diff options
Diffstat (limited to 'examples')
-rw-r--r-- | examples/hashsmt/sha1smt.cpp | 6 | ||||
-rw-r--r-- | examples/hashsmt/word.cpp | 2 | ||||
-rw-r--r-- | examples/hashsmt/word.h | 2 | ||||
-rw-r--r-- | examples/nra-translate/normalize.cpp | 2 | ||||
-rw-r--r-- | examples/nra-translate/smt2info.cpp | 2 | ||||
-rw-r--r-- | examples/nra-translate/smt2todreal.cpp | 2 | ||||
-rw-r--r-- | examples/nra-translate/smt2toisat.cpp | 8 | ||||
-rw-r--r-- | examples/nra-translate/smt2tomathematica.cpp | 8 | ||||
-rw-r--r-- | examples/nra-translate/smt2toqepcad.cpp | 8 | ||||
-rw-r--r-- | examples/nra-translate/smt2toredlog.cpp | 8 | ||||
-rw-r--r-- | examples/simple_vc_cxx.cpp | 6 |
11 files changed, 27 insertions, 27 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) { diff --git a/examples/nra-translate/normalize.cpp b/examples/nra-translate/normalize.cpp index ac5780439..d38da7616 100644 --- a/examples/nra-translate/normalize.cpp +++ b/examples/nra-translate/normalize.cpp @@ -40,7 +40,7 @@ int main(int argc, char* argv[]) SmtEngine engine(&exprManager); // Variables and assertions - vector<BoolExpr> assertions; + vector<Expr> assertions; Command* cmd; while ((cmd = parser->nextCommand())) { diff --git a/examples/nra-translate/smt2info.cpp b/examples/nra-translate/smt2info.cpp index b14f8fa8f..0ccf9d669 100644 --- a/examples/nra-translate/smt2info.cpp +++ b/examples/nra-translate/smt2info.cpp @@ -72,7 +72,7 @@ int main(int argc, char* argv[]) vector<string> variables; vector<string> info_tags; vector<string> info_data; - vector<BoolExpr> assertions; + vector<Expr> assertions; Command* cmd; while ((cmd = parser->nextCommand())) { diff --git a/examples/nra-translate/smt2todreal.cpp b/examples/nra-translate/smt2todreal.cpp index 8bdb27181..6fcf5c565 100644 --- a/examples/nra-translate/smt2todreal.cpp +++ b/examples/nra-translate/smt2todreal.cpp @@ -42,7 +42,7 @@ int main(int argc, char* argv[]) std::map<Expr, unsigned> variables; vector<string> info_tags; vector<string> info_data; - vector<BoolExpr> assertions; + vector<Expr> assertions; Command* cmd; while ((cmd = parser->nextCommand())) { diff --git a/examples/nra-translate/smt2toisat.cpp b/examples/nra-translate/smt2toisat.cpp index e2b55b4b9..b44339309 100644 --- a/examples/nra-translate/smt2toisat.cpp +++ b/examples/nra-translate/smt2toisat.cpp @@ -23,7 +23,7 @@ void translate_to_isat( const vector<string>& info_tags, const vector<string>& info_data, const map<Expr, unsigned>& variables, - const vector<BoolExpr>& assertions); + const vector<Expr>& assertions); int main(int argc, char* argv[]) { @@ -47,7 +47,7 @@ int main(int argc, char* argv[]) std::map<Expr, unsigned> variables; vector<string> info_tags; vector<string> info_data; - vector<BoolExpr> assertions; + vector<Expr> assertions; Command* cmd; while ((cmd = parser->nextCommand())) { @@ -148,7 +148,7 @@ void translate_to_isat_term(const map<Expr, unsigned>& variables, const Expr& te } } -void translate_to_isat(const map<Expr, unsigned>& variables, const BoolExpr& assertion) { +void translate_to_isat(const map<Expr, unsigned>& variables, const Expr& assertion) { bool first; unsigned n = assertion.getNumChildren(); @@ -260,7 +260,7 @@ void translate_to_isat( const vector<string>& info_tags, const vector<string>& info_data, const std::map<Expr, unsigned>& variables, - const vector<BoolExpr>& assertions) + const vector<Expr>& assertions) { bool first; diff --git a/examples/nra-translate/smt2tomathematica.cpp b/examples/nra-translate/smt2tomathematica.cpp index 9da21b69b..bfee27310 100644 --- a/examples/nra-translate/smt2tomathematica.cpp +++ b/examples/nra-translate/smt2tomathematica.cpp @@ -22,7 +22,7 @@ void translate_to_mathematica( const vector<string>& info_tags, const vector<string>& info_data, const map<Expr, unsigned>& variables, - const vector<BoolExpr>& assertions); + const vector<Expr>& assertions); int main(int argc, char* argv[]) { @@ -43,7 +43,7 @@ int main(int argc, char* argv[]) std::map<Expr, unsigned> variables; vector<string> info_tags; vector<string> info_data; - vector<BoolExpr> assertions; + vector<Expr> assertions; Command* cmd; while ((cmd = parser->nextCommand())) { @@ -150,7 +150,7 @@ void translate_to_mathematica_term(const map<Expr, unsigned>& variables, const E } } -void translate_to_mathematica(const map<Expr, unsigned>& variables, const BoolExpr& assertion) { +void translate_to_mathematica(const map<Expr, unsigned>& variables, const Expr& assertion) { bool first; unsigned n = assertion.getNumChildren(); @@ -255,7 +255,7 @@ void translate_to_mathematica( const vector<string>& info_tags, const vector<string>& info_data, const std::map<Expr, unsigned>& variables, - const vector<BoolExpr>& assertions) + const vector<Expr>& assertions) { bool first; diff --git a/examples/nra-translate/smt2toqepcad.cpp b/examples/nra-translate/smt2toqepcad.cpp index bed9b42ea..fc43c4c7b 100644 --- a/examples/nra-translate/smt2toqepcad.cpp +++ b/examples/nra-translate/smt2toqepcad.cpp @@ -22,7 +22,7 @@ void translate_to_qepcad( const vector<string>& info_tags, const vector<string>& info_data, const map<Expr, unsigned>& variables, - const vector<BoolExpr>& assertions); + const vector<Expr>& assertions); int main(int argc, char* argv[]) { @@ -44,7 +44,7 @@ int main(int argc, char* argv[]) std::map<Expr, unsigned> variables; vector<string> info_tags; vector<string> info_data; - vector<BoolExpr> assertions; + vector<Expr> assertions; Command* cmd; while ((cmd = parser->nextCommand())) { @@ -152,7 +152,7 @@ void translate_to_qepcad_term(const std::map<Expr, unsigned>& variables, const E } } -void translate_to_qepcad(const std::map<Expr, unsigned>& variables, const BoolExpr& assertion) { +void translate_to_qepcad(const std::map<Expr, unsigned>& variables, const Expr& assertion) { bool first; unsigned n = assertion.getNumChildren(); @@ -251,7 +251,7 @@ void translate_to_qepcad( const vector<string>& info_tags, const vector<string>& info_data, const std::map<Expr, unsigned>& variables, - const vector<BoolExpr>& assertions) + const vector<Expr>& assertions) { bool first; diff --git a/examples/nra-translate/smt2toredlog.cpp b/examples/nra-translate/smt2toredlog.cpp index da34ca4da..b2717c157 100644 --- a/examples/nra-translate/smt2toredlog.cpp +++ b/examples/nra-translate/smt2toredlog.cpp @@ -24,7 +24,7 @@ void translate_to_redlog( const vector<string>& info_tags, const vector<string>& info_data, const map<Expr, unsigned>& variables, - const vector<BoolExpr>& assertions); + const vector<Expr>& assertions); int main(int argc, char* argv[]) { @@ -50,7 +50,7 @@ int main(int argc, char* argv[]) std::map<Expr, unsigned> variables; vector<string> info_tags; vector<string> info_data; - vector<BoolExpr> assertions; + vector<Expr> assertions; Command* cmd; while ((cmd = parser->nextCommand())) { @@ -155,7 +155,7 @@ void translate_to_redlog_term(const map<Expr, unsigned>& variables, const Expr& } } -void translate_to_redlog(const map<Expr, unsigned>& variables, const BoolExpr& assertion) { +void translate_to_redlog(const map<Expr, unsigned>& variables, const Expr& assertion) { bool first; unsigned n = assertion.getNumChildren(); @@ -269,7 +269,7 @@ void translate_to_redlog( const vector<string>& info_tags, const vector<string>& info_data, const std::map<Expr, unsigned>& variables, - const vector<BoolExpr>& assertions) + const vector<Expr>& assertions) { bool first; diff --git a/examples/simple_vc_cxx.cpp b/examples/simple_vc_cxx.cpp index 557199e75..92714ebc7 100644 --- a/examples/simple_vc_cxx.cpp +++ b/examples/simple_vc_cxx.cpp @@ -49,9 +49,9 @@ int main() { Expr three = em.mkConst(Rational(3)); Expr twox_plus_y_geq_3 = em.mkExpr(kind::GEQ, twox_plus_y, three); - BoolExpr formula = - BoolExpr(em.mkExpr(kind::AND, x_positive, y_positive)). - impExpr(BoolExpr(twox_plus_y_geq_3)); + Expr formula = + em.mkExpr(kind::AND, x_positive, y_positive). + impExpr(twox_plus_y_geq_3); cout << "Checking validity of formula " << formula << " with CVC4." << endl; cout << "CVC4 should report VALID." << endl; |