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/main/main.cpp | |
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/main/main.cpp')
-rw-r--r-- | src/main/main.cpp | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/src/main/main.cpp b/src/main/main.cpp index 92902ac11..9151d8bf7 100644 --- a/src/main/main.cpp +++ b/src/main/main.cpp @@ -22,19 +22,18 @@ #include <stdio.h> #include <unistd.h> +#include "base/configuration.h" #include "base/output.h" #include "expr/expr_manager.h" #include "main/command_executor.h" #include "main/interactive_shell.h" -#include "options/base_options.h" #include "options/language.h" -#include "options/main_options.h" +#include "options/options.h" #include "parser/parser.h" #include "parser/parser_builder.h" #include "parser/parser_exception.h" #include "smt/smt_engine.h" #include "smt_util/command.h" -#include "util/configuration.h" #include "util/result.h" #include "util/statistics.h" @@ -56,24 +55,24 @@ int main(int argc, char* argv[]) { return runCvc4(argc, argv, opts); } catch(OptionException& e) { #ifdef CVC4_COMPETITION_MODE - *opts[options::out] << "unknown" << endl; + *opts.getOut() << "unknown" << endl; #endif cerr << "CVC4 Error:" << endl << e << endl << endl << "Please use --help to get help on command-line options." << endl; } catch(Exception& e) { #ifdef CVC4_COMPETITION_MODE - *opts[options::out] << "unknown" << endl; + *opts.getOut() << "unknown" << endl; #endif - if(opts[options::outputLanguage] == output::LANG_SMTLIB_V2_0 || - opts[options::outputLanguage] == output::LANG_SMTLIB_V2_5) { - *opts[options::out] << "(error \"" << e << "\")" << endl; + if(opts.getOutputLanguage() == output::LANG_SMTLIB_V2_0 || + opts.getOutputLanguage() == output::LANG_SMTLIB_V2_5) { + *opts.getOut() << "(error \"" << e << "\")" << endl; } else { - *opts[options::err] << "CVC4 Error:" << endl << e << endl; + *opts.getErr() << "CVC4 Error:" << endl << e << endl; } - if(opts[options::statistics] && pExecutor != NULL) { + if(opts.getStatistics() && pExecutor != NULL) { pTotalTime->stop(); - pExecutor->flushStatistics(*opts[options::err]); + pExecutor->flushStatistics(*opts.getErr()); } } exit(1); |