git.libre-soc.org Git - cvc5.git/commit

Merge branch 'master' of https://github.com/CVC4/CVC4.git

Conflicts:
proofs/signatures/Makefile.am
src/Makefile.am
src/expr/datatype.cpp
src/options/datatypes_options
src/options/options_template.cpp
src/options/quantifiers_options
src/proof/arith_proof.cpp
src/proof/arith_proof.h
src/proof/array_proof.cpp
src/proof/array_proof.h
src/proof/bitvector_proof.cpp
src/proof/bitvector_proof.h
src/proof/cnf_proof.cpp
src/proof/cnf_proof.h
src/proof/proof_manager.cpp
src/proof/proof_manager.h
src/proof/sat_proof.h
src/proof/sat_proof_implementation.h
src/proof/skolemization_manager.h
src/proof/theory_proof.cpp
src/proof/theory_proof.h
src/proof/uf_proof.cpp
src/proof/uf_proof.h
src/prop/cnf_stream.cpp
src/prop/cnf_stream.h
src/prop/minisat/core/Solver.cc
src/prop/prop_engine.cpp
src/prop/prop_engine.h
src/prop/theory_proxy.cpp
src/smt/smt_engine.cpp
src/smt/smt_engine_check_proof.cpp
src/theory/arrays/array_proof_reconstruction.cpp
src/theory/arrays/theory_arrays.cpp
src/theory/bv/eager_bitblaster.cpp
src/theory/bv/lazy_bitblaster.cpp
src/theory/datatypes/theory_datatypes.cpp
src/theory/quantifiers/alpha_equivalence.cpp
src/theory/quantifiers/candidate_generator.cpp
src/theory/quantifiers/candidate_generator.h
src/theory/quantifiers/ce_guided_single_inv.cpp
src/theory/quantifiers/ceg_instantiator.cpp
src/theory/quantifiers/conjecture_generator.cpp
src/theory/quantifiers/equality_infer.cpp
src/theory/quantifiers/equality_infer.h
src/theory/quantifiers/inst_match_generator.cpp
src/theory/quantifiers/inst_propagator.cpp
src/theory/quantifiers/inst_propagator.h
src/theory/quantifiers/inst_strategy_e_matching.cpp
src/theory/quantifiers/inst_strategy_e_matching.h
src/theory/quantifiers/instantiation_engine.cpp
src/theory/quantifiers/model_builder.cpp
src/theory/quantifiers/model_engine.cpp
src/theory/quantifiers/quant_conflict_find.cpp
src/theory/quantifiers/quant_conflict_find.h
src/theory/quantifiers/quant_split.cpp
src/theory/quantifiers/quant_util.cpp
src/theory/quantifiers/quantifiers_rewriter.cpp
src/theory/quantifiers/quantifiers_rewriter.h
src/theory/quantifiers/term_database.cpp
src/theory/quantifiers/term_database.h
src/theory/quantifiers/trigger.cpp
src/theory/quantifiers/trigger.h
src/theory/quantifiers_engine.cpp
src/theory/quantifiers_engine.h
src/theory/sets/kinds
src/theory/sets/theory_sets_private.cpp
src/theory/sets/theory_sets_private.h
src/theory/sets/theory_sets_rewriter.cpp
src/theory/sets/theory_sets_type_rules.h
src/theory/strings/theory_strings.cpp
src/theory/strings/theory_strings.h
src/theory/theory_engine.cpp
src/theory/theory_engine.h
src/theory/uf/equality_engine.cpp
test/regress/regress0/fmf/Makefile.am
test/regress/regress0/quantifiers/Makefile.am
test/regress/regress0/strings/Makefile.am
test/regress/regress0/sygus/Makefile.am
test/regress/regress0/sygus/max2-univ.sy

author	PaulMeng <pmtruth@hotmail.com>
	Tue, 5 Jul 2016 17:56:53 +0000 (13:56 -0400)
committer	PaulMeng <pmtruth@hotmail.com>
	Tue, 5 Jul 2016 17:56:53 +0000 (13:56 -0400)
commit	36a0d1d948f201471596e092136c5a00103f78af
tree	7a9b0d79074da1cb0c1cbed986584d50792a30e9	tree
parent	66525e81928d0d025dbcc197ab3ef772eac31103	commit \| diff
parent	a58abbe71fb1fc07129ff9c7568ac544145fb57c	commit \| diff

