Merge quantifiers2-trunk:
authorFrançois Bobot <francois@bobot.eu>
Fri, 27 Jul 2012 13:36:32 +0000 (13:36 +0000)
committerFrançois Bobot <francois@bobot.eu>
Fri, 27 Jul 2012 13:36:32 +0000 (13:36 +0000)
commit4bfa927dac67bbcadf219f70e61f1d123e33944b
treef295343430799748de8b9a823f1a3c641c096905
parent988c97d92fa617c5dccaeb1ef33121bfa6459afc
Merge quantifiers2-trunk:
   - new syntax for rewrite rules
   - better rewrite rules theory
   - remove the rewriting with rewrite rules during ppRewrite temporarily
   - theory can define their own candidate generator
   - define a general candidate generator (inefficient ask to every theory)
   - split inst_match between the pattern matching used for quantifiers (inst_match.*) and
     the one used for rewrite rules (rr_inst_match.*):
      - the pattern matching is less exhaustive for quantifiers,
      - the one for rewrite rules can use efficient-e-matching.
69 files changed:
src/context/cdo.h
src/context/cdqueue.h
src/expr/command.cpp
src/expr/command.h
src/expr/node.h
src/parser/smt2/Smt2.g
src/printer/smt2/smt2_printer.cpp
src/theory/Makefile.am
src/theory/arith/theory_arith_instantiator.cpp
src/theory/arrays/theory_arrays_instantiator.cpp
src/theory/arrays/theory_arrays_instantiator.h
src/theory/datatypes/Makefile.am
src/theory/datatypes/theory_datatypes.h
src/theory/datatypes/theory_datatypes_candidate_generator.h [new file with mode: 0644]
src/theory/datatypes/theory_datatypes_instantiator.cpp
src/theory/datatypes/theory_datatypes_instantiator.h
src/theory/inst_match.cpp
src/theory/inst_match.h
src/theory/instantiator_default.cpp
src/theory/quantifiers/instantiation_engine.cpp
src/theory/quantifiers/model_engine.cpp
src/theory/quantifiers/rep_set_iterator.cpp
src/theory/quantifiers/term_database.cpp
src/theory/quantifiers/term_database.h
src/theory/quantifiers/theory_quantifiers.h
src/theory/quantifiers_engine.cpp
src/theory/quantifiers_engine.h
src/theory/rewriterules/theory_rewriterules.cpp
src/theory/rewriterules/theory_rewriterules.h
src/theory/rewriterules/theory_rewriterules_params.h
src/theory/rewriterules/theory_rewriterules_rules.cpp
src/theory/rewriterules/theory_rewriterules_type_rules.h
src/theory/rr_inst_match.cpp [new file with mode: 0644]
src/theory/rr_inst_match.h [new file with mode: 0644]
src/theory/rr_inst_match_impl.h [new file with mode: 0644]
src/theory/rr_trigger.cpp [new file with mode: 0644]
src/theory/rr_trigger.h [new file with mode: 0644]
src/theory/theory.h
src/theory/theory_engine.h
src/theory/trigger.cpp
src/theory/trigger.h
src/theory/uf/equality_engine.cpp
src/theory/uf/equality_engine.h
src/theory/uf/inst_strategy.cpp
src/theory/uf/inst_strategy.h
src/theory/uf/theory_uf_candidate_generator.cpp
src/theory/uf/theory_uf_candidate_generator.h
src/theory/uf/theory_uf_instantiator.cpp
src/theory/uf/theory_uf_instantiator.h
src/util/options.cpp
src/util/options.h
test/regress/regress0/Makefile.am
test/regress/regress0/quantifiers/Makefile.am
test/regress/regress0/rewriterules/Makefile.am
test/regress/regress0/rewriterules/datatypes_clark.smt2
test/regress/regress0/rewriterules/datatypes_clark_quantification.smt2 [new file with mode: 0644]
test/regress/regress0/rewriterules/length_gen_010.smt2
test/regress/regress0/rewriterules/native_arrays.smt2 [new file with mode: 0644]
test/regress/regress0/rewriterules/native_datatypes.smt2 [new file with mode: 0644]
test/regress/regress0/rewriterules/native_datatypes2.smt2 [new file with mode: 0644]
test/regress/regress0/rewriterules/reachability_back_to_the_future.smt2 [new file with mode: 0644]
test/regress/regress0/rewriterules/reachability_back_to_the_future_extended.smt2 [new file with mode: 0644]
test/regress/regress0/rewriterules/reachability_bbttf_eT_arrays.smt2 [new file with mode: 0644]
test/regress/regress0/rewriterules/reachability_bttf_ext_Thomas.smt2 [new file with mode: 0644]
test/regress/regress0/rewriterules/relation.smt2 [new file with mode: 0644]
test/regress/regress0/rewriterules/set_A_new_fast_tableau-base.smt2
test/regress/regress0/rewriterules/set_A_new_fast_tableau-base_sat.smt2
test/regress/regress0/rewriterules/simulate_rewritting.smt2 [new file with mode: 0644]
test/regress/regress0/rewriterules/test_efficient_ematching.smt2 [new file with mode: 0644]