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.

1 files changed, 5 insertions, 3 deletions

diff --git a/src/expr/record.cpp b/src/expr/record.cpp
index 2dee03dbf..ec5ef96f1 100644
--- a/src/expr/record.cpp
+++ b/src/expr/record.cpp
@@ -68,8 +68,9 @@ bool Record::contains(const std::string& name) const {
 
 size_t Record::getIndex(std::string name) const {
   FieldVector::const_iterator i = find(*d_fields, name);
-  CheckArgument(i != d_fields->end(), name,
-                  "requested field `%s' does not exist in record", name.c_str());
+  PrettyCheckArgument(i != d_fields->end(), name,
+                      "requested field `%s' does not exist in record",
+                      name.c_str());
   return i - d_fields->begin();
 }
 
@@ -115,7 +116,8 @@ std::ostream& operator<<(std::ostream& out, const RecordUpdate& t) {
 
 
 const std::pair<std::string, Type>& Record::operator[](size_t index) const {
-  CheckArgument(index < d_fields->size(), index, "index out of bounds for record type");
+  PrettyCheckArgument(index < d_fields->size(), index,
+                      "index out of bounds for record type");
   return (*d_fields)[index];
 }