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

1 files changed, 2 insertions, 2 deletions

diff --git a/src/smt/smt_options_handler.h b/src/smt/smt_options_handler.h
index c4d27a722..f8e2ac155 100644
--- a/src/smt/smt_options_handler.h
+++ b/src/smt/smt_options_handler.h
@@ -124,7 +124,6 @@ public:
   virtual void setRegularOutputChannel(std::string option, std::string optarg);
   virtual void setDiagnosticOutputChannel(std::string option, std::string optarg);
   virtual std::string checkReplayFilename(std::string option, std::string optarg);
-  virtual std::ostream* checkReplayLogFilename(std::string option, std::string optarg);
   virtual void statsEnabledBuild(std::string option, bool value) throw(OptionException);
   virtual unsigned long tlimitHandler(std::string option, std::string optarg) throw(OptionException);
   virtual unsigned long tlimitPerHandler(std::string option, std::string optarg) throw(OptionException);
@@ -152,13 +151,14 @@ public:
   virtual void addDebugTag(std::string option, std::string optarg);
   virtual void setPrintSuccess(std::string option, bool value);
 
+  static std::string __cvc4_errno_failreason();
+
 private:
   SmtEngine* d_smtEngine;
 
   /* Helper utilities */
   static std::string suggestTags(char const* const* validTags, std::string inputTag,
                                  char const* const* additionalTags = NULL);
-  static std::string __cvc4_errno_failreason();
 
   /* Help strings */
   static const std::string s_bitblastingModeHelp;