From 2ba8bb701ce289ba60afec01b653b0930cc59298 Mon Sep 17 00:00:00 2001 From: Tim King Date: Thu, 28 Jan 2016 12:35:45 -0800 Subject: 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}. --- src/proof/proof_manager.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/proof/proof_manager.cpp') diff --git a/src/proof/proof_manager.cpp b/src/proof/proof_manager.cpp index 0ae020090..b90d589b8 100644 --- a/src/proof/proof_manager.cpp +++ b/src/proof/proof_manager.cpp @@ -153,22 +153,23 @@ void ProofManager::initCnfProof(prop::CnfStream* cnfStream, } -void ProofManager::initTheoryProofEngine(SmtGlobals* globals) { +void ProofManager::initTheoryProofEngine() { Assert (currentPM()->d_theoryProof == NULL); Assert (currentPM()->d_format == LFSC); - currentPM()->d_theoryProof = new LFSCTheoryProofEngine(globals); + currentPM()->d_theoryProof = new LFSCTheoryProofEngine(); } std::string ProofManager::getInputClauseName(ClauseId id, const std::string& prefix) { return append(prefix+".pb", id); } + std::string ProofManager::getLemmaClauseName(ClauseId id, const std::string& prefix) { return append(prefix+".lemc", id); } - std::string ProofManager::getLemmaName(ClauseId id, - const std::string& prefix) { + +std::string ProofManager::getLemmaName(ClauseId id, const std::string& prefix) { return append(prefix+"lem", id); } -- cgit v1.2.3