diff options
author | Tim King <taking@google.com> | 2015-12-30 11:45:37 -0800 |
---|---|---|
committer | Tim King <taking@google.com> | 2015-12-30 11:45:37 -0800 |
commit | fa7f30a4ba08afe066604daee87006b4fb5f21f7 (patch) | |
tree | 6eecac7cce64fa00f4ac5c18f023f1bc234435a3 /examples/translator.cpp | |
parent | 1ce397129214a427a10ff3e33069e315fe13eec1 (diff) |
Shuffling around public vs. private headers
- Adding a script contrib/test_install_headers.h that tests whether one can include all cvc4_public headers. CVC4 can pass this test after this commit.
- Making lib/{clock_gettime.h,ffs.h,strtok_r.h} cvc4_private.
- Making prop/sat_solver_factory.h cvc4_private.
- Moving the expr iostream manipulators into their own files: expr_iomanip.{h,cpp}.
- Setting the generated *_options.h files back to being cvc4_private.
-- Removing the usage of options/expr_options.h from expr.h.
-- Removing the include of base_options.h from options.h.
- Cleaning up CPP macros in cvc4_public headers.
-- Changing the ROLL macro in floatingpoint.h into an inline function.
-- Removing the now unused flag -D__BUILDING_STATISTICS_FOR_EXPORT.
Diffstat (limited to 'examples/translator.cpp')
-rw-r--r-- | examples/translator.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/examples/translator.cpp b/examples/translator.cpp index 7d5e912e7..248dadd5f 100644 --- a/examples/translator.cpp +++ b/examples/translator.cpp @@ -23,6 +23,8 @@ #include <iostream> #include "expr/expr.h" +#include "expr/expr_iomanip.h" +#include "options/base_options.h" #include "options/language.h" #include "options/set_language.h" #include "parser/parser.h" @@ -211,7 +213,7 @@ int main(int argc, char* argv[]) { switch(c) { case 1: ++files; - *out << Expr::dag(dag_thresh); + *out << expr::ExprDag(dag_thresh); readFile(optarg, (!strcmp(optarg, "-") && fromLang == input::LANG_AUTO) ? input::LANG_CVC4 : fromLang, toLang, expand_definitions, combine_assertions, out); break; case INPUT_LANG: @@ -276,7 +278,7 @@ int main(int argc, char* argv[]) { } if(files == 0) { - *out << Expr::dag(dag_thresh); + *out << expr::ExprDag(dag_thresh); readFile("-", fromLang == input::LANG_AUTO ? input::LANG_CVC4 : fromLang, toLang, expand_definitions, combine_assertions, out); exit(0); } |