diff options
| author | Morgan Deters <mdeters@gmail.com> | 2011-10-04 14:36:57 +0000 |
|---|---|---|
| committer | Morgan Deters <mdeters@gmail.com> | 2011-10-04 14:36:57 +0000 |
| commit | 01d547ba46a88b1ab98778cd267e6458b3e30713 (patch) | |
| tree | bda8542d464e6b7ae8499707a2e7e49beccc5c7c /src/parser | |
| parent | 070b3f89d4bc9940fb87e86108152144b187c891 (diff) | |
cvc3 compatibility layer; and another libantlr3c v3.4 incompatibility fix
Diffstat (limited to 'src/parser')
| -rw-r--r-- | src/parser/cvc/Cvc.g | 8 | ||||
| -rw-r--r-- | src/parser/parser.i | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/parser/cvc/Cvc.g b/src/parser/cvc/Cvc.g index 955f3a1f4..96c0933d8 100644 --- a/src/parser/cvc/Cvc.g +++ b/src/parser/cvc/Cvc.g @@ -596,10 +596,10 @@ mainCommand[CVC4::Command*& cmd] { cmd = new SetOptionCommand(s, sexpr); } /* push / pop */ - | PUSH_TOK k=numeral? - { cmd = REPEAT_COMMAND(k, PushCommand()); } - | POP_TOK k=numeral? - { cmd = REPEAT_COMMAND(k, PopCommand()); } + | PUSH_TOK ( k=numeral { cmd = REPEAT_COMMAND(k, PushCommand()); } + | { cmd = new PushCommand(); } ) + | POP_TOK ( k=numeral { cmd = REPEAT_COMMAND(k, PopCommand()); } + | { cmd = new PopCommand(); } ) | POPTO_TOK k=numeral? { UNSUPPORTED("POPTO command"); } diff --git a/src/parser/parser.i b/src/parser/parser.i index dd52bfcda..5e10973d4 100644 --- a/src/parser/parser.i +++ b/src/parser/parser.i @@ -12,8 +12,8 @@ namespace CVC4 { class ParserExprStream : public CVC4::ExprStream { Parser* d_parser; public: - ExprStream(Parser* parser) : d_parser(parser) {} - ~ExprStream() { delete d_parser; } + ParserExprStream(Parser* parser) : d_parser(parser) {} + ~ParserExprStream() { delete d_parser; } Expr nextExpr() { return d_parser->nextExpression(); } };/* class Parser::ExprStream */ |