Adding ParserBuilder, reducing visibility of Parser and Input constructors

Adding Smt2 subclass of Parser
Checking for multiple calls to set-logic in SMT v2

1 files changed, 6 insertions, 5 deletions

diff --git a/src/parser/input.h b/src/parser/input.h
index 114880bb0..ccae2d84b 100644
--- a/src/parser/input.h
+++ b/src/parser/input.h
@@ -75,6 +75,7 @@ class Parser;
  */
 class CVC4_PUBLIC Input {
   friend class Parser; // for parseError, parseCommand, parseExpr
+  friend class ParserBuilder;
 
   /** The input stream. */
   InputStream *d_inputStream;
@@ -85,11 +86,6 @@ class CVC4_PUBLIC Input {
   Input(const Input& input) { Unimplemented("Copy constructor for Input."); }
   Input& operator=(const Input& input) { Unimplemented("operator= for Input."); }
 
-public:
-
-  /** Destructor. Frees the token stream and closes the input. */
-  virtual ~Input();
-
   /** Create an input for the given file.
     *
     * @param lang the input language
@@ -116,6 +112,11 @@ public:
   static Input* newStringInput(InputLanguage lang, const std::string& input, const std::string& name)
     throw (InputStreamException);
 
+public:
+
+  /** Destructor. Frees the token stream and closes the input. */
+  virtual ~Input();
+
 protected:
 
   /** Create an input.