Highlights of this commit are:

* add NodeManagerWhite unit test

* change kind::APPLY to kind::APPLY_UF

* better APPLY handling: operators are no longer considered children

* more efficient pool lookup; the NodeValue doesn't have to be as fully constructed for the lookup to proceed

* extend DSL for kind declarations
  + new "theory" command declares a theory and its header.  theory_def.h no longer required.
  + arity enforced on operators
  + constant mapping, hashing, equality

* CONSTANT metakinds supported (via Node::getConst<T>(), for example, Node::getConst<CVC4::Rational>() gets a Rational out of a Node (assuming it is of CONST_RATIONAL kind)

* added CONST_RATIONAL and CONST_INTEGER kinds

* builtin operators (AND, OR, PLUS, etc..) returned by Node::getOperator() are now CONSTANT metakind and are created by NodeManager

* Pretty-printing of Nodes now has a depth limit settable by a stream manipulator (e.g. "cout << Node::setdepth(5) << m << endl;" prints DAG rooted at m to a depth of 5)

* getters added to Node, TNode, NodeValue, etc., for operators and metakinds

* build-time generators for kind.h, metakind.h, and theoryof_table.h headers now have a simpler design and flag errors better, and the templates (kind_template.h etc.) are easier to understand.

* DISTINCT is now a kind, and the SMT parser now passes through DISTINCT nodes instead of blowing them up into ANDs.  Until theory rewriting is online, though, DISTINCTs are directly blown up into conjunctions in TheoryEngine::rewrite().

* add gmpxx detection and inclusion

* better Asserts throughout, some documentation, cleanup

2 files changed, 19 insertions, 10 deletions

diff --git a/src/util/integer.h b/src/util/integer.h
index 1ac8eab78..c86e836c7 100644
--- a/src/util/integer.h
+++ b/src/util/integer.h
@@ -12,13 +12,13 @@
  **
  ** A multiprecision integer constant.
  **/
-#include <gmpxx.h>
-#include <string>
-
 
 #ifndef __CVC4__INTEGER_H
 #define __CVC4__INTEGER_H
 
+#include <gmpxx.h>
+#include <string>
+
 namespace CVC4 {
 
 /** Hashes the gmp integer primitive in a word by word fashion. */
@@ -148,10 +148,14 @@ public:
   friend class CVC4::Rational;
 };/* class Integer */
 
-std::ostream& operator<<(std::ostream& os, const Integer& n);
+struct IntegerHashFcn {
+  static inline size_t hash(const CVC4::Integer& i) {
+    return i.hash();
+  }
+};
 
+std::ostream& operator<<(std::ostream& os, const Integer& n);
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__RATIONAL_H */
-
+#endif /* __CVC4__INTEGER_H */
diff --git a/src/util/rational.h b/src/util/rational.h
index b22f44a2c..fdd125587 100644
--- a/src/util/rational.h
+++ b/src/util/rational.h
@@ -19,13 +19,13 @@
  ** different than the values used to construct the Rational.
  **/
 
+#ifndef __CVC4__RATIONAL_H
+#define __CVC4__RATIONAL_H
+
 #include <gmpxx.h>
 #include <string>
 #include "integer.h"
 
-#ifndef __CVC4__RATIONAL_H
-#define __CVC4__RATIONAL_H
-
 namespace CVC4 {
 
 class Rational {
@@ -181,9 +181,14 @@ public:
 
 };/* class Rational */
 
+struct RationalHashFcn {
+  static inline size_t hash(const CVC4::Rational& r) {
+    return r.hash();
+  }
+};
+
 std::ostream& operator<<(std::ostream& os, const Rational& n);
 
 }/* CVC4 namespace */
 
 #endif /* __CVC4__RATIONAL_H */
-