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

4 files changed, 10 insertions, 6 deletions

diff --git a/contrib/alttheoryskel/theory_DIR.cpp b/contrib/alttheoryskel/theory_DIR.cpp
index ce29fd34d..3f89abbab 100644
--- a/contrib/alttheoryskel/theory_DIR.cpp
+++ b/contrib/alttheoryskel/theory_DIR.cpp
@@ -11,8 +11,9 @@ Theory$camel::Theory$camel(context::Context* c,
                            context::UserContext* u,
                            OutputChannel& out,
                            Valuation valuation,
-                           const LogicInfo& logicInfo) :
-  Theory(THEORY_$alt_id, c, u, out, valuation, logicInfo) {
+                           const LogicInfo& logicInfo,
+                           SmtGlobals* globals) :
+    Theory(THEORY_$alt_id, c, u, out, valuation, logicInfo, globals) {
 }/* Theory$camel::Theory$camel() */
 
 void Theory$camel::check(Effort level) {
diff --git a/contrib/alttheoryskel/theory_DIR.h b/contrib/alttheoryskel/theory_DIR.h
index d8e652b7c..a26d76ad5 100644
--- a/contrib/alttheoryskel/theory_DIR.h
+++ b/contrib/alttheoryskel/theory_DIR.h
@@ -17,7 +17,8 @@ public:
                context::UserContext* u,
                OutputChannel& out,
                Valuation valuation,
-               const LogicInfo& logicInfo);
+               const LogicInfo& logicInfo,
+               SmtGlobals* globals);
 
   void check(Effort);
 
diff --git a/contrib/theoryskel/theory_DIR.cpp b/contrib/theoryskel/theory_DIR.cpp
index 2130b21f5..2b48114af 100644
--- a/contrib/theoryskel/theory_DIR.cpp
+++ b/contrib/theoryskel/theory_DIR.cpp
@@ -11,8 +11,9 @@ Theory$camel::Theory$camel(context::Context* c,
                            context::UserContext* u,
                            OutputChannel& out,
                            Valuation valuation,
-                           const LogicInfo& logicInfo) :
-  Theory(THEORY_$id, c, u, out, valuation, logicInfo) {
+                           const LogicInfo& logicInfo,
+                           SmtGlobals* globals) :
+    Theory(THEORY_$id, c, u, out, valuation, logicInfo, globals) {
 }/* Theory$camel::Theory$camel() */
 
 void Theory$camel::check(Effort level) {
diff --git a/contrib/theoryskel/theory_DIR.h b/contrib/theoryskel/theory_DIR.h
index d8e652b7c..a26d76ad5 100644
--- a/contrib/theoryskel/theory_DIR.h
+++ b/contrib/theoryskel/theory_DIR.h
@@ -17,7 +17,8 @@ public:
                context::UserContext* u,
                OutputChannel& out,
                Valuation valuation,
-               const LogicInfo& logicInfo);
+               const LogicInfo& logicInfo,
+               SmtGlobals* globals);
 
   void check(Effort);