diff options
author | Tim King <taking@google.com> | 2017-01-10 17:51:14 -0800 |
---|---|---|
committer | Tim King <taking@google.com> | 2017-01-10 18:21:15 -0800 |
commit | 1e7807069e07a710bafa83fc7412c3ac164249b8 (patch) | |
tree | 3301a132c17645a33abe8e5bb331fa3d721af33d /src | |
parent | ff498bb43b3d3785bdb894974678e65926de62ab (diff) |
Adding regression test scrubbing.
Diffstat (limited to 'src')
-rw-r--r-- | src/printer/cvc/cvc_printer.cpp | 3 | ||||
-rw-r--r-- | src/theory/arith/arith_rewriter.cpp | 7 | ||||
-rw-r--r-- | src/theory/rewriter.cpp | 2 | ||||
-rw-r--r-- | src/theory/rewriter.h | 2 |
4 files changed, 9 insertions, 5 deletions
diff --git a/src/printer/cvc/cvc_printer.cpp b/src/printer/cvc/cvc_printer.cpp index 58d0ea6c0..a9eab4a8c 100644 --- a/src/printer/cvc/cvc_printer.cpp +++ b/src/printer/cvc/cvc_printer.cpp @@ -507,14 +507,17 @@ void CvcPrinter::toStream(std::ostream& out, TNode n, int depth, bool types, boo opType = PREFIX; break; case kind::DIVISION: + case kind::DIVISION_TOTAL: op << '/'; opType = INFIX; break; case kind::INTS_DIVISION: + case kind::INTS_DIVISION_TOTAL: op << "DIV"; opType = INFIX; break; case kind::INTS_MODULUS: + case kind::INTS_MODULUS_TOTAL: op << "MOD"; opType = INFIX; break; diff --git a/src/theory/arith/arith_rewriter.cpp b/src/theory/arith/arith_rewriter.cpp index e53e2ee97..642216b40 100644 --- a/src/theory/arith/arith_rewriter.cpp +++ b/src/theory/arith/arith_rewriter.cpp @@ -19,7 +19,7 @@ #include <stack> #include <vector> -#include "base/output.h" +#include "smt/logic_exception.h" #include "theory/arith/arith_rewriter.h" #include "theory/arith/arith_utilities.h" #include "theory/arith/normal_form.h" @@ -31,7 +31,8 @@ namespace arith { bool ArithRewriter::isAtom(TNode n) { Kind k = n.getKind(); - return arith::isRelationOperator(k) || k == kind::IS_INTEGER || k == kind::DIVISIBLE; + return arith::isRelationOperator(k) || k == kind::IS_INTEGER + || k == kind::DIVISIBLE; } RewriteResponse ArithRewriter::rewriteConstant(TNode t){ @@ -211,7 +212,7 @@ RewriteResponse ArithRewriter::postRewriteTerm(TNode t){ ss << "The POW(^) operator can only be used with a natural number "; ss << "in the exponent. Exception occured in:" << std::endl; ss << " " << t; - throw Exception(ss.str()); + throw LogicException(ss.str()); } default: Unreachable(); diff --git a/src/theory/rewriter.cpp b/src/theory/rewriter.cpp index 18ded60a8..87080ec18 100644 --- a/src/theory/rewriter.cpp +++ b/src/theory/rewriter.cpp @@ -84,7 +84,7 @@ struct RewriteStackElement { } }; -Node Rewriter::rewrite(TNode node) throw (UnsafeInterruptException){ +Node Rewriter::rewrite(TNode node) { return rewriteTo(theoryOf(node), node); } diff --git a/src/theory/rewriter.h b/src/theory/rewriter.h index fc53121e4..aed93a451 100644 --- a/src/theory/rewriter.h +++ b/src/theory/rewriter.h @@ -107,7 +107,7 @@ public: * Rewrites the node using theoryOf() to determine which rewriter to * use on the node. */ - static Node rewrite(TNode node) throw (UnsafeInterruptException); + static Node rewrite(TNode node); /** * Garbage collects the rewrite caches. |