diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/smt/smt_engine.cpp | 5 | ||||
| -rw-r--r-- | src/util/configuration.cpp | 4 | ||||
| -rw-r--r-- | src/util/configuration.h | 4 |
3 files changed, 7 insertions, 6 deletions
diff --git a/src/smt/smt_engine.cpp b/src/smt/smt_engine.cpp index 0a5270d83..d63a63ba2 100644 --- a/src/smt/smt_engine.cpp +++ b/src/smt/smt_engine.cpp @@ -2447,7 +2447,7 @@ void SmtEngine::pop() throw(ModalException) { if(!options::incrementalSolving()) { throw ModalException("Cannot pop when not solving incrementally (use --incremental)"); } - if(d_userContext->getLevel() == 0) { + if(d_userLevels.size() == 0) { throw ModalException("Cannot pop beyond the first user frame"); } @@ -2457,7 +2457,8 @@ void SmtEngine::pop() throw(ModalException) { d_needPostsolve = false; } - AlwaysAssert(d_userLevels.size() > 0 && d_userLevels.back() < d_userContext->getLevel()); + AlwaysAssert(d_userContext->getLevel() > 0); + AlwaysAssert(d_userLevels.back() < d_userContext->getLevel()); while (d_userLevels.back() < d_userContext->getLevel()) { internalPop(true); } diff --git a/src/util/configuration.cpp b/src/util/configuration.cpp index 6fe2e2af0..7b7559ce6 100644 --- a/src/util/configuration.cpp +++ b/src/util/configuration.cpp @@ -3,9 +3,9 @@ ** \verbatim ** Original author: mdeters ** Major contributors: none - ** Minor contributors (to current version): acsys, cconway + ** Minor contributors (to current version): lianah, acsys, cconway, dejan, bobot ** This file is part of the CVC4 prototype. - ** Copyright (c) 2009, 2010, 2011 The Analysis of Computer Systems Group (ACSys) + ** Copyright (c) 2009-2012 The Analysis of Computer Systems Group (ACSys) ** Courant Institute of Mathematical Sciences ** New York University ** See the file COPYING in the top-level source directory for licensing diff --git a/src/util/configuration.h b/src/util/configuration.h index b1ef7154d..c43c7c0df 100644 --- a/src/util/configuration.h +++ b/src/util/configuration.h @@ -3,9 +3,9 @@ ** \verbatim ** Original author: mdeters ** Major contributors: none - ** Minor contributors (to current version): acsys + ** Minor contributors (to current version): acsys, lianah, bobot ** This file is part of the CVC4 prototype. - ** Copyright (c) 2009, 2010, 2011 The Analysis of Computer Systems Group (ACSys) + ** Copyright (c) 2009-2012 The Analysis of Computer Systems Group (ACSys) ** Courant Institute of Mathematical Sciences ** New York University ** See the file COPYING in the top-level source directory for licensing |