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/parser | |
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/parser')
-rw-r--r-- | src/parser/parser.cpp | 3 | ||||
-rw-r--r-- | src/parser/parser_builder.cpp | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/parser/parser.cpp b/src/parser/parser.cpp index 0e8a9e241..120f63987 100644 --- a/src/parser/parser.cpp +++ b/src/parser/parser.cpp @@ -26,6 +26,7 @@ #include "base/output.h" #include "expr/expr.h" +#include "expr/expr_iomanip.h" #include "expr/kind.h" #include "expr/resource_manager.h" #include "expr/type.h" @@ -331,7 +332,7 @@ Parser::mkMutualDatatypeTypes(const std::vector<Datatype>& datatypes) { j != j_end; ++j) { const DatatypeConstructor& ctor = *j; - Expr::printtypes::Scope pts(Debug("parser-idt"), true); + expr::ExprPrintTypes::Scope pts(Debug("parser-idt"), true); Expr constructor = ctor.getConstructor(); Debug("parser-idt") << "+ define " << constructor << std::endl; string constructorName = ctor.getName(); diff --git a/src/parser/parser_builder.cpp b/src/parser/parser_builder.cpp index 08e0232aa..f473ae178 100644 --- a/src/parser/parser_builder.cpp +++ b/src/parser/parser_builder.cpp @@ -18,6 +18,7 @@ #include <string> #include "expr/expr_manager.h" +#include "options/base_options.h" #include "options/parser_options.h" #include "options/smt_options.h" #include "parser/input.h" |