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.

3 files changed, 6 insertions, 4 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() {
diff --git a/src/smt_util/command.h b/src/smt_util/command.h
index b35fb7a7f..17d65beb2 100644
--- a/src/smt_util/command.h
+++ b/src/smt_util/command.h
@@ -22,11 +22,11 @@
 #ifndef __CVC4__COMMAND_H
 #define __CVC4__COMMAND_H
 
-#include <iostream>
+#include <iosfwd>
+#include <map>
 #include <sstream>
 #include <string>
 #include <vector>
-#include <map>
 
 #include "expr/datatype.h"
 #include "expr/expr.h"
diff --git a/src/smt_util/model.h b/src/smt_util/model.h
index 98794a53d..33a9312a6 100644
--- a/src/smt_util/model.h
+++ b/src/smt_util/model.h
@@ -17,7 +17,7 @@
 #ifndef __CVC4__MODEL_H
 #define __CVC4__MODEL_H
 
-#include <iostream>
+#include <iosfwd>
 #include <vector>
 
 #include "expr/expr.h"