Partial merge from datatypes-merge branch:
authorMorgan Deters <mdeters@gmail.com>
Mon, 18 Apr 2011 08:59:09 +0000 (08:59 +0000)
committerMorgan Deters <mdeters@gmail.com>
Mon, 18 Apr 2011 08:59:09 +0000 (08:59 +0000)
commitb90081962840584bb9eeda368ea232a7d42a292b
treec0f568bc787744a5d53b79a818c0f1bd819596cf
parent7d281fba79b1c9f3ae646d3371a0e52e2efd3bba
Partial merge from datatypes-merge branch:

1. Defines a new type "DatatypeType", a type-constant that holds a Datatype, describing an inductive data type.
2. CVC language parser supports datatypes.
3. CVC language printer now functional.
4. Minor other cleanups.

No performance impact is expected outside of datatypes.  I'm verifying that that is the case with a cluster job this morning.
58 files changed:
src/expr/command.cpp
src/expr/command.h
src/expr/expr_manager_template.cpp
src/expr/expr_manager_template.h
src/expr/expr_template.h
src/expr/mkexpr
src/expr/mkkind
src/expr/node.h
src/expr/node_manager.cpp
src/expr/node_manager.h
src/expr/type.cpp
src/expr/type.h
src/expr/type_node.cpp
src/expr/type_node.h
src/parser/cvc/Cvc.g
src/parser/input.h
src/parser/parser.cpp
src/parser/parser.h
src/parser/smt/Smt.g
src/parser/smt2/Smt2.g
src/printer/cvc/cvc_printer.cpp
src/smt/smt_engine.cpp
src/theory/Makefile.am
src/theory/builtin/theory_builtin_rewriter.h
src/theory/datatypes/Makefile [new file with mode: 0644]
src/theory/datatypes/Makefile.am [new file with mode: 0644]
src/theory/datatypes/datatypes_rewriter.h [new file with mode: 0644]
src/theory/datatypes/kinds [new file with mode: 0644]
src/theory/datatypes/theory_datatypes.cpp [new file with mode: 0644]
src/theory/datatypes/theory_datatypes.h [new file with mode: 0644]
src/theory/datatypes/theory_datatypes_type_rules.h [new file with mode: 0644]
src/theory/datatypes/union_find.cpp [new file with mode: 0644]
src/theory/datatypes/union_find.h [new file with mode: 0644]
src/theory/theory_engine.cpp
src/theory/theory_engine.h
src/util/Assert.h
src/util/Makefile.am
src/util/bitvector.h
src/util/datatype.cpp [new file with mode: 0644]
src/util/datatype.h [new file with mode: 0644]
test/Makefile.am
test/regress/regress0/Makefile.am
test/regress/regress0/datatypes/Makefile [new file with mode: 0644]
test/regress/regress0/datatypes/Makefile.am [new file with mode: 0644]
test/regress/regress0/datatypes/datatype.cvc [new file with mode: 0644]
test/regress/regress0/datatypes/datatype0.cvc [new file with mode: 0644]
test/regress/regress0/datatypes/datatype1.cvc [new file with mode: 0644]
test/regress/regress0/datatypes/datatype13.cvc [new file with mode: 0644]
test/regress/regress0/datatypes/datatype2.cvc [new file with mode: 0644]
test/regress/regress0/datatypes/datatype3.cvc [new file with mode: 0644]
test/regress/regress0/datatypes/datatype4.cvc [new file with mode: 0644]
test/regress/regress0/datatypes/error.cvc [new file with mode: 0644]
test/regress/regress0/datatypes/mutually-recursive.cvc [new file with mode: 0644]
test/regress/regress0/datatypes/rewriter.cvc [new file with mode: 0644]
test/regress/regress0/datatypes/typed_v1l50016-simp.cvc [new file with mode: 0644]
test/unit/Makefile.am
test/unit/util/bitvector_black.h
test/unit/util/datatype_black.h [new file with mode: 0644]