diff options
| author | Andrew Reynolds <andrew.j.reynolds@gmail.com> | 2012-07-12 18:30:15 +0000 |
|---|---|---|
| committer | Andrew Reynolds <andrew.j.reynolds@gmail.com> | 2012-07-12 18:30:15 +0000 |
| commit | 65798541fa437278cde0c759ab70fd9fa4fe9638 (patch) | |
| tree | 27341327b8159e58a5ce6371bede6129bf67beb3 /src/parser/smt2/Smt2.g | |
| parent | 78d8b3ce56a1fd243acb54d2aaaf6d716e3b9788 (diff) | |
merged fmf-devel branch, includes support for SMT2 command get-value and (extended) SMT command get-model. added collectModelInfo and removed getValue from theory interface. merge also includes major updates to finite model finding module (from CASC), added fmf options, some updates to strong solver and quantifiers engine interface. The test recursion_breaker_black currently fails for me on production builds, Morgan is planning to look into this.
Diffstat (limited to 'src/parser/smt2/Smt2.g')
| -rw-r--r-- | src/parser/smt2/Smt2.g | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/parser/smt2/Smt2.g b/src/parser/smt2/Smt2.g index 84d75ceac..577438d37 100644 --- a/src/parser/smt2/Smt2.g +++ b/src/parser/smt2/Smt2.g @@ -240,8 +240,8 @@ command returns [CVC4::Command* cmd = NULL] if( sorts.size() > 0 ) { t = EXPR_MANAGER->mkFunctionType(sorts, t); } - PARSER_STATE->mkVar(name, t); - $cmd = new DeclareFunctionCommand(name, t); } + Expr func = PARSER_STATE->mkVar(name, t); + $cmd = new DeclareFunctionCommand(name, func, t); } | /* function definition */ DEFINE_FUN_TOK { PARSER_STATE->checkThatLogicIsSet(); } symbol[name,CHECK_UNDECLARED,SYM_VARIABLE] @@ -383,6 +383,9 @@ extendedCommand[CVC4::Command*& cmd] LPAREN_TOK ( LPAREN_TOK datatypeDef[dts] RPAREN_TOK )+ RPAREN_TOK { PARSER_STATE->popScope(); cmd = new DatatypeDeclarationCommand(PARSER_STATE->mkMutualDatatypeTypes(dts)); } + | /* get model */ + GET_MODEL_TOK { PARSER_STATE->checkThatLogicIsSet(); } + { cmd = new GetModelCommand; } | ECHO_TOK ( simpleSymbolicExpr[sexpr] { std::stringstream ss; @@ -1063,6 +1066,7 @@ POP_TOK : 'pop'; // extended commands DECLARE_DATATYPES_TOK : 'declare-datatypes'; +GET_MODEL_TOK : 'get-model'; ECHO_TOK : 'echo'; // attributes |