summaryrefslogtreecommitdiff
path: root/examples/hashsmt
diff options
context:
space:
mode:
authorDejan Jovanović <dejan.jovanovic@gmail.com>2012-10-05 22:07:16 +0000
committerDejan Jovanović <dejan.jovanovic@gmail.com>2012-10-05 22:07:16 +0000
commit4c87c0794b7e954afd090cfbf441caa0b09c3ef5 (patch)
treed0cfcf60cbf9600c52dcb728744802ad27a5c3e1 /examples/hashsmt
parent7a9899f394476e53b7f759e698c7e10c8388fd57 (diff)
BoolExpr removed and replaced with Expr
Diffstat (limited to 'examples/hashsmt')
-rw-r--r--examples/hashsmt/sha1smt.cpp6
-rw-r--r--examples/hashsmt/word.cpp2
-rw-r--r--examples/hashsmt/word.h2
3 files changed, 5 insertions, 5 deletions
diff --git a/examples/hashsmt/sha1smt.cpp b/examples/hashsmt/sha1smt.cpp
index 3a33a4bc2..97b79a7d0 100644
--- a/examples/hashsmt/sha1smt.cpp
+++ b/examples/hashsmt/sha1smt.cpp
@@ -46,7 +46,7 @@ int main(int argc, char* argv[]) {
output << DeclareFunctionCommand(ss.str(), cvc4input[i].getExpr(), cvc4input[i].getExpr().getType()) << endl;
// Ouput the solution also
- BoolExpr solution = (cvc4input[i] == hashsmt::cvc4_uchar8(msg.c_str()[i]));
+ Expr solution = (cvc4input[i] == hashsmt::cvc4_uchar8(msg.c_str()[i]));
output << "; " << AssertCommand(solution) << endl;
}
@@ -65,9 +65,9 @@ int main(int argc, char* argv[]) {
sha1encoder.get_digest(sha1digest);
// Create the assertion
- BoolExpr assertion;
+ Expr assertion;
for (unsigned i = 0; i < 5; ++ i) {
- BoolExpr conjunct = (cvc4digest[i] == hashsmt::cvc4_uint32(sha1digest[i]));
+ Expr conjunct = (cvc4digest[i] == hashsmt::cvc4_uint32(sha1digest[i]));
if (i > 0) {
assertion = assertion.andExpr(conjunct);
} else {
diff --git a/examples/hashsmt/word.cpp b/examples/hashsmt/word.cpp
index d1b8e2fef..c6cb8caf2 100644
--- a/examples/hashsmt/word.cpp
+++ b/examples/hashsmt/word.cpp
@@ -34,7 +34,7 @@ ExprManager* Word::em() {
return s_manager;
}
-BoolExpr Word::operator == (const Word& b) const {
+Expr Word::operator == (const Word& b) const {
return em()->mkExpr(kind::EQUAL, d_expr, b.getExpr());
}
diff --git a/examples/hashsmt/word.h b/examples/hashsmt/word.h
index 50fdee0c0..e8d6053c0 100644
--- a/examples/hashsmt/word.h
+++ b/examples/hashsmt/word.h
@@ -61,7 +61,7 @@ public:
}
/** Returns the comparison expression */
- CVC4::BoolExpr operator == (const Word& b) const;
+ CVC4::Expr operator == (const Word& b) const;
};
inline std::ostream& operator << (std::ostream& out, const Word& word) {
generated by cgit on debian on lair
contact matthew@masot.net with questions or feedback