diff options
Diffstat (limited to 'examples')
-rw-r--r-- | examples/hashsmt/sha1_collision.cpp | 1 | ||||
-rw-r--r-- | examples/hashsmt/sha1_inversion.cpp | 1 | ||||
-rw-r--r-- | examples/hashsmt/word.cpp | 8 | ||||
-rw-r--r-- | examples/nra-translate/normalize.cpp | 4 | ||||
-rw-r--r-- | examples/nra-translate/smt2info.cpp | 1 | ||||
-rw-r--r-- | examples/nra-translate/smt2todreal.cpp | 4 | ||||
-rw-r--r-- | examples/nra-translate/smt2toisat.cpp | 1 | ||||
-rw-r--r-- | examples/nra-translate/smt2tomathematica.cpp | 1 | ||||
-rw-r--r-- | examples/nra-translate/smt2toqepcad.cpp | 1 | ||||
-rw-r--r-- | examples/nra-translate/smt2toredlog.cpp | 1 | ||||
-rw-r--r-- | examples/sets-translate/sets_translate.cpp | 1 | ||||
-rw-r--r-- | examples/translator.cpp | 6 |
12 files changed, 25 insertions, 5 deletions
diff --git a/examples/hashsmt/sha1_collision.cpp b/examples/hashsmt/sha1_collision.cpp index 9ed4424ba..984cbde13 100644 --- a/examples/hashsmt/sha1_collision.cpp +++ b/examples/hashsmt/sha1_collision.cpp @@ -28,6 +28,7 @@ #include <sstream> #include <string> +#include "expr/expr_iomanip.h" #include "options/language.h" #include "options/set_language.h" #include "sha1.hpp" diff --git a/examples/hashsmt/sha1_inversion.cpp b/examples/hashsmt/sha1_inversion.cpp index 15c7d8728..9aac7bbe0 100644 --- a/examples/hashsmt/sha1_inversion.cpp +++ b/examples/hashsmt/sha1_inversion.cpp @@ -28,6 +28,7 @@ #include <sstream> #include <string> +#include "expr/expr_iomanip.h" #include "options/language.h" #include "options/set_language.h" #include "sha1.hpp" diff --git a/examples/hashsmt/word.cpp b/examples/hashsmt/word.cpp index 2e638f64f..7aa37e91b 100644 --- a/examples/hashsmt/word.cpp +++ b/examples/hashsmt/word.cpp @@ -26,6 +26,12 @@ #include <vector> +#include "expr/expr.h" +#include "expr/expr_iomanip.h" +#include "options/base_options.h" +#include "options/language.h" +#include "options/options.h" + using namespace std; using namespace hashsmt; using namespace CVC4; @@ -66,7 +72,7 @@ Word Word::concat(const Word words[], unsigned size) { } void Word::print(ostream& out) const { - out << CVC4::Expr::setdepth(-1) << d_expr; + out << CVC4::expr::ExprSetDepth(-1) << d_expr; } Word::Word(unsigned newSize, unsigned value) { diff --git a/examples/nra-translate/normalize.cpp b/examples/nra-translate/normalize.cpp index db76390a7..56f326216 100644 --- a/examples/nra-translate/normalize.cpp +++ b/examples/nra-translate/normalize.cpp @@ -23,7 +23,9 @@ #include <vector> #include "expr/expr.h" +#include "expr/expr_iomanip.h" #include "options/language.h" +#include "options/base_options.h" #include "options/options.h" #include "options/set_language.h" #include "parser/parser.h" @@ -49,7 +51,7 @@ int main(int argc, char* argv[]) ExprManager exprManager(options); cout << language::SetLanguage(language::output::LANG_SMTLIB_V2) - << Expr::setdepth(-1); + << expr::ExprSetDepth(-1); // Create the parser ParserBuilder parserBuilder(&exprManager, input, options); diff --git a/examples/nra-translate/smt2info.cpp b/examples/nra-translate/smt2info.cpp index d59f9f4c4..c541a23fe 100644 --- a/examples/nra-translate/smt2info.cpp +++ b/examples/nra-translate/smt2info.cpp @@ -22,6 +22,7 @@ #include <vector> #include "expr/expr.h" +#include "options/base_options.h" #include "options/options.h" #include "parser/parser.h" #include "parser/parser_builder.h" diff --git a/examples/nra-translate/smt2todreal.cpp b/examples/nra-translate/smt2todreal.cpp index 97c5c5d04..56f323812 100644 --- a/examples/nra-translate/smt2todreal.cpp +++ b/examples/nra-translate/smt2todreal.cpp @@ -23,6 +23,8 @@ #include <vector> #include "expr/expr.h" +#include "expr/expr_iomanip.h" +#include "options/base_options.h" #include "options/options.h" #include "parser/parser.h" #include "parser/parser_builder.h" @@ -46,7 +48,7 @@ int main(int argc, char* argv[]) options.set(outputLanguage, language::output::LANG_SMTLIB_V2); ExprManager exprManager(options); - cout << Expr::dag(0) << Expr::setdepth(-1); + cout << expr::ExprDag(0) << expr::ExprSetDepth(-1); // Create the parser ParserBuilder parserBuilder(&exprManager, input, options); diff --git a/examples/nra-translate/smt2toisat.cpp b/examples/nra-translate/smt2toisat.cpp index 9c94cdd43..8eb46dd2f 100644 --- a/examples/nra-translate/smt2toisat.cpp +++ b/examples/nra-translate/smt2toisat.cpp @@ -23,6 +23,7 @@ #include <vector> #include "expr/expr.h" +#include "options/base_options.h" #include "options/options.h" #include "parser/parser.h" #include "parser/parser_builder.h" diff --git a/examples/nra-translate/smt2tomathematica.cpp b/examples/nra-translate/smt2tomathematica.cpp index 86aaf786f..0ad5bbab5 100644 --- a/examples/nra-translate/smt2tomathematica.cpp +++ b/examples/nra-translate/smt2tomathematica.cpp @@ -23,6 +23,7 @@ #include <vector> #include "expr/expr.h" +#include "options/base_options.h" #include "options/options.h" #include "parser/parser.h" #include "parser/parser_builder.h" diff --git a/examples/nra-translate/smt2toqepcad.cpp b/examples/nra-translate/smt2toqepcad.cpp index 058fa8e0d..c74b0a110 100644 --- a/examples/nra-translate/smt2toqepcad.cpp +++ b/examples/nra-translate/smt2toqepcad.cpp @@ -23,6 +23,7 @@ #include <vector> #include "expr/expr.h" +#include "options/base_options.h" #include "options/options.h" #include "parser/parser.h" #include "parser/parser_builder.h" diff --git a/examples/nra-translate/smt2toredlog.cpp b/examples/nra-translate/smt2toredlog.cpp index 1ebd6ea59..7a6f87122 100644 --- a/examples/nra-translate/smt2toredlog.cpp +++ b/examples/nra-translate/smt2toredlog.cpp @@ -23,6 +23,7 @@ #include <vector> #include "expr/expr.h" +#include "options/base_options.h" #include "options/options.h" #include "parser/parser.h" #include "parser/parser_builder.h" diff --git a/examples/sets-translate/sets_translate.cpp b/examples/sets-translate/sets_translate.cpp index 7e17e68f4..aef3843f8 100644 --- a/examples/sets-translate/sets_translate.cpp +++ b/examples/sets-translate/sets_translate.cpp @@ -24,6 +24,7 @@ #include "expr/expr.h" #include "options/language.h" +#include "options/base_options.h" #include "options/options.h" #include "options/set_language.h" #include "parser/parser.h" 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); } |