diff options
author | Tim King <taking@google.com> | 2015-12-24 05:38:43 -0500 |
---|---|---|
committer | Tim King <taking@google.com> | 2015-12-24 05:38:43 -0500 |
commit | a39ad6584c1d61e22e72b53c3838f4f675ed2e19 (patch) | |
tree | ed40cb371c41ac285ca2bf41a82254a36134e132 /src/smt_util/command.cpp | |
parent | 87b0fe9ce10d1e5e9ed5a3e7db77f46bf3f68922 (diff) |
Miscellaneous fixes
- Splitting the two instances of CheckArgument. The template version is now always defined in base/exception.h and is available in a cvc4_public header. This version has lost its variadic version (due to swig not supporting va_list's). The CPP macro version has been renamed PrettyCheckArgument. (Taking suggestions for a better name.) This is now only defined in base/cvc4_assert.h. Only use this in cvc4_private headers and in .cpp files that can use cvc4_private headers. To use a variadic version of CheckArguments, outside of this scope, you need to duplicate this macro locally. See cvc3_compat.cpp for an example.
- Making fitsSignedInt() and fitsUnsignedInt() work more robustly for CLN on 32 bit systems.
- Refactoring ArrayStoreAll to avoid potential problems with circular header inclusions.
- Changing some headers to use iosfwd when possible.
Diffstat (limited to 'src/smt_util/command.cpp')
-rw-r--r-- | src/smt_util/command.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/smt_util/command.cpp b/src/smt_util/command.cpp index 464a2e0aa..ae4e1f1f0 100644 --- a/src/smt_util/command.cpp +++ b/src/smt_util/command.cpp @@ -23,6 +23,7 @@ #include <utility> #include <vector> +#include "base/cvc4_assert.h" #include "base/output.h" #include "expr/node.h" #include "expr/sexpr.h" @@ -939,7 +940,8 @@ GetValueCommand::GetValueCommand(Expr term) throw() : GetValueCommand::GetValueCommand(const std::vector<Expr>& terms) throw() : d_terms(terms) { - CheckArgument(terms.size() >= 1, terms, "cannot get-value of an empty set of terms"); + PrettyCheckArgument(terms.size() >= 1, terms, + "cannot get-value of an empty set of terms"); } const std::vector<Expr>& GetValueCommand::getTerms() const throw() { |