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

1 files changed, 29 insertions, 8 deletions

diff --git a/src/expr/node_value.cpp b/src/expr/node_value.cpp
index 840f41143..0138aa2a5 100644
--- a/src/expr/node_value.cpp
+++ b/src/expr/node_value.cpp
@@ -19,6 +19,8 @@
 
 #include "expr/node_value.h"
 #include "expr/node.h"
+#include "expr/kind.h"
+#include "expr/metakind.h"
 #include <sstream>
 
 using namespace std;
@@ -36,9 +38,19 @@ string NodeValue::toString() const {
   return ss.str();
 }
 
-void NodeValue::toStream(std::ostream& out) const {
-  if(d_kind == kind::VARIABLE) {
+void NodeValue::toStream(std::ostream& out, int toDepth) const {
+  using namespace CVC4::kind;
+  using namespace CVC4;
+
+  if(getKind() == kind::NULL_EXPR) {
+    out << "null";
+  } else if(getMetaKind() == kind::metakind::VARIABLE) {
+    if(getKind() != kind::VARIABLE) {
+      out << getKind() << ':';
+    }
+
     string s;
+
     // conceptually "this" is const, and hasAttribute() doesn't change
     // its argument, but it requires a non-const key arg (for now)
     if(NodeManager::currentNM()->getAttribute(const_cast<NodeValue*>(this),
@@ -48,14 +60,23 @@ void NodeValue::toStream(std::ostream& out) const {
       out << "var_" << d_id;
     }
   } else {
-    out << "(" << Kind(d_kind);
-    for(const_nv_iterator i = nv_begin(); i != nv_end(); ++i) {
-      if(i != nv_end()) {
-        out << " ";
+    out << '(' << Kind(d_kind);
+    if(getMetaKind() == kind::metakind::CONSTANT) {
+      out << ' ';
+      kind::metakind::NodeValueConstPrinter::toStream(out, this);
+    } else {
+      for(const_nv_iterator i = nv_begin(); i != nv_end(); ++i) {
+        if(i != nv_end()) {
+          out << ' ';
+        }
+        if(toDepth != 0) {
+          (*i)->toStream(out, toDepth < 0 ? toDepth : toDepth - 1);
+        } else {
+          out << "(...)";
+        }
       }
-      (*i)->toStream(out);
     }
-    out << ")";
+    out << ')';
   }
 }