Add SmtGlobals Class

- The options replayStream, lemmaInputChannel, lemmaOutputChannel have been removed due to their datatypes. These datatypes were previously pointers to types that were not usable from the options/ library.
- The option replayLog has been removed due to inconsistent memory management.
- SmtGlobals is a class that wraps a pointer to each of these removed options. These can each be set independently.
- There is a single SmtGlobals per SmtEngine with the lifetime of the SmtEngine.
- A pointer to this is freely given to the user of an SmtEngine to parameterize the solver after construction.
- Selected classes have been given a copy of this pointer in their constructors.
- Removed the dependence on Node from Result. Moving Result back into util/.

3 files changed, 9 insertions, 10 deletions

diff --git a/src/theory/sets/theory_sets.cpp b/src/theory/sets/theory_sets.cpp
index db93c597c..82ebb5bf8 100644
--- a/src/theory/sets/theory_sets.cpp
+++ b/src/theory/sets/theory_sets.cpp
@@ -25,10 +25,11 @@ TheorySets::TheorySets(context::Context* c,
                        context::UserContext* u,
                        OutputChannel& out,
                        Valuation valuation,
-                       const LogicInfo& logicInfo) :
-  Theory(THEORY_SETS, c, u, out, valuation, logicInfo),
-  d_internal(new TheorySetsPrivate(*this, c, u)) {
-}
+                       const LogicInfo& logicInfo,
+                       SmtGlobals* globals)
+    : Theory(THEORY_SETS, c, u, out, valuation, logicInfo, globals),
+      d_internal(new TheorySetsPrivate(*this, c, u))
+{}
 
 TheorySets::~TheorySets() {
   delete d_internal;
diff --git a/src/theory/sets/theory_sets.h b/src/theory/sets/theory_sets.h
index 6136fc8f8..7ff8abec6 100644
--- a/src/theory/sets/theory_sets.h
+++ b/src/theory/sets/theory_sets.h
@@ -40,11 +40,9 @@ public:
    * Constructs a new instance of TheorySets w.r.t. the provided
    * contexts.
    */
-  TheorySets(context::Context* c,
-               context::UserContext* u,
-               OutputChannel& out,
-               Valuation valuation,
-               const LogicInfo& logicInfo);
+  TheorySets(context::Context* c, context::UserContext* u, OutputChannel& out,
+             Valuation valuation, const LogicInfo& logicInfo,
+             SmtGlobals* globals);
 
   ~TheorySets();
 
diff --git a/src/theory/sets/theory_sets_private.cpp b/src/theory/sets/theory_sets_private.cpp
index f200397bc..0c3171065 100644
--- a/src/theory/sets/theory_sets_private.cpp
+++ b/src/theory/sets/theory_sets_private.cpp
@@ -19,12 +19,12 @@
 #include <boost/foreach.hpp>
 
 #include "expr/emptyset.h"
-#include "expr/result.h"
 #include "options/sets_options.h"
 #include "theory/sets/expr_patterns.h" // ONLY included here
 #include "theory/sets/scrutinize.h"
 #include "theory/sets/theory_sets.h"
 #include "theory/theory_model.h"
+#include "util/result.h"
 
 using namespace std;
 using namespace CVC4::expr::pattern;