From 76ce7fc9917af0a106550ac501545f7941d17744 Mon Sep 17 00:00:00 2001 From: Daniel Dunbar Date: Tue, 9 Jun 2009 00:58:29 +0000 Subject: Get rid of Parser language member, we only use SMTLIB. git-svn-id: https://llvm.org/svn/llvm-project/klee/trunk@73108 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/SMT/parser.cpp | 42 ++++++++++-------------------------------- lib/SMT/parser.h | 5 ++--- 2 files changed, 12 insertions(+), 35 deletions(-) (limited to 'lib/SMT') diff --git a/lib/SMT/parser.cpp b/lib/SMT/parser.cpp index 8981179e..fd694536 100644 --- a/lib/SMT/parser.cpp +++ b/lib/SMT/parser.cpp @@ -68,10 +68,8 @@ namespace CVC3 { }; // Constructors - Parser::Parser(InputLanguage lang, bool interactive, - const std::string& fileName) + Parser::Parser(bool interactive, const std::string& fileName) : d_data(new ParserData) { - d_data->lang = lang; if(fileName == "") { // Use std::cin d_data->useName = false; @@ -91,9 +89,8 @@ namespace CVC3 { initParser(); } - Parser::Parser(InputLanguage lang, std::istream& is, bool interactive) + Parser::Parser(std::istream& is, bool interactive) : d_data(new ParserData) { - d_data->lang = lang; d_data->useName = false; d_data->temp.is = &is; d_data->temp.fileName = "stdin"; @@ -111,23 +108,13 @@ namespace CVC3 { // Initialize the actual parser void Parser::initParser() { - switch(d_data->lang) { - case SMTLIB_LANG: - d_data->buffer = smtlib_createBuffer(smtlib_bufSize()); - d_data->temp.lineNum = 1; - break; - default: FatalAssert(false, "Bad input language specified"); exit(1); - } + d_data->buffer = smtlib_createBuffer(smtlib_bufSize()); + d_data->temp.lineNum = 1; } // Clean up the parser's internal data structures void Parser::deleteParser() { - switch(d_data->lang) { - case SMTLIB_LANG: - smtlib_deleteBuffer(d_data->buffer); - break; - default: FatalAssert(false, "Bad input language specified"); - } + smtlib_deleteBuffer(d_data->buffer); } @@ -139,20 +126,11 @@ namespace CVC3 { // Switch to our buffer, in case there are multiple instances of // the parser running try { - switch(d_data->lang) { - case SMTLIB_LANG: - smtlib_switchToBuffer(d_data->buffer); - smtlib_setInteractive(d_data->temp.interactive); - smtlibparse(); - // Reset the prompt to the main one - d_data->temp.setPrompt1(); - break; - default: { - ostringstream ss; - ss << "Bad input language specified: " << d_data->lang; - DebugAssert(false, ss.str().c_str()); exit(1); - } - } + smtlib_switchToBuffer(d_data->buffer); + smtlib_setInteractive(d_data->temp.interactive); + smtlibparse(); + // Reset the prompt to the main one + d_data->temp.setPrompt1(); } catch(Exception* e) { cerr << d_data->temp.fileName << ":" << d_data->temp.lineNum << ": " << e << endl; diff --git a/lib/SMT/parser.h b/lib/SMT/parser.h index 4e7f05ba..04c2f73b 100644 --- a/lib/SMT/parser.h +++ b/lib/SMT/parser.h @@ -46,11 +46,10 @@ namespace CVC3 { void deleteParser(); public: // Constructors - Parser(InputLanguage lang, - // The 'interactive' flag is ignored when fileName != "" + Parser(// The 'interactive' flag is ignored when fileName != "" bool interactive = true, const std::string& fileName = ""); - Parser(InputLanguage lang, std::istream& is, bool interactive = false); + Parser(std::istream& is, bool interactive = false); // Destructor ~Parser(); // Read the next command. -- cgit 1.4.1