diff options
| author | Morgan Deters <mdeters@gmail.com> | 2012-03-01 14:48:04 +0000 |
|---|---|---|
| committer | Morgan Deters <mdeters@gmail.com> | 2012-03-01 14:48:04 +0000 |
| commit | 45a138c326da72890bf889a3670aad503ef4aa1e (patch) | |
| tree | fa0c9a8497d0b33f78a9f19212152a61392825cc /src/expr/command.cpp | |
| parent | 8c0b2d6db32103268f84d89c0d0545c7eb504069 (diff) | |
Partial merge from kind-backend branch, including Minisat and CNF work to
support incrementality.
Some clean-up work will likely follow, but the CNF/Minisat stuff should be
left pretty much untouched.
Expected performance change negligible; slightly better on memory:
http://church.cims.nyu.edu/regress-results/compare_jobs.php?job_id=3705&reference_id=3697&mode=&category=&p=5
Note that there are crashes, but that these are exhibited in the nightly
regression run too!
Diffstat (limited to 'src/expr/command.cpp')
| -rw-r--r-- | src/expr/command.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/expr/command.cpp b/src/expr/command.cpp index 8d089901b..3dac28e11 100644 --- a/src/expr/command.cpp +++ b/src/expr/command.cpp @@ -494,10 +494,14 @@ Expr DefineFunctionCommand::getFormula() const throw() { void DefineFunctionCommand::invoke(SmtEngine* smtEngine) throw() { //Dump("declarations") << *this << endl; -- done by SmtEngine - if(!d_func.isNull()) { - smtEngine->defineFunction(d_func, d_formals, d_formula); + try { + if(!d_func.isNull()) { + smtEngine->defineFunction(d_func, d_formals, d_formula); + } + d_commandStatus = CommandSuccess::instance(); + } catch(exception& e) { + d_commandStatus = new CommandFailure(e.what()); } - d_commandStatus = CommandSuccess::instance(); } Command* DefineFunctionCommand::exportTo(ExprManager* exprManager, ExprManagerMapCollection& variableMap) { |