Add --default-dag-thresh to translator, build translator with other examples.

diff --git a/examples/Makefile.am b/examples/Makefile.am
index d5d8534f4ae93070683629d35c8c03c16d521438..940af06ffd4c74c76151231a56ed004ca2306144 100644 (file)
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -6,7 +6,8 @@ AM_CXXFLAGS = -Wall
 AM_CFLAGS = -Wall
 
 noinst_PROGRAMS = \
-       simple_vc_cxx
+       simple_vc_cxx \
+       translator
 
 if CVC4_BUILD_LIBCOMPAT
 noinst_PROGRAMS += \
@@ -47,6 +48,12 @@ simple_vc_compat_c_SOURCES = \
 simple_vc_compat_c_LDADD = \
        @builddir@/../src/bindings/compat/c/libcvc4bindings_c_compat.la
 
+translator_SOURCES = \
+       translator.cpp
+translator_LDADD = \
+       @builddir@/../src/parser/libcvc4parser.la \
+       @builddir@/../src/libcvc4.la
+
 SimpleVC.class: SimpleVC.java
        $(AM_V_JAVAC)$(JAVAC) -classpath "@builddir@/../src/bindings/CVC4.jar" -d "@builddir@" $<
 SimpleVCCompat.class: SimpleVCCompat.java

diff --git a/examples/translator.cpp b/examples/translator.cpp
index 67dce699d445e3cb0d121b8df76967905c1411f5..b7e6f618ab6d390a5746011f4b4bbe19b0785079 100644 (file)
--- a/examples/translator.cpp
+++ b/examples/translator.cpp
@@ -19,6 +19,8 @@
 #include <fstream>
 #include <getopt.h>
 #include <cstring>
+#include <cstdlib>
+#include <cerrno>
 #include "util/language.h"
 #include "expr/command.h"
 #include "expr/expr.h"
@@ -34,12 +36,14 @@ enum {
   INPUT_LANG = 'L',
   OUTPUT_LANG = 'O',
   OUTPUT_FILE = 'o',
-  HELP = 'h'
+  HELP = 'h',
+  DEFAULT_DAG_THRESH,
 };/* enum */
 
 const struct option longopts[] = {
   { "output-lang", required_argument, NULL, OUTPUT_LANG },
   { "output-language", required_argument, NULL, OUTPUT_LANG },
+  { "default-dag-thresh", required_argument, NULL, DEFAULT_DAG_THRESH },
   { "lang", required_argument, NULL, INPUT_LANG },
   { "language", required_argument, NULL, INPUT_LANG },
   { "out", required_argument, NULL, OUTPUT_FILE },
@@ -52,6 +56,7 @@ static void showHelp() {
        << "  --output-language | -O  set output language (default smt2)" << endl
        << "  --input-language | -L   set input language (default auto)" << endl
        << "  --out | -o              set output file (- for stdout)" << endl
+       << "  --default-dag-thresh=N  set DAG threshold" << endl
        << "  --help | -h             this help" << endl
        << "Options and input filenames can be intermixed, and order is important." << endl
        << "For instance, \"-O smt2 x -O cvc4 y\" reads file x in smt2 format and"
@@ -115,6 +120,7 @@ int main(int argc, char* argv[]) {
   InputLanguage fromLang = input::LANG_AUTO;
   OutputLanguage toLang = output::LANG_SMTLIB_V2;
   size_t files = 0;
+  int dag_thresh = 1;
 
   try {
     int c;
@@ -122,6 +128,7 @@ int main(int argc, char* argv[]) {
       switch(c) {
       case 1:
         ++files;
+        *out << Expr::dag(dag_thresh);
         readFile(optarg, (!strcmp(optarg, "-") && fromLang == input::LANG_AUTO) ? input::LANG_CVC4 : fromLang, toLang, out);
         break;
       case INPUT_LANG:
@@ -150,6 +157,22 @@ int main(int argc, char* argv[]) {
           out = &cout;
         }
         break;
+      case DEFAULT_DAG_THRESH: {
+          if(!isdigit(*optarg)) {
+            cerr << "error: --default-dag-thresh requires non-negative argument: `"
+                 << optarg << "' invalid." << endl;
+            exit(1);
+          }
+          char* end;
+          unsigned long ul = strtoul(optarg, &end, 10);
+          if(errno != 0 || *end != '\0') {
+            cerr << "error: --default-dag-thresh argument malformed: `"
+                 << optarg << "'." << endl;
+            exit(1);
+          }
+          dag_thresh = ul > INT_MAX ? INT_MAX : int(ul);
+        }
+        break;
       case 'h':
         showHelp();
         exit(0);
@@ -164,6 +187,7 @@ int main(int argc, char* argv[]) {
     }
 
     if(files == 0) {
+      *out << Expr::dag(dag_thresh);
       readFile("-", fromLang == input::LANG_AUTO ? input::LANG_CVC4 : fromLang, toLang, out);
       exit(0);
     }