Partial merge from kind-backend branch, including Minisat and CNF work to
authorMorgan Deters <mdeters@gmail.com>
Thu, 1 Mar 2012 14:48:04 +0000 (14:48 +0000)
committerMorgan Deters <mdeters@gmail.com>
Thu, 1 Mar 2012 14:48:04 +0000 (14:48 +0000)
commit45a138c326da72890bf889a3670aad503ef4aa1e
treefa0c9a8497d0b33f78a9f19212152a61392825cc
parent8c0b2d6db32103268f84d89c0d0545c7eb504069
Partial merge from kind-backend branch, including Minisat and CNF work to
support incrementality.

Some clean-up work will likely follow, but the CNF/Minisat stuff should be
left pretty much untouched.

Expected performance change negligible; slightly better on memory:
  http://church.cims.nyu.edu/regress-results/compare_jobs.php?job_id=3705&reference_id=3697&mode=&category=&p=5
Note that there are crashes, but that these are exhibited in the nightly
regression run too!
85 files changed:
src/compat/cvc3_compat.cpp
src/context/context.cpp
src/expr/command.cpp
src/expr/expr_manager_template.cpp
src/expr/expr_manager_template.h
src/expr/expr_template.cpp
src/expr/node.cpp
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/main/driver.cpp
src/main/driver_portfolio.cpp
src/main/interactive_shell.cpp
src/main/interactive_shell.h
src/parser/Makefile.am
src/parser/Makefile.antlr_tracing
src/parser/antlr_input.cpp
src/parser/antlr_input.h
src/parser/antlr_line_buffered_input.cpp [new file with mode: 0644]
src/parser/antlr_line_buffered_input.h [new file with mode: 0644]
src/parser/antlr_tracing.h
src/parser/bounded_token_buffer.cpp
src/parser/cvc/Cvc.g
src/parser/input.cpp
src/parser/input.h
src/parser/parser.cpp
src/parser/parser.h
src/parser/parser_builder.cpp
src/parser/parser_builder.h
src/parser/smt/smt.cpp
src/parser/smt/smt.h
src/parser/smt2/Smt2.g
src/parser/smt2/smt2.cpp
src/printer/cvc/cvc_printer.cpp
src/printer/smt2/smt2_printer.cpp
src/prop/cnf_stream.cpp
src/prop/cnf_stream.h
src/prop/minisat/core/Solver.cc
src/prop/minisat/core/Solver.h
src/prop/prop_engine.cpp
src/prop/prop_engine.h
src/prop/sat.h
src/prop/sat_module.cpp
src/prop/sat_module.h
src/smt/smt_engine.cpp
src/smt/smt_engine.h
src/theory/arith/arith_rewriter.cpp
src/theory/arith/kinds
src/theory/arith/theory_arith_type_rules.h
src/theory/builtin/kinds
src/theory/builtin/theory_builtin_type_rules.h
src/theory/substitutions.cpp
src/theory/substitutions.h
src/theory/theory.cpp
src/theory/theory.h
src/theory/theory_engine.cpp
src/theory/theory_engine.h
src/util/Makefile.am
src/util/configuration.cpp
src/util/configuration.h
src/util/configuration_private.h
src/util/datatype.i
src/util/integer_gmp_imp.h
src/util/options.cpp
src/util/output.h
src/util/predicate.cpp [new file with mode: 0644]
src/util/predicate.h [new file with mode: 0644]
src/util/subrange_bound.h
test/Makefile.am
test/regress/regress0/Makefile.am
test/regress/regress0/datatypes/Makefile.am
test/regress/regress0/datatypes/rec1.cvc [new file with mode: 0644]
test/regress/regress0/datatypes/rec2.cvc [new file with mode: 0644]
test/regress/regress0/datatypes/rec4.cvc [new file with mode: 0644]
test/regress/regress0/datatypes/rec5.cvc [new file with mode: 0644]
test/regress/regress0/datatypes/tuple.cvc [new file with mode: 0644]
test/regress/regress0/push-pop/Makefile.am
test/regress/regress0/push-pop/tiny_bug.smt2 [new file with mode: 0644]
test/regress/regress0/simplification_bug4.smt2 [new file with mode: 0644]
test/regress/regress0/simplification_bug4.smt2.expect [new file with mode: 0644]
test/regress/run_regression
test/unit/prop/cnf_stream_black.h