* theory "tree" rewriting implemented and works

* added TheoryArith::preRewrite() to test and demonstrate
  the use of pre-rewriting.

* array types and type checking now supported

* array type checking now supported

* theoryOf() dispatching properly to arrays now

* theories now required to implement a (simple) identify()
  function that returns a string identifying them for
  debugging/user output purposes

* added "builtin" theory to hold all built-in kinds and their
  type rules and rewriting (currently only exploding distinct)

* fixed production build failure (regarding NodeSetDepth)

* removed an errant "using namespace std" in util/bitvector.h
  (and made associated trivial fixes elsewhere)

* fixes to make unexpected exceptions more verbose in debug builds

* fixes to make multiple, cascading assertion fails simpler

* minor other fixes to comments etc.

1 files changed, 10 insertions, 6 deletions

diff --git a/src/expr/expr_manager_template.h b/src/expr/expr_manager_template.h
index 707d9a26e..450d7fc4d 100644
--- a/src/expr/expr_manager_template.h
+++ b/src/expr/expr_manager_template.h
@@ -33,7 +33,7 @@ ${includes}
 // compiler directs the user to the template file instead of the
 // generated one.  We don't want the user to modify the generated one,
 // since it'll get overwritten on a later build.
-#line 33 "${template}"
+#line 37 "${template}"
 
 namespace CVC4 {
 
@@ -100,9 +100,6 @@ public:
   /** Get the type for integers */
   IntegerType integerType() const;
 
-  /** The the type for bit-vectors */
-  BitVectorType bitVectorType(unsigned size) const;
-
   /**
    * Make a unary expression of a given kind (NOT, BVNOT, ...).
    * @param child1 kind the kind of expression
@@ -214,8 +211,14 @@ public:
    */
   FunctionType mkPredicateType(const std::vector<Type>& sorts);
 
+  /** Make a type representing a bit-vector of the given size */
+  BitVectorType mkBitVectorType(unsigned size) const;
+
+  /** Make the type of arrays with the given parameterization */
+  ArrayType mkArrayType(Type indexType, Type constituentType) const;
+
   /** Make a new sort with the given name. */
-  SortType mkSort(const std::string& name);
+  SortType mkSort(const std::string& name) const;
 
   /** Get the type of an expression */
   Type getType(const Expr& e) throw (TypeCheckingException);
@@ -230,7 +233,8 @@ public:
   /** Returns the maximum arity of the given kind. */
   static unsigned maxArity(Kind kind);
 
-  /** Signals that this expression manager will soon be destroyed.
+  /**
+   * Signals that this expression manager will soon be destroyed.
    * Turns off debugging assertions that may not hold as the system
    * is being torn down.
    *