From fef0f8190fc7e5f3b88b33e7574b7df1e629e80f Mon Sep 17 00:00:00 2001 From: Morgan Deters Date: Thu, 5 May 2011 22:23:50 +0000 Subject: Merge from nonclausal-simplification-v2 branch: * Preprocessing-time, non-clausal, Boolean simplification round to support "quasi-non-linear rewrites" as discussed at last few meetings. * --simplification=none is the default for now, but we'll probably change that to --simplification=incremental. --simplification=batch is also a possibility. See --simplification=help for details. * RecursionBreaker now uses a hash set for the seen trail. * Fixes to TLS stuff to support that. * Fixes to theory and SmtEngine documentation. * Fixes to stream indentation. * Other miscellaneous stuff. --- src/parser/cvc/Cvc.g | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/parser') diff --git a/src/parser/cvc/Cvc.g b/src/parser/cvc/Cvc.g index fce785cc7..b3c253dab 100644 --- a/src/parser/cvc/Cvc.g +++ b/src/parser/cvc/Cvc.g @@ -676,7 +676,7 @@ mainCommand[CVC4::Command*& cmd] ) | TRANSFORM_TOK formula[f] - { UNSUPPORTED("TRANSFORM command"); } + { cmd = new SimplifyCommand(f); } | PRINT_TOK formula[f] { UNSUPPORTED("PRINT command"); } @@ -1428,6 +1428,9 @@ postfixTerm[CVC4::Expr& f] } /* record / tuple select */ + // FIXME - clash in lexer between tuple-select and real; can + // resolve with syntactic predicate in ANTLR 3.3, but broken in + // 3.2 ? /*| DOT ( identifier[id,CHECK_NONE,SYM_VARIABLE] { UNSUPPORTED("record select not implemented yet"); -- cgit v1.2.3