proofs/signatures/Makefile.am	diff1 \|	diff2 \|	blob \| history
src/Makefile.am	diff1 \|	diff2 \|	blob \| history
src/expr/datatype.cpp	diff1 \|	diff2 \|	blob \| history
src/expr/datatype.h	diff1 \|	diff2 \|	blob \| history
src/expr/expr_manager_template.h	diff1 \|	diff2 \|	blob \| history
src/options/quantifiers_options	diff1 \|	diff2 \|	blob \| history
src/parser/cvc/Cvc.g	diff1 \|	diff2 \|	blob \| history
src/parser/smt2/smt2.cpp	diff1 \|	diff2 \|	blob \| history
src/printer/smt2/smt2_printer.cpp	diff1 \|	diff2 \|	blob \| history
src/proof/bitvector_proof.cpp	diff1 \|	diff2 \|	blob \| history
src/prop/minisat/core/Solver.cc	diff1 \|	diff2 \|	blob \| history
src/theory/bv/bitblaster_template.h	diff1 \|	diff2 \|	blob \| history
src/theory/quantifiers/alpha_equivalence.cpp	diff1 \|	diff2 \|	blob \| history
src/theory/quantifiers/alpha_equivalence.h	diff1 \|	diff2 \|	blob \| history
src/theory/quantifiers/ambqi_builder.cpp	diff1 \|	diff2 \|	blob \| history
src/theory/quantifiers/ambqi_builder.h	diff1 \|	diff2 \|	blob \| history
src/theory/quantifiers/anti_skolem.cpp	diff1 \|	diff2 \|	blob \| history
src/theory/quantifiers/anti_skolem.h	diff1 \|	diff2 \|	blob \| history
src/theory/quantifiers/bounded_integers.cpp	diff1 \|	diff2 \|	blob \| history
src/theory/quantifiers/bounded_integers.h	diff1 \|	diff2 \|	blob \| history
src/theory/quantifiers/candidate_generator.cpp	diff1 \|	diff2 \|	blob \| history
src/theory/quantifiers/candidate_generator.h	diff1 \|	diff2 \|	blob \| history
src/theory/quantifiers/ce_guided_instantiation.cpp	diff1 \|	diff2 \|	blob \| history
src/theory/quantifiers/ce_guided_instantiation.h	diff1 \|	diff2 \|	blob \| history
src/theory/quantifiers/ce_guided_single_inv.cpp	diff1 \|	diff2 \|	blob \| history
src/theory/quantifiers/ce_guided_single_inv.h	diff1 \|	diff2 \|	blob \| history
src/theory/quantifiers/ce_guided_single_inv_ei.cpp	diff1 \|	diff2 \|	blob \| history
src/theory/quantifiers/ce_guided_single_inv_ei.h	diff1 \|	diff2 \|	blob \| history
src/theory/quantifiers/ce_guided_single_inv_sol.cpp	diff1 \|	diff2 \|	blob \| history
src/theory/quantifiers/ce_guided_single_inv_sol.h	diff1 \|	diff2 \|	blob \| history
src/theory/quantifiers/ceg_instantiator.cpp	diff1 \|	diff2 \|	blob \| history
src/theory/quantifiers/ceg_instantiator.h	diff1 \|	diff2 \|	blob \| history
src/theory/quantifiers/conjecture_generator.cpp	diff1 \|	diff2 \|	blob \| history
src/theory/quantifiers/conjecture_generator.h	diff1 \|	diff2 \|	blob \| history
src/theory/quantifiers/equality_infer.cpp	diff1 \|	diff2 \|	blob \| history
src/theory/quantifiers/equality_infer.h	diff1 \|	diff2 \|	blob \| history
src/theory/quantifiers/first_order_model.cpp	diff1 \|	diff2 \|	blob \| history
src/theory/quantifiers/first_order_model.h	diff1 \|	diff2 \|	blob \| history
src/theory/quantifiers/full_model_check.cpp	diff1 \|	diff2 \|	blob \| history
src/theory/quantifiers/full_model_check.h	diff1 \|	diff2 \|	blob \| history
src/theory/quantifiers/fun_def_engine.cpp	diff1 \|	diff2 \|	blob \| history
src/theory/quantifiers/fun_def_engine.h	diff1 \|	diff2 \|	blob \| history
src/theory/quantifiers/fun_def_process.cpp	diff1 \|	diff2 \|	blob \| history
src/theory/quantifiers/fun_def_process.h	diff1 \|	diff2 \|	blob \| history
src/theory/quantifiers/inst_match.cpp	diff1 \|	diff2 \|	blob \| history
src/theory/quantifiers/inst_match.h	diff1 \|	diff2 \|	blob \| history
src/theory/quantifiers/inst_match_generator.cpp	diff1 \|	diff2 \|	blob \| history
src/theory/quantifiers/inst_match_generator.h	diff1 \|	diff2 \|	blob \| history
src/theory/quantifiers/inst_propagator.cpp	diff1 \|	diff2 \|	blob \| history
src/theory/quantifiers/inst_propagator.h	diff1 \|	diff2 \|	blob \| history
src/theory/quantifiers/inst_strategy_cbqi.cpp	diff1 \|	diff2 \|	blob \| history
src/theory/quantifiers/inst_strategy_cbqi.h	diff1 \|	diff2 \|	blob \| history
src/theory/quantifiers/inst_strategy_e_matching.cpp	diff1 \|	diff2 \|	blob \| history
src/theory/quantifiers/inst_strategy_e_matching.h	diff1 \|	diff2 \|	blob \| history
src/theory/quantifiers/instantiation_engine.cpp	diff1 \|	diff2 \|	blob \| history
src/theory/quantifiers/instantiation_engine.h	diff1 \|	diff2 \|	blob \| history
src/theory/quantifiers/kinds	diff1 \|	diff2 \|	blob \| history
src/theory/quantifiers/local_theory_ext.cpp	diff1 \|	diff2 \|	blob \| history
src/theory/quantifiers/local_theory_ext.h	diff1 \|	diff2 \|	blob \| history
src/theory/quantifiers/macros.cpp	diff1 \|	diff2 \|	blob \| history
src/theory/quantifiers/macros.h	diff1 \|	diff2 \|	blob \| history
src/theory/quantifiers/model_builder.cpp	diff1 \|	diff2 \|	blob \| history
src/theory/quantifiers/model_builder.h	diff1 \|	diff2 \|	blob \| history
src/theory/quantifiers/model_engine.cpp	diff1 \|	diff2 \|	blob \| history
src/theory/quantifiers/model_engine.h	diff1 \|	diff2 \|	blob \| history
src/theory/quantifiers/quant_conflict_find.cpp	diff1 \|	diff2 \|	blob \| history
src/theory/quantifiers/quant_conflict_find.h	diff1 \|	diff2 \|	blob \| history
src/theory/quantifiers/quant_equality_engine.cpp	diff1 \|	diff2 \|	blob \| history
src/theory/quantifiers/quant_equality_engine.h	diff1 \|	diff2 \|	blob \| history
src/theory/quantifiers/quant_split.cpp	diff1 \|	diff2 \|	blob \| history
src/theory/quantifiers/quant_split.h	diff1 \|	diff2 \|	blob \| history
src/theory/quantifiers/quant_util.cpp	diff1 \|	diff2 \|	blob \| history
src/theory/quantifiers/quant_util.h	diff1 \|	diff2 \|	blob \| history
src/theory/quantifiers/quantifiers_attributes.cpp	diff1 \|	diff2 \|	blob \| history
src/theory/quantifiers/quantifiers_attributes.h	diff1 \|	diff2 \|	blob \| history
src/theory/quantifiers/quantifiers_rewriter.cpp	diff1 \|	diff2 \|	blob \| history
src/theory/quantifiers/quantifiers_rewriter.h	diff1 \|	diff2 \|	blob \| history
src/theory/quantifiers/relevant_domain.cpp	diff1 \|	diff2 \|	blob \| history
src/theory/quantifiers/relevant_domain.h	diff1 \|	diff2 \|	blob \| history
src/theory/quantifiers/rewrite_engine.cpp	diff1 \|	diff2 \|	blob \| history
src/theory/quantifiers/rewrite_engine.h	diff1 \|	diff2 \|	blob \| history
src/theory/quantifiers/symmetry_breaking.cpp	diff1 \|	diff2 \|	blob \| history
src/theory/quantifiers/symmetry_breaking.h	diff1 \|	diff2 \|	blob \| history
src/theory/quantifiers/term_database.cpp	diff1 \|	diff2 \|	blob \| history
src/theory/quantifiers/term_database.h	diff1 \|	diff2 \|	blob \| history
src/theory/quantifiers/theory_quantifiers.cpp	diff1 \|	diff2 \|	blob \| history
src/theory/quantifiers/theory_quantifiers.h	diff1 \|	diff2 \|	blob \| history
src/theory/quantifiers/theory_quantifiers_type_rules.h	diff1 \|	diff2 \|	blob \| history
src/theory/quantifiers/trigger.cpp	diff1 \|	diff2 \|	blob \| history
src/theory/quantifiers/trigger.h	diff1 \|	diff2 \|	blob \| history
src/theory/sets/kinds	diff1 \|	diff2 \|	blob \| history
src/theory/sets/theory_sets_private.h	diff1 \|	diff2 \|	blob \| history
src/theory/sets/theory_sets_type_rules.h	diff1 \|	diff2 \|	blob \| history