From 3c4935c7c0c6774588af94c82307a960e58a1154 Mon Sep 17 00:00:00 2001 From: Andrew Reynolds Date: Fri, 31 Aug 2012 16:48:20 +0000 Subject: merge from fmf-devel branch. more updates to models: now with collectModelInfo with fullModel argument, most theory-specific implementation out of the model class, model printer relegated to printer classes. Also updates to finite mode finding, modifications to datatypes making them compatible with theory combination, support for theory-specific handling of user attributes, refactoring of uf models --- src/parser/cvc/Cvc.g | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/parser/cvc') diff --git a/src/parser/cvc/Cvc.g b/src/parser/cvc/Cvc.g index 3c4a51ad4..82e27401e 100644 --- a/src/parser/cvc/Cvc.g +++ b/src/parser/cvc/Cvc.g @@ -747,9 +747,9 @@ mainCommand[CVC4::Command*& cmd] { cmd = new GetAssertionsCommand(); } | COUNTEREXAMPLE_TOK - { UNSUPPORTED("COUNTEREXAMPLE command"); } + { cmd = new GetModelCommand; } | COUNTERMODEL_TOK - { UNSUPPORTED("COUNTERMODEL command"); } + { cmd = new GetModelCommand; } | ARITH_VAR_ORDER_TOK LPAREN formula[f] ( COMMA formula[f] )* RPAREN { UNSUPPORTED("ARITH_VAR_ORDER command"); } -- cgit v1.2.3