diff options
author | Morgan Deters <mdeters@gmail.com> | 2012-09-26 22:00:19 +0000 |
---|---|---|
committer | Morgan Deters <mdeters@gmail.com> | 2012-09-26 22:00:19 +0000 |
commit | b06a3d697c1dc57c58498c9e8612d4c21d6395d6 (patch) | |
tree | fbdfd6de8a4534840c6fc2c3f9cfe76c999d18de /src/compat/cvc3_compat.cpp | |
parent | c6d2a808e4981f81e4a638d25582e8542e89b716 (diff) |
Finish off SEXPR kind work.
(this commit was certified error- and warning-free by the test-and-commit script.)
Diffstat (limited to 'src/compat/cvc3_compat.cpp')
-rw-r--r-- | src/compat/cvc3_compat.cpp | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/src/compat/cvc3_compat.cpp b/src/compat/cvc3_compat.cpp index 2c5bc0170..b7c7013d2 100644 --- a/src/compat/cvc3_compat.cpp +++ b/src/compat/cvc3_compat.cpp @@ -1304,47 +1304,38 @@ Expr ValidityChecker::idExpr(const std::string& name) { } Expr ValidityChecker::listExpr(const std::vector<Expr>& kids) { - // list exprs aren't supported by CVC4; make a tuple if two or more - CheckArgument(kids.size() > 0, kids); - return (kids.size() == 1) ? kids[0] : Expr(d_em->mkExpr(CVC4::kind::TUPLE, vector<CVC4::Expr>(kids.begin(), kids.end()))); + return d_em->mkExpr(CVC4::kind::SEXPR, vector<CVC4::Expr>(kids.begin(), kids.end())); } Expr ValidityChecker::listExpr(const Expr& e1) { - // list exprs aren't supported by CVC4; just return e1 - return e1; + return d_em->mkExpr(CVC4::kind::SEXPR, e1); } Expr ValidityChecker::listExpr(const Expr& e1, const Expr& e2) { - // list exprs aren't supported by CVC4; just return a tuple - return d_em->mkExpr(CVC4::kind::TUPLE, e1, e2); + return d_em->mkExpr(CVC4::kind::SEXPR, e1, e2); } Expr ValidityChecker::listExpr(const Expr& e1, const Expr& e2, const Expr& e3) { - // list exprs aren't supported by CVC4; just return a tuple - return d_em->mkExpr(CVC4::kind::TUPLE, e1, e2, e3); + return d_em->mkExpr(CVC4::kind::SEXPR, e1, e2, e3); } Expr ValidityChecker::listExpr(const std::string& op, const std::vector<Expr>& kids) { - // list exprs aren't supported by CVC4; just return a tuple - return d_em->mkExpr(CVC4::kind::TUPLE, d_em->mkConst(op), vector<CVC4::Expr>(kids.begin(), kids.end())); + return d_em->mkExpr(CVC4::kind::SEXPR, d_em->mkConst(op), vector<CVC4::Expr>(kids.begin(), kids.end())); } Expr ValidityChecker::listExpr(const std::string& op, const Expr& e1) { - // list exprs aren't supported by CVC4; just return a tuple - return d_em->mkExpr(CVC4::kind::TUPLE, d_em->mkConst(op), e1); + return d_em->mkExpr(CVC4::kind::SEXPR, d_em->mkConst(op), e1); } Expr ValidityChecker::listExpr(const std::string& op, const Expr& e1, const Expr& e2) { - // list exprs aren't supported by CVC4; just return a tuple - return d_em->mkExpr(CVC4::kind::TUPLE, d_em->mkConst(op), e1, e2); + return d_em->mkExpr(CVC4::kind::SEXPR, d_em->mkConst(op), e1, e2); } Expr ValidityChecker::listExpr(const std::string& op, const Expr& e1, const Expr& e2, const Expr& e3) { - // list exprs aren't supported by CVC4; just return a tuple - return d_em->mkExpr(CVC4::kind::TUPLE, d_em->mkConst(op), e1, e2, e3); + return d_em->mkExpr(CVC4::kind::SEXPR, d_em->mkConst(op), e1, e2, e3); } void ValidityChecker::printExpr(const Expr& e) { |