Highlights of this commit are:
authorMorgan Deters <mdeters@gmail.com>
Tue, 30 Mar 2010 04:59:16 +0000 (04:59 +0000)
committerMorgan Deters <mdeters@gmail.com>
Tue, 30 Mar 2010 04:59:16 +0000 (04:59 +0000)
commite24352317b31bfcc9e3be53909e152cfdcd72a28
tree917163e1cdd3302e3ce343748861c9206789a896
parent3b19c6c93f12eab5ecbcb7d6c164cc9ca541313c
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
51 files changed:
configure.ac
src/expr/Makefile.am
src/expr/builtin_kinds
src/expr/expr.cpp
src/expr/kind_epilogue.h [deleted file]
src/expr/kind_middle.h [deleted file]
src/expr/kind_prologue.h [deleted file]
src/expr/kind_template.h [new file with mode: 0644]
src/expr/metakind_template.h [new file with mode: 0644]
src/expr/mkkind
src/expr/mkmetakind [new file with mode: 0755]
src/expr/node.cpp
src/expr/node.h
src/expr/node_builder.cpp [deleted file]
src/expr/node_builder.h
src/expr/node_manager.cpp
src/expr/node_manager.h
src/expr/node_value.cpp
src/expr/node_value.h
src/parser/antlr_parser.cpp
src/parser/cvc/cvc_parser.g
src/parser/smt/smt_parser.g
src/theory/Makefile.am
src/theory/arith/kinds
src/theory/arith/theory_def.h [deleted file]
src/theory/arrays/kinds
src/theory/arrays/theory_def.h [deleted file]
src/theory/booleans/kinds
src/theory/booleans/theory_def.h [deleted file]
src/theory/bv/kinds
src/theory/bv/theory_def.h [deleted file]
src/theory/mktheoryof
src/theory/theory.h
src/theory/theory_engine.cpp
src/theory/theory_engine.h
src/theory/theoryof_table_epilogue.h [deleted file]
src/theory/theoryof_table_middle.h [deleted file]
src/theory/theoryof_table_prologue.h [deleted file]
src/theory/theoryof_table_template.h [new file with mode: 0644]
src/theory/uf/kinds
src/theory/uf/theory_def.h [deleted file]
src/theory/uf/theory_uf.cpp
src/theory/uf/theory_uf.h
src/util/integer.h
src/util/rational.h
test/unit/Makefile.am
test/unit/expr/node_black.h
test/unit/expr/node_builder_black.h
test/unit/expr/node_manager_white.h [new file with mode: 0644]
test/unit/theory/theory_black.h
test/unit/theory/theory_uf_white.h