diff options
| author | Mathias Preiner <mathias.preiner@gmail.com> | 2019-10-30 15:27:10 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-30 15:27:10 -0700 |
| commit | 43ab3f4cd1aa5549cb1aa3c20a2d589614bcb8fc (patch) | |
| tree | cf7b5d7f73a4d4ddc34492334a7d0eb90b57b77b /src/smt_util | |
| parent | 8dda9531995953c3cec094339002f2ee7cadae08 (diff) | |
Unify CVC4_CHECK/CVC4_DCHECK/AlwaysAssert/Assert. (#3366)
Diffstat (limited to 'src/smt_util')
| -rw-r--r-- | src/smt_util/boolean_simplification.h | 2 | ||||
| -rw-r--r-- | src/smt_util/nary_builder.cpp | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/smt_util/boolean_simplification.h b/src/smt_util/boolean_simplification.h index c1e2e4d76..f1bfe6e33 100644 --- a/src/smt_util/boolean_simplification.h +++ b/src/smt_util/boolean_simplification.h @@ -22,7 +22,7 @@ #include <vector> #include <algorithm> -#include "base/cvc4_assert.h" +#include "base/check.h" #include "expr/expr_manager_scope.h" #include "expr/node.h" diff --git a/src/smt_util/nary_builder.cpp b/src/smt_util/nary_builder.cpp index 2c2256d47..6c655ad41 100644 --- a/src/smt_util/nary_builder.cpp +++ b/src/smt_util/nary_builder.cpp @@ -77,13 +77,13 @@ Node NaryBuilder::mkAssoc(Kind kind, const std::vector<Node>& children){ /* It's inconceivable we could have enough children for this to fail * (more than 2^32, in most cases?). */ - AlwaysAssert( newChildren.size() <= max, - "Too many new children in mkAssociative" ); + AlwaysAssert(newChildren.size() <= max) + << "Too many new children in mkAssociative"; /* It would be really weird if this happened (it would require * min > 2, for one thing), but let's make sure. */ - AlwaysAssert( newChildren.size() >= min, - "Too few new children in mkAssociative" ); + AlwaysAssert(newChildren.size() >= min) + << "Too few new children in mkAssociative"; return nm->mkNode(kind,newChildren); } @@ -153,7 +153,6 @@ Node RePairAssocCommutativeOperators::case_assoccomm(TNode n){ unsigned N = n.getNumChildren(); Assert(N >= 2); - Node last = rePairAssocCommutativeOperators( n[N-1]); Node nextToLast = rePairAssocCommutativeOperators(n[N-2]); |