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}.

1 files changed, 23 insertions, 20 deletions

diff --git a/src/theory/theory.h b/src/theory/theory.h
index 2c3c66d8b..9849dd0b9 100644
--- a/src/theory/theory.h
+++ b/src/theory/theory.h
@@ -20,9 +20,8 @@
 #define __CVC4__THEORY__THEORY_H
 
 #include <ext/hash_set>
-#include <iostream>
+#include <iosfwd>
 #include <string>
-#include <strings.h>
 
 #include "context/cdlist.h"
 #include "context/cdo.h"
@@ -33,7 +32,6 @@
 #include "options/theory_options.h"
 #include "options/theoryof_mode.h"
 #include "smt/logic_request.h"
-#include "smt/smt_globals.h"
 #include "smt_util/command.h"
 #include "smt_util/dump.h"
 #include "theory/logic_info.h"
@@ -140,9 +138,9 @@ private:
   friend class ::CVC4::TheoryEngine;
 
   // Disallow default construction, copy, assignment.
-  Theory() CVC4_UNUSED;
-  Theory(const Theory&) CVC4_UNUSED;
-  Theory& operator=(const Theory&) CVC4_UNUSED;
+  Theory() CVC4_UNDEFINED;
+  Theory(const Theory&) CVC4_UNDEFINED;
+  Theory& operator=(const Theory&) CVC4_UNDEFINED;
 
   /**
    * An integer identifying the type of the theory
@@ -153,7 +151,7 @@ private:
    * an unique string identifier for each instance of a Theory class. We need
    * this to ensure unique statistics names over multiple theory instances. */
   std::string d_instanceName;
-  
+
   /**
    * The SAT search context for the Theory.
    */
@@ -243,10 +241,14 @@ protected:
 
   /**
    * Construct a Theory.
+   *
+   * The pair <id, instance> is assumed to uniquely identify this Theory
+   * w.r.t. the SmtEngine.
    */
-  Theory(TheoryId id, context::Context* satContext, context::UserContext* userContext,
-         OutputChannel& out, Valuation valuation, const LogicInfo& logicInfo,
-         SmtGlobals* globals, std::string name = "") throw(); // taking : No default.
+  Theory(TheoryId id, context::Context* satContext,
+         context::UserContext* userContext, OutputChannel& out,
+         Valuation valuation, const LogicInfo& logicInfo,
+         std::string instance = "") throw();  // taking : No default.
 
   /**
    * This is called at shutdown time by the TheoryEngine, just before
@@ -295,7 +297,11 @@ protected:
   void printFacts(std::ostream& os) const;
   void debugPrintFacts() const;
 
-  SmtGlobals* d_globals;
+  /**
+   * Whether proofs are enabled
+   *
+   */
+  bool d_proofEnabled;
 
 public:
 
@@ -415,13 +421,13 @@ public:
     return d_id;
   }
 
-  std::string getFullInstanceName() const {
-    std::stringstream ss;
-    ss << "theory<" << d_id << ">" << d_instanceName;
-    return ss.str();
-  }
+  /**
+   * Returns a string that uniquely identifies this theory solver w.r.t. the
+   * SmtEngine.
+   */
+  std::string getFullInstanceName() const;
+
 
-  
   /**
    * Get the SAT context associated to this Theory.
    */
@@ -865,9 +871,6 @@ public:
    * Turn on proof-production mode.
    */
   void produceProofs() { d_proofsEnabled = true; }
-  
-  /** Returns a pointer to the globals copy the theory is using. */
-  SmtGlobals* globals() { return d_globals; }
 
 };/* class Theory */