diff options
| author | Morgan Deters <mdeters@gmail.com> | 2012-10-08 22:51:08 +0000 |
|---|---|---|
| committer | Morgan Deters <mdeters@gmail.com> | 2012-10-08 22:51:08 +0000 |
| commit | e256e63588a867b9ea82e03cfc684c2ea2ca1738 (patch) | |
| tree | 97583e7952f18934b2751574032b0a48ff8b866c /src/parser/cvc/Cvc.g | |
| parent | ffda058e93ac699b1649a87f15418f645bb13312 (diff) | |
* Models' SubstitutionMaps are now attached to the user context
(rather than SAT context)
* Enable part of CVC3 system test (resolves bug 375)
* Fix infinite recursion in beta reduction code (resolves bug 417)
* Some model-building assertions have been added
* Other minor changes
(this commit was certified error- and warning-free by the test-and-commit script.)
Diffstat (limited to 'src/parser/cvc/Cvc.g')
| -rw-r--r-- | src/parser/cvc/Cvc.g | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/parser/cvc/Cvc.g b/src/parser/cvc/Cvc.g index b496aa91c..22459037d 100644 --- a/src/parser/cvc/Cvc.g +++ b/src/parser/cvc/Cvc.g @@ -619,18 +619,22 @@ mainCommand[CVC4::Command*& cmd] | QUERY_TOK formula[f] { cmd = new QueryCommand(f); } | CHECKSAT_TOK formula[f] { cmd = new CheckSatCommand(f); } - | CHECKSAT_TOK { cmd = new CheckSatCommand(MK_CONST(bool(true))); } + | CHECKSAT_TOK { cmd = new CheckSatCommand(); } /* options */ | OPTION_TOK ( str[s] | IDENTIFIER { s = AntlrInput::tokenText($IDENTIFIER); } ) - symbolicExpr[sexpr] - { if(s == "logic") { - cmd = new SetBenchmarkLogicCommand(sexpr.getValue()); - } else { - cmd = new SetOptionCommand(s, sexpr); + ( symbolicExpr[sexpr] + { if(s == "logic") { + cmd = new SetBenchmarkLogicCommand(sexpr.getValue()); + } else { + cmd = new SetOptionCommand(s, sexpr); + } } - } + | TRUE_TOK { cmd = new SetOptionCommand(s, SExpr("true")); } + | FALSE_TOK { cmd = new SetOptionCommand(s, SExpr("false")); } + | { cmd = new SetOptionCommand(s, SExpr("true")); } + ) /* push / pop */ | PUSH_TOK ( k=numeral { cmd = REPEAT_COMMAND(k, PushCommand()); } |