diff options
| author | Morgan Deters <mdeters@cs.nyu.edu> | 2013-12-04 16:04:14 -0500 |
|---|---|---|
| committer | Morgan Deters <mdeters@cs.nyu.edu> | 2013-12-04 17:13:47 -0500 |
| commit | 863dd51bd8b5d72d41006a02950de28fc1666f21 (patch) | |
| tree | 064a73d8a5bf75455010e7cacae126fd057c2c91 /src/smt | |
| parent | 5e52f04e3deca668df1637ee9a11ecf0deb3bf27 (diff) | |
Don't put define-funs in model output; bug 411 testcase no longer relevant.
Diffstat (limited to 'src/smt')
| -rw-r--r-- | src/smt/smt_engine.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/smt/smt_engine.cpp b/src/smt/smt_engine.cpp index 07b30a87e..eaaa201c3 100644 --- a/src/smt/smt_engine.cpp +++ b/src/smt/smt_engine.cpp @@ -1306,7 +1306,7 @@ void SmtEngine::defineFunction(Expr func, ss << Expr::setlanguage(Expr::setlanguage::getLanguage(Dump.getStream())) << func; DefineFunctionCommand c(ss.str(), func, formals, formula); - addToModelCommandAndDump(c, ExprManager::VAR_FLAG_NONE, true, "declarations"); + addToModelCommandAndDump(c, ExprManager::VAR_FLAG_DEFINED, true, "declarations"); SmtScope smts(this); @@ -3609,7 +3609,9 @@ void SmtEngine::addToModelCommandAndDump(const Command& c, uint32_t flags, bool // decouple SmtEngine and ExprManager if the user does a few // ExprManager::mkSort() before SmtEngine::setOption("produce-models") // and expects to find their cardinalities in the model. - if(/* userVisible && */ (!d_fullyInited || options::produceModels())) { + if(/* userVisible && */ + (!d_fullyInited || options::produceModels()) && + (flags & ExprManager::VAR_FLAG_DEFINED) == 0) { doPendingPops(); if(flags & ExprManager::VAR_FLAG_GLOBAL) { d_modelGlobalCommands.push_back(c.clone()); |