Removed parser_temp.h. Adapted the code to use SMTParser directly.

git-svn-id: https://llvm.org/svn/llvm-project/klee/trunk@73215 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 15 insertions, 5 deletions

diff --git a/lib/SMT/SMTParser.h b/lib/SMT/SMTParser.h
index 5abbee7b..35a0b00e 100644
--- a/lib/SMT/SMTParser.h
+++ b/lib/SMT/SMTParser.h
@@ -11,7 +11,6 @@
 #ifndef SMT_PARSER_H
 #define SMT_PARSER_H
 
-#include "parser_temp.h"
 #include "expr/Parser.h"
 
 #include <cassert>
@@ -23,12 +22,21 @@ namespace klee {
 namespace expr {
 
 class SMTParser : public klee::expr::Parser {
- private:
-  std::string fname;
-  void *buf;
+  private:
+    void *buf;
 
  public:
-  SMTParser(const std::string filename) : fname(filename) {}
+  /* For interacting w/ the actual parser, should make this nicer */
+  static SMTParser* parserTemp;
+  std::string fileName;
+  std::istream* is;
+  int lineNum;
+  bool done;
+  klee::expr::ExprHandle expr;
+  int bvSize;
+  bool queryParsed;
+    
+  SMTParser(const std::string filename);
   
   virtual klee::expr::Decl *ParseTopLevelDecl();
   
@@ -39,6 +47,8 @@ class SMTParser : public klee::expr::Parser {
   virtual ~SMTParser() {}
   
   void Init(void);
+
+  int Error(const std::string& s);
 };
 
 }