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, 13 insertions, 13 deletions

diff --git a/src/util/floatingpoint.cpp b/src/util/floatingpoint.cpp
index d3bb1967a..d1164133a 100644
--- a/src/util/floatingpoint.cpp
+++ b/src/util/floatingpoint.cpp
@@ -19,20 +19,20 @@
 
 namespace CVC4 {
 
-  FloatingPointSize::FloatingPointSize (unsigned _e, unsigned _s) : e(_e), s(_s)
-  {
-    CheckArgument(validExponentSize(_e),_e,"Invalid exponent size : %d",_e);
-    CheckArgument(validSignificandSize(_s),_s,"Invalid significand size : %d",_s);
-  }
+FloatingPointSize::FloatingPointSize (unsigned _e, unsigned _s) : e(_e), s(_s)
+{
+  PrettyCheckArgument(validExponentSize(_e),_e,"Invalid exponent size : %d",_e);
+  PrettyCheckArgument(validSignificandSize(_s),_s,"Invalid significand size : %d",_s);
+}
 
-  FloatingPointSize::FloatingPointSize (const FloatingPointSize &old) : e(old.e), s(old.s)
-  {
-    CheckArgument(validExponentSize(e),e,"Invalid exponent size : %d",e);
-    CheckArgument(validSignificandSize(s),s,"Invalid significand size : %d",s);
-  }
+FloatingPointSize::FloatingPointSize (const FloatingPointSize &old) : e(old.e), s(old.s)
+{
+  PrettyCheckArgument(validExponentSize(e),e,"Invalid exponent size : %d",e);
+  PrettyCheckArgument(validSignificandSize(s),s,"Invalid significand size : %d",s);
+}
 
-  void FloatingPointLiteral::unfinished (void) const {
-    Unimplemented("Floating-point literals not yet implemented.");
-  }
+void FloatingPointLiteral::unfinished (void) const {
+  Unimplemented("Floating-point literals not yet implemented.");
+}
 
 }/* CVC4 namespace */