summaryrefslogtreecommitdiff
path: root/src/prop/prop_engine.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/prop/prop_engine.cpp')
-rw-r--r--src/prop/prop_engine.cpp13
1 files changed, 6 insertions, 7 deletions
diff --git a/src/prop/prop_engine.cpp b/src/prop/prop_engine.cpp
index 55d8f7222..8a0cc9f15 100644
--- a/src/prop/prop_engine.cpp
+++ b/src/prop/prop_engine.cpp
@@ -20,7 +20,7 @@
#include <map>
#include <utility>
-#include "base/cvc4_assert.h"
+#include "base/check.h"
#include "base/output.h"
#include "decision/decision_engine.h"
#include "expr/expr.h"
@@ -30,13 +30,12 @@
#include "options/options.h"
#include "options/smt_options.h"
#include "proof/proof_manager.h"
-#include "proof/proof_manager.h"
#include "prop/cnf_stream.h"
#include "prop/sat_solver.h"
#include "prop/sat_solver_factory.h"
#include "prop/theory_proxy.h"
-#include "smt/smt_statistics_registry.h"
#include "smt/command.h"
+#include "smt/smt_statistics_registry.h"
#include "theory/theory_engine.h"
#include "theory/theory_registrar.h"
#include "util/resource_manager.h"
@@ -119,7 +118,7 @@ PropEngine::~PropEngine() {
}
void PropEngine::assertFormula(TNode node) {
- Assert(!d_inCheckSat, "Sat solver in solve()!");
+ Assert(!d_inCheckSat) << "Sat solver in solve()!";
Debug("prop") << "assertFormula(" << node << ")" << endl;
// Assert as non-removable
d_cnfStream->convertAndAssert(node, false, false, RULE_GIVEN);
@@ -170,7 +169,7 @@ void PropEngine::printSatisfyingAssignment(){
}
Result PropEngine::checkSat() {
- Assert(!d_inCheckSat, "Sat solver in solve()!");
+ Assert(!d_inCheckSat) << "Sat solver in solve()!";
Debug("prop") << "PropEngine::checkSat()" << endl;
// Mark that we are in the checkSat
@@ -261,13 +260,13 @@ void PropEngine::ensureLiteral(TNode n) {
}
void PropEngine::push() {
- Assert(!d_inCheckSat, "Sat solver in solve()!");
+ Assert(!d_inCheckSat) << "Sat solver in solve()!";
d_satSolver->push();
Debug("prop") << "push()" << endl;
}
void PropEngine::pop() {
- Assert(!d_inCheckSat, "Sat solver in solve()!");
+ Assert(!d_inCheckSat) << "Sat solver in solve()!";
d_satSolver->pop();
Debug("prop") << "pop()" << endl;
}
generated by cgit on debian on lair
contact matthew@masot.net with questions or feedback