diff options
author | Tim King <taking@google.com> | 2015-12-18 17:19:07 -0800 |
---|---|---|
committer | Tim King <taking@google.com> | 2015-12-18 17:19:07 -0800 |
commit | 5f207ba01302c3245e169bfbe2ed91ad0cd659cd (patch) | |
tree | e1131e8c2891e283ab028fba6a7a677bb4ac9f5f /test/unit/util | |
parent | 7e4468ba0aa0b08eeb4ba1a86b1fdd839ae169d6 (diff) |
Modifying emptyset.h and sexpr. Adding SetLanguage.
- Modifies expr/emptyset.h to use SetType only as an incomplete type within expr/emptyset.h. This breaks the include cycle between expr/emptyset.h, expr/expr.h and expr/type.h.
- Refactors SExpr to avoid a potentially infinite cycle. This is likely overkill, but it works.
- Moving Expr::setlanguage and related utilities out of the Expr class and into their own file. This allows files in util/ to know the output language set on an ostream.
Diffstat (limited to 'test/unit/util')
-rw-r--r-- | test/unit/util/boolean_simplification_black.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/test/unit/util/boolean_simplification_black.h b/test/unit/util/boolean_simplification_black.h index ac343ede8..355d4ff37 100644 --- a/test/unit/util/boolean_simplification_black.h +++ b/test/unit/util/boolean_simplification_black.h @@ -22,6 +22,7 @@ #include "expr/node.h" #include "expr/node_manager.h" #include "options/language.h" +#include "options/set_language.h" #include "smt_util/boolean_simplification.h" using namespace CVC4; @@ -102,7 +103,7 @@ public: BooleanSimplification::DUPLICATE_REMOVAL_THRESHOLD); cout << Expr::setdepth(-1) - << Expr::setlanguage(language::output::LANG_CVC4); + << language::SetLanguage(language::output::LANG_CVC4); } void tearDown() { |