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

2 files changed, 12 insertions, 10 deletions

diff --git a/examples/nra-translate/smt2toisat.cpp b/examples/nra-translate/smt2toisat.cpp
index 8eb46dd2f..076d37077 100644
--- a/examples/nra-translate/smt2toisat.cpp
+++ b/examples/nra-translate/smt2toisat.cpp
@@ -39,20 +39,20 @@ void translate_to_isat(
         string input,
         const vector<string>& info_tags,
         const vector<string>& info_data,
-	const map<Expr, unsigned>& variables, 
+	const map<Expr, unsigned>& variables,
 	const vector<Expr>& assertions);
 
-int main(int argc, char* argv[]) 
+int main(int argc, char* argv[])
 {
 
-  // Get the filename 
+  // Get the filename
   string input(argv[1]);
 
   // Create the expression manager
   Options options;
   options.set(inputLanguage, language::input::LANG_SMTLIB_V2);
   ExprManager exprManager(options);
-  
+
   // Create the parser
   ParserBuilder parserBuilder(&exprManager, input, options);
   Parser* parser = parserBuilder.build();
@@ -310,4 +310,3 @@ void translate_to_isat(
   }
 
 }
-
diff --git a/examples/sets-translate/sets_translate.cpp b/examples/sets-translate/sets_translate.cpp
index aef3843f8..a310a2e6b 100644
--- a/examples/sets-translate/sets_translate.cpp
+++ b/examples/sets-translate/sets_translate.cpp
@@ -250,15 +250,18 @@ public:
 };
 
 
-int main(int argc, char* argv[]) 
+int main(int argc, char* argv[])
 {
 
   try {
 
-    // Get the filename 
+    // Get the filename
     string input;
-    if(argc > 1) input = string(argv[1]);
-    else input = "<stdin>";
+    if(argc > 1){
+      input = string(argv[1]);
+    } else {
+      input = "<stdin>";
+    }
 
     // Create the expression manager
     Options options;
@@ -279,7 +282,7 @@ int main(int argc, char* argv[])
     vector<string> info_tags;
     vector<string> info_data;
     vector<Expr> assertions;
-  
+
     Command* cmd = NULL;
     CommandSequence commandsSequence;
     bool logicisset = false;