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/prop/theory_proxy.h | |
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/prop/theory_proxy.h')
-rw-r--r-- | src/prop/theory_proxy.h | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/src/prop/theory_proxy.h b/src/prop/theory_proxy.h index 261db8c87..acc242ab6 100644 --- a/src/prop/theory_proxy.h +++ b/src/prop/theory_proxy.h @@ -26,11 +26,12 @@ #include <iosfwd> #include "context/cdqueue.h" +#include "expr/expr_stream.h" #include "expr/node.h" #include "prop/sat_solver.h" -#include "smt/smt_globals.h" -#include "smt_util/lemma_output_channel.h" +#include "smt_util/lemma_channels.h" #include "smt_util/lemma_input_channel.h" +#include "smt_util/lemma_output_channel.h" #include "theory/theory.h" #include "util/statistics_registry.h" @@ -54,7 +55,9 @@ public: DecisionEngine* decisionEngine, context::Context* context, CnfStream* cnfStream, - SmtGlobals* globals); + std::ostream* replayLog, + ExprStream* replayStream, + LemmaChannels* globals); ~TheoryProxy(); @@ -110,11 +113,14 @@ public: TheoryEngine* d_theoryEngine; - /** - * Container for inputChannel, outputChannel, replayLog, and - * replayStream. - */ - SmtGlobals* d_globals; + /** Container for inputChannel() and outputChannel(). */ + LemmaChannels* d_channels; + + /** Stream on which to log replay events. */ + std::ostream* d_replayLog; + + /** Stream for replaying decisions. */ + ExprStream* d_replayStream; /** The lemma input channel we are using. */ LemmaInputChannel* inputChannel(); @@ -122,9 +128,6 @@ public: /** The lemma output channel we are using. */ LemmaOutputChannel* outputChannel(); - std::ostream* replayLog(); - ExprStream* replayStream(); - /** Queue of asserted facts */ context::CDQueue<TNode> d_queue; |