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/parser/parser_builder.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/parser/parser_builder.cpp')
-rw-r--r-- | src/parser/parser_builder.cpp | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/src/parser/parser_builder.cpp b/src/parser/parser_builder.cpp index f473ae178..e095d208b 100644 --- a/src/parser/parser_builder.cpp +++ b/src/parser/parser_builder.cpp @@ -13,16 +13,18 @@ ** ** A builder for parsers. **/ + +// This must be included first. +#include "parser/antlr_input.h" + #include "parser/parser_builder.h" #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" #include "parser/parser.h" +#include "options/options.h" #include "smt1/smt1.h" #include "smt2/smt2.h" #include "tptp/tptp.h" @@ -161,14 +163,15 @@ ParserBuilder& ParserBuilder::withParseOnly(bool flag) { ParserBuilder& ParserBuilder::withOptions(const Options& options) { ParserBuilder& retval = *this; retval = - retval.withInputLanguage(options[options::inputLanguage]) - .withMmap(options[options::memoryMap]) - .withChecks(options[options::semanticChecks]) - .withStrictMode(options[options::strictParsing]) - .withParseOnly(options[options::parseOnly]) - .withIncludeFile(options[options::filesystemAccess]); - if(options.wasSetByUser(options::forceLogic)) { - retval = retval.withForcedLogic(options[options::forceLogic]->getLogicString()); + retval.withInputLanguage(options.getInputLanguage()) + .withMmap(options.getMemoryMap()) + .withChecks(options.getSemanticChecks()) + .withStrictMode(options.getStrictParsing()) + .withParseOnly(options.getParseOnly()) + .withIncludeFile(options.getFilesystemAccess()); + if(options.wasSetByUserForceLogicString()) { + LogicInfo tmp(options.getForceLogicString()); + retval = retval.withForcedLogic(tmp.getLogicString()); } return retval; } |