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 /src/smt_util | |
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 'src/smt_util')
-rw-r--r-- | src/smt_util/command.cpp | 3 | ||||
-rw-r--r-- | src/smt_util/model.cpp | 10 |
2 files changed, 8 insertions, 5 deletions
diff --git a/src/smt_util/command.cpp b/src/smt_util/command.cpp index ae4e1f1f0..5917d71da 100644 --- a/src/smt_util/command.cpp +++ b/src/smt_util/command.cpp @@ -25,6 +25,7 @@ #include "base/cvc4_assert.h" #include "base/output.h" +#include "expr/expr_iomanip.h" #include "expr/node.h" #include "expr/sexpr.h" #include "options/options.h" @@ -984,7 +985,7 @@ void GetValueCommand::printResult(std::ostream& out, uint32_t verbosity) const t if(! ok()) { this->Command::printResult(out, verbosity); } else { - Expr::dag::Scope scope(out, false); + expr::ExprDag::Scope scope(out, false); out << d_result << endl; } } diff --git a/src/smt_util/model.cpp b/src/smt_util/model.cpp index 3f0423f49..ddac7e263 100644 --- a/src/smt_util/model.cpp +++ b/src/smt_util/model.cpp @@ -16,10 +16,12 @@ #include <vector> -#include "smt_util/command.h" -#include "smt/smt_engine_scope.h" -#include "smt/command_list.h" +#include "expr/expr_iomanip.h" +#include "options/base_options.h" #include "printer/printer.h" +#include "smt/command_list.h" +#include "smt/smt_engine_scope.h" +#include "smt_util/command.h" using namespace std; @@ -27,7 +29,7 @@ namespace CVC4 { std::ostream& operator<<(std::ostream& out, const Model& m) { smt::SmtScope smts(&m.d_smt); - Expr::dag::Scope scope(out, false); + expr::ExprDag::Scope scope(out, false); Printer::getPrinter(options::outputLanguage())->toStream(out, m); return out; } |