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, 4 insertions, 1 deletions

diff --git a/src/util/abstract_value.cpp b/src/util/abstract_value.cpp
index e401661eb..c9dc0251d 100644
--- a/src/util/abstract_value.cpp
+++ b/src/util/abstract_value.cpp
@@ -15,10 +15,13 @@
  **/
 
 #include "util/abstract_value.h"
+
 #include <iostream>
 #include <sstream>
 #include <string>
 
+#include "base/cvc4_assert.h"
+
 using namespace std;
 
 namespace CVC4 {
@@ -29,7 +32,7 @@ std::ostream& operator<<(std::ostream& out, const AbstractValue& val) {
 
 AbstractValue::AbstractValue(Integer index) throw(IllegalArgumentException) :
     d_index(index) {
-    CheckArgument(index >= 1, index, "index >= 1 required for abstract value, not `%s'", index.toString().c_str());
+    PrettyCheckArgument(index >= 1, index, "index >= 1 required for abstract value, not `%s'", index.toString().c_str());
 }
 
 }/* CVC4 namespace */