diff options
| author | Morgan Deters <mdeters@gmail.com> | 2010-04-04 19:36:56 +0000 |
|---|---|---|
| committer | Morgan Deters <mdeters@gmail.com> | 2010-04-04 19:36:56 +0000 |
| commit | 73be7b6b5a9c98cc5a32dcfb3050b9656bf10243 (patch) | |
| tree | 5421477844240ad71493ee01a85a4a8a5369d92d /test | |
| parent | 3e27983545a25f3acc3bf7c7dbdf0ec1fe3219ca (diff) | |
Recommit revision 365 (undoing revision 375, which reverted revision 365).
Fix the case in NodeBuilderBlack that triggered bug #82. (Fixes bug #82.)
This also fixes regression failures from this morning (2010 Apr 4), in
the optimized builds, for which a fix was included in 365 and reverted
in 375. They looked like this:
In ExprBlack::testGetConst:
/usr/local/share/cvc4/src/cvc4-2010-04-04/builds/x86_64-unknown-linux-gnu/production/../../../test/unit/expr/expr_black.h:377: Error: Expected (a->getConst<Kind>()) to throw (IllegalArgumentException) but it didn't throw
/usr/local/share/cvc4/src/cvc4-2010-04-04/builds/x86_64-unknown-linux-gnu/production/../../../test/unit/expr/expr_black.h:378: Error: Expected (b->getConst<Kind>()) to throw (IllegalArgumentException) but it didn't throw
[etc..]
Diffstat (limited to 'test')
| -rw-r--r-- | test/unit/expr/expr_black.h | 2 | ||||
| -rw-r--r-- | test/unit/expr/node_builder_black.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/test/unit/expr/expr_black.h b/test/unit/expr/expr_black.h index b08b5c6aa..e253b4a24 100644 --- a/test/unit/expr/expr_black.h +++ b/test/unit/expr/expr_black.h @@ -362,7 +362,7 @@ public: TS_ASSERT(r2->isAtomic()); Expr x = d_em->mkExpr(AND, *a, *b); - Expr y = d_em->mkExpr(XOR, *a, *b, *c); + Expr y = d_em->mkExpr(ITE, *a, *b, *c); Expr z = d_em->mkExpr(IFF, x, y); TS_ASSERT(!x.isAtomic()); diff --git a/test/unit/expr/node_builder_black.h b/test/unit/expr/node_builder_black.h index 2af5988a6..81aa424f8 100644 --- a/test/unit/expr/node_builder_black.h +++ b/test/unit/expr/node_builder_black.h @@ -465,7 +465,7 @@ public: Node z = d_nm->mkVar(); Node m = d_nm->mkNode(AND, y, z, x); Node n = d_nm->mkNode(OR, d_nm->mkNode(NOT, x), y, z); - Node o = d_nm->mkNode(XOR, y, x, z); + Node o = d_nm->mkNode(XOR, y, x); Node p = d_nm->mkNode(PLUS, z, d_nm->mkNode(UMINUS, x), z); Node q = d_nm->mkNode(AND, x, z, d_nm->mkNode(NOT, y)); |