From fa7f30a4ba08afe066604daee87006b4fb5f21f7 Mon Sep 17 00:00:00 2001 From: Tim King Date: Wed, 30 Dec 2015 11:45:37 -0800 Subject: 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. --- examples/nra-translate/normalize.cpp | 4 +++- examples/nra-translate/smt2info.cpp | 1 + examples/nra-translate/smt2todreal.cpp | 4 +++- examples/nra-translate/smt2toisat.cpp | 1 + examples/nra-translate/smt2tomathematica.cpp | 1 + examples/nra-translate/smt2toqepcad.cpp | 1 + examples/nra-translate/smt2toredlog.cpp | 1 + 7 files changed, 11 insertions(+), 2 deletions(-) (limited to 'examples/nra-translate') 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 #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 #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 #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 #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 #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 #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 #include "expr/expr.h" +#include "options/base_options.h" #include "options/options.h" #include "parser/parser.h" #include "parser/parser_builder.h" -- cgit v1.2.3