Adding general support for SMT2 set-info command

1 files changed, 14 insertions, 6 deletions

diff --git a/src/parser/input.cpp b/src/parser/input.cpp
index 3c1747759..9ee167897 100644
--- a/src/parser/input.cpp
+++ b/src/parser/input.cpp
@@ -31,12 +31,16 @@ using namespace CVC4::kind;
 namespace CVC4 {
 namespace parser {
 
+InputStreamException::InputStreamException(const std::string& msg) :
+  Exception(msg) {
+}
+
 const std::string InputStream::getName() const {
   return d_name;
 }
 
-Input::Input(InputStream *inputStream) :
-    d_inputStream( inputStream ) {
+Input::Input(InputStream& inputStream) :
+    d_inputStream( &inputStream ) {
 }
 
 Input::~Input() {
@@ -48,15 +52,19 @@ InputStream *Input::getInputStream() {
 }
 
 Input* Input::newFileInput(InputLanguage lang,
-                           const std::string& filename, bool useMmap) {
+                           const std::string& filename,
+                           bool useMmap)
+  throw (InputStreamException) {
   AntlrInputStream *inputStream = AntlrInputStream::newFileInputStream(filename,useMmap);
-  return AntlrInput::newInput(lang,inputStream);
+  return AntlrInput::newInput(lang,*inputStream);
 }
 
 Input* Input::newStringInput(InputLanguage lang,
-                             const std::string& str, const std::string& name) {
+                             const std::string& str,
+                             const std::string& name)
+  throw (InputStreamException) {
   AntlrInputStream *inputStream = AntlrInputStream::newStringInputStream(str,name);
-  return AntlrInput::newInput(lang,inputStream);
+  return AntlrInput::newInput(lang,*inputStream);
 }
 
 }/* CVC4::parser namespace */