From 129dadba47447148096acd216d61f93e14539cb4 Mon Sep 17 00:00:00 2001 From: Morgan Deters Date: Fri, 5 Oct 2012 22:46:27 +0000 Subject: Bug-related: * ITE removal fixed to be context-dependent (on UserContext). Resolves incrementality bugs 376 and 396 (which had given wrong answers). * some bugfixes for incrementality that Dejan found (fixes bug 394) * fix for bug in SmtEngine::getValue() where definitions weren't respected (partially resolves bug 411, but get-model is still broken). * change status of microwave21.ec.minimized.smt2 (it's actually unsat, but was labeled sat); re-enable it for "make regress" Also: * --check-model doesn't fail if quantified assertions don't simplify away. * fix some examples, and the Java system test, for the disappearance of the BoolExpr class * add copy constructor to array type enumerator (the type enumerator framework requires copy ctors, and the automatically-generated copy ctor was copying pointers that were then deleted, leaving dangling pointers in the copy and causing segfaults) * --dump=assertions now implies --dump=skolems * --dump=assertions:pre- and --dump=assertions:post- now allow you to dump before/after a particular preprocessing pass. E.g., --dump=assertions:pre-ite-removal or --dump=assertions:post-static-learning. "--dump=assertions" by itself is after all preprocessing, just before CNF conversion. * minor fixes to dumping output * include Model in language bindings Minor refactoring/misc: * fix compiler warning in src/theory/model.cpp * remove unnecessary SmtEngine::printModel(). * mkoptions script doesn't give progress output if stdout isn't a terminal (e.g., if it's written to a log, or piped through less(1), or whatever). * add some type enumerator unit tests * de-emphasize --parse-only and --preprocess-only (they aren't really "common" options) * fix some exception throw() specifications in SmtEngine * minor documentation clarifications --- src/parser/parser.cpp | 2 +- src/parser/smt2/Smt2.g | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/parser') diff --git a/src/parser/parser.cpp b/src/parser/parser.cpp index 7b58ba4f9..3198c8b64 100644 --- a/src/parser/parser.cpp +++ b/src/parser/parser.cpp @@ -156,7 +156,7 @@ Parser::mkBoundVar(const std::string& name, const Type& type) { Expr Parser::mkFunction(const std::string& name, const Type& type, - bool levelZero) { + bool levelZero) { Debug("parser") << "mkVar(" << name << ", " << type << ")" << std::endl; Expr expr = d_exprManager->mkVar(name, type); defineFunction(name, expr, levelZero); diff --git a/src/parser/smt2/Smt2.g b/src/parser/smt2/Smt2.g index 37b926c34..1bfba3eb4 100644 --- a/src/parser/smt2/Smt2.g +++ b/src/parser/smt2/Smt2.g @@ -634,7 +634,7 @@ simpleSymbolicExpr[CVC4::SExpr& sexpr] | str[s] { sexpr = SExpr(s); } | symbol[s,CHECK_NONE,SYM_SORT] - { sexpr = SExpr(s); } + { sexpr = SExpr(SExpr::Keyword(s)); } | builtinOp[k] { std::stringstream ss; ss << Expr::setlanguage(CVC4::language::output::LANG_SMTLIB_V2) << EXPR_MANAGER->mkConst(k); -- cgit v1.2.3