diff options
author | Tim King <taking@google.com> | 2016-01-28 12:35:45 -0800 |
---|---|---|
committer | Tim King <taking@google.com> | 2016-01-28 12:35:45 -0800 |
commit | 2ba8bb701ce289ba60afec01b653b0930cc59298 (patch) | |
tree | 46df365b7b41ce662a0f94de5b11c3ed20829851 /src/compat | |
parent | 42b665f2a00643c81b42932fab1441987628c5a5 (diff) |
Adding listeners to Options.
- Options
-- Added the new option attribute :notify. One can get a notify() call on the Listener after a the option's value is updated. This is the new preferred way to achieve dynamic dispatch for options.
-- Removed SmtOptionsHandler and pushed its functionality into OptionsHandler and Listeners.
-- Added functions to Options for registering listeners of the notify calls.
-- Changed a number of options to use the new listener infrastructure.
-- Fixed a number of warnings in options.
-- Added the ArgumentExtender class to better capture how arguments are inserted while parsing options and ease memory management. Previously this was the "preemptGetopt" procedure.
-- Moved options/options_handler_interface.{cpp,h} to options/options_handler.{cpp,h}.
- Theories
-- Reimplemented alternative theories to use a datastructure stored on TheoryEngine instead of on Options.
- Ostream Handling:
-- Added new functionality that generalized how ostreams are opened, options/open_stream.h.
-- Simplified the memory management for different ostreams, smt/managed_ostreams.h.
-- Had the SmtEnginePrivate manage the memory for the ostreams set by options.
-- Simplified how the setting of ostreams are updated, smt/update_ostream.h.
- Configuration and Tags:
-- Configuration can now be used during predicates and handlers for options.
-- Moved configuration.{cpp,h,i} and configuration_private.h from util/ into base/.
-- Moved {Debug,Trace}_tags.* from being generated in options/ into base/.
- cvc4_private.h
-- Upgraded #warning's in cvc4_private.h and cvc4_private_library.h to #error's.
-- Added public first-order (non-templatized) member functions for options get and set the value of options outside of libcvc4. Fixed all of the use locations.
-- Made lib/lib/clock_gettime.h a cvc4_private_library.h header.
- Antlr
-- Fixed antlr and cvc4 macro definition conflicts that caused warnings.
- SmtGlobals
-- Refactored replayStream and replayLog out of SmtGlobals.
-- Renamed SmtGlobals to LemmaChannels and moved the implementation into smt_util/lemma_channels.{h,cpp}.
Diffstat (limited to 'src/compat')
-rw-r--r-- | src/compat/cvc3_compat.cpp | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/src/compat/cvc3_compat.cpp b/src/compat/cvc3_compat.cpp index 9ae394b97..a62776c80 100644 --- a/src/compat/cvc3_compat.cpp +++ b/src/compat/cvc3_compat.cpp @@ -28,11 +28,8 @@ #include "expr/expr_iomanip.h" #include "expr/kind.h" #include "expr/predicate.h" -#include "options/base_options.h" -#include "options/expr_options.h" -#include "options/parser_options.h" +#include "options/options.h" #include "options/set_language.h" -#include "options/smt_options.h" #include "parser/parser.h" #include "parser/parser_builder.h" #include "smt_util/command.h" @@ -655,11 +652,11 @@ std::string ExprManager::getKindName(int kind) { } InputLanguage ExprManager::getInputLang() const { - return getOptions()[CVC4::options::inputLanguage]; + return getOptions().getInputLanguage(); } InputLanguage ExprManager::getOutputLang() const { - return CVC4::language::toInputLanguage(getOptions()[CVC4::options::outputLanguage]); + return CVC4::language::toInputLanguage(getOptions().getOutputLanguage()); } Expr Expr::operator[](int i) const { @@ -927,7 +924,7 @@ void ValidityChecker::setUpOptions(CVC4::Options& options, const CLFlags& clflag d_smt->setOption("input-language", clflags["lang"].getString()); if(clflags["output-lang"].getString() == "") { stringstream langss; - langss << CVC4::language::toOutputLanguage(options[CVC4::options::inputLanguage]); + langss << CVC4::language::toOutputLanguage(options.getInputLanguage()); d_smt->setOption("output-language", langss.str()); } else { d_smt->setOption("output-language", clflags["output-lang"].getString()); @@ -1563,7 +1560,8 @@ void ValidityChecker::printExpr(const Expr& e) { void ValidityChecker::printExpr(const Expr& e, std::ostream& os) { CVC4::expr::ExprSetDepth::Scope sd(os, -1); CVC4::expr::ExprPrintTypes::Scope pt(os, false); - CVC4::language::SetLanguage::Scope sl(os, d_em->getOptions()[CVC4::options::outputLanguage]); + CVC4::language::SetLanguage::Scope sl( + os, d_em->getOptions().getOutputLanguage()); os << e; } @@ -2561,8 +2559,8 @@ void ValidityChecker::logAnnotation(const Expr& annot) { static void doCommands(CVC4::parser::Parser* parser, CVC4::SmtEngine* smt, CVC4::Options& opts) { while(CVC4::Command* cmd = parser->nextCommand()) { - if(opts[CVC4::options::verbosity] >= 0) { - cmd->invoke(smt, *opts[CVC4::options::out]); + if(opts.getVerbosity() >= 0) { + cmd->invoke(smt, *opts.getOut()); } else { cmd->invoke(smt); } @@ -2574,7 +2572,8 @@ void ValidityChecker::loadFile(const std::string& fileName, InputLanguage lang, bool interactive, bool calledFromParser) { - CVC4::Options opts = d_em->getOptions(); + CVC4::Options opts; + opts.copyValues(d_em->getOptions()); stringstream langss; langss << lang; d_smt->setOption("input-language", CVC4::SExpr(langss.str())); @@ -2589,7 +2588,9 @@ void ValidityChecker::loadFile(const std::string& fileName, void ValidityChecker::loadFile(std::istream& is, InputLanguage lang, bool interactive) { - CVC4::Options opts = d_em->getOptions(); + CVC4::Options opts; + opts.copyValues(d_em->getOptions()); + stringstream langss; langss << lang; d_smt->setOption("input-language", CVC4::SExpr(langss.str())); |