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, 26 deletions

diff --git a/src/util/cardinality.h b/src/util/cardinality.h
index 1cb4454e0..8b0d85980 100644
--- a/src/util/cardinality.h
+++ b/src/util/cardinality.h
@@ -36,11 +36,7 @@ class CVC4_PUBLIC CardinalityBeth {
   Integer d_index;
 
 public:
-  CardinalityBeth(const Integer& beth) : d_index(beth) {
-    CheckArgument(beth >= 0, beth,
-                  "Beth index must be a nonnegative integer, not %s.",
-                  beth.toString().c_str());
-  }
+  CardinalityBeth(const Integer& beth);
 
   const Integer& getNumber() const throw() {
     return d_index;
@@ -112,22 +108,13 @@ public:
    * "unsigned" argument to enforce the restriction, we mask some
    * errors that automatically convert, like "Cardinality(-1)".
    */
-  Cardinality(long card) : d_card(card) {
-    CheckArgument(card >= 0, card,
-                  "Cardinality must be a nonnegative integer, not %ld.", card);
-    d_card += 1;
-  }
+  Cardinality(long card);
 
   /**
    * Construct a finite cardinality equal to the integer argument.
    * The argument must be nonnegative.
    */
-  Cardinality(const Integer& card) : d_card(card) {
-    CheckArgument(card >= 0, card,
-                  "Cardinality must be a nonnegative integer, not %s.",
-                  card.toString().c_str());
-    d_card += 1;
-  }
+  Cardinality(const Integer& card);
 
   /**
    * Construct an infinite cardinality equal to the given Beth number.
@@ -187,22 +174,14 @@ public:
    * cardinality.  (If this cardinality is infinite, this function
    * throws an IllegalArgumentException.)
    */
-  Integer getFiniteCardinality() const throw(IllegalArgumentException) {
-    CheckArgument(isFinite(), *this, "This cardinality is not finite.");
-    CheckArgument(!isLargeFinite(), *this, "This cardinality is finite, but too large to represent.");
-    return d_card - 1;
-  }
+  Integer getFiniteCardinality() const throw(IllegalArgumentException);
 
   /**
    * In the case that this cardinality is infinite, return its Beth
    * number.  (If this cardinality is finite, this function throws an
    * IllegalArgumentException.)
    */
-  Integer getBethNumber() const throw(IllegalArgumentException) {
-    CheckArgument(!isFinite() && !isUnknown(), *this,
-                  "This cardinality is not infinite (or is unknown).");
-    return -d_card - 1;
-  }
+  Integer getBethNumber() const throw(IllegalArgumentException);
 
   /** Assigning addition of this cardinality with another. */
   Cardinality& operator+=(const Cardinality& c) throw();