From a1466978fbc328507406d4a121dab4d1a1047e1d Mon Sep 17 00:00:00 2001 From: Aina Niemetz Date: Wed, 31 Mar 2021 15:23:17 -0700 Subject: [PATCH] Rename namespace CVC4 to CVC5. (#6249) --- .github/workflows/ci.yml | 2 +- examples/api/bitvectors.cpp | 2 +- examples/api/bitvectors_and_arrays.cpp | 2 +- examples/api/combination.cpp | 2 +- examples/api/datatypes.cpp | 2 +- examples/api/extract.cpp | 2 +- examples/api/helloworld.cpp | 2 +- examples/api/linear_arith.cpp | 2 +- examples/api/sequences.cpp | 2 +- examples/api/sets.cpp | 2 +- examples/api/strings.cpp | 2 +- examples/api/sygus-fun.cpp | 2 +- examples/api/sygus-grammar.cpp | 2 +- examples/api/sygus-inv.cpp | 2 +- examples/hashsmt/sha1_collision.cpp | 7 +- examples/hashsmt/sha1_inversion.cpp | 6 +- examples/hashsmt/word.cpp | 10 +- examples/hashsmt/word.h | 23 +- examples/nra-translate/normalize.cpp | 6 +- examples/nra-translate/smt2info.cpp | 6 +- examples/nra-translate/smt2todreal.cpp | 6 +- examples/nra-translate/smt2toisat.cpp | 6 +- examples/nra-translate/smt2tomathematica.cpp | 4 +- examples/nra-translate/smt2toqepcad.cpp | 4 +- examples/nra-translate/smt2toredlog.cpp | 6 +- examples/sets-translate/sets_translate.cpp | 6 +- examples/simple_vc_cxx.cpp | 2 +- examples/simple_vc_quant_cxx.cpp | 2 +- examples/translator.cpp | 6 +- src/api/checks.h | 4 +- src/api/cvc4cpp.cpp | 1458 ++++++++--------- src/api/cvc4cpp.h | 132 +- src/api/cvc4cppkind.h | 6 +- src/api/python/cvc4.pxd | 4 +- src/api/python/genkinds.py.in | 4 +- src/base/check.cpp | 4 +- src/base/check.h | 14 +- src/base/configuration.cpp | 7 +- src/base/configuration.h | 4 +- src/base/configuration_private.h | 4 +- src/base/exception.cpp | 4 +- src/base/exception.h | 12 +- src/base/git_versioninfo.cpp.in | 8 +- src/base/listener.cpp | 5 +- src/base/listener.h | 4 +- src/base/map_util.h | 8 +- src/base/modal_exception.h | 8 +- src/base/output.cpp | 4 +- src/base/output.h | 63 +- src/context/backtrackable.h | 4 +- src/context/cddense_set.h | 7 +- src/context/cdhashmap.h | 6 +- src/context/cdhashmap_forward.h | 13 +- src/context/cdhashset.h | 6 +- src/context/cdhashset_forward.h | 4 +- src/context/cdinsert_hashmap.h | 6 +- src/context/cdinsert_hashmap_forward.h | 4 +- src/context/cdlist.h | 6 +- src/context/cdlist_forward.h | 6 +- src/context/cdmaybe.h | 7 +- src/context/cdo.h | 7 +- src/context/cdqueue.h | 6 +- src/context/cdtrail_queue.h | 6 +- src/context/context.cpp | 7 +- src/context/context.h | 7 +- src/context/context_mm.cpp | 6 +- src/context/context_mm.h | 6 +- src/decision/decision_attributes.h | 8 +- src/decision/decision_engine.cpp | 4 +- src/decision/decision_engine.h | 8 +- src/decision/decision_strategy.h | 8 +- src/decision/justification_heuristic.cpp | 12 +- src/decision/justification_heuristic.h | 154 +- src/expr/array_store_all.cpp | 4 +- src/expr/array_store_all.h | 5 +- src/expr/ascription_type.cpp | 4 +- src/expr/ascription_type.h | 4 +- src/expr/attribute.cpp | 8 +- src/expr/attribute.h | 13 +- src/expr/attribute_internals.h | 14 +- src/expr/attribute_unique_id.h | 10 +- src/expr/bound_var_manager.cpp | 4 +- src/expr/bound_var_manager.h | 4 +- src/expr/buffered_proof_generator.cpp | 4 +- src/expr/buffered_proof_generator.h | 4 +- src/expr/datatype_index.cpp | 4 +- src/expr/datatype_index.h | 4 +- src/expr/dtype.cpp | 6 +- src/expr/dtype.h | 4 +- src/expr/dtype_cons.cpp | 8 +- src/expr/dtype_cons.h | 4 +- src/expr/dtype_selector.cpp | 6 +- src/expr/dtype_selector.h | 4 +- src/expr/emptybag.cpp | 4 +- src/expr/emptybag.h | 4 +- src/expr/emptyset.cpp | 4 +- src/expr/emptyset.h | 4 +- src/expr/expr_iomanip.cpp | 7 +- src/expr/expr_iomanip.h | 6 +- src/expr/kind_map.h | 4 +- src/expr/kind_template.cpp | 25 +- src/expr/kind_template.h | 30 +- src/expr/lazy_proof.cpp | 6 +- src/expr/lazy_proof.h | 4 +- src/expr/lazy_proof_chain.cpp | 4 +- src/expr/lazy_proof_chain.h | 4 +- src/expr/match_trie.cpp | 6 +- src/expr/match_trie.h | 4 +- src/expr/metakind_template.cpp | 52 +- src/expr/metakind_template.h | 60 +- src/expr/mkexpr | 8 +- src/expr/mkkind | 6 +- src/expr/mkmetakind | 18 +- src/expr/node.cpp | 4 +- src/expr/node.h | 34 +- src/expr/node_algorithm.cpp | 4 +- src/expr/node_algorithm.h | 4 +- src/expr/node_builder.h | 20 +- src/expr/node_manager.cpp | 12 +- src/expr/node_manager.h | 16 +- src/expr/node_manager_attributes.h | 8 +- src/expr/node_self_iterator.h | 6 +- src/expr/node_traversal.cpp | 4 +- src/expr/node_traversal.h | 4 +- src/expr/node_trie.cpp | 4 +- src/expr/node_trie.h | 4 +- src/expr/node_value.cpp | 6 +- src/expr/node_value.h | 48 +- src/expr/node_visitor.h | 4 +- src/expr/proof.cpp | 6 +- src/expr/proof.h | 4 +- src/expr/proof_checker.cpp | 6 +- src/expr/proof_checker.h | 4 +- src/expr/proof_ensure_closed.cpp | 4 +- src/expr/proof_ensure_closed.h | 4 +- src/expr/proof_generator.cpp | 4 +- src/expr/proof_generator.h | 4 +- src/expr/proof_node.cpp | 4 +- src/expr/proof_node.h | 4 +- src/expr/proof_node_algorithm.cpp | 4 +- src/expr/proof_node_algorithm.h | 4 +- src/expr/proof_node_manager.cpp | 6 +- src/expr/proof_node_manager.h | 4 +- src/expr/proof_node_to_sexpr.cpp | 6 +- src/expr/proof_node_to_sexpr.h | 4 +- src/expr/proof_node_updater.cpp | 4 +- src/expr/proof_node_updater.h | 4 +- src/expr/proof_rule.cpp | 4 +- src/expr/proof_rule.h | 4 +- src/expr/proof_set.h | 4 +- src/expr/proof_step_buffer.cpp | 6 +- src/expr/proof_step_buffer.h | 4 +- src/expr/record.cpp | 5 +- src/expr/record.h | 8 +- src/expr/sequence.cpp | 4 +- src/expr/sequence.h | 6 +- src/expr/skolem_manager.cpp | 6 +- src/expr/skolem_manager.h | 4 +- src/expr/subs.cpp | 4 +- src/expr/subs.h | 4 +- src/expr/sygus_datatype.cpp | 6 +- src/expr/sygus_datatype.h | 4 +- src/expr/symbol_manager.cpp | 6 +- src/expr/symbol_manager.h | 4 +- src/expr/symbol_table.cpp | 10 +- src/expr/symbol_table.h | 4 +- src/expr/tconv_seq_proof_generator.cpp | 4 +- src/expr/tconv_seq_proof_generator.h | 4 +- src/expr/term_canonize.cpp | 6 +- src/expr/term_canonize.h | 4 +- src/expr/term_context.cpp | 4 +- src/expr/term_context.h | 4 +- src/expr/term_context_node.cpp | 4 +- src/expr/term_context_node.h | 4 +- src/expr/term_context_stack.cpp | 4 +- src/expr/term_context_stack.h | 4 +- src/expr/term_conversion_proof_generator.cpp | 6 +- src/expr/term_conversion_proof_generator.h | 4 +- src/expr/type_checker.h | 6 +- src/expr/type_checker_template.cpp | 6 +- src/expr/type_checker_util.h | 4 +- src/expr/type_matcher.cpp | 4 +- src/expr/type_matcher.h | 4 +- src/expr/type_node.cpp | 6 +- src/expr/type_node.h | 18 +- src/expr/type_properties_template.h | 6 +- src/expr/uninterpreted_constant.cpp | 4 +- src/expr/uninterpreted_constant.h | 4 +- src/main/command_executor.cpp | 6 +- src/main/command_executor.h | 13 +- src/main/driver_unified.cpp | 63 +- src/main/interactive_shell.cpp | 4 +- src/main/interactive_shell.h | 6 +- src/main/main.cpp | 6 +- src/main/main.h | 14 +- src/main/signal_handlers.cpp | 6 +- src/main/signal_handlers.h | 4 +- src/main/time_limit.cpp | 4 +- src/main/time_limit.h | 4 +- src/options/README | 2 +- src/options/base_handlers.h | 6 +- src/options/decision_weight.h | 6 +- src/options/didyoumean.cpp | 4 +- src/options/didyoumean.h | 4 +- src/options/didyoumean_test.cpp | 2 +- src/options/language.cpp | 8 +- src/options/language.h | 12 +- src/options/module_template.cpp | 6 +- src/options/module_template.h | 11 +- src/options/open_ostream.cpp | 4 +- src/options/open_ostream.h | 4 +- src/options/option_exception.cpp | 4 +- src/options/option_exception.h | 22 +- src/options/options.h | 6 +- src/options/options_handler.cpp | 27 +- src/options/options_handler.h | 6 +- src/options/options_holder_template.h | 13 +- src/options/options_listener.h | 4 +- src/options/options_public_functions.cpp | 4 +- src/options/options_template.cpp | 19 +- src/options/printer_modes.cpp | 4 +- src/options/printer_modes.h | 4 +- src/options/set_language.cpp | 6 +- src/options/set_language.h | 6 +- src/parser/antlr_input.cpp | 12 +- src/parser/antlr_input.h | 6 +- src/parser/antlr_input_imports.cpp | 4 +- src/parser/antlr_line_buffered_input.cpp | 16 +- src/parser/antlr_line_buffered_input.h | 6 +- src/parser/bounded_token_buffer.cpp | 7 +- src/parser/bounded_token_buffer.h | 6 +- src/parser/bounded_token_factory.cpp | 6 +- src/parser/bounded_token_factory.h | 6 +- src/parser/cvc/Cvc.g | 290 ++-- src/parser/cvc/cvc.cpp | 4 +- src/parser/cvc/cvc.h | 4 +- src/parser/cvc/cvc_input.cpp | 6 +- src/parser/cvc/cvc_input.h | 9 +- src/parser/input.cpp | 12 +- src/parser/input.h | 6 +- src/parser/line_buffer.cpp | 4 +- src/parser/line_buffer.h | 4 +- src/parser/memory_mapped_input_buffer.cpp | 6 +- src/parser/memory_mapped_input_buffer.h | 6 +- src/parser/parse_op.cpp | 4 +- src/parser/parse_op.h | 4 +- src/parser/parser.cpp | 8 +- src/parser/parser.h | 6 +- src/parser/parser_builder.cpp | 6 +- src/parser/parser_builder.h | 6 +- src/parser/parser_exception.h | 6 +- src/parser/smt2/Smt2.g | 228 +-- src/parser/smt2/smt2.cpp | 4 +- src/parser/smt2/smt2.h | 4 +- src/parser/smt2/smt2_input.cpp | 6 +- src/parser/smt2/smt2_input.h | 9 +- src/parser/smt2/sygus_input.cpp | 6 +- src/parser/smt2/sygus_input.h | 9 +- src/parser/tptp/Tptp.g | 188 +-- src/parser/tptp/tptp.cpp | 8 +- src/parser/tptp/tptp.h | 19 +- src/parser/tptp/tptp_input.cpp | 6 +- src/parser/tptp/tptp_input.h | 9 +- src/preprocessing/assertion_pipeline.cpp | 4 +- src/preprocessing/assertion_pipeline.h | 4 +- src/preprocessing/passes/ackermann.cpp | 8 +- src/preprocessing/passes/ackermann.h | 4 +- src/preprocessing/passes/apply_substs.cpp | 4 +- src/preprocessing/passes/apply_substs.h | 4 +- src/preprocessing/passes/bool_to_bv.cpp | 6 +- src/preprocessing/passes/bool_to_bv.h | 4 +- src/preprocessing/passes/bv_abstraction.cpp | 6 +- src/preprocessing/passes/bv_abstraction.h | 4 +- src/preprocessing/passes/bv_eager_atoms.cpp | 4 +- src/preprocessing/passes/bv_eager_atoms.h | 4 +- src/preprocessing/passes/bv_gauss.cpp | 12 +- src/preprocessing/passes/bv_gauss.h | 4 +- src/preprocessing/passes/bv_intro_pow2.cpp | 11 +- src/preprocessing/passes/bv_intro_pow2.h | 4 +- src/preprocessing/passes/bv_to_bool.cpp | 6 +- src/preprocessing/passes/bv_to_bool.h | 4 +- src/preprocessing/passes/bv_to_int.cpp | 8 +- src/preprocessing/passes/bv_to_int.h | 4 +- .../passes/extended_rewriter_pass.cpp | 4 +- .../passes/extended_rewriter_pass.h | 4 +- .../passes/foreign_theory_rewrite.cpp | 6 +- .../passes/foreign_theory_rewrite.h | 4 +- src/preprocessing/passes/fun_def_fmf.cpp | 10 +- src/preprocessing/passes/fun_def_fmf.h | 4 +- src/preprocessing/passes/global_negate.cpp | 8 +- src/preprocessing/passes/global_negate.h | 4 +- src/preprocessing/passes/ho_elim.cpp | 6 +- src/preprocessing/passes/ho_elim.h | 4 +- src/preprocessing/passes/int_to_bv.cpp | 6 +- src/preprocessing/passes/int_to_bv.h | 4 +- src/preprocessing/passes/ite_removal.cpp | 6 +- src/preprocessing/passes/ite_removal.h | 4 +- src/preprocessing/passes/ite_simp.cpp | 10 +- src/preprocessing/passes/ite_simp.h | 4 +- src/preprocessing/passes/miplib_trick.cpp | 6 +- src/preprocessing/passes/miplib_trick.h | 4 +- src/preprocessing/passes/nl_ext_purify.cpp | 6 +- src/preprocessing/passes/nl_ext_purify.h | 4 +- src/preprocessing/passes/non_clausal_simp.cpp | 8 +- src/preprocessing/passes/non_clausal_simp.h | 4 +- .../passes/pseudo_boolean_processor.cpp | 8 +- .../passes/pseudo_boolean_processor.h | 4 +- .../passes/quantifier_macros.cpp | 10 +- src/preprocessing/passes/quantifier_macros.h | 4 +- .../passes/quantifiers_preprocess.cpp | 6 +- .../passes/quantifiers_preprocess.h | 4 +- src/preprocessing/passes/real_to_int.cpp | 6 +- src/preprocessing/passes/real_to_int.h | 4 +- src/preprocessing/passes/rewrite.cpp | 7 +- src/preprocessing/passes/rewrite.h | 4 +- src/preprocessing/passes/sep_skolem_emp.cpp | 6 +- src/preprocessing/passes/sep_skolem_emp.h | 4 +- src/preprocessing/passes/sort_infer.cpp | 4 +- src/preprocessing/passes/sort_infer.h | 4 +- src/preprocessing/passes/static_learning.cpp | 4 +- src/preprocessing/passes/static_learning.h | 4 +- src/preprocessing/passes/strings_eager_pp.cpp | 6 +- src/preprocessing/passes/strings_eager_pp.h | 4 +- src/preprocessing/passes/sygus_inference.cpp | 8 +- src/preprocessing/passes/sygus_inference.h | 4 +- src/preprocessing/passes/synth_rew_rules.cpp | 6 +- src/preprocessing/passes/synth_rew_rules.h | 4 +- .../passes/theory_preprocess.cpp | 6 +- src/preprocessing/passes/theory_preprocess.h | 4 +- .../passes/theory_rewrite_eq.cpp | 6 +- src/preprocessing/passes/theory_rewrite_eq.h | 4 +- .../passes/unconstrained_simplifier.cpp | 6 +- .../passes/unconstrained_simplifier.h | 4 +- src/preprocessing/preprocessing_pass.cpp | 4 +- src/preprocessing/preprocessing_pass.h | 4 +- .../preprocessing_pass_context.cpp | 4 +- .../preprocessing_pass_context.h | 4 +- .../preprocessing_pass_registry.cpp | 6 +- .../preprocessing_pass_registry.h | 4 +- src/preprocessing/util/ite_utilities.cpp | 4 +- src/preprocessing/util/ite_utilities.h | 4 +- src/printer/ast/ast_printer.cpp | 8 +- src/printer/ast/ast_printer.h | 8 +- src/printer/cvc/cvc_printer.cpp | 8 +- src/printer/cvc/cvc_printer.h | 8 +- src/printer/let_binding.cpp | 4 +- src/printer/let_binding.h | 4 +- src/printer/printer.cpp | 6 +- src/printer/printer.h | 4 +- src/printer/smt2/smt2_printer.cpp | 30 +- src/printer/smt2/smt2_printer.h | 8 +- src/printer/tptp/tptp_printer.cpp | 8 +- src/printer/tptp/tptp_printer.h | 8 +- src/proof/clause_id.h | 4 +- src/proof/cnf_proof.cpp | 4 +- src/proof/cnf_proof.h | 86 +- src/proof/dot/dot_printer.cpp | 4 +- src/proof/dot/dot_printer.h | 4 +- src/proof/proof_manager.cpp | 4 +- src/proof/proof_manager.h | 16 +- src/proof/sat_proof.h | 8 +- src/proof/sat_proof_implementation.h | 19 +- src/proof/unsat_core.cpp | 4 +- src/proof/unsat_core.h | 4 +- src/prop/README.minisat | 2 +- src/prop/bv_sat_solver_notify.h | 4 +- src/prop/bvminisat/bvminisat.cpp | 6 +- src/prop/bvminisat/bvminisat.h | 6 +- src/prop/bvminisat/core/Dimacs.h | 6 +- src/prop/bvminisat/core/Solver.cc | 12 +- src/prop/bvminisat/core/Solver.h | 310 ++-- src/prop/bvminisat/core/SolverTypes.h | 10 +- src/prop/bvminisat/mtl/Alg.h | 6 +- src/prop/bvminisat/mtl/Alloc.h | 6 +- src/prop/bvminisat/mtl/Heap.h | 7 +- src/prop/bvminisat/mtl/Map.h | 6 +- src/prop/bvminisat/mtl/Queue.h | 6 +- src/prop/bvminisat/mtl/Sort.h | 7 +- src/prop/bvminisat/mtl/Vec.h | 6 +- src/prop/bvminisat/mtl/XAlloc.h | 7 +- src/prop/bvminisat/simp/SimpSolver.cc | 123 +- src/prop/bvminisat/simp/SimpSolver.h | 13 +- src/prop/bvminisat/utils/Options.cc | 7 +- src/prop/bvminisat/utils/Options.h | 6 +- src/prop/bvminisat/utils/ParseUtils.h | 6 +- src/prop/bvminisat/utils/System.cc | 5 +- src/prop/bvminisat/utils/System.h | 21 +- src/prop/cadical.cpp | 4 +- src/prop/cadical.h | 4 +- src/prop/cnf_stream.cpp | 6 +- src/prop/cnf_stream.h | 4 +- src/prop/cryptominisat.cpp | 4 +- src/prop/cryptominisat.h | 4 +- src/prop/kissat.cpp | 4 +- src/prop/kissat.h | 4 +- src/prop/minisat/core/Dimacs.h | 4 +- src/prop/minisat/core/Solver.cc | 40 +- src/prop/minisat/core/Solver.h | 43 +- src/prop/minisat/core/SolverTypes.h | 17 +- src/prop/minisat/minisat.cpp | 23 +- src/prop/minisat/minisat.h | 8 +- src/prop/minisat/mtl/Alg.h | 4 +- src/prop/minisat/mtl/Alloc.h | 4 +- src/prop/minisat/mtl/Heap.h | 4 +- src/prop/minisat/mtl/Map.h | 4 +- src/prop/minisat/mtl/Queue.h | 4 +- src/prop/minisat/mtl/Sort.h | 5 +- src/prop/minisat/mtl/Vec.h | 4 +- src/prop/minisat/mtl/XAlloc.h | 4 +- src/prop/minisat/simp/SimpSolver.cc | 10 +- src/prop/minisat/simp/SimpSolver.h | 16 +- src/prop/minisat/utils/Options.h | 4 +- src/prop/minisat/utils/ParseUtils.h | 4 +- src/prop/proof_cnf_stream.cpp | 4 +- src/prop/proof_cnf_stream.h | 4 +- src/prop/proof_post_processor.cpp | 4 +- src/prop/proof_post_processor.h | 4 +- src/prop/prop_engine.cpp | 4 +- src/prop/prop_engine.h | 4 +- src/prop/prop_proof_manager.cpp | 4 +- src/prop/prop_proof_manager.h | 4 +- src/prop/registrar.h | 6 +- src/prop/sat_proof_manager.cpp | 4 +- src/prop/sat_proof_manager.h | 4 +- src/prop/sat_solver.h | 8 +- src/prop/sat_solver_factory.cpp | 4 +- src/prop/sat_solver_factory.h | 4 +- src/prop/sat_solver_types.cpp | 4 +- src/prop/sat_solver_types.h | 4 +- src/prop/skolem_def_manager.cpp | 4 +- src/prop/skolem_def_manager.h | 4 +- src/prop/theory_proxy.cpp | 8 +- src/prop/theory_proxy.h | 6 +- src/smt/abduction_solver.cpp | 6 +- src/smt/abduction_solver.h | 4 +- src/smt/abstract_values.cpp | 4 +- src/smt/abstract_values.h | 4 +- src/smt/assertions.cpp | 8 +- src/smt/assertions.h | 4 +- src/smt/check_models.cpp | 6 +- src/smt/check_models.h | 4 +- src/smt/command.cpp | 4 +- src/smt/command.h | 4 +- src/smt/defined_function.h | 4 +- src/smt/dump.cpp | 14 +- src/smt/dump.h | 6 +- src/smt/dump_manager.cpp | 4 +- src/smt/dump_manager.h | 4 +- src/smt/env.cpp | 6 +- src/smt/env.h | 4 +- src/smt/expand_definitions.cpp | 10 +- src/smt/expand_definitions.h | 4 +- src/smt/interpolation_solver.cpp | 6 +- src/smt/interpolation_solver.h | 4 +- src/smt/listeners.cpp | 4 +- src/smt/listeners.h | 4 +- src/smt/logic_exception.h | 6 +- src/smt/managed_ostreams.cpp | 4 +- src/smt/managed_ostreams.h | 4 +- src/smt/model.cpp | 4 +- src/smt/model.h | 6 +- src/smt/model_blocker.cpp | 6 +- src/smt/model_blocker.h | 4 +- src/smt/model_core_builder.cpp | 6 +- src/smt/model_core_builder.h | 4 +- src/smt/node_command.cpp | 4 +- src/smt/node_command.h | 4 +- src/smt/optimization_solver.cpp | 6 +- src/smt/optimization_solver.h | 4 +- src/smt/options_manager.cpp | 4 +- src/smt/options_manager.h | 4 +- src/smt/output_manager.cpp | 4 +- src/smt/output_manager.h | 4 +- src/smt/preprocess_proof_generator.cpp | 4 +- src/smt/preprocess_proof_generator.h | 4 +- src/smt/preprocessor.cpp | 8 +- src/smt/preprocessor.h | 4 +- src/smt/process_assertions.cpp | 10 +- src/smt/process_assertions.h | 4 +- src/smt/proof_manager.cpp | 4 +- src/smt/proof_manager.h | 4 +- src/smt/proof_post_processor.cpp | 8 +- src/smt/proof_post_processor.h | 4 +- src/smt/quant_elim_solver.cpp | 8 +- src/smt/quant_elim_solver.h | 4 +- src/smt/set_defaults.cpp | 6 +- src/smt/set_defaults.h | 4 +- src/smt/smt_engine.cpp | 16 +- src/smt/smt_engine.h | 23 +- src/smt/smt_engine_scope.cpp | 6 +- src/smt/smt_engine_scope.h | 7 +- src/smt/smt_engine_state.cpp | 4 +- src/smt/smt_engine_state.h | 4 +- src/smt/smt_engine_stats.cpp | 4 +- src/smt/smt_engine_stats.h | 4 +- src/smt/smt_mode.cpp | 4 +- src/smt/smt_mode.h | 4 +- src/smt/smt_solver.cpp | 4 +- src/smt/smt_solver.h | 4 +- src/smt/smt_statistics_registry.cpp | 4 +- src/smt/smt_statistics_registry.h | 4 +- src/smt/sygus_solver.cpp | 8 +- src/smt/sygus_solver.h | 4 +- src/smt/term_formula_removal.cpp | 4 +- src/smt/term_formula_removal.h | 4 +- src/smt/unsat_core_manager.cpp | 4 +- src/smt/unsat_core_manager.h | 4 +- src/smt/update_ostream.h | 4 +- src/smt/witness_form.cpp | 4 +- src/smt/witness_form.h | 4 +- src/smt_util/boolean_simplification.cpp | 4 +- src/smt_util/boolean_simplification.h | 4 +- src/smt_util/nary_builder.cpp | 4 +- src/smt_util/nary_builder.h | 4 +- src/theory/arith/approx_simplex.cpp | 34 +- src/theory/arith/approx_simplex.h | 9 +- src/theory/arith/arith_ite_utils.cpp | 11 +- src/theory/arith/arith_ite_utils.h | 8 +- src/theory/arith/arith_msum.cpp | 8 +- src/theory/arith/arith_msum.h | 6 +- src/theory/arith/arith_preprocess.cpp | 4 +- src/theory/arith/arith_preprocess.h | 4 +- src/theory/arith/arith_rewriter.cpp | 10 +- src/theory/arith/arith_rewriter.h | 8 +- src/theory/arith/arith_state.cpp | 4 +- src/theory/arith/arith_state.h | 4 +- src/theory/arith/arith_static_learner.cpp | 10 +- src/theory/arith/arith_static_learner.h | 8 +- src/theory/arith/arith_utilities.cpp | 6 +- src/theory/arith/arith_utilities.h | 8 +- src/theory/arith/arithvar.cpp | 8 +- src/theory/arith/arithvar.h | 9 +- src/theory/arith/arithvar_node_map.h | 8 +- src/theory/arith/attempt_solution_simplex.cpp | 8 +- src/theory/arith/attempt_solution_simplex.h | 8 +- src/theory/arith/bound_counts.h | 8 +- src/theory/arith/bound_inference.cpp | 4 +- src/theory/arith/bound_inference.h | 4 +- src/theory/arith/callbacks.cpp | 8 +- src/theory/arith/callbacks.h | 8 +- src/theory/arith/congruence_manager.cpp | 8 +- src/theory/arith/congruence_manager.h | 8 +- src/theory/arith/constraint.cpp | 10 +- src/theory/arith/constraint.h | 9 +- src/theory/arith/constraint_forward.h | 8 +- src/theory/arith/cut_log.cpp | 8 +- src/theory/arith/cut_log.h | 10 +- src/theory/arith/delta_rational.cpp | 4 +- src/theory/arith/delta_rational.h | 45 +- src/theory/arith/dio_solver.cpp | 8 +- src/theory/arith/dio_solver.h | 8 +- src/theory/arith/dual_simplex.cpp | 8 +- src/theory/arith/dual_simplex.h | 8 +- src/theory/arith/error_set.cpp | 8 +- src/theory/arith/error_set.h | 8 +- src/theory/arith/fc_simplex.cpp | 8 +- src/theory/arith/fc_simplex.h | 8 +- src/theory/arith/infer_bounds.cpp | 4 +- src/theory/arith/infer_bounds.h | 5 +- src/theory/arith/inference_manager.cpp | 4 +- src/theory/arith/inference_manager.h | 4 +- src/theory/arith/kinds | 64 +- src/theory/arith/linear_equality.cpp | 8 +- src/theory/arith/linear_equality.h | 8 +- src/theory/arith/matrix.cpp | 8 +- src/theory/arith/matrix.h | 13 +- src/theory/arith/nl/cad/cdcac.cpp | 6 +- src/theory/arith/nl/cad/cdcac.h | 4 +- src/theory/arith/nl/cad/cdcac_utils.cpp | 4 +- src/theory/arith/nl/cad/cdcac_utils.h | 4 +- src/theory/arith/nl/cad/constraints.cpp | 4 +- src/theory/arith/nl/cad/constraints.h | 4 +- src/theory/arith/nl/cad/projections.cpp | 4 +- src/theory/arith/nl/cad/projections.h | 4 +- src/theory/arith/nl/cad/proof_checker.cpp | 6 +- src/theory/arith/nl/cad/proof_checker.h | 4 +- src/theory/arith/nl/cad/proof_generator.cpp | 4 +- src/theory/arith/nl/cad/proof_generator.h | 4 +- src/theory/arith/nl/cad/variable_ordering.cpp | 4 +- src/theory/arith/nl/cad/variable_ordering.h | 4 +- src/theory/arith/nl/cad_solver.cpp | 4 +- src/theory/arith/nl/cad_solver.h | 4 +- src/theory/arith/nl/ext/constraint.cpp | 6 +- src/theory/arith/nl/ext/constraint.h | 4 +- src/theory/arith/nl/ext/ext_state.cpp | 5 +- src/theory/arith/nl/ext/ext_state.h | 4 +- src/theory/arith/nl/ext/factoring_check.cpp | 4 +- src/theory/arith/nl/ext/factoring_check.h | 4 +- src/theory/arith/nl/ext/monomial.cpp | 6 +- src/theory/arith/nl/ext/monomial.h | 4 +- .../arith/nl/ext/monomial_bounds_check.cpp | 4 +- .../arith/nl/ext/monomial_bounds_check.h | 4 +- src/theory/arith/nl/ext/monomial_check.cpp | 4 +- src/theory/arith/nl/ext/monomial_check.h | 4 +- src/theory/arith/nl/ext/proof_checker.cpp | 6 +- src/theory/arith/nl/ext/proof_checker.h | 4 +- src/theory/arith/nl/ext/split_zero_check.cpp | 4 +- src/theory/arith/nl/ext/split_zero_check.h | 4 +- .../arith/nl/ext/tangent_plane_check.cpp | 4 +- src/theory/arith/nl/ext/tangent_plane_check.h | 4 +- src/theory/arith/nl/ext_theory_callback.cpp | 6 +- src/theory/arith/nl/ext_theory_callback.h | 4 +- src/theory/arith/nl/iand_solver.cpp | 6 +- src/theory/arith/nl/iand_solver.h | 4 +- src/theory/arith/nl/iand_utils.cpp | 4 +- src/theory/arith/nl/iand_utils.h | 4 +- src/theory/arith/nl/icp/candidate.cpp | 4 +- src/theory/arith/nl/icp/candidate.h | 4 +- .../arith/nl/icp/contraction_origins.cpp | 4 +- src/theory/arith/nl/icp/contraction_origins.h | 4 +- src/theory/arith/nl/icp/icp_solver.cpp | 4 +- src/theory/arith/nl/icp/icp_solver.h | 4 +- src/theory/arith/nl/icp/intersection.cpp | 4 +- src/theory/arith/nl/icp/intersection.h | 4 +- src/theory/arith/nl/icp/interval.h | 4 +- src/theory/arith/nl/nl_lemma_utils.cpp | 4 +- src/theory/arith/nl/nl_lemma_utils.h | 4 +- src/theory/arith/nl/nl_model.cpp | 6 +- src/theory/arith/nl/nl_model.h | 4 +- src/theory/arith/nl/nonlinear_extension.cpp | 6 +- src/theory/arith/nl/nonlinear_extension.h | 4 +- src/theory/arith/nl/poly_conversion.cpp | 28 +- src/theory/arith/nl/poly_conversion.h | 30 +- src/theory/arith/nl/stats.cpp | 4 +- src/theory/arith/nl/stats.h | 4 +- src/theory/arith/nl/strategy.cpp | 4 +- src/theory/arith/nl/strategy.h | 4 +- .../nl/transcendental/exponential_solver.cpp | 4 +- .../nl/transcendental/exponential_solver.h | 4 +- .../arith/nl/transcendental/proof_checker.cpp | 6 +- .../arith/nl/transcendental/proof_checker.h | 4 +- .../arith/nl/transcendental/sine_solver.cpp | 4 +- .../arith/nl/transcendental/sine_solver.h | 4 +- .../nl/transcendental/taylor_generator.cpp | 4 +- .../nl/transcendental/taylor_generator.h | 4 +- .../transcendental/transcendental_solver.cpp | 6 +- .../nl/transcendental/transcendental_solver.h | 4 +- .../transcendental/transcendental_state.cpp | 4 +- .../nl/transcendental/transcendental_state.h | 4 +- src/theory/arith/normal_form.cpp | 4 +- src/theory/arith/normal_form.h | 9 +- src/theory/arith/operator_elim.cpp | 6 +- src/theory/arith/operator_elim.h | 4 +- src/theory/arith/partial_model.cpp | 8 +- src/theory/arith/partial_model.h | 9 +- src/theory/arith/proof_checker.cpp | 4 +- src/theory/arith/proof_checker.h | 4 +- src/theory/arith/proof_macros.h | 12 +- src/theory/arith/rewrites.cpp | 4 +- src/theory/arith/rewrites.h | 4 +- src/theory/arith/simplex.cpp | 8 +- src/theory/arith/simplex.h | 8 +- src/theory/arith/simplex_update.cpp | 8 +- src/theory/arith/simplex_update.h | 8 +- src/theory/arith/soi_simplex.cpp | 8 +- src/theory/arith/soi_simplex.h | 8 +- src/theory/arith/tableau.cpp | 8 +- src/theory/arith/tableau.h | 10 +- src/theory/arith/tableau_sizes.cpp | 8 +- src/theory/arith/tableau_sizes.h | 9 +- src/theory/arith/theory_arith.cpp | 10 +- src/theory/arith/theory_arith.h | 8 +- src/theory/arith/theory_arith_private.cpp | 10 +- src/theory/arith/theory_arith_private.h | 8 +- src/theory/arith/theory_arith_type_rules.h | 8 +- src/theory/arith/type_enumerator.h | 8 +- src/theory/arrays/array_info.cpp | 9 +- src/theory/arrays/array_info.h | 8 +- src/theory/arrays/inference_manager.cpp | 6 +- src/theory/arrays/inference_manager.h | 4 +- src/theory/arrays/kinds | 36 +- src/theory/arrays/proof_checker.cpp | 4 +- src/theory/arrays/proof_checker.h | 4 +- src/theory/arrays/skolem_cache.cpp | 6 +- src/theory/arrays/skolem_cache.h | 4 +- src/theory/arrays/theory_arrays.cpp | 8 +- src/theory/arrays/theory_arrays.h | 8 +- src/theory/arrays/theory_arrays_rewriter.cpp | 10 +- src/theory/arrays/theory_arrays_rewriter.h | 8 +- src/theory/arrays/theory_arrays_type_rules.h | 8 +- src/theory/arrays/type_enumerator.h | 8 +- src/theory/arrays/union_find.cpp | 8 +- src/theory/arrays/union_find.h | 10 +- src/theory/assertion.cpp | 6 +- src/theory/assertion.h | 6 +- src/theory/atom_requests.cpp | 2 +- src/theory/atom_requests.h | 8 +- src/theory/bags/bag_solver.cpp | 8 +- src/theory/bags/bag_solver.h | 4 +- src/theory/bags/bags_rewriter.cpp | 6 +- src/theory/bags/bags_rewriter.h | 4 +- src/theory/bags/bags_statistics.cpp | 4 +- src/theory/bags/bags_statistics.h | 4 +- src/theory/bags/infer_info.cpp | 4 +- src/theory/bags/infer_info.h | 4 +- src/theory/bags/inference_generator.cpp | 4 +- src/theory/bags/inference_generator.h | 4 +- src/theory/bags/inference_manager.cpp | 6 +- src/theory/bags/inference_manager.h | 4 +- src/theory/bags/kinds | 58 +- src/theory/bags/make_bag_op.cpp | 4 +- src/theory/bags/make_bag_op.h | 4 +- src/theory/bags/normal_form.cpp | 6 +- src/theory/bags/normal_form.h | 4 +- src/theory/bags/rewrites.cpp | 4 +- src/theory/bags/rewrites.h | 4 +- src/theory/bags/solver_state.cpp | 6 +- src/theory/bags/solver_state.h | 4 +- src/theory/bags/term_registry.cpp | 6 +- src/theory/bags/term_registry.h | 4 +- src/theory/bags/theory_bags.cpp | 6 +- src/theory/bags/theory_bags.h | 4 +- .../bags/theory_bags_type_enumerator.cpp | 4 +- src/theory/bags/theory_bags_type_enumerator.h | 4 +- src/theory/bags/theory_bags_type_rules.cpp | 4 +- src/theory/bags/theory_bags_type_rules.h | 4 +- src/theory/booleans/circuit_propagator.cpp | 4 +- src/theory/booleans/circuit_propagator.h | 4 +- src/theory/booleans/kinds | 22 +- src/theory/booleans/proof_checker.cpp | 4 +- src/theory/booleans/proof_checker.h | 4 +- .../booleans/proof_circuit_propagator.cpp | 4 +- .../booleans/proof_circuit_propagator.h | 4 +- src/theory/booleans/theory_bool.cpp | 8 +- src/theory/booleans/theory_bool.h | 8 +- src/theory/booleans/theory_bool_rewriter.cpp | 8 +- src/theory/booleans/theory_bool_rewriter.h | 8 +- src/theory/booleans/theory_bool_type_rules.h | 8 +- src/theory/booleans/type_enumerator.h | 8 +- src/theory/builtin/kinds | 56 +- src/theory/builtin/proof_checker.cpp | 6 +- src/theory/builtin/proof_checker.h | 4 +- src/theory/builtin/theory_builtin.cpp | 4 +- src/theory/builtin/theory_builtin.h | 4 +- .../builtin/theory_builtin_rewriter.cpp | 8 +- src/theory/builtin/theory_builtin_rewriter.h | 8 +- .../builtin/theory_builtin_type_rules.cpp | 4 +- .../builtin/theory_builtin_type_rules.h | 8 +- src/theory/builtin/type_enumerator.cpp | 8 +- src/theory/builtin/type_enumerator.h | 8 +- src/theory/bv/abstraction.cpp | 10 +- src/theory/bv/abstraction.h | 4 +- src/theory/bv/bitblast/aig_bitblaster.cpp | 6 +- src/theory/bv/bitblast/aig_bitblaster.h | 4 +- .../bitblast/bitblast_strategies_template.h | 4 +- src/theory/bv/bitblast/bitblast_utils.h | 4 +- src/theory/bv/bitblast/bitblaster.h | 4 +- src/theory/bv/bitblast/eager_bitblaster.cpp | 4 +- src/theory/bv/bitblast/eager_bitblaster.h | 4 +- src/theory/bv/bitblast/lazy_bitblaster.cpp | 4 +- src/theory/bv/bitblast/lazy_bitblaster.h | 4 +- src/theory/bv/bitblast/proof_bitblaster.cpp | 4 +- src/theory/bv/bitblast/proof_bitblaster.h | 4 +- src/theory/bv/bitblast/simple_bitblaster.cpp | 4 +- src/theory/bv/bitblast/simple_bitblaster.h | 4 +- src/theory/bv/bv_eager_solver.cpp | 4 +- src/theory/bv/bv_eager_solver.h | 4 +- src/theory/bv/bv_inequality_graph.cpp | 19 +- src/theory/bv/bv_inequality_graph.h | 4 +- src/theory/bv/bv_quick_check.cpp | 6 +- src/theory/bv/bv_quick_check.h | 4 +- src/theory/bv/bv_solver.h | 4 +- src/theory/bv/bv_solver_bitblast.cpp | 4 +- src/theory/bv/bv_solver_bitblast.h | 4 +- src/theory/bv/bv_solver_lazy.cpp | 6 +- src/theory/bv/bv_solver_lazy.h | 4 +- src/theory/bv/bv_solver_simple.cpp | 4 +- src/theory/bv/bv_solver_simple.h | 4 +- src/theory/bv/bv_subtheory.h | 4 +- src/theory/bv/bv_subtheory_algebraic.cpp | 12 +- src/theory/bv/bv_subtheory_algebraic.h | 4 +- src/theory/bv/bv_subtheory_bitblast.cpp | 10 +- src/theory/bv/bv_subtheory_bitblast.h | 4 +- src/theory/bv/bv_subtheory_core.cpp | 10 +- src/theory/bv/bv_subtheory_core.h | 4 +- src/theory/bv/bv_subtheory_inequality.cpp | 10 +- src/theory/bv/bv_subtheory_inequality.h | 4 +- src/theory/bv/int_blaster.h | 4 +- src/theory/bv/kinds | 164 +- src/theory/bv/proof_checker.cpp | 4 +- src/theory/bv/proof_checker.h | 4 +- src/theory/bv/slicer.cpp | 6 +- src/theory/bv/slicer.h | 10 +- src/theory/bv/theory_bv.cpp | 4 +- src/theory/bv/theory_bv.h | 4 +- src/theory/bv/theory_bv_rewrite_rules.h | 4 +- ...ory_bv_rewrite_rules_constant_evaluation.h | 4 +- src/theory/bv/theory_bv_rewrite_rules_core.h | 4 +- .../theory_bv_rewrite_rules_normalization.h | 4 +- ...ry_bv_rewrite_rules_operator_elimination.h | 4 +- .../theory_bv_rewrite_rules_simplification.h | 4 +- src/theory/bv/theory_bv_rewriter.cpp | 6 +- src/theory/bv/theory_bv_rewriter.h | 8 +- src/theory/bv/theory_bv_type_rules.h | 4 +- src/theory/bv/theory_bv_utils.cpp | 10 +- src/theory/bv/theory_bv_utils.h | 4 +- src/theory/bv/type_enumerator.h | 8 +- src/theory/care_graph.h | 4 +- src/theory/combination_care_graph.cpp | 4 +- src/theory/combination_care_graph.h | 4 +- src/theory/combination_engine.cpp | 4 +- src/theory/combination_engine.h | 4 +- src/theory/datatypes/datatypes_rewriter.cpp | 12 +- src/theory/datatypes/datatypes_rewriter.h | 8 +- src/theory/datatypes/infer_proof_cons.cpp | 6 +- src/theory/datatypes/infer_proof_cons.h | 4 +- src/theory/datatypes/inference.cpp | 6 +- src/theory/datatypes/inference.h | 4 +- src/theory/datatypes/inference_manager.cpp | 6 +- src/theory/datatypes/inference_manager.h | 4 +- src/theory/datatypes/kinds | 80 +- src/theory/datatypes/proof_checker.cpp | 4 +- src/theory/datatypes/proof_checker.h | 4 +- src/theory/datatypes/sygus_datatype_utils.cpp | 8 +- src/theory/datatypes/sygus_datatype_utils.h | 4 +- src/theory/datatypes/sygus_extension.cpp | 10 +- src/theory/datatypes/sygus_extension.h | 4 +- src/theory/datatypes/sygus_simple_sym.cpp | 6 +- src/theory/datatypes/sygus_simple_sym.h | 4 +- src/theory/datatypes/theory_datatypes.cpp | 12 +- src/theory/datatypes/theory_datatypes.h | 8 +- .../datatypes/theory_datatypes_type_rules.h | 8 +- .../datatypes/theory_datatypes_utils.cpp | 8 +- src/theory/datatypes/theory_datatypes_utils.h | 4 +- src/theory/datatypes/tuple_project_op.cpp | 4 +- src/theory/datatypes/tuple_project_op.h | 4 +- src/theory/datatypes/type_enumerator.cpp | 2 +- src/theory/datatypes/type_enumerator.h | 8 +- src/theory/decision_manager.cpp | 6 +- src/theory/decision_manager.h | 4 +- src/theory/decision_strategy.cpp | 6 +- src/theory/decision_strategy.h | 4 +- src/theory/eager_proof_generator.cpp | 4 +- src/theory/eager_proof_generator.h | 4 +- src/theory/ee_manager.cpp | 4 +- src/theory/ee_manager.h | 4 +- src/theory/ee_manager_distributed.cpp | 4 +- src/theory/ee_manager_distributed.h | 4 +- src/theory/ee_setup_info.h | 4 +- src/theory/engine_output_channel.cpp | 6 +- src/theory/engine_output_channel.h | 4 +- src/theory/evaluator.cpp | 4 +- src/theory/evaluator.h | 4 +- src/theory/ext_theory.cpp | 6 +- src/theory/ext_theory.h | 6 +- src/theory/fp/fp_converter.cpp | 62 +- src/theory/fp/fp_converter.h | 6 +- src/theory/fp/kinds | 180 +- src/theory/fp/theory_fp.cpp | 15 +- src/theory/fp/theory_fp.h | 4 +- src/theory/fp/theory_fp_rewriter.cpp | 16 +- src/theory/fp/theory_fp_rewriter.h | 8 +- src/theory/fp/theory_fp_type_rules.cpp | 4 +- src/theory/fp/theory_fp_type_rules.h | 4 +- src/theory/fp/type_enumerator.h | 4 +- src/theory/inference_id.cpp | 4 +- src/theory/inference_id.h | 4 +- src/theory/inference_manager_buffered.cpp | 6 +- src/theory/inference_manager_buffered.h | 4 +- src/theory/interrupted.h | 13 +- src/theory/lazy_tree_proof_generator.cpp | 4 +- src/theory/lazy_tree_proof_generator.h | 4 +- src/theory/logic_info.cpp | 6 +- src/theory/logic_info.h | 4 +- src/theory/mkrewriter | 6 +- src/theory/mktheorytraits | 6 +- src/theory/model_manager.cpp | 4 +- src/theory/model_manager.h | 4 +- src/theory/model_manager_distributed.cpp | 4 +- src/theory/model_manager_distributed.h | 4 +- src/theory/output_channel.cpp | 4 +- src/theory/output_channel.h | 6 +- src/theory/quantifiers/alpha_equivalence.cpp | 6 +- src/theory/quantifiers/alpha_equivalence.h | 4 +- src/theory/quantifiers/bv_inverter.cpp | 6 +- src/theory/quantifiers/bv_inverter.h | 4 +- src/theory/quantifiers/bv_inverter_utils.cpp | 6 +- src/theory/quantifiers/bv_inverter_utils.h | 4 +- .../candidate_rewrite_database.cpp | 12 +- .../quantifiers/candidate_rewrite_database.h | 8 +- .../quantifiers/candidate_rewrite_filter.cpp | 6 +- .../quantifiers/candidate_rewrite_filter.h | 4 +- .../cegqi/ceg_arith_instantiator.cpp | 8 +- .../cegqi/ceg_arith_instantiator.h | 4 +- .../quantifiers/cegqi/ceg_bv_instantiator.cpp | 6 +- .../quantifiers/cegqi/ceg_bv_instantiator.h | 4 +- .../cegqi/ceg_bv_instantiator_utils.cpp | 6 +- .../cegqi/ceg_bv_instantiator_utils.h | 4 +- .../quantifiers/cegqi/ceg_dt_instantiator.cpp | 6 +- .../quantifiers/cegqi/ceg_dt_instantiator.h | 4 +- .../quantifiers/cegqi/ceg_instantiator.cpp | 10 +- .../quantifiers/cegqi/ceg_instantiator.h | 8 +- .../quantifiers/cegqi/inst_strategy_cegqi.cpp | 8 +- .../quantifiers/cegqi/inst_strategy_cegqi.h | 4 +- src/theory/quantifiers/cegqi/nested_qe.cpp | 4 +- src/theory/quantifiers/cegqi/nested_qe.h | 4 +- .../quantifiers/cegqi/vts_term_cache.cpp | 6 +- src/theory/quantifiers/cegqi/vts_term_cache.h | 4 +- .../quantifiers/conjecture_generator.cpp | 12 +- src/theory/quantifiers/conjecture_generator.h | 4 +- src/theory/quantifiers/dynamic_rewrite.cpp | 10 +- src/theory/quantifiers/dynamic_rewrite.h | 8 +- .../ematching/candidate_generator.cpp | 6 +- .../ematching/candidate_generator.h | 8 +- .../quantifiers/ematching/ho_trigger.cpp | 6 +- src/theory/quantifiers/ematching/ho_trigger.h | 4 +- .../quantifiers/ematching/im_generator.cpp | 6 +- .../quantifiers/ematching/im_generator.h | 4 +- .../ematching/inst_match_generator.cpp | 6 +- .../ematching/inst_match_generator.h | 4 +- .../ematching/inst_match_generator_multi.cpp | 6 +- .../ematching/inst_match_generator_multi.h | 4 +- .../inst_match_generator_multi_linear.cpp | 6 +- .../inst_match_generator_multi_linear.h | 4 +- .../ematching/inst_match_generator_simple.cpp | 6 +- .../ematching/inst_match_generator_simple.h | 4 +- .../quantifiers/ematching/inst_strategy.cpp | 4 +- .../quantifiers/ematching/inst_strategy.h | 4 +- .../ematching/inst_strategy_e_matching.cpp | 12 +- .../ematching/inst_strategy_e_matching.h | 6 +- .../inst_strategy_e_matching_user.cpp | 8 +- .../ematching/inst_strategy_e_matching_user.h | 4 +- .../ematching/instantiation_engine.cpp | 10 +- .../ematching/instantiation_engine.h | 8 +- .../ematching/pattern_term_selector.cpp | 6 +- .../ematching/pattern_term_selector.h | 4 +- src/theory/quantifiers/ematching/trigger.cpp | 6 +- src/theory/quantifiers/ematching/trigger.h | 4 +- .../ematching/trigger_database.cpp | 4 +- .../quantifiers/ematching/trigger_database.h | 4 +- .../ematching/trigger_term_info.cpp | 6 +- .../quantifiers/ematching/trigger_term_info.h | 4 +- .../quantifiers/ematching/trigger_trie.cpp | 4 +- .../quantifiers/ematching/trigger_trie.h | 4 +- .../ematching/var_match_generator.cpp | 6 +- .../ematching/var_match_generator.h | 4 +- src/theory/quantifiers/equality_query.cpp | 12 +- src/theory/quantifiers/equality_query.h | 8 +- src/theory/quantifiers/expr_miner.cpp | 6 +- src/theory/quantifiers/expr_miner.h | 4 +- src/theory/quantifiers/expr_miner_manager.cpp | 4 +- src/theory/quantifiers/expr_miner_manager.h | 4 +- src/theory/quantifiers/extended_rewrite.cpp | 10 +- src/theory/quantifiers/extended_rewrite.h | 8 +- src/theory/quantifiers/first_order_model.cpp | 12 +- src/theory/quantifiers/first_order_model.h | 8 +- .../quantifiers/fmf/bounded_integers.cpp | 8 +- src/theory/quantifiers/fmf/bounded_integers.h | 4 +- .../quantifiers/fmf/first_order_model_fmc.cpp | 6 +- .../quantifiers/fmf/first_order_model_fmc.h | 4 +- .../quantifiers/fmf/full_model_check.cpp | 8 +- src/theory/quantifiers/fmf/full_model_check.h | 10 +- src/theory/quantifiers/fmf/model_builder.cpp | 10 +- src/theory/quantifiers/fmf/model_builder.h | 8 +- src/theory/quantifiers/fmf/model_engine.cpp | 8 +- src/theory/quantifiers/fmf/model_engine.h | 8 +- src/theory/quantifiers/fun_def_evaluator.cpp | 6 +- src/theory/quantifiers/fun_def_evaluator.h | 4 +- src/theory/quantifiers/index_trie.cpp | 4 +- src/theory/quantifiers/index_trie.h | 4 +- src/theory/quantifiers/inst_match.cpp | 6 +- src/theory/quantifiers/inst_match.h | 6 +- src/theory/quantifiers/inst_match_trie.cpp | 8 +- src/theory/quantifiers/inst_match_trie.h | 6 +- .../quantifiers/inst_strategy_enumerative.cpp | 8 +- .../quantifiers/inst_strategy_enumerative.h | 8 +- src/theory/quantifiers/instantiate.cpp | 12 +- src/theory/quantifiers/instantiate.h | 8 +- src/theory/quantifiers/instantiation_list.cpp | 4 +- src/theory/quantifiers/instantiation_list.h | 4 +- src/theory/quantifiers/kinds | 26 +- src/theory/quantifiers/lazy_trie.cpp | 8 +- src/theory/quantifiers/lazy_trie.h | 8 +- src/theory/quantifiers/proof_checker.cpp | 6 +- src/theory/quantifiers/proof_checker.h | 4 +- .../quantifiers/quant_bound_inference.cpp | 6 +- .../quantifiers/quant_bound_inference.h | 4 +- .../quantifiers/quant_conflict_find.cpp | 10 +- src/theory/quantifiers/quant_conflict_find.h | 8 +- src/theory/quantifiers/quant_module.cpp | 6 +- src/theory/quantifiers/quant_module.h | 4 +- src/theory/quantifiers/quant_relevance.cpp | 12 +- src/theory/quantifiers/quant_relevance.h | 8 +- .../quantifiers/quant_rep_bound_ext.cpp | 6 +- src/theory/quantifiers/quant_rep_bound_ext.h | 4 +- src/theory/quantifiers/quant_split.cpp | 6 +- src/theory/quantifiers/quant_split.h | 4 +- src/theory/quantifiers/quant_util.cpp | 8 +- src/theory/quantifiers/quant_util.h | 4 +- .../quantifiers/quantifiers_attributes.cpp | 12 +- .../quantifiers/quantifiers_attributes.h | 4 +- .../quantifiers_inference_manager.cpp | 4 +- .../quantifiers_inference_manager.h | 4 +- .../quantifiers/quantifiers_modules.cpp | 4 +- src/theory/quantifiers/quantifiers_modules.h | 7 +- .../quantifiers/quantifiers_registry.cpp | 4 +- src/theory/quantifiers/quantifiers_registry.h | 4 +- .../quantifiers/quantifiers_rewriter.cpp | 12 +- src/theory/quantifiers/quantifiers_rewriter.h | 8 +- src/theory/quantifiers/quantifiers_state.cpp | 4 +- src/theory/quantifiers/quantifiers_state.h | 4 +- .../quantifiers/quantifiers_statistics.cpp | 4 +- .../quantifiers/quantifiers_statistics.h | 4 +- src/theory/quantifiers/query_generator.cpp | 6 +- src/theory/quantifiers/query_generator.h | 4 +- src/theory/quantifiers/relevant_domain.cpp | 6 +- src/theory/quantifiers/relevant_domain.h | 9 +- .../quantifiers/single_inv_partition.cpp | 12 +- src/theory/quantifiers/single_inv_partition.h | 8 +- src/theory/quantifiers/skolemize.cpp | 10 +- src/theory/quantifiers/skolemize.h | 8 +- src/theory/quantifiers/solution_filter.cpp | 6 +- src/theory/quantifiers/solution_filter.h | 4 +- .../sygus/ce_guided_single_inv.cpp | 6 +- .../quantifiers/sygus/ce_guided_single_inv.h | 8 +- src/theory/quantifiers/sygus/cegis.cpp | 12 +- src/theory/quantifiers/sygus/cegis.h | 8 +- .../sygus/cegis_core_connective.cpp | 6 +- .../quantifiers/sygus/cegis_core_connective.h | 4 +- src/theory/quantifiers/sygus/cegis_unif.cpp | 6 +- src/theory/quantifiers/sygus/cegis_unif.h | 4 +- .../sygus/enum_stream_substitution.cpp | 6 +- .../sygus/enum_stream_substitution.h | 4 +- .../quantifiers/sygus/example_eval_cache.cpp | 8 +- .../quantifiers/sygus/example_eval_cache.h | 4 +- .../quantifiers/sygus/example_infer.cpp | 8 +- src/theory/quantifiers/sygus/example_infer.h | 4 +- .../quantifiers/sygus/example_min_eval.cpp | 4 +- .../quantifiers/sygus/example_min_eval.h | 4 +- .../sygus/rcons_obligation_info.cpp | 4 +- .../quantifiers/sygus/rcons_obligation_info.h | 4 +- .../quantifiers/sygus/rcons_type_info.cpp | 4 +- .../quantifiers/sygus/rcons_type_info.h | 4 +- src/theory/quantifiers/sygus/sygus_abduct.cpp | 6 +- src/theory/quantifiers/sygus/sygus_abduct.h | 4 +- .../quantifiers/sygus/sygus_enumerator.cpp | 6 +- .../quantifiers/sygus/sygus_enumerator.h | 4 +- .../sygus/sygus_enumerator_basic.cpp | 6 +- .../sygus/sygus_enumerator_basic.h | 4 +- .../quantifiers/sygus/sygus_eval_unfold.cpp | 8 +- .../quantifiers/sygus/sygus_eval_unfold.h | 4 +- .../quantifiers/sygus/sygus_explain.cpp | 10 +- src/theory/quantifiers/sygus/sygus_explain.h | 8 +- .../quantifiers/sygus/sygus_grammar_cons.cpp | 10 +- .../quantifiers/sygus/sygus_grammar_cons.h | 8 +- .../quantifiers/sygus/sygus_grammar_norm.cpp | 6 +- .../quantifiers/sygus/sygus_grammar_norm.h | 4 +- .../quantifiers/sygus/sygus_grammar_red.cpp | 10 +- .../quantifiers/sygus/sygus_grammar_red.h | 8 +- .../quantifiers/sygus/sygus_interpol.cpp | 4 +- src/theory/quantifiers/sygus/sygus_interpol.h | 4 +- .../quantifiers/sygus/sygus_invariance.cpp | 10 +- .../quantifiers/sygus/sygus_invariance.h | 8 +- src/theory/quantifiers/sygus/sygus_module.cpp | 8 +- src/theory/quantifiers/sygus/sygus_module.h | 8 +- src/theory/quantifiers/sygus/sygus_pbe.cpp | 8 +- src/theory/quantifiers/sygus/sygus_pbe.h | 8 +- .../quantifiers/sygus/sygus_process_conj.cpp | 10 +- .../quantifiers/sygus/sygus_process_conj.h | 8 +- .../quantifiers/sygus/sygus_qe_preproc.cpp | 6 +- .../quantifiers/sygus/sygus_qe_preproc.h | 4 +- .../quantifiers/sygus/sygus_reconstruct.cpp | 6 +- .../quantifiers/sygus/sygus_reconstruct.h | 4 +- .../quantifiers/sygus/sygus_repair_const.cpp | 10 +- .../quantifiers/sygus/sygus_repair_const.h | 8 +- src/theory/quantifiers/sygus/sygus_stats.cpp | 4 +- src/theory/quantifiers/sygus/sygus_stats.h | 4 +- src/theory/quantifiers/sygus/sygus_unif.cpp | 10 +- src/theory/quantifiers/sygus/sygus_unif.h | 8 +- .../quantifiers/sygus/sygus_unif_io.cpp | 10 +- src/theory/quantifiers/sygus/sygus_unif_io.h | 8 +- .../quantifiers/sygus/sygus_unif_rl.cpp | 6 +- src/theory/quantifiers/sygus/sygus_unif_rl.h | 4 +- .../quantifiers/sygus/sygus_unif_strat.cpp | 10 +- .../quantifiers/sygus/sygus_unif_strat.h | 8 +- src/theory/quantifiers/sygus/sygus_utils.cpp | 6 +- src/theory/quantifiers/sygus/sygus_utils.h | 4 +- .../quantifiers/sygus/synth_conjecture.cpp | 6 +- .../quantifiers/sygus/synth_conjecture.h | 4 +- src/theory/quantifiers/sygus/synth_engine.cpp | 6 +- src/theory/quantifiers/sygus/synth_engine.h | 4 +- .../quantifiers/sygus/template_infer.cpp | 6 +- src/theory/quantifiers/sygus/template_infer.h | 4 +- .../quantifiers/sygus/term_database_sygus.cpp | 10 +- .../quantifiers/sygus/term_database_sygus.h | 8 +- .../sygus/transition_inference.cpp | 6 +- .../quantifiers/sygus/transition_inference.h | 4 +- src/theory/quantifiers/sygus/type_info.cpp | 6 +- src/theory/quantifiers/sygus/type_info.h | 4 +- .../quantifiers/sygus/type_node_id_trie.cpp | 6 +- .../quantifiers/sygus/type_node_id_trie.h | 4 +- src/theory/quantifiers/sygus_inst.cpp | 4 +- src/theory/quantifiers/sygus_inst.h | 4 +- src/theory/quantifiers/sygus_sampler.cpp | 8 +- src/theory/quantifiers/sygus_sampler.h | 8 +- src/theory/quantifiers/term_database.cpp | 12 +- src/theory/quantifiers/term_database.h | 8 +- src/theory/quantifiers/term_enumeration.cpp | 10 +- src/theory/quantifiers/term_enumeration.h | 8 +- src/theory/quantifiers/term_registry.cpp | 4 +- src/theory/quantifiers/term_registry.h | 4 +- .../quantifiers/term_tuple_enumerator.cpp | 4 +- .../quantifiers/term_tuple_enumerator.h | 4 +- src/theory/quantifiers/term_util.cpp | 10 +- src/theory/quantifiers/term_util.h | 8 +- src/theory/quantifiers/theory_quantifiers.cpp | 8 +- src/theory/quantifiers/theory_quantifiers.h | 8 +- .../theory_quantifiers_type_rules.h | 8 +- src/theory/quantifiers_engine.cpp | 6 +- src/theory/quantifiers_engine.h | 8 +- src/theory/relevance_manager.cpp | 6 +- src/theory/relevance_manager.h | 4 +- src/theory/rep_set.cpp | 8 +- src/theory/rep_set.h | 6 +- src/theory/rewriter.cpp | 6 +- src/theory/rewriter.h | 6 +- src/theory/rewriter_attributes.h | 6 +- src/theory/rewriter_tables_template.h | 8 +- src/theory/sep/kinds | 16 +- src/theory/sep/theory_sep.cpp | 10 +- src/theory/sep/theory_sep.h | 8 +- src/theory/sep/theory_sep_rewriter.cpp | 8 +- src/theory/sep/theory_sep_rewriter.h | 8 +- src/theory/sep/theory_sep_type_rules.h | 9 +- src/theory/sets/cardinality_extension.cpp | 6 +- src/theory/sets/cardinality_extension.h | 4 +- src/theory/sets/inference_manager.cpp | 6 +- src/theory/sets/inference_manager.h | 4 +- src/theory/sets/kinds | 68 +- src/theory/sets/normal_form.h | 4 +- src/theory/sets/rels_utils.h | 10 +- src/theory/sets/singleton_op.cpp | 4 +- src/theory/sets/singleton_op.h | 4 +- src/theory/sets/skolem_cache.cpp | 6 +- src/theory/sets/skolem_cache.h | 4 +- src/theory/sets/solver_state.cpp | 6 +- src/theory/sets/solver_state.h | 4 +- src/theory/sets/term_registry.cpp | 6 +- src/theory/sets/term_registry.h | 4 +- src/theory/sets/theory_sets.cpp | 10 +- src/theory/sets/theory_sets.h | 8 +- src/theory/sets/theory_sets_private.cpp | 6 +- src/theory/sets/theory_sets_private.h | 9 +- src/theory/sets/theory_sets_rels.cpp | 6 +- src/theory/sets/theory_sets_rels.h | 11 +- src/theory/sets/theory_sets_rewriter.cpp | 10 +- src/theory/sets/theory_sets_rewriter.h | 8 +- .../sets/theory_sets_type_enumerator.cpp | 4 +- src/theory/sets/theory_sets_type_enumerator.h | 4 +- src/theory/sets/theory_sets_type_rules.h | 10 +- src/theory/shared_solver.cpp | 4 +- src/theory/shared_solver.h | 4 +- src/theory/shared_solver_distributed.cpp | 4 +- src/theory/shared_solver_distributed.h | 4 +- src/theory/shared_terms_database.cpp | 6 +- src/theory/shared_terms_database.h | 4 +- src/theory/skolem_lemma.cpp | 4 +- src/theory/skolem_lemma.h | 4 +- src/theory/smt_engine_subsolver.cpp | 4 +- src/theory/smt_engine_subsolver.h | 4 +- src/theory/sort_inference.cpp | 8 +- src/theory/sort_inference.h | 4 +- src/theory/strings/arith_entail.cpp | 6 +- src/theory/strings/arith_entail.h | 4 +- src/theory/strings/base_solver.cpp | 8 +- src/theory/strings/base_solver.h | 4 +- src/theory/strings/core_solver.cpp | 12 +- src/theory/strings/core_solver.h | 4 +- src/theory/strings/eager_solver.cpp | 6 +- src/theory/strings/eager_solver.h | 4 +- src/theory/strings/eqc_info.cpp | 8 +- src/theory/strings/eqc_info.h | 4 +- src/theory/strings/extf_solver.cpp | 8 +- src/theory/strings/extf_solver.h | 4 +- src/theory/strings/infer_info.cpp | 4 +- src/theory/strings/infer_info.h | 4 +- src/theory/strings/infer_proof_cons.cpp | 6 +- src/theory/strings/infer_proof_cons.h | 4 +- src/theory/strings/inference_manager.cpp | 8 +- src/theory/strings/inference_manager.h | 4 +- src/theory/strings/kinds | 70 +- src/theory/strings/normal_form.cpp | 6 +- src/theory/strings/normal_form.h | 4 +- src/theory/strings/proof_checker.cpp | 6 +- src/theory/strings/proof_checker.h | 4 +- src/theory/strings/regexp_elim.cpp | 6 +- src/theory/strings/regexp_elim.h | 4 +- src/theory/strings/regexp_entail.cpp | 26 +- src/theory/strings/regexp_entail.h | 6 +- src/theory/strings/regexp_operation.cpp | 32 +- src/theory/strings/regexp_operation.h | 14 +- src/theory/strings/regexp_solver.cpp | 16 +- src/theory/strings/regexp_solver.h | 6 +- src/theory/strings/rewrites.cpp | 4 +- src/theory/strings/rewrites.h | 4 +- src/theory/strings/sequences_rewriter.cpp | 20 +- src/theory/strings/sequences_rewriter.h | 4 +- src/theory/strings/sequences_stats.cpp | 4 +- src/theory/strings/sequences_stats.h | 4 +- src/theory/strings/skolem_cache.cpp | 6 +- src/theory/strings/skolem_cache.h | 4 +- src/theory/strings/solver_state.cpp | 8 +- src/theory/strings/solver_state.h | 4 +- src/theory/strings/strategy.cpp | 4 +- src/theory/strings/strategy.h | 4 +- src/theory/strings/strings_entail.cpp | 12 +- src/theory/strings/strings_entail.h | 4 +- src/theory/strings/strings_fmf.cpp | 8 +- src/theory/strings/strings_fmf.h | 4 +- src/theory/strings/strings_rewriter.cpp | 6 +- src/theory/strings/strings_rewriter.h | 4 +- src/theory/strings/term_registry.cpp | 8 +- src/theory/strings/term_registry.h | 4 +- src/theory/strings/theory_strings.cpp | 12 +- src/theory/strings/theory_strings.h | 8 +- .../strings/theory_strings_preprocess.cpp | 12 +- .../strings/theory_strings_preprocess.h | 8 +- .../strings/theory_strings_type_rules.h | 8 +- src/theory/strings/theory_strings_utils.cpp | 6 +- src/theory/strings/theory_strings_utils.h | 4 +- src/theory/strings/type_enumerator.cpp | 4 +- src/theory/strings/type_enumerator.h | 8 +- src/theory/strings/word.cpp | 6 +- src/theory/strings/word.h | 4 +- src/theory/subs_minimize.cpp | 6 +- src/theory/subs_minimize.h | 4 +- src/theory/substitutions.cpp | 6 +- src/theory/substitutions.h | 6 +- src/theory/term_registration_visitor.cpp | 6 +- src/theory/term_registration_visitor.h | 5 +- src/theory/theory.cpp | 6 +- src/theory/theory.h | 13 +- src/theory/theory_engine.cpp | 32 +- src/theory/theory_engine.h | 6 +- src/theory/theory_engine_proof_generator.cpp | 6 +- src/theory/theory_engine_proof_generator.h | 4 +- src/theory/theory_eq_notify.h | 4 +- src/theory/theory_id.cpp | 4 +- src/theory/theory_id.h | 4 +- src/theory/theory_inference.cpp | 6 +- src/theory/theory_inference.h | 4 +- src/theory/theory_inference_manager.cpp | 6 +- src/theory/theory_inference_manager.h | 4 +- src/theory/theory_model.cpp | 10 +- src/theory/theory_model.h | 6 +- src/theory/theory_model_builder.cpp | 10 +- src/theory/theory_model_builder.h | 6 +- src/theory/theory_preprocessor.cpp | 4 +- src/theory/theory_preprocessor.h | 4 +- src/theory/theory_proof_step_buffer.cpp | 6 +- src/theory/theory_proof_step_buffer.h | 4 +- src/theory/theory_rewriter.cpp | 4 +- src/theory/theory_rewriter.h | 4 +- src/theory/theory_state.cpp | 4 +- src/theory/theory_state.h | 4 +- src/theory/theory_traits_template.h | 8 +- src/theory/trust_node.cpp | 4 +- src/theory/trust_node.h | 4 +- src/theory/trust_substitutions.cpp | 4 +- src/theory/trust_substitutions.h | 4 +- src/theory/type_enumerator.h | 6 +- src/theory/type_enumerator_template.cpp | 6 +- src/theory/type_set.cpp | 8 +- src/theory/type_set.h | 6 +- src/theory/uf/cardinality_extension.cpp | 12 +- src/theory/uf/cardinality_extension.h | 8 +- src/theory/uf/eq_proof.cpp | 4 +- src/theory/uf/eq_proof.h | 4 +- src/theory/uf/equality_engine.cpp | 4 +- src/theory/uf/equality_engine.h | 4 +- src/theory/uf/equality_engine_iterator.cpp | 4 +- src/theory/uf/equality_engine_iterator.h | 4 +- src/theory/uf/equality_engine_notify.h | 4 +- src/theory/uf/equality_engine_types.h | 4 +- src/theory/uf/ho_extension.cpp | 6 +- src/theory/uf/ho_extension.h | 4 +- src/theory/uf/kinds | 16 +- src/theory/uf/proof_checker.cpp | 6 +- src/theory/uf/proof_checker.h | 4 +- src/theory/uf/proof_equality_engine.cpp | 6 +- src/theory/uf/proof_equality_engine.h | 4 +- src/theory/uf/symmetry_breaker.cpp | 10 +- src/theory/uf/symmetry_breaker.h | 12 +- src/theory/uf/theory_uf.cpp | 8 +- src/theory/uf/theory_uf.h | 8 +- src/theory/uf/theory_uf_model.cpp | 6 +- src/theory/uf/theory_uf_model.h | 4 +- src/theory/uf/theory_uf_rewriter.h | 8 +- src/theory/uf/theory_uf_type_rules.h | 12 +- src/theory/valuation.cpp | 6 +- src/theory/valuation.h | 6 +- src/util/abstract_value.cpp | 4 +- src/util/abstract_value.h | 4 +- src/util/bin_heap.h | 4 +- src/util/bitvector.cpp | 4 +- src/util/bitvector.h | 4 +- src/util/bool.h | 4 +- src/util/cardinality.cpp | 4 +- src/util/cardinality.h | 4 +- src/util/dense_map.h | 5 +- src/util/divisible.cpp | 4 +- src/util/divisible.h | 4 +- src/util/floatingpoint.cpp | 4 +- src/util/floatingpoint.h | 6 +- src/util/floatingpoint_literal_symfpu.cpp | 26 +- src/util/floatingpoint_literal_symfpu.h.in | 12 +- src/util/floatingpoint_size.cpp | 4 +- src/util/floatingpoint_size.h | 4 +- src/util/gmp_util.h | 4 +- src/util/hash.h | 4 +- src/util/iand.h | 4 +- src/util/index.cpp | 4 +- src/util/index.h | 4 +- src/util/indexed_root_predicate.h | 4 +- src/util/integer_cln_imp.cpp | 4 +- src/util/integer_cln_imp.h | 8 +- src/util/integer_gmp_imp.cpp | 4 +- src/util/integer_gmp_imp.h | 8 +- src/util/maybe.h | 4 +- src/util/ostream_util.cpp | 4 +- src/util/ostream_util.h | 4 +- src/util/poly_util.cpp | 4 +- src/util/poly_util.h | 28 +- src/util/random.cpp | 4 +- src/util/random.h | 4 +- src/util/rational_cln_imp.cpp | 4 +- src/util/rational_cln_imp.h | 6 +- src/util/rational_gmp_imp.cpp | 4 +- src/util/rational_gmp_imp.h | 6 +- src/util/real_algebraic_number_poly_imp.cpp | 4 +- src/util/real_algebraic_number_poly_imp.h | 4 +- src/util/regexp.cpp | 4 +- src/util/regexp.h | 4 +- src/util/resource_manager.cpp | 4 +- src/util/resource_manager.h | 4 +- src/util/result.cpp | 4 +- src/util/result.h | 4 +- src/util/roundingmode.h | 4 +- src/util/safe_print.cpp | 4 +- src/util/safe_print.h | 4 +- src/util/sampler.cpp | 4 +- src/util/sampler.h | 4 +- src/util/sexpr.cpp | 22 +- src/util/sexpr.h | 16 +- src/util/smt2_quote_string.cpp | 4 +- src/util/smt2_quote_string.h | 4 +- src/util/statistics.cpp | 5 +- src/util/statistics.h | 4 +- src/util/statistics_registry.cpp | 4 +- src/util/statistics_registry.h | 4 +- src/util/stats_base.cpp | 4 +- src/util/stats_base.h | 4 +- src/util/stats_histogram.h | 4 +- src/util/stats_timer.cpp | 4 +- src/util/stats_timer.h | 6 +- src/util/stats_utils.cpp | 4 +- src/util/stats_utils.h | 4 +- src/util/string.cpp | 6 +- src/util/string.h | 13 +- src/util/tuple.h | 4 +- src/util/unsafe_interrupt_exception.h | 6 +- src/util/utility.cpp | 4 +- src/util/utility.h | 5 +- test/api/boilerplate.cpp | 2 +- test/api/issue4889.cpp | 2 +- test/api/issue5074.cpp | 2 +- test/api/ouroborous.cpp | 6 +- test/api/reset_assertions.cpp | 2 +- test/api/sep_log_api.cpp | 2 +- test/api/smt2_compliance.cpp | 4 +- test/api/two_solvers.cpp | 2 +- test/unit/api/datatype_api_black.cpp | 4 +- test/unit/api/grammar_black.cpp | 4 +- test/unit/api/op_black.cpp | 4 +- test/unit/api/op_white.cpp | 4 +- test/unit/api/result_black.cpp | 26 +- test/unit/api/solver_black.cpp | 8 +- test/unit/api/solver_white.cpp | 4 +- test/unit/api/sort_black.cpp | 4 +- test/unit/api/term_black.cpp | 4 +- test/unit/api/term_white.cpp | 4 +- test/unit/base/map_util_black.cpp | 52 +- test/unit/context/cdhashmap_black.cpp | 12 +- test/unit/context/cdhashmap_white.cpp | 8 +- test/unit/context/cdlist_black.cpp | 8 +- test/unit/context/cdo_black.cpp | 8 +- test/unit/context/context_black.cpp | 8 +- test/unit/context/context_mm_black.cpp | 8 +- test/unit/context/context_white.cpp | 8 +- test/unit/main/interactive_shell_black.cpp | 12 +- test/unit/memory.h | 9 +- test/unit/node/attribute_black.cpp | 8 +- test/unit/node/attribute_white.cpp | 4 +- test/unit/node/kind_black.cpp | 8 +- test/unit/node/kind_map_black.cpp | 8 +- test/unit/node/node_algorithm_black.cpp | 4 +- test/unit/node/node_black.cpp | 8 +- test/unit/node/node_builder_black.cpp | 8 +- test/unit/node/node_manager_black.cpp | 8 +- test/unit/node/node_manager_white.cpp | 10 +- test/unit/node/node_self_iterator_black.cpp | 8 +- test/unit/node/node_traversal_black.cpp | 4 +- test/unit/node/node_white.cpp | 8 +- test/unit/node/symbol_table_black.cpp | 8 +- test/unit/node/type_cardinality_black.cpp | 4 +- test/unit/node/type_node_white.cpp | 4 +- test/unit/parser/parser_black.cpp | 12 +- test/unit/parser/parser_builder_black.cpp | 8 +- .../preprocessing/pass_bv_gauss_white.cpp | 4 +- .../pass_foreign_theory_rewrite_white.cpp | 4 +- test/unit/printer/smt2_printer_black.cpp | 4 +- test/unit/prop/cnf_stream_white.cpp | 10 +- test/unit/test.h | 4 +- test/unit/test_api.h | 6 +- test/unit/test_context.h | 8 +- test/unit/test_node.h | 4 +- test/unit/test_smt.h | 6 +- test/unit/theory/evaluator_white.cpp | 4 +- test/unit/theory/logic_info_white.cpp | 74 +- test/unit/theory/regexp_operation_black.cpp | 4 +- test/unit/theory/sequences_rewriter_white.cpp | 148 +- test/unit/theory/strings_rewriter_white.cpp | 8 +- test/unit/theory/theory_arith_white.cpp | 4 +- .../theory/theory_bags_normal_form_white.cpp | 6 +- .../theory/theory_bags_rewriter_white.cpp | 4 +- .../theory/theory_bags_type_rules_white.cpp | 6 +- test/unit/theory/theory_black.cpp | 8 +- .../theory/theory_bv_int_blaster_white.cpp | 4 +- test/unit/theory/theory_bv_rewriter_white.cpp | 4 +- test/unit/theory/theory_bv_white.cpp | 4 +- test/unit/theory/theory_engine_white.cpp | 8 +- test/unit/theory/theory_int_opt_white.cpp | 4 +- ...eory_quantifiers_bv_instantiator_white.cpp | 4 +- .../theory_quantifiers_bv_inverter_white.cpp | 4 +- .../theory_sets_type_enumerator_white.cpp | 8 +- .../theory/theory_sets_type_rules_white.cpp | 6 +- .../theory_strings_skolem_cache_black.cpp | 4 +- .../unit/theory/theory_strings_word_white.cpp | 4 +- test/unit/theory/theory_white.cpp | 8 +- test/unit/theory/type_enumerator_white.cpp | 8 +- test/unit/util/array_store_all_white.cpp | 8 +- test/unit/util/assert_white.cpp | 8 +- test/unit/util/binary_heap_black.cpp | 8 +- test/unit/util/bitvector_black.cpp | 8 +- .../util/boolean_simplification_black.cpp | 8 +- test/unit/util/cardinality_black.cpp | 8 +- test/unit/util/check_white.cpp | 4 +- test/unit/util/configuration_black.cpp | 8 +- test/unit/util/datatype_black.cpp | 8 +- test/unit/util/exception_black.cpp | 10 +- test/unit/util/floatingpoint_black.cpp | 8 +- test/unit/util/integer_black.cpp | 8 +- test/unit/util/integer_white.cpp | 8 +- test/unit/util/output_black.cpp | 4 +- test/unit/util/rational_black.cpp | 8 +- test/unit/util/rational_white.cpp | 8 +- .../unit/util/real_algebraic_number_black.cpp | 8 +- test/unit/util/stats_black.cpp | 10 +- 1458 files changed, 6661 insertions(+), 6619 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3930adbfa..5ba5cf444 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -168,7 +168,7 @@ jobs: - name: Install Check run: | make -j2 install - echo -e "#include \nint main() { CVC4::api::Solver s; return 0; }" > /tmp/test.cpp + echo -e "#include \nint main() { CVC5::api::Solver s; return 0; }" > /tmp/test.cpp g++ -std=c++11 /tmp/test.cpp -I install/include -L install/lib -lcvc4 working-directory: build diff --git a/examples/api/bitvectors.cpp b/examples/api/bitvectors.cpp index 6c0a1e875..1cbfdb031 100644 --- a/examples/api/bitvectors.cpp +++ b/examples/api/bitvectors.cpp @@ -19,7 +19,7 @@ #include using namespace std; -using namespace CVC4::api; +using namespace CVC5::api; int main() { diff --git a/examples/api/bitvectors_and_arrays.cpp b/examples/api/bitvectors_and_arrays.cpp index ebc1da9fe..5c243e1d1 100644 --- a/examples/api/bitvectors_and_arrays.cpp +++ b/examples/api/bitvectors_and_arrays.cpp @@ -20,7 +20,7 @@ #include using namespace std; -using namespace CVC4::api; +using namespace CVC5::api; int main() { diff --git a/examples/api/combination.cpp b/examples/api/combination.cpp index 9e0b47f33..2651bf80f 100644 --- a/examples/api/combination.cpp +++ b/examples/api/combination.cpp @@ -21,7 +21,7 @@ #include using namespace std; -using namespace CVC4::api; +using namespace CVC5::api; void prefixPrintGetValue(Solver& slv, Term t, int level = 0) { diff --git a/examples/api/datatypes.cpp b/examples/api/datatypes.cpp index fcd2757d7..c2b3bc4c4 100644 --- a/examples/api/datatypes.cpp +++ b/examples/api/datatypes.cpp @@ -18,7 +18,7 @@ #include -using namespace CVC4::api; +using namespace CVC5::api; void test(Solver& slv, Sort& consListSort) { diff --git a/examples/api/extract.cpp b/examples/api/extract.cpp index cbb1468b2..a6a43a7c2 100644 --- a/examples/api/extract.cpp +++ b/examples/api/extract.cpp @@ -19,7 +19,7 @@ #include using namespace std; -using namespace CVC4::api; +using namespace CVC5::api; int main() { diff --git a/examples/api/helloworld.cpp b/examples/api/helloworld.cpp index 79477c9b8..89b0e212d 100644 --- a/examples/api/helloworld.cpp +++ b/examples/api/helloworld.cpp @@ -18,7 +18,7 @@ #include -using namespace CVC4::api; +using namespace CVC5::api; int main() { diff --git a/examples/api/linear_arith.cpp b/examples/api/linear_arith.cpp index 039ae586f..ca3e8a2b9 100644 --- a/examples/api/linear_arith.cpp +++ b/examples/api/linear_arith.cpp @@ -20,7 +20,7 @@ #include "cvc4/api/cvc4cpp.h" using namespace std; -using namespace CVC4::api; +using namespace CVC5::api; int main() { diff --git a/examples/api/sequences.cpp b/examples/api/sequences.cpp index ef479cbd3..6272b423b 100644 --- a/examples/api/sequences.cpp +++ b/examples/api/sequences.cpp @@ -18,7 +18,7 @@ #include -using namespace CVC4::api; +using namespace CVC5::api; int main() { diff --git a/examples/api/sets.cpp b/examples/api/sets.cpp index b1090d19b..cac705415 100644 --- a/examples/api/sets.cpp +++ b/examples/api/sets.cpp @@ -19,7 +19,7 @@ #include using namespace std; -using namespace CVC4::api; +using namespace CVC5::api; int main() { diff --git a/examples/api/strings.cpp b/examples/api/strings.cpp index bae9c9ec2..b926395de 100644 --- a/examples/api/strings.cpp +++ b/examples/api/strings.cpp @@ -18,7 +18,7 @@ #include -using namespace CVC4::api; +using namespace CVC5::api; int main() { diff --git a/examples/api/sygus-fun.cpp b/examples/api/sygus-fun.cpp index dc6f4df0f..a29cdb132 100644 --- a/examples/api/sygus-fun.cpp +++ b/examples/api/sygus-fun.cpp @@ -49,7 +49,7 @@ #include -using namespace CVC4::api; +using namespace CVC5::api; int main() { diff --git a/examples/api/sygus-grammar.cpp b/examples/api/sygus-grammar.cpp index 9dc801e66..6491dc0a5 100644 --- a/examples/api/sygus-grammar.cpp +++ b/examples/api/sygus-grammar.cpp @@ -46,7 +46,7 @@ #include -using namespace CVC4::api; +using namespace CVC5::api; int main() { diff --git a/examples/api/sygus-inv.cpp b/examples/api/sygus-inv.cpp index 8435eea44..206803eb6 100644 --- a/examples/api/sygus-inv.cpp +++ b/examples/api/sygus-inv.cpp @@ -37,7 +37,7 @@ #include -using namespace CVC4::api; +using namespace CVC5::api; int main() { diff --git a/examples/hashsmt/sha1_collision.cpp b/examples/hashsmt/sha1_collision.cpp index 7887cb3e9..6fa7954ea 100644 --- a/examples/hashsmt/sha1_collision.cpp +++ b/examples/hashsmt/sha1_collision.cpp @@ -34,7 +34,7 @@ #include "word.h" using namespace std; -using namespace CVC4; +using namespace CVC5; hashsmt::cvc4_uchar8 *createInput(unsigned size, std::string prefix, std::ostream& output) { hashsmt::cvc4_uchar8 *input = new hashsmt::cvc4_uchar8[size]; @@ -101,8 +101,9 @@ int main(int argc, char* argv[]) { delete[] cvc4input1; delete[] cvc4input2; - - } catch (CVC4::Exception& e) { + } + catch (CVC5::Exception& e) + { cerr << e << endl; } } diff --git a/examples/hashsmt/sha1_inversion.cpp b/examples/hashsmt/sha1_inversion.cpp index e555486d2..957f9225e 100644 --- a/examples/hashsmt/sha1_inversion.cpp +++ b/examples/hashsmt/sha1_inversion.cpp @@ -43,7 +43,7 @@ #include "word.h" using namespace std; -using namespace CVC4; +using namespace CVC5; int main(int argc, char* argv[]) { @@ -104,7 +104,9 @@ int main(int argc, char* argv[]) { // Checksat command output << CheckSatCommand() << endl; - } catch (CVC4::Exception& e) { + } + catch (CVC5::Exception& e) + { cerr << e << endl; } } diff --git a/examples/hashsmt/word.cpp b/examples/hashsmt/word.cpp index 4d86d062e..5fd5b7979 100644 --- a/examples/hashsmt/word.cpp +++ b/examples/hashsmt/word.cpp @@ -33,8 +33,8 @@ using namespace std; using namespace hashsmt; -using namespace CVC4; -using namespace CVC4::options; +using namespace CVC5; +using namespace CVC5::options; Expr Word::extendToSize(unsigned newSize) const { if (newSize <= size()) { @@ -50,10 +50,10 @@ ExprManager* Word::s_manager = 0; ExprManager* Word::em() { if (s_manager == 0) { - CVC4::Options options; + CVC5::Options options; options.setInputLanguage(language::input::LANG_SMTLIB_V2); options.setOutputLanguage(language::output::LANG_SMTLIB_V2); - s_manager = new CVC4::ExprManager(options); + s_manager = new CVC5::ExprManager(options); } return s_manager; } @@ -71,7 +71,7 @@ Word Word::concat(const Word words[], unsigned size) { } void Word::print(ostream& out) const { - out << CVC4::expr::ExprSetDepth(-1) << d_expr; + out << CVC5::expr::ExprSetDepth(-1) << d_expr; } Word::Word(unsigned newSize, unsigned value) { diff --git a/examples/hashsmt/word.h b/examples/hashsmt/word.h index 11871e951..4a1d142f4 100644 --- a/examples/hashsmt/word.h +++ b/examples/hashsmt/word.h @@ -35,23 +35,22 @@ namespace hashsmt { class Word { /** Expression managaer we're using for all word expressions */ - static CVC4::ExprManager* s_manager; + static CVC5::ExprManager* s_manager; -protected: + protected: /** The expression of this word */ - CVC4::Expr d_expr; + CVC5::Expr d_expr; /** Get the expression manager words are using */ - static CVC4::ExprManager* em(); + static CVC5::ExprManager* em(); - Word(CVC4::Expr expr = CVC4::Expr()) - : d_expr(expr) {} + Word(CVC5::Expr expr = CVC5::Expr()) : d_expr(expr) {} /** Extend the representing expression to the given size >= size() */ - CVC4::Expr extendToSize(unsigned size) const; + CVC5::Expr extendToSize(unsigned size) const; -public: + public: Word(unsigned size, unsigned value = 0); Word(unsigned size, std::string name); @@ -71,12 +70,10 @@ public: void print(std::ostream& out) const; - CVC4::Expr getExpr() const { - return d_expr; - } + CVC5::Expr getExpr() const { return d_expr; } - /** Returns the comparison expression */ - CVC4::Expr operator == (const Word& b) const; + /** Returns the comparison expression */ + CVC5::Expr operator==(const Word& b) const; /** Concatenate the given words */ static Word concat(const Word words[], unsigned size); diff --git a/examples/nra-translate/normalize.cpp b/examples/nra-translate/normalize.cpp index 43e120f08..daa7d920d 100644 --- a/examples/nra-translate/normalize.cpp +++ b/examples/nra-translate/normalize.cpp @@ -28,9 +28,9 @@ #include using namespace std; -using namespace CVC4; -using namespace CVC4::parser; -using namespace CVC4::theory; +using namespace CVC5; +using namespace CVC5::parser; +using namespace CVC5::theory; int main(int argc, char* argv[]) { diff --git a/examples/nra-translate/smt2info.cpp b/examples/nra-translate/smt2info.cpp index b73b0d28f..661747ab0 100644 --- a/examples/nra-translate/smt2info.cpp +++ b/examples/nra-translate/smt2info.cpp @@ -25,9 +25,9 @@ #include using namespace std; -using namespace CVC4; -using namespace CVC4::parser; -using namespace CVC4::options; +using namespace CVC5; +using namespace CVC5::parser; +using namespace CVC5::options; unsigned compute_degree(ExprManager& exprManager, const Expr& term) { unsigned n = term.getNumChildren(); diff --git a/examples/nra-translate/smt2todreal.cpp b/examples/nra-translate/smt2todreal.cpp index fe27b01bd..2a12b828e 100644 --- a/examples/nra-translate/smt2todreal.cpp +++ b/examples/nra-translate/smt2todreal.cpp @@ -28,9 +28,9 @@ #include using namespace std; -using namespace CVC4; -using namespace CVC4::parser; -using namespace CVC4::options; +using namespace CVC5; +using namespace CVC5::parser; +using namespace CVC5::options; int main(int argc, char* argv[]) { diff --git a/examples/nra-translate/smt2toisat.cpp b/examples/nra-translate/smt2toisat.cpp index 33efcbbfe..aecdf5ba2 100644 --- a/examples/nra-translate/smt2toisat.cpp +++ b/examples/nra-translate/smt2toisat.cpp @@ -26,9 +26,9 @@ #include using namespace std; -using namespace CVC4; -using namespace CVC4::parser; -using namespace CVC4::options; +using namespace CVC5; +using namespace CVC5::parser; +using namespace CVC5::options; void translate_to_isat( string input, diff --git a/examples/nra-translate/smt2tomathematica.cpp b/examples/nra-translate/smt2tomathematica.cpp index 0c7a4f275..02795dc1f 100644 --- a/examples/nra-translate/smt2tomathematica.cpp +++ b/examples/nra-translate/smt2tomathematica.cpp @@ -26,8 +26,8 @@ #include using namespace std; -using namespace CVC4; -using namespace CVC4::parser; +using namespace CVC5; +using namespace CVC5::parser; void translate_to_mathematica( string input, diff --git a/examples/nra-translate/smt2toqepcad.cpp b/examples/nra-translate/smt2toqepcad.cpp index 6164f437c..1bfe9424b 100644 --- a/examples/nra-translate/smt2toqepcad.cpp +++ b/examples/nra-translate/smt2toqepcad.cpp @@ -26,8 +26,8 @@ #include using namespace std; -using namespace CVC4; -using namespace CVC4::parser; +using namespace CVC5; +using namespace CVC5::parser; void translate_to_qepcad( string input, diff --git a/examples/nra-translate/smt2toredlog.cpp b/examples/nra-translate/smt2toredlog.cpp index 97d600797..4238e9f13 100644 --- a/examples/nra-translate/smt2toredlog.cpp +++ b/examples/nra-translate/smt2toredlog.cpp @@ -26,9 +26,9 @@ #include using namespace std; -using namespace CVC4; -using namespace CVC4::parser; -using namespace CVC4::options; +using namespace CVC5; +using namespace CVC5::parser; +using namespace CVC5::options; void translate_to_redlog( string input, diff --git a/examples/sets-translate/sets_translate.cpp b/examples/sets-translate/sets_translate.cpp index 3e59eaa2a..b9ced3d79 100644 --- a/examples/sets-translate/sets_translate.cpp +++ b/examples/sets-translate/sets_translate.cpp @@ -28,9 +28,9 @@ #include using namespace std; -using namespace CVC4; -using namespace CVC4::parser; -using namespace CVC4::options; +using namespace CVC5; +using namespace CVC5::parser; +using namespace CVC5::options; bool nonsense(char c) { return !isalnum(c); } diff --git a/examples/simple_vc_cxx.cpp b/examples/simple_vc_cxx.cpp index f99a0170e..b6890e6ef 100644 --- a/examples/simple_vc_cxx.cpp +++ b/examples/simple_vc_cxx.cpp @@ -20,7 +20,7 @@ #include -using namespace CVC4::api; +using namespace CVC5::api; int main() { Solver slv; diff --git a/examples/simple_vc_quant_cxx.cpp b/examples/simple_vc_quant_cxx.cpp index 9fb720652..e6778fa41 100644 --- a/examples/simple_vc_quant_cxx.cpp +++ b/examples/simple_vc_quant_cxx.cpp @@ -18,7 +18,7 @@ #include -using namespace CVC4::api; +using namespace CVC5::api; int main() { Solver slv; diff --git a/examples/translator.cpp b/examples/translator.cpp index 0783989fc..1a9de7f80 100644 --- a/examples/translator.cpp +++ b/examples/translator.cpp @@ -28,9 +28,9 @@ #include using namespace std; -using namespace CVC4; -using namespace CVC4::language; -using namespace CVC4::parser; +using namespace CVC5; +using namespace CVC5::language; +using namespace CVC5::parser; enum { INPUT_LANG = 'L', diff --git a/src/api/checks.h b/src/api/checks.h index d5408d312..4686c0694 100644 --- a/src/api/checks.h +++ b/src/api/checks.h @@ -528,7 +528,7 @@ namespace api { this == bv.d_solver, "bound variable", bound_vars, i) \ << "a term associated with this solver object"; \ CVC4_API_ARG_AT_INDEX_CHECK_EXPECTED( \ - bv.d_node->getKind() == CVC4::Kind::BOUND_VARIABLE, \ + bv.d_node->getKind() == CVC5::Kind::BOUND_VARIABLE, \ "bound variable", \ bound_vars, \ i) \ @@ -560,7 +560,7 @@ namespace api { this == bv.d_solver, "bound variable", bound_vars, i) \ << "a term associated with this solver object"; \ CVC4_API_ARG_AT_INDEX_CHECK_EXPECTED( \ - bv.d_node->getKind() == CVC4::Kind::BOUND_VARIABLE, \ + bv.d_node->getKind() == CVC5::Kind::BOUND_VARIABLE, \ "bound variable", \ bound_vars, \ i) \ diff --git a/src/api/cvc4cpp.cpp b/src/api/cvc4cpp.cpp index e8b190003..66ddff9d4 100644 --- a/src/api/cvc4cpp.cpp +++ b/src/api/cvc4cpp.cpp @@ -64,7 +64,7 @@ #include "util/stats_histogram.h" #include "util/utility.h" -namespace CVC4 { +namespace CVC5 { namespace api { /* -------------------------------------------------------------------------- */ @@ -87,570 +87,570 @@ struct Statistics /* -------------------------------------------------------------------------- */ /* Mapping from external (API) kind to internal kind. */ -const static std::unordered_map s_kinds{ - {INTERNAL_KIND, CVC4::Kind::UNDEFINED_KIND}, - {UNDEFINED_KIND, CVC4::Kind::UNDEFINED_KIND}, - {NULL_EXPR, CVC4::Kind::NULL_EXPR}, +const static std::unordered_map s_kinds{ + {INTERNAL_KIND, CVC5::Kind::UNDEFINED_KIND}, + {UNDEFINED_KIND, CVC5::Kind::UNDEFINED_KIND}, + {NULL_EXPR, CVC5::Kind::NULL_EXPR}, /* Builtin ------------------------------------------------------------- */ - {UNINTERPRETED_CONSTANT, CVC4::Kind::UNINTERPRETED_CONSTANT}, - {ABSTRACT_VALUE, CVC4::Kind::ABSTRACT_VALUE}, - {EQUAL, CVC4::Kind::EQUAL}, - {DISTINCT, CVC4::Kind::DISTINCT}, - {CONSTANT, CVC4::Kind::VARIABLE}, - {VARIABLE, CVC4::Kind::BOUND_VARIABLE}, - {SEXPR, CVC4::Kind::SEXPR}, - {LAMBDA, CVC4::Kind::LAMBDA}, - {WITNESS, CVC4::Kind::WITNESS}, + {UNINTERPRETED_CONSTANT, CVC5::Kind::UNINTERPRETED_CONSTANT}, + {ABSTRACT_VALUE, CVC5::Kind::ABSTRACT_VALUE}, + {EQUAL, CVC5::Kind::EQUAL}, + {DISTINCT, CVC5::Kind::DISTINCT}, + {CONSTANT, CVC5::Kind::VARIABLE}, + {VARIABLE, CVC5::Kind::BOUND_VARIABLE}, + {SEXPR, CVC5::Kind::SEXPR}, + {LAMBDA, CVC5::Kind::LAMBDA}, + {WITNESS, CVC5::Kind::WITNESS}, /* Boolean ------------------------------------------------------------- */ - {CONST_BOOLEAN, CVC4::Kind::CONST_BOOLEAN}, - {NOT, CVC4::Kind::NOT}, - {AND, CVC4::Kind::AND}, - {IMPLIES, CVC4::Kind::IMPLIES}, - {OR, CVC4::Kind::OR}, - {XOR, CVC4::Kind::XOR}, - {ITE, CVC4::Kind::ITE}, - {MATCH, CVC4::Kind::MATCH}, - {MATCH_CASE, CVC4::Kind::MATCH_CASE}, - {MATCH_BIND_CASE, CVC4::Kind::MATCH_BIND_CASE}, + {CONST_BOOLEAN, CVC5::Kind::CONST_BOOLEAN}, + {NOT, CVC5::Kind::NOT}, + {AND, CVC5::Kind::AND}, + {IMPLIES, CVC5::Kind::IMPLIES}, + {OR, CVC5::Kind::OR}, + {XOR, CVC5::Kind::XOR}, + {ITE, CVC5::Kind::ITE}, + {MATCH, CVC5::Kind::MATCH}, + {MATCH_CASE, CVC5::Kind::MATCH_CASE}, + {MATCH_BIND_CASE, CVC5::Kind::MATCH_BIND_CASE}, /* UF ------------------------------------------------------------------ */ - {APPLY_UF, CVC4::Kind::APPLY_UF}, - {CARDINALITY_CONSTRAINT, CVC4::Kind::CARDINALITY_CONSTRAINT}, - {CARDINALITY_VALUE, CVC4::Kind::CARDINALITY_VALUE}, - {HO_APPLY, CVC4::Kind::HO_APPLY}, + {APPLY_UF, CVC5::Kind::APPLY_UF}, + {CARDINALITY_CONSTRAINT, CVC5::Kind::CARDINALITY_CONSTRAINT}, + {CARDINALITY_VALUE, CVC5::Kind::CARDINALITY_VALUE}, + {HO_APPLY, CVC5::Kind::HO_APPLY}, /* Arithmetic ---------------------------------------------------------- */ - {PLUS, CVC4::Kind::PLUS}, - {MULT, CVC4::Kind::MULT}, - {IAND, CVC4::Kind::IAND}, - {MINUS, CVC4::Kind::MINUS}, - {UMINUS, CVC4::Kind::UMINUS}, - {DIVISION, CVC4::Kind::DIVISION}, - {INTS_DIVISION, CVC4::Kind::INTS_DIVISION}, - {INTS_MODULUS, CVC4::Kind::INTS_MODULUS}, - {ABS, CVC4::Kind::ABS}, - {DIVISIBLE, CVC4::Kind::DIVISIBLE}, - {POW, CVC4::Kind::POW}, - {EXPONENTIAL, CVC4::Kind::EXPONENTIAL}, - {SINE, CVC4::Kind::SINE}, - {COSINE, CVC4::Kind::COSINE}, - {TANGENT, CVC4::Kind::TANGENT}, - {COSECANT, CVC4::Kind::COSECANT}, - {SECANT, CVC4::Kind::SECANT}, - {COTANGENT, CVC4::Kind::COTANGENT}, - {ARCSINE, CVC4::Kind::ARCSINE}, - {ARCCOSINE, CVC4::Kind::ARCCOSINE}, - {ARCTANGENT, CVC4::Kind::ARCTANGENT}, - {ARCCOSECANT, CVC4::Kind::ARCCOSECANT}, - {ARCSECANT, CVC4::Kind::ARCSECANT}, - {ARCCOTANGENT, CVC4::Kind::ARCCOTANGENT}, - {SQRT, CVC4::Kind::SQRT}, - {CONST_RATIONAL, CVC4::Kind::CONST_RATIONAL}, - {LT, CVC4::Kind::LT}, - {LEQ, CVC4::Kind::LEQ}, - {GT, CVC4::Kind::GT}, - {GEQ, CVC4::Kind::GEQ}, - {IS_INTEGER, CVC4::Kind::IS_INTEGER}, - {TO_INTEGER, CVC4::Kind::TO_INTEGER}, - {TO_REAL, CVC4::Kind::TO_REAL}, - {PI, CVC4::Kind::PI}, + {PLUS, CVC5::Kind::PLUS}, + {MULT, CVC5::Kind::MULT}, + {IAND, CVC5::Kind::IAND}, + {MINUS, CVC5::Kind::MINUS}, + {UMINUS, CVC5::Kind::UMINUS}, + {DIVISION, CVC5::Kind::DIVISION}, + {INTS_DIVISION, CVC5::Kind::INTS_DIVISION}, + {INTS_MODULUS, CVC5::Kind::INTS_MODULUS}, + {ABS, CVC5::Kind::ABS}, + {DIVISIBLE, CVC5::Kind::DIVISIBLE}, + {POW, CVC5::Kind::POW}, + {EXPONENTIAL, CVC5::Kind::EXPONENTIAL}, + {SINE, CVC5::Kind::SINE}, + {COSINE, CVC5::Kind::COSINE}, + {TANGENT, CVC5::Kind::TANGENT}, + {COSECANT, CVC5::Kind::COSECANT}, + {SECANT, CVC5::Kind::SECANT}, + {COTANGENT, CVC5::Kind::COTANGENT}, + {ARCSINE, CVC5::Kind::ARCSINE}, + {ARCCOSINE, CVC5::Kind::ARCCOSINE}, + {ARCTANGENT, CVC5::Kind::ARCTANGENT}, + {ARCCOSECANT, CVC5::Kind::ARCCOSECANT}, + {ARCSECANT, CVC5::Kind::ARCSECANT}, + {ARCCOTANGENT, CVC5::Kind::ARCCOTANGENT}, + {SQRT, CVC5::Kind::SQRT}, + {CONST_RATIONAL, CVC5::Kind::CONST_RATIONAL}, + {LT, CVC5::Kind::LT}, + {LEQ, CVC5::Kind::LEQ}, + {GT, CVC5::Kind::GT}, + {GEQ, CVC5::Kind::GEQ}, + {IS_INTEGER, CVC5::Kind::IS_INTEGER}, + {TO_INTEGER, CVC5::Kind::TO_INTEGER}, + {TO_REAL, CVC5::Kind::TO_REAL}, + {PI, CVC5::Kind::PI}, /* BV ------------------------------------------------------------------ */ - {CONST_BITVECTOR, CVC4::Kind::CONST_BITVECTOR}, - {BITVECTOR_CONCAT, CVC4::Kind::BITVECTOR_CONCAT}, - {BITVECTOR_AND, CVC4::Kind::BITVECTOR_AND}, - {BITVECTOR_OR, CVC4::Kind::BITVECTOR_OR}, - {BITVECTOR_XOR, CVC4::Kind::BITVECTOR_XOR}, - {BITVECTOR_NOT, CVC4::Kind::BITVECTOR_NOT}, - {BITVECTOR_NAND, CVC4::Kind::BITVECTOR_NAND}, - {BITVECTOR_NOR, CVC4::Kind::BITVECTOR_NOR}, - {BITVECTOR_XNOR, CVC4::Kind::BITVECTOR_XNOR}, - {BITVECTOR_COMP, CVC4::Kind::BITVECTOR_COMP}, - {BITVECTOR_MULT, CVC4::Kind::BITVECTOR_MULT}, - {BITVECTOR_PLUS, CVC4::Kind::BITVECTOR_PLUS}, - {BITVECTOR_SUB, CVC4::Kind::BITVECTOR_SUB}, - {BITVECTOR_NEG, CVC4::Kind::BITVECTOR_NEG}, - {BITVECTOR_UDIV, CVC4::Kind::BITVECTOR_UDIV}, - {BITVECTOR_UREM, CVC4::Kind::BITVECTOR_UREM}, - {BITVECTOR_SDIV, CVC4::Kind::BITVECTOR_SDIV}, - {BITVECTOR_SREM, CVC4::Kind::BITVECTOR_SREM}, - {BITVECTOR_SMOD, CVC4::Kind::BITVECTOR_SMOD}, - {BITVECTOR_SHL, CVC4::Kind::BITVECTOR_SHL}, - {BITVECTOR_LSHR, CVC4::Kind::BITVECTOR_LSHR}, - {BITVECTOR_ASHR, CVC4::Kind::BITVECTOR_ASHR}, - {BITVECTOR_ULT, CVC4::Kind::BITVECTOR_ULT}, - {BITVECTOR_ULE, CVC4::Kind::BITVECTOR_ULE}, - {BITVECTOR_UGT, CVC4::Kind::BITVECTOR_UGT}, - {BITVECTOR_UGE, CVC4::Kind::BITVECTOR_UGE}, - {BITVECTOR_SLT, CVC4::Kind::BITVECTOR_SLT}, - {BITVECTOR_SLE, CVC4::Kind::BITVECTOR_SLE}, - {BITVECTOR_SGT, CVC4::Kind::BITVECTOR_SGT}, - {BITVECTOR_SGE, CVC4::Kind::BITVECTOR_SGE}, - {BITVECTOR_ULTBV, CVC4::Kind::BITVECTOR_ULTBV}, - {BITVECTOR_SLTBV, CVC4::Kind::BITVECTOR_SLTBV}, - {BITVECTOR_ITE, CVC4::Kind::BITVECTOR_ITE}, - {BITVECTOR_REDOR, CVC4::Kind::BITVECTOR_REDOR}, - {BITVECTOR_REDAND, CVC4::Kind::BITVECTOR_REDAND}, - {BITVECTOR_EXTRACT, CVC4::Kind::BITVECTOR_EXTRACT}, - {BITVECTOR_REPEAT, CVC4::Kind::BITVECTOR_REPEAT}, - {BITVECTOR_ZERO_EXTEND, CVC4::Kind::BITVECTOR_ZERO_EXTEND}, - {BITVECTOR_SIGN_EXTEND, CVC4::Kind::BITVECTOR_SIGN_EXTEND}, - {BITVECTOR_ROTATE_LEFT, CVC4::Kind::BITVECTOR_ROTATE_LEFT}, - {BITVECTOR_ROTATE_RIGHT, CVC4::Kind::BITVECTOR_ROTATE_RIGHT}, - {INT_TO_BITVECTOR, CVC4::Kind::INT_TO_BITVECTOR}, - {BITVECTOR_TO_NAT, CVC4::Kind::BITVECTOR_TO_NAT}, + {CONST_BITVECTOR, CVC5::Kind::CONST_BITVECTOR}, + {BITVECTOR_CONCAT, CVC5::Kind::BITVECTOR_CONCAT}, + {BITVECTOR_AND, CVC5::Kind::BITVECTOR_AND}, + {BITVECTOR_OR, CVC5::Kind::BITVECTOR_OR}, + {BITVECTOR_XOR, CVC5::Kind::BITVECTOR_XOR}, + {BITVECTOR_NOT, CVC5::Kind::BITVECTOR_NOT}, + {BITVECTOR_NAND, CVC5::Kind::BITVECTOR_NAND}, + {BITVECTOR_NOR, CVC5::Kind::BITVECTOR_NOR}, + {BITVECTOR_XNOR, CVC5::Kind::BITVECTOR_XNOR}, + {BITVECTOR_COMP, CVC5::Kind::BITVECTOR_COMP}, + {BITVECTOR_MULT, CVC5::Kind::BITVECTOR_MULT}, + {BITVECTOR_PLUS, CVC5::Kind::BITVECTOR_PLUS}, + {BITVECTOR_SUB, CVC5::Kind::BITVECTOR_SUB}, + {BITVECTOR_NEG, CVC5::Kind::BITVECTOR_NEG}, + {BITVECTOR_UDIV, CVC5::Kind::BITVECTOR_UDIV}, + {BITVECTOR_UREM, CVC5::Kind::BITVECTOR_UREM}, + {BITVECTOR_SDIV, CVC5::Kind::BITVECTOR_SDIV}, + {BITVECTOR_SREM, CVC5::Kind::BITVECTOR_SREM}, + {BITVECTOR_SMOD, CVC5::Kind::BITVECTOR_SMOD}, + {BITVECTOR_SHL, CVC5::Kind::BITVECTOR_SHL}, + {BITVECTOR_LSHR, CVC5::Kind::BITVECTOR_LSHR}, + {BITVECTOR_ASHR, CVC5::Kind::BITVECTOR_ASHR}, + {BITVECTOR_ULT, CVC5::Kind::BITVECTOR_ULT}, + {BITVECTOR_ULE, CVC5::Kind::BITVECTOR_ULE}, + {BITVECTOR_UGT, CVC5::Kind::BITVECTOR_UGT}, + {BITVECTOR_UGE, CVC5::Kind::BITVECTOR_UGE}, + {BITVECTOR_SLT, CVC5::Kind::BITVECTOR_SLT}, + {BITVECTOR_SLE, CVC5::Kind::BITVECTOR_SLE}, + {BITVECTOR_SGT, CVC5::Kind::BITVECTOR_SGT}, + {BITVECTOR_SGE, CVC5::Kind::BITVECTOR_SGE}, + {BITVECTOR_ULTBV, CVC5::Kind::BITVECTOR_ULTBV}, + {BITVECTOR_SLTBV, CVC5::Kind::BITVECTOR_SLTBV}, + {BITVECTOR_ITE, CVC5::Kind::BITVECTOR_ITE}, + {BITVECTOR_REDOR, CVC5::Kind::BITVECTOR_REDOR}, + {BITVECTOR_REDAND, CVC5::Kind::BITVECTOR_REDAND}, + {BITVECTOR_EXTRACT, CVC5::Kind::BITVECTOR_EXTRACT}, + {BITVECTOR_REPEAT, CVC5::Kind::BITVECTOR_REPEAT}, + {BITVECTOR_ZERO_EXTEND, CVC5::Kind::BITVECTOR_ZERO_EXTEND}, + {BITVECTOR_SIGN_EXTEND, CVC5::Kind::BITVECTOR_SIGN_EXTEND}, + {BITVECTOR_ROTATE_LEFT, CVC5::Kind::BITVECTOR_ROTATE_LEFT}, + {BITVECTOR_ROTATE_RIGHT, CVC5::Kind::BITVECTOR_ROTATE_RIGHT}, + {INT_TO_BITVECTOR, CVC5::Kind::INT_TO_BITVECTOR}, + {BITVECTOR_TO_NAT, CVC5::Kind::BITVECTOR_TO_NAT}, /* FP ------------------------------------------------------------------ */ - {CONST_FLOATINGPOINT, CVC4::Kind::CONST_FLOATINGPOINT}, - {CONST_ROUNDINGMODE, CVC4::Kind::CONST_ROUNDINGMODE}, - {FLOATINGPOINT_FP, CVC4::Kind::FLOATINGPOINT_FP}, - {FLOATINGPOINT_EQ, CVC4::Kind::FLOATINGPOINT_EQ}, - {FLOATINGPOINT_ABS, CVC4::Kind::FLOATINGPOINT_ABS}, - {FLOATINGPOINT_NEG, CVC4::Kind::FLOATINGPOINT_NEG}, - {FLOATINGPOINT_PLUS, CVC4::Kind::FLOATINGPOINT_PLUS}, - {FLOATINGPOINT_SUB, CVC4::Kind::FLOATINGPOINT_SUB}, - {FLOATINGPOINT_MULT, CVC4::Kind::FLOATINGPOINT_MULT}, - {FLOATINGPOINT_DIV, CVC4::Kind::FLOATINGPOINT_DIV}, - {FLOATINGPOINT_FMA, CVC4::Kind::FLOATINGPOINT_FMA}, - {FLOATINGPOINT_SQRT, CVC4::Kind::FLOATINGPOINT_SQRT}, - {FLOATINGPOINT_REM, CVC4::Kind::FLOATINGPOINT_REM}, - {FLOATINGPOINT_RTI, CVC4::Kind::FLOATINGPOINT_RTI}, - {FLOATINGPOINT_MIN, CVC4::Kind::FLOATINGPOINT_MIN}, - {FLOATINGPOINT_MAX, CVC4::Kind::FLOATINGPOINT_MAX}, - {FLOATINGPOINT_LEQ, CVC4::Kind::FLOATINGPOINT_LEQ}, - {FLOATINGPOINT_LT, CVC4::Kind::FLOATINGPOINT_LT}, - {FLOATINGPOINT_GEQ, CVC4::Kind::FLOATINGPOINT_GEQ}, - {FLOATINGPOINT_GT, CVC4::Kind::FLOATINGPOINT_GT}, - {FLOATINGPOINT_ISN, CVC4::Kind::FLOATINGPOINT_ISN}, - {FLOATINGPOINT_ISSN, CVC4::Kind::FLOATINGPOINT_ISSN}, - {FLOATINGPOINT_ISZ, CVC4::Kind::FLOATINGPOINT_ISZ}, - {FLOATINGPOINT_ISINF, CVC4::Kind::FLOATINGPOINT_ISINF}, - {FLOATINGPOINT_ISNAN, CVC4::Kind::FLOATINGPOINT_ISNAN}, - {FLOATINGPOINT_ISNEG, CVC4::Kind::FLOATINGPOINT_ISNEG}, - {FLOATINGPOINT_ISPOS, CVC4::Kind::FLOATINGPOINT_ISPOS}, + {CONST_FLOATINGPOINT, CVC5::Kind::CONST_FLOATINGPOINT}, + {CONST_ROUNDINGMODE, CVC5::Kind::CONST_ROUNDINGMODE}, + {FLOATINGPOINT_FP, CVC5::Kind::FLOATINGPOINT_FP}, + {FLOATINGPOINT_EQ, CVC5::Kind::FLOATINGPOINT_EQ}, + {FLOATINGPOINT_ABS, CVC5::Kind::FLOATINGPOINT_ABS}, + {FLOATINGPOINT_NEG, CVC5::Kind::FLOATINGPOINT_NEG}, + {FLOATINGPOINT_PLUS, CVC5::Kind::FLOATINGPOINT_PLUS}, + {FLOATINGPOINT_SUB, CVC5::Kind::FLOATINGPOINT_SUB}, + {FLOATINGPOINT_MULT, CVC5::Kind::FLOATINGPOINT_MULT}, + {FLOATINGPOINT_DIV, CVC5::Kind::FLOATINGPOINT_DIV}, + {FLOATINGPOINT_FMA, CVC5::Kind::FLOATINGPOINT_FMA}, + {FLOATINGPOINT_SQRT, CVC5::Kind::FLOATINGPOINT_SQRT}, + {FLOATINGPOINT_REM, CVC5::Kind::FLOATINGPOINT_REM}, + {FLOATINGPOINT_RTI, CVC5::Kind::FLOATINGPOINT_RTI}, + {FLOATINGPOINT_MIN, CVC5::Kind::FLOATINGPOINT_MIN}, + {FLOATINGPOINT_MAX, CVC5::Kind::FLOATINGPOINT_MAX}, + {FLOATINGPOINT_LEQ, CVC5::Kind::FLOATINGPOINT_LEQ}, + {FLOATINGPOINT_LT, CVC5::Kind::FLOATINGPOINT_LT}, + {FLOATINGPOINT_GEQ, CVC5::Kind::FLOATINGPOINT_GEQ}, + {FLOATINGPOINT_GT, CVC5::Kind::FLOATINGPOINT_GT}, + {FLOATINGPOINT_ISN, CVC5::Kind::FLOATINGPOINT_ISN}, + {FLOATINGPOINT_ISSN, CVC5::Kind::FLOATINGPOINT_ISSN}, + {FLOATINGPOINT_ISZ, CVC5::Kind::FLOATINGPOINT_ISZ}, + {FLOATINGPOINT_ISINF, CVC5::Kind::FLOATINGPOINT_ISINF}, + {FLOATINGPOINT_ISNAN, CVC5::Kind::FLOATINGPOINT_ISNAN}, + {FLOATINGPOINT_ISNEG, CVC5::Kind::FLOATINGPOINT_ISNEG}, + {FLOATINGPOINT_ISPOS, CVC5::Kind::FLOATINGPOINT_ISPOS}, {FLOATINGPOINT_TO_FP_FLOATINGPOINT, - CVC4::Kind::FLOATINGPOINT_TO_FP_FLOATINGPOINT}, - {FLOATINGPOINT_TO_FP_REAL, CVC4::Kind::FLOATINGPOINT_TO_FP_REAL}, + CVC5::Kind::FLOATINGPOINT_TO_FP_FLOATINGPOINT}, + {FLOATINGPOINT_TO_FP_REAL, CVC5::Kind::FLOATINGPOINT_TO_FP_REAL}, {FLOATINGPOINT_TO_FP_SIGNED_BITVECTOR, - CVC4::Kind::FLOATINGPOINT_TO_FP_SIGNED_BITVECTOR}, + CVC5::Kind::FLOATINGPOINT_TO_FP_SIGNED_BITVECTOR}, {FLOATINGPOINT_TO_FP_UNSIGNED_BITVECTOR, - CVC4::Kind::FLOATINGPOINT_TO_FP_UNSIGNED_BITVECTOR}, - {FLOATINGPOINT_TO_FP_GENERIC, CVC4::Kind::FLOATINGPOINT_TO_FP_GENERIC}, - {FLOATINGPOINT_TO_UBV, CVC4::Kind::FLOATINGPOINT_TO_UBV}, - {FLOATINGPOINT_TO_SBV, CVC4::Kind::FLOATINGPOINT_TO_SBV}, - {FLOATINGPOINT_TO_REAL, CVC4::Kind::FLOATINGPOINT_TO_REAL}, + CVC5::Kind::FLOATINGPOINT_TO_FP_UNSIGNED_BITVECTOR}, + {FLOATINGPOINT_TO_FP_GENERIC, CVC5::Kind::FLOATINGPOINT_TO_FP_GENERIC}, + {FLOATINGPOINT_TO_UBV, CVC5::Kind::FLOATINGPOINT_TO_UBV}, + {FLOATINGPOINT_TO_SBV, CVC5::Kind::FLOATINGPOINT_TO_SBV}, + {FLOATINGPOINT_TO_REAL, CVC5::Kind::FLOATINGPOINT_TO_REAL}, /* Arrays -------------------------------------------------------------- */ - {SELECT, CVC4::Kind::SELECT}, - {STORE, CVC4::Kind::STORE}, - {CONST_ARRAY, CVC4::Kind::STORE_ALL}, - {EQ_RANGE, CVC4::Kind::EQ_RANGE}, + {SELECT, CVC5::Kind::SELECT}, + {STORE, CVC5::Kind::STORE}, + {CONST_ARRAY, CVC5::Kind::STORE_ALL}, + {EQ_RANGE, CVC5::Kind::EQ_RANGE}, /* Datatypes ----------------------------------------------------------- */ - {APPLY_SELECTOR, CVC4::Kind::APPLY_SELECTOR}, - {APPLY_CONSTRUCTOR, CVC4::Kind::APPLY_CONSTRUCTOR}, - {APPLY_TESTER, CVC4::Kind::APPLY_TESTER}, - {TUPLE_UPDATE, CVC4::Kind::TUPLE_UPDATE}, - {RECORD_UPDATE, CVC4::Kind::RECORD_UPDATE}, - {DT_SIZE, CVC4::Kind::DT_SIZE}, - {TUPLE_PROJECT, CVC4::Kind::TUPLE_PROJECT}, + {APPLY_SELECTOR, CVC5::Kind::APPLY_SELECTOR}, + {APPLY_CONSTRUCTOR, CVC5::Kind::APPLY_CONSTRUCTOR}, + {APPLY_TESTER, CVC5::Kind::APPLY_TESTER}, + {TUPLE_UPDATE, CVC5::Kind::TUPLE_UPDATE}, + {RECORD_UPDATE, CVC5::Kind::RECORD_UPDATE}, + {DT_SIZE, CVC5::Kind::DT_SIZE}, + {TUPLE_PROJECT, CVC5::Kind::TUPLE_PROJECT}, /* Separation Logic ---------------------------------------------------- */ - {SEP_NIL, CVC4::Kind::SEP_NIL}, - {SEP_EMP, CVC4::Kind::SEP_EMP}, - {SEP_PTO, CVC4::Kind::SEP_PTO}, - {SEP_STAR, CVC4::Kind::SEP_STAR}, - {SEP_WAND, CVC4::Kind::SEP_WAND}, + {SEP_NIL, CVC5::Kind::SEP_NIL}, + {SEP_EMP, CVC5::Kind::SEP_EMP}, + {SEP_PTO, CVC5::Kind::SEP_PTO}, + {SEP_STAR, CVC5::Kind::SEP_STAR}, + {SEP_WAND, CVC5::Kind::SEP_WAND}, /* Sets ---------------------------------------------------------------- */ - {EMPTYSET, CVC4::Kind::EMPTYSET}, - {UNION, CVC4::Kind::UNION}, - {INTERSECTION, CVC4::Kind::INTERSECTION}, - {SETMINUS, CVC4::Kind::SETMINUS}, - {SUBSET, CVC4::Kind::SUBSET}, - {MEMBER, CVC4::Kind::MEMBER}, - {SINGLETON, CVC4::Kind::SINGLETON}, - {INSERT, CVC4::Kind::INSERT}, - {CARD, CVC4::Kind::CARD}, - {COMPLEMENT, CVC4::Kind::COMPLEMENT}, - {UNIVERSE_SET, CVC4::Kind::UNIVERSE_SET}, - {JOIN, CVC4::Kind::JOIN}, - {PRODUCT, CVC4::Kind::PRODUCT}, - {TRANSPOSE, CVC4::Kind::TRANSPOSE}, - {TCLOSURE, CVC4::Kind::TCLOSURE}, - {JOIN_IMAGE, CVC4::Kind::JOIN_IMAGE}, - {IDEN, CVC4::Kind::IDEN}, - {COMPREHENSION, CVC4::Kind::COMPREHENSION}, - {CHOOSE, CVC4::Kind::CHOOSE}, - {IS_SINGLETON, CVC4::Kind::IS_SINGLETON}, + {EMPTYSET, CVC5::Kind::EMPTYSET}, + {UNION, CVC5::Kind::UNION}, + {INTERSECTION, CVC5::Kind::INTERSECTION}, + {SETMINUS, CVC5::Kind::SETMINUS}, + {SUBSET, CVC5::Kind::SUBSET}, + {MEMBER, CVC5::Kind::MEMBER}, + {SINGLETON, CVC5::Kind::SINGLETON}, + {INSERT, CVC5::Kind::INSERT}, + {CARD, CVC5::Kind::CARD}, + {COMPLEMENT, CVC5::Kind::COMPLEMENT}, + {UNIVERSE_SET, CVC5::Kind::UNIVERSE_SET}, + {JOIN, CVC5::Kind::JOIN}, + {PRODUCT, CVC5::Kind::PRODUCT}, + {TRANSPOSE, CVC5::Kind::TRANSPOSE}, + {TCLOSURE, CVC5::Kind::TCLOSURE}, + {JOIN_IMAGE, CVC5::Kind::JOIN_IMAGE}, + {IDEN, CVC5::Kind::IDEN}, + {COMPREHENSION, CVC5::Kind::COMPREHENSION}, + {CHOOSE, CVC5::Kind::CHOOSE}, + {IS_SINGLETON, CVC5::Kind::IS_SINGLETON}, /* Bags ---------------------------------------------------------------- */ - {UNION_MAX, CVC4::Kind::UNION_MAX}, - {UNION_DISJOINT, CVC4::Kind::UNION_DISJOINT}, - {INTERSECTION_MIN, CVC4::Kind::INTERSECTION_MIN}, - {DIFFERENCE_SUBTRACT, CVC4::Kind::DIFFERENCE_SUBTRACT}, - {DIFFERENCE_REMOVE, CVC4::Kind::DIFFERENCE_REMOVE}, - {SUBBAG, CVC4::Kind::SUBBAG}, - {BAG_COUNT, CVC4::Kind::BAG_COUNT}, - {DUPLICATE_REMOVAL, CVC4::Kind::DUPLICATE_REMOVAL}, - {MK_BAG, CVC4::Kind::MK_BAG}, - {EMPTYBAG, CVC4::Kind::EMPTYBAG}, - {BAG_CARD, CVC4::Kind::BAG_CARD}, - {BAG_CHOOSE, CVC4::Kind::BAG_CHOOSE}, - {BAG_IS_SINGLETON, CVC4::Kind::BAG_IS_SINGLETON}, - {BAG_FROM_SET, CVC4::Kind::BAG_FROM_SET}, - {BAG_TO_SET, CVC4::Kind::BAG_TO_SET}, + {UNION_MAX, CVC5::Kind::UNION_MAX}, + {UNION_DISJOINT, CVC5::Kind::UNION_DISJOINT}, + {INTERSECTION_MIN, CVC5::Kind::INTERSECTION_MIN}, + {DIFFERENCE_SUBTRACT, CVC5::Kind::DIFFERENCE_SUBTRACT}, + {DIFFERENCE_REMOVE, CVC5::Kind::DIFFERENCE_REMOVE}, + {SUBBAG, CVC5::Kind::SUBBAG}, + {BAG_COUNT, CVC5::Kind::BAG_COUNT}, + {DUPLICATE_REMOVAL, CVC5::Kind::DUPLICATE_REMOVAL}, + {MK_BAG, CVC5::Kind::MK_BAG}, + {EMPTYBAG, CVC5::Kind::EMPTYBAG}, + {BAG_CARD, CVC5::Kind::BAG_CARD}, + {BAG_CHOOSE, CVC5::Kind::BAG_CHOOSE}, + {BAG_IS_SINGLETON, CVC5::Kind::BAG_IS_SINGLETON}, + {BAG_FROM_SET, CVC5::Kind::BAG_FROM_SET}, + {BAG_TO_SET, CVC5::Kind::BAG_TO_SET}, /* Strings ------------------------------------------------------------- */ - {STRING_CONCAT, CVC4::Kind::STRING_CONCAT}, - {STRING_IN_REGEXP, CVC4::Kind::STRING_IN_REGEXP}, - {STRING_LENGTH, CVC4::Kind::STRING_LENGTH}, - {STRING_SUBSTR, CVC4::Kind::STRING_SUBSTR}, - {STRING_UPDATE, CVC4::Kind::STRING_UPDATE}, - {STRING_CHARAT, CVC4::Kind::STRING_CHARAT}, - {STRING_CONTAINS, CVC4::Kind::STRING_STRCTN}, - {STRING_INDEXOF, CVC4::Kind::STRING_STRIDOF}, - {STRING_REPLACE, CVC4::Kind::STRING_STRREPL}, - {STRING_REPLACE_ALL, CVC4::Kind::STRING_STRREPLALL}, - {STRING_REPLACE_RE, CVC4::Kind::STRING_REPLACE_RE}, - {STRING_REPLACE_RE_ALL, CVC4::Kind::STRING_REPLACE_RE_ALL}, - {STRING_TOLOWER, CVC4::Kind::STRING_TOLOWER}, - {STRING_TOUPPER, CVC4::Kind::STRING_TOUPPER}, - {STRING_REV, CVC4::Kind::STRING_REV}, - {STRING_FROM_CODE, CVC4::Kind::STRING_FROM_CODE}, - {STRING_TO_CODE, CVC4::Kind::STRING_TO_CODE}, - {STRING_LT, CVC4::Kind::STRING_LT}, - {STRING_LEQ, CVC4::Kind::STRING_LEQ}, - {STRING_PREFIX, CVC4::Kind::STRING_PREFIX}, - {STRING_SUFFIX, CVC4::Kind::STRING_SUFFIX}, - {STRING_IS_DIGIT, CVC4::Kind::STRING_IS_DIGIT}, - {STRING_FROM_INT, CVC4::Kind::STRING_ITOS}, - {STRING_TO_INT, CVC4::Kind::STRING_STOI}, - {CONST_STRING, CVC4::Kind::CONST_STRING}, - {STRING_TO_REGEXP, CVC4::Kind::STRING_TO_REGEXP}, - {REGEXP_CONCAT, CVC4::Kind::REGEXP_CONCAT}, - {REGEXP_UNION, CVC4::Kind::REGEXP_UNION}, - {REGEXP_INTER, CVC4::Kind::REGEXP_INTER}, - {REGEXP_DIFF, CVC4::Kind::REGEXP_DIFF}, - {REGEXP_STAR, CVC4::Kind::REGEXP_STAR}, - {REGEXP_PLUS, CVC4::Kind::REGEXP_PLUS}, - {REGEXP_OPT, CVC4::Kind::REGEXP_OPT}, - {REGEXP_RANGE, CVC4::Kind::REGEXP_RANGE}, - {REGEXP_REPEAT, CVC4::Kind::REGEXP_REPEAT}, - {REGEXP_LOOP, CVC4::Kind::REGEXP_LOOP}, - {REGEXP_EMPTY, CVC4::Kind::REGEXP_EMPTY}, - {REGEXP_SIGMA, CVC4::Kind::REGEXP_SIGMA}, - {REGEXP_COMPLEMENT, CVC4::Kind::REGEXP_COMPLEMENT}, + {STRING_CONCAT, CVC5::Kind::STRING_CONCAT}, + {STRING_IN_REGEXP, CVC5::Kind::STRING_IN_REGEXP}, + {STRING_LENGTH, CVC5::Kind::STRING_LENGTH}, + {STRING_SUBSTR, CVC5::Kind::STRING_SUBSTR}, + {STRING_UPDATE, CVC5::Kind::STRING_UPDATE}, + {STRING_CHARAT, CVC5::Kind::STRING_CHARAT}, + {STRING_CONTAINS, CVC5::Kind::STRING_STRCTN}, + {STRING_INDEXOF, CVC5::Kind::STRING_STRIDOF}, + {STRING_REPLACE, CVC5::Kind::STRING_STRREPL}, + {STRING_REPLACE_ALL, CVC5::Kind::STRING_STRREPLALL}, + {STRING_REPLACE_RE, CVC5::Kind::STRING_REPLACE_RE}, + {STRING_REPLACE_RE_ALL, CVC5::Kind::STRING_REPLACE_RE_ALL}, + {STRING_TOLOWER, CVC5::Kind::STRING_TOLOWER}, + {STRING_TOUPPER, CVC5::Kind::STRING_TOUPPER}, + {STRING_REV, CVC5::Kind::STRING_REV}, + {STRING_FROM_CODE, CVC5::Kind::STRING_FROM_CODE}, + {STRING_TO_CODE, CVC5::Kind::STRING_TO_CODE}, + {STRING_LT, CVC5::Kind::STRING_LT}, + {STRING_LEQ, CVC5::Kind::STRING_LEQ}, + {STRING_PREFIX, CVC5::Kind::STRING_PREFIX}, + {STRING_SUFFIX, CVC5::Kind::STRING_SUFFIX}, + {STRING_IS_DIGIT, CVC5::Kind::STRING_IS_DIGIT}, + {STRING_FROM_INT, CVC5::Kind::STRING_ITOS}, + {STRING_TO_INT, CVC5::Kind::STRING_STOI}, + {CONST_STRING, CVC5::Kind::CONST_STRING}, + {STRING_TO_REGEXP, CVC5::Kind::STRING_TO_REGEXP}, + {REGEXP_CONCAT, CVC5::Kind::REGEXP_CONCAT}, + {REGEXP_UNION, CVC5::Kind::REGEXP_UNION}, + {REGEXP_INTER, CVC5::Kind::REGEXP_INTER}, + {REGEXP_DIFF, CVC5::Kind::REGEXP_DIFF}, + {REGEXP_STAR, CVC5::Kind::REGEXP_STAR}, + {REGEXP_PLUS, CVC5::Kind::REGEXP_PLUS}, + {REGEXP_OPT, CVC5::Kind::REGEXP_OPT}, + {REGEXP_RANGE, CVC5::Kind::REGEXP_RANGE}, + {REGEXP_REPEAT, CVC5::Kind::REGEXP_REPEAT}, + {REGEXP_LOOP, CVC5::Kind::REGEXP_LOOP}, + {REGEXP_EMPTY, CVC5::Kind::REGEXP_EMPTY}, + {REGEXP_SIGMA, CVC5::Kind::REGEXP_SIGMA}, + {REGEXP_COMPLEMENT, CVC5::Kind::REGEXP_COMPLEMENT}, // maps to the same kind as the string versions - {SEQ_CONCAT, CVC4::Kind::STRING_CONCAT}, - {SEQ_LENGTH, CVC4::Kind::STRING_LENGTH}, - {SEQ_EXTRACT, CVC4::Kind::STRING_SUBSTR}, - {SEQ_UPDATE, CVC4::Kind::STRING_UPDATE}, - {SEQ_AT, CVC4::Kind::STRING_CHARAT}, - {SEQ_CONTAINS, CVC4::Kind::STRING_STRCTN}, - {SEQ_INDEXOF, CVC4::Kind::STRING_STRIDOF}, - {SEQ_REPLACE, CVC4::Kind::STRING_STRREPL}, - {SEQ_REPLACE_ALL, CVC4::Kind::STRING_STRREPLALL}, - {SEQ_REV, CVC4::Kind::STRING_REV}, - {SEQ_PREFIX, CVC4::Kind::STRING_PREFIX}, - {SEQ_SUFFIX, CVC4::Kind::STRING_SUFFIX}, - {CONST_SEQUENCE, CVC4::Kind::CONST_SEQUENCE}, - {SEQ_UNIT, CVC4::Kind::SEQ_UNIT}, - {SEQ_NTH, CVC4::Kind::SEQ_NTH}, + {SEQ_CONCAT, CVC5::Kind::STRING_CONCAT}, + {SEQ_LENGTH, CVC5::Kind::STRING_LENGTH}, + {SEQ_EXTRACT, CVC5::Kind::STRING_SUBSTR}, + {SEQ_UPDATE, CVC5::Kind::STRING_UPDATE}, + {SEQ_AT, CVC5::Kind::STRING_CHARAT}, + {SEQ_CONTAINS, CVC5::Kind::STRING_STRCTN}, + {SEQ_INDEXOF, CVC5::Kind::STRING_STRIDOF}, + {SEQ_REPLACE, CVC5::Kind::STRING_STRREPL}, + {SEQ_REPLACE_ALL, CVC5::Kind::STRING_STRREPLALL}, + {SEQ_REV, CVC5::Kind::STRING_REV}, + {SEQ_PREFIX, CVC5::Kind::STRING_PREFIX}, + {SEQ_SUFFIX, CVC5::Kind::STRING_SUFFIX}, + {CONST_SEQUENCE, CVC5::Kind::CONST_SEQUENCE}, + {SEQ_UNIT, CVC5::Kind::SEQ_UNIT}, + {SEQ_NTH, CVC5::Kind::SEQ_NTH}, /* Quantifiers --------------------------------------------------------- */ - {FORALL, CVC4::Kind::FORALL}, - {EXISTS, CVC4::Kind::EXISTS}, - {BOUND_VAR_LIST, CVC4::Kind::BOUND_VAR_LIST}, - {INST_PATTERN, CVC4::Kind::INST_PATTERN}, - {INST_NO_PATTERN, CVC4::Kind::INST_NO_PATTERN}, - {INST_ATTRIBUTE, CVC4::Kind::INST_ATTRIBUTE}, - {INST_PATTERN_LIST, CVC4::Kind::INST_PATTERN_LIST}, - {LAST_KIND, CVC4::Kind::LAST_KIND}, + {FORALL, CVC5::Kind::FORALL}, + {EXISTS, CVC5::Kind::EXISTS}, + {BOUND_VAR_LIST, CVC5::Kind::BOUND_VAR_LIST}, + {INST_PATTERN, CVC5::Kind::INST_PATTERN}, + {INST_NO_PATTERN, CVC5::Kind::INST_NO_PATTERN}, + {INST_ATTRIBUTE, CVC5::Kind::INST_ATTRIBUTE}, + {INST_PATTERN_LIST, CVC5::Kind::INST_PATTERN_LIST}, + {LAST_KIND, CVC5::Kind::LAST_KIND}, }; /* Mapping from internal kind to external (API) kind. */ -const static std::unordered_map +const static std::unordered_map s_kinds_internal{ - {CVC4::Kind::UNDEFINED_KIND, UNDEFINED_KIND}, - {CVC4::Kind::NULL_EXPR, NULL_EXPR}, + {CVC5::Kind::UNDEFINED_KIND, UNDEFINED_KIND}, + {CVC5::Kind::NULL_EXPR, NULL_EXPR}, /* Builtin --------------------------------------------------------- */ - {CVC4::Kind::UNINTERPRETED_CONSTANT, UNINTERPRETED_CONSTANT}, - {CVC4::Kind::ABSTRACT_VALUE, ABSTRACT_VALUE}, - {CVC4::Kind::EQUAL, EQUAL}, - {CVC4::Kind::DISTINCT, DISTINCT}, - {CVC4::Kind::VARIABLE, CONSTANT}, - {CVC4::Kind::BOUND_VARIABLE, VARIABLE}, - {CVC4::Kind::SEXPR, SEXPR}, - {CVC4::Kind::LAMBDA, LAMBDA}, - {CVC4::Kind::WITNESS, WITNESS}, + {CVC5::Kind::UNINTERPRETED_CONSTANT, UNINTERPRETED_CONSTANT}, + {CVC5::Kind::ABSTRACT_VALUE, ABSTRACT_VALUE}, + {CVC5::Kind::EQUAL, EQUAL}, + {CVC5::Kind::DISTINCT, DISTINCT}, + {CVC5::Kind::VARIABLE, CONSTANT}, + {CVC5::Kind::BOUND_VARIABLE, VARIABLE}, + {CVC5::Kind::SEXPR, SEXPR}, + {CVC5::Kind::LAMBDA, LAMBDA}, + {CVC5::Kind::WITNESS, WITNESS}, /* Boolean --------------------------------------------------------- */ - {CVC4::Kind::CONST_BOOLEAN, CONST_BOOLEAN}, - {CVC4::Kind::NOT, NOT}, - {CVC4::Kind::AND, AND}, - {CVC4::Kind::IMPLIES, IMPLIES}, - {CVC4::Kind::OR, OR}, - {CVC4::Kind::XOR, XOR}, - {CVC4::Kind::ITE, ITE}, - {CVC4::Kind::MATCH, MATCH}, - {CVC4::Kind::MATCH_CASE, MATCH_CASE}, - {CVC4::Kind::MATCH_BIND_CASE, MATCH_BIND_CASE}, + {CVC5::Kind::CONST_BOOLEAN, CONST_BOOLEAN}, + {CVC5::Kind::NOT, NOT}, + {CVC5::Kind::AND, AND}, + {CVC5::Kind::IMPLIES, IMPLIES}, + {CVC5::Kind::OR, OR}, + {CVC5::Kind::XOR, XOR}, + {CVC5::Kind::ITE, ITE}, + {CVC5::Kind::MATCH, MATCH}, + {CVC5::Kind::MATCH_CASE, MATCH_CASE}, + {CVC5::Kind::MATCH_BIND_CASE, MATCH_BIND_CASE}, /* UF -------------------------------------------------------------- */ - {CVC4::Kind::APPLY_UF, APPLY_UF}, - {CVC4::Kind::CARDINALITY_CONSTRAINT, CARDINALITY_CONSTRAINT}, - {CVC4::Kind::CARDINALITY_VALUE, CARDINALITY_VALUE}, - {CVC4::Kind::HO_APPLY, HO_APPLY}, + {CVC5::Kind::APPLY_UF, APPLY_UF}, + {CVC5::Kind::CARDINALITY_CONSTRAINT, CARDINALITY_CONSTRAINT}, + {CVC5::Kind::CARDINALITY_VALUE, CARDINALITY_VALUE}, + {CVC5::Kind::HO_APPLY, HO_APPLY}, /* Arithmetic ------------------------------------------------------ */ - {CVC4::Kind::PLUS, PLUS}, - {CVC4::Kind::MULT, MULT}, - {CVC4::Kind::IAND, IAND}, - {CVC4::Kind::MINUS, MINUS}, - {CVC4::Kind::UMINUS, UMINUS}, - {CVC4::Kind::DIVISION, DIVISION}, - {CVC4::Kind::DIVISION_TOTAL, INTERNAL_KIND}, - {CVC4::Kind::INTS_DIVISION, INTS_DIVISION}, - {CVC4::Kind::INTS_DIVISION_TOTAL, INTERNAL_KIND}, - {CVC4::Kind::INTS_MODULUS, INTS_MODULUS}, - {CVC4::Kind::INTS_MODULUS_TOTAL, INTERNAL_KIND}, - {CVC4::Kind::ABS, ABS}, - {CVC4::Kind::DIVISIBLE, DIVISIBLE}, - {CVC4::Kind::POW, POW}, - {CVC4::Kind::EXPONENTIAL, EXPONENTIAL}, - {CVC4::Kind::SINE, SINE}, - {CVC4::Kind::COSINE, COSINE}, - {CVC4::Kind::TANGENT, TANGENT}, - {CVC4::Kind::COSECANT, COSECANT}, - {CVC4::Kind::SECANT, SECANT}, - {CVC4::Kind::COTANGENT, COTANGENT}, - {CVC4::Kind::ARCSINE, ARCSINE}, - {CVC4::Kind::ARCCOSINE, ARCCOSINE}, - {CVC4::Kind::ARCTANGENT, ARCTANGENT}, - {CVC4::Kind::ARCCOSECANT, ARCCOSECANT}, - {CVC4::Kind::ARCSECANT, ARCSECANT}, - {CVC4::Kind::ARCCOTANGENT, ARCCOTANGENT}, - {CVC4::Kind::SQRT, SQRT}, - {CVC4::Kind::DIVISIBLE_OP, DIVISIBLE}, - {CVC4::Kind::CONST_RATIONAL, CONST_RATIONAL}, - {CVC4::Kind::LT, LT}, - {CVC4::Kind::LEQ, LEQ}, - {CVC4::Kind::GT, GT}, - {CVC4::Kind::GEQ, GEQ}, - {CVC4::Kind::IS_INTEGER, IS_INTEGER}, - {CVC4::Kind::TO_INTEGER, TO_INTEGER}, - {CVC4::Kind::TO_REAL, TO_REAL}, - {CVC4::Kind::PI, PI}, + {CVC5::Kind::PLUS, PLUS}, + {CVC5::Kind::MULT, MULT}, + {CVC5::Kind::IAND, IAND}, + {CVC5::Kind::MINUS, MINUS}, + {CVC5::Kind::UMINUS, UMINUS}, + {CVC5::Kind::DIVISION, DIVISION}, + {CVC5::Kind::DIVISION_TOTAL, INTERNAL_KIND}, + {CVC5::Kind::INTS_DIVISION, INTS_DIVISION}, + {CVC5::Kind::INTS_DIVISION_TOTAL, INTERNAL_KIND}, + {CVC5::Kind::INTS_MODULUS, INTS_MODULUS}, + {CVC5::Kind::INTS_MODULUS_TOTAL, INTERNAL_KIND}, + {CVC5::Kind::ABS, ABS}, + {CVC5::Kind::DIVISIBLE, DIVISIBLE}, + {CVC5::Kind::POW, POW}, + {CVC5::Kind::EXPONENTIAL, EXPONENTIAL}, + {CVC5::Kind::SINE, SINE}, + {CVC5::Kind::COSINE, COSINE}, + {CVC5::Kind::TANGENT, TANGENT}, + {CVC5::Kind::COSECANT, COSECANT}, + {CVC5::Kind::SECANT, SECANT}, + {CVC5::Kind::COTANGENT, COTANGENT}, + {CVC5::Kind::ARCSINE, ARCSINE}, + {CVC5::Kind::ARCCOSINE, ARCCOSINE}, + {CVC5::Kind::ARCTANGENT, ARCTANGENT}, + {CVC5::Kind::ARCCOSECANT, ARCCOSECANT}, + {CVC5::Kind::ARCSECANT, ARCSECANT}, + {CVC5::Kind::ARCCOTANGENT, ARCCOTANGENT}, + {CVC5::Kind::SQRT, SQRT}, + {CVC5::Kind::DIVISIBLE_OP, DIVISIBLE}, + {CVC5::Kind::CONST_RATIONAL, CONST_RATIONAL}, + {CVC5::Kind::LT, LT}, + {CVC5::Kind::LEQ, LEQ}, + {CVC5::Kind::GT, GT}, + {CVC5::Kind::GEQ, GEQ}, + {CVC5::Kind::IS_INTEGER, IS_INTEGER}, + {CVC5::Kind::TO_INTEGER, TO_INTEGER}, + {CVC5::Kind::TO_REAL, TO_REAL}, + {CVC5::Kind::PI, PI}, /* BV -------------------------------------------------------------- */ - {CVC4::Kind::CONST_BITVECTOR, CONST_BITVECTOR}, - {CVC4::Kind::BITVECTOR_CONCAT, BITVECTOR_CONCAT}, - {CVC4::Kind::BITVECTOR_AND, BITVECTOR_AND}, - {CVC4::Kind::BITVECTOR_OR, BITVECTOR_OR}, - {CVC4::Kind::BITVECTOR_XOR, BITVECTOR_XOR}, - {CVC4::Kind::BITVECTOR_NOT, BITVECTOR_NOT}, - {CVC4::Kind::BITVECTOR_NAND, BITVECTOR_NAND}, - {CVC4::Kind::BITVECTOR_NOR, BITVECTOR_NOR}, - {CVC4::Kind::BITVECTOR_XNOR, BITVECTOR_XNOR}, - {CVC4::Kind::BITVECTOR_COMP, BITVECTOR_COMP}, - {CVC4::Kind::BITVECTOR_MULT, BITVECTOR_MULT}, - {CVC4::Kind::BITVECTOR_PLUS, BITVECTOR_PLUS}, - {CVC4::Kind::BITVECTOR_SUB, BITVECTOR_SUB}, - {CVC4::Kind::BITVECTOR_NEG, BITVECTOR_NEG}, - {CVC4::Kind::BITVECTOR_UDIV, BITVECTOR_UDIV}, - {CVC4::Kind::BITVECTOR_UREM, BITVECTOR_UREM}, - {CVC4::Kind::BITVECTOR_SDIV, BITVECTOR_SDIV}, - {CVC4::Kind::BITVECTOR_SREM, BITVECTOR_SREM}, - {CVC4::Kind::BITVECTOR_SMOD, BITVECTOR_SMOD}, - {CVC4::Kind::BITVECTOR_SHL, BITVECTOR_SHL}, - {CVC4::Kind::BITVECTOR_LSHR, BITVECTOR_LSHR}, - {CVC4::Kind::BITVECTOR_ASHR, BITVECTOR_ASHR}, - {CVC4::Kind::BITVECTOR_ULT, BITVECTOR_ULT}, - {CVC4::Kind::BITVECTOR_ULE, BITVECTOR_ULE}, - {CVC4::Kind::BITVECTOR_UGT, BITVECTOR_UGT}, - {CVC4::Kind::BITVECTOR_UGE, BITVECTOR_UGE}, - {CVC4::Kind::BITVECTOR_SLT, BITVECTOR_SLT}, - {CVC4::Kind::BITVECTOR_SLE, BITVECTOR_SLE}, - {CVC4::Kind::BITVECTOR_SGT, BITVECTOR_SGT}, - {CVC4::Kind::BITVECTOR_SGE, BITVECTOR_SGE}, - {CVC4::Kind::BITVECTOR_ULTBV, BITVECTOR_ULTBV}, - {CVC4::Kind::BITVECTOR_SLTBV, BITVECTOR_SLTBV}, - {CVC4::Kind::BITVECTOR_ITE, BITVECTOR_ITE}, - {CVC4::Kind::BITVECTOR_REDOR, BITVECTOR_REDOR}, - {CVC4::Kind::BITVECTOR_REDAND, BITVECTOR_REDAND}, - {CVC4::Kind::BITVECTOR_EXTRACT_OP, BITVECTOR_EXTRACT}, - {CVC4::Kind::BITVECTOR_REPEAT_OP, BITVECTOR_REPEAT}, - {CVC4::Kind::BITVECTOR_ZERO_EXTEND_OP, BITVECTOR_ZERO_EXTEND}, - {CVC4::Kind::BITVECTOR_SIGN_EXTEND_OP, BITVECTOR_SIGN_EXTEND}, - {CVC4::Kind::BITVECTOR_ROTATE_LEFT_OP, BITVECTOR_ROTATE_LEFT}, - {CVC4::Kind::BITVECTOR_ROTATE_RIGHT_OP, BITVECTOR_ROTATE_RIGHT}, - {CVC4::Kind::BITVECTOR_EXTRACT, BITVECTOR_EXTRACT}, - {CVC4::Kind::BITVECTOR_REPEAT, BITVECTOR_REPEAT}, - {CVC4::Kind::BITVECTOR_ZERO_EXTEND, BITVECTOR_ZERO_EXTEND}, - {CVC4::Kind::BITVECTOR_SIGN_EXTEND, BITVECTOR_SIGN_EXTEND}, - {CVC4::Kind::BITVECTOR_ROTATE_LEFT, BITVECTOR_ROTATE_LEFT}, - {CVC4::Kind::BITVECTOR_ROTATE_RIGHT, BITVECTOR_ROTATE_RIGHT}, - {CVC4::Kind::INT_TO_BITVECTOR_OP, INT_TO_BITVECTOR}, - {CVC4::Kind::INT_TO_BITVECTOR, INT_TO_BITVECTOR}, - {CVC4::Kind::BITVECTOR_TO_NAT, BITVECTOR_TO_NAT}, + {CVC5::Kind::CONST_BITVECTOR, CONST_BITVECTOR}, + {CVC5::Kind::BITVECTOR_CONCAT, BITVECTOR_CONCAT}, + {CVC5::Kind::BITVECTOR_AND, BITVECTOR_AND}, + {CVC5::Kind::BITVECTOR_OR, BITVECTOR_OR}, + {CVC5::Kind::BITVECTOR_XOR, BITVECTOR_XOR}, + {CVC5::Kind::BITVECTOR_NOT, BITVECTOR_NOT}, + {CVC5::Kind::BITVECTOR_NAND, BITVECTOR_NAND}, + {CVC5::Kind::BITVECTOR_NOR, BITVECTOR_NOR}, + {CVC5::Kind::BITVECTOR_XNOR, BITVECTOR_XNOR}, + {CVC5::Kind::BITVECTOR_COMP, BITVECTOR_COMP}, + {CVC5::Kind::BITVECTOR_MULT, BITVECTOR_MULT}, + {CVC5::Kind::BITVECTOR_PLUS, BITVECTOR_PLUS}, + {CVC5::Kind::BITVECTOR_SUB, BITVECTOR_SUB}, + {CVC5::Kind::BITVECTOR_NEG, BITVECTOR_NEG}, + {CVC5::Kind::BITVECTOR_UDIV, BITVECTOR_UDIV}, + {CVC5::Kind::BITVECTOR_UREM, BITVECTOR_UREM}, + {CVC5::Kind::BITVECTOR_SDIV, BITVECTOR_SDIV}, + {CVC5::Kind::BITVECTOR_SREM, BITVECTOR_SREM}, + {CVC5::Kind::BITVECTOR_SMOD, BITVECTOR_SMOD}, + {CVC5::Kind::BITVECTOR_SHL, BITVECTOR_SHL}, + {CVC5::Kind::BITVECTOR_LSHR, BITVECTOR_LSHR}, + {CVC5::Kind::BITVECTOR_ASHR, BITVECTOR_ASHR}, + {CVC5::Kind::BITVECTOR_ULT, BITVECTOR_ULT}, + {CVC5::Kind::BITVECTOR_ULE, BITVECTOR_ULE}, + {CVC5::Kind::BITVECTOR_UGT, BITVECTOR_UGT}, + {CVC5::Kind::BITVECTOR_UGE, BITVECTOR_UGE}, + {CVC5::Kind::BITVECTOR_SLT, BITVECTOR_SLT}, + {CVC5::Kind::BITVECTOR_SLE, BITVECTOR_SLE}, + {CVC5::Kind::BITVECTOR_SGT, BITVECTOR_SGT}, + {CVC5::Kind::BITVECTOR_SGE, BITVECTOR_SGE}, + {CVC5::Kind::BITVECTOR_ULTBV, BITVECTOR_ULTBV}, + {CVC5::Kind::BITVECTOR_SLTBV, BITVECTOR_SLTBV}, + {CVC5::Kind::BITVECTOR_ITE, BITVECTOR_ITE}, + {CVC5::Kind::BITVECTOR_REDOR, BITVECTOR_REDOR}, + {CVC5::Kind::BITVECTOR_REDAND, BITVECTOR_REDAND}, + {CVC5::Kind::BITVECTOR_EXTRACT_OP, BITVECTOR_EXTRACT}, + {CVC5::Kind::BITVECTOR_REPEAT_OP, BITVECTOR_REPEAT}, + {CVC5::Kind::BITVECTOR_ZERO_EXTEND_OP, BITVECTOR_ZERO_EXTEND}, + {CVC5::Kind::BITVECTOR_SIGN_EXTEND_OP, BITVECTOR_SIGN_EXTEND}, + {CVC5::Kind::BITVECTOR_ROTATE_LEFT_OP, BITVECTOR_ROTATE_LEFT}, + {CVC5::Kind::BITVECTOR_ROTATE_RIGHT_OP, BITVECTOR_ROTATE_RIGHT}, + {CVC5::Kind::BITVECTOR_EXTRACT, BITVECTOR_EXTRACT}, + {CVC5::Kind::BITVECTOR_REPEAT, BITVECTOR_REPEAT}, + {CVC5::Kind::BITVECTOR_ZERO_EXTEND, BITVECTOR_ZERO_EXTEND}, + {CVC5::Kind::BITVECTOR_SIGN_EXTEND, BITVECTOR_SIGN_EXTEND}, + {CVC5::Kind::BITVECTOR_ROTATE_LEFT, BITVECTOR_ROTATE_LEFT}, + {CVC5::Kind::BITVECTOR_ROTATE_RIGHT, BITVECTOR_ROTATE_RIGHT}, + {CVC5::Kind::INT_TO_BITVECTOR_OP, INT_TO_BITVECTOR}, + {CVC5::Kind::INT_TO_BITVECTOR, INT_TO_BITVECTOR}, + {CVC5::Kind::BITVECTOR_TO_NAT, BITVECTOR_TO_NAT}, /* FP -------------------------------------------------------------- */ - {CVC4::Kind::CONST_FLOATINGPOINT, CONST_FLOATINGPOINT}, - {CVC4::Kind::CONST_ROUNDINGMODE, CONST_ROUNDINGMODE}, - {CVC4::Kind::FLOATINGPOINT_FP, FLOATINGPOINT_FP}, - {CVC4::Kind::FLOATINGPOINT_EQ, FLOATINGPOINT_EQ}, - {CVC4::Kind::FLOATINGPOINT_ABS, FLOATINGPOINT_ABS}, - {CVC4::Kind::FLOATINGPOINT_NEG, FLOATINGPOINT_NEG}, - {CVC4::Kind::FLOATINGPOINT_PLUS, FLOATINGPOINT_PLUS}, - {CVC4::Kind::FLOATINGPOINT_SUB, FLOATINGPOINT_SUB}, - {CVC4::Kind::FLOATINGPOINT_MULT, FLOATINGPOINT_MULT}, - {CVC4::Kind::FLOATINGPOINT_DIV, FLOATINGPOINT_DIV}, - {CVC4::Kind::FLOATINGPOINT_FMA, FLOATINGPOINT_FMA}, - {CVC4::Kind::FLOATINGPOINT_SQRT, FLOATINGPOINT_SQRT}, - {CVC4::Kind::FLOATINGPOINT_REM, FLOATINGPOINT_REM}, - {CVC4::Kind::FLOATINGPOINT_RTI, FLOATINGPOINT_RTI}, - {CVC4::Kind::FLOATINGPOINT_MIN, FLOATINGPOINT_MIN}, - {CVC4::Kind::FLOATINGPOINT_MAX, FLOATINGPOINT_MAX}, - {CVC4::Kind::FLOATINGPOINT_LEQ, FLOATINGPOINT_LEQ}, - {CVC4::Kind::FLOATINGPOINT_LT, FLOATINGPOINT_LT}, - {CVC4::Kind::FLOATINGPOINT_GEQ, FLOATINGPOINT_GEQ}, - {CVC4::Kind::FLOATINGPOINT_GT, FLOATINGPOINT_GT}, - {CVC4::Kind::FLOATINGPOINT_ISN, FLOATINGPOINT_ISN}, - {CVC4::Kind::FLOATINGPOINT_ISSN, FLOATINGPOINT_ISSN}, - {CVC4::Kind::FLOATINGPOINT_ISZ, FLOATINGPOINT_ISZ}, - {CVC4::Kind::FLOATINGPOINT_ISINF, FLOATINGPOINT_ISINF}, - {CVC4::Kind::FLOATINGPOINT_ISNAN, FLOATINGPOINT_ISNAN}, - {CVC4::Kind::FLOATINGPOINT_ISNEG, FLOATINGPOINT_ISNEG}, - {CVC4::Kind::FLOATINGPOINT_ISPOS, FLOATINGPOINT_ISPOS}, - {CVC4::Kind::FLOATINGPOINT_TO_FP_IEEE_BITVECTOR_OP, + {CVC5::Kind::CONST_FLOATINGPOINT, CONST_FLOATINGPOINT}, + {CVC5::Kind::CONST_ROUNDINGMODE, CONST_ROUNDINGMODE}, + {CVC5::Kind::FLOATINGPOINT_FP, FLOATINGPOINT_FP}, + {CVC5::Kind::FLOATINGPOINT_EQ, FLOATINGPOINT_EQ}, + {CVC5::Kind::FLOATINGPOINT_ABS, FLOATINGPOINT_ABS}, + {CVC5::Kind::FLOATINGPOINT_NEG, FLOATINGPOINT_NEG}, + {CVC5::Kind::FLOATINGPOINT_PLUS, FLOATINGPOINT_PLUS}, + {CVC5::Kind::FLOATINGPOINT_SUB, FLOATINGPOINT_SUB}, + {CVC5::Kind::FLOATINGPOINT_MULT, FLOATINGPOINT_MULT}, + {CVC5::Kind::FLOATINGPOINT_DIV, FLOATINGPOINT_DIV}, + {CVC5::Kind::FLOATINGPOINT_FMA, FLOATINGPOINT_FMA}, + {CVC5::Kind::FLOATINGPOINT_SQRT, FLOATINGPOINT_SQRT}, + {CVC5::Kind::FLOATINGPOINT_REM, FLOATINGPOINT_REM}, + {CVC5::Kind::FLOATINGPOINT_RTI, FLOATINGPOINT_RTI}, + {CVC5::Kind::FLOATINGPOINT_MIN, FLOATINGPOINT_MIN}, + {CVC5::Kind::FLOATINGPOINT_MAX, FLOATINGPOINT_MAX}, + {CVC5::Kind::FLOATINGPOINT_LEQ, FLOATINGPOINT_LEQ}, + {CVC5::Kind::FLOATINGPOINT_LT, FLOATINGPOINT_LT}, + {CVC5::Kind::FLOATINGPOINT_GEQ, FLOATINGPOINT_GEQ}, + {CVC5::Kind::FLOATINGPOINT_GT, FLOATINGPOINT_GT}, + {CVC5::Kind::FLOATINGPOINT_ISN, FLOATINGPOINT_ISN}, + {CVC5::Kind::FLOATINGPOINT_ISSN, FLOATINGPOINT_ISSN}, + {CVC5::Kind::FLOATINGPOINT_ISZ, FLOATINGPOINT_ISZ}, + {CVC5::Kind::FLOATINGPOINT_ISINF, FLOATINGPOINT_ISINF}, + {CVC5::Kind::FLOATINGPOINT_ISNAN, FLOATINGPOINT_ISNAN}, + {CVC5::Kind::FLOATINGPOINT_ISNEG, FLOATINGPOINT_ISNEG}, + {CVC5::Kind::FLOATINGPOINT_ISPOS, FLOATINGPOINT_ISPOS}, + {CVC5::Kind::FLOATINGPOINT_TO_FP_IEEE_BITVECTOR_OP, FLOATINGPOINT_TO_FP_IEEE_BITVECTOR}, - {CVC4::Kind::FLOATINGPOINT_TO_FP_IEEE_BITVECTOR, + {CVC5::Kind::FLOATINGPOINT_TO_FP_IEEE_BITVECTOR, FLOATINGPOINT_TO_FP_IEEE_BITVECTOR}, - {CVC4::Kind::FLOATINGPOINT_TO_FP_FLOATINGPOINT_OP, + {CVC5::Kind::FLOATINGPOINT_TO_FP_FLOATINGPOINT_OP, FLOATINGPOINT_TO_FP_FLOATINGPOINT}, - {CVC4::Kind::FLOATINGPOINT_TO_FP_FLOATINGPOINT, + {CVC5::Kind::FLOATINGPOINT_TO_FP_FLOATINGPOINT, FLOATINGPOINT_TO_FP_FLOATINGPOINT}, - {CVC4::Kind::FLOATINGPOINT_TO_FP_REAL_OP, FLOATINGPOINT_TO_FP_REAL}, - {CVC4::Kind::FLOATINGPOINT_TO_FP_REAL, FLOATINGPOINT_TO_FP_REAL}, - {CVC4::Kind::FLOATINGPOINT_TO_FP_SIGNED_BITVECTOR_OP, + {CVC5::Kind::FLOATINGPOINT_TO_FP_REAL_OP, FLOATINGPOINT_TO_FP_REAL}, + {CVC5::Kind::FLOATINGPOINT_TO_FP_REAL, FLOATINGPOINT_TO_FP_REAL}, + {CVC5::Kind::FLOATINGPOINT_TO_FP_SIGNED_BITVECTOR_OP, FLOATINGPOINT_TO_FP_SIGNED_BITVECTOR}, - {CVC4::Kind::FLOATINGPOINT_TO_FP_SIGNED_BITVECTOR, + {CVC5::Kind::FLOATINGPOINT_TO_FP_SIGNED_BITVECTOR, FLOATINGPOINT_TO_FP_SIGNED_BITVECTOR}, - {CVC4::Kind::FLOATINGPOINT_TO_FP_UNSIGNED_BITVECTOR_OP, + {CVC5::Kind::FLOATINGPOINT_TO_FP_UNSIGNED_BITVECTOR_OP, FLOATINGPOINT_TO_FP_UNSIGNED_BITVECTOR}, - {CVC4::Kind::FLOATINGPOINT_TO_FP_UNSIGNED_BITVECTOR, + {CVC5::Kind::FLOATINGPOINT_TO_FP_UNSIGNED_BITVECTOR, FLOATINGPOINT_TO_FP_UNSIGNED_BITVECTOR}, - {CVC4::Kind::FLOATINGPOINT_TO_FP_GENERIC_OP, + {CVC5::Kind::FLOATINGPOINT_TO_FP_GENERIC_OP, FLOATINGPOINT_TO_FP_GENERIC}, - {CVC4::Kind::FLOATINGPOINT_TO_FP_GENERIC, FLOATINGPOINT_TO_FP_GENERIC}, - {CVC4::Kind::FLOATINGPOINT_TO_UBV_OP, FLOATINGPOINT_TO_UBV}, - {CVC4::Kind::FLOATINGPOINT_TO_UBV, FLOATINGPOINT_TO_UBV}, - {CVC4::Kind::FLOATINGPOINT_TO_UBV_TOTAL_OP, INTERNAL_KIND}, - {CVC4::Kind::FLOATINGPOINT_TO_UBV_TOTAL, INTERNAL_KIND}, - {CVC4::Kind::FLOATINGPOINT_TO_SBV_OP, FLOATINGPOINT_TO_SBV}, - {CVC4::Kind::FLOATINGPOINT_TO_SBV, FLOATINGPOINT_TO_SBV}, - {CVC4::Kind::FLOATINGPOINT_TO_SBV_TOTAL_OP, INTERNAL_KIND}, - {CVC4::Kind::FLOATINGPOINT_TO_SBV_TOTAL, INTERNAL_KIND}, - {CVC4::Kind::FLOATINGPOINT_TO_REAL, FLOATINGPOINT_TO_REAL}, - {CVC4::Kind::FLOATINGPOINT_TO_REAL_TOTAL, INTERNAL_KIND}, + {CVC5::Kind::FLOATINGPOINT_TO_FP_GENERIC, FLOATINGPOINT_TO_FP_GENERIC}, + {CVC5::Kind::FLOATINGPOINT_TO_UBV_OP, FLOATINGPOINT_TO_UBV}, + {CVC5::Kind::FLOATINGPOINT_TO_UBV, FLOATINGPOINT_TO_UBV}, + {CVC5::Kind::FLOATINGPOINT_TO_UBV_TOTAL_OP, INTERNAL_KIND}, + {CVC5::Kind::FLOATINGPOINT_TO_UBV_TOTAL, INTERNAL_KIND}, + {CVC5::Kind::FLOATINGPOINT_TO_SBV_OP, FLOATINGPOINT_TO_SBV}, + {CVC5::Kind::FLOATINGPOINT_TO_SBV, FLOATINGPOINT_TO_SBV}, + {CVC5::Kind::FLOATINGPOINT_TO_SBV_TOTAL_OP, INTERNAL_KIND}, + {CVC5::Kind::FLOATINGPOINT_TO_SBV_TOTAL, INTERNAL_KIND}, + {CVC5::Kind::FLOATINGPOINT_TO_REAL, FLOATINGPOINT_TO_REAL}, + {CVC5::Kind::FLOATINGPOINT_TO_REAL_TOTAL, INTERNAL_KIND}, /* Arrays ---------------------------------------------------------- */ - {CVC4::Kind::SELECT, SELECT}, - {CVC4::Kind::STORE, STORE}, - {CVC4::Kind::STORE_ALL, CONST_ARRAY}, + {CVC5::Kind::SELECT, SELECT}, + {CVC5::Kind::STORE, STORE}, + {CVC5::Kind::STORE_ALL, CONST_ARRAY}, /* Datatypes ------------------------------------------------------- */ - {CVC4::Kind::APPLY_SELECTOR, APPLY_SELECTOR}, - {CVC4::Kind::APPLY_CONSTRUCTOR, APPLY_CONSTRUCTOR}, - {CVC4::Kind::APPLY_SELECTOR_TOTAL, INTERNAL_KIND}, - {CVC4::Kind::APPLY_TESTER, APPLY_TESTER}, - {CVC4::Kind::TUPLE_UPDATE_OP, TUPLE_UPDATE}, - {CVC4::Kind::TUPLE_UPDATE, TUPLE_UPDATE}, - {CVC4::Kind::RECORD_UPDATE_OP, RECORD_UPDATE}, - {CVC4::Kind::RECORD_UPDATE, RECORD_UPDATE}, - {CVC4::Kind::DT_SIZE, DT_SIZE}, - {CVC4::Kind::TUPLE_PROJECT, TUPLE_PROJECT}, + {CVC5::Kind::APPLY_SELECTOR, APPLY_SELECTOR}, + {CVC5::Kind::APPLY_CONSTRUCTOR, APPLY_CONSTRUCTOR}, + {CVC5::Kind::APPLY_SELECTOR_TOTAL, INTERNAL_KIND}, + {CVC5::Kind::APPLY_TESTER, APPLY_TESTER}, + {CVC5::Kind::TUPLE_UPDATE_OP, TUPLE_UPDATE}, + {CVC5::Kind::TUPLE_UPDATE, TUPLE_UPDATE}, + {CVC5::Kind::RECORD_UPDATE_OP, RECORD_UPDATE}, + {CVC5::Kind::RECORD_UPDATE, RECORD_UPDATE}, + {CVC5::Kind::DT_SIZE, DT_SIZE}, + {CVC5::Kind::TUPLE_PROJECT, TUPLE_PROJECT}, /* Separation Logic ------------------------------------------------ */ - {CVC4::Kind::SEP_NIL, SEP_NIL}, - {CVC4::Kind::SEP_EMP, SEP_EMP}, - {CVC4::Kind::SEP_PTO, SEP_PTO}, - {CVC4::Kind::SEP_STAR, SEP_STAR}, - {CVC4::Kind::SEP_WAND, SEP_WAND}, + {CVC5::Kind::SEP_NIL, SEP_NIL}, + {CVC5::Kind::SEP_EMP, SEP_EMP}, + {CVC5::Kind::SEP_PTO, SEP_PTO}, + {CVC5::Kind::SEP_STAR, SEP_STAR}, + {CVC5::Kind::SEP_WAND, SEP_WAND}, /* Sets ------------------------------------------------------------ */ - {CVC4::Kind::EMPTYSET, EMPTYSET}, - {CVC4::Kind::UNION, UNION}, - {CVC4::Kind::INTERSECTION, INTERSECTION}, - {CVC4::Kind::SETMINUS, SETMINUS}, - {CVC4::Kind::SUBSET, SUBSET}, - {CVC4::Kind::MEMBER, MEMBER}, - {CVC4::Kind::SINGLETON, SINGLETON}, - {CVC4::Kind::INSERT, INSERT}, - {CVC4::Kind::CARD, CARD}, - {CVC4::Kind::COMPLEMENT, COMPLEMENT}, - {CVC4::Kind::UNIVERSE_SET, UNIVERSE_SET}, - {CVC4::Kind::JOIN, JOIN}, - {CVC4::Kind::PRODUCT, PRODUCT}, - {CVC4::Kind::TRANSPOSE, TRANSPOSE}, - {CVC4::Kind::TCLOSURE, TCLOSURE}, - {CVC4::Kind::JOIN_IMAGE, JOIN_IMAGE}, - {CVC4::Kind::IDEN, IDEN}, - {CVC4::Kind::COMPREHENSION, COMPREHENSION}, - {CVC4::Kind::CHOOSE, CHOOSE}, - {CVC4::Kind::IS_SINGLETON, IS_SINGLETON}, + {CVC5::Kind::EMPTYSET, EMPTYSET}, + {CVC5::Kind::UNION, UNION}, + {CVC5::Kind::INTERSECTION, INTERSECTION}, + {CVC5::Kind::SETMINUS, SETMINUS}, + {CVC5::Kind::SUBSET, SUBSET}, + {CVC5::Kind::MEMBER, MEMBER}, + {CVC5::Kind::SINGLETON, SINGLETON}, + {CVC5::Kind::INSERT, INSERT}, + {CVC5::Kind::CARD, CARD}, + {CVC5::Kind::COMPLEMENT, COMPLEMENT}, + {CVC5::Kind::UNIVERSE_SET, UNIVERSE_SET}, + {CVC5::Kind::JOIN, JOIN}, + {CVC5::Kind::PRODUCT, PRODUCT}, + {CVC5::Kind::TRANSPOSE, TRANSPOSE}, + {CVC5::Kind::TCLOSURE, TCLOSURE}, + {CVC5::Kind::JOIN_IMAGE, JOIN_IMAGE}, + {CVC5::Kind::IDEN, IDEN}, + {CVC5::Kind::COMPREHENSION, COMPREHENSION}, + {CVC5::Kind::CHOOSE, CHOOSE}, + {CVC5::Kind::IS_SINGLETON, IS_SINGLETON}, /* Bags ------------------------------------------------------------ */ - {CVC4::Kind::UNION_MAX, UNION_MAX}, - {CVC4::Kind::UNION_DISJOINT, UNION_DISJOINT}, - {CVC4::Kind::INTERSECTION_MIN, INTERSECTION_MIN}, - {CVC4::Kind::DIFFERENCE_SUBTRACT, DIFFERENCE_SUBTRACT}, - {CVC4::Kind::DIFFERENCE_REMOVE, DIFFERENCE_REMOVE}, - {CVC4::Kind::SUBBAG, SUBBAG}, - {CVC4::Kind::BAG_COUNT, BAG_COUNT}, - {CVC4::Kind::DUPLICATE_REMOVAL, DUPLICATE_REMOVAL}, - {CVC4::Kind::MK_BAG, MK_BAG}, - {CVC4::Kind::EMPTYBAG, EMPTYBAG}, - {CVC4::Kind::BAG_CARD, BAG_CARD}, - {CVC4::Kind::BAG_CHOOSE, BAG_CHOOSE}, - {CVC4::Kind::BAG_IS_SINGLETON, BAG_IS_SINGLETON}, - {CVC4::Kind::BAG_FROM_SET, BAG_FROM_SET}, - {CVC4::Kind::BAG_TO_SET, BAG_TO_SET}, + {CVC5::Kind::UNION_MAX, UNION_MAX}, + {CVC5::Kind::UNION_DISJOINT, UNION_DISJOINT}, + {CVC5::Kind::INTERSECTION_MIN, INTERSECTION_MIN}, + {CVC5::Kind::DIFFERENCE_SUBTRACT, DIFFERENCE_SUBTRACT}, + {CVC5::Kind::DIFFERENCE_REMOVE, DIFFERENCE_REMOVE}, + {CVC5::Kind::SUBBAG, SUBBAG}, + {CVC5::Kind::BAG_COUNT, BAG_COUNT}, + {CVC5::Kind::DUPLICATE_REMOVAL, DUPLICATE_REMOVAL}, + {CVC5::Kind::MK_BAG, MK_BAG}, + {CVC5::Kind::EMPTYBAG, EMPTYBAG}, + {CVC5::Kind::BAG_CARD, BAG_CARD}, + {CVC5::Kind::BAG_CHOOSE, BAG_CHOOSE}, + {CVC5::Kind::BAG_IS_SINGLETON, BAG_IS_SINGLETON}, + {CVC5::Kind::BAG_FROM_SET, BAG_FROM_SET}, + {CVC5::Kind::BAG_TO_SET, BAG_TO_SET}, /* Strings --------------------------------------------------------- */ - {CVC4::Kind::STRING_CONCAT, STRING_CONCAT}, - {CVC4::Kind::STRING_IN_REGEXP, STRING_IN_REGEXP}, - {CVC4::Kind::STRING_LENGTH, STRING_LENGTH}, - {CVC4::Kind::STRING_SUBSTR, STRING_SUBSTR}, - {CVC4::Kind::STRING_UPDATE, STRING_UPDATE}, - {CVC4::Kind::STRING_CHARAT, STRING_CHARAT}, - {CVC4::Kind::STRING_STRCTN, STRING_CONTAINS}, - {CVC4::Kind::STRING_STRIDOF, STRING_INDEXOF}, - {CVC4::Kind::STRING_STRREPL, STRING_REPLACE}, - {CVC4::Kind::STRING_STRREPLALL, STRING_REPLACE_ALL}, - {CVC4::Kind::STRING_REPLACE_RE, STRING_REPLACE_RE}, - {CVC4::Kind::STRING_REPLACE_RE_ALL, STRING_REPLACE_RE_ALL}, - {CVC4::Kind::STRING_TOLOWER, STRING_TOLOWER}, - {CVC4::Kind::STRING_TOUPPER, STRING_TOUPPER}, - {CVC4::Kind::STRING_REV, STRING_REV}, - {CVC4::Kind::STRING_FROM_CODE, STRING_FROM_CODE}, - {CVC4::Kind::STRING_TO_CODE, STRING_TO_CODE}, - {CVC4::Kind::STRING_LT, STRING_LT}, - {CVC4::Kind::STRING_LEQ, STRING_LEQ}, - {CVC4::Kind::STRING_PREFIX, STRING_PREFIX}, - {CVC4::Kind::STRING_SUFFIX, STRING_SUFFIX}, - {CVC4::Kind::STRING_IS_DIGIT, STRING_IS_DIGIT}, - {CVC4::Kind::STRING_ITOS, STRING_FROM_INT}, - {CVC4::Kind::STRING_STOI, STRING_TO_INT}, - {CVC4::Kind::CONST_STRING, CONST_STRING}, - {CVC4::Kind::STRING_TO_REGEXP, STRING_TO_REGEXP}, - {CVC4::Kind::REGEXP_CONCAT, REGEXP_CONCAT}, - {CVC4::Kind::REGEXP_UNION, REGEXP_UNION}, - {CVC4::Kind::REGEXP_INTER, REGEXP_INTER}, - {CVC4::Kind::REGEXP_DIFF, REGEXP_DIFF}, - {CVC4::Kind::REGEXP_STAR, REGEXP_STAR}, - {CVC4::Kind::REGEXP_PLUS, REGEXP_PLUS}, - {CVC4::Kind::REGEXP_OPT, REGEXP_OPT}, - {CVC4::Kind::REGEXP_RANGE, REGEXP_RANGE}, - {CVC4::Kind::REGEXP_REPEAT, REGEXP_REPEAT}, - {CVC4::Kind::REGEXP_REPEAT_OP, REGEXP_REPEAT}, - {CVC4::Kind::REGEXP_LOOP, REGEXP_LOOP}, - {CVC4::Kind::REGEXP_LOOP_OP, REGEXP_LOOP}, - {CVC4::Kind::REGEXP_EMPTY, REGEXP_EMPTY}, - {CVC4::Kind::REGEXP_SIGMA, REGEXP_SIGMA}, - {CVC4::Kind::REGEXP_COMPLEMENT, REGEXP_COMPLEMENT}, - {CVC4::Kind::CONST_SEQUENCE, CONST_SEQUENCE}, - {CVC4::Kind::SEQ_UNIT, SEQ_UNIT}, - {CVC4::Kind::SEQ_NTH, SEQ_NTH}, + {CVC5::Kind::STRING_CONCAT, STRING_CONCAT}, + {CVC5::Kind::STRING_IN_REGEXP, STRING_IN_REGEXP}, + {CVC5::Kind::STRING_LENGTH, STRING_LENGTH}, + {CVC5::Kind::STRING_SUBSTR, STRING_SUBSTR}, + {CVC5::Kind::STRING_UPDATE, STRING_UPDATE}, + {CVC5::Kind::STRING_CHARAT, STRING_CHARAT}, + {CVC5::Kind::STRING_STRCTN, STRING_CONTAINS}, + {CVC5::Kind::STRING_STRIDOF, STRING_INDEXOF}, + {CVC5::Kind::STRING_STRREPL, STRING_REPLACE}, + {CVC5::Kind::STRING_STRREPLALL, STRING_REPLACE_ALL}, + {CVC5::Kind::STRING_REPLACE_RE, STRING_REPLACE_RE}, + {CVC5::Kind::STRING_REPLACE_RE_ALL, STRING_REPLACE_RE_ALL}, + {CVC5::Kind::STRING_TOLOWER, STRING_TOLOWER}, + {CVC5::Kind::STRING_TOUPPER, STRING_TOUPPER}, + {CVC5::Kind::STRING_REV, STRING_REV}, + {CVC5::Kind::STRING_FROM_CODE, STRING_FROM_CODE}, + {CVC5::Kind::STRING_TO_CODE, STRING_TO_CODE}, + {CVC5::Kind::STRING_LT, STRING_LT}, + {CVC5::Kind::STRING_LEQ, STRING_LEQ}, + {CVC5::Kind::STRING_PREFIX, STRING_PREFIX}, + {CVC5::Kind::STRING_SUFFIX, STRING_SUFFIX}, + {CVC5::Kind::STRING_IS_DIGIT, STRING_IS_DIGIT}, + {CVC5::Kind::STRING_ITOS, STRING_FROM_INT}, + {CVC5::Kind::STRING_STOI, STRING_TO_INT}, + {CVC5::Kind::CONST_STRING, CONST_STRING}, + {CVC5::Kind::STRING_TO_REGEXP, STRING_TO_REGEXP}, + {CVC5::Kind::REGEXP_CONCAT, REGEXP_CONCAT}, + {CVC5::Kind::REGEXP_UNION, REGEXP_UNION}, + {CVC5::Kind::REGEXP_INTER, REGEXP_INTER}, + {CVC5::Kind::REGEXP_DIFF, REGEXP_DIFF}, + {CVC5::Kind::REGEXP_STAR, REGEXP_STAR}, + {CVC5::Kind::REGEXP_PLUS, REGEXP_PLUS}, + {CVC5::Kind::REGEXP_OPT, REGEXP_OPT}, + {CVC5::Kind::REGEXP_RANGE, REGEXP_RANGE}, + {CVC5::Kind::REGEXP_REPEAT, REGEXP_REPEAT}, + {CVC5::Kind::REGEXP_REPEAT_OP, REGEXP_REPEAT}, + {CVC5::Kind::REGEXP_LOOP, REGEXP_LOOP}, + {CVC5::Kind::REGEXP_LOOP_OP, REGEXP_LOOP}, + {CVC5::Kind::REGEXP_EMPTY, REGEXP_EMPTY}, + {CVC5::Kind::REGEXP_SIGMA, REGEXP_SIGMA}, + {CVC5::Kind::REGEXP_COMPLEMENT, REGEXP_COMPLEMENT}, + {CVC5::Kind::CONST_SEQUENCE, CONST_SEQUENCE}, + {CVC5::Kind::SEQ_UNIT, SEQ_UNIT}, + {CVC5::Kind::SEQ_NTH, SEQ_NTH}, /* Quantifiers ----------------------------------------------------- */ - {CVC4::Kind::FORALL, FORALL}, - {CVC4::Kind::EXISTS, EXISTS}, - {CVC4::Kind::BOUND_VAR_LIST, BOUND_VAR_LIST}, - {CVC4::Kind::INST_PATTERN, INST_PATTERN}, - {CVC4::Kind::INST_NO_PATTERN, INST_NO_PATTERN}, - {CVC4::Kind::INST_ATTRIBUTE, INST_ATTRIBUTE}, - {CVC4::Kind::INST_PATTERN_LIST, INST_PATTERN_LIST}, + {CVC5::Kind::FORALL, FORALL}, + {CVC5::Kind::EXISTS, EXISTS}, + {CVC5::Kind::BOUND_VAR_LIST, BOUND_VAR_LIST}, + {CVC5::Kind::INST_PATTERN, INST_PATTERN}, + {CVC5::Kind::INST_NO_PATTERN, INST_NO_PATTERN}, + {CVC5::Kind::INST_ATTRIBUTE, INST_ATTRIBUTE}, + {CVC5::Kind::INST_PATTERN_LIST, INST_PATTERN_LIST}, /* ----------------------------------------------------------------- */ - {CVC4::Kind::LAST_KIND, LAST_KIND}, + {CVC5::Kind::LAST_KIND, LAST_KIND}, }; /* Set of kinds for indexed operators */ @@ -677,8 +677,8 @@ const static std::unordered_set s_indexed_kinds( namespace { -/** Convert a CVC4::Kind (internal) to a CVC4::api::Kind (external). */ -CVC4::api::Kind intToExtKind(CVC4::Kind k) +/** Convert a CVC5::Kind (internal) to a CVC5::api::Kind (external). */ +CVC5::api::Kind intToExtKind(CVC5::Kind k) { auto it = api::s_kinds_internal.find(k); if (it == api::s_kinds_internal.end()) @@ -688,13 +688,13 @@ CVC4::api::Kind intToExtKind(CVC4::Kind k) return it->second; } -/** Convert a CVC4::api::Kind (external) to a CVC4::Kind (internal). */ -CVC4::Kind extToIntKind(CVC4::api::Kind k) +/** Convert a CVC5::api::Kind (external) to a CVC5::Kind (internal). */ +CVC5::Kind extToIntKind(CVC5::api::Kind k) { auto it = api::s_kinds.find(k); if (it == api::s_kinds.end()) { - return CVC4::Kind::UNDEFINED_KIND; + return CVC5::Kind::UNDEFINED_KIND; } return it->second; } @@ -709,17 +709,17 @@ bool isDefinedKind(Kind k) { return k > UNDEFINED_KIND && k < LAST_KIND; } * as datatype constructors/selectors/testers as terms * but interally they are not */ -bool isApplyKind(CVC4::Kind k) +bool isApplyKind(CVC5::Kind k) { - return (k == CVC4::Kind::APPLY_UF || k == CVC4::Kind::APPLY_CONSTRUCTOR - || k == CVC4::Kind::APPLY_SELECTOR || k == CVC4::Kind::APPLY_TESTER); + return (k == CVC5::Kind::APPLY_UF || k == CVC5::Kind::APPLY_CONSTRUCTOR + || k == CVC5::Kind::APPLY_SELECTOR || k == CVC5::Kind::APPLY_TESTER); } #ifdef CVC4_ASSERTIONS /** Return true if given kind is a defined internal kind. */ -bool isDefinedIntKind(CVC4::Kind k) +bool isDefinedIntKind(CVC5::Kind k) { - return k != CVC4::Kind::UNDEFINED_KIND && k != CVC4::Kind::LAST_KIND; + return k != CVC5::Kind::UNDEFINED_KIND && k != CVC5::Kind::LAST_KIND; } #endif @@ -728,7 +728,7 @@ uint32_t minArity(Kind k) { Assert(isDefinedKind(k)); Assert(isDefinedIntKind(extToIntKind(k))); - uint32_t min = CVC4::kind::metakind::getMinArityForKind(extToIntKind(k)); + uint32_t min = CVC5::kind::metakind::getMinArityForKind(extToIntKind(k)); // At the API level, we treat functions/constructors/selectors/testers as // normal terms instead of making them part of the operator @@ -744,7 +744,7 @@ uint32_t maxArity(Kind k) { Assert(isDefinedKind(k)); Assert(isDefinedIntKind(extToIntKind(k))); - uint32_t max = CVC4::kind::metakind::getMaxArityForKind(extToIntKind(k)); + uint32_t max = CVC5::kind::metakind::getMaxArityForKind(extToIntKind(k)); // At the API level, we treat functions/constructors/selectors/testers as // normal terms instead of making them part of the operator @@ -762,7 +762,7 @@ uint32_t maxArity(Kind k) std::string kindToString(Kind k) { return k == INTERNAL_KIND ? "INTERNAL_KIND" - : CVC4::kind::kindToString(extToIntKind(k)); + : CVC5::kind::kindToString(extToIntKind(k)); } std::ostream& operator<<(std::ostream& out, Kind k) @@ -834,11 +834,11 @@ class CVC4ApiRecoverableExceptionStream { \ throw CVC4ApiRecoverableException(e.getMessage()); \ } \ - catch (const CVC4::RecoverableModalException& e) \ + catch (const CVC5::RecoverableModalException& e) \ { \ throw CVC4ApiRecoverableException(e.getMessage()); \ } \ - catch (const CVC4::Exception& e) { throw CVC4ApiException(e.getMessage()); } \ + catch (const CVC5::Exception& e) { throw CVC4ApiException(e.getMessage()); } \ catch (const std::invalid_argument& e) { throw CVC4ApiException(e.what()); } } // namespace @@ -847,49 +847,49 @@ class CVC4ApiRecoverableExceptionStream /* Result */ /* -------------------------------------------------------------------------- */ -Result::Result(const CVC4::Result& r) : d_result(new CVC4::Result(r)) {} +Result::Result(const CVC5::Result& r) : d_result(new CVC5::Result(r)) {} -Result::Result() : d_result(new CVC4::Result()) {} +Result::Result() : d_result(new CVC5::Result()) {} bool Result::isNull() const { - return d_result->getType() == CVC4::Result::TYPE_NONE; + return d_result->getType() == CVC5::Result::TYPE_NONE; } bool Result::isSat(void) const { - return d_result->getType() == CVC4::Result::TYPE_SAT - && d_result->isSat() == CVC4::Result::SAT; + return d_result->getType() == CVC5::Result::TYPE_SAT + && d_result->isSat() == CVC5::Result::SAT; } bool Result::isUnsat(void) const { - return d_result->getType() == CVC4::Result::TYPE_SAT - && d_result->isSat() == CVC4::Result::UNSAT; + return d_result->getType() == CVC5::Result::TYPE_SAT + && d_result->isSat() == CVC5::Result::UNSAT; } bool Result::isSatUnknown(void) const { - return d_result->getType() == CVC4::Result::TYPE_SAT - && d_result->isSat() == CVC4::Result::SAT_UNKNOWN; + return d_result->getType() == CVC5::Result::TYPE_SAT + && d_result->isSat() == CVC5::Result::SAT_UNKNOWN; } bool Result::isEntailed(void) const { - return d_result->getType() == CVC4::Result::TYPE_ENTAILMENT - && d_result->isEntailed() == CVC4::Result::ENTAILED; + return d_result->getType() == CVC5::Result::TYPE_ENTAILMENT + && d_result->isEntailed() == CVC5::Result::ENTAILED; } bool Result::isNotEntailed(void) const { - return d_result->getType() == CVC4::Result::TYPE_ENTAILMENT - && d_result->isEntailed() == CVC4::Result::NOT_ENTAILED; + return d_result->getType() == CVC5::Result::TYPE_ENTAILMENT + && d_result->isEntailed() == CVC5::Result::NOT_ENTAILED; } bool Result::isEntailmentUnknown(void) const { - return d_result->getType() == CVC4::Result::TYPE_ENTAILMENT - && d_result->isEntailed() == CVC4::Result::ENTAILMENT_UNKNOWN; + return d_result->getType() == CVC5::Result::TYPE_ENTAILMENT + && d_result->isEntailed() == CVC5::Result::ENTAILMENT_UNKNOWN; } bool Result::operator==(const Result& r) const @@ -904,18 +904,18 @@ bool Result::operator!=(const Result& r) const Result::UnknownExplanation Result::getUnknownExplanation(void) const { - CVC4::Result::UnknownExplanation expl = d_result->whyUnknown(); + CVC5::Result::UnknownExplanation expl = d_result->whyUnknown(); switch (expl) { - case CVC4::Result::REQUIRES_FULL_CHECK: return REQUIRES_FULL_CHECK; - case CVC4::Result::INCOMPLETE: return INCOMPLETE; - case CVC4::Result::TIMEOUT: return TIMEOUT; - case CVC4::Result::RESOURCEOUT: return RESOURCEOUT; - case CVC4::Result::MEMOUT: return MEMOUT; - case CVC4::Result::INTERRUPTED: return INTERRUPTED; - case CVC4::Result::NO_STATUS: return NO_STATUS; - case CVC4::Result::UNSUPPORTED: return UNSUPPORTED; - case CVC4::Result::OTHER: return OTHER; + case CVC5::Result::REQUIRES_FULL_CHECK: return REQUIRES_FULL_CHECK; + case CVC5::Result::INCOMPLETE: return INCOMPLETE; + case CVC5::Result::TIMEOUT: return TIMEOUT; + case CVC5::Result::RESOURCEOUT: return RESOURCEOUT; + case CVC5::Result::MEMOUT: return MEMOUT; + case CVC5::Result::INTERRUPTED: return INTERRUPTED; + case CVC5::Result::NO_STATUS: return NO_STATUS; + case CVC5::Result::UNSUPPORTED: return UNSUPPORTED; + case CVC5::Result::OTHER: return OTHER; default: return UNKNOWN_REASON; } return UNKNOWN_REASON; @@ -952,12 +952,12 @@ std::ostream& operator<<(std::ostream& out, enum Result::UnknownExplanation e) /* Sort */ /* -------------------------------------------------------------------------- */ -Sort::Sort(const Solver* slv, const CVC4::TypeNode& t) - : d_solver(slv), d_type(new CVC4::TypeNode(t)) +Sort::Sort(const Solver* slv, const CVC5::TypeNode& t) + : d_solver(slv), d_type(new CVC5::TypeNode(t)) { } -Sort::Sort() : d_solver(nullptr), d_type(new CVC4::TypeNode()) {} +Sort::Sort() : d_solver(nullptr), d_type(new CVC5::TypeNode()) {} Sort::~Sort() { @@ -1332,7 +1332,7 @@ Sort Sort::instantiate(const std::vector& params) const CVC4_API_CHECK(isParametricDatatype() || isSortConstructor()) << "Expected parametric datatype or sort constructor sort."; //////// all checks before this line - std::vector tparams = sortVectorToTypeNodes(params); + std::vector tparams = sortVectorToTypeNodes(params); if (d_type->isDatatype()) { return Sort(d_solver, d_type->instantiateParametricDatatype(tparams)); @@ -1368,7 +1368,7 @@ Sort Sort::substitute(const std::vector& sorts, CVC4_API_CHECK_SORTS(replacements); //////// all checks before this line - std::vector tSorts = sortVectorToTypeNodes(sorts), + std::vector tSorts = sortVectorToTypeNodes(sorts), tReplacements = sortVectorToTypeNodes(replacements); return Sort(d_solver, @@ -1394,7 +1394,7 @@ std::string Sort::toString() const CVC4_API_TRY_CATCH_END; } -const CVC4::TypeNode& Sort::getTypeNode(void) const { return *d_type; } +const CVC5::TypeNode& Sort::getTypeNode(void) const { return *d_type; } /* Constructor sort ------------------------------------------------------- */ @@ -1757,15 +1757,15 @@ bool Sort::isNullHelper() const { return d_type->isNull(); } /* Op */ /* -------------------------------------------------------------------------- */ -Op::Op() : d_solver(nullptr), d_kind(NULL_EXPR), d_node(new CVC4::Node()) {} +Op::Op() : d_solver(nullptr), d_kind(NULL_EXPR), d_node(new CVC5::Node()) {} Op::Op(const Solver* slv, const Kind k) - : d_solver(slv), d_kind(k), d_node(new CVC4::Node()) + : d_solver(slv), d_kind(k), d_node(new CVC5::Node()) { } -Op::Op(const Solver* slv, const Kind k, const CVC4::Node& n) - : d_solver(slv), d_kind(k), d_node(new CVC4::Node(n)) +Op::Op(const Solver* slv, const Kind k, const CVC5::Node& n) + : d_solver(slv), d_kind(k), d_node(new CVC5::Node(n)) { } @@ -1914,53 +1914,53 @@ std::pair Op::getIndices() const // using if/else instead of case statement because want local variables if (k == BITVECTOR_EXTRACT) { - CVC4::BitVectorExtract ext = d_node->getConst(); + CVC5::BitVectorExtract ext = d_node->getConst(); indices = std::make_pair(ext.d_high, ext.d_low); } else if (k == FLOATINGPOINT_TO_FP_IEEE_BITVECTOR) { - CVC4::FloatingPointToFPIEEEBitVector ext = + CVC5::FloatingPointToFPIEEEBitVector ext = d_node->getConst(); indices = std::make_pair(ext.getSize().exponentWidth(), ext.getSize().significandWidth()); } else if (k == FLOATINGPOINT_TO_FP_FLOATINGPOINT) { - CVC4::FloatingPointToFPFloatingPoint ext = + CVC5::FloatingPointToFPFloatingPoint ext = d_node->getConst(); indices = std::make_pair(ext.getSize().exponentWidth(), ext.getSize().significandWidth()); } else if (k == FLOATINGPOINT_TO_FP_REAL) { - CVC4::FloatingPointToFPReal ext = d_node->getConst(); + CVC5::FloatingPointToFPReal ext = d_node->getConst(); indices = std::make_pair(ext.getSize().exponentWidth(), ext.getSize().significandWidth()); } else if (k == FLOATINGPOINT_TO_FP_SIGNED_BITVECTOR) { - CVC4::FloatingPointToFPSignedBitVector ext = + CVC5::FloatingPointToFPSignedBitVector ext = d_node->getConst(); indices = std::make_pair(ext.getSize().exponentWidth(), ext.getSize().significandWidth()); } else if (k == FLOATINGPOINT_TO_FP_UNSIGNED_BITVECTOR) { - CVC4::FloatingPointToFPUnsignedBitVector ext = + CVC5::FloatingPointToFPUnsignedBitVector ext = d_node->getConst(); indices = std::make_pair(ext.getSize().exponentWidth(), ext.getSize().significandWidth()); } else if (k == FLOATINGPOINT_TO_FP_GENERIC) { - CVC4::FloatingPointToFPGeneric ext = + CVC5::FloatingPointToFPGeneric ext = d_node->getConst(); indices = std::make_pair(ext.getSize().exponentWidth(), ext.getSize().significandWidth()); } else if (k == REGEXP_LOOP) { - CVC4::RegExpLoop ext = d_node->getConst(); + CVC5::RegExpLoop ext = d_node->getConst(); indices = std::make_pair(ext.d_loopMinOcc, ext.d_loopMaxOcc); } else @@ -2031,13 +2031,13 @@ bool Op::isIndexedHelper() const { return !d_node->isNull(); } /* Term */ /* -------------------------------------------------------------------------- */ -Term::Term() : d_solver(nullptr), d_node(new CVC4::Node()) {} +Term::Term() : d_solver(nullptr), d_node(new CVC5::Node()) {} -Term::Term(const Solver* slv, const CVC4::Node& n) : d_solver(slv) +Term::Term(const Solver* slv, const CVC5::Node& n) : d_solver(slv) { // Ensure that we create the node in the correct node manager. NodeManagerScope scope(d_solver->getNodeManager()); - d_node.reset(new CVC4::Node(n)); + d_node.reset(new CVC5::Node(n)); } Term::~Term() @@ -2251,7 +2251,7 @@ Op Term::getOp() const { // it's an indexed operator // so we should return the indexed op - CVC4::Node op = d_node->getOperator(); + CVC5::Node op = d_node->getOperator(); return Op(d_solver, intToExtKind(d_node->getKind()), op); } // Notice this is the only case where getKindHelper is used, since the @@ -2276,7 +2276,7 @@ Term Term::getConstArrayBase() const CVC4_API_TRY_CATCH_BEGIN; CVC4_API_CHECK_NOT_NULL; // CONST_ARRAY kind maps to STORE_ALL internal kind - CVC4_API_CHECK(d_node->getKind() == CVC4::Kind::STORE_ALL) + CVC4_API_CHECK(d_node->getKind() == CVC5::Kind::STORE_ALL) << "Expecting a CONST_ARRAY Term when calling getConstArrayBase()"; //////// all checks before this line return Term(d_solver, d_node->getConst().getValue()); @@ -2288,7 +2288,7 @@ std::vector Term::getConstSequenceElements() const { CVC4_API_TRY_CATCH_BEGIN; CVC4_API_CHECK_NOT_NULL; - CVC4_API_CHECK(d_node->getKind() == CVC4::Kind::CONST_SEQUENCE) + CVC4_API_CHECK(d_node->getKind() == CVC5::Kind::CONST_SEQUENCE) << "Expecting a CONST_SEQUENCE Term when calling " "getConstSequenceElements()"; //////// all checks before this line @@ -2414,7 +2414,7 @@ Term::const_iterator::const_iterator() } Term::const_iterator::const_iterator(const Solver* slv, - const std::shared_ptr& n, + const std::shared_ptr& n, uint32_t p) : d_solver(slv), d_origNode(n), d_pos(p) { @@ -2515,14 +2515,14 @@ Term::const_iterator Term::end() const return Term::const_iterator(d_solver, d_node, endpos); } -const CVC4::Node& Term::getNode(void) const { return *d_node; } +const CVC5::Node& Term::getNode(void) const { return *d_node; } namespace detail { -const Rational& getRational(const CVC4::Node& node) +const Rational& getRational(const CVC5::Node& node) { return node.getConst(); } -Integer getInteger(const CVC4::Node& node) +Integer getInteger(const CVC5::Node& node) { return node.getConst().getNumerator(); } @@ -2545,7 +2545,7 @@ bool checkReal64Bounds(const Rational& r) bool isInteger(const Node& node) { - return node.getKind() == CVC4::Kind::CONST_RATIONAL + return node.getKind() == CVC5::Kind::CONST_RATIONAL && node.getConst().isIntegral(); } bool isInt32(const Node& node) @@ -2658,7 +2658,7 @@ bool Term::isString() const CVC4_API_TRY_CATCH_BEGIN; CVC4_API_CHECK_NOT_NULL; //////// all checks before this line - return d_node->getKind() == CVC4::Kind::CONST_STRING; + return d_node->getKind() == CVC5::Kind::CONST_STRING; //////// CVC4_API_TRY_CATCH_END; } @@ -2667,10 +2667,10 @@ std::wstring Term::getString() const { CVC4_API_TRY_CATCH_BEGIN; CVC4_API_CHECK_NOT_NULL; - CVC4_API_CHECK(d_node->getKind() == CVC4::Kind::CONST_STRING) + CVC4_API_CHECK(d_node->getKind() == CVC5::Kind::CONST_STRING) << "Term should be a String when calling getString()"; //////// all checks before this line - return d_node->getConst().toWString(); + return d_node->getConst().toWString(); //////// CVC4_API_TRY_CATCH_END; } @@ -2754,18 +2754,18 @@ Kind Term::getKindHelper() const { switch (d_node->getKind()) { - case CVC4::Kind::STRING_CONCAT: return SEQ_CONCAT; - case CVC4::Kind::STRING_LENGTH: return SEQ_LENGTH; - case CVC4::Kind::STRING_SUBSTR: return SEQ_EXTRACT; - case CVC4::Kind::STRING_UPDATE: return SEQ_UPDATE; - case CVC4::Kind::STRING_CHARAT: return SEQ_AT; - case CVC4::Kind::STRING_STRCTN: return SEQ_CONTAINS; - case CVC4::Kind::STRING_STRIDOF: return SEQ_INDEXOF; - case CVC4::Kind::STRING_STRREPL: return SEQ_REPLACE; - case CVC4::Kind::STRING_STRREPLALL: return SEQ_REPLACE_ALL; - case CVC4::Kind::STRING_REV: return SEQ_REV; - case CVC4::Kind::STRING_PREFIX: return SEQ_PREFIX; - case CVC4::Kind::STRING_SUFFIX: return SEQ_SUFFIX; + case CVC5::Kind::STRING_CONCAT: return SEQ_CONCAT; + case CVC5::Kind::STRING_LENGTH: return SEQ_LENGTH; + case CVC5::Kind::STRING_SUBSTR: return SEQ_EXTRACT; + case CVC5::Kind::STRING_UPDATE: return SEQ_UPDATE; + case CVC5::Kind::STRING_CHARAT: return SEQ_AT; + case CVC5::Kind::STRING_STRCTN: return SEQ_CONTAINS; + case CVC5::Kind::STRING_STRIDOF: return SEQ_INDEXOF; + case CVC5::Kind::STRING_STRREPL: return SEQ_REPLACE; + case CVC5::Kind::STRING_STRREPLALL: return SEQ_REPLACE_ALL; + case CVC5::Kind::STRING_REV: return SEQ_REV; + case CVC5::Kind::STRING_PREFIX: return SEQ_PREFIX; + case CVC5::Kind::STRING_SUFFIX: return SEQ_SUFFIX; default: // fall through to conversion below break; @@ -2802,7 +2802,7 @@ DatatypeConstructorDecl::DatatypeConstructorDecl() DatatypeConstructorDecl::DatatypeConstructorDecl(const Solver* slv, const std::string& name) - : d_solver(slv), d_ctor(new CVC4::DTypeConstructor(name)) + : d_solver(slv), d_ctor(new CVC5::DTypeConstructor(name)) { } DatatypeConstructorDecl::~DatatypeConstructorDecl() @@ -2884,7 +2884,7 @@ DatatypeDecl::DatatypeDecl() : d_solver(nullptr), d_dtype(nullptr) {} DatatypeDecl::DatatypeDecl(const Solver* slv, const std::string& name, bool isCoDatatype) - : d_solver(slv), d_dtype(new CVC4::DType(name, isCoDatatype)) + : d_solver(slv), d_dtype(new CVC5::DType(name, isCoDatatype)) { } @@ -2893,7 +2893,7 @@ DatatypeDecl::DatatypeDecl(const Solver* slv, const Sort& param, bool isCoDatatype) : d_solver(slv), - d_dtype(new CVC4::DType( + d_dtype(new CVC5::DType( name, std::vector{*param.d_type}, isCoDatatype)) { } @@ -2905,8 +2905,8 @@ DatatypeDecl::DatatypeDecl(const Solver* slv, : d_solver(slv) { std::vector tparams = Sort::sortVectorToTypeNodes(params); - d_dtype = std::shared_ptr( - new CVC4::DType(name, tparams, isCoDatatype)); + d_dtype = std::shared_ptr( + new CVC5::DType(name, tparams, isCoDatatype)); } bool DatatypeDecl::isNullHelper() const { return !d_dtype; } @@ -2991,15 +2991,15 @@ std::ostream& operator<<(std::ostream& out, const DatatypeDecl& dtdecl) return out; } -CVC4::DType& DatatypeDecl::getDatatype(void) const { return *d_dtype; } +CVC5::DType& DatatypeDecl::getDatatype(void) const { return *d_dtype; } /* DatatypeSelector --------------------------------------------------------- */ DatatypeSelector::DatatypeSelector() : d_solver(nullptr), d_stor(nullptr) {} DatatypeSelector::DatatypeSelector(const Solver* slv, - const CVC4::DTypeSelector& stor) - : d_solver(slv), d_stor(new CVC4::DTypeSelector(stor)) + const CVC5::DTypeSelector& stor) + : d_solver(slv), d_stor(new CVC5::DTypeSelector(stor)) { CVC4_API_CHECK(d_stor->isResolved()) << "Expected resolved datatype selector"; } @@ -3079,8 +3079,8 @@ DatatypeConstructor::DatatypeConstructor() : d_solver(nullptr), d_ctor(nullptr) } DatatypeConstructor::DatatypeConstructor(const Solver* slv, - const CVC4::DTypeConstructor& ctor) - : d_solver(slv), d_ctor(new CVC4::DTypeConstructor(ctor)) + const CVC5::DTypeConstructor& ctor) + : d_solver(slv), d_ctor(new CVC5::DTypeConstructor(ctor)) { CVC4_API_CHECK(d_ctor->isResolved()) << "Expected resolved datatype constructor"; @@ -3214,14 +3214,14 @@ DatatypeConstructor::const_iterator DatatypeConstructor::end() const } DatatypeConstructor::const_iterator::const_iterator( - const Solver* slv, const CVC4::DTypeConstructor& ctor, bool begin) + const Solver* slv, const CVC5::DTypeConstructor& ctor, bool begin) { d_solver = slv; d_int_stors = &ctor.getArgs(); - const std::vector>& sels = + const std::vector>& sels = ctor.getArgs(); - for (const std::shared_ptr& s : sels) + for (const std::shared_ptr& s : sels) { /* Can not use emplace_back here since constructor is private. */ d_stors.push_back(DatatypeSelector(d_solver, *s.get())); @@ -3341,8 +3341,8 @@ std::ostream& operator<<(std::ostream& out, const DatatypeConstructor& ctor) /* Datatype ----------------------------------------------------------------- */ -Datatype::Datatype(const Solver* slv, const CVC4::DType& dtype) - : d_solver(slv), d_dtype(new CVC4::DType(dtype)) +Datatype::Datatype(const Solver* slv, const CVC5::DType& dtype) + : d_solver(slv), d_dtype(new CVC5::DType(dtype)) { CVC4_API_CHECK(d_dtype->isResolved()) << "Expected resolved datatype"; } @@ -3549,7 +3549,7 @@ DatatypeConstructor Datatype::getConstructorForName( } Datatype::const_iterator::const_iterator(const Solver* slv, - const CVC4::DType& dtype, + const CVC5::DType& dtype, bool begin) : d_solver(slv), d_int_ctors(&dtype.getConstructors()) { @@ -3816,7 +3816,7 @@ Sort Grammar::resolve() bvl = Term( d_solver, d_solver->getNodeManager()->mkNode( - CVC4::kind::BOUND_VAR_LIST, Term::termVectorToNodes(d_sygusVars))); + CVC5::kind::BOUND_VAR_LIST, Term::termVectorToNodes(d_sygusVars))); } std::unordered_map ntsToUnres(d_ntSyms.size()); @@ -3829,7 +3829,7 @@ Sort Grammar::resolve() Sort(d_solver, d_solver->getNodeManager()->mkSort(ntsymbol.toString())); } - std::vector datatypes; + std::vector datatypes; std::set unresTypes; datatypes.reserve(d_ntSyms.size()); @@ -3903,12 +3903,12 @@ void Grammar::addSygusConstructorTerm( { Term lbvl = Term(d_solver, - d_solver->getNodeManager()->mkNode(CVC4::kind::BOUND_VAR_LIST, + d_solver->getNodeManager()->mkNode(CVC5::kind::BOUND_VAR_LIST, Term::termVectorToNodes(args))); // its operator is a lambda op = Term(d_solver, d_solver->getNodeManager()->mkNode( - CVC4::kind::LAMBDA, *lbvl.d_node, *op.d_node)); + CVC5::kind::LAMBDA, *lbvl.d_node, *op.d_node)); } std::vector cargst = Sort::sortVectorToTypeNodes(cargs); dt.d_dtype->addSygusConstructor(*op.d_node, ssCName.str(), cargst); @@ -4027,27 +4027,27 @@ std::ostream& operator<<(std::ostream& out, const Grammar& grammar) /* -------------------------------------------------------------------------- */ const static std:: - unordered_map + unordered_map s_rmodes{ {ROUND_NEAREST_TIES_TO_EVEN, - CVC4::RoundingMode::ROUND_NEAREST_TIES_TO_EVEN}, - {ROUND_TOWARD_POSITIVE, CVC4::RoundingMode::ROUND_TOWARD_POSITIVE}, - {ROUND_TOWARD_NEGATIVE, CVC4::RoundingMode::ROUND_TOWARD_NEGATIVE}, - {ROUND_TOWARD_ZERO, CVC4::RoundingMode::ROUND_TOWARD_ZERO}, + CVC5::RoundingMode::ROUND_NEAREST_TIES_TO_EVEN}, + {ROUND_TOWARD_POSITIVE, CVC5::RoundingMode::ROUND_TOWARD_POSITIVE}, + {ROUND_TOWARD_NEGATIVE, CVC5::RoundingMode::ROUND_TOWARD_NEGATIVE}, + {ROUND_TOWARD_ZERO, CVC5::RoundingMode::ROUND_TOWARD_ZERO}, {ROUND_NEAREST_TIES_TO_AWAY, - CVC4::RoundingMode::ROUND_NEAREST_TIES_TO_AWAY}, + CVC5::RoundingMode::ROUND_NEAREST_TIES_TO_AWAY}, }; -const static std::unordered_map + CVC5::RoundingModeHashFunction> s_rmodes_internal{ - {CVC4::RoundingMode::ROUND_NEAREST_TIES_TO_EVEN, + {CVC5::RoundingMode::ROUND_NEAREST_TIES_TO_EVEN, ROUND_NEAREST_TIES_TO_EVEN}, - {CVC4::RoundingMode::ROUND_TOWARD_POSITIVE, ROUND_TOWARD_POSITIVE}, - {CVC4::RoundingMode::ROUND_TOWARD_POSITIVE, ROUND_TOWARD_NEGATIVE}, - {CVC4::RoundingMode::ROUND_TOWARD_ZERO, ROUND_TOWARD_ZERO}, - {CVC4::RoundingMode::ROUND_NEAREST_TIES_TO_AWAY, + {CVC5::RoundingMode::ROUND_TOWARD_POSITIVE, ROUND_TOWARD_POSITIVE}, + {CVC5::RoundingMode::ROUND_TOWARD_POSITIVE, ROUND_TOWARD_NEGATIVE}, + {CVC5::RoundingMode::ROUND_TOWARD_ZERO, ROUND_TOWARD_ZERO}, + {CVC5::RoundingMode::ROUND_NEAREST_TIES_TO_AWAY, ROUND_NEAREST_TIES_TO_AWAY}, }; @@ -4093,7 +4093,7 @@ void Solver::increment_vars_consts_stats(const Sort& sort, bool is_var) const { #ifdef CVC4_STATISTICS_ON const TypeNode tn = sort.getTypeNode(); - TypeConstant tc = tn.getKind() == CVC4::kind::TYPE_CONSTANT + TypeConstant tc = tn.getKind() == CVC5::kind::TYPE_CONSTANT ? tn.getConst() : LAST_TYPE; if (is_var) @@ -4124,10 +4124,10 @@ Term Solver::mkRealFromStrHelper(const std::string& s) const //////// all checks before this line try { - CVC4::Rational r = s.find('/') != std::string::npos - ? CVC4::Rational(s) - : CVC4::Rational::fromDecimal(s); - return mkValHelper(r); + CVC5::Rational r = s.find('/') != std::string::npos + ? CVC5::Rational(s) + : CVC5::Rational::fromDecimal(s); + return mkValHelper(r); } catch (const std::invalid_argument& e) { @@ -4144,7 +4144,7 @@ Term Solver::mkBVFromIntHelper(uint32_t size, uint64_t val) const { CVC4_API_ARG_CHECK_EXPECTED(size > 0, size) << "a bit-width > 0"; //////// all checks before this line - return mkValHelper(CVC4::BitVector(size, val)); + return mkValHelper(CVC5::BitVector(size, val)); } Term Solver::mkBVFromStrHelper(const std::string& s, uint32_t base) const @@ -4153,7 +4153,7 @@ Term Solver::mkBVFromStrHelper(const std::string& s, uint32_t base) const CVC4_API_ARG_CHECK_EXPECTED(base == 2 || base == 10 || base == 16, base) << "base 2, 10, or 16"; //////// all checks before this line - return mkValHelper(CVC4::BitVector(s, base)); + return mkValHelper(CVC5::BitVector(s, base)); } Term Solver::mkBVFromStrHelper(uint32_t size, @@ -4180,7 +4180,7 @@ Term Solver::mkBVFromStrHelper(uint32_t size, << size << " too small to hold value " << s << ")"; } - return mkValHelper(CVC4::BitVector(size, val)); + return mkValHelper(CVC5::BitVector(size, val)); } Term Solver::mkCharFromStrHelper(const std::string& s) const @@ -4195,7 +4195,7 @@ Term Solver::mkCharFromStrHelper(const std::string& s) const //////// all checks before this line std::vector cpts; cpts.push_back(val); - return mkValHelper(CVC4::String(cpts)); + return mkValHelper(CVC5::String(cpts)); } Term Solver::getValueHelper(const Term& term) const @@ -4230,14 +4230,14 @@ Term Solver::mkTermFromKind(Kind kind) const Node res; if (kind == REGEXP_EMPTY || kind == REGEXP_SIGMA) { - CVC4::Kind k = extToIntKind(kind); + CVC5::Kind k = extToIntKind(kind); Assert(isDefinedIntKind(k)); res = d_nodeMgr->mkNode(k, std::vector()); } else { Assert(kind == PI); - res = d_nodeMgr->mkNullaryOperator(d_nodeMgr->realType(), CVC4::kind::PI); + res = d_nodeMgr->mkNullaryOperator(d_nodeMgr->realType(), CVC5::kind::PI); } (void)res.getType(true); /* kick off type checking */ increment_term_stats(kind); @@ -4250,7 +4250,7 @@ Term Solver::mkTermHelper(Kind kind, const std::vector& children) const //////// all checks before this line std::vector echildren = Term::termVectorToNodes(children); - CVC4::Kind k = extToIntKind(kind); + CVC5::Kind k = extToIntKind(kind); Node res; if (echildren.size() > 2) { @@ -4340,7 +4340,7 @@ Term Solver::mkTermHelper(const Op& op, const std::vector& children) const return mkTermHelper(op.d_kind, children); } - const CVC4::Kind int_kind = extToIntKind(op.d_kind); + const CVC5::Kind int_kind = extToIntKind(op.d_kind); std::vector echildren = Term::termVectorToNodes(children); NodeBuilder<> nb(int_kind); @@ -4360,14 +4360,14 @@ std::vector Solver::mkDatatypeSortsInternal( // double checks //////// all checks before this line - std::vector datatypes; + std::vector datatypes; for (size_t i = 0, ndts = dtypedecls.size(); i < ndts; ++i) { datatypes.push_back(dtypedecls[i].getDatatype()); } std::set utypes = Sort::sortSetToTypeNodes(unresolvedSorts); - std::vector dtypes = + std::vector dtypes = getNodeManager()->mkMutualDatatypeTypes(datatypes, utypes); std::vector retTypes = Sort::typeNodeVectorToSorts(this, dtypes); return retTypes; @@ -4439,7 +4439,7 @@ Term Solver::ensureTermSort(const Term& term, const Sort& sort) const res = Term(this, d_nodeMgr->mkNode(extToIntKind(DIVISION), *res.d_node, - d_nodeMgr->mkConst(CVC4::Rational(1)))); + d_nodeMgr->mkConst(CVC5::Rational(1)))); } Assert(res.getSort() == sort); return res; @@ -4507,7 +4507,7 @@ void Solver::checkMkTerm(Kind kind, uint32_t nchildren) const { CVC4_API_KIND_CHECK(kind); Assert(isDefinedIntKind(extToIntKind(kind))); - const CVC4::kind::MetaKind mk = kind::metaKindOf(extToIntKind(kind)); + const CVC5::kind::MetaKind mk = kind::metaKindOf(extToIntKind(kind)); CVC4_API_KIND_CHECK_EXPECTED( mk == kind::metakind::PARAMETERIZED || mk == kind::metakind::OPERATOR, kind) @@ -4870,7 +4870,7 @@ Term Solver::mkPi() const CVC4_API_TRY_CATCH_BEGIN; //////// all checks before this line Node res = - d_nodeMgr->mkNullaryOperator(d_nodeMgr->realType(), CVC4::kind::PI); + d_nodeMgr->mkNullaryOperator(d_nodeMgr->realType(), CVC5::kind::PI); (void)res.getType(true); /* kick off type checking */ return Term(this, res); //////// @@ -4896,7 +4896,7 @@ Term Solver::mkInteger(int64_t val) const NodeManagerScope scope(getNodeManager()); CVC4_API_TRY_CATCH_BEGIN; //////// all checks before this line - Term integer = mkValHelper(CVC4::Rational(val)); + Term integer = mkValHelper(CVC5::Rational(val)); Assert(integer.getSort() == getIntegerSort()); return integer; //////// @@ -4924,7 +4924,7 @@ Term Solver::mkReal(int64_t val) const NodeManagerScope scope(getNodeManager()); CVC4_API_TRY_CATCH_BEGIN; //////// all checks before this line - Term rational = mkValHelper(CVC4::Rational(val)); + Term rational = mkValHelper(CVC5::Rational(val)); return ensureRealSort(rational); //////// CVC4_API_TRY_CATCH_END; @@ -4935,7 +4935,7 @@ Term Solver::mkReal(int64_t num, int64_t den) const NodeManagerScope scope(getNodeManager()); CVC4_API_TRY_CATCH_BEGIN; //////// all checks before this line - Term rational = mkValHelper(CVC4::Rational(num, den)); + Term rational = mkValHelper(CVC5::Rational(num, den)); return ensureRealSort(rational); //////// CVC4_API_TRY_CATCH_END; @@ -4947,7 +4947,7 @@ Term Solver::mkRegexpEmpty() const CVC4_API_TRY_CATCH_BEGIN; //////// all checks before this line Node res = - d_nodeMgr->mkNode(CVC4::kind::REGEXP_EMPTY, std::vector()); + d_nodeMgr->mkNode(CVC5::kind::REGEXP_EMPTY, std::vector()); (void)res.getType(true); /* kick off type checking */ return Term(this, res); //////// @@ -4960,7 +4960,7 @@ Term Solver::mkRegexpSigma() const CVC4_API_TRY_CATCH_BEGIN; //////// all checks before this line Node res = - d_nodeMgr->mkNode(CVC4::kind::REGEXP_SIGMA, std::vector()); + d_nodeMgr->mkNode(CVC5::kind::REGEXP_SIGMA, std::vector()); (void)res.getType(true); /* kick off type checking */ return Term(this, res); //////// @@ -4976,7 +4976,7 @@ Term Solver::mkEmptySet(const Sort& sort) const CVC4_API_ARG_CHECK_EXPECTED(sort.isNull() || this == sort.d_solver, sort) << "set sort associated with this solver object"; //////// all checks before this line - return mkValHelper(CVC4::EmptySet(*sort.d_type)); + return mkValHelper(CVC5::EmptySet(*sort.d_type)); //////// CVC4_API_TRY_CATCH_END; } @@ -4990,7 +4990,7 @@ Term Solver::mkEmptyBag(const Sort& sort) const CVC4_API_ARG_CHECK_EXPECTED(sort.isNull() || this == sort.d_solver, sort) << "bag sort associated with this solver object"; //////// all checks before this line - return mkValHelper(CVC4::EmptyBag(*sort.d_type)); + return mkValHelper(CVC5::EmptyBag(*sort.d_type)); //////// CVC4_API_TRY_CATCH_END; } @@ -5002,7 +5002,7 @@ Term Solver::mkSepNil(const Sort& sort) const CVC4_API_SOLVER_CHECK_SORT(sort); //////// all checks before this line Node res = - getNodeManager()->mkNullaryOperator(*sort.d_type, CVC4::kind::SEP_NIL); + getNodeManager()->mkNullaryOperator(*sort.d_type, CVC5::kind::SEP_NIL); (void)res.getType(true); /* kick off type checking */ return Term(this, res); //////// @@ -5014,7 +5014,7 @@ Term Solver::mkString(const std::string& s, bool useEscSequences) const NodeManagerScope scope(getNodeManager()); CVC4_API_TRY_CATCH_BEGIN; //////// all checks before this line - return mkValHelper(CVC4::String(s, useEscSequences)); + return mkValHelper(CVC5::String(s, useEscSequences)); //////// CVC4_API_TRY_CATCH_END; } @@ -5024,7 +5024,7 @@ Term Solver::mkString(const unsigned char c) const NodeManagerScope scope(getNodeManager()); CVC4_API_TRY_CATCH_BEGIN; //////// all checks before this line - return mkValHelper(CVC4::String(std::string(1, c))); + return mkValHelper(CVC5::String(std::string(1, c))); //////// CVC4_API_TRY_CATCH_END; } @@ -5034,7 +5034,7 @@ Term Solver::mkString(const std::vector& s) const NodeManagerScope scope(getNodeManager()); CVC4_API_TRY_CATCH_BEGIN; //////// all checks before this line - return mkValHelper(CVC4::String(s)); + return mkValHelper(CVC5::String(s)); //////// CVC4_API_TRY_CATCH_END; } @@ -5070,7 +5070,7 @@ Term Solver::mkUniverseSet(const Sort& sort) const //////// all checks before this line Node res = getNodeManager()->mkNullaryOperator(*sort.d_type, - CVC4::kind::UNIVERSE_SET); + CVC5::kind::UNIVERSE_SET); // TODO(#2771): Reenable? // (void)res->getType(true); /* kick off type checking */ return Term(this, res); @@ -5128,8 +5128,8 @@ Term Solver::mkConstArray(const Sort& sort, const Term& val) const // this is safe because the constant array stores its type n = n[0]; } - Term res = mkValHelper( - CVC4::ArrayStoreAll(*sort.d_type, n)); + Term res = + mkValHelper(CVC5::ArrayStoreAll(*sort.d_type, n)); return res; //////// CVC4_API_TRY_CATCH_END; @@ -5142,7 +5142,7 @@ Term Solver::mkPosInf(uint32_t exp, uint32_t sig) const CVC4_API_CHECK(Configuration::isBuiltWithSymFPU()) << "Expected CVC4 to be compiled with SymFPU support"; //////// all checks before this line - return mkValHelper( + return mkValHelper( FloatingPoint::makeInf(FloatingPointSize(exp, sig), false)); //////// CVC4_API_TRY_CATCH_END; @@ -5155,7 +5155,7 @@ Term Solver::mkNegInf(uint32_t exp, uint32_t sig) const CVC4_API_CHECK(Configuration::isBuiltWithSymFPU()) << "Expected CVC4 to be compiled with SymFPU support"; //////// all checks before this line - return mkValHelper( + return mkValHelper( FloatingPoint::makeInf(FloatingPointSize(exp, sig), true)); //////// CVC4_API_TRY_CATCH_END; @@ -5168,7 +5168,7 @@ Term Solver::mkNaN(uint32_t exp, uint32_t sig) const CVC4_API_CHECK(Configuration::isBuiltWithSymFPU()) << "Expected CVC4 to be compiled with SymFPU support"; //////// all checks before this line - return mkValHelper( + return mkValHelper( FloatingPoint::makeNaN(FloatingPointSize(exp, sig))); //////// CVC4_API_TRY_CATCH_END; @@ -5181,7 +5181,7 @@ Term Solver::mkPosZero(uint32_t exp, uint32_t sig) const CVC4_API_CHECK(Configuration::isBuiltWithSymFPU()) << "Expected CVC4 to be compiled with SymFPU support"; //////// all checks before this line - return mkValHelper( + return mkValHelper( FloatingPoint::makeZero(FloatingPointSize(exp, sig), false)); //////// CVC4_API_TRY_CATCH_END; @@ -5194,7 +5194,7 @@ Term Solver::mkNegZero(uint32_t exp, uint32_t sig) const CVC4_API_CHECK(Configuration::isBuiltWithSymFPU()) << "Expected CVC4 to be compiled with SymFPU support"; //////// all checks before this line - return mkValHelper( + return mkValHelper( FloatingPoint::makeZero(FloatingPointSize(exp, sig), true)); //////// CVC4_API_TRY_CATCH_END; @@ -5207,7 +5207,7 @@ Term Solver::mkRoundingMode(RoundingMode rm) const CVC4_API_CHECK(Configuration::isBuiltWithSymFPU()) << "Expected CVC4 to be compiled with SymFPU support"; //////// all checks before this line - return mkValHelper(s_rmodes.at(rm)); + return mkValHelper(s_rmodes.at(rm)); //////// CVC4_API_TRY_CATCH_END; } @@ -5218,8 +5218,8 @@ Term Solver::mkUninterpretedConst(const Sort& sort, int32_t index) const CVC4_API_TRY_CATCH_BEGIN; CVC4_API_SOLVER_CHECK_SORT(sort); //////// all checks before this line - return mkValHelper( - CVC4::UninterpretedConstant(*sort.d_type, index)); + return mkValHelper( + CVC5::UninterpretedConstant(*sort.d_type, index)); //////// CVC4_API_TRY_CATCH_END; } @@ -5230,11 +5230,11 @@ Term Solver::mkAbstractValue(const std::string& index) const CVC4_API_TRY_CATCH_BEGIN; CVC4_API_ARG_CHECK_EXPECTED(!index.empty(), index) << "a non-empty string"; - CVC4::Integer idx(index, 10); + CVC5::Integer idx(index, 10); CVC4_API_ARG_CHECK_EXPECTED(idx > 0, index) << "a string representing an integer > 0"; //////// all checks before this line - return Term(this, getNodeManager()->mkConst(CVC4::AbstractValue(idx))); + return Term(this, getNodeManager()->mkConst(CVC5::AbstractValue(idx))); // do not call getType(), for abstract values, type can not be computed // until it is substituted away //////// @@ -5248,7 +5248,7 @@ Term Solver::mkAbstractValue(uint64_t index) const CVC4_API_ARG_CHECK_EXPECTED(index > 0, index) << "an integer > 0"; //////// all checks before this line return Term(this, - getNodeManager()->mkConst(CVC4::AbstractValue(Integer(index)))); + getNodeManager()->mkConst(CVC5::AbstractValue(Integer(index)))); // do not call getType(), for abstract values, type can not be computed // until it is substituted away //////// @@ -5271,8 +5271,8 @@ Term Solver::mkFloatingPoint(uint32_t exp, uint32_t sig, Term val) const val.getSort().isBitVector() && val.d_node->isConst(), val) << "bit-vector constant"; //////// all checks before this line - return mkValHelper( - CVC4::FloatingPoint(exp, sig, val.d_node->getConst())); + return mkValHelper( + CVC5::FloatingPoint(exp, sig, val.d_node->getConst())); //////// CVC4_API_TRY_CATCH_END; } @@ -5461,7 +5461,7 @@ Term Solver::mkTerm(const Op& op) const return mkTermFromKind(op.d_kind); } - const CVC4::Kind int_kind = extToIntKind(op.d_kind); + const CVC5::Kind int_kind = extToIntKind(op.d_kind); Term res = Term(this, getNodeManager()->mkNode(int_kind, *op.d_node)); (void)res.d_node->getType(true); /* kick off type checking */ @@ -5534,7 +5534,7 @@ Term Solver::mkTuple(const std::vector& sorts, CVC4_API_SOLVER_CHECK_SORTS(sorts); CVC4_API_SOLVER_CHECK_TERMS(terms); //////// all checks before this line - std::vector args; + std::vector args; for (size_t i = 0, size = sorts.size(); i < size; i++) { args.push_back(*(ensureTermSort(terms[i], sorts[i])).d_node); @@ -5580,7 +5580,7 @@ Op Solver::mkOp(Kind kind, const std::string& arg) const { res = Op(this, kind, - *mkValHelper(CVC4::RecordUpdate(arg)).d_node); + *mkValHelper(CVC5::RecordUpdate(arg)).d_node); } else { @@ -5591,7 +5591,7 @@ Op Solver::mkOp(Kind kind, const std::string& arg) const << "a string representing an integer, real or rational value."; res = Op(this, kind, - *mkValHelper(CVC4::Divisible(CVC4::Integer(arg))) + *mkValHelper(CVC5::Divisible(CVC5::Integer(arg))) .d_node); } return res; @@ -5610,76 +5610,76 @@ Op Solver::mkOp(Kind kind, uint32_t arg) const case DIVISIBLE: res = Op(this, kind, - *mkValHelper(CVC4::Divisible(arg)).d_node); + *mkValHelper(CVC5::Divisible(arg)).d_node); break; case BITVECTOR_REPEAT: res = Op(this, kind, - *mkValHelper(CVC4::BitVectorRepeat(arg)) + *mkValHelper(CVC5::BitVectorRepeat(arg)) .d_node); break; case BITVECTOR_ZERO_EXTEND: res = Op(this, kind, - *mkValHelper( - CVC4::BitVectorZeroExtend(arg)) + *mkValHelper( + CVC5::BitVectorZeroExtend(arg)) .d_node); break; case BITVECTOR_SIGN_EXTEND: res = Op(this, kind, - *mkValHelper( - CVC4::BitVectorSignExtend(arg)) + *mkValHelper( + CVC5::BitVectorSignExtend(arg)) .d_node); break; case BITVECTOR_ROTATE_LEFT: res = Op(this, kind, - *mkValHelper( - CVC4::BitVectorRotateLeft(arg)) + *mkValHelper( + CVC5::BitVectorRotateLeft(arg)) .d_node); break; case BITVECTOR_ROTATE_RIGHT: res = Op(this, kind, - *mkValHelper( - CVC4::BitVectorRotateRight(arg)) + *mkValHelper( + CVC5::BitVectorRotateRight(arg)) .d_node); break; case INT_TO_BITVECTOR: res = Op( this, kind, - *mkValHelper(CVC4::IntToBitVector(arg)).d_node); + *mkValHelper(CVC5::IntToBitVector(arg)).d_node); break; case IAND: res = - Op(this, kind, *mkValHelper(CVC4::IntAnd(arg)).d_node); + Op(this, kind, *mkValHelper(CVC5::IntAnd(arg)).d_node); break; case FLOATINGPOINT_TO_UBV: res = Op( this, kind, - *mkValHelper(CVC4::FloatingPointToUBV(arg)) + *mkValHelper(CVC5::FloatingPointToUBV(arg)) .d_node); break; case FLOATINGPOINT_TO_SBV: res = Op( this, kind, - *mkValHelper(CVC4::FloatingPointToSBV(arg)) + *mkValHelper(CVC5::FloatingPointToSBV(arg)) .d_node); break; case TUPLE_UPDATE: res = Op(this, kind, - *mkValHelper(CVC4::TupleUpdate(arg)).d_node); + *mkValHelper(CVC5::TupleUpdate(arg)).d_node); break; case REGEXP_REPEAT: res = Op(this, kind, - *mkValHelper(CVC4::RegExpRepeat(arg)).d_node); + *mkValHelper(CVC5::RegExpRepeat(arg)).d_node); break; default: CVC4_API_KIND_CHECK_EXPECTED(false, kind) @@ -5703,57 +5703,57 @@ Op Solver::mkOp(Kind kind, uint32_t arg1, uint32_t arg2) const case BITVECTOR_EXTRACT: res = Op(this, kind, - *mkValHelper( - CVC4::BitVectorExtract(arg1, arg2)) + *mkValHelper( + CVC5::BitVectorExtract(arg1, arg2)) .d_node); break; case FLOATINGPOINT_TO_FP_IEEE_BITVECTOR: res = Op(this, kind, - *mkValHelper( - CVC4::FloatingPointToFPIEEEBitVector(arg1, arg2)) + *mkValHelper( + CVC5::FloatingPointToFPIEEEBitVector(arg1, arg2)) .d_node); break; case FLOATINGPOINT_TO_FP_FLOATINGPOINT: res = Op(this, kind, - *mkValHelper( - CVC4::FloatingPointToFPFloatingPoint(arg1, arg2)) + *mkValHelper( + CVC5::FloatingPointToFPFloatingPoint(arg1, arg2)) .d_node); break; case FLOATINGPOINT_TO_FP_REAL: res = Op(this, kind, - *mkValHelper( - CVC4::FloatingPointToFPReal(arg1, arg2)) + *mkValHelper( + CVC5::FloatingPointToFPReal(arg1, arg2)) .d_node); break; case FLOATINGPOINT_TO_FP_SIGNED_BITVECTOR: res = Op(this, kind, - *mkValHelper( - CVC4::FloatingPointToFPSignedBitVector(arg1, arg2)) + *mkValHelper( + CVC5::FloatingPointToFPSignedBitVector(arg1, arg2)) .d_node); break; case FLOATINGPOINT_TO_FP_UNSIGNED_BITVECTOR: res = Op(this, kind, - *mkValHelper( - CVC4::FloatingPointToFPUnsignedBitVector(arg1, arg2)) + *mkValHelper( + CVC5::FloatingPointToFPUnsignedBitVector(arg1, arg2)) .d_node); break; case FLOATINGPOINT_TO_FP_GENERIC: res = Op(this, kind, - *mkValHelper( - CVC4::FloatingPointToFPGeneric(arg1, arg2)) + *mkValHelper( + CVC5::FloatingPointToFPGeneric(arg1, arg2)) .d_node); break; case REGEXP_LOOP: res = Op( this, kind, - *mkValHelper(CVC4::RegExpLoop(arg1, arg2)).d_node); + *mkValHelper(CVC5::RegExpLoop(arg1, arg2)).d_node); break; default: CVC4_API_KIND_CHECK_EXPECTED(false, kind) @@ -5778,7 +5778,7 @@ Op Solver::mkOp(Kind kind, const std::vector& args) const { res = Op(this, kind, - *mkValHelper(CVC4::TupleProjectOp(args)) + *mkValHelper(CVC5::TupleProjectOp(args)) .d_node); } break; @@ -5819,7 +5819,7 @@ Result Solver::checkEntailed(const Term& term) const "(try --incremental)"; CVC4_API_SOLVER_CHECK_TERM(term); //////// all checks before this line - CVC4::Result r = d_smtEngine->checkEntailed(*term.d_node); + CVC5::Result r = d_smtEngine->checkEntailed(*term.d_node); return Result(r); //////// CVC4_API_TRY_CATCH_END; @@ -5869,7 +5869,7 @@ Result Solver::checkSat(void) const << "Cannot make multiple queries unless incremental solving is enabled " "(try --incremental)"; //////// all checks before this line - CVC4::Result r = d_smtEngine->checkSat(); + CVC5::Result r = d_smtEngine->checkSat(); return Result(r); //////// CVC4_API_TRY_CATCH_END; @@ -5888,7 +5888,7 @@ Result Solver::checkSatAssuming(const Term& assumption) const "(try --incremental)"; CVC4_API_SOLVER_CHECK_TERM_WITH_SORT(assumption, getBooleanSort()); //////// all checks before this line - CVC4::Result r = d_smtEngine->checkSat(*assumption.d_node); + CVC5::Result r = d_smtEngine->checkSat(*assumption.d_node); return Result(r); //////// CVC4_API_TRY_CATCH_END; @@ -5912,7 +5912,7 @@ Result Solver::checkSatAssuming(const std::vector& assumptions) const CVC4_API_SOLVER_CHECK_TERM(term); } std::vector eassumptions = Term::termVectorToNodes(assumptions); - CVC4::Result r = d_smtEngine->checkSat(eassumptions); + CVC5::Result r = d_smtEngine->checkSat(eassumptions); return Result(r); //////// CVC4_API_TRY_CATCH_END; @@ -6641,7 +6641,7 @@ void Solver::setLogic(const std::string& logic) const CVC4_API_TRY_CATCH_BEGIN; CVC4_API_CHECK(!d_smtEngine->isFullyInited()) << "Invalid call to 'setLogic', solver is already fully initialized"; - CVC4::LogicInfo logic_info(logic); + CVC5::LogicInfo logic_info(logic); //////// all checks before this line d_smtEngine->setLogic(logic_info); //////// @@ -6824,12 +6824,12 @@ Term Solver::getSynthSolution(Term term) const CVC4_API_TRY_CATCH_BEGIN; CVC4_API_SOLVER_CHECK_TERM(term); - std::map map; + std::map map; CVC4_API_CHECK(d_smtEngine->getSynthSolutions(map)) << "The solver is not in a state immediately preceded by a " "successful call to checkSynth"; - std::map::const_iterator it = map.find(*term.d_node); + std::map::const_iterator it = map.find(*term.d_node); CVC4_API_CHECK(it != map.cend()) << "Synth solution not found for given term"; //////// all checks before this line @@ -6845,7 +6845,7 @@ std::vector Solver::getSynthSolutions( CVC4_API_ARG_SIZE_CHECK_EXPECTED(!terms.empty(), terms) << "non-empty vector"; CVC4_API_SOLVER_CHECK_TERMS(terms); - std::map map; + std::map map; CVC4_API_CHECK(d_smtEngine->getSynthSolutions(map)) << "The solver is not in a state immediately preceded by a " "successful call to checkSynth"; @@ -6856,7 +6856,7 @@ std::vector Solver::getSynthSolutions( for (size_t i = 0, n = terms.size(); i < n; ++i) { - std::map::const_iterator it = + std::map::const_iterator it = map.find(*terms[i].d_node); CVC4_API_CHECK(it != map.cend()) @@ -6893,4 +6893,4 @@ Options& Solver::getOptions(void) { return d_smtEngine->getOptions(); } } // namespace api -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/api/cvc4cpp.h b/src/api/cvc4cpp.h index 5a8f62983..8e5ddf28d 100644 --- a/src/api/cvc4cpp.h +++ b/src/api/cvc4cpp.h @@ -30,7 +30,7 @@ #include #include -namespace CVC4 { +namespace CVC5 { template class NodeTemplate; @@ -201,14 +201,14 @@ class CVC4_EXPORT Result * @param r the internal result that is to be wrapped by this result * @return the Result */ - Result(const CVC4::Result& r); + Result(const CVC5::Result& r); /** * The interal result wrapped by this result. - * Note: This is a shared_ptr rather than a unique_ptr since CVC4::Result is + * Note: This is a shared_ptr rather than a unique_ptr since CVC5::Result is * not ref counted. */ - std::shared_ptr d_result; + std::shared_ptr d_result; }; /** @@ -239,16 +239,16 @@ class Datatype; */ class CVC4_EXPORT Sort { - friend class CVC4::DatatypeDeclarationCommand; - friend class CVC4::DeclareFunctionCommand; - friend class CVC4::DeclareHeapCommand; - friend class CVC4::DeclareSortCommand; - friend class CVC4::DeclareSygusVarCommand; - friend class CVC4::DefineSortCommand; - friend class CVC4::GetAbductCommand; - friend class CVC4::GetInterpolCommand; - friend class CVC4::GetModelCommand; - friend class CVC4::SynthFunCommand; + friend class CVC5::DatatypeDeclarationCommand; + friend class CVC5::DeclareFunctionCommand; + friend class CVC5::DeclareHeapCommand; + friend class CVC5::DeclareSortCommand; + friend class CVC5::DeclareSygusVarCommand; + friend class CVC5::DefineSortCommand; + friend class CVC5::GetAbductCommand; + friend class CVC5::GetInterpolCommand; + friend class CVC5::GetModelCommand; + friend class CVC5::SynthFunCommand; friend class DatatypeConstructor; friend class DatatypeConstructorDecl; friend class DatatypeSelector; @@ -700,7 +700,7 @@ class CVC4_EXPORT Sort private: /** @return the internal wrapped TypeNode of this sort. */ - const CVC4::TypeNode& getTypeNode(void) const; + const CVC5::TypeNode& getTypeNode(void) const; /** Helper to convert a set of Sorts to internal TypeNodes. */ std::set static sortSetToTypeNodes(const std::set& sorts); @@ -717,7 +717,7 @@ class CVC4_EXPORT Sort * @param t the internal type that is to be wrapped by this sort * @return the Sort */ - Sort(const Solver* slv, const CVC4::TypeNode& t); + Sort(const Solver* slv, const CVC5::TypeNode& t); /** * Helper for isNull checks. This prevents calling an API function with @@ -733,10 +733,10 @@ class CVC4_EXPORT Sort /** * The interal type wrapped by this sort. * Note: This is a shared_ptr rather than a unique_ptr to avoid overhead due - * to memory allocation (CVC4::Type is already ref counted, so this + * to memory allocation (CVC5::Type is already ref counted, so this * could be a unique_ptr instead). */ - std::shared_ptr d_type; + std::shared_ptr d_type; }; /** @@ -847,7 +847,7 @@ class CVC4_EXPORT Op * @param n the internal node that is to be wrapped by this term * @return the Term */ - Op(const Solver* slv, const Kind k, const CVC4::Node& n); + Op(const Solver* slv, const Kind k, const CVC5::Node& n); /** * Helper for isNull checks. This prevents calling an API function with @@ -874,10 +874,10 @@ class CVC4_EXPORT Op /** * The internal node wrapped by this operator. * Note: This is a shared_ptr rather than a unique_ptr to avoid overhead due - * to memory allocation (CVC4::Node is already ref counted, so this + * to memory allocation (CVC5::Node is already ref counted, so this * could be a unique_ptr instead). */ - std::shared_ptr d_node; + std::shared_ptr d_node; }; /* -------------------------------------------------------------------------- */ @@ -889,25 +889,25 @@ class CVC4_EXPORT Op */ class CVC4_EXPORT Term { - friend class CVC4::AssertCommand; - friend class CVC4::BlockModelValuesCommand; - friend class CVC4::CheckSatCommand; - friend class CVC4::CheckSatAssumingCommand; - friend class CVC4::DeclareSygusVarCommand; - friend class CVC4::DefineFunctionCommand; - friend class CVC4::DefineFunctionRecCommand; - friend class CVC4::GetAbductCommand; - friend class CVC4::GetInterpolCommand; - friend class CVC4::GetModelCommand; - friend class CVC4::GetQuantifierEliminationCommand; - friend class CVC4::GetUnsatCoreCommand; - friend class CVC4::GetValueCommand; - friend class CVC4::SetUserAttributeCommand; - friend class CVC4::SimplifyCommand; - friend class CVC4::SygusConstraintCommand; - friend class CVC4::SygusInvConstraintCommand; - friend class CVC4::SynthFunCommand; - friend class CVC4::QueryCommand; + friend class CVC5::AssertCommand; + friend class CVC5::BlockModelValuesCommand; + friend class CVC5::CheckSatCommand; + friend class CVC5::CheckSatAssumingCommand; + friend class CVC5::DeclareSygusVarCommand; + friend class CVC5::DefineFunctionCommand; + friend class CVC5::DefineFunctionRecCommand; + friend class CVC5::GetAbductCommand; + friend class CVC5::GetInterpolCommand; + friend class CVC5::GetModelCommand; + friend class CVC5::GetQuantifierEliminationCommand; + friend class CVC5::GetUnsatCoreCommand; + friend class CVC5::GetValueCommand; + friend class CVC5::SetUserAttributeCommand; + friend class CVC5::SimplifyCommand; + friend class CVC5::SygusConstraintCommand; + friend class CVC5::SygusInvConstraintCommand; + friend class CVC5::SynthFunCommand; + friend class CVC5::QueryCommand; friend class Datatype; friend class DatatypeConstructor; friend class DatatypeSelector; @@ -1116,7 +1116,7 @@ class CVC4_EXPORT Term * @param p the position of the iterator (e.g. which child it's on) */ const_iterator(const Solver* slv, - const std::shared_ptr& e, + const std::shared_ptr& e, uint32_t p); /** @@ -1169,7 +1169,7 @@ class CVC4_EXPORT Term */ const Solver* d_solver; /** The original node to be iterated over. */ - std::shared_ptr d_origNode; + std::shared_ptr d_origNode; /** Keeps track of the iteration position. */ uint32_t d_pos; }; @@ -1259,10 +1259,10 @@ class CVC4_EXPORT Term * @param n the internal node that is to be wrapped by this term * @return the Term */ - Term(const Solver* slv, const CVC4::Node& n); + Term(const Solver* slv, const CVC5::Node& n); /** @return the internal wrapped Node of this term. */ - const CVC4::Node& getNode(void) const; + const CVC5::Node& getNode(void) const; /** * Helper for isNull checks. This prevents calling an API function with @@ -1285,10 +1285,10 @@ class CVC4_EXPORT Term /** * The internal node wrapped by this term. * Note: This is a shared_ptr rather than a unique_ptr to avoid overhead due - * to memory allocation (CVC4::Node is already ref counted, so this + * to memory allocation (CVC5::Node is already ref counted, so this * could be a unique_ptr instead). */ - std::shared_ptr d_node; + std::shared_ptr d_node; }; /** @@ -1445,9 +1445,9 @@ class CVC4_EXPORT DatatypeConstructorDecl * The internal (intermediate) datatype constructor wrapped by this * datatype constructor declaration. * Note: This is a shared_ptr rather than a unique_ptr since - * CVC4::DTypeConstructor is not ref counted. + * CVC5::DTypeConstructor is not ref counted. */ - std::shared_ptr d_ctor; + std::shared_ptr d_ctor; }; class Solver; @@ -1534,7 +1534,7 @@ class CVC4_EXPORT DatatypeDecl bool isCoDatatype = false); /** @return the internal wrapped Dtype of this datatype declaration. */ - CVC4::DType& getDatatype(void) const; + CVC5::DType& getDatatype(void) const; /** * Helper for isNull checks. This prevents calling an API function with @@ -1550,10 +1550,10 @@ class CVC4_EXPORT DatatypeDecl /** * The internal (intermediate) datatype wrapped by this datatype * declaration. - * Note: This is a shared_ptr rather than a unique_ptr since CVC4::DType is + * Note: This is a shared_ptr rather than a unique_ptr since CVC5::DType is * not ref counted. */ - std::shared_ptr d_dtype; + std::shared_ptr d_dtype; }; /** @@ -1604,7 +1604,7 @@ class CVC4_EXPORT DatatypeSelector * @param stor the internal datatype selector to be wrapped * @return the DatatypeSelector */ - DatatypeSelector(const Solver* slv, const CVC4::DTypeSelector& stor); + DatatypeSelector(const Solver* slv, const CVC5::DTypeSelector& stor); /** * Helper for isNull checks. This prevents calling an API function with @@ -1619,10 +1619,10 @@ class CVC4_EXPORT DatatypeSelector /** * The internal datatype selector wrapped by this datatype selector. - * Note: This is a shared_ptr rather than a unique_ptr since CVC4::DType is + * Note: This is a shared_ptr rather than a unique_ptr since CVC5::DType is * not ref counted. */ - std::shared_ptr d_stor; + std::shared_ptr d_stor; }; /** @@ -1785,7 +1785,7 @@ class CVC4_EXPORT DatatypeConstructor * @param true if this is a begin() iterator */ const_iterator(const Solver* slv, - const CVC4::DTypeConstructor& ctor, + const CVC5::DTypeConstructor& ctor, bool begin); /** @@ -1823,7 +1823,7 @@ class CVC4_EXPORT DatatypeConstructor * @param ctor the internal datatype constructor to be wrapped * @return the DatatypeConstructor */ - DatatypeConstructor(const Solver* slv, const CVC4::DTypeConstructor& ctor); + DatatypeConstructor(const Solver* slv, const CVC5::DTypeConstructor& ctor); /** * Return selector for name. @@ -1845,10 +1845,10 @@ class CVC4_EXPORT DatatypeConstructor /** * The internal datatype constructor wrapped by this datatype constructor. - * Note: This is a shared_ptr rather than a unique_ptr since CVC4::DType is + * Note: This is a shared_ptr rather than a unique_ptr since CVC5::DType is * not ref counted. */ - std::shared_ptr d_ctor; + std::shared_ptr d_ctor; }; /* @@ -2007,7 +2007,7 @@ class CVC4_EXPORT Datatype * @param dtype the internal datatype to iterate over * @param true if this is a begin() iterator */ - const_iterator(const Solver* slv, const CVC4::DType& dtype, bool begin); + const_iterator(const Solver* slv, const CVC5::DType& dtype, bool begin); /** * The associated solver object. @@ -2044,7 +2044,7 @@ class CVC4_EXPORT Datatype * @param dtype the internal datatype to be wrapped * @return the Datatype */ - Datatype(const Solver* slv, const CVC4::DType& dtype); + Datatype(const Solver* slv, const CVC5::DType& dtype); /** * Return constructor for name. @@ -2066,10 +2066,10 @@ class CVC4_EXPORT Datatype /** * The internal datatype wrapped by this datatype. - * Note: This is a shared_ptr rather than a unique_ptr since CVC4::DType is + * Note: This is a shared_ptr rather than a unique_ptr since CVC5::DType is * not ref counted. */ - std::shared_ptr d_dtype; + std::shared_ptr d_dtype; }; /** @@ -2135,9 +2135,9 @@ std::ostream& operator<<(std::ostream& out, */ class CVC4_EXPORT Grammar { - friend class CVC4::GetAbductCommand; - friend class CVC4::GetInterpolCommand; - friend class CVC4::SynthFunCommand; + friend class CVC5::GetAbductCommand; + friend class CVC5::GetInterpolCommand; + friend class CVC5::SynthFunCommand; friend class Solver; public: @@ -3704,5 +3704,5 @@ class CVC4_EXPORT Solver }; } // namespace api -} // namespace CVC4 +} // namespace CVC5 #endif diff --git a/src/api/cvc4cppkind.h b/src/api/cvc4cppkind.h index c98667da7..ef2f6af74 100644 --- a/src/api/cvc4cppkind.h +++ b/src/api/cvc4cppkind.h @@ -21,7 +21,7 @@ #include -namespace CVC4 { +namespace CVC5 { namespace api { /* -------------------------------------------------------------------------- */ @@ -33,7 +33,7 @@ namespace api { * * Note that the underlying type of Kind must be signed (to enable range * checks for validity). The size of this type depends on the size of - * CVC4::Kind (NodeValue::NBITS_KIND, currently 10 bits, see expr/node_value.h). + * CVC5::Kind (NodeValue::NBITS_KIND, currently 10 bits, see expr/node_value.h). */ enum CVC4_EXPORT Kind : int32_t { @@ -2868,6 +2868,6 @@ struct CVC4_EXPORT KindHashFunction }; } // namespace api -} // namespace CVC4 +} // namespace CVC5 #endif diff --git a/src/api/python/cvc4.pxd b/src/api/python/cvc4.pxd index 19e7eb092..9d69e2a15 100644 --- a/src/api/python/cvc4.pxd +++ b/src/api/python/cvc4.pxd @@ -19,7 +19,7 @@ cdef extern from "api/cvc4cpp.h" namespace "CVC4": pass -cdef extern from "api/cvc4cpp.h" namespace "CVC4::api": +cdef extern from "api/cvc4cpp.h" namespace "CVC5::api": cdef cppclass Datatype: Datatype() except + DatatypeConstructor operator[](size_t idx) except + @@ -353,7 +353,7 @@ cdef extern from "api/cvc4cpp.h" namespace "CVC4::api": size_t operator()(const Term & t) except + -cdef extern from "api/cvc4cpp.h" namespace "CVC4::api::RoundingMode": +cdef extern from "api/cvc4cpp.h" namespace "CVC5::api::RoundingMode": cdef RoundingMode ROUND_NEAREST_TIES_TO_EVEN, cdef RoundingMode ROUND_TOWARD_POSITIVE, cdef RoundingMode ROUND_TOWARD_NEGATIVE, diff --git a/src/api/python/genkinds.py.in b/src/api/python/genkinds.py.in index 0f8ba4b45..46bf2b45e 100644 --- a/src/api/python/genkinds.py.in +++ b/src/api/python/genkinds.py.in @@ -40,13 +40,13 @@ PYCOMMENT = '#' CDEF_KIND = " cdef Kind " KINDS_PXD_TOP = \ -r"""cdef extern from "api/cvc4cppkind.h" namespace "CVC4::api": +r"""cdef extern from "api/cvc4cppkind.h" namespace "CVC5::api": cdef cppclass Kind: pass # Kind declarations: See cvc4cppkind.h for additional information -cdef extern from "api/cvc4cppkind.h" namespace "CVC4::api::Kind": +cdef extern from "api/cvc4cppkind.h" namespace "CVC5::api::Kind": """ KINDS_PXI_TOP = \ diff --git a/src/base/check.cpp b/src/base/check.cpp index c19b30f6a..4aa6bfce0 100644 --- a/src/base/check.cpp +++ b/src/base/check.cpp @@ -19,7 +19,7 @@ #include #include -namespace CVC4 { +namespace CVC5 { FatalStream::FatalStream(const char* function, const char* file, int line) { @@ -209,4 +209,4 @@ AssertArgumentException::AssertArgumentException(const char* condStr, line); } -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/base/check.h b/src/base/check.h index 70c5c9016..1e46ea85c 100644 --- a/src/base/check.h +++ b/src/base/check.h @@ -75,7 +75,7 @@ #define CVC4_FALLTHROUGH #endif -namespace CVC4 { +namespace CVC5 { // Implementation notes: // To understand FatalStream and OStreamVoider, it is useful to understand @@ -206,11 +206,11 @@ class AssertArgumentException : public Exception #define InternalError() CVC4_FATAL() << "Internal error detected" #define IllegalArgument(arg, msg...) \ - throw ::CVC4::IllegalArgumentException( \ + throw ::CVC5::IllegalArgumentException( \ "", \ #arg, \ __PRETTY_FUNCTION__, \ - ::CVC4::IllegalArgumentException::formatVariadic(msg).c_str()); + ::CVC5::IllegalArgumentException::formatVariadic(msg).c_str()); // This cannot use check argument directly as this forces // CheckArgument to use a va_list. This is unsupported in Swig. #define PrettyCheckArgument(cond, arg, msg...) \ @@ -218,11 +218,11 @@ class AssertArgumentException : public Exception { \ if (__builtin_expect((!(cond)), false)) \ { \ - throw ::CVC4::IllegalArgumentException( \ + throw ::CVC5::IllegalArgumentException( \ #cond, \ #arg, \ __PRETTY_FUNCTION__, \ - ::CVC4::IllegalArgumentException::formatVariadic(msg).c_str()); \ + ::CVC5::IllegalArgumentException::formatVariadic(msg).c_str()); \ } \ } while (0) #define AlwaysAssertArgument(cond, arg, msg...) \ @@ -230,7 +230,7 @@ class AssertArgumentException : public Exception { \ if (__builtin_expect((!(cond)), false)) \ { \ - throw ::CVC4::AssertArgumentException( \ + throw ::CVC5::AssertArgumentException( \ #cond, #arg, __PRETTY_FUNCTION__, __FILE__, __LINE__, ##msg); \ } \ } while (0) @@ -245,6 +245,6 @@ class AssertArgumentException : public Exception cond, arg, msg...) /*__builtin_expect( ( cond ), true )*/ #endif /* CVC4_ASSERTIONS */ -} // namespace CVC4 +} // namespace CVC5 #endif /* CVC4__CHECK_H */ diff --git a/src/base/configuration.cpp b/src/base/configuration.cpp index 39284227a..1b8be7bf9 100644 --- a/src/base/configuration.cpp +++ b/src/base/configuration.cpp @@ -36,7 +36,7 @@ using namespace std; -namespace CVC4 { +namespace CVC5 { string Configuration::getName() { return CVC4_PACKAGE_NAME; @@ -375,7 +375,8 @@ std::string Configuration::getGitId() { stringstream ss; ss << "git " << branchName << " " << string(getGitCommit()).substr(0, 8) - << ( ::CVC4::Configuration::hasGitModifications() ? " (with modifications)" : "" ); + << (::CVC5::Configuration::hasGitModifications() ? " (with modifications)" + : ""); return ss.str(); } @@ -398,4 +399,4 @@ std::string Configuration::getCompiledDateTime() { return __DATE__ " " __TIME__; } -}/* CVC4 namespace */ +} // namespace CVC5 diff --git a/src/base/configuration.h b/src/base/configuration.h index ec8cc879b..c6cf3b229 100644 --- a/src/base/configuration.h +++ b/src/base/configuration.h @@ -25,7 +25,7 @@ #include "cvc4_export.h" -namespace CVC4 { +namespace CVC5 { /** * Represents the (static) configuration of CVC4. @@ -135,6 +135,6 @@ public: }; /* class Configuration */ -}/* CVC4 namespace */ +} // namespace CVC5 #endif /* CVC4__CONFIGURATION_H */ diff --git a/src/base/configuration_private.h b/src/base/configuration_private.h index cc1983734..7de4f0e97 100644 --- a/src/base/configuration_private.h +++ b/src/base/configuration_private.h @@ -22,7 +22,7 @@ #include "base/configuration.h" -namespace CVC4 { +namespace CVC5 { #ifdef CVC4_DEBUG # define IS_DEBUG_BUILD true @@ -182,6 +182,6 @@ namespace CVC4 { #endif /* __has_feature(thread_sanitizer) */ #endif /* defined(__has_feature) */ -}/* CVC4 namespace */ +} // namespace CVC5 #endif /* CVC4__CONFIGURATION_PRIVATE_H */ diff --git a/src/base/exception.cpp b/src/base/exception.cpp index 43227cce5..631f1cc35 100644 --- a/src/base/exception.cpp +++ b/src/base/exception.cpp @@ -27,7 +27,7 @@ using namespace std; -namespace CVC4 { +namespace CVC5 { std::string Exception::toString() const { @@ -187,4 +187,4 @@ void IllegalArgumentException::construct(const char* header, const char* extra, delete [] buf; } -} /* namespace CVC4 */ +} // namespace CVC5 diff --git a/src/base/exception.h b/src/base/exception.h index d9bf83f44..a0ad0819c 100644 --- a/src/base/exception.h +++ b/src/base/exception.h @@ -25,7 +25,7 @@ #include "cvc4_export.h" -namespace CVC4 { +namespace CVC5 { class Exception : public std::exception { @@ -121,15 +121,15 @@ template inline void CheckArgument(bool cond, const T& arg, const char* tail); template inline void CheckArgument(bool cond, const T& arg CVC4_UNUSED, const char* tail CVC4_UNUSED) { - if(__builtin_expect( ( !cond ), false )) { \ - throw ::CVC4::IllegalArgumentException("", "", tail); \ + if(__builtin_expect( ( !cond ), false )) { + throw ::CVC5::IllegalArgumentException("", "", tail); } \ } template inline void CheckArgument(bool cond, const T& arg); template inline void CheckArgument(bool cond, const T& arg CVC4_UNUSED) { - if(__builtin_expect( ( !cond ), false )) { \ - throw ::CVC4::IllegalArgumentException("", "", ""); \ + if(__builtin_expect( ( !cond ), false )) { + throw ::CVC5::IllegalArgumentException("", "", ""); } \ } @@ -159,6 +159,6 @@ private: static thread_local LastExceptionBuffer* s_currentBuffer; }; /* class LastExceptionBuffer */ -}/* CVC4 namespace */ +} // namespace CVC5 #endif /* CVC4__EXCEPTION_H */ diff --git a/src/base/git_versioninfo.cpp.in b/src/base/git_versioninfo.cpp.in index 78f9115b0..333564b97 100644 --- a/src/base/git_versioninfo.cpp.in +++ b/src/base/git_versioninfo.cpp.in @@ -16,7 +16,7 @@ **/ #include "base/configuration.h" -const bool ::CVC4::Configuration::IS_GIT_BUILD = @GIT_BUILD@; -const char* const ::CVC4::Configuration::GIT_BRANCH_NAME = "@GIT_BRANCH@"; -const char* const ::CVC4::Configuration::GIT_COMMIT = "@GIT_SHA1@"; -const bool ::CVC4::Configuration::GIT_HAS_MODIFICATIONS = @GIT_IS_DIRTY@; +const bool ::CVC5::Configuration::IS_GIT_BUILD = @GIT_BUILD@; +const char* const ::CVC5::Configuration::GIT_BRANCH_NAME = "@GIT_BRANCH@"; +const char* const ::CVC5::Configuration::GIT_COMMIT = "@GIT_SHA1@"; +const bool ::CVC5::Configuration::GIT_HAS_MODIFICATIONS = @GIT_IS_DIRTY@; diff --git a/src/base/listener.cpp b/src/base/listener.cpp index 02a052a09..b7d92e6a3 100644 --- a/src/base/listener.cpp +++ b/src/base/listener.cpp @@ -16,10 +16,9 @@ #include "base/listener.h" -namespace CVC4 { +namespace CVC5 { Listener::Listener(){} Listener::~Listener(){} - -}/* CVC4 namespace */ +} // namespace CVC5 diff --git a/src/base/listener.h b/src/base/listener.h index 4205aca01..0bb81e63a 100644 --- a/src/base/listener.h +++ b/src/base/listener.h @@ -20,7 +20,7 @@ #ifndef CVC4__LISTENER_H #define CVC4__LISTENER_H -namespace CVC4 { +namespace CVC5 { /** * Listener interface class. @@ -37,6 +37,6 @@ class Listener virtual void notify() = 0; }; -}/* CVC4 namespace */ +} // namespace CVC5 #endif /* CVC4__LISTENER_H */ diff --git a/src/base/map_util.h b/src/base/map_util.h index 2af0113b5..f428a9943 100644 --- a/src/base/map_util.h +++ b/src/base/map_util.h @@ -16,8 +16,8 @@ ** new code. Supports: ** - std::map ** - std::unordered_map - ** - CVC4::context::CDHashmap - ** - CVC4::context::CDInsertHashmap + ** - CVC5::context::CDHashmap + ** - CVC5::context::CDInsertHashmap ** The ContainsKey function is also compatible with std::[unordered_]set. ** ** Currently implemented classes of functions: @@ -40,7 +40,7 @@ #include "base/check.h" -namespace CVC4 { +namespace CVC5 { // Returns true if the `map` contains the `key`. // @@ -92,6 +92,6 @@ const MapMappedTypeT& FindOrDie(const M& map, const MapKeyTypeT& key) return (*it).second; } -} // namespace CVC4 +} // namespace CVC5 #endif /* CVC4__BASE__MAP_UTIL_H */ diff --git a/src/base/modal_exception.h b/src/base/modal_exception.h index bfd5c9469..eab6c66b1 100644 --- a/src/base/modal_exception.h +++ b/src/base/modal_exception.h @@ -24,9 +24,9 @@ #include "base/exception.h" -namespace CVC4 { +namespace CVC5 { -class ModalException : public CVC4::Exception +class ModalException : public CVC5::Exception { public: ModalException() : @@ -50,7 +50,7 @@ class ModalException : public CVC4::Exception * TODO(#1108): This exception should not be needed anymore in future versions * of the public API. */ -class RecoverableModalException : public CVC4::ModalException +class RecoverableModalException : public CVC5::ModalException { public: RecoverableModalException(const std::string& msg) : ModalException(msg) {} @@ -58,6 +58,6 @@ class RecoverableModalException : public CVC4::ModalException RecoverableModalException(const char* msg) : ModalException(msg) {} }; /* class RecoverableModalException */ -}/* CVC4 namespace */ +} // namespace CVC5 #endif /* CVC4__SMT__MODAL_EXCEPTION_H */ diff --git a/src/base/output.cpp b/src/base/output.cpp index 93ebf2a70..7876f0fbe 100644 --- a/src/base/output.cpp +++ b/src/base/output.cpp @@ -20,7 +20,7 @@ using namespace std; -namespace CVC4 { +namespace CVC5 { /* Definitions of the declared globals from output.h... */ @@ -41,4 +41,4 @@ TraceC TraceChannel(&cout); std::ostream DumpOutC::dump_cout(cout.rdbuf());// copy cout stream buffer DumpOutC DumpOutChannel(&DumpOutC::dump_cout); -}/* CVC4 namespace */ +} // namespace CVC5 diff --git a/src/base/output.h b/src/base/output.h index 5791d6f8f..b1f15d98b 100644 --- a/src/base/output.h +++ b/src/base/output.h @@ -28,7 +28,7 @@ #include "cvc4_export.h" -namespace CVC4 { +namespace CVC5 { template std::ostream& operator<<(std::ostream& out, @@ -412,39 +412,58 @@ extern DumpOutC DumpOutChannel CVC4_EXPORT; #ifdef CVC4_MUZZLE -# define Debug ::CVC4::__cvc4_true() ? ::CVC4::nullCvc4Stream : ::CVC4::DebugChannel -# define Warning ::CVC4::__cvc4_true() ? ::CVC4::nullCvc4Stream : ::CVC4::WarningChannel -# define WarningOnce ::CVC4::__cvc4_true() ? ::CVC4::nullCvc4Stream : ::CVC4::WarningChannel +#define Debug \ + ::CVC5::__cvc4_true() ? ::CVC5::nullCvc4Stream : ::CVC5::DebugChannel +#define Warning \ + ::CVC5::__cvc4_true() ? ::CVC5::nullCvc4Stream : ::CVC5::WarningChannel +#define WarningOnce \ + ::CVC5::__cvc4_true() ? ::CVC5::nullCvc4Stream : ::CVC5::WarningChannel #define CVC4Message \ - ::CVC4::__cvc4_true() ? ::CVC4::nullCvc4Stream : ::CVC4::MessageChannel -# define Notice ::CVC4::__cvc4_true() ? ::CVC4::nullCvc4Stream : ::CVC4::NoticeChannel -# define Chat ::CVC4::__cvc4_true() ? ::CVC4::nullCvc4Stream : ::CVC4::ChatChannel -# define Trace ::CVC4::__cvc4_true() ? ::CVC4::nullCvc4Stream : ::CVC4::TraceChannel -# define DumpOut ::CVC4::__cvc4_true() ? ::CVC4::nullCvc4Stream : ::CVC4::DumpOutChannel + ::CVC5::__cvc4_true() ? ::CVC5::nullCvc4Stream : ::CVC5::MessageChannel +#define Notice \ + ::CVC5::__cvc4_true() ? ::CVC5::nullCvc4Stream : ::CVC5::NoticeChannel +#define Chat \ + ::CVC5::__cvc4_true() ? ::CVC5::nullCvc4Stream : ::CVC5::ChatChannel +#define Trace \ + ::CVC5::__cvc4_true() ? ::CVC5::nullCvc4Stream : ::CVC5::TraceChannel +#define DumpOut \ + ::CVC5::__cvc4_true() ? ::CVC5::nullCvc4Stream : ::CVC5::DumpOutChannel #else /* CVC4_MUZZLE */ # if defined(CVC4_DEBUG) && defined(CVC4_TRACING) -# define Debug ::CVC4::DebugChannel +#define Debug ::CVC5::DebugChannel # else /* CVC4_DEBUG && CVC4_TRACING */ -# define Debug ::CVC4::__cvc4_true() ? ::CVC4::nullCvc4Stream : ::CVC4::DebugChannel +#define Debug \ + ::CVC5::__cvc4_true() ? ::CVC5::nullCvc4Stream : ::CVC5::DebugChannel # endif /* CVC4_DEBUG && CVC4_TRACING */ -# define Warning (! ::CVC4::WarningChannel.isOn()) ? ::CVC4::nullCvc4Stream : ::CVC4::WarningChannel -# define WarningOnce (! ::CVC4::WarningChannel.isOn() || ! ::CVC4::WarningChannel.warnOnce(__FILE__,__LINE__)) ? ::CVC4::nullCvc4Stream : ::CVC4::WarningChannel +#define Warning \ + (!::CVC5::WarningChannel.isOn()) ? ::CVC5::nullCvc4Stream \ + : ::CVC5::WarningChannel +#define WarningOnce \ + (!::CVC5::WarningChannel.isOn() \ + || !::CVC5::WarningChannel.warnOnce(__FILE__, __LINE__)) \ + ? ::CVC5::nullCvc4Stream \ + : ::CVC5::WarningChannel #define CVC4Message \ - (!::CVC4::MessageChannel.isOn()) ? ::CVC4::nullCvc4Stream \ - : ::CVC4::MessageChannel -# define Notice (! ::CVC4::NoticeChannel.isOn()) ? ::CVC4::nullCvc4Stream : ::CVC4::NoticeChannel -# define Chat (! ::CVC4::ChatChannel.isOn()) ? ::CVC4::nullCvc4Stream : ::CVC4::ChatChannel + (!::CVC5::MessageChannel.isOn()) ? ::CVC5::nullCvc4Stream \ + : ::CVC5::MessageChannel +#define Notice \ + (!::CVC5::NoticeChannel.isOn()) ? ::CVC5::nullCvc4Stream \ + : ::CVC5::NoticeChannel +#define Chat \ + (!::CVC5::ChatChannel.isOn()) ? ::CVC5::nullCvc4Stream : ::CVC5::ChatChannel # ifdef CVC4_TRACING -# define Trace ::CVC4::TraceChannel +#define Trace ::CVC5::TraceChannel # else /* CVC4_TRACING */ -# define Trace ::CVC4::__cvc4_true() ? ::CVC4::nullCvc4Stream : ::CVC4::TraceChannel +#define Trace \ + ::CVC5::__cvc4_true() ? ::CVC5::nullCvc4Stream : ::CVC5::TraceChannel # endif /* CVC4_TRACING */ # ifdef CVC4_DUMPING -# define DumpOut ::CVC4::DumpOutChannel +#define DumpOut ::CVC5::DumpOutChannel # else /* CVC4_DUMPING */ -# define DumpOut ::CVC4::__cvc4_true() ? ::CVC4::nullCvc4Stream : ::CVC4::DumpOutChannel +#define DumpOut \ + ::CVC5::__cvc4_true() ? ::CVC5::nullCvc4Stream : ::CVC5::DumpOutChannel # endif /* CVC4_DUMPING */ #endif /* CVC4_MUZZLE */ @@ -560,6 +579,6 @@ inline IndentedScope::IndentedScope(CVC4ostream out) {} inline IndentedScope::~IndentedScope() {} #endif /* CVC4_DEBUG && CVC4_TRACING */ -}/* CVC4 namespace */ +} // namespace CVC5 #endif /* CVC4__OUTPUT_H */ diff --git a/src/context/backtrackable.h b/src/context/backtrackable.h index 7ef91617d..2d5416eab 100644 --- a/src/context/backtrackable.h +++ b/src/context/backtrackable.h @@ -23,7 +23,7 @@ #include #include "context/cdo.h" -namespace CVC4 { +namespace CVC5 { template class List; template class List_iterator; @@ -217,6 +217,6 @@ template void Backtracker::checkConsistency() { Assert(curr_level == pop_level); } -}/* CVC4 namespace */ +} // namespace CVC5 #endif /* CVC4__UTIL__BACKTRACKABLE_H */ diff --git a/src/context/cddense_set.h b/src/context/cddense_set.h index 168e901a8..765e0f75d 100644 --- a/src/context/cddense_set.h +++ b/src/context/cddense_set.h @@ -29,7 +29,7 @@ #include "util/index.h" -namespace CVC4 { +namespace CVC5 { namespace context { template > @@ -96,6 +96,5 @@ public: };/* class CDDenseSet<> */ - -}/* CVC4::context namespace */ -}/* CVC4 namespace */ +} // namespace context +} // namespace CVC5 diff --git a/src/context/cdhashmap.h b/src/context/cdhashmap.h index 4ab552001..165080bd1 100644 --- a/src/context/cdhashmap.h +++ b/src/context/cdhashmap.h @@ -91,7 +91,7 @@ #include "context/cdhashmap_forward.h" #include "context/context.h" -namespace CVC4 { +namespace CVC5 { namespace context { // Auxiliary class: almost the same as CDO (see cdo.h) @@ -452,7 +452,7 @@ public: };/* class CDHashMap<> */ -}/* CVC4::context namespace */ -}/* CVC4 namespace */ +} // namespace context +} // namespace CVC5 #endif /* CVC4__CONTEXT__CDHASHMAP_H */ diff --git a/src/context/cdhashmap_forward.h b/src/context/cdhashmap_forward.h index 7ef3874a9..b34981c73 100644 --- a/src/context/cdhashmap_forward.h +++ b/src/context/cdhashmap_forward.h @@ -30,13 +30,12 @@ /// \cond internals - -namespace CVC4 { - namespace context { - template > - class CDHashMap; - }/* CVC4::context namespace */ -}/* CVC4 namespace */ +namespace CVC5 { +namespace context { +template > +class CDHashMap; +} // namespace context +} // namespace CVC5 /// \endcond diff --git a/src/context/cdhashset.h b/src/context/cdhashset.h index 665bf8f0d..418bc8bf0 100644 --- a/src/context/cdhashset.h +++ b/src/context/cdhashset.h @@ -23,7 +23,7 @@ #include "context/cdinsert_hashmap.h" #include "context/context.h" -namespace CVC4 { +namespace CVC5 { namespace context { template @@ -155,7 +155,7 @@ public: };/* class CDHashSet */ -}/* CVC4::context namespace */ -}/* CVC4 namespace */ +} // namespace context +} // namespace CVC5 #endif /* CVC4__CONTEXT__CDHASHSET_H */ diff --git a/src/context/cdhashset_forward.h b/src/context/cdhashset_forward.h index e8877c3c2..81154db5d 100644 --- a/src/context/cdhashset_forward.h +++ b/src/context/cdhashset_forward.h @@ -28,11 +28,11 @@ #include -namespace CVC4 { +namespace CVC5 { namespace context { template > class CDHashSet; } // namespace context -} // namespace CVC4 +} // namespace CVC5 #endif /* CVC4__CONTEXT__CDSET_FORWARD_H */ diff --git a/src/context/cdinsert_hashmap.h b/src/context/cdinsert_hashmap.h index 56004463a..6bd15c645 100644 --- a/src/context/cdinsert_hashmap.h +++ b/src/context/cdinsert_hashmap.h @@ -45,7 +45,7 @@ #pragma once -namespace CVC4 { +namespace CVC5 { namespace context { @@ -406,5 +406,5 @@ class CDInsertHashMap : public ContextObj { "Cannot create a CDInsertHashMap with TNode keys"); }; -}/* CVC4::context namespace */ -}/* CVC4 namespace */ +} // namespace context +} // namespace CVC5 diff --git a/src/context/cdinsert_hashmap_forward.h b/src/context/cdinsert_hashmap_forward.h index 07e8d16e9..9729ea2f4 100644 --- a/src/context/cdinsert_hashmap_forward.h +++ b/src/context/cdinsert_hashmap_forward.h @@ -28,11 +28,11 @@ #include -namespace CVC4 { +namespace CVC5 { namespace context { template > class CDInsertHashMap; } // namespace context -} // namespace CVC4 +} // namespace CVC5 #endif /* CVC4__CONTEXT__CDINSERT_HASHMAP_FORWARD_H */ diff --git a/src/context/cdlist.h b/src/context/cdlist.h index b1c8229f0..7174152cb 100644 --- a/src/context/cdlist.h +++ b/src/context/cdlist.h @@ -29,7 +29,7 @@ #include "context/context.h" #include "context/context_mm.h" -namespace CVC4 { +namespace CVC5 { namespace context { /** @@ -434,7 +434,7 @@ class CDList > : public ContextObj { "Cannot create a CDList with a ContextMemoryAllocator."); }; -}/* CVC4::context namespace */ -}/* CVC4 namespace */ +} // namespace context +} // namespace CVC5 #endif /* CVC4__CONTEXT__CDLIST_H */ diff --git a/src/context/cdlist_forward.h b/src/context/cdlist_forward.h index 576463399..bd3a911af 100644 --- a/src/context/cdlist_forward.h +++ b/src/context/cdlist_forward.h @@ -36,7 +36,7 @@ /// \cond internals -namespace CVC4 { +namespace CVC5 { namespace context { template @@ -50,7 +50,7 @@ class CDList; /// \endcond -}/* CVC4::context namespace */ -}/* CVC4 namespace */ +} // namespace context +} // namespace CVC5 #endif /* CVC4__CONTEXT__CDLIST_FORWARD_H */ diff --git a/src/context/cdmaybe.h b/src/context/cdmaybe.h index 8b62c619f..1455ca5f0 100644 --- a/src/context/cdmaybe.h +++ b/src/context/cdmaybe.h @@ -24,7 +24,7 @@ #include "context/cdo.h" #include "context/context.h" -namespace CVC4 { +namespace CVC5 { namespace context { class CDRaised { @@ -73,6 +73,5 @@ public: } };/* class CDMaybe */ -}/* CVC4::context namespace */ -}/* CVC4 namespace */ - +} // namespace context +} // namespace CVC5 diff --git a/src/context/cdo.h b/src/context/cdo.h index c6d9e93f6..79e73d38f 100644 --- a/src/context/cdo.h +++ b/src/context/cdo.h @@ -21,8 +21,7 @@ #include "context/context.h" - -namespace CVC4 { +namespace CVC5 { namespace context { /** @@ -176,7 +175,7 @@ public: };/* class CDO */ -}/* CVC4::context namespace */ -}/* CVC4 namespace */ +} // namespace context +} // namespace CVC5 #endif /* CVC4__CONTEXT__CDO_H */ diff --git a/src/context/cdqueue.h b/src/context/cdqueue.h index 3659f5653..20d078184 100644 --- a/src/context/cdqueue.h +++ b/src/context/cdqueue.h @@ -28,7 +28,7 @@ #include "context/context.h" #include "context/cdlist.h" -namespace CVC4 { +namespace CVC5 { namespace context { template , class Allocator = std::allocator > @@ -162,7 +162,7 @@ public: };/* class CDQueue<> */ -}/* CVC4::context namespace */ -}/* CVC4 namespace */ +} // namespace context +} // namespace CVC5 #endif /* CVC4__CONTEXT__CDQUEUE_H */ diff --git a/src/context/cdtrail_queue.h b/src/context/cdtrail_queue.h index f505004cb..d9bf6d572 100644 --- a/src/context/cdtrail_queue.h +++ b/src/context/cdtrail_queue.h @@ -25,7 +25,7 @@ #include "context/cdlist.h" #include "context/cdo.h" -namespace CVC4 { +namespace CVC5 { namespace context { class Context; @@ -89,7 +89,7 @@ public: };/* class CDTrailQueue<> */ -}/* CVC4::context namespace */ -}/* CVC4 namespace */ +} // namespace context +} // namespace CVC5 #endif /* CVC4__CONTEXT__CDTRAIL_QUEUE_H */ diff --git a/src/context/context.cpp b/src/context/context.cpp index 06485c0ba..88c783303 100644 --- a/src/context/context.cpp +++ b/src/context/context.cpp @@ -21,8 +21,7 @@ #include "base/check.h" #include "context/context.h" - -namespace CVC4 { +namespace CVC5 { namespace context { @@ -388,5 +387,5 @@ void Scope::enqueueToGarbageCollect(ContextObj* obj) { d_garbage->push_back(obj); } -} /* CVC4::context namespace */ -} /* CVC4 namespace */ +} // namespace context +} // namespace CVC5 diff --git a/src/context/context.h b/src/context/context.h index d9f98b993..7cf72e4d2 100644 --- a/src/context/context.h +++ b/src/context/context.h @@ -29,8 +29,7 @@ #include "base/output.h" #include "context/context_mm.h" - -namespace CVC4 { +namespace CVC5 { namespace context { class Context; @@ -740,7 +739,7 @@ inline void Scope::addToChain(ContextObj* pContextObj) d_pContextObjList = pContextObj; } -}/* CVC4::context namespace */ -}/* CVC4 namespace */ +} // namespace context +} // namespace CVC5 #endif /* CVC4__CONTEXT__CONTEXT_H */ diff --git a/src/context/context_mm.cpp b/src/context/context_mm.cpp index 4d9413320..2a69bc26f 100644 --- a/src/context/context_mm.cpp +++ b/src/context/context_mm.cpp @@ -29,7 +29,7 @@ #include "base/output.h" #include "context/context_mm.h" -namespace CVC4 { +namespace CVC5 { namespace context { #ifndef CVC4_DEBUG_CONTEXT_MEMORY_MANAGER @@ -177,5 +177,5 @@ unsigned ContextMemoryManager::getMaxAllocationSize() #endif /* CVC4_DEBUG_CONTEXT_MEMORY_MANAGER */ -} /* CVC4::context namespace */ -} /* CVC4 namespace */ +} // namespace context +} // namespace CVC5 diff --git a/src/context/context_mm.h b/src/context/context_mm.h index e20b9fdb9..72c2bcd3a 100644 --- a/src/context/context_mm.h +++ b/src/context/context_mm.h @@ -25,7 +25,7 @@ #endif #include -namespace CVC4 { +namespace CVC5 { namespace context { #ifndef CVC4_DEBUG_CONTEXT_MEMORY_MANAGER @@ -261,7 +261,7 @@ inline bool operator!=(const ContextMemoryAllocator& a1, return a1.d_mm != a2.d_mm; } -}/* CVC4::context namespace */ -}/* CVC4 namespace */ +} // namespace context +} // namespace CVC5 #endif /* CVC4__CONTEXT__CONTEXT_MM_H */ diff --git a/src/decision/decision_attributes.h b/src/decision/decision_attributes.h index 918710dc8..be5987e6d 100644 --- a/src/decision/decision_attributes.h +++ b/src/decision/decision_attributes.h @@ -22,15 +22,15 @@ #include "options/decision_weight.h" #include "expr/attribute.h" -namespace CVC4 { +namespace CVC5 { namespace decision { namespace attr { struct DecisionWeightTag {}; -}/* CVC4::decision::attr namespace */ + } // namespace attr typedef expr::Attribute DecisionWeightAttr; -}/* CVC4::decision namespace */ -}/* CVC4 namespace */ +} // namespace decision +} // namespace CVC5 #endif /* CVC4__DECISION__DECISION_ATTRIBUTES_H */ diff --git a/src/decision/decision_engine.cpp b/src/decision/decision_engine.cpp index e535e5415..3196336aa 100644 --- a/src/decision/decision_engine.cpp +++ b/src/decision/decision_engine.cpp @@ -24,7 +24,7 @@ using namespace std; -namespace CVC4 { +namespace CVC5 { DecisionEngine::DecisionEngine(context::Context* sc, context::UserContext* uc, @@ -101,4 +101,4 @@ void DecisionEngine::addSkolemDefinition(TNode lem, TNode skolem) } } -}/* CVC4 namespace */ +} // namespace CVC5 diff --git a/src/decision/decision_engine.h b/src/decision/decision_engine.h index 2e7eaaa76..7405498b5 100644 --- a/src/decision/decision_engine.h +++ b/src/decision/decision_engine.h @@ -28,10 +28,10 @@ #include "prop/sat_solver_types.h" #include "util/result.h" -using namespace CVC4::prop; -using namespace CVC4::decision; +using namespace CVC5::prop; +using namespace CVC5::decision; -namespace CVC4 { +namespace CVC5 { class DecisionEngine { @@ -160,6 +160,6 @@ class DecisionEngine { std::unique_ptr d_enabledITEStrategy; };/* DecisionEngine class */ -}/* CVC4 namespace */ +} // namespace CVC5 #endif /* CVC4__DECISION__DECISION_ENGINE_H */ diff --git a/src/decision/decision_strategy.h b/src/decision/decision_strategy.h index 829ad18a4..6a9353474 100644 --- a/src/decision/decision_strategy.h +++ b/src/decision/decision_strategy.h @@ -25,13 +25,13 @@ #include "prop/sat_solver_types.h" #include "smt/term_formula_removal.h" -namespace CVC4 { +namespace CVC5 { class DecisionEngine; namespace context { class Context; -}/* CVC4::context namespace */ + } // namespace context namespace decision { @@ -65,7 +65,7 @@ public: virtual void addSkolemDefinition(TNode lem, TNode skolem) = 0; };/* class ITEDecisionStrategy */ -}/* CVC4::decision namespace */ -}/* CVC4 namespace */ +} // namespace decision +} // namespace CVC5 #endif /* CVC4__DECISION__DECISION_STRATEGY_H */ diff --git a/src/decision/justification_heuristic.cpp b/src/decision/justification_heuristic.cpp index a313dcf15..f9f9cb7df 100644 --- a/src/decision/justification_heuristic.cpp +++ b/src/decision/justification_heuristic.cpp @@ -28,10 +28,10 @@ #include "theory/rewriter.h" #include "util/random.h" -namespace CVC4 { +namespace CVC5 { namespace decision { -JustificationHeuristic::JustificationHeuristic(CVC4::DecisionEngine* de, +JustificationHeuristic::JustificationHeuristic(CVC5::DecisionEngine* de, context::UserContext* uc, context::Context* c) : ITEDecisionStrategy(de, c), @@ -66,7 +66,7 @@ JustificationHeuristic::~JustificationHeuristic() smtStatisticsRegistry()->unregisterStat(&d_timestat); } -CVC4::prop::SatLiteral JustificationHeuristic::getNext(bool &stopSearch) +CVC5::prop::SatLiteral JustificationHeuristic::getNext(bool& stopSearch) { if(options::decisionThreshold() > 0) { bool stopSearchTmp = false; @@ -82,7 +82,9 @@ CVC4::prop::SatLiteral JustificationHeuristic::getNext(bool &stopSearch) return getNextThresh(stopSearch, 0); } -CVC4::prop::SatLiteral JustificationHeuristic::getNextThresh(bool &stopSearch, DecisionWeight threshold) { +CVC5::prop::SatLiteral JustificationHeuristic::getNextThresh( + bool& stopSearch, DecisionWeight threshold) +{ Trace("decision") << "JustificationHeuristic::getNextThresh(stopSearch, "< StartIndexCache; - StartIndexCache d_startIndexCache; - int getStartIndex(TNode node); - void saveStartIndex(TNode node, int val); - - /* Compute all term-removal skolems in a node recursively */ - void computeSkolems(TNode n, SkolemList& l); - - SearchResult handleAndOrEasy(TNode node, prop::SatValue desiredVal); - SearchResult handleAndOrHard(TNode node, prop::SatValue desiredVal); - SearchResult handleBinaryEasy(TNode node1, - prop::SatValue desiredVal1, - TNode node2, - prop::SatValue desiredVal2); - SearchResult handleBinaryHard(TNode node1, - prop::SatValue desiredVal1, - TNode node2, - prop::SatValue desiredVal2); - SearchResult handleITE(TNode node, prop::SatValue desiredVal); - SearchResult handleEmbeddedSkolems(TNode node); + JustificationHeuristic(CVC5::DecisionEngine* de, + context::UserContext* uc, + context::Context* c); + + ~JustificationHeuristic(); + + prop::SatLiteral getNext(bool& stopSearch) override; + + /** + * Notify this class that assertion is an (input) assertion, not corresponding + * to a skolem definition. + */ + void addAssertion(TNode assertion) override; + /** + * Notify this class that lem is the skolem definition for skolem, which is + * a part of the current assertions. + */ + void addSkolemDefinition(TNode lem, TNode skolem) override; + +private: + /* getNext with an option to specify threshold */ + prop::SatLiteral getNextThresh(bool& stopSearch, DecisionWeight threshold); + + prop::SatLiteral findSplitter(TNode node, prop::SatValue desiredVal); + + /** + * Do all the hard work. + */ + SearchResult findSplitterRec(TNode node, prop::SatValue value); + + /* Helper functions */ + void setJustified(TNode); + bool checkJustified(TNode); + DecisionWeight getExploredThreshold(TNode); + void setExploredThreshold(TNode); + void setPrvsIndex(int); + int getPrvsIndex(); + DecisionWeight getWeightPolarized(TNode n, bool polarity); + DecisionWeight getWeightPolarized(TNode n, prop::SatValue); + static DecisionWeight getWeight(TNode); + bool compareByWeightFalse(TNode, TNode); + bool compareByWeightTrue(TNode, TNode); + TNode getChildByWeight(TNode n, int i, bool polarity); + + /* If literal exists corresponding to the node return + that. Otherwise an UNKNOWN */ + prop::SatValue tryGetSatValue(Node n); + + /* Get list of all term-ITEs for the atomic formula v */ + JustificationHeuristic::SkolemList getSkolems(TNode n); + + /** + * For big and/or nodes, a cache to save starting index into children + * for efficiently. + */ + typedef context::CDHashMap StartIndexCache; + StartIndexCache d_startIndexCache; + int getStartIndex(TNode node); + void saveStartIndex(TNode node, int val); + + /* Compute all term-removal skolems in a node recursively */ + void computeSkolems(TNode n, SkolemList& l); + + SearchResult handleAndOrEasy(TNode node, prop::SatValue desiredVal); + SearchResult handleAndOrHard(TNode node, prop::SatValue desiredVal); + SearchResult handleBinaryEasy(TNode node1, + prop::SatValue desiredVal1, + TNode node2, + prop::SatValue desiredVal2); + SearchResult handleBinaryHard(TNode node1, + prop::SatValue desiredVal1, + TNode node2, + prop::SatValue desiredVal2); + SearchResult handleITE(TNode node, prop::SatValue desiredVal); + SearchResult handleEmbeddedSkolems(TNode node); };/* class JustificationHeuristic */ }/* namespace decision */ -}/* namespace CVC4 */ +} // namespace CVC5 #endif /* CVC4__DECISION__JUSTIFICATION_HEURISTIC */ diff --git a/src/expr/array_store_all.cpp b/src/expr/array_store_all.cpp index 6d14ac40d..d50921598 100644 --- a/src/expr/array_store_all.cpp +++ b/src/expr/array_store_all.cpp @@ -26,7 +26,7 @@ using namespace std; -namespace CVC4 { +namespace CVC5 { ArrayStoreAll::ArrayStoreAll(const TypeNode& type, const Node& value) : d_type(), d_value() @@ -115,4 +115,4 @@ size_t ArrayStoreAllHashFunction::operator()(const ArrayStoreAll& asa) const { * NodeHashFunction()(asa.getValue()); } -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/expr/array_store_all.h b/src/expr/array_store_all.h index dac967668..974f456ef 100644 --- a/src/expr/array_store_all.h +++ b/src/expr/array_store_all.h @@ -24,8 +24,7 @@ #include #include - -namespace CVC4 { +namespace CVC5 { template class NodeTemplate; @@ -70,6 +69,6 @@ struct ArrayStoreAllHashFunction size_t operator()(const ArrayStoreAll& asa) const; }; /* struct ArrayStoreAllHashFunction */ -} // namespace CVC4 +} // namespace CVC5 #endif /* CVC4__ARRAY_STORE_ALL_H */ diff --git a/src/expr/ascription_type.cpp b/src/expr/ascription_type.cpp index 6f50568f1..6fecb2978 100644 --- a/src/expr/ascription_type.cpp +++ b/src/expr/ascription_type.cpp @@ -18,7 +18,7 @@ #include "expr/type_node.h" -namespace CVC4 { +namespace CVC5 { AscriptionType::AscriptionType(TypeNode t) : d_type(new TypeNode(t)) {} @@ -55,4 +55,4 @@ std::ostream& operator<<(std::ostream& out, AscriptionType at) return out; } -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/expr/ascription_type.h b/src/expr/ascription_type.h index 66f376b18..5b0ff2b71 100644 --- a/src/expr/ascription_type.h +++ b/src/expr/ascription_type.h @@ -22,7 +22,7 @@ #include #include -namespace CVC4 { +namespace CVC5 { class TypeNode; @@ -60,6 +60,6 @@ struct AscriptionTypeHashFunction /** An output routine for AscriptionTypes */ std::ostream& operator<<(std::ostream& out, AscriptionType at); -}/* CVC4 namespace */ +} // namespace CVC5 #endif /* CVC4__ASCRIPTION_TYPE_H */ diff --git a/src/expr/attribute.cpp b/src/expr/attribute.cpp index 5973aab17..fe1bff897 100644 --- a/src/expr/attribute.cpp +++ b/src/expr/attribute.cpp @@ -22,7 +22,7 @@ using namespace std; -namespace CVC4 { +namespace CVC5 { namespace expr { namespace attr { @@ -114,6 +114,6 @@ void AttributeManager::deleteAttributes(const AttrIdVec& atids) { } } -}/* CVC4::expr::attr namespace */ -}/* CVC4::expr namespace */ -}/* CVC4 namespace */ +} // namespace attr +} // namespace expr +} // namespace CVC5 diff --git a/src/expr/attribute.h b/src/expr/attribute.h index 9a1f4682e..b3a3eb717 100644 --- a/src/expr/attribute.h +++ b/src/expr/attribute.h @@ -32,7 +32,7 @@ #include "expr/attribute_internals.h" #undef CVC4_ATTRIBUTE_H__INCLUDING__ATTRIBUTE_INTERNALS_H -namespace CVC4 { +namespace CVC5 { namespace expr { namespace attr { @@ -218,7 +218,7 @@ public: void debugHook(int debugFlag); }; -}/* CVC4::expr::attr namespace */ +} // namespace attr // MAPPING OF ATTRIBUTE KINDS TO TABLES IN THE ATTRIBUTE MANAGER =============== @@ -318,7 +318,7 @@ struct getTable { } }; -}/* CVC4::expr::attr namespace */ +} // namespace attr // ATTRIBUTE MANAGER IMPLEMENTATIONS =========================================== @@ -540,9 +540,8 @@ void AttributeManager::reconstructTable(AttrHash& table){ d_inGarbageCollection = false; } - -}/* CVC4::expr::attr namespace */ -}/* CVC4::expr namespace */ +} // namespace attr +} // namespace expr template inline typename AttrKind::value_type @@ -622,6 +621,6 @@ NodeManager::setAttribute(TypeNode n, const AttrKind&, d_attrManager->setAttribute(n.d_nv, AttrKind(), value); } -}/* CVC4 namespace */ +} // namespace CVC5 #endif /* CVC4__EXPR__ATTRIBUTE_H */ diff --git a/src/expr/attribute_internals.h b/src/expr/attribute_internals.h index 271c34d3c..bbd5455be 100644 --- a/src/expr/attribute_internals.h +++ b/src/expr/attribute_internals.h @@ -25,7 +25,7 @@ #include -namespace CVC4 { +namespace CVC5 { namespace expr { // ATTRIBUTE HASH FUNCTIONS ==================================================== @@ -54,7 +54,7 @@ struct AttrBoolHashFunction { } };/* struct AttrBoolHashFunction */ -}/* CVC4::expr::attr namespace */ +} // namespace attr // ATTRIBUTE TYPE MAPPINGS ===================================================== @@ -131,7 +131,7 @@ struct KindValueToTableValueMapping< static T convertBack(const uint64_t& t) { return static_cast(t); } }; -}/* CVC4::expr::attr namespace */ +} // namespace attr // ATTRIBUTE HASH TABLES ======================================================= @@ -363,7 +363,7 @@ public: } };/* class AttrHash */ -}/* CVC4::expr::attr namespace */ +} // namespace attr // ATTRIBUTE IDENTIFIER ASSIGNMENT TEMPLATE ==================================== @@ -393,7 +393,7 @@ struct LastAttributeId { } }; -}/* CVC4::expr::attr namespace */ +} // namespace attr // ATTRIBUTE DEFINITION ======================================================== @@ -511,7 +511,7 @@ template const uint64_t Attribute::s_id = Attribute::registerAttribute(); -}/* CVC4::expr namespace */ -}/* CVC4 namespace */ +} // namespace expr +} // namespace CVC5 #endif /* CVC4__EXPR__ATTRIBUTE_INTERNALS_H */ diff --git a/src/expr/attribute_unique_id.h b/src/expr/attribute_unique_id.h index 247e0b1f1..f084baaa1 100644 --- a/src/expr/attribute_unique_id.h +++ b/src/expr/attribute_unique_id.h @@ -21,7 +21,7 @@ // ATTRIBUTE IDs ============================================================ -namespace CVC4 { +namespace CVC5 { namespace expr { namespace attr { @@ -59,8 +59,8 @@ public: AttrTableId getTableId() const{ return d_tableId; } uint64_t getWithinTypeId() const{ return d_withinTypeId; } -};/* CVC4::expr::attr::AttributeUniqueId */ +}; /* CVC5::expr::attr::AttributeUniqueId */ -}/* CVC4::expr::attr namespace */ -}/* CVC4::expr namespace */ -}/* CVC4 namespace */ +} // namespace attr +} // namespace expr +} // namespace CVC5 diff --git a/src/expr/bound_var_manager.cpp b/src/expr/bound_var_manager.cpp index 36b824c31..ca257d313 100644 --- a/src/expr/bound_var_manager.cpp +++ b/src/expr/bound_var_manager.cpp @@ -16,7 +16,7 @@ #include "expr/node_manager_attributes.h" -namespace CVC4 { +namespace CVC5 { BoundVarManager::BoundVarManager() : d_keepCacheVals(false) {} @@ -53,4 +53,4 @@ Node BoundVarManager::getCacheValue(TNode cv, size_t i) return getCacheValue(cv, getCacheValue(i)); } -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/expr/bound_var_manager.h b/src/expr/bound_var_manager.h index 16ff97cce..08705f6d2 100644 --- a/src/expr/bound_var_manager.h +++ b/src/expr/bound_var_manager.h @@ -22,7 +22,7 @@ #include "expr/node.h" -namespace CVC4 { +namespace CVC5 { /** * Bound variable manager. @@ -98,6 +98,6 @@ class BoundVarManager std::unordered_set d_cacheVals; }; -} // namespace CVC4 +} // namespace CVC5 #endif /* CVC4__EXPR__BOUND_VAR_MANAGER_H */ diff --git a/src/expr/buffered_proof_generator.cpp b/src/expr/buffered_proof_generator.cpp index b1abee0d0..caf6b0841 100644 --- a/src/expr/buffered_proof_generator.cpp +++ b/src/expr/buffered_proof_generator.cpp @@ -17,7 +17,7 @@ #include "expr/proof.h" #include "expr/proof_node_manager.h" -namespace CVC4 { +namespace CVC5 { BufferedProofGenerator::BufferedProofGenerator(context::Context* c, ProofNodeManager* pnm) @@ -80,4 +80,4 @@ std::shared_ptr BufferedProofGenerator::getProofFor(Node fact) return cdp.getProofFor(fact); } -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/expr/buffered_proof_generator.h b/src/expr/buffered_proof_generator.h index 4b46aa56a..db8e50274 100644 --- a/src/expr/buffered_proof_generator.h +++ b/src/expr/buffered_proof_generator.h @@ -20,7 +20,7 @@ #include "context/cdhashmap.h" #include "expr/proof_generator.h" -namespace CVC4 { +namespace CVC5 { class ProofNodeManager; class ProofStep; @@ -57,6 +57,6 @@ class BufferedProofGenerator : public ProofGenerator ProofNodeManager* d_pnm; }; -} // namespace CVC4 +} // namespace CVC5 #endif /* CVC4__EXPR__BUFFERED_PROOF_GENERATOR_H */ diff --git a/src/expr/datatype_index.cpp b/src/expr/datatype_index.cpp index 5f9d782ad..2459c86d8 100644 --- a/src/expr/datatype_index.cpp +++ b/src/expr/datatype_index.cpp @@ -20,7 +20,7 @@ using namespace std; -namespace CVC4 { +namespace CVC5 { DatatypeIndexConstant::DatatypeIndexConstant(uint32_t index) : d_index(index) {} std::ostream& operator<<(std::ostream& out, const DatatypeIndexConstant& dic) @@ -34,4 +34,4 @@ size_t DatatypeIndexConstantHashFunction::operator()( return IntegerHashFunction()(dic.getIndex()); } -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/expr/datatype_index.h b/src/expr/datatype_index.h index 6020759fb..08d33ca83 100644 --- a/src/expr/datatype_index.h +++ b/src/expr/datatype_index.h @@ -19,7 +19,7 @@ #include -namespace CVC4 { +namespace CVC5 { /* stores an index to Datatype residing in NodeManager */ class DatatypeIndexConstant @@ -64,6 +64,6 @@ struct DatatypeIndexConstantHashFunction size_t operator()(const DatatypeIndexConstant& dic) const; }; /* struct DatatypeIndexConstantHashFunction */ -} // namespace CVC4 +} // namespace CVC5 #endif /* CVC4__DATATYPE_H */ diff --git a/src/expr/dtype.cpp b/src/expr/dtype.cpp index 162afd84a..35ad5ff4c 100644 --- a/src/expr/dtype.cpp +++ b/src/expr/dtype.cpp @@ -19,9 +19,9 @@ #include "expr/node_algorithm.h" #include "expr/type_matcher.h" -using namespace CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { DType::DType(std::string name, bool isCo) : d_name(name), @@ -954,4 +954,4 @@ std::ostream& operator<<(std::ostream& out, const DTypeIndexConstant& dic) return out << "index_" << dic.getIndex(); } -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/expr/dtype.h b/src/expr/dtype.h index 18694bf64..5b6ec4a7d 100644 --- a/src/expr/dtype.h +++ b/src/expr/dtype.h @@ -24,7 +24,7 @@ #include "expr/node.h" #include "expr/type_node.h" -namespace CVC4 { +namespace CVC5 { // ----------------------- datatype attributes /** @@ -696,6 +696,6 @@ struct DTypeIndexConstantHashFunction std::ostream& operator<<(std::ostream& os, const DType& dt); -} // namespace CVC4 +} // namespace CVC5 #endif diff --git a/src/expr/dtype_cons.cpp b/src/expr/dtype_cons.cpp index d02435465..089d41637 100644 --- a/src/expr/dtype_cons.cpp +++ b/src/expr/dtype_cons.cpp @@ -18,10 +18,10 @@ #include "expr/type_matcher.h" #include "options/datatypes_options.h" -using namespace CVC4::kind; -using namespace CVC4::theory; +using namespace CVC5::kind; +using namespace CVC5::theory; -namespace CVC4 { +namespace CVC5 { DTypeConstructor::DTypeConstructor(std::string name, unsigned weight) @@ -693,4 +693,4 @@ std::ostream& operator<<(std::ostream& os, const DTypeConstructor& ctor) return os; } -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/expr/dtype_cons.h b/src/expr/dtype_cons.h index dd9fc6a0b..245d461b0 100644 --- a/src/expr/dtype_cons.h +++ b/src/expr/dtype_cons.h @@ -24,7 +24,7 @@ #include "expr/node.h" #include "expr/type_node.h" -namespace CVC4 { +namespace CVC5 { /** * The Node-level representation of a constructor for a datatype, which @@ -371,6 +371,6 @@ struct DTypeConstructorHashFunction std::ostream& operator<<(std::ostream& os, const DTypeConstructor& ctor); -} // namespace CVC4 +} // namespace CVC5 #endif diff --git a/src/expr/dtype_selector.cpp b/src/expr/dtype_selector.cpp index 522e6b4c1..a276c3734 100644 --- a/src/expr/dtype_selector.cpp +++ b/src/expr/dtype_selector.cpp @@ -16,9 +16,9 @@ #include "options/set_language.h" -using namespace CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { DTypeSelector::DTypeSelector(std::string name, Node selector) : d_name(name), d_selector(selector), d_resolved(false) @@ -83,4 +83,4 @@ std::ostream& operator<<(std::ostream& os, const DTypeSelector& arg) return os; } -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/expr/dtype_selector.h b/src/expr/dtype_selector.h index b134c7f7d..7404c0c96 100644 --- a/src/expr/dtype_selector.h +++ b/src/expr/dtype_selector.h @@ -21,7 +21,7 @@ #include "expr/node.h" #include "expr/type_node.h" -namespace CVC4 { +namespace CVC5 { class DatatypeConstructorArg; class DType; @@ -90,6 +90,6 @@ class DTypeSelector std::ostream& operator<<(std::ostream& os, const DTypeSelector& arg); -} // namespace CVC4 +} // namespace CVC5 #endif diff --git a/src/expr/emptybag.cpp b/src/expr/emptybag.cpp index d23ccef09..0f7a3a73e 100644 --- a/src/expr/emptybag.cpp +++ b/src/expr/emptybag.cpp @@ -18,7 +18,7 @@ #include "expr/type_node.h" -namespace CVC4 { +namespace CVC5 { std::ostream& operator<<(std::ostream& out, const EmptyBag& asa) { @@ -64,4 +64,4 @@ bool EmptyBag::operator<=(const EmptyBag& es) const bool EmptyBag::operator>(const EmptyBag& es) const { return !(*this <= es); } bool EmptyBag::operator>=(const EmptyBag& es) const { return !(*this < es); } -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/expr/emptybag.h b/src/expr/emptybag.h index e9763108e..59060eaa8 100644 --- a/src/expr/emptybag.h +++ b/src/expr/emptybag.h @@ -20,7 +20,7 @@ #include #include -namespace CVC4 { +namespace CVC5 { class TypeNode; @@ -58,6 +58,6 @@ struct EmptyBagHashFunction size_t operator()(const EmptyBag& es) const; }; /* struct EmptyBagHashFunction */ -} // namespace CVC4 +} // namespace CVC5 #endif /* CVC4__EMPTY_BAG_H */ diff --git a/src/expr/emptyset.cpp b/src/expr/emptyset.cpp index 97a986054..4a0bd4e51 100644 --- a/src/expr/emptyset.cpp +++ b/src/expr/emptyset.cpp @@ -21,7 +21,7 @@ #include "expr/type_node.h" -namespace CVC4 { +namespace CVC5 { std::ostream& operator<<(std::ostream& out, const EmptySet& asa) { return out << "emptyset(" << asa.getType() << ')'; @@ -64,4 +64,4 @@ bool EmptySet::operator<=(const EmptySet& es) const bool EmptySet::operator>(const EmptySet& es) const { return !(*this <= es); } bool EmptySet::operator>=(const EmptySet& es) const { return !(*this < es); } -}/* CVC4 namespace */ +} // namespace CVC5 diff --git a/src/expr/emptyset.h b/src/expr/emptyset.h index 1c441e519..febb4e111 100644 --- a/src/expr/emptyset.h +++ b/src/expr/emptyset.h @@ -23,7 +23,7 @@ #include #include -namespace CVC4 { +namespace CVC5 { class TypeNode; @@ -60,6 +60,6 @@ struct EmptySetHashFunction size_t operator()(const EmptySet& es) const; }; /* struct EmptySetHashFunction */ -} // namespace CVC4 +} // namespace CVC5 #endif /* CVC4__EMPTY_SET_H */ diff --git a/src/expr/expr_iomanip.cpp b/src/expr/expr_iomanip.cpp index 82ac83d33..4aec28b85 100644 --- a/src/expr/expr_iomanip.cpp +++ b/src/expr/expr_iomanip.cpp @@ -22,7 +22,7 @@ #include "options/options.h" #include "options/expr_options.h" -namespace CVC4 { +namespace CVC5 { namespace expr { const int ExprSetDepth::s_iosIndex = std::ios_base::xalloc(); @@ -122,6 +122,5 @@ std::ostream& operator<<(std::ostream& out, ExprSetDepth sd) { return out; } - -}/* namespace CVC4::expr */ -}/* namespace CVC4 */ +} // namespace expr +} // namespace CVC5 diff --git a/src/expr/expr_iomanip.h b/src/expr/expr_iomanip.h index 5306e2a2b..c40840cd4 100644 --- a/src/expr/expr_iomanip.h +++ b/src/expr/expr_iomanip.h @@ -21,7 +21,7 @@ #include -namespace CVC4 { +namespace CVC5 { namespace expr { /** @@ -171,8 +171,8 @@ std::ostream& operator<<(std::ostream& out, ExprDag d); */ std::ostream& operator<<(std::ostream& out, ExprSetDepth sd); -}/* namespace CVC4::expr */ +} // namespace expr -}/* CVC4 namespace */ +} // namespace CVC5 #endif /* CVC4__EXPR__EXPR_IOMANIP_H */ diff --git a/src/expr/kind_map.h b/src/expr/kind_map.h index d118b7077..e6f6f9ca0 100644 --- a/src/expr/kind_map.h +++ b/src/expr/kind_map.h @@ -25,7 +25,7 @@ #include "base/check.h" #include "expr/kind.h" -namespace CVC4 { +namespace CVC5 { /** A very simple bitmap for Kinds */ class KindMap @@ -51,6 +51,6 @@ class KindMap std::bitset d_bits; }; -} // namespace CVC4 +} // namespace CVC5 #endif /* CVC4__KIND_MAP_H */ diff --git a/src/expr/kind_template.cpp b/src/expr/kind_template.cpp index 0aff7a79b..cbe979642 100644 --- a/src/expr/kind_template.cpp +++ b/src/expr/kind_template.cpp @@ -19,12 +19,12 @@ #include "expr/kind.h" -namespace CVC4 { +namespace CVC5 { namespace kind { -const char* toString(CVC4::Kind k) +const char* toString(CVC5::Kind k) { - using namespace CVC4::kind; + using namespace CVC5::kind; switch (k) { @@ -37,7 +37,7 @@ const char* toString(CVC4::Kind k) } } -std::ostream& operator<<(std::ostream& out, CVC4::Kind k) +std::ostream& operator<<(std::ostream& out, CVC5::Kind k) { out << toString(k); return out; @@ -47,7 +47,8 @@ std::ostream& operator<<(std::ostream& out, CVC4::Kind k) * decide whether it's safe to modify big expressions by changing the grouping of * the arguments. */ /* TODO: This could be generated. */ -bool isAssociative(::CVC4::Kind k) { +bool isAssociative(::CVC5::Kind k) +{ switch(k) { case kind::AND: case kind::OR: @@ -60,13 +61,14 @@ bool isAssociative(::CVC4::Kind k) { } } -std::string kindToString(::CVC4::Kind k) { +std::string kindToString(::CVC5::Kind k) +{ std::stringstream ss; ss << k; return ss.str(); } -}/* CVC4::kind namespace */ +} // namespace kind std::ostream& operator<<(std::ostream& out, TypeConstant typeConstant) { switch(typeConstant) { @@ -80,7 +82,8 @@ ${type_constant_descriptions} namespace theory { -TheoryId kindToTheoryId(::CVC4::Kind k) { +TheoryId kindToTheoryId(::CVC5::Kind k) +{ switch(k) { case kind::UNDEFINED_KIND: case kind::NULL_EXPR: @@ -92,7 +95,7 @@ ${kind_to_theory_id} throw IllegalArgumentException("", "k", __PRETTY_FUNCTION__, "bad kind"); } -TheoryId typeConstantToTheoryId(::CVC4::TypeConstant typeConstant) +TheoryId typeConstantToTheoryId(::CVC5::TypeConstant typeConstant) { switch (typeConstant) { @@ -103,5 +106,5 @@ ${type_constant_to_theory_id} "", "k", __PRETTY_FUNCTION__, "bad type constant"); } -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace theory +} // namespace CVC5 diff --git a/src/expr/kind_template.h b/src/expr/kind_template.h index ccb7656a9..4661cfa15 100644 --- a/src/expr/kind_template.h +++ b/src/expr/kind_template.h @@ -24,7 +24,7 @@ #include "base/exception.h" #include "theory/theory_id.h" -namespace CVC4 { +namespace CVC5 { namespace kind { enum Kind_t @@ -35,11 +35,11 @@ enum Kind_t }; /* enum Kind_t */ -}/* CVC4::kind namespace */ +} // namespace kind // import Kind into the "CVC4" namespace but keep the individual kind // constants under kind:: -typedef ::CVC4::kind::Kind_t Kind; +typedef ::CVC5::kind::Kind_t Kind; namespace kind { @@ -52,7 +52,7 @@ namespace kind { * @param k The kind * @return The name of the kind */ -const char* toString(CVC4::Kind k); +const char* toString(CVC5::Kind k); /** * Writes a kind name to a stream. @@ -61,22 +61,20 @@ const char* toString(CVC4::Kind k); * @param k The kind to write to the stream * @return The stream */ -std::ostream& operator<<(std::ostream&, CVC4::Kind); +std::ostream& operator<<(std::ostream&, CVC5::Kind); /** Returns true if the given kind is associative. This is used by ExprManager to * decide whether it's safe to modify big expressions by changing the grouping of * the arguments. */ /* TODO: This could be generated. */ -bool isAssociative(::CVC4::Kind k); -std::string kindToString(::CVC4::Kind k); +bool isAssociative(::CVC5::Kind k); +std::string kindToString(::CVC5::Kind k); struct KindHashFunction { - inline size_t operator()(::CVC4::Kind k) const { - return k; - } + inline size_t operator()(::CVC5::Kind k) const { return k; } };/* struct KindHashFunction */ -}/* CVC4::kind namespace */ +} // namespace kind /** * The enumeration for the built-in atomic types. @@ -99,11 +97,11 @@ std::ostream& operator<<(std::ostream& out, TypeConstant typeConstant); namespace theory { -::CVC4::theory::TheoryId kindToTheoryId(::CVC4::Kind k); -::CVC4::theory::TheoryId typeConstantToTheoryId( - ::CVC4::TypeConstant typeConstant); +::CVC5::theory::TheoryId kindToTheoryId(::CVC5::Kind k); +::CVC5::theory::TheoryId typeConstantToTheoryId( + ::CVC5::TypeConstant typeConstant); -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace theory +} // namespace CVC5 #endif /* CVC4__KIND_H */ diff --git a/src/expr/lazy_proof.cpp b/src/expr/lazy_proof.cpp index 3f333eeab..701cc55dc 100644 --- a/src/expr/lazy_proof.cpp +++ b/src/expr/lazy_proof.cpp @@ -18,9 +18,9 @@ #include "expr/proof_node.h" #include "expr/proof_node_manager.h" -using namespace CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { LazyCDProof::LazyCDProof(ProofNodeManager* pnm, ProofGenerator* dpg, @@ -228,4 +228,4 @@ bool LazyCDProof::hasGenerator(Node fact) const return it != d_gens.end(); } -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/expr/lazy_proof.h b/src/expr/lazy_proof.h index 989fd55dc..5c0de5c5b 100644 --- a/src/expr/lazy_proof.h +++ b/src/expr/lazy_proof.h @@ -19,7 +19,7 @@ #include "expr/proof.h" -namespace CVC4 { +namespace CVC5 { class ProofGenerator; class ProofNodeManager; @@ -105,6 +105,6 @@ class LazyCDProof : public CDProof ProofGenerator* getGeneratorFor(Node fact, bool& isSym); }; -} // namespace CVC4 +} // namespace CVC5 #endif /* CVC4__EXPR__LAZY_PROOF_H */ diff --git a/src/expr/lazy_proof_chain.cpp b/src/expr/lazy_proof_chain.cpp index e6fba747e..3651e53e1 100644 --- a/src/expr/lazy_proof_chain.cpp +++ b/src/expr/lazy_proof_chain.cpp @@ -21,7 +21,7 @@ #include "expr/proof_node_manager.h" #include "options/proof_options.h" -namespace CVC4 { +namespace CVC5 { LazyCDProofChain::LazyCDProofChain(ProofNodeManager* pnm, bool cyclic, @@ -317,4 +317,4 @@ ProofGenerator* LazyCDProofChain::getGeneratorForInternal(Node fact, bool& rec) std::string LazyCDProofChain::identify() const { return "LazyCDProofChain"; } -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/expr/lazy_proof_chain.h b/src/expr/lazy_proof_chain.h index 4c21eea99..7482e3ca4 100644 --- a/src/expr/lazy_proof_chain.h +++ b/src/expr/lazy_proof_chain.h @@ -22,7 +22,7 @@ #include "context/cdhashmap.h" #include "expr/proof_generator.h" -namespace CVC4 { +namespace CVC5 { class ProofNodeManager; @@ -148,6 +148,6 @@ class LazyCDProofChain : public ProofGenerator ProofGenerator* d_defGen; }; -} // namespace CVC4 +} // namespace CVC5 #endif /* CVC4__EXPR__LAZY_PROOF_CHAIN_H */ diff --git a/src/expr/match_trie.cpp b/src/expr/match_trie.cpp index f2465e030..d3adeb50e 100644 --- a/src/expr/match_trie.cpp +++ b/src/expr/match_trie.cpp @@ -14,9 +14,9 @@ #include "expr/match_trie.h" -using namespace CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace expr { bool MatchTrie::getMatches(Node n, NotifyMatch* ntm) @@ -196,4 +196,4 @@ void MatchTrie::clear() } } // namespace expr -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/expr/match_trie.h b/src/expr/match_trie.h index 976b70fba..45ff0c0c7 100644 --- a/src/expr/match_trie.h +++ b/src/expr/match_trie.h @@ -22,7 +22,7 @@ #include "expr/node.h" -namespace CVC4 { +namespace CVC5 { namespace expr { /** A virtual class for notifications regarding matches. */ @@ -77,6 +77,6 @@ class MatchTrie }; } // namespace expr -} // namespace CVC4 +} // namespace CVC5 #endif /* CVC4__THEORY__QUANTIFIERS__CANDIDATE_REWRITE_FILTER_H */ diff --git a/src/expr/metakind_template.cpp b/src/expr/metakind_template.cpp index 6e76c0da3..2f147b8b4 100644 --- a/src/expr/metakind_template.cpp +++ b/src/expr/metakind_template.cpp @@ -19,7 +19,7 @@ #include -namespace CVC4 { +namespace CVC5 { namespace kind { /** @@ -41,31 +41,32 @@ ${metakind_kinds} return metaKinds[k + 1]; }/* metaKindOf(k) */ -}/* CVC4::kind namespace */ +} // namespace kind namespace expr { ${metakind_constantMaps} -}/* CVC4::expr namespace */ +} // namespace expr namespace kind { namespace metakind { -size_t NodeValueCompare::constHash(const ::CVC4::expr::NodeValue* nv) +size_t NodeValueCompare::constHash(const ::CVC5::expr::NodeValue* nv) { Assert(nv->getMetaKind() == kind::metakind::CONSTANT); switch (nv->d_kind) { ${metakind_constHashes} - default: Unhandled() << ::CVC4::expr::NodeValue::dKindToKind(nv->d_kind); +default: Unhandled() << ::CVC5::expr::NodeValue::dKindToKind(nv->d_kind); } } template -bool NodeValueCompare::compare(const ::CVC4::expr::NodeValue* nv1, - const ::CVC4::expr::NodeValue* nv2) { +bool NodeValueCompare::compare(const ::CVC5::expr::NodeValue* nv1, + const ::CVC5::expr::NodeValue* nv2) +{ if(nv1->d_kind != nv2->d_kind) { return false; } @@ -75,7 +76,7 @@ bool NodeValueCompare::compare(const ::CVC4::expr::NodeValue* nv1, switch (nv1->d_kind) { ${metakind_compares} - default: Unhandled() << ::CVC4::expr::NodeValue::dKindToKind(nv1->d_kind); +default: Unhandled() << ::CVC5::expr::NodeValue::dKindToKind(nv1->d_kind); } } @@ -83,9 +84,9 @@ ${metakind_compares} return false; } - ::CVC4::expr::NodeValue::const_nv_iterator i = nv1->nv_begin(); - ::CVC4::expr::NodeValue::const_nv_iterator j = nv2->nv_begin(); - ::CVC4::expr::NodeValue::const_nv_iterator i_end = nv1->nv_end(); + ::CVC5::expr::NodeValue::const_nv_iterator i = nv1->nv_begin(); + ::CVC5::expr::NodeValue::const_nv_iterator j = nv2->nv_begin(); + ::CVC5::expr::NodeValue::const_nv_iterator i_end = nv1->nv_end(); while(i != i_end) { if((*i) != (*j)) { @@ -98,19 +99,20 @@ ${metakind_compares} return true; } -template bool NodeValueCompare::compare(const ::CVC4::expr::NodeValue* nv1, - const ::CVC4::expr::NodeValue* nv2); -template bool NodeValueCompare::compare(const ::CVC4::expr::NodeValue* nv1, - const ::CVC4::expr::NodeValue* nv2); +template bool NodeValueCompare::compare( + const ::CVC5::expr::NodeValue* nv1, const ::CVC5::expr::NodeValue* nv2); +template bool NodeValueCompare::compare( + const ::CVC5::expr::NodeValue* nv1, const ::CVC5::expr::NodeValue* nv2); void NodeValueConstPrinter::toStream(std::ostream& out, - const ::CVC4::expr::NodeValue* nv) { + const ::CVC5::expr::NodeValue* nv) +{ Assert(nv->getMetaKind() == kind::metakind::CONSTANT); switch (nv->d_kind) { ${metakind_constPrinters} - default: Unhandled() << ::CVC4::expr::NodeValue::dKindToKind(nv->d_kind); +default: Unhandled() << ::CVC5::expr::NodeValue::dKindToKind(nv->d_kind); } } @@ -134,20 +136,21 @@ void NodeValueConstPrinter::toStream(std::ostream& out, TNode n) { * This doesn't support "non-inlined" NodeValues, which shouldn't need this * kind of cleanup. */ -void deleteNodeValueConstant(::CVC4::expr::NodeValue* nv) { +void deleteNodeValueConstant(::CVC5::expr::NodeValue* nv) +{ Assert(nv->getMetaKind() == kind::metakind::CONSTANT); switch (nv->d_kind) { ${metakind_constDeleters} - default: Unhandled() << ::CVC4::expr::NodeValue::dKindToKind(nv->d_kind); +default: Unhandled() << ::CVC5::expr::NodeValue::dKindToKind(nv->d_kind); } } // re-enable the strict-aliasing warning # pragma GCC diagnostic warning "-Wstrict-aliasing" -uint32_t getMinArityForKind(::CVC4::Kind k) +uint32_t getMinArityForKind(::CVC5::Kind k) { static const unsigned lbs[] = { 0, /* NULL_EXPR */ @@ -159,7 +162,7 @@ ${metakind_lbchildren} return lbs[k]; } -uint32_t getMaxArityForKind(::CVC4::Kind k) +uint32_t getMaxArityForKind(::CVC5::Kind k) { static const unsigned ubs[] = { 0, /* NULL_EXPR */ @@ -177,7 +180,8 @@ ${metakind_ubchildren} * example, since the kind of functions is just VARIABLE, it should map * VARIABLE to APPLY_UF. */ -Kind operatorToKind(::CVC4::expr::NodeValue* nv) { +Kind operatorToKind(::CVC5::expr::NodeValue* nv) +{ if(nv->getKind() == kind::BUILTIN) { return nv->getConst(); } else if(nv->getKind() == kind::LAMBDA) { @@ -192,5 +196,5 @@ ${metakind_operatorKinds} }; } -}/* CVC4::kind namespace */ -}/* CVC4 namespace */ +} // namespace kind +} // namespace CVC5 diff --git a/src/expr/metakind_template.h b/src/expr/metakind_template.h index 42b7da248..ba1b47b4a 100644 --- a/src/expr/metakind_template.h +++ b/src/expr/metakind_template.h @@ -24,11 +24,11 @@ #include "base/check.h" #include "expr/kind.h" -namespace CVC4 { +namespace CVC5 { namespace expr { class NodeValue; -}/* CVC4::expr namespace */ + } // namespace expr namespace kind { namespace metakind { @@ -74,16 +74,16 @@ struct ConstantMapReverse; */ template struct NodeValueConstCompare { - inline static bool compare(const ::CVC4::expr::NodeValue* x, - const ::CVC4::expr::NodeValue* y); - inline static size_t constHash(const ::CVC4::expr::NodeValue* nv); + inline static bool compare(const ::CVC5::expr::NodeValue* x, + const ::CVC5::expr::NodeValue* y); + inline static size_t constHash(const ::CVC5::expr::NodeValue* nv); };/* NodeValueConstCompare */ struct NodeValueCompare { template - static bool compare(const ::CVC4::expr::NodeValue* nv1, - const ::CVC4::expr::NodeValue* nv2); - static size_t constHash(const ::CVC4::expr::NodeValue* nv); + static bool compare(const ::CVC5::expr::NodeValue* nv1, + const ::CVC5::expr::NodeValue* nv2); + static size_t constHash(const ::CVC5::expr::NodeValue* nv); };/* struct NodeValueCompare */ /** @@ -102,29 +102,29 @@ enum MetaKind_t { NULLARY_OPERATOR /**< nullary operator */ };/* enum MetaKind_t */ -}/* CVC4::kind::metakind namespace */ +} // namespace metakind -// import MetaKind into the "CVC4::kind" namespace but keep the +// import MetaKind into the "CVC5::kind" namespace but keep the // individual MetaKind constants under kind::metakind:: -typedef ::CVC4::kind::metakind::MetaKind_t MetaKind; +typedef ::CVC5::kind::metakind::MetaKind_t MetaKind; /** * Get the metakind for a particular kind. */ MetaKind metaKindOf(Kind k); -}/* CVC4::kind namespace */ +} // namespace kind namespace expr { // Comparison predicate struct NodeValuePoolEq { inline bool operator()(const NodeValue* nv1, const NodeValue* nv2) const { - return ::CVC4::kind::metakind::NodeValueCompare::compare(nv1, nv2); + return ::CVC5::kind::metakind::NodeValueCompare::compare(nv1, nv2); } }; -}/* CVC4::expr namespace */ -}/* CVC4 namespace */ +} // namespace expr +} // namespace CVC5 #include "expr/node_value.h" @@ -134,18 +134,19 @@ ${metakind_includes} #ifdef CVC4__NODE_MANAGER_NEEDS_CONSTANT_MAP -namespace CVC4 { +namespace CVC5 { namespace expr { ${metakind_getConst_decls} -}/* CVC4::expr namespace */ +} // namespace expr namespace kind { namespace metakind { template -inline bool NodeValueConstCompare::compare(const ::CVC4::expr::NodeValue* x, - const ::CVC4::expr::NodeValue* y) { +inline bool NodeValueConstCompare::compare( + const ::CVC5::expr::NodeValue* x, const ::CVC5::expr::NodeValue* y) +{ typedef typename ConstantMapReverse::T T; if(pool) { if(x->d_nchildren == 1) { @@ -163,7 +164,9 @@ inline bool NodeValueConstCompare::compare(const ::CVC4::expr::NodeValu } template -inline size_t NodeValueConstCompare::constHash(const ::CVC4::expr::NodeValue* nv) { +inline size_t NodeValueConstCompare::constHash( + const ::CVC5::expr::NodeValue* nv) +{ typedef typename ConstantMapReverse::T T; return nv->getConst().hash(); } @@ -171,8 +174,7 @@ inline size_t NodeValueConstCompare::constHash(const ::CVC4::expr::Node ${metakind_constantMaps_decls} struct NodeValueConstPrinter { - static void toStream(std::ostream& out, - const ::CVC4::expr::NodeValue* nv); + static void toStream(std::ostream& out, const ::CVC5::expr::NodeValue* nv); static void toStream(std::ostream& out, TNode n); }; @@ -185,24 +187,24 @@ struct NodeValueConstPrinter { * This doesn't support "non-inlined" NodeValues, which shouldn't need this * kind of cleanup. */ -void deleteNodeValueConstant(::CVC4::expr::NodeValue* nv); +void deleteNodeValueConstant(::CVC5::expr::NodeValue* nv); /** Return the minimum arity of the given kind. */ -uint32_t getMinArityForKind(::CVC4::Kind k); +uint32_t getMinArityForKind(::CVC5::Kind k); /** Return the maximum arity of the given kind. */ -uint32_t getMaxArityForKind(::CVC4::Kind k); +uint32_t getMaxArityForKind(::CVC5::Kind k); -}/* CVC4::kind::metakind namespace */ +} // namespace metakind /** * Map a kind of the operator to the kind of the enclosing expression. For * example, since the kind of functions is just VARIABLE, it should map * VARIABLE to APPLY_UF. */ -Kind operatorToKind(::CVC4::expr::NodeValue* nv); +Kind operatorToKind(::CVC5::expr::NodeValue* nv); -}/* CVC4::kind namespace */ +} // namespace kind -}/* CVC4 namespace */ +} // namespace CVC5 #endif /* CVC4__NODE_MANAGER_NEEDS_CONSTANT_MAP */ diff --git a/src/expr/mkexpr b/src/expr/mkexpr index 58531cba4..cc5162fef 100755 --- a/src/expr/mkexpr +++ b/src/expr/mkexpr @@ -92,9 +92,9 @@ function theory { echo "$kf:$lineno: error: \"theory\" directive missing class or header argument" >&2 exit 1 elif ! expr "$2" : '\(::*\)' >/dev/null; then - echo "$kf:$lineno: warning: theory class \`$2' isn't fully-qualified (e.g., ::CVC4::theory::foo)" >&2 - elif ! expr "$2" : '\(::CVC4::theory::*\)' >/dev/null; then - echo "$kf:$lineno: warning: theory class not under ::CVC4::theory namespace" >&2 + echo "$kf:$lineno: warning: theory class \`$2' isn't fully-qualified (e.g., ::CVC5::theory::foo)" >&2 + elif ! expr "$2" : '\(::CVC5::theory::*\)' >/dev/null; then + echo "$kf:$lineno: warning: theory class not under ::CVC5::theory namespace" >&2 fi } @@ -226,7 +226,7 @@ template <> $2 const & Expr::getConst< $2 >() const; " getConst_implementations="${getConst_implementations} template <> $2 const & Expr::getConst() const { - PrettyCheckArgument(getKind() == ::CVC4::kind::$1, *this, \"Improper kind for getConst<$2>()\"); + PrettyCheckArgument(getKind() == ::CVC5::kind::$1, *this, \"Improper kind for getConst<$2>()\"); return d_node->getConst< $2 >(); } " diff --git a/src/expr/mkkind b/src/expr/mkkind index 55276549a..3b987746a 100755 --- a/src/expr/mkkind +++ b/src/expr/mkkind @@ -97,9 +97,9 @@ function theory { echo "$kf:$lineno: error: \"theory\" directive missing class or header argument" >&2 exit 1 elif ! expr "$2" : '\(::*\)' >/dev/null; then - echo "$kf:$lineno: warning: theory class \`$2' isn't fully-qualified (e.g., ::CVC4::theory::foo)" >&2 - elif ! expr "$2" : '\(::CVC4::theory::*\)' >/dev/null; then - echo "$kf:$lineno: warning: theory class not under ::CVC4::theory namespace" >&2 + echo "$kf:$lineno: warning: theory class \`$2' isn't fully-qualified (e.g., ::CVC5::theory::foo)" >&2 + elif ! expr "$2" : '\(::CVC5::theory::*\)' >/dev/null; then + echo "$kf:$lineno: warning: theory class not under ::CVC5::theory namespace" >&2 fi theory_id="$1" diff --git a/src/expr/mkmetakind b/src/expr/mkmetakind index 9d2f0a475..b88a70c71 100755 --- a/src/expr/mkmetakind +++ b/src/expr/mkmetakind @@ -76,9 +76,9 @@ function theory { echo "$kf:$lineno: error: \"theory\" directive missing class or header argument" >&2 exit 1 elif ! expr "$2" : '\(::*\)' >/dev/null; then - echo "$kf:$lineno: warning: theory class \`$1' isn't fully-qualified (e.g., ::CVC4::theory::foo)" >&2 - elif ! expr "$2" : '\(::CVC4::theory::*\)' >/dev/null; then - echo "$kf:$lineno: warning: theory class not under ::CVC4::theory namespace" >&2 + echo "$kf:$lineno: warning: theory class \`$1' isn't fully-qualified (e.g., ::CVC5::theory::foo)" >&2 + elif ! expr "$2" : '\(::CVC5::theory::*\)' >/dev/null; then + echo "$kf:$lineno: warning: theory class not under ::CVC5::theory namespace" >&2 fi theory_class=$1 @@ -211,12 +211,12 @@ function constant { # tricky to specify the CONST payload, like "int const*"; in any # case, this warning gives too many false positives, so disable it if ! expr "$2" : '..* ..*' >/dev/null; then - echo "$kf:$lineno: warning: constant $1 class \`$2' isn't fully-qualified (e.g., ::CVC4::Rational)" >&2 + echo "$kf:$lineno: warning: constant $1 class \`$2' isn't fully-qualified (e.g., ::CVC5::Rational)" >&2 fi fi fi if ! expr "$3" : '\(::*\)' >/dev/null; then - echo "$kf:$lineno: warning: constant $1 hasher \`$3' isn't fully-qualified (e.g., ::CVC4::RationalHashFunction)" >&2 + echo "$kf:$lineno: warning: constant $1 hasher \`$3' isn't fully-qualified (e.g., ::CVC5::RationalHashFunction)" >&2 fi # Avoid including the same header multiple times @@ -233,13 +233,13 @@ $2 const& NodeValue::getConst< $2 >() const; template <> struct ConstantMap< $2 > { // typedef $theory_class OwningTheory; - enum { kind = ::CVC4::kind::$1 }; + enum { kind = ::CVC5::kind::$1 }; };/* ConstantMap< $2 > */ template <> -struct ConstantMapReverse< ::CVC4::kind::$1 > { +struct ConstantMapReverse< ::CVC5::kind::$1 > { typedef $2 T; -};/* ConstantMapReverse< ::CVC4::kind::$1 > */ +};/* ConstantMapReverse< ::CVC5::kind::$1 > */ " metakind_constantMaps="${metakind_constantMaps} // The reinterpret_cast of d_children to \"$2 const*\" @@ -250,7 +250,7 @@ struct ConstantMapReverse< ::CVC4::kind::$1 > { template <> $2 const& NodeValue::getConst< $2 >() const { - AssertArgument(getKind() == ::CVC4::kind::$1, *this, + AssertArgument(getKind() == ::CVC5::kind::$1, *this, \"Improper kind for getConst<$2>()\"); // To support non-inlined CONSTANT-kinded NodeValues (those that are // \"constructed\" when initially checking them against the NodeManager diff --git a/src/expr/node.cpp b/src/expr/node.cpp index 59d002631..fa2a8860c 100644 --- a/src/expr/node.cpp +++ b/src/expr/node.cpp @@ -26,7 +26,7 @@ using namespace std; -namespace CVC4 { +namespace CVC5 { TypeCheckingExceptionPrivate::TypeCheckingExceptionPrivate(TNode node, std::string message) @@ -110,4 +110,4 @@ bool NodeTemplate::isConst() const { template bool NodeTemplate::isConst() const; template bool NodeTemplate::isConst() const; -}/* CVC4 namespace */ +} // namespace CVC5 diff --git a/src/expr/node.h b/src/expr/node.h index 9e485ae78..291c2e538 100644 --- a/src/expr/node.h +++ b/src/expr/node.h @@ -41,7 +41,7 @@ #include "util/hash.h" #include "util/utility.h" -namespace CVC4 { +namespace CVC5 { class TypeNode; class NodeManager; @@ -138,16 +138,16 @@ class NodeValue; namespace attr { class AttributeManager; struct SmtAttributes; - }/* CVC4::expr::attr namespace */ + } // namespace attr class ExprSetDepth; -}/* CVC4::expr namespace */ + } // namespace expr namespace kind { namespace metakind { struct NodeValueConstPrinter; - }/* CVC4::kind::metakind namespace */ -}/* CVC4::kind namespace */ + } // namespace metakind + } // namespace kind // for hash_maps, hash_sets.. struct NodeHashFunction { @@ -199,10 +199,10 @@ class NodeTemplate { template friend class NodeBuilder; - friend class ::CVC4::expr::attr::AttributeManager; - friend struct ::CVC4::expr::attr::SmtAttributes; + friend class ::CVC5::expr::attr::AttributeManager; + friend struct ::CVC5::expr::attr::SmtAttributes; - friend struct ::CVC4::kind::metakind::NodeValueConstPrinter; + friend struct ::CVC5::kind::metakind::NodeValueConstPrinter; /** * Assigns the expression value and does reference counting. No assumptions @@ -951,12 +951,12 @@ std::ostream& operator<<( return out; } -}/* CVC4 namespace */ +} // namespace CVC5 //#include "expr/attribute.h" #include "expr/node_manager.h" -namespace CVC4 { +namespace CVC5 { inline size_t NodeHashFunction::operator()(Node node) const { return node.getId(); @@ -986,7 +986,7 @@ template inline typename AttrKind::value_type NodeTemplate:: getAttribute(const AttrKind&) const { Assert(NodeManager::currentNM() != NULL) - << "There is no current CVC4::NodeManager associated to this thread.\n" + << "There is no current CVC5::NodeManager associated to this thread.\n" "Perhaps a public-facing function is missing a NodeManagerScope ?"; assertTNodeNotExpired(); @@ -999,7 +999,7 @@ template inline bool NodeTemplate:: hasAttribute(const AttrKind&) const { Assert(NodeManager::currentNM() != NULL) - << "There is no current CVC4::NodeManager associated to this thread.\n" + << "There is no current CVC5::NodeManager associated to this thread.\n" "Perhaps a public-facing function is missing a NodeManagerScope ?"; assertTNodeNotExpired(); @@ -1012,7 +1012,7 @@ template inline bool NodeTemplate::getAttribute(const AttrKind&, typename AttrKind::value_type& ret) const { Assert(NodeManager::currentNM() != NULL) - << "There is no current CVC4::NodeManager associated to this thread.\n" + << "There is no current CVC5::NodeManager associated to this thread.\n" "Perhaps a public-facing function is missing a NodeManagerScope ?"; assertTNodeNotExpired(); @@ -1025,7 +1025,7 @@ template inline void NodeTemplate:: setAttribute(const AttrKind&, const typename AttrKind::value_type& value) { Assert(NodeManager::currentNM() != NULL) - << "There is no current CVC4::NodeManager associated to this thread.\n" + << "There is no current CVC5::NodeManager associated to this thread.\n" "Perhaps a public-facing function is missing a NodeManagerScope ?"; assertTNodeNotExpired(); @@ -1225,7 +1225,7 @@ template NodeTemplate NodeTemplate::getOperator() const { Assert(NodeManager::currentNM() != NULL) - << "There is no current CVC4::NodeManager associated to this thread.\n" + << "There is no current CVC5::NodeManager associated to this thread.\n" "Perhaps a public-facing function is missing a NodeManagerScope ?"; assertTNodeNotExpired(); @@ -1255,7 +1255,7 @@ template TypeNode NodeTemplate::getType(bool check) const { Assert(NodeManager::currentNM() != NULL) - << "There is no current CVC4::NodeManager associated to this thread.\n" + << "There is no current CVC5::NodeManager associated to this thread.\n" "Perhaps a public-facing function is missing a NodeManagerScope ?"; assertTNodeNotExpired(); @@ -1491,6 +1491,6 @@ static void __attribute__((used)) debugPrintRawTNode(const NodeTemplate& } #endif /* CVC4_DEBUG */ -}/* CVC4 namespace */ +} // namespace CVC5 #endif /* CVC4__NODE_H */ diff --git a/src/expr/node_algorithm.cpp b/src/expr/node_algorithm.cpp index 1ec6c7f3a..318b7c85b 100644 --- a/src/expr/node_algorithm.cpp +++ b/src/expr/node_algorithm.cpp @@ -20,7 +20,7 @@ #include "expr/attribute.h" #include "expr/dtype.h" -namespace CVC4 { +namespace CVC5 { namespace expr { bool hasSubterm(TNode n, TNode t, bool strict) @@ -764,4 +764,4 @@ bool match(Node x, } } // namespace expr -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/expr/node_algorithm.h b/src/expr/node_algorithm.h index e7d71ce3a..ca1ee2e39 100644 --- a/src/expr/node_algorithm.h +++ b/src/expr/node_algorithm.h @@ -27,7 +27,7 @@ #include "expr/node.h" #include "expr/type_node.h" -namespace CVC4 { +namespace CVC5 { namespace expr { /** @@ -235,6 +235,6 @@ bool match(Node n1, std::unordered_map& subs); } // namespace expr -} // namespace CVC4 +} // namespace CVC5 #endif diff --git a/src/expr/node_builder.h b/src/expr/node_builder.h index 91b378c5f..724e03451 100644 --- a/src/expr/node_builder.h +++ b/src/expr/node_builder.h @@ -160,14 +160,14 @@ #include #include -namespace CVC4 { - static const unsigned default_nchild_thresh = 10; +namespace CVC5 { +static const unsigned default_nchild_thresh = 10; - template - class NodeBuilder; +template +class NodeBuilder; - class NodeManager; -}/* CVC4 namespace */ +class NodeManager; +} // namespace CVC5 #include "base/check.h" #include "base/output.h" @@ -175,7 +175,7 @@ namespace CVC4 { #include "expr/metakind.h" #include "expr/node_value.h" -namespace CVC4 { +namespace CVC5 { // Sometimes it's useful for debugging to output a NodeBuilder that // isn't yet a Node.. @@ -729,7 +729,7 @@ public: };/* class NodeBuilder<> */ -}/* CVC4 namespace */ +} // namespace CVC5 // TODO: add templatized NodeTemplate to all above and // below inlines for 'const [T]Node&' arguments? Technically a lot of @@ -741,7 +741,7 @@ public: #include "expr/node_manager.h" #include "options/expr_options.h" -namespace CVC4 { +namespace CVC5 { template void NodeBuilder::clear(Kind k) { @@ -1324,6 +1324,6 @@ std::ostream& operator<<(std::ostream& out, const NodeBuilder& nb return out << *nb.d_nv; } -}/* CVC4 namespace */ +} // namespace CVC5 #endif /* CVC4__NODE_BUILDER_H */ diff --git a/src/expr/node_manager.cpp b/src/expr/node_manager.cpp index a5329147b..370f0fb4c 100644 --- a/src/expr/node_manager.cpp +++ b/src/expr/node_manager.cpp @@ -35,9 +35,9 @@ #include "util/resource_manager.h" using namespace std; -using namespace CVC4::expr; +using namespace CVC5::expr; -namespace CVC4 { +namespace CVC5 { thread_local NodeManager* NodeManager::s_current = NULL; @@ -87,7 +87,7 @@ struct NVReclaim { namespace attr { struct LambdaBoundVarListTag { }; -}/* CVC4::attr namespace */ + } // namespace attr // attribute that stores the canonical bound variable list for function types typedef expr::Attribute LambdaBoundVarListAttr; @@ -373,7 +373,7 @@ void NodeManager::reclaimZombies() { if(mk == kind::metakind::CONSTANT) { // Destroy (call the destructor for) the C++ type representing // the constant in this NodeValue. This is needed for - // e.g. CVC4::Rational, since it has a gmp internal + // e.g. CVC5::Rational, since it has a gmp internal // representation that mallocs memory and should be cleaned // up. (This won't delete a pointer value if used as a // constant, but then, you should probably use a smart-pointer @@ -678,7 +678,7 @@ std::vector NodeManager::mkMutualDatatypeTypes( << "malformed selector in datatype post-resolution"; // This next one's a "hard" check, performed in non-debug builds // as well; the other ones should all be guaranteed by the - // CVC4::DType class, but this actually needs to be checked. + // CVC5::DType class, but this actually needs to be checked. AlwaysAssert(!selectorType.getRangeType().isFunctionLike()) << "cannot put function-like things in datatypes"; } @@ -1170,4 +1170,4 @@ Kind NodeManager::getKindForFunction(TNode fun) return kind::UNDEFINED_KIND; } -}/* CVC4 namespace */ +} // namespace CVC5 diff --git a/src/expr/node_manager.h b/src/expr/node_manager.h index 52ce096d5..aeea179d4 100644 --- a/src/expr/node_manager.h +++ b/src/expr/node_manager.h @@ -35,7 +35,7 @@ #include "expr/metakind.h" #include "expr/node_value.h" -namespace CVC4 { +namespace CVC5 { namespace api { class Solver; @@ -51,10 +51,10 @@ namespace expr { namespace attr { class AttributeUniqueId; class AttributeManager; - }/* CVC4::expr::attr namespace */ + } // namespace attr class TypeChecker; -}/* CVC4::expr namespace */ + } // namespace expr /** * An interface that an interested party can implement and then subscribe @@ -163,7 +163,7 @@ class NodeManager * PLUS, are APPLYs of a PLUS operator to arguments. This array * holds the set of operators for these things. A PLUS operator is * a Node with kind "BUILTIN", and if you call - * plusOperator->getConst(), you get kind::PLUS back. + * plusOperator->getConst(), you get kind::PLUS back. */ Node d_operators[kind::LAST_KIND]; @@ -660,7 +660,7 @@ class NodeManager /** * Get the (singleton) operator of an OPERATOR-kinded kind. The * returned node n will have kind BUILTIN, and calling - * n.getConst() will yield k. + * n.getConst() will yield k. */ inline TNode operatorOf(Kind k) { AssertArgument( kind::metaKindOf(k) == kind::metakind::OPERATOR, k, @@ -1203,7 +1203,7 @@ inline void NodeManager::poolRemove(expr::NodeValue* nv) { d_nodeValuePool.erase(nv);// FIXME multithreading } -}/* CVC4 namespace */ +} // namespace CVC5 #define CVC4__NODE_MANAGER_NEEDS_CONSTANT_MAP #include "expr/metakind.h" @@ -1211,7 +1211,7 @@ inline void NodeManager::poolRemove(expr::NodeValue* nv) { #include "expr/node_builder.h" -namespace CVC4 { +namespace CVC5 { // general expression-builders @@ -1577,6 +1577,6 @@ NodeClass NodeManager::mkConstInternal(const T& val) { return NodeClass(nv); } -}/* CVC4 namespace */ +} // namespace CVC5 #endif /* CVC4__NODE_MANAGER_H */ diff --git a/src/expr/node_manager_attributes.h b/src/expr/node_manager_attributes.h index 2add5a314..b7f6319eb 100644 --- a/src/expr/node_manager_attributes.h +++ b/src/expr/node_manager_attributes.h @@ -19,7 +19,7 @@ #include "expr/attribute.h" -namespace CVC4 { +namespace CVC5 { namespace expr { // Definition of an attribute for the variable name. @@ -29,12 +29,12 @@ namespace attr { struct SortArityTag { }; struct TypeTag { }; struct TypeCheckedTag { }; -}/* CVC4::expr::attr namespace */ + } // namespace attr typedef Attribute VarNameAttr; typedef Attribute SortArityAttr; typedef expr::Attribute TypeAttr; typedef expr::Attribute TypeCheckedAttr; -}/* CVC4::expr namespace */ -}/* CVC4 namespace */ +} // namespace expr +} // namespace CVC5 diff --git a/src/expr/node_self_iterator.h b/src/expr/node_self_iterator.h index 475e0a122..831eace65 100644 --- a/src/expr/node_self_iterator.h +++ b/src/expr/node_self_iterator.h @@ -24,7 +24,7 @@ #include "base/check.h" #include "expr/node.h" -namespace CVC4 { +namespace CVC5 { namespace expr { class NodeSelfIterator : public std::iterator { @@ -122,7 +122,7 @@ inline bool NodeSelfIterator::operator!=(NodeSelfIterator i) const { return !(*this == i); } -}/* CVC4::expr namespace */ -}/* CVC4 namespace */ +} // namespace expr +} // namespace CVC5 #endif /* CVC4__EXPR__NODE_SELF_ITERATOR_H */ diff --git a/src/expr/node_traversal.cpp b/src/expr/node_traversal.cpp index f3b4c2ede..c7d3ab3f8 100644 --- a/src/expr/node_traversal.cpp +++ b/src/expr/node_traversal.cpp @@ -16,7 +16,7 @@ #include -namespace CVC4 { +namespace CVC5 { NodeDfsIterator::NodeDfsIterator(TNode n, VisitOrder order, @@ -156,4 +156,4 @@ NodeDfsIterator NodeDfsIterable::end() const return NodeDfsIterator(d_order); } -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/expr/node_traversal.h b/src/expr/node_traversal.h index 1f3b1f563..934ec6bd8 100644 --- a/src/expr/node_traversal.h +++ b/src/expr/node_traversal.h @@ -23,7 +23,7 @@ #include "expr/node.h" -namespace CVC4 { +namespace CVC5 { /** * Enum that represents an order in which nodes are visited. @@ -144,6 +144,6 @@ class NodeDfsIterable std::function d_skipIf; }; -} // namespace CVC4 +} // namespace CVC5 #endif // CVC4__EXPR__NODE_TRAVERSAL_H diff --git a/src/expr/node_trie.cpp b/src/expr/node_trie.cpp index f02035c43..195011c1f 100644 --- a/src/expr/node_trie.cpp +++ b/src/expr/node_trie.cpp @@ -14,7 +14,7 @@ #include "expr/node_trie.h" -namespace CVC4 { +namespace CVC5 { namespace theory { template @@ -92,4 +92,4 @@ template void NodeTemplateTrie::debugPrint(const char* c, unsigned depth) const; } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/expr/node_trie.h b/src/expr/node_trie.h index 81529f38e..f765105d3 100644 --- a/src/expr/node_trie.h +++ b/src/expr/node_trie.h @@ -20,7 +20,7 @@ #include #include "expr/node.h" -namespace CVC4 { +namespace CVC5 { namespace theory { /** NodeTemplate trie class @@ -107,6 +107,6 @@ typedef NodeTemplateTrie NodeTrie; typedef NodeTemplateTrie TNodeTrie; } // namespace theory -} // namespace CVC4 +} // namespace CVC5 #endif /* CVC4__EXPR__NODE_TRIE_H */ diff --git a/src/expr/node_value.cpp b/src/expr/node_value.cpp index dc682a9fb..027c15a0a 100644 --- a/src/expr/node_value.cpp +++ b/src/expr/node_value.cpp @@ -31,7 +31,7 @@ using namespace std; -namespace CVC4 { +namespace CVC5 { namespace expr { string NodeValue::toString() const { @@ -94,5 +94,5 @@ NodeValue::iterator > operator+( return i + p; } -} /* CVC4::expr namespace */ -} /* CVC4 namespace */ +} // namespace expr +} // namespace CVC5 diff --git a/src/expr/node_value.h b/src/expr/node_value.h index d6b6d3c45..ecc054a75 100644 --- a/src/expr/node_value.h +++ b/src/expr/node_value.h @@ -32,7 +32,7 @@ #include "expr/kind.h" #include "options/language.h" -namespace CVC4 { +namespace CVC5 { template class NodeTemplate; class TypeNode; @@ -45,15 +45,15 @@ namespace expr { namespace kind { namespace metakind { - template < ::CVC4::Kind k, bool pool > - struct NodeValueConstCompare; + template < ::CVC5::Kind k, bool pool> + struct NodeValueConstCompare; - struct NodeValueCompare; - struct NodeValueConstPrinter; + struct NodeValueCompare; + struct NodeValueConstPrinter; - void deleteNodeValueConstant(::CVC4::expr::NodeValue* nv); - }/* CVC4::kind::metakind namespace */ -}/* CVC4::kind namespace */ + void deleteNodeValueConstant(::CVC5::expr::NodeValue* nv); + } // namespace metakind + } // namespace kind namespace expr { @@ -63,19 +63,19 @@ namespace expr { class NodeValue { template - friend class ::CVC4::NodeTemplate; - friend class ::CVC4::TypeNode; + friend class ::CVC5::NodeTemplate; + friend class ::CVC5::TypeNode; template - friend class ::CVC4::NodeBuilder; - friend class ::CVC4::NodeManager; + friend class ::CVC5::NodeBuilder; + friend class ::CVC5::NodeManager; template - friend struct ::CVC4::kind::metakind::NodeValueConstCompare; + friend struct ::CVC5::kind::metakind::NodeValueConstCompare; - friend struct ::CVC4::kind::metakind::NodeValueCompare; - friend struct ::CVC4::kind::metakind::NodeValueConstPrinter; + friend struct ::CVC5::kind::metakind::NodeValueCompare; + friend struct ::CVC5::kind::metakind::NodeValueConstPrinter; - friend void ::CVC4::kind::metakind::deleteNodeValueConstant(NodeValue* nv); + friend void ::CVC5::kind::metakind::deleteNodeValueConstant(NodeValue* nv); friend class RefCountGuard; @@ -395,12 +395,12 @@ struct NodeValueIDEquality { inline std::ostream& operator<<(std::ostream& out, const NodeValue& nv); -}/* CVC4::expr namespace */ -}/* CVC4 namespace */ +} // namespace expr +} // namespace CVC5 #include "expr/node_manager.h" -namespace CVC4 { +namespace CVC5 { namespace expr { inline NodeValue::NodeValue(int) : @@ -496,12 +496,12 @@ inline NodeValue* NodeValue::getChild(int i) const { return d_children[i]; } -}/* CVC4::expr namespace */ -}/* CVC4 namespace */ +} // namespace expr +} // namespace CVC5 #include "expr/node.h" -namespace CVC4 { +namespace CVC5 { namespace expr { template @@ -517,7 +517,7 @@ inline std::ostream& operator<<(std::ostream& out, const NodeValue& nv) { return out; } -}/* CVC4::expr namespace */ +} // namespace expr #ifdef CVC4_DEBUG /** @@ -545,6 +545,6 @@ static void __attribute__((used)) debugPrintRawNodeValue(const expr::NodeValue* } #endif /* CVC4_DEBUG */ -}/* CVC4 namespace */ +} // namespace CVC5 #endif /* CVC4__EXPR__NODE_VALUE_H */ diff --git a/src/expr/node_visitor.h b/src/expr/node_visitor.h index dcf8e38e0..a3e24772a 100644 --- a/src/expr/node_visitor.h +++ b/src/expr/node_visitor.h @@ -22,7 +22,7 @@ #include "expr/node.h" -namespace CVC4 { +namespace CVC5 { /** * Traverses the nodes reverse-topologically (children before parents), @@ -123,4 +123,4 @@ public: template thread_local bool NodeVisitor::s_inRun = false; -}/* CVC4 namespace */ +} // namespace CVC5 diff --git a/src/expr/proof.cpp b/src/expr/proof.cpp index e3c70590c..a55b3c69a 100644 --- a/src/expr/proof.cpp +++ b/src/expr/proof.cpp @@ -18,9 +18,9 @@ #include "expr/proof_node.h" #include "expr/proof_node_manager.h" -using namespace CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { CDProof::CDProof(ProofNodeManager* pnm, context::Context* c, @@ -455,4 +455,4 @@ Node CDProof::getSymmFact(TNode f) std::string CDProof::identify() const { return d_name; } -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/expr/proof.h b/src/expr/proof.h index e676731ea..164880cea 100644 --- a/src/expr/proof.h +++ b/src/expr/proof.h @@ -24,7 +24,7 @@ #include "expr/proof_generator.h" #include "expr/proof_step_buffer.h" -namespace CVC4 { +namespace CVC5 { class ProofNode; class ProofNodeManager; @@ -273,6 +273,6 @@ class CDProof : public ProofGenerator void notifyNewProof(Node expected); }; -} // namespace CVC4 +} // namespace CVC5 #endif /* CVC4__EXPR__PROOF_MANAGER_H */ diff --git a/src/expr/proof_checker.cpp b/src/expr/proof_checker.cpp index bcff07c30..b5955e991 100644 --- a/src/expr/proof_checker.cpp +++ b/src/expr/proof_checker.cpp @@ -19,9 +19,9 @@ #include "options/proof_options.h" #include "smt/smt_statistics_registry.h" -using namespace CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { Node ProofRuleChecker::check(PfRule id, const std::vector& children, @@ -347,4 +347,4 @@ bool ProofChecker::isPedanticFailure(PfRule id, return false; } -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/expr/proof_checker.h b/src/expr/proof_checker.h index a84f17c28..edb0fec3a 100644 --- a/src/expr/proof_checker.h +++ b/src/expr/proof_checker.h @@ -24,7 +24,7 @@ #include "util/statistics_registry.h" #include "util/stats_histogram.h" -namespace CVC4 { +namespace CVC5 { class ProofChecker; class ProofNode; @@ -202,6 +202,6 @@ class ProofChecker bool enableOutput); }; -} // namespace CVC4 +} // namespace CVC5 #endif /* CVC4__EXPR__PROOF_CHECKER_H */ diff --git a/src/expr/proof_ensure_closed.cpp b/src/expr/proof_ensure_closed.cpp index e4a59c8f0..487c52bc6 100644 --- a/src/expr/proof_ensure_closed.cpp +++ b/src/expr/proof_ensure_closed.cpp @@ -22,7 +22,7 @@ #include "options/proof_options.h" #include "options/smt_options.h" -namespace CVC4 { +namespace CVC5 { /** * Ensure closed with respect to assumptions, internal version, which @@ -179,4 +179,4 @@ void pfnEnsureClosedWrt(ProofNode* pn, ensureClosedWrtInternal(Node::null(), nullptr, pn, assumps, c, ctx, false); } -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/expr/proof_ensure_closed.h b/src/expr/proof_ensure_closed.h index dd137343a..40143f814 100644 --- a/src/expr/proof_ensure_closed.h +++ b/src/expr/proof_ensure_closed.h @@ -19,7 +19,7 @@ #include "expr/node.h" -namespace CVC4 { +namespace CVC5 { class ProofGenerator; class ProofNode; @@ -67,6 +67,6 @@ void pfnEnsureClosedWrt(ProofNode* pn, const std::vector& assumps, const char* c, const char* ctx); -} // namespace CVC4 +} // namespace CVC5 #endif /* CVC4__EXPR__PROOF_ENSURE_CLOSED_H */ diff --git a/src/expr/proof_generator.cpp b/src/expr/proof_generator.cpp index 53bc54d7a..102435cea 100644 --- a/src/expr/proof_generator.cpp +++ b/src/expr/proof_generator.cpp @@ -21,7 +21,7 @@ #include "expr/proof_node_algorithm.h" #include "options/smt_options.h" -namespace CVC4 { +namespace CVC5 { std::ostream& operator<<(std::ostream& out, CDPOverwrite opol) { @@ -73,4 +73,4 @@ bool ProofGenerator::addProofTo(Node f, return false; } -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/expr/proof_generator.h b/src/expr/proof_generator.h index 497e89d7a..446cb2c83 100644 --- a/src/expr/proof_generator.h +++ b/src/expr/proof_generator.h @@ -19,7 +19,7 @@ #include "expr/node.h" -namespace CVC4 { +namespace CVC5 { class CDProof; class ProofNode; @@ -107,6 +107,6 @@ class ProofGenerator virtual std::string identify() const = 0; }; -} // namespace CVC4 +} // namespace CVC5 #endif /* CVC4__EXPR__PROOF_GENERATOR_H */ diff --git a/src/expr/proof_node.cpp b/src/expr/proof_node.cpp index 755a37643..923bdeacd 100644 --- a/src/expr/proof_node.cpp +++ b/src/expr/proof_node.cpp @@ -17,7 +17,7 @@ #include "expr/proof_node_algorithm.h" #include "expr/proof_node_to_sexpr.h" -namespace CVC4 { +namespace CVC5 { ProofNode::ProofNode(PfRule id, const std::vector>& children, @@ -81,4 +81,4 @@ std::ostream& operator<<(std::ostream& out, const ProofNode& pn) return out; } -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/expr/proof_node.h b/src/expr/proof_node.h index f7b323018..67600e2d0 100644 --- a/src/expr/proof_node.h +++ b/src/expr/proof_node.h @@ -22,7 +22,7 @@ #include "expr/node.h" #include "expr/proof_rule.h" -namespace CVC4 { +namespace CVC5 { class ProofNodeManager; class ProofNode; @@ -141,6 +141,6 @@ inline size_t ProofNodeHashFunction::operator()( */ std::ostream& operator<<(std::ostream& out, const ProofNode& pn); -} // namespace CVC4 +} // namespace CVC5 #endif /* CVC4__EXPR__PROOF_NODE_H */ diff --git a/src/expr/proof_node_algorithm.cpp b/src/expr/proof_node_algorithm.cpp index 90b1e9030..142a9b37f 100644 --- a/src/expr/proof_node_algorithm.cpp +++ b/src/expr/proof_node_algorithm.cpp @@ -16,7 +16,7 @@ #include "expr/proof_node.h" -namespace CVC4 { +namespace CVC5 { namespace expr { void getFreeAssumptions(ProofNode* pn, std::vector& assump) @@ -172,4 +172,4 @@ bool containsSubproof(ProofNode* pn, } } // namespace expr -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/expr/proof_node_algorithm.h b/src/expr/proof_node_algorithm.h index 9106bb36f..9266c7251 100644 --- a/src/expr/proof_node_algorithm.h +++ b/src/expr/proof_node_algorithm.h @@ -21,7 +21,7 @@ #include "expr/node.h" -namespace CVC4 { +namespace CVC5 { class ProofNode; @@ -70,6 +70,6 @@ bool containsSubproof(ProofNode* pn, std::unordered_set& visited); } // namespace expr -} // namespace CVC4 +} // namespace CVC5 #endif /* CVC4__EXPR__PROOF_NODE_ALGORITHM_H */ diff --git a/src/expr/proof_node_manager.cpp b/src/expr/proof_node_manager.cpp index a018db4c0..ceb9d4eac 100644 --- a/src/expr/proof_node_manager.cpp +++ b/src/expr/proof_node_manager.cpp @@ -23,9 +23,9 @@ #include "options/proof_options.h" #include "theory/rewriter.h" -using namespace CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { ProofNodeManager::ProofNodeManager(ProofChecker* pc) : d_checker(pc) @@ -356,4 +356,4 @@ bool ProofNodeManager::updateNodeInternal( return true; } -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/expr/proof_node_manager.h b/src/expr/proof_node_manager.h index 434cffe28..8e019818d 100644 --- a/src/expr/proof_node_manager.h +++ b/src/expr/proof_node_manager.h @@ -22,7 +22,7 @@ #include "expr/node.h" #include "expr/proof_rule.h" -namespace CVC4 { +namespace CVC5 { class ProofChecker; class ProofNode; @@ -192,6 +192,6 @@ class ProofNodeManager bool needsCheck); }; -} // namespace CVC4 +} // namespace CVC5 #endif /* CVC4__EXPR__PROOF_NODE_H */ diff --git a/src/expr/proof_node_to_sexpr.cpp b/src/expr/proof_node_to_sexpr.cpp index c298dafe6..7468ecb5a 100644 --- a/src/expr/proof_node_to_sexpr.cpp +++ b/src/expr/proof_node_to_sexpr.cpp @@ -20,9 +20,9 @@ #include "expr/proof_node.h" #include "options/proof_options.h" -using namespace CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { ProofNodeToSExpr::ProofNodeToSExpr() { @@ -144,4 +144,4 @@ Node ProofNodeToSExpr::getOrMkNodeVariable(Node n) return var; } -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/expr/proof_node_to_sexpr.h b/src/expr/proof_node_to_sexpr.h index cf2e86263..8da094da2 100644 --- a/src/expr/proof_node_to_sexpr.h +++ b/src/expr/proof_node_to_sexpr.h @@ -22,7 +22,7 @@ #include "expr/node.h" #include "expr/proof_rule.h" -namespace CVC4 { +namespace CVC5 { class ProofNode; @@ -64,6 +64,6 @@ class ProofNodeToSExpr Node getOrMkNodeVariable(Node n); }; -} // namespace CVC4 +} // namespace CVC5 #endif /* CVC4__EXPR__PROOF_RULE_H */ diff --git a/src/expr/proof_node_updater.cpp b/src/expr/proof_node_updater.cpp index cacadc815..4c1883e93 100644 --- a/src/expr/proof_node_updater.cpp +++ b/src/expr/proof_node_updater.cpp @@ -19,7 +19,7 @@ #include "expr/proof_node_algorithm.h" #include "expr/proof_node_manager.h" -namespace CVC4 { +namespace CVC5 { ProofNodeUpdaterCallback::ProofNodeUpdaterCallback() {} ProofNodeUpdaterCallback::~ProofNodeUpdaterCallback() {} @@ -261,4 +261,4 @@ void ProofNodeUpdater::setDebugFreeAssumptions( d_debugFreeAssumps = true; } -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/expr/proof_node_updater.h b/src/expr/proof_node_updater.h index 693168a25..5a22af61a 100644 --- a/src/expr/proof_node_updater.h +++ b/src/expr/proof_node_updater.h @@ -23,7 +23,7 @@ #include "expr/node.h" #include "expr/proof_node.h" -namespace CVC4 { +namespace CVC5 { class CDProof; class ProofNode; @@ -155,6 +155,6 @@ class ProofNodeUpdater bool d_autoSym; }; -} // namespace CVC4 +} // namespace CVC5 #endif diff --git a/src/expr/proof_rule.cpp b/src/expr/proof_rule.cpp index 579b06c76..1323520c3 100644 --- a/src/expr/proof_rule.cpp +++ b/src/expr/proof_rule.cpp @@ -16,7 +16,7 @@ #include -namespace CVC4 { +namespace CVC5 { const char* toString(PfRule id) { @@ -210,4 +210,4 @@ size_t PfRuleHashFunction::operator()(PfRule id) const return static_cast(id); } -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/expr/proof_rule.h b/src/expr/proof_rule.h index efa673409..95f97ae44 100644 --- a/src/expr/proof_rule.h +++ b/src/expr/proof_rule.h @@ -19,7 +19,7 @@ #include -namespace CVC4 { +namespace CVC5 { /** * An enumeration for proof rules. This enumeration is analogous to Kind for @@ -1379,6 +1379,6 @@ struct PfRuleHashFunction size_t operator()(PfRule id) const; }; /* struct PfRuleHashFunction */ -} // namespace CVC4 +} // namespace CVC5 #endif /* CVC4__EXPR__PROOF_RULE_H */ diff --git a/src/expr/proof_set.h b/src/expr/proof_set.h index a45a0f1f8..ccfac350a 100644 --- a/src/expr/proof_set.h +++ b/src/expr/proof_set.h @@ -23,7 +23,7 @@ #include "context/context.h" #include "expr/proof_node_manager.h" -namespace CVC4 { +namespace CVC5 { /** * A (context-dependent) set of proofs, which is used for memory @@ -70,6 +70,6 @@ class CDProofSet std::string d_namePrefix; }; -} // namespace CVC4 +} // namespace CVC5 #endif /* CVC4__EXPR__LAZY_PROOF_SET_H */ diff --git a/src/expr/proof_step_buffer.cpp b/src/expr/proof_step_buffer.cpp index 51aa9f098..23f0f5997 100644 --- a/src/expr/proof_step_buffer.cpp +++ b/src/expr/proof_step_buffer.cpp @@ -16,9 +16,9 @@ #include "expr/proof_checker.h" -using namespace CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { ProofStep::ProofStep() : d_rule(PfRule::UNKNOWN) {} ProofStep::ProofStep(PfRule r, @@ -108,4 +108,4 @@ const std::vector>& ProofStepBuffer::getSteps() const void ProofStepBuffer::clear() { d_steps.clear(); } -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/expr/proof_step_buffer.h b/src/expr/proof_step_buffer.h index 0b4b8552b..b78d1d605 100644 --- a/src/expr/proof_step_buffer.h +++ b/src/expr/proof_step_buffer.h @@ -22,7 +22,7 @@ #include "expr/node.h" #include "expr/proof_rule.h" -namespace CVC4 { +namespace CVC5 { class ProofChecker; @@ -92,6 +92,6 @@ class ProofStepBuffer std::vector> d_steps; }; -} // namespace CVC4 +} // namespace CVC5 #endif /* CVC4__EXPR__PROOF_STEP_BUFFER_H */ diff --git a/src/expr/record.cpp b/src/expr/record.cpp index ed4e05567..affd2615c 100644 --- a/src/expr/record.cpp +++ b/src/expr/record.cpp @@ -19,11 +19,10 @@ #include "base/check.h" #include "base/output.h" - -namespace CVC4 { +namespace CVC5 { std::ostream& operator<<(std::ostream& out, const RecordUpdate& t) { return out << "[" << t.getField() << "]"; } -}/* CVC4 namespace */ +} // namespace CVC5 diff --git a/src/expr/record.h b/src/expr/record.h index a9201fca3..d4b41b9b9 100644 --- a/src/expr/record.h +++ b/src/expr/record.h @@ -25,13 +25,13 @@ #include // Forward Declarations -namespace CVC4 { +namespace CVC5 { // This forward delcartion is required to resolve a cicular dependency with // Record which is a referenced in a Kind file. class TypeNode; -} /* namespace CVC4 */ +} // namespace CVC5 -namespace CVC4 { +namespace CVC5 { // operators for record update class RecordUpdate @@ -56,6 +56,6 @@ std::ostream& operator<<(std::ostream& out, const RecordUpdate& t); using Record = std::vector>; -}/* CVC4 namespace */ +} // namespace CVC5 #endif /* CVC4__RECORD_H */ diff --git a/src/expr/sequence.cpp b/src/expr/sequence.cpp index b02b68815..90b57f58d 100644 --- a/src/expr/sequence.cpp +++ b/src/expr/sequence.cpp @@ -22,7 +22,7 @@ using namespace std; -namespace CVC4 { +namespace CVC5 { Sequence::Sequence(const TypeNode& t, const std::vector& s) : d_type(new TypeNode(t)), d_seq(s) @@ -378,4 +378,4 @@ size_t SequenceHashFunction::operator()(const Sequence& s) const return ret; } -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/expr/sequence.h b/src/expr/sequence.h index 1c0b1fbb9..461adb667 100644 --- a/src/expr/sequence.h +++ b/src/expr/sequence.h @@ -20,7 +20,7 @@ #include #include -namespace CVC4 { +namespace CVC5 { template class NodeTemplate; @@ -36,7 +36,7 @@ class Sequence public: /** constructors for Sequence * - * Internally, a CVC4::Sequence is represented by a vector of Nodes (d_seq), + * Internally, a CVC5::Sequence is represented by a vector of Nodes (d_seq), * where each Node in this vector must be a constant. */ Sequence() = default; @@ -173,6 +173,6 @@ struct SequenceHashFunction std::ostream& operator<<(std::ostream& os, const Sequence& s); -} // namespace CVC4 +} // namespace CVC5 #endif /* CVC4__EXPR__SEQUENCE_H */ diff --git a/src/expr/skolem_manager.cpp b/src/expr/skolem_manager.cpp index c65180ed3..2b04c0755 100644 --- a/src/expr/skolem_manager.cpp +++ b/src/expr/skolem_manager.cpp @@ -18,9 +18,9 @@ #include "expr/bound_var_manager.h" #include "expr/node_algorithm.h" -using namespace CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { // Attributes are global maps from Nodes to data. Thus, note that these could // be implemented as internal maps in SkolemManager. @@ -298,4 +298,4 @@ Node SkolemManager::mkSkolemInternal(Node w, return k; } -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/expr/skolem_manager.h b/src/expr/skolem_manager.h index 44a8f87c2..1078bc11f 100644 --- a/src/expr/skolem_manager.h +++ b/src/expr/skolem_manager.h @@ -21,7 +21,7 @@ #include "expr/node.h" -namespace CVC4 { +namespace CVC5 { class ProofGenerator; @@ -234,6 +234,6 @@ class SkolemManager int flags = NodeManager::SKOLEM_DEFAULT); }; -} // namespace CVC4 +} // namespace CVC5 #endif /* CVC4__EXPR__PROOF_SKOLEM_CACHE_H */ diff --git a/src/expr/subs.cpp b/src/expr/subs.cpp index 0434cacf3..897c6fdba 100644 --- a/src/expr/subs.cpp +++ b/src/expr/subs.cpp @@ -18,7 +18,7 @@ #include "theory/rewriter.h" -namespace CVC4 { +namespace CVC5 { bool Subs::empty() const { return d_vars.empty(); } @@ -176,4 +176,4 @@ std::ostream& operator<<(std::ostream& out, const Subs& s) return out; } -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/expr/subs.h b/src/expr/subs.h index 86c7d1758..c2854bf36 100644 --- a/src/expr/subs.h +++ b/src/expr/subs.h @@ -19,7 +19,7 @@ #include #include "expr/node.h" -namespace CVC4 { +namespace CVC5 { /** * Helper substitution class. Stores a substitution in parallel vectors @@ -80,6 +80,6 @@ class Subs */ std::ostream& operator<<(std::ostream& out, const Subs& s); -} // namespace CVC4 +} // namespace CVC5 #endif /* CVC4__EXPR__SUBS_H */ diff --git a/src/expr/sygus_datatype.cpp b/src/expr/sygus_datatype.cpp index d2e845452..352dd157a 100644 --- a/src/expr/sygus_datatype.cpp +++ b/src/expr/sygus_datatype.cpp @@ -16,9 +16,9 @@ #include -using namespace CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { SygusDatatype::SygusDatatype(const std::string& name) : d_dt(DType(name)) {} @@ -99,4 +99,4 @@ const DType& SygusDatatype::getDatatype() const bool SygusDatatype::isInitialized() const { return d_dt.isSygus(); } -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/expr/sygus_datatype.h b/src/expr/sygus_datatype.h index 1350e9e57..f4635bdb3 100644 --- a/src/expr/sygus_datatype.h +++ b/src/expr/sygus_datatype.h @@ -24,7 +24,7 @@ #include "expr/node.h" #include "expr/type_node.h" -namespace CVC4 { +namespace CVC5 { /** Attribute true for variables that represent any constant */ struct SygusAnyConstAttributeId @@ -134,6 +134,6 @@ class SygusDatatype DType d_dt; }; -} // namespace CVC4 +} // namespace CVC5 #endif diff --git a/src/expr/symbol_manager.cpp b/src/expr/symbol_manager.cpp index 0fa2db1d4..1e99f4a68 100644 --- a/src/expr/symbol_manager.cpp +++ b/src/expr/symbol_manager.cpp @@ -19,9 +19,9 @@ #include "context/cdlist.h" #include "context/cdo.h" -using namespace CVC4::context; +using namespace CVC5::context; -namespace CVC4 { +namespace CVC5 { // ---------------------------------------------- SymbolManager::Implementation @@ -367,4 +367,4 @@ void SymbolManager::resetAssertions() d_symtabAllocated.resetAssertions(); } -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/expr/symbol_manager.h b/src/expr/symbol_manager.h index 40ea44b34..6795ce3b3 100644 --- a/src/expr/symbol_manager.h +++ b/src/expr/symbol_manager.h @@ -25,7 +25,7 @@ #include "cvc4_export.h" #include "expr/symbol_table.h" -namespace CVC4 { +namespace CVC5 { /** * Symbol manager, which manages: @@ -156,6 +156,6 @@ class CVC4_EXPORT SymbolManager bool d_globalDeclarations; }; -} // namespace CVC4 +} // namespace CVC5 #endif /* CVC4__EXPR__SYMBOL_MANAGER_H */ diff --git a/src/expr/symbol_table.cpp b/src/expr/symbol_table.cpp index 3942f3775..774e2bb39 100644 --- a/src/expr/symbol_table.cpp +++ b/src/expr/symbol_table.cpp @@ -28,11 +28,11 @@ #include "context/cdhashset.h" #include "context/context.h" -namespace CVC4 { +namespace CVC5 { -using ::CVC4::context::CDHashMap; -using ::CVC4::context::CDHashSet; -using ::CVC4::context::Context; +using ::CVC5::context::CDHashMap; +using ::CVC5::context::CDHashSet; +using ::CVC5::context::Context; using ::std::copy; using ::std::endl; using ::std::ostream_iterator; @@ -679,4 +679,4 @@ size_t SymbolTable::getLevel() const { return d_implementation->getLevel(); } void SymbolTable::reset() { d_implementation->reset(); } void SymbolTable::resetAssertions() { d_implementation->resetAssertions(); } -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/expr/symbol_table.h b/src/expr/symbol_table.h index 297917120..113dea704 100644 --- a/src/expr/symbol_table.h +++ b/src/expr/symbol_table.h @@ -26,7 +26,7 @@ #include "base/exception.h" #include "cvc4_export.h" -namespace CVC4 { +namespace CVC5 { namespace api { class Solver; @@ -210,6 +210,6 @@ class CVC4_EXPORT SymbolTable std::unique_ptr d_implementation; }; /* class SymbolTable */ -} // namespace CVC4 +} // namespace CVC5 #endif /* CVC4__SYMBOL_TABLE_H */ diff --git a/src/expr/tconv_seq_proof_generator.cpp b/src/expr/tconv_seq_proof_generator.cpp index e7fba5088..9b099de2d 100644 --- a/src/expr/tconv_seq_proof_generator.cpp +++ b/src/expr/tconv_seq_proof_generator.cpp @@ -18,7 +18,7 @@ #include "expr/proof_node_manager.h" -namespace CVC4 { +namespace CVC5 { TConvSeqProofGenerator::TConvSeqProofGenerator( ProofNodeManager* pnm, @@ -168,4 +168,4 @@ theory::TrustNode TConvSeqProofGenerator::mkTrustRewriteSequence( std::string TConvSeqProofGenerator::identify() const { return d_name; } -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/expr/tconv_seq_proof_generator.h b/src/expr/tconv_seq_proof_generator.h index e907ef09c..a5b1de101 100644 --- a/src/expr/tconv_seq_proof_generator.h +++ b/src/expr/tconv_seq_proof_generator.h @@ -22,7 +22,7 @@ #include "expr/proof_generator.h" #include "theory/trust_node.h" -namespace CVC4 { +namespace CVC5 { class ProofNodeManager; @@ -115,6 +115,6 @@ class TConvSeqProofGenerator : public ProofGenerator std::string d_name; }; -} // namespace CVC4 +} // namespace CVC5 #endif /* CVC4__EXPR__TCONV_SEQ_PROOF_GENERATOR_H */ diff --git a/src/expr/term_canonize.cpp b/src/expr/term_canonize.cpp index 72c59136b..97f3c2539 100644 --- a/src/expr/term_canonize.cpp +++ b/src/expr/term_canonize.cpp @@ -19,9 +19,9 @@ // TODO #1216: move the code in this include #include "theory/quantifiers/term_util.h" -using namespace CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace expr { TermCanonize::TermCanonize() : d_op_id_count(0), d_typ_id_count(0) {} @@ -209,4 +209,4 @@ Node TermCanonize::getCanonicalTerm(TNode n, bool apply_torder, bool doHoVar) } } // namespace expr -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/expr/term_canonize.h b/src/expr/term_canonize.h index 3eefb0c4a..f9f0fda24 100644 --- a/src/expr/term_canonize.h +++ b/src/expr/term_canonize.h @@ -20,7 +20,7 @@ #include #include "expr/node.h" -namespace CVC4 { +namespace CVC5 { namespace expr { /** TermCanonize @@ -100,6 +100,6 @@ class TermCanonize }; } // namespace expr -} // namespace CVC4 +} // namespace CVC5 #endif /* CVC4__EXPR__TERM_CANONIZE_H */ diff --git a/src/expr/term_context.cpp b/src/expr/term_context.cpp index 2ade0943d..56c38a17c 100644 --- a/src/expr/term_context.cpp +++ b/src/expr/term_context.cpp @@ -14,7 +14,7 @@ #include "expr/term_context.h" -namespace CVC4 { +namespace CVC5 { uint32_t TermContext::computeValueOp(TNode t, uint32_t tval) const { @@ -132,4 +132,4 @@ void PolarityTermContext::getFlags(uint32_t val, bool& hasPol, bool& pol) pol = val == 2; } -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/expr/term_context.h b/src/expr/term_context.h index 7b4dbe928..65cdbb23e 100644 --- a/src/expr/term_context.h +++ b/src/expr/term_context.h @@ -19,7 +19,7 @@ #include "expr/node.h" -namespace CVC4 { +namespace CVC5 { /** * This is an abstract class for computing "term context identifiers". A term @@ -163,6 +163,6 @@ class PolarityTermContext : public TermContext static void getFlags(uint32_t val, bool& hasPol, bool& pol); }; -} // namespace CVC4 +} // namespace CVC5 #endif /* CVC4__EXPR__TERM_CONVERSION_PROOF_GENERATOR_H */ diff --git a/src/expr/term_context_node.cpp b/src/expr/term_context_node.cpp index 871193442..1afc599d2 100644 --- a/src/expr/term_context_node.cpp +++ b/src/expr/term_context_node.cpp @@ -16,7 +16,7 @@ #include "expr/term_context.h" -namespace CVC4 { +namespace CVC5 { TCtxNode::TCtxNode(Node n, const TermContext* tctx) : d_node(n), d_val(tctx->initialValue()), d_tctx(tctx) @@ -73,4 +73,4 @@ Node TCtxNode::decomposeNodeHash(Node h, uint32_t& val) return h[0]; } -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/expr/term_context_node.h b/src/expr/term_context_node.h index 15e7f9f1b..67d747557 100644 --- a/src/expr/term_context_node.h +++ b/src/expr/term_context_node.h @@ -19,7 +19,7 @@ #include "expr/node.h" -namespace CVC4 { +namespace CVC5 { class TCtxStack; class TermContext; @@ -74,6 +74,6 @@ class TCtxNode const TermContext* d_tctx; }; -} // namespace CVC4 +} // namespace CVC5 #endif /* CVC4__EXPR__TERM_CONVERSION_PROOF_GENERATOR_H */ diff --git a/src/expr/term_context_stack.cpp b/src/expr/term_context_stack.cpp index 07d7746ed..557683498 100644 --- a/src/expr/term_context_stack.cpp +++ b/src/expr/term_context_stack.cpp @@ -16,7 +16,7 @@ #include "expr/term_context.h" -namespace CVC4 { +namespace CVC5 { TCtxStack::TCtxStack(const TermContext* tctx) : d_tctx(tctx) {} @@ -75,4 +75,4 @@ TCtxNode TCtxStack::getCurrentNode() const return TCtxNode(curr.first, curr.second, d_tctx); } -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/expr/term_context_stack.h b/src/expr/term_context_stack.h index f40f5f6b2..34c474a52 100644 --- a/src/expr/term_context_stack.h +++ b/src/expr/term_context_stack.h @@ -19,7 +19,7 @@ #include "expr/term_context_node.h" -namespace CVC4 { +namespace CVC5 { /** * A stack for term-context-sensitive terms. Its main advantage is that @@ -68,6 +68,6 @@ class TCtxStack const TermContext* d_tctx; }; -} // namespace CVC4 +} // namespace CVC5 #endif /* CVC4__EXPR__TERM_CONTEXT_STACK_H */ diff --git a/src/expr/term_conversion_proof_generator.cpp b/src/expr/term_conversion_proof_generator.cpp index 470b8c9f8..bfdf4d188 100644 --- a/src/expr/term_conversion_proof_generator.cpp +++ b/src/expr/term_conversion_proof_generator.cpp @@ -21,9 +21,9 @@ #include "expr/term_context.h" #include "expr/term_context_stack.h" -using namespace CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { std::ostream& operator<<(std::ostream& out, TConvPolicy tcpol) { @@ -588,4 +588,4 @@ std::string TConvProofGenerator::toStringDebug() const return ss.str(); } -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/expr/term_conversion_proof_generator.h b/src/expr/term_conversion_proof_generator.h index acff2ded1..734ef103e 100644 --- a/src/expr/term_conversion_proof_generator.h +++ b/src/expr/term_conversion_proof_generator.h @@ -21,7 +21,7 @@ #include "expr/lazy_proof.h" #include "expr/proof_generator.h" -namespace CVC4 { +namespace CVC5 { class ProofNodeManager; class TermContext; @@ -242,6 +242,6 @@ class TConvProofGenerator : public ProofGenerator std::string toStringDebug() const; }; -} // namespace CVC4 +} // namespace CVC5 #endif /* CVC4__EXPR__TERM_CONVERSION_PROOF_GENERATOR_H */ diff --git a/src/expr/type_checker.h b/src/expr/type_checker.h index 0ca2fb806..b502d8013 100644 --- a/src/expr/type_checker.h +++ b/src/expr/type_checker.h @@ -22,7 +22,7 @@ #ifndef CVC4__EXPR__TYPE_CHECKER_H #define CVC4__EXPR__TYPE_CHECKER_H -namespace CVC4 { +namespace CVC5 { namespace expr { class TypeChecker { @@ -35,7 +35,7 @@ public: };/* class TypeChecker */ -}/* CVC4::expr namespace */ -}/* CVC4 namespace */ +} // namespace expr +} // namespace CVC5 #endif /* CVC4__EXPR__TYPE_CHECKER_H */ diff --git a/src/expr/type_checker_template.cpp b/src/expr/type_checker_template.cpp index 527f98384..07dca77e2 100644 --- a/src/expr/type_checker_template.cpp +++ b/src/expr/type_checker_template.cpp @@ -23,7 +23,7 @@ ${typechecker_includes} -namespace CVC4 { +namespace CVC5 { namespace expr { TypeNode TypeChecker::computeType(NodeManager* nodeManager, TNode n, bool check) @@ -71,5 +71,5 @@ ${construles} }/* TypeChecker::computeIsConst */ -}/* CVC4::expr namespace */ -}/* CVC4 namespace */ +} // namespace expr +} // namespace CVC5 diff --git a/src/expr/type_checker_util.h b/src/expr/type_checker_util.h index 5f227423b..1ca23d374 100644 --- a/src/expr/type_checker_util.h +++ b/src/expr/type_checker_util.h @@ -26,7 +26,7 @@ #include "expr/node_manager.h" #include "expr/type_node.h" -namespace CVC4 { +namespace CVC5 { namespace expr { /** Type check returns the builtin operator sort */ @@ -202,4 +202,4 @@ class SimpleTypeRuleVar }; } // namespace expr -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/expr/type_matcher.cpp b/src/expr/type_matcher.cpp index b71a4b515..76d256157 100644 --- a/src/expr/type_matcher.cpp +++ b/src/expr/type_matcher.cpp @@ -14,7 +14,7 @@ #include "type_matcher.h" -namespace CVC4 { +namespace CVC5 { TypeMatcher::TypeMatcher(TypeNode dt) { @@ -125,4 +125,4 @@ void TypeMatcher::getMatches(std::vector& types) const } } -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/expr/type_matcher.h b/src/expr/type_matcher.h index 98c3ce865..651054313 100644 --- a/src/expr/type_matcher.h +++ b/src/expr/type_matcher.h @@ -21,7 +21,7 @@ #include "expr/type_node.h" -namespace CVC4 { +namespace CVC5 { /** * This class is used for inferring the parameters of an instantiated @@ -68,6 +68,6 @@ class TypeMatcher void addTypes(const std::vector& types); }; /* class TypeMatcher */ -} // namespace CVC4 +} // namespace CVC5 #endif /* CVC4__MATCHER_H */ diff --git a/src/expr/type_node.cpp b/src/expr/type_node.cpp index 8d474ca5f..f73bde3eb 100644 --- a/src/expr/type_node.cpp +++ b/src/expr/type_node.cpp @@ -25,7 +25,7 @@ using namespace std; -namespace CVC4 { +namespace CVC5 { TypeNode TypeNode::s_null( &expr::NodeValue::null() ); @@ -499,7 +499,7 @@ TypeNode TypeNode::mostCommonTypeNode(TypeNode t0, TypeNode t1){ TypeNode TypeNode::commonTypeNode(TypeNode t0, TypeNode t1, bool isLeast) { Assert(NodeManager::currentNM() != NULL) - << "There is no current CVC4::NodeManager associated to this thread.\n" + << "There is no current CVC5::NodeManager associated to this thread.\n" "Perhaps a public-facing function is missing a NodeManagerScope ?"; Assert(!t0.isNull()); @@ -717,4 +717,4 @@ TypeNode TypeNode::getBagElementType() const return (*this)[0]; } -}/* CVC4 namespace */ +} // namespace CVC5 diff --git a/src/expr/type_node.h b/src/expr/type_node.h index baff528ff..7b752c3e5 100644 --- a/src/expr/type_node.h +++ b/src/expr/type_node.h @@ -32,14 +32,14 @@ #include "expr/metakind.h" #include "util/cardinality.h" -namespace CVC4 { +namespace CVC5 { class NodeManager; class DType; namespace expr { class NodeValue; -}/* CVC4::expr namespace */ + } // namespace expr /** * Encapsulation of an NodeValue pointer for Types. The reference count is @@ -749,11 +749,11 @@ inline std::ostream& operator<<(std::ostream& out, const TypeNode& n) { typedef TypeNode::HashFunction TypeNodeHashFunction; -}/* CVC4 namespace */ +} // namespace CVC5 #include "expr/node_manager.h" -namespace CVC4 { +namespace CVC5 { inline TypeNode TypeNode::substitute(const TypeNode& type, @@ -860,7 +860,7 @@ template inline typename AttrKind::value_type TypeNode:: getAttribute(const AttrKind&) const { Assert(NodeManager::currentNM() != NULL) - << "There is no current CVC4::NodeManager associated to this thread.\n" + << "There is no current CVC5::NodeManager associated to this thread.\n" "Perhaps a public-facing function is missing a NodeManagerScope ?"; return NodeManager::currentNM()->getAttribute(d_nv, AttrKind()); } @@ -869,7 +869,7 @@ template inline bool TypeNode:: hasAttribute(const AttrKind&) const { Assert(NodeManager::currentNM() != NULL) - << "There is no current CVC4::NodeManager associated to this thread.\n" + << "There is no current CVC5::NodeManager associated to this thread.\n" "Perhaps a public-facing function is missing a NodeManagerScope ?"; return NodeManager::currentNM()->hasAttribute(d_nv, AttrKind()); } @@ -877,7 +877,7 @@ hasAttribute(const AttrKind&) const { template inline bool TypeNode::getAttribute(const AttrKind&, typename AttrKind::value_type& ret) const { Assert(NodeManager::currentNM() != NULL) - << "There is no current CVC4::NodeManager associated to this thread.\n" + << "There is no current CVC5::NodeManager associated to this thread.\n" "Perhaps a public-facing function is missing a NodeManagerScope ?"; return NodeManager::currentNM()->getAttribute(d_nv, AttrKind(), ret); } @@ -886,7 +886,7 @@ template inline void TypeNode:: setAttribute(const AttrKind&, const typename AttrKind::value_type& value) { Assert(NodeManager::currentNM() != NULL) - << "There is no current CVC4::NodeManager associated to this thread.\n" + << "There is no current CVC5::NodeManager associated to this thread.\n" "Perhaps a public-facing function is missing a NodeManagerScope ?"; NodeManager::currentNM()->setAttribute(d_nv, AttrKind(), value); } @@ -1069,6 +1069,6 @@ static void __attribute__((used)) debugPrintRawTypeNode(const TypeNode& n) { } #endif /* CVC4_DEBUG */ -}/* CVC4 namespace */ +} // namespace CVC5 #endif /* CVC4__NODE_H */ diff --git a/src/expr/type_properties_template.h b/src/expr/type_properties_template.h index c0f9fb844..abf5e6173 100644 --- a/src/expr/type_properties_template.h +++ b/src/expr/type_properties_template.h @@ -29,7 +29,7 @@ ${type_properties_includes} -namespace CVC4 { +namespace CVC5 { namespace kind { /** @@ -113,7 +113,7 @@ ${type_groundterms} } } /* mkGroundTerm(TypeNode) */ -}/* CVC4::kind namespace */ -}/* CVC4 namespace */ +} // namespace kind +} // namespace CVC5 #endif /* CVC4__TYPE_PROPERTIES_H */ diff --git a/src/expr/uninterpreted_constant.cpp b/src/expr/uninterpreted_constant.cpp index b2d5a2b12..9d8b12264 100644 --- a/src/expr/uninterpreted_constant.cpp +++ b/src/expr/uninterpreted_constant.cpp @@ -26,7 +26,7 @@ using namespace std; -namespace CVC4 { +namespace CVC5 { UninterpretedConstant::UninterpretedConstant(const TypeNode& type, Integer index) @@ -95,4 +95,4 @@ size_t UninterpretedConstantHashFunction::operator()( * IntegerHashFunction()(uc.getIndex()); } -}/* CVC4 namespace */ +} // namespace CVC5 diff --git a/src/expr/uninterpreted_constant.h b/src/expr/uninterpreted_constant.h index e7c0f9830..00ad68212 100644 --- a/src/expr/uninterpreted_constant.h +++ b/src/expr/uninterpreted_constant.h @@ -24,7 +24,7 @@ #include "util/integer.h" -namespace CVC4 { +namespace CVC5 { class TypeNode; @@ -60,6 +60,6 @@ struct UninterpretedConstantHashFunction size_t operator()(const UninterpretedConstant& uc) const; }; /* struct UninterpretedConstantHashFunction */ -} // namespace CVC4 +} // namespace CVC5 #endif /* CVC4__UNINTERPRETED_CONSTANT_H */ diff --git a/src/main/command_executor.cpp b/src/main/command_executor.cpp index 551880b98..ebe51f359 100644 --- a/src/main/command_executor.cpp +++ b/src/main/command_executor.cpp @@ -26,7 +26,7 @@ #include "main/main.h" #include "smt/command.h" -namespace CVC4 { +namespace CVC5 { namespace main { // Function to cancel any (externally-imposed) limit on CPU time. @@ -331,5 +331,5 @@ void CommandExecutor::flushOutputStreams() { d_options.flushErr(); } -}/* CVC4::main namespace */ -}/* CVC4 namespace */ +} // namespace main +} // namespace CVC5 diff --git a/src/main/command_executor.h b/src/main/command_executor.h index 0dea41383..a2dc4a4e9 100644 --- a/src/main/command_executor.h +++ b/src/main/command_executor.h @@ -24,7 +24,7 @@ #include "smt/smt_engine.h" #include "util/statistics_registry.h" -namespace CVC4 { +namespace CVC5 { class Command; @@ -65,9 +65,10 @@ class CommandExecutor * sequence. Eventually uses doCommandSingleton (which can be * overridden by a derived class). */ - bool doCommand(CVC4::Command* cmd); + bool doCommand(CVC5::Command* cmd); - bool doCommand(std::unique_ptr& cmd) { + bool doCommand(std::unique_ptr& cmd) + { return doCommand(cmd.get()); } @@ -100,7 +101,7 @@ class CommandExecutor protected: /** Executes treating cmd as a singleton */ - virtual bool doCommandSingleton(CVC4::Command* cmd); + virtual bool doCommandSingleton(CVC5::Command* cmd); private: CommandExecutor(); @@ -112,7 +113,7 @@ bool solverInvoke(api::Solver* solver, Command* cmd, std::ostream* out); -}/* CVC4::main namespace */ -}/* CVC4 namespace */ +} // namespace main +} // namespace CVC5 #endif /* CVC4__MAIN__COMMAND_EXECUTOR_H */ diff --git a/src/main/driver_unified.cpp b/src/main/driver_unified.cpp index 2bca01e08..40ed674c0 100644 --- a/src/main/driver_unified.cpp +++ b/src/main/driver_unified.cpp @@ -41,40 +41,39 @@ #include "util/result.h" using namespace std; -using namespace CVC4; -using namespace CVC4::parser; -using namespace CVC4::main; +using namespace CVC5; +using namespace CVC5::parser; +using namespace CVC5::main; -namespace CVC4 { - namespace main { - /** Global options variable */ - thread_local Options* pOptions; +namespace CVC5 { +namespace main { +/** Global options variable */ +thread_local Options* pOptions; - /** Full argv[0] */ - const char *progPath; +/** Full argv[0] */ +const char* progPath; - /** Just the basename component of argv[0] */ - const std::string *progName; +/** Just the basename component of argv[0] */ +const std::string* progName; - /** A pointer to the CommandExecutor (the signal handlers need it) */ - std::unique_ptr pExecutor; +/** A pointer to the CommandExecutor (the signal handlers need it) */ +std::unique_ptr pExecutor; - /** The time point the binary started, accessible to signal handlers */ - std::unique_ptr totalTime; +/** The time point the binary started, accessible to signal handlers */ +std::unique_ptr totalTime; - TotalTimer::~TotalTimer() - { - if (pExecutor != nullptr) - { - auto duration = std::chrono::steady_clock::now() - d_start; - pExecutor->getSmtEngine()->setTotalTimeStatistic( - std::chrono::duration(duration).count()); - } +TotalTimer::~TotalTimer() +{ + if (pExecutor != nullptr) + { + auto duration = std::chrono::steady_clock::now() - d_start; + pExecutor->getSmtEngine()->setTotalTimeStatistic( + std::chrono::duration(duration).count()); + } } - }/* CVC4::main namespace */ -}/* CVC4 namespace */ - + } // namespace main + } // namespace CVC5 void printUsage(Options& opts, bool full) { stringstream ss; @@ -176,12 +175,12 @@ int runCvc4(int argc, char* argv[], Options& opts) { // Determine which messages to show based on smtcomp_mode and verbosity if(Configuration::isMuzzledBuild()) { - DebugChannel.setStream(&CVC4::null_os); - TraceChannel.setStream(&CVC4::null_os); - NoticeChannel.setStream(&CVC4::null_os); - ChatChannel.setStream(&CVC4::null_os); - MessageChannel.setStream(&CVC4::null_os); - WarningChannel.setStream(&CVC4::null_os); + DebugChannel.setStream(&CVC5::null_os); + TraceChannel.setStream(&CVC5::null_os); + NoticeChannel.setStream(&CVC5::null_os); + ChatChannel.setStream(&CVC5::null_os); + MessageChannel.setStream(&CVC5::null_os); + WarningChannel.setStream(&CVC5::null_os); } // important even for muzzled builds (to get result output right) diff --git a/src/main/interactive_shell.cpp b/src/main/interactive_shell.cpp index 4fe8d4da9..91b3d53b3 100644 --- a/src/main/interactive_shell.cpp +++ b/src/main/interactive_shell.cpp @@ -49,7 +49,7 @@ using namespace std; -namespace CVC4 { +namespace CVC5 { using namespace parser; using namespace language; @@ -432,4 +432,4 @@ char* commandGenerator(const char* text, int state) { #endif /* HAVE_LIBEDITLINE */ -}/* CVC4 namespace */ +} // namespace CVC5 diff --git a/src/main/interactive_shell.h b/src/main/interactive_shell.h index b3c54f580..2c421d7b2 100644 --- a/src/main/interactive_shell.h +++ b/src/main/interactive_shell.h @@ -22,7 +22,7 @@ #include "options/options.h" #include "util/unsafe_interrupt_exception.h" -namespace CVC4 { +namespace CVC5 { class Command; class Options; @@ -33,7 +33,7 @@ class Solver; namespace parser { class Parser; -}/* CVC4::parser namespace */ + } // namespace parser class SymbolManager; @@ -72,6 +72,6 @@ public: };/* class InteractiveShell */ -}/* CVC4 namespace */ +} // namespace CVC5 #endif /* CVC4__INTERACTIVE_SHELL_H */ diff --git a/src/main/main.cpp b/src/main/main.cpp index 65b341a12..f880d5ee1 100644 --- a/src/main/main.cpp +++ b/src/main/main.cpp @@ -34,9 +34,9 @@ #include "util/result.h" using namespace std; -using namespace CVC4; -using namespace CVC4::main; -using namespace CVC4::language; +using namespace CVC5; +using namespace CVC5::main; +using namespace CVC5::language; /** * CVC4's main() routine is just an exception-safe wrapper around CVC4. diff --git a/src/main/main.h b/src/main/main.h index 518145577..47312c465 100644 --- a/src/main/main.h +++ b/src/main/main.h @@ -26,7 +26,7 @@ #ifndef CVC4__MAIN__MAIN_H #define CVC4__MAIN__MAIN_H -namespace CVC4 { +namespace CVC5 { namespace main { class CommandExecutor; @@ -38,7 +38,7 @@ extern const char* progPath; extern const std::string* progName; /** A reference for use by the signal handlers to print statistics */ -extern std::unique_ptr pExecutor; +extern std::unique_ptr pExecutor; /** Manages a custom timer for the total runtime in RAII-style. */ class TotalTimer @@ -64,18 +64,18 @@ extern bool segvSpin; extern thread_local Options* pOptions; /** Initialize the driver. Sets signal handlers for SIGINT and SIGSEGV. - * This can throw a CVC4::Exception. + * This can throw a CVC5::Exception. */ void cvc4_init(); /** Shutdown the driver. Frees memory for the signal handlers. */ void cvc4_shutdown() noexcept; -}/* CVC4::main namespace */ -}/* CVC4 namespace */ +} // namespace main +} // namespace CVC5 /** Actual Cvc4 driver functions **/ -int runCvc4(int argc, char* argv[], CVC4::Options&); -void printUsage(CVC4::Options&, bool full = false); +int runCvc4(int argc, char* argv[], CVC5::Options&); +void printUsage(CVC5::Options&, bool full = false); #endif /* CVC4__MAIN__MAIN_H */ diff --git a/src/main/signal_handlers.cpp b/src/main/signal_handlers.cpp index 93014b256..a7a3a073c 100644 --- a/src/main/signal_handlers.cpp +++ b/src/main/signal_handlers.cpp @@ -41,10 +41,10 @@ #include "smt/smt_engine.h" #include "util/safe_print.h" -using CVC4::Exception; +using CVC5::Exception; using namespace std; -namespace CVC4 { +namespace CVC5 { namespace main { /** @@ -343,4 +343,4 @@ void cleanup() noexcept } // namespace signal_handlers } // namespace main -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/main/signal_handlers.h b/src/main/signal_handlers.h index c313b7747..1312ca27d 100644 --- a/src/main/signal_handlers.h +++ b/src/main/signal_handlers.h @@ -17,7 +17,7 @@ #ifndef CVC4__MAIN__SIGNAL_HANDLERS_H #define CVC4__MAIN__SIGNAL_HANDLERS_H -namespace CVC4 { +namespace CVC5 { namespace main { namespace signal_handlers { @@ -41,6 +41,6 @@ void cleanup(); } // namespace signal_handlers } // namespace main -} // namespace CVC4 +} // namespace CVC5 #endif /* CVC4__MAIN__SIGNAL_HANDLERS_H */ diff --git a/src/main/time_limit.cpp b/src/main/time_limit.cpp index fd7164d2c..7f2bc0c61 100644 --- a/src/main/time_limit.cpp +++ b/src/main/time_limit.cpp @@ -58,7 +58,7 @@ #include "signal_handlers.h" -namespace CVC4 { +namespace CVC5 { namespace main { #if HAVE_SETITIMER @@ -133,4 +133,4 @@ TimeLimit install_time_limit(const Options& opts) } } // namespace main -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/main/time_limit.h b/src/main/time_limit.h index 4f7425839..62dc6a6a3 100644 --- a/src/main/time_limit.h +++ b/src/main/time_limit.h @@ -19,7 +19,7 @@ #include "options/options.h" -namespace CVC4 { +namespace CVC5 { namespace main { /** @@ -47,6 +47,6 @@ struct TimeLimit TimeLimit install_time_limit(const Options& opts); } // namespace main -} // namespace CVC4 +} // namespace CVC5 #endif /* CVC4__MAIN__TIME_LIMIT_H */ diff --git a/src/options/README b/src/options/README index 47a7d9db7..92609f433 100644 --- a/src/options/README +++ b/src/options/README @@ -215,7 +215,7 @@ Further information (the old option package) well as an OptionsHandler*. void custom-notification( - const std::string& option, CVC4::options::OptionsHandler* handler); + const std::string& option, CVC5::options::OptionsHandler* handler); The name is provided so multiple options can use the same notification implementation. diff --git a/src/options/base_handlers.h b/src/options/base_handlers.h index 64353af5d..5c223d770 100644 --- a/src/options/base_handlers.h +++ b/src/options/base_handlers.h @@ -26,7 +26,7 @@ #include "options/option_exception.h" -namespace CVC4 { +namespace CVC5 { namespace options { template