diff options
| author | Tim King <taking@cs.nyu.edu> | 2017-11-07 10:35:42 -0800 |
|---|---|---|
| committer | Andrew Reynolds <andrew.j.reynolds@gmail.com> | 2017-11-07 12:35:42 -0600 |
| commit | a2746472fb95b523dc838376c84467751f6ef764 (patch) | |
| tree | c197a2112b8dbefa59deb9f2da2d5911d57bad2d /src/parser | |
| parent | d53203e51b75ac9ee94cbde611b21a56f1d58c37 (diff) | |
Removing an unused member from Tptp. Initializing members of Tptp. (#1326)
* Removing an unused member from Tptp. Initializing members of Tptp.
* Removing delcaration for myPopCharStream.
Diffstat (limited to 'src/parser')
| -rw-r--r-- | src/parser/tptp/tptp.cpp | 24 | ||||
| -rw-r--r-- | src/parser/tptp/tptp.h | 3 |
2 files changed, 5 insertions, 22 deletions
diff --git a/src/parser/tptp/tptp.cpp b/src/parser/tptp/tptp.cpp index e49315609..af675dec1 100644 --- a/src/parser/tptp/tptp.cpp +++ b/src/parser/tptp/tptp.cpp @@ -29,8 +29,11 @@ namespace CVC4 { namespace parser { -Tptp::Tptp(ExprManager* exprManager, Input* input, bool strictMode, bool parseOnly) : - Parser(exprManager,input,strictMode,parseOnly) { +Tptp::Tptp(ExprManager* exprManager, Input* input, bool strictMode, + bool parseOnly) + : Parser(exprManager, input, strictMode, parseOnly), + d_cnf(false), + d_fof(false) { addTheory(Tptp::THEORY_CORE); /* Try to find TPTP dir */ @@ -135,14 +138,6 @@ bool newInputStream(std::string fileName, pANTLR3_LEXER lexer, std::vector< pANT return true; } -/* overridden popCharStream for the lexer - necessary if we had symbol - * filtering in file inclusion. -void Tptp::myPopCharStream(pANTLR3_LEXER lexer) { - ((Tptp*)lexer->super)->d_oldPopCharStream(lexer); - ((Tptp*)lexer->super)->popScope(); -} -*/ - void Tptp::includeFile(std::string fileName) { // security for online version if(!canIncludeFile()) { @@ -153,15 +148,6 @@ void Tptp::includeFile(std::string fileName) { AntlrInput * ai = static_cast<AntlrInput *>(getInput()); pANTLR3_LEXER lexer = ai->getAntlr3Lexer(); - // set up popCharStream - would be necessary for handling symbol - // filtering in inclusions - /* - if(d_oldPopCharStream == NULL) { - d_oldPopCharStream = lexer->popCharStream; - lexer->popCharStream = myPopCharStream; - } - */ - // push the inclusion scope; will be popped by our special popCharStream // would be necessary for handling symbol filtering in inclusions //pushScope(); diff --git a/src/parser/tptp/tptp.h b/src/parser/tptp/tptp.h index 1cc9c2d7f..c955d152e 100644 --- a/src/parser/tptp/tptp.h +++ b/src/parser/tptp/tptp.h @@ -146,9 +146,6 @@ class Tptp : public Parser { bool d_cnf; // in a cnf formula bool d_fof; // in an fof formula - - static void myPopCharStream(pANTLR3_LEXER lexer); - void (*d_oldPopCharStream)(pANTLR3_LEXER); };/* class Tptp */ |