From a6bd02c5c442b806b5e01fed40ab9d1017e42bc3 Mon Sep 17 00:00:00 2001 From: Aina Niemetz Date: Tue, 26 Mar 2019 11:33:55 -0700 Subject: Update copyright headers. --- src/theory/uf/symmetry_breaker.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/theory/uf/symmetry_breaker.h') diff --git a/src/theory/uf/symmetry_breaker.h b/src/theory/uf/symmetry_breaker.h index 434ddd93b..dd79b571a 100644 --- a/src/theory/uf/symmetry_breaker.h +++ b/src/theory/uf/symmetry_breaker.h @@ -4,7 +4,7 @@ ** Top contributors (to current version): ** Morgan Deters, Liana Hadarean, Tim King ** This file is part of the CVC4 project. - ** Copyright (c) 2009-2018 by the authors listed in the file AUTHORS + ** Copyright (c) 2009-2019 by the authors listed in the file AUTHORS ** in the top-level source directory) and their institutional affiliations. ** All rights reserved. See the file COPYING in the top-level source ** directory for licensing information.\endverbatim -- cgit v1.2.3 From 2ab48defab1f0c8918cd7612c1943be7503e4d30 Mon Sep 17 00:00:00 2001 From: Mathias Preiner Date: Wed, 24 Apr 2019 15:39:24 -0700 Subject: Do not use __ prefix for header guards. (#2974) Fixes 2887. --- src/api/cvc4cpp.h | 4 +- src/api/cvc4cppkind.h | 6 +-- src/base/configuration.h | 6 +-- src/base/configuration_private.h | 6 +-- src/base/cvc4_assert.h | 6 +-- src/base/cvc4_check.h | 6 +-- src/base/exception.h | 6 +-- src/base/listener.h | 6 +-- src/base/map_util.h | 6 +-- src/base/modal_exception.h | 6 +-- src/base/output.h | 6 +-- src/bindings/java_iterator_adapter.h | 6 +-- src/bindings/java_stream_adapters.h | 6 +-- src/bindings/swig.h | 6 +-- src/context/backtrackable.h | 6 +-- src/context/cdhashmap.h | 6 +-- src/context/cdhashmap_forward.h | 6 +-- src/context/cdhashset.h | 6 +-- src/context/cdhashset_forward.h | 6 +-- src/context/cdinsert_hashmap_forward.h | 6 +-- src/context/cdlist.h | 6 +-- src/context/cdlist_forward.h | 6 +-- src/context/cdo.h | 6 +-- src/context/cdqueue.h | 6 +-- src/context/cdtrail_queue.h | 6 +-- src/context/context.h | 6 +-- src/context/context_mm.h | 6 +-- src/decision/decision_attributes.h | 6 +-- src/decision/decision_engine.h | 6 +-- src/decision/decision_strategy.h | 6 +-- src/decision/justification_heuristic.h | 6 +-- src/expr/array.h | 6 +-- src/expr/array_store_all.h | 6 +-- src/expr/ascription_type.h | 6 +-- src/expr/attribute.h | 6 +-- src/expr/attribute_internals.h | 6 +-- src/expr/chain.h | 6 +-- src/expr/datatype.h | 6 +-- src/expr/expr_iomanip.h | 6 +-- src/expr/expr_manager_scope.h | 6 +-- src/expr/expr_manager_template.h | 6 +-- src/expr/expr_stream.h | 6 +-- src/expr/expr_template.h | 6 +-- src/expr/kind_map.h | 6 +-- src/expr/kind_template.h | 6 +-- src/expr/matcher.h | 6 +-- src/expr/metakind_template.h | 20 +++++----- src/expr/node.h | 6 +-- src/expr/node_algorithm.h | 4 +- src/expr/node_builder.h | 12 +++--- src/expr/node_manager.h | 10 ++--- src/expr/node_manager_listeners.h | 6 +-- src/expr/node_self_iterator.h | 6 +-- src/expr/node_trie.h | 6 +-- src/expr/node_value.h | 22 +++++------ src/expr/pickle_data.h | 10 ++--- src/expr/pickler.h | 6 +-- src/expr/record.h | 6 +-- src/expr/symbol_table.h | 6 +-- src/expr/type.h | 6 +-- src/expr/type_checker.h | 6 +-- src/expr/type_node.h | 6 +-- src/expr/type_properties_template.h | 6 +-- src/expr/variable_type_map.h | 6 +-- src/include/cvc4.h | 6 +-- src/include/cvc4_private.h | 6 +-- src/include/cvc4_private_library.h | 6 +-- src/include/cvc4_public.h | 6 +-- src/lib/clock_gettime.h | 6 +-- src/lib/ffs.h | 6 +-- src/lib/replacements.h | 6 +-- src/lib/strtok_r.h | 6 +-- src/main/command_executor.h | 6 +-- src/main/command_executor_portfolio.h | 6 +-- src/main/interactive_shell.h | 6 +-- src/main/main.h | 6 +-- src/main/portfolio.h | 6 +-- src/main/portfolio_util.h | 6 +-- src/options/argument_extender.h | 6 +-- src/options/argument_extender_implementation.h | 6 +-- src/options/arith_heuristic_pivot_rule.h | 6 +-- src/options/arith_propagation_mode.h | 6 +-- src/options/arith_unate_lemma_mode.h | 6 +-- src/options/base_handlers.h | 6 +-- src/options/bool_to_bv_mode.h | 6 +-- src/options/bv_bitblast_mode.h | 6 +-- src/options/datatypes_modes.h | 6 +-- src/options/decision_mode.h | 6 +-- src/options/decision_weight.h | 6 +-- src/options/language.h | 6 +-- src/options/module_template.h | 6 +-- src/options/open_ostream.h | 6 +-- src/options/option_exception.h | 6 +-- src/options/options.h | 6 +-- src/options/options_handler.h | 6 +-- src/options/options_holder_template.h | 6 +-- src/options/printer_modes.h | 6 +-- src/options/quantifiers_modes.h | 6 +-- src/options/set_language.h | 6 +-- src/options/smt_modes.h | 6 +-- src/options/strings_process_loop_mode.h | 6 +-- src/options/sygus_out_mode.h | 6 +-- src/options/ufss_mode.h | 6 +-- src/parser/antlr_input.h | 6 +-- src/parser/antlr_line_buffered_input.h | 6 +-- src/parser/antlr_tracing.h | 6 +-- src/parser/bounded_token_buffer.h | 6 +-- src/parser/bounded_token_factory.h | 6 +-- src/parser/cvc/cvc_input.h | 6 +-- src/parser/input.h | 6 +-- src/parser/line_buffer.h | 6 +-- src/parser/memory_mapped_input_buffer.h | 6 +-- src/parser/parser.h | 6 +-- src/parser/parser_builder.h | 6 +-- src/parser/parser_exception.h | 6 +-- src/parser/smt1/smt1.h | 6 +-- src/parser/smt1/smt1_input.h | 6 +-- src/parser/smt2/smt2.h | 6 +-- src/parser/smt2/smt2_input.h | 6 +-- src/parser/smt2/sygus_input.h | 6 +-- src/parser/tptp/tptp.h | 6 +-- src/parser/tptp/tptp_input.h | 6 +-- src/preprocessing/assertion_pipeline.h | 6 +-- src/preprocessing/passes/apply_substs.h | 4 +- src/preprocessing/passes/apply_to_const.h | 6 +-- src/preprocessing/passes/bool_to_bv.h | 6 +-- src/preprocessing/passes/bv_abstraction.h | 6 +-- src/preprocessing/passes/bv_ackermann.h | 4 +- src/preprocessing/passes/bv_eager_atoms.h | 6 +-- src/preprocessing/passes/bv_gauss.h | 4 +- src/preprocessing/passes/bv_intro_pow2.h | 6 +-- src/preprocessing/passes/bv_to_bool.h | 6 +-- src/preprocessing/passes/extended_rewriter_pass.h | 6 +-- src/preprocessing/passes/global_negate.h | 6 +-- src/preprocessing/passes/int_to_bv.h | 6 +-- src/preprocessing/passes/ite_removal.h | 6 +-- src/preprocessing/passes/ite_simp.h | 4 +- src/preprocessing/passes/miplib_trick.h | 6 +-- src/preprocessing/passes/nl_ext_purify.h | 6 +-- src/preprocessing/passes/non_clausal_simp.h | 4 +- .../passes/pseudo_boolean_processor.h | 6 +-- src/preprocessing/passes/quantifier_macros.h | 6 +-- src/preprocessing/passes/quantifiers_preprocess.h | 6 +-- src/preprocessing/passes/real_to_int.h | 6 +-- src/preprocessing/passes/rewrite.h | 6 +-- src/preprocessing/passes/sep_skolem_emp.h | 6 +-- src/preprocessing/passes/sort_infer.h | 6 +-- src/preprocessing/passes/static_learning.h | 6 +-- src/preprocessing/passes/sygus_abduct.h | 6 +-- src/preprocessing/passes/sygus_inference.h | 6 +-- src/preprocessing/passes/symmetry_breaker.h | 6 +-- src/preprocessing/passes/symmetry_detect.h | 4 +- src/preprocessing/passes/synth_rew_rules.h | 6 +-- src/preprocessing/passes/theory_preprocess.h | 6 +-- .../passes/unconstrained_simplifier.h | 4 +- src/preprocessing/preprocessing_pass.h | 6 +-- src/preprocessing/preprocessing_pass_context.h | 6 +-- src/preprocessing/preprocessing_pass_registry.h | 6 +-- src/preprocessing/util/ite_utilities.h | 4 +- src/printer/ast/ast_printer.h | 6 +-- src/printer/cvc/cvc_printer.h | 6 +-- src/printer/dagification_visitor.h | 6 +-- src/printer/printer.h | 6 +-- src/printer/smt2/smt2_printer.h | 6 +-- src/printer/sygus_print_callback.h | 6 +-- src/printer/tptp/tptp_printer.h | 6 +-- src/proof/arith_proof.h | 6 +-- src/proof/arith_proof_recorder.h | 4 +- src/proof/array_proof.h | 6 +-- src/proof/bitvector_proof.h | 6 +-- src/proof/clausal_bitvector_proof.h | 6 +-- src/proof/clause_id.h | 6 +-- src/proof/cnf_proof.h | 6 +-- src/proof/dimacs_printer.h | 6 +-- src/proof/drat/drat_proof.h | 6 +-- src/proof/er/er_proof.h | 6 +-- src/proof/lemma_proof.h | 6 +-- src/proof/lfsc_proof_printer.h | 6 +-- src/proof/lrat/lrat_proof.h | 4 +- src/proof/proof.h | 6 +-- src/proof/proof_manager.h | 6 +-- src/proof/proof_output_channel.h | 6 +-- src/proof/resolution_bitvector_proof.h | 6 +-- src/proof/sat_proof.h | 6 +-- src/proof/sat_proof_implementation.h | 6 +-- src/proof/simplify_boolean_node.h | 6 +-- src/proof/skolemization_manager.h | 6 +-- src/proof/theory_proof.h | 6 +-- src/proof/uf_proof.h | 6 +-- src/proof/unsat_core.h | 6 +-- src/prop/bv_sat_solver_notify.h | 4 +- src/prop/cadical.h | 6 +-- src/prop/cnf_stream.h | 6 +-- src/prop/cryptominisat.h | 6 +-- src/prop/prop_engine.h | 6 +-- src/prop/registrar.h | 6 +-- src/prop/sat_solver.h | 6 +-- src/prop/sat_solver_factory.h | 6 +-- src/prop/theory_proxy.h | 8 ++-- src/smt/command.h | 6 +-- src/smt/command_list.h | 6 +-- src/smt/dump.h | 6 +-- src/smt/logic_exception.h | 6 +-- src/smt/logic_request.h | 6 +-- src/smt/managed_ostreams.h | 6 +-- src/smt/model.h | 6 +-- src/smt/model_core_builder.h | 6 +-- src/smt/smt_engine.h | 6 +-- src/smt/smt_engine_scope.h | 6 +-- src/smt/update_ostream.h | 6 +-- src/smt_util/boolean_simplification.h | 6 +-- src/smt_util/lemma_channels.h | 6 +-- src/smt_util/lemma_input_channel.h | 6 +-- src/smt_util/lemma_output_channel.h | 6 +-- src/theory/arith/arith_ite_utils.h | 6 +-- src/theory/arith/arith_msum.h | 6 +-- src/theory/arith/arith_rewriter.h | 6 +-- src/theory/arith/arith_static_learner.h | 6 +-- src/theory/arith/arith_utilities.h | 6 +-- src/theory/arith/arithvar_node_map.h | 6 +-- src/theory/arith/constraint.h | 6 +-- src/theory/arith/constraint_forward.h | 6 +-- src/theory/arith/dio_solver.h | 6 +-- src/theory/arith/nonlinear_extension.h | 6 +-- src/theory/arith/normal_form.h | 6 +-- src/theory/arith/partial_model.h | 6 +-- src/theory/arith/theory_arith_type_rules.h | 6 +-- src/theory/arith/type_enumerator.h | 6 +-- src/theory/arrays/array_info.h | 6 +-- src/theory/arrays/array_proof_reconstruction.h | 6 +-- src/theory/arrays/static_fact_manager.h | 6 +-- src/theory/arrays/theory_arrays.h | 6 +-- src/theory/arrays/theory_arrays_rewriter.h | 6 +-- src/theory/arrays/theory_arrays_type_rules.h | 6 +-- src/theory/arrays/type_enumerator.h | 6 +-- src/theory/arrays/union_find.h | 6 +-- src/theory/assertion.h | 6 +-- src/theory/booleans/circuit_propagator.h | 6 +-- src/theory/booleans/theory_bool.h | 6 +-- src/theory/booleans/theory_bool_rewriter.cpp | 2 +- src/theory/booleans/theory_bool_rewriter.h | 6 +-- src/theory/booleans/theory_bool_type_rules.h | 6 +-- src/theory/booleans/type_enumerator.h | 6 +-- src/theory/builtin/theory_builtin.h | 6 +-- src/theory/builtin/theory_builtin_rewriter.h | 6 +-- src/theory/builtin/theory_builtin_type_rules.h | 6 +-- src/theory/builtin/type_enumerator.h | 6 +-- src/theory/bv/abstraction.h | 4 +- src/theory/bv/bitblast/aig_bitblaster.h | 6 +-- .../bv/bitblast/bitblast_strategies_template.h | 4 +- src/theory/bv/bitblast/bitblast_utils.h | 6 +-- src/theory/bv/bitblast/bitblaster.h | 6 +-- src/theory/bv/bitblast/eager_bitblaster.h | 6 +-- src/theory/bv/bitblast/lazy_bitblaster.h | 6 +-- src/theory/bv/bv_eager_solver.h | 6 +-- src/theory/bv/bv_inequality_graph.h | 6 +-- src/theory/bv/bv_quick_check.h | 6 +-- src/theory/bv/bv_subtheory.h | 6 +-- src/theory/bv/bv_subtheory_inequality.h | 6 +-- src/theory/bv/slicer.h | 6 +-- src/theory/bv/theory_bv.h | 6 +-- src/theory/bv/theory_bv_rewriter.h | 6 +-- src/theory/bv/theory_bv_type_rules.h | 6 +-- src/theory/bv/type_enumerator.h | 6 +-- src/theory/care_graph.h | 6 +-- src/theory/datatypes/datatypes_rewriter.h | 6 +-- src/theory/datatypes/datatypes_sygus.h | 4 +- src/theory/datatypes/sygus_simple_sym.h | 6 +-- src/theory/datatypes/theory_datatypes.h | 6 +-- src/theory/datatypes/theory_datatypes_type_rules.h | 6 +-- src/theory/datatypes/type_enumerator.h | 6 +-- src/theory/decision_manager.h | 6 +-- src/theory/decision_strategy.h | 6 +-- src/theory/evaluator.h | 6 +-- src/theory/example/ecdata.h | 6 +-- src/theory/example/theory_uf_tim.h | 6 +-- src/theory/ext_theory.h | 6 +-- src/theory/fp/fp_converter.h | 6 +-- src/theory/fp/theory_fp.h | 6 +-- src/theory/fp/theory_fp_rewriter.h | 6 +-- src/theory/fp/theory_fp_type_rules.h | 6 +-- src/theory/fp/type_enumerator.h | 6 +-- src/theory/interrupted.h | 6 +-- src/theory/logic_info.h | 6 +-- src/theory/output_channel.h | 6 +-- src/theory/quantifiers/alpha_equivalence.h | 4 +- src/theory/quantifiers/anti_skolem.h | 4 +- src/theory/quantifiers/bv_inverter.h | 6 +-- src/theory/quantifiers/bv_inverter_utils.h | 4 +- .../quantifiers/candidate_rewrite_database.h | 6 +-- src/theory/quantifiers/candidate_rewrite_filter.h | 6 +-- .../quantifiers/cegqi/ceg_arith_instantiator.h | 6 +-- src/theory/quantifiers/cegqi/ceg_bv_instantiator.h | 6 +-- .../quantifiers/cegqi/ceg_bv_instantiator_utils.h | 4 +- src/theory/quantifiers/cegqi/ceg_dt_instantiator.h | 6 +-- .../quantifiers/cegqi/ceg_epr_instantiator.h | 6 +-- src/theory/quantifiers/cegqi/ceg_instantiator.h | 4 +- src/theory/quantifiers/cegqi/inst_strategy_cegqi.h | 4 +- src/theory/quantifiers/dynamic_rewrite.h | 6 +-- .../quantifiers/ematching/candidate_generator.h | 6 +-- src/theory/quantifiers/ematching/ho_trigger.h | 6 +-- .../quantifiers/ematching/inst_match_generator.h | 4 +- .../ematching/inst_strategy_e_matching.h | 4 +- .../quantifiers/ematching/instantiation_engine.h | 6 +-- src/theory/quantifiers/ematching/trigger.h | 6 +-- src/theory/quantifiers/equality_infer.h | 4 +- src/theory/quantifiers/equality_query.h | 6 +-- src/theory/quantifiers/expr_miner.h | 6 +-- src/theory/quantifiers/expr_miner_manager.h | 6 +-- src/theory/quantifiers/extended_rewrite.h | 6 +-- src/theory/quantifiers/first_order_model.h | 6 +-- src/theory/quantifiers/fmf/bounded_integers.h | 4 +- src/theory/quantifiers/fmf/full_model_check.h | 6 +-- src/theory/quantifiers/fmf/model_builder.h | 6 +-- src/theory/quantifiers/fmf/model_engine.h | 6 +-- src/theory/quantifiers/fun_def_process.h | 4 +- src/theory/quantifiers/inst_match.h | 6 +-- src/theory/quantifiers/inst_match_trie.h | 6 +-- src/theory/quantifiers/inst_propagator.h | 4 +- src/theory/quantifiers/inst_strategy_enumerative.h | 4 +- src/theory/quantifiers/instantiate.h | 6 +-- src/theory/quantifiers/lazy_trie.h | 6 +-- src/theory/quantifiers/local_theory_ext.h | 4 +- src/theory/quantifiers/quant_epr.h | 6 +-- src/theory/quantifiers/quant_relevance.h | 6 +-- src/theory/quantifiers/quant_split.h | 4 +- src/theory/quantifiers/quant_util.h | 6 +-- src/theory/quantifiers/quantifiers_attributes.h | 4 +- src/theory/quantifiers/quantifiers_rewriter.h | 6 +-- src/theory/quantifiers/query_generator.h | 6 +-- src/theory/quantifiers/relevant_domain.h | 6 +-- src/theory/quantifiers/rewrite_engine.h | 4 +- src/theory/quantifiers/single_inv_partition.h | 6 +-- src/theory/quantifiers/skolemize.h | 6 +-- src/theory/quantifiers/solution_filter.h | 6 +-- .../quantifiers/sygus/ce_guided_single_inv.h | 4 +- .../quantifiers/sygus/ce_guided_single_inv_sol.h | 4 +- src/theory/quantifiers/sygus/cegis.h | 6 +-- src/theory/quantifiers/sygus/cegis_unif.h | 4 +- .../quantifiers/sygus/enum_stream_substitution.h | 4 +- src/theory/quantifiers/sygus/sygus_enumerator.h | 6 +-- src/theory/quantifiers/sygus/sygus_eval_unfold.h | 6 +-- src/theory/quantifiers/sygus/sygus_explain.h | 6 +-- src/theory/quantifiers/sygus/sygus_grammar_cons.h | 4 +- src/theory/quantifiers/sygus/sygus_grammar_norm.h | 4 +- src/theory/quantifiers/sygus/sygus_grammar_red.h | 6 +-- src/theory/quantifiers/sygus/sygus_invariance.h | 6 +-- src/theory/quantifiers/sygus/sygus_module.h | 6 +-- src/theory/quantifiers/sygus/sygus_pbe.h | 4 +- src/theory/quantifiers/sygus/sygus_process_conj.h | 4 +- src/theory/quantifiers/sygus/sygus_repair_const.h | 6 +-- src/theory/quantifiers/sygus/sygus_unif.h | 6 +-- src/theory/quantifiers/sygus/sygus_unif_io.h | 6 +-- src/theory/quantifiers/sygus/sygus_unif_rl.h | 6 +-- src/theory/quantifiers/sygus/sygus_unif_strat.h | 6 +-- src/theory/quantifiers/sygus/synth_conjecture.h | 4 +- src/theory/quantifiers/sygus/synth_engine.h | 4 +- src/theory/quantifiers/sygus/term_database_sygus.h | 6 +-- src/theory/quantifiers/sygus_sampler.h | 6 +-- src/theory/quantifiers/term_canonize.h | 6 +-- src/theory/quantifiers/term_database.h | 6 +-- src/theory/quantifiers/term_enumeration.h | 6 +-- src/theory/quantifiers/term_util.h | 6 +-- src/theory/quantifiers/theory_quantifiers.h | 6 +-- .../quantifiers/theory_quantifiers_type_rules.h | 6 +-- src/theory/quantifiers_engine.h | 6 +-- src/theory/rep_set.h | 6 +-- src/theory/sep/theory_sep.h | 6 +-- src/theory/sep/theory_sep_rewriter.h | 6 +-- src/theory/sep/theory_sep_type_rules.h | 6 +-- src/theory/sets/normal_form.h | 4 +- src/theory/sets/theory_sets.h | 6 +-- src/theory/sets/theory_sets_private.h | 6 +-- src/theory/sets/theory_sets_rewriter.h | 6 +-- src/theory/sets/theory_sets_type_enumerator.h | 6 +-- src/theory/sets/theory_sets_type_rules.h | 6 +-- src/theory/sort_inference.h | 4 +- src/theory/strings/normal_form.h | 6 +-- src/theory/strings/regexp_elim.h | 6 +-- src/theory/strings/regexp_operation.h | 6 +-- src/theory/strings/regexp_solver.h | 6 +-- src/theory/strings/skolem_cache.h | 6 +-- src/theory/strings/theory_strings.h | 6 +-- src/theory/strings/theory_strings_preprocess.h | 6 +-- src/theory/strings/theory_strings_rewriter.h | 6 +-- src/theory/strings/theory_strings_type_rules.h | 6 +-- src/theory/strings/type_enumerator.h | 6 +-- src/theory/subs_minimize.h | 6 +-- src/theory/substitutions.h | 6 +-- src/theory/theory.h | 6 +-- src/theory/theory_engine.h | 6 +-- src/theory/theory_model.h | 6 +-- src/theory/theory_model_builder.h | 6 +-- src/theory/theory_registrar.h | 6 +-- src/theory/theory_test_utils.h | 6 +-- src/theory/type_enumerator.h | 6 +-- src/theory/type_set.h | 6 +-- src/theory/uf/equality_engine_types.h | 6 +-- src/theory/uf/symmetry_breaker.h | 6 +-- src/theory/uf/theory_uf.h | 6 +-- src/theory/uf/theory_uf_model.h | 4 +- src/theory/uf/theory_uf_rewriter.h | 6 +-- src/theory/uf/theory_uf_strong_solver.h | 6 +-- src/theory/uf/theory_uf_type_rules.h | 6 +-- src/theory/valuation.h | 6 +-- src/util/bin_heap.h | 6 +-- src/util/bitvector.h | 6 +-- src/util/bool.h | 6 +-- src/util/cardinality.h | 6 +-- src/util/channel.h | 6 +-- src/util/debug.h | 6 +-- src/util/divisible.h | 6 +-- src/util/floatingpoint.h.in | 6 +-- src/util/gmp_util.h | 6 +-- src/util/hash.h | 6 +-- src/util/index.h | 6 +-- src/util/integer_cln_imp.h | 6 +-- src/util/integer_gmp_imp.h | 6 +-- src/util/maybe.h | 6 +-- src/util/ostream_util.h | 6 +-- src/util/proof.h | 6 +-- src/util/random.h | 4 +- src/util/rational_cln_imp.h | 6 +-- src/util/rational_gmp_imp.h | 6 +-- src/util/regexp.h | 6 +-- src/util/resource_manager.h | 6 +-- src/util/result.h | 6 +-- src/util/safe_print.h | 6 +-- src/util/sampler.h | 6 +-- src/util/sexpr.h | 6 +-- src/util/smt2_quote_string.h | 6 +-- src/util/statistics.h | 6 +-- src/util/statistics_registry.cpp | 16 ++++---- src/util/statistics_registry.h | 44 +++++++++++----------- src/util/tuple.h | 6 +-- src/util/unsafe_interrupt_exception.h | 6 +-- src/util/utility.h | 6 +-- 437 files changed, 1309 insertions(+), 1309 deletions(-) (limited to 'src/theory/uf/symmetry_breaker.h') diff --git a/src/api/cvc4cpp.h b/src/api/cvc4cpp.h index 95d917f54..203586066 100644 --- a/src/api/cvc4cpp.h +++ b/src/api/cvc4cpp.h @@ -16,8 +16,8 @@ #include "cvc4_public.h" -#ifndef __CVC4__API__CVC4CPP_H -#define __CVC4__API__CVC4CPP_H +#ifndef CVC4__API__CVC4CPP_H +#define CVC4__API__CVC4CPP_H #include "api/cvc4cppkind.h" diff --git a/src/api/cvc4cppkind.h b/src/api/cvc4cppkind.h index f587f44be..3aba6cebb 100644 --- a/src/api/cvc4cppkind.h +++ b/src/api/cvc4cppkind.h @@ -16,8 +16,8 @@ #include "cvc4_public.h" -#ifndef __CVC4__API__CVC4CPPKIND_H -#define __CVC4__API__CVC4CPPKIND_H +#ifndef CVC4__API__CVC4CPPKIND_H +#define CVC4__API__CVC4CPPKIND_H #include @@ -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 (__CVC4__EXPR__NODE_VALUE__NBITS__KIND, currently 10 bits, + * CVC4::Kind (CVC4__EXPR__NODE_VALUE__NBITS__KIND, currently 10 bits, * see expr/metakind_template.h). */ enum CVC4_PUBLIC Kind : int32_t diff --git a/src/base/configuration.h b/src/base/configuration.h index da11b9547..fc149587b 100644 --- a/src/base/configuration.h +++ b/src/base/configuration.h @@ -18,8 +18,8 @@ #include "cvc4_public.h" -#ifndef __CVC4__CONFIGURATION_H -#define __CVC4__CONFIGURATION_H +#ifndef CVC4__CONFIGURATION_H +#define CVC4__CONFIGURATION_H #include @@ -132,4 +132,4 @@ public: }/* CVC4 namespace */ -#endif /* __CVC4__CONFIGURATION_H */ +#endif /* CVC4__CONFIGURATION_H */ diff --git a/src/base/configuration_private.h b/src/base/configuration_private.h index 0476dc24e..3b06a9e6a 100644 --- a/src/base/configuration_private.h +++ b/src/base/configuration_private.h @@ -15,8 +15,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__CONFIGURATION_PRIVATE_H -#define __CVC4__CONFIGURATION_PRIVATE_H +#ifndef CVC4__CONFIGURATION_PRIVATE_H +#define CVC4__CONFIGURATION_PRIVATE_H #include @@ -174,4 +174,4 @@ namespace CVC4 { }/* CVC4 namespace */ -#endif /* __CVC4__CONFIGURATION_PRIVATE_H */ +#endif /* CVC4__CONFIGURATION_PRIVATE_H */ diff --git a/src/base/cvc4_assert.h b/src/base/cvc4_assert.h index e311639f9..a29e6f545 100644 --- a/src/base/cvc4_assert.h +++ b/src/base/cvc4_assert.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__ASSERT_H -#define __CVC4__ASSERT_H +#ifndef CVC4__ASSERT_H +#define CVC4__ASSERT_H #include #include @@ -317,4 +317,4 @@ void debugAssertionFailed(const AssertionException& thisException, } /* CVC4 namespace */ -#endif /* __CVC4__ASSERT_H */ +#endif /* CVC4__ASSERT_H */ diff --git a/src/base/cvc4_check.h b/src/base/cvc4_check.h index 0565ad22a..703931108 100644 --- a/src/base/cvc4_check.h +++ b/src/base/cvc4_check.h @@ -34,8 +34,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__CHECK_H -#define __CVC4__CHECK_H +#ifndef CVC4__CHECK_H +#define CVC4__CHECK_H #include @@ -143,4 +143,4 @@ class OstreamVoider } // namespace CVC4 -#endif /* __CVC4__CHECK_H */ +#endif /* CVC4__CHECK_H */ diff --git a/src/base/exception.h b/src/base/exception.h index c3c785fc1..51829c86c 100644 --- a/src/base/exception.h +++ b/src/base/exception.h @@ -16,8 +16,8 @@ #include "cvc4_public.h" -#ifndef __CVC4__EXCEPTION_H -#define __CVC4__EXCEPTION_H +#ifndef CVC4__EXCEPTION_H +#define CVC4__EXCEPTION_H #include #include @@ -166,4 +166,4 @@ private: }/* CVC4 namespace */ -#endif /* __CVC4__EXCEPTION_H */ +#endif /* CVC4__EXCEPTION_H */ diff --git a/src/base/listener.h b/src/base/listener.h index 0c6045b48..842567646 100644 --- a/src/base/listener.h +++ b/src/base/listener.h @@ -20,8 +20,8 @@ #include "cvc4_public.h" -#ifndef __CVC4__LISTENER_H -#define __CVC4__LISTENER_H +#ifndef CVC4__LISTENER_H +#define CVC4__LISTENER_H #include @@ -161,4 +161,4 @@ class ListenerRegistrationList { }/* CVC4 namespace */ -#endif /* __CVC4__LISTENER_H */ +#endif /* CVC4__LISTENER_H */ diff --git a/src/base/map_util.h b/src/base/map_util.h index d57145917..786e22ae0 100644 --- a/src/base/map_util.h +++ b/src/base/map_util.h @@ -35,8 +35,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__BASE__MAP_UTIL_H -#define __CVC4__BASE__MAP_UTIL_H +#ifndef CVC4__BASE__MAP_UTIL_H +#define CVC4__BASE__MAP_UTIL_H #include "base/cvc4_check.h" @@ -94,4 +94,4 @@ const MapMappedTypeT& FindOrDie(const M& map, const MapKeyTypeT& key) } // namespace CVC4 -#endif /* __CVC4__BASE__MAP_UTIL_H */ +#endif /* CVC4__BASE__MAP_UTIL_H */ diff --git a/src/base/modal_exception.h b/src/base/modal_exception.h index 7d6522ea7..4fa9349fb 100644 --- a/src/base/modal_exception.h +++ b/src/base/modal_exception.h @@ -19,8 +19,8 @@ #include "cvc4_public.h" -#ifndef __CVC4__SMT__MODAL_EXCEPTION_H -#define __CVC4__SMT__MODAL_EXCEPTION_H +#ifndef CVC4__SMT__MODAL_EXCEPTION_H +#define CVC4__SMT__MODAL_EXCEPTION_H #include "base/exception.h" @@ -58,4 +58,4 @@ class CVC4_PUBLIC RecoverableModalException : public CVC4::ModalException { }/* CVC4 namespace */ -#endif /* __CVC4__SMT__MODAL_EXCEPTION_H */ +#endif /* CVC4__SMT__MODAL_EXCEPTION_H */ diff --git a/src/base/output.h b/src/base/output.h index 9fe4ec34d..c3a073580 100644 --- a/src/base/output.h +++ b/src/base/output.h @@ -16,8 +16,8 @@ #include "cvc4_private_library.h" -#ifndef __CVC4__OUTPUT_H -#define __CVC4__OUTPUT_H +#ifndef CVC4__OUTPUT_H +#define CVC4__OUTPUT_H #include #include @@ -543,4 +543,4 @@ inline IndentedScope::~IndentedScope() {} }/* CVC4 namespace */ -#endif /* __CVC4__OUTPUT_H */ +#endif /* CVC4__OUTPUT_H */ diff --git a/src/bindings/java_iterator_adapter.h b/src/bindings/java_iterator_adapter.h index d164fe563..bf1b22e1b 100644 --- a/src/bindings/java_iterator_adapter.h +++ b/src/bindings/java_iterator_adapter.h @@ -27,8 +27,8 @@ # error This should only be included from the Java bindings layer. #endif /* SWIGJAVA */ -#ifndef __CVC4__BINDINGS__JAVA_ITERATOR_ADAPTER_H -#define __CVC4__BINDINGS__JAVA_ITERATOR_ADAPTER_H +#ifndef CVC4__BINDINGS__JAVA_ITERATOR_ADAPTER_H +#define CVC4__BINDINGS__JAVA_ITERATOR_ADAPTER_H namespace CVC4 { @@ -56,4 +56,4 @@ public: }/* CVC4 namespace */ -#endif /* __CVC4__BINDINGS__JAVA_ITERATOR_ADAPTER_H */ +#endif /* CVC4__BINDINGS__JAVA_ITERATOR_ADAPTER_H */ diff --git a/src/bindings/java_stream_adapters.h b/src/bindings/java_stream_adapters.h index d88f34ca6..f2e89c004 100644 --- a/src/bindings/java_stream_adapters.h +++ b/src/bindings/java_stream_adapters.h @@ -37,8 +37,8 @@ #include #include -#ifndef __CVC4__BINDINGS__JAVA_STREAM_ADAPTERS_H -#define __CVC4__BINDINGS__JAVA_STREAM_ADAPTERS_H +#ifndef CVC4__BINDINGS__JAVA_STREAM_ADAPTERS_H +#define CVC4__BINDINGS__JAVA_STREAM_ADAPTERS_H namespace CVC4 { @@ -105,4 +105,4 @@ public: }/* CVC4 namespace */ -#endif /* __CVC4__BINDINGS__JAVA_STREAM_ADAPTERS_H */ +#endif /* CVC4__BINDINGS__JAVA_STREAM_ADAPTERS_H */ diff --git a/src/bindings/swig.h b/src/bindings/swig.h index eb05cc080..81f197d5f 100644 --- a/src/bindings/swig.h +++ b/src/bindings/swig.h @@ -14,8 +14,8 @@ ** Common swig checks and definitions, when generating swig interfaces. **/ -#ifndef __CVC4__BINDINGS__SWIG_H -#define __CVC4__BINDINGS__SWIG_H +#ifndef CVC4__BINDINGS__SWIG_H +#define CVC4__BINDINGS__SWIG_H #ifndef SWIG # error This file should only be included when generating swig interfaces. @@ -30,4 +30,4 @@ // swig doesn't like GCC attributes #define __attribute__(x) -#endif /* __CVC4__BINDINGS__SWIG_H */ +#endif /* CVC4__BINDINGS__SWIG_H */ diff --git a/src/context/backtrackable.h b/src/context/backtrackable.h index 31cbee2b1..5d358941f 100644 --- a/src/context/backtrackable.h +++ b/src/context/backtrackable.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__UTIL__BACKTRACKABLE_H -#define __CVC4__UTIL__BACKTRACKABLE_H +#ifndef CVC4__UTIL__BACKTRACKABLE_H +#define CVC4__UTIL__BACKTRACKABLE_H #include #include @@ -219,4 +219,4 @@ template void Backtracker::checkConsistency() { }/* CVC4 namespace */ -#endif /* __CVC4__UTIL__BACKTRACKABLE_H */ +#endif /* CVC4__UTIL__BACKTRACKABLE_H */ diff --git a/src/context/cdhashmap.h b/src/context/cdhashmap.h index 8d97bfa66..0a1f3387c 100644 --- a/src/context/cdhashmap.h +++ b/src/context/cdhashmap.h @@ -79,8 +79,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__CONTEXT__CDHASHMAP_H -#define __CVC4__CONTEXT__CDHASHMAP_H +#ifndef CVC4__CONTEXT__CDHASHMAP_H +#define CVC4__CONTEXT__CDHASHMAP_H #include #include @@ -448,4 +448,4 @@ public: }/* CVC4::context namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__CONTEXT__CDHASHMAP_H */ +#endif /* CVC4__CONTEXT__CDHASHMAP_H */ diff --git a/src/context/cdhashmap_forward.h b/src/context/cdhashmap_forward.h index a98bbe649..667e71990 100644 --- a/src/context/cdhashmap_forward.h +++ b/src/context/cdhashmap_forward.h @@ -23,8 +23,8 @@ #include "cvc4_public.h" -#ifndef __CVC4__CONTEXT__CDHASHMAP_FORWARD_H -#define __CVC4__CONTEXT__CDHASHMAP_FORWARD_H +#ifndef CVC4__CONTEXT__CDHASHMAP_FORWARD_H +#define CVC4__CONTEXT__CDHASHMAP_FORWARD_H #include @@ -40,4 +40,4 @@ namespace CVC4 { /// \endcond -#endif /* __CVC4__CONTEXT__CDHASHMAP_FORWARD_H */ +#endif /* CVC4__CONTEXT__CDHASHMAP_FORWARD_H */ diff --git a/src/context/cdhashset.h b/src/context/cdhashset.h index 191ac1ac7..a35ecae88 100644 --- a/src/context/cdhashset.h +++ b/src/context/cdhashset.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__CONTEXT__CDHASHSET_H -#define __CVC4__CONTEXT__CDHASHSET_H +#ifndef CVC4__CONTEXT__CDHASHSET_H +#define CVC4__CONTEXT__CDHASHSET_H #include "base/cvc4_assert.h" #include "context/context.h" @@ -158,4 +158,4 @@ public: }/* CVC4::context namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__CONTEXT__CDHASHSET_H */ +#endif /* CVC4__CONTEXT__CDHASHSET_H */ diff --git a/src/context/cdhashset_forward.h b/src/context/cdhashset_forward.h index e2a41404b..dbe8ff052 100644 --- a/src/context/cdhashset_forward.h +++ b/src/context/cdhashset_forward.h @@ -23,8 +23,8 @@ #include "cvc4_public.h" -#ifndef __CVC4__CONTEXT__CDSET_FORWARD_H -#define __CVC4__CONTEXT__CDSET_FORWARD_H +#ifndef CVC4__CONTEXT__CDSET_FORWARD_H +#define CVC4__CONTEXT__CDSET_FORWARD_H #include @@ -35,4 +35,4 @@ class CDHashSet; } // namespace context } // namespace CVC4 -#endif /* __CVC4__CONTEXT__CDSET_FORWARD_H */ +#endif /* CVC4__CONTEXT__CDSET_FORWARD_H */ diff --git a/src/context/cdinsert_hashmap_forward.h b/src/context/cdinsert_hashmap_forward.h index d89a17990..a1559a078 100644 --- a/src/context/cdinsert_hashmap_forward.h +++ b/src/context/cdinsert_hashmap_forward.h @@ -23,8 +23,8 @@ #include "cvc4_public.h" -#ifndef __CVC4__CONTEXT__CDINSERT_HASHMAP_FORWARD_H -#define __CVC4__CONTEXT__CDINSERT_HASHMAP_FORWARD_H +#ifndef CVC4__CONTEXT__CDINSERT_HASHMAP_FORWARD_H +#define CVC4__CONTEXT__CDINSERT_HASHMAP_FORWARD_H #include @@ -35,4 +35,4 @@ class CDInsertHashMap; } // namespace context } // namespace CVC4 -#endif /* __CVC4__CONTEXT__CDINSERT_HASHMAP_FORWARD_H */ +#endif /* CVC4__CONTEXT__CDINSERT_HASHMAP_FORWARD_H */ diff --git a/src/context/cdlist.h b/src/context/cdlist.h index e9b9ccdff..dda88a0fd 100644 --- a/src/context/cdlist.h +++ b/src/context/cdlist.h @@ -17,8 +17,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__CONTEXT__CDLIST_H -#define __CVC4__CONTEXT__CDLIST_H +#ifndef CVC4__CONTEXT__CDLIST_H +#define CVC4__CONTEXT__CDLIST_H #include #include @@ -436,4 +436,4 @@ class CDList > : public ContextObj { }/* CVC4::context namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__CONTEXT__CDLIST_H */ +#endif /* CVC4__CONTEXT__CDLIST_H */ diff --git a/src/context/cdlist_forward.h b/src/context/cdlist_forward.h index 3cdb1962a..d7b1cbc61 100644 --- a/src/context/cdlist_forward.h +++ b/src/context/cdlist_forward.h @@ -29,8 +29,8 @@ #include "cvc4_public.h" -#ifndef __CVC4__CONTEXT__CDLIST_FORWARD_H -#define __CVC4__CONTEXT__CDLIST_FORWARD_H +#ifndef CVC4__CONTEXT__CDLIST_FORWARD_H +#define CVC4__CONTEXT__CDLIST_FORWARD_H #include @@ -53,4 +53,4 @@ class CDList; }/* CVC4::context namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__CONTEXT__CDLIST_FORWARD_H */ +#endif /* CVC4__CONTEXT__CDLIST_FORWARD_H */ diff --git a/src/context/cdo.h b/src/context/cdo.h index 47116d9bb..fe588afb0 100644 --- a/src/context/cdo.h +++ b/src/context/cdo.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__CONTEXT__CDO_H -#define __CVC4__CONTEXT__CDO_H +#ifndef CVC4__CONTEXT__CDO_H +#define CVC4__CONTEXT__CDO_H #include "base/cvc4_assert.h" #include "context/context.h" @@ -180,4 +180,4 @@ public: }/* CVC4::context namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__CONTEXT__CDO_H */ +#endif /* CVC4__CONTEXT__CDO_H */ diff --git a/src/context/cdqueue.h b/src/context/cdqueue.h index 7187e9e7f..6ad0e9339 100644 --- a/src/context/cdqueue.h +++ b/src/context/cdqueue.h @@ -23,8 +23,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__CONTEXT__CDQUEUE_H -#define __CVC4__CONTEXT__CDQUEUE_H +#ifndef CVC4__CONTEXT__CDQUEUE_H +#define CVC4__CONTEXT__CDQUEUE_H #include "context/context.h" #include "context/cdlist.h" @@ -166,4 +166,4 @@ public: }/* CVC4::context namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__CONTEXT__CDQUEUE_H */ +#endif /* CVC4__CONTEXT__CDQUEUE_H */ diff --git a/src/context/cdtrail_queue.h b/src/context/cdtrail_queue.h index dfd5a1353..ad2bef54c 100644 --- a/src/context/cdtrail_queue.h +++ b/src/context/cdtrail_queue.h @@ -20,8 +20,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__CONTEXT__CDTRAIL_QUEUE_H -#define __CVC4__CONTEXT__CDTRAIL_QUEUE_H +#ifndef CVC4__CONTEXT__CDTRAIL_QUEUE_H +#define CVC4__CONTEXT__CDTRAIL_QUEUE_H #include "context/context.h" #include "context/cdlist.h" @@ -92,4 +92,4 @@ public: }/* CVC4::context namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__CONTEXT__CDTRAIL_QUEUE_H */ +#endif /* CVC4__CONTEXT__CDTRAIL_QUEUE_H */ diff --git a/src/context/context.h b/src/context/context.h index fee1efa05..d9d73f770 100644 --- a/src/context/context.h +++ b/src/context/context.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__CONTEXT__CONTEXT_H -#define __CVC4__CONTEXT__CONTEXT_H +#ifndef CVC4__CONTEXT__CONTEXT_H +#define CVC4__CONTEXT__CONTEXT_H #include #include @@ -745,4 +745,4 @@ inline void Scope::addToChain(ContextObj* pContextObj) }/* CVC4::context namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__CONTEXT__CONTEXT_H */ +#endif /* CVC4__CONTEXT__CONTEXT_H */ diff --git a/src/context/context_mm.h b/src/context/context_mm.h index 157034d7f..51726f36e 100644 --- a/src/context/context_mm.h +++ b/src/context/context_mm.h @@ -17,8 +17,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__CONTEXT__CONTEXT_MM_H -#define __CVC4__CONTEXT__CONTEXT_MM_H +#ifndef CVC4__CONTEXT__CONTEXT_MM_H +#define CVC4__CONTEXT__CONTEXT_MM_H #include #include @@ -266,4 +266,4 @@ inline bool operator!=(const ContextMemoryAllocator& a1, }/* CVC4::context namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__CONTEXT__CONTEXT_MM_H */ +#endif /* CVC4__CONTEXT__CONTEXT_MM_H */ diff --git a/src/decision/decision_attributes.h b/src/decision/decision_attributes.h index 387c506ec..bdcc722ec 100644 --- a/src/decision/decision_attributes.h +++ b/src/decision/decision_attributes.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__DECISION__DECISION_ATTRIBUTES_H -#define __CVC4__DECISION__DECISION_ATTRIBUTES_H +#ifndef CVC4__DECISION__DECISION_ATTRIBUTES_H +#define CVC4__DECISION__DECISION_ATTRIBUTES_H #include "options/decision_weight.h" #include "expr/attribute.h" @@ -33,4 +33,4 @@ typedef expr::Attribute DecisionWeightA }/* CVC4::decision namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__DECISION__DECISION_ATTRIBUTES_H */ +#endif /* CVC4__DECISION__DECISION_ATTRIBUTES_H */ diff --git a/src/decision/decision_engine.h b/src/decision/decision_engine.h index dc8cd30fa..73d7e2a31 100644 --- a/src/decision/decision_engine.h +++ b/src/decision/decision_engine.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__DECISION__DECISION_ENGINE_H -#define __CVC4__DECISION__DECISION_ENGINE_H +#ifndef CVC4__DECISION__DECISION_ENGINE_H +#define CVC4__DECISION__DECISION_ENGINE_H #include @@ -219,4 +219,4 @@ private: }/* CVC4 namespace */ -#endif /* __CVC4__DECISION__DECISION_ENGINE_H */ +#endif /* CVC4__DECISION__DECISION_ENGINE_H */ diff --git a/src/decision/decision_strategy.h b/src/decision/decision_strategy.h index 842178ed0..f408515de 100644 --- a/src/decision/decision_strategy.h +++ b/src/decision/decision_strategy.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__DECISION__DECISION_STRATEGY_H -#define __CVC4__DECISION__DECISION_STRATEGY_H +#ifndef CVC4__DECISION__DECISION_STRATEGY_H +#define CVC4__DECISION__DECISION_STRATEGY_H #include "preprocessing/assertion_pipeline.h" #include "prop/sat_solver_types.h" @@ -75,4 +75,4 @@ public: }/* CVC4::decision namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__DECISION__DECISION_STRATEGY_H */ +#endif /* CVC4__DECISION__DECISION_STRATEGY_H */ diff --git a/src/decision/justification_heuristic.h b/src/decision/justification_heuristic.h index 5597f4c84..b2c325628 100644 --- a/src/decision/justification_heuristic.h +++ b/src/decision/justification_heuristic.h @@ -20,8 +20,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__DECISION__JUSTIFICATION_HEURISTIC -#define __CVC4__DECISION__JUSTIFICATION_HEURISTIC +#ifndef CVC4__DECISION__JUSTIFICATION_HEURISTIC +#define CVC4__DECISION__JUSTIFICATION_HEURISTIC #include @@ -181,4 +181,4 @@ public: }/* namespace decision */ }/* namespace CVC4 */ -#endif /* __CVC4__DECISION__JUSTIFICATION_HEURISTIC */ +#endif /* CVC4__DECISION__JUSTIFICATION_HEURISTIC */ diff --git a/src/expr/array.h b/src/expr/array.h index b313a694b..a53ac3cd2 100644 --- a/src/expr/array.h +++ b/src/expr/array.h @@ -16,11 +16,11 @@ #include "cvc4_public.h" -#ifndef __CVC4__ARRAY_H -#define __CVC4__ARRAY_H +#ifndef CVC4__ARRAY_H +#define CVC4__ARRAY_H // we get ArrayType right now by #including type.h. // array.h is still useful for the auto-generated kinds #includes. #include "expr/type.h" -#endif /* __CVC4__ARRAY_H */ +#endif /* CVC4__ARRAY_H */ diff --git a/src/expr/array_store_all.h b/src/expr/array_store_all.h index 3b1112e4f..0adcfde36 100644 --- a/src/expr/array_store_all.h +++ b/src/expr/array_store_all.h @@ -18,8 +18,8 @@ #include "cvc4_public.h" -#ifndef __CVC4__ARRAY_STORE_ALL_H -#define __CVC4__ARRAY_STORE_ALL_H +#ifndef CVC4__ARRAY_STORE_ALL_H +#define CVC4__ARRAY_STORE_ALL_H #include #include @@ -72,4 +72,4 @@ struct CVC4_PUBLIC ArrayStoreAllHashFunction { } // namespace CVC4 -#endif /* __CVC4__ARRAY_STORE_ALL_H */ +#endif /* CVC4__ARRAY_STORE_ALL_H */ diff --git a/src/expr/ascription_type.h b/src/expr/ascription_type.h index 8089a2c85..94258896a 100644 --- a/src/expr/ascription_type.h +++ b/src/expr/ascription_type.h @@ -16,8 +16,8 @@ #include "cvc4_public.h" -#ifndef __CVC4__ASCRIPTION_TYPE_H -#define __CVC4__ASCRIPTION_TYPE_H +#ifndef CVC4__ASCRIPTION_TYPE_H +#define CVC4__ASCRIPTION_TYPE_H #include "expr/type.h" @@ -63,4 +63,4 @@ inline std::ostream& operator<<(std::ostream& out, AscriptionType at) { }/* CVC4 namespace */ -#endif /* __CVC4__ASCRIPTION_TYPE_H */ +#endif /* CVC4__ASCRIPTION_TYPE_H */ diff --git a/src/expr/attribute.h b/src/expr/attribute.h index bccea5dda..46302fc9f 100644 --- a/src/expr/attribute.h +++ b/src/expr/attribute.h @@ -21,8 +21,8 @@ #include "expr/node.h" #include "expr/type_node.h" -#ifndef __CVC4__EXPR__ATTRIBUTE_H -#define __CVC4__EXPR__ATTRIBUTE_H +#ifndef CVC4__EXPR__ATTRIBUTE_H +#define CVC4__EXPR__ATTRIBUTE_H #include #include @@ -578,4 +578,4 @@ NodeManager::setAttribute(TypeNode n, const AttrKind&, }/* CVC4 namespace */ -#endif /* __CVC4__EXPR__ATTRIBUTE_H */ +#endif /* CVC4__EXPR__ATTRIBUTE_H */ diff --git a/src/expr/attribute_internals.h b/src/expr/attribute_internals.h index 83056896f..e47dce434 100644 --- a/src/expr/attribute_internals.h +++ b/src/expr/attribute_internals.h @@ -20,8 +20,8 @@ # error expr/attribute_internals.h should only be included by expr/attribute.h #endif /* CVC4_ATTRIBUTE_H__INCLUDING__ATTRIBUTE_INTERNALS_H */ -#ifndef __CVC4__EXPR__ATTRIBUTE_INTERNALS_H -#define __CVC4__EXPR__ATTRIBUTE_INTERNALS_H +#ifndef CVC4__EXPR__ATTRIBUTE_INTERNALS_H +#define CVC4__EXPR__ATTRIBUTE_INTERNALS_H #include #include @@ -486,4 +486,4 @@ const uint64_t Attribute::s_id = }/* CVC4::expr namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__EXPR__ATTRIBUTE_INTERNALS_H */ +#endif /* CVC4__EXPR__ATTRIBUTE_INTERNALS_H */ diff --git a/src/expr/chain.h b/src/expr/chain.h index 99df9ee7b..9df819b4d 100644 --- a/src/expr/chain.h +++ b/src/expr/chain.h @@ -17,8 +17,8 @@ #include "cvc4_public.h" -#ifndef __CVC4__CHAIN_H -#define __CVC4__CHAIN_H +#ifndef CVC4__CHAIN_H +#define CVC4__CHAIN_H #include "expr/kind.h" #include @@ -48,4 +48,4 @@ struct CVC4_PUBLIC ChainHashFunction { }/* CVC4 namespace */ -#endif /* __CVC4__CHAIN_H */ +#endif /* CVC4__CHAIN_H */ diff --git a/src/expr/datatype.h b/src/expr/datatype.h index 3cc02d3c5..0e8ace709 100644 --- a/src/expr/datatype.h +++ b/src/expr/datatype.h @@ -17,8 +17,8 @@ #include "cvc4_public.h" -#ifndef __CVC4__DATATYPE_H -#define __CVC4__DATATYPE_H +#ifndef CVC4__DATATYPE_H +#define CVC4__DATATYPE_H #include #include @@ -1288,4 +1288,4 @@ inline DatatypeConstructor::const_iterator DatatypeConstructor::end() const }/* CVC4 namespace */ -#endif /* __CVC4__DATATYPE_H */ +#endif /* CVC4__DATATYPE_H */ diff --git a/src/expr/expr_iomanip.h b/src/expr/expr_iomanip.h index 7203063b7..9a582f8c8 100644 --- a/src/expr/expr_iomanip.h +++ b/src/expr/expr_iomanip.h @@ -16,8 +16,8 @@ #include "cvc4_public.h" -#ifndef __CVC4__EXPR__EXPR_IOMANIP_H -#define __CVC4__EXPR__EXPR_IOMANIP_H +#ifndef CVC4__EXPR__EXPR_IOMANIP_H +#define CVC4__EXPR__EXPR_IOMANIP_H #include @@ -236,4 +236,4 @@ std::ostream& operator<<(std::ostream& out, ExprSetDepth sd) CVC4_PUBLIC; }/* CVC4 namespace */ -#endif /* __CVC4__EXPR__EXPR_IOMANIP_H */ +#endif /* CVC4__EXPR__EXPR_IOMANIP_H */ diff --git a/src/expr/expr_manager_scope.h b/src/expr/expr_manager_scope.h index cad5195dd..b494796a1 100644 --- a/src/expr/expr_manager_scope.h +++ b/src/expr/expr_manager_scope.h @@ -17,8 +17,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__EXPR_MANAGER_SCOPE_H -#define __CVC4__EXPR_MANAGER_SCOPE_H +#ifndef CVC4__EXPR_MANAGER_SCOPE_H +#define CVC4__EXPR_MANAGER_SCOPE_H #include "expr/expr.h" #include "expr/node_manager.h" @@ -66,4 +66,4 @@ public: }/* CVC4 namespace */ -#endif /* __CVC4__EXPR_MANAGER_SCOPE_H */ +#endif /* CVC4__EXPR_MANAGER_SCOPE_H */ diff --git a/src/expr/expr_manager_template.h b/src/expr/expr_manager_template.h index 2e6832840..17affaef0 100644 --- a/src/expr/expr_manager_template.h +++ b/src/expr/expr_manager_template.h @@ -16,8 +16,8 @@ #include "cvc4_public.h" -#ifndef __CVC4__EXPR_MANAGER_H -#define __CVC4__EXPR_MANAGER_H +#ifndef CVC4__EXPR_MANAGER_H +#define CVC4__EXPR_MANAGER_H #include @@ -586,4 +586,4 @@ ${mkConst_instantiations} }/* CVC4 namespace */ -#endif /* __CVC4__EXPR_MANAGER_H */ +#endif /* CVC4__EXPR_MANAGER_H */ diff --git a/src/expr/expr_stream.h b/src/expr/expr_stream.h index e4fdeb598..d31e8e4fc 100644 --- a/src/expr/expr_stream.h +++ b/src/expr/expr_stream.h @@ -16,8 +16,8 @@ #include "cvc4_public.h" -#ifndef __CVC4__EXPR_STREAM_H -#define __CVC4__EXPR_STREAM_H +#ifndef CVC4__EXPR_STREAM_H +#define CVC4__EXPR_STREAM_H #include "expr/expr.h" @@ -41,5 +41,5 @@ public: }/* CVC4 namespace */ -#endif /* __CVC4__EXPR_STREAM_H */ +#endif /* CVC4__EXPR_STREAM_H */ diff --git a/src/expr/expr_template.h b/src/expr/expr_template.h index 71f09825e..a32590050 100644 --- a/src/expr/expr_template.h +++ b/src/expr/expr_template.h @@ -23,8 +23,8 @@ // "expr.h" safely, then go on to completely declare their own stuff. ${includes} -#ifndef __CVC4__EXPR_H -#define __CVC4__EXPR_H +#ifndef CVC4__EXPR_H +#define CVC4__EXPR_H #include #include @@ -620,4 +620,4 @@ inline size_t ExprHashFunction::operator()(CVC4::Expr e) const { }/* CVC4 namespace */ -#endif /* __CVC4__EXPR_H */ +#endif /* CVC4__EXPR_H */ diff --git a/src/expr/kind_map.h b/src/expr/kind_map.h index 45e128c37..a5ae73802 100644 --- a/src/expr/kind_map.h +++ b/src/expr/kind_map.h @@ -17,8 +17,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__KIND_MAP_H -#define __CVC4__KIND_MAP_H +#ifndef CVC4__KIND_MAP_H +#define CVC4__KIND_MAP_H #include #include @@ -271,4 +271,4 @@ inline KindMap operator^(Kind k1, KindMap m2) { }/* CVC4 namespace */ -#endif /* __CVC4__KIND_MAP_H */ +#endif /* CVC4__KIND_MAP_H */ diff --git a/src/expr/kind_template.h b/src/expr/kind_template.h index 820fa6b7d..93c37f6cc 100644 --- a/src/expr/kind_template.h +++ b/src/expr/kind_template.h @@ -16,8 +16,8 @@ #include "cvc4_public.h" -#ifndef __CVC4__KIND_H -#define __CVC4__KIND_H +#ifndef CVC4__KIND_H +#define CVC4__KIND_H #include @@ -104,4 +104,4 @@ std::string getStatsPrefix(TheoryId theoryId) CVC4_PUBLIC; }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__KIND_H */ +#endif /* CVC4__KIND_H */ diff --git a/src/expr/matcher.h b/src/expr/matcher.h index a08d17715..95ece7d23 100644 --- a/src/expr/matcher.h +++ b/src/expr/matcher.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__MATCHER_H -#define __CVC4__MATCHER_H +#ifndef CVC4__MATCHER_H +#define CVC4__MATCHER_H #include #include @@ -116,4 +116,4 @@ public: }/* CVC4 namespace */ -#endif /* __CVC4__MATCHER_H */ +#endif /* CVC4__MATCHER_H */ diff --git a/src/expr/metakind_template.h b/src/expr/metakind_template.h index 1da66202b..3550acf05 100644 --- a/src/expr/metakind_template.h +++ b/src/expr/metakind_template.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__KIND__METAKIND_H -#define __CVC4__KIND__METAKIND_H +#ifndef CVC4__KIND__METAKIND_H +#define CVC4__KIND__METAKIND_H #include @@ -118,13 +118,13 @@ namespace kind { namespace metakind { /* these are #defines so their sum can be #if-checked in node_value.h */ -#define __CVC4__EXPR__NODE_VALUE__NBITS__REFCOUNT 20 -#define __CVC4__EXPR__NODE_VALUE__NBITS__KIND 10 -#define __CVC4__EXPR__NODE_VALUE__NBITS__ID 40 -#define __CVC4__EXPR__NODE_VALUE__NBITS__NCHILDREN 26 +#define CVC4__EXPR__NODE_VALUE__NBITS__REFCOUNT 20 +#define CVC4__EXPR__NODE_VALUE__NBITS__KIND 10 +#define CVC4__EXPR__NODE_VALUE__NBITS__ID 40 +#define CVC4__EXPR__NODE_VALUE__NBITS__NCHILDREN 26 static const unsigned MAX_CHILDREN = - (1u << __CVC4__EXPR__NODE_VALUE__NBITS__NCHILDREN) - 1; + (1u << CVC4__EXPR__NODE_VALUE__NBITS__NCHILDREN) - 1; }/* CVC4::kind::metakind namespace */ }/* CVC4::kind namespace */ @@ -143,11 +143,11 @@ struct NodeValuePoolEq { #include "expr/node_value.h" -#endif /* __CVC4__KIND__METAKIND_H */ +#endif /* CVC4__KIND__METAKIND_H */ ${metakind_includes} -#ifdef __CVC4__NODE_MANAGER_NEEDS_CONSTANT_MAP +#ifdef CVC4__NODE_MANAGER_NEEDS_CONSTANT_MAP namespace CVC4 { @@ -234,4 +234,4 @@ ${theory_alternate_doc}"; }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__NODE_MANAGER_NEEDS_CONSTANT_MAP */ +#endif /* CVC4__NODE_MANAGER_NEEDS_CONSTANT_MAP */ diff --git a/src/expr/node.h b/src/expr/node.h index cd7a1f839..935cde308 100644 --- a/src/expr/node.h +++ b/src/expr/node.h @@ -19,8 +19,8 @@ // circular dependency #include "expr/node_value.h" -#ifndef __CVC4__NODE_H -#define __CVC4__NODE_H +#ifndef CVC4__NODE_H +#define CVC4__NODE_H #include @@ -1570,4 +1570,4 @@ static void __attribute__((used)) debugPrintRawTNode(const NodeTemplate& }/* CVC4 namespace */ -#endif /* __CVC4__NODE_H */ +#endif /* CVC4__NODE_H */ diff --git a/src/expr/node_algorithm.h b/src/expr/node_algorithm.h index 0ed6e159b..656f162ae 100644 --- a/src/expr/node_algorithm.h +++ b/src/expr/node_algorithm.h @@ -18,8 +18,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__EXPR__NODE_ALGORITHM_H -#define __CVC4__EXPR__NODE_ALGORITHM_H +#ifndef CVC4__EXPR__NODE_ALGORITHM_H +#define CVC4__EXPR__NODE_ALGORITHM_H #include #include diff --git a/src/expr/node_builder.h b/src/expr/node_builder.h index 299960c1d..9128bc190 100644 --- a/src/expr/node_builder.h +++ b/src/expr/node_builder.h @@ -152,8 +152,8 @@ #include "expr/node.h" #include "expr/type_node.h" -#ifndef __CVC4__NODE_BUILDER_H -#define __CVC4__NODE_BUILDER_H +#ifndef CVC4__NODE_BUILDER_H +#define CVC4__NODE_BUILDER_H #include #include @@ -274,7 +274,7 @@ class NodeBuilder { */ inline void realloc() { size_t newSize = 2 * size_t(d_nvMaxChildren); - size_t hardLimit = (1lu << __CVC4__EXPR__NODE_VALUE__NBITS__NCHILDREN) - 1; + size_t hardLimit = (1lu << CVC4__EXPR__NODE_VALUE__NBITS__NCHILDREN) - 1; realloc(__builtin_expect( ( newSize > hardLimit ), false ) ? hardLimit : newSize); } @@ -774,9 +774,9 @@ template void NodeBuilder::realloc(size_t toSize) { Assert( toSize > d_nvMaxChildren, "attempt to realloc() a NodeBuilder to a smaller/equal size!" ); - Assert( toSize < (1lu << __CVC4__EXPR__NODE_VALUE__NBITS__NCHILDREN), + Assert( toSize < (1lu << CVC4__EXPR__NODE_VALUE__NBITS__NCHILDREN), "attempt to realloc() a NodeBuilder to size %u (beyond hard limit of %u)", - toSize, (1lu << __CVC4__EXPR__NODE_VALUE__NBITS__NCHILDREN) - 1 ); + toSize, (1lu << CVC4__EXPR__NODE_VALUE__NBITS__NCHILDREN) - 1 ); if(__builtin_expect( ( nvIsAllocated() ), false )) { // Ensure d_nv is not modified on allocation failure @@ -1342,4 +1342,4 @@ std::ostream& operator<<(std::ostream& out, const NodeBuilder& nb }/* CVC4 namespace */ -#endif /* __CVC4__NODE_BUILDER_H */ +#endif /* CVC4__NODE_BUILDER_H */ diff --git a/src/expr/node_manager.h b/src/expr/node_manager.h index 30512c41e..510e6d585 100644 --- a/src/expr/node_manager.h +++ b/src/expr/node_manager.h @@ -25,8 +25,8 @@ #include "expr/expr.h" #include "expr/expr_manager.h" -#ifndef __CVC4__NODE_MANAGER_H -#define __CVC4__NODE_MANAGER_H +#ifndef CVC4__NODE_MANAGER_H +#define CVC4__NODE_MANAGER_H #include #include @@ -1215,9 +1215,9 @@ inline TypeNode NodeManager::fromType(Type t) { }/* CVC4 namespace */ -#define __CVC4__NODE_MANAGER_NEEDS_CONSTANT_MAP +#define CVC4__NODE_MANAGER_NEEDS_CONSTANT_MAP #include "expr/metakind.h" -#undef __CVC4__NODE_MANAGER_NEEDS_CONSTANT_MAP +#undef CVC4__NODE_MANAGER_NEEDS_CONSTANT_MAP #include "expr/node_builder.h" @@ -1559,4 +1559,4 @@ NodeClass NodeManager::mkConstInternal(const T& val) { }/* CVC4 namespace */ -#endif /* __CVC4__NODE_MANAGER_H */ +#endif /* CVC4__NODE_MANAGER_H */ diff --git a/src/expr/node_manager_listeners.h b/src/expr/node_manager_listeners.h index 019a785d4..501c6129f 100644 --- a/src/expr/node_manager_listeners.h +++ b/src/expr/node_manager_listeners.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__EXPR__NODE_MANAGER_LISTENERS_H -#define __CVC4__EXPR__NODE_MANAGER_LISTENERS_H +#ifndef CVC4__EXPR__NODE_MANAGER_LISTENERS_H +#define CVC4__EXPR__NODE_MANAGER_LISTENERS_H #include "base/listener.h" #include "util/resource_manager.h" @@ -64,4 +64,4 @@ class RlimitPerListener : public Listener { }/* CVC4::expr namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__EXPR__NODE_MANAGER_LISTENERS_H */ +#endif /* CVC4__EXPR__NODE_MANAGER_LISTENERS_H */ diff --git a/src/expr/node_self_iterator.h b/src/expr/node_self_iterator.h index e81d4c524..7e0478acc 100644 --- a/src/expr/node_self_iterator.h +++ b/src/expr/node_self_iterator.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__EXPR__NODE_SELF_ITERATOR_H -#define __CVC4__EXPR__NODE_SELF_ITERATOR_H +#ifndef CVC4__EXPR__NODE_SELF_ITERATOR_H +#define CVC4__EXPR__NODE_SELF_ITERATOR_H #include @@ -125,4 +125,4 @@ inline bool NodeSelfIterator::operator!=(NodeSelfIterator i) const { }/* CVC4::expr namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__EXPR__NODE_SELF_ITERATOR_H */ +#endif /* CVC4__EXPR__NODE_SELF_ITERATOR_H */ diff --git a/src/expr/node_trie.h b/src/expr/node_trie.h index bc2e17ed0..7aa740a42 100644 --- a/src/expr/node_trie.h +++ b/src/expr/node_trie.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__EXPR__NODE_TRIE_H -#define __CVC4__EXPR__NODE_TRIE_H +#ifndef CVC4__EXPR__NODE_TRIE_H +#define CVC4__EXPR__NODE_TRIE_H #include #include "expr/node.h" @@ -109,4 +109,4 @@ typedef NodeTemplateTrie TNodeTrie; } // namespace theory } // namespace CVC4 -#endif /* __CVC4__EXPR__NODE_TRIE_H */ +#endif /* CVC4__EXPR__NODE_TRIE_H */ diff --git a/src/expr/node_value.h b/src/expr/node_value.h index 4881033cb..024a13941 100644 --- a/src/expr/node_value.h +++ b/src/expr/node_value.h @@ -23,8 +23,8 @@ // circular dependency #include "expr/metakind.h" -#ifndef __CVC4__EXPR__NODE_VALUE_H -#define __CVC4__EXPR__NODE_VALUE_H +#ifndef CVC4__EXPR__NODE_VALUE_H +#define CVC4__EXPR__NODE_VALUE_H #include @@ -59,10 +59,10 @@ namespace kind { namespace expr { -#if __CVC4__EXPR__NODE_VALUE__NBITS__REFCOUNT + \ - __CVC4__EXPR__NODE_VALUE__NBITS__KIND + \ - __CVC4__EXPR__NODE_VALUE__NBITS__ID + \ - __CVC4__EXPR__NODE_VALUE__NBITS__NCHILDREN != 96 +#if CVC4__EXPR__NODE_VALUE__NBITS__REFCOUNT + \ + CVC4__EXPR__NODE_VALUE__NBITS__KIND + \ + CVC4__EXPR__NODE_VALUE__NBITS__ID + \ + CVC4__EXPR__NODE_VALUE__NBITS__NCHILDREN != 96 # error NodeValue header bit assignment does not sum to 96 ! #endif /* sum != 96 */ @@ -71,10 +71,10 @@ namespace expr { */ class NodeValue { - static const unsigned NBITS_REFCOUNT = __CVC4__EXPR__NODE_VALUE__NBITS__REFCOUNT; - static const unsigned NBITS_KIND = __CVC4__EXPR__NODE_VALUE__NBITS__KIND; - static const unsigned NBITS_ID = __CVC4__EXPR__NODE_VALUE__NBITS__ID; - static const unsigned NBITS_NCHILDREN = __CVC4__EXPR__NODE_VALUE__NBITS__NCHILDREN; + static const unsigned NBITS_REFCOUNT = CVC4__EXPR__NODE_VALUE__NBITS__REFCOUNT; + static const unsigned NBITS_KIND = CVC4__EXPR__NODE_VALUE__NBITS__KIND; + static const unsigned NBITS_ID = CVC4__EXPR__NODE_VALUE__NBITS__ID; + static const unsigned NBITS_NCHILDREN = CVC4__EXPR__NODE_VALUE__NBITS__NCHILDREN; /** Maximum reference count possible. Used for sticky * reference-counting. Should be (1 << num_bits(d_rc)) - 1 */ @@ -549,4 +549,4 @@ static void __attribute__((used)) debugPrintRawNodeValue(const expr::NodeValue* }/* CVC4 namespace */ -#endif /* __CVC4__EXPR__NODE_VALUE_H */ +#endif /* CVC4__EXPR__NODE_VALUE_H */ diff --git a/src/expr/pickle_data.h b/src/expr/pickle_data.h index af91fbbea..316b6285c 100644 --- a/src/expr/pickle_data.h +++ b/src/expr/pickle_data.h @@ -20,8 +20,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__PICKLE_DATA_H -#define __CVC4__PICKLE_DATA_H +#ifndef CVC4__PICKLE_DATA_H +#define CVC4__PICKLE_DATA_H #include #include @@ -44,8 +44,8 @@ namespace expr { namespace pickle { const unsigned NBITS_BLOCK = 64; -const unsigned NBITS_KIND = __CVC4__EXPR__NODE_VALUE__NBITS__KIND; -const unsigned NBITS_NCHILDREN = __CVC4__EXPR__NODE_VALUE__NBITS__NCHILDREN; +const unsigned NBITS_KIND = CVC4__EXPR__NODE_VALUE__NBITS__KIND; +const unsigned NBITS_NCHILDREN = CVC4__EXPR__NODE_VALUE__NBITS__NCHILDREN; const unsigned NBITS_CONSTBLOCKS = 32; struct BlockHeader { @@ -117,4 +117,4 @@ public: }/* CVC4::expr namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__PICKLE_DATA_H */ +#endif /* CVC4__PICKLE_DATA_H */ diff --git a/src/expr/pickler.h b/src/expr/pickler.h index f0d219eeb..02abdf18d 100644 --- a/src/expr/pickler.h +++ b/src/expr/pickler.h @@ -18,8 +18,8 @@ #include "cvc4_public.h" -#ifndef __CVC4__PICKLER_H -#define __CVC4__PICKLER_H +#ifndef CVC4__PICKLER_H +#define CVC4__PICKLER_H #include "expr/variable_type_map.h" #include "expr/expr.h" @@ -126,4 +126,4 @@ protected: }/* CVC4::expr namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__PICKLER_H */ +#endif /* CVC4__PICKLER_H */ diff --git a/src/expr/record.h b/src/expr/record.h index 98fb5c106..bfa5d9395 100644 --- a/src/expr/record.h +++ b/src/expr/record.h @@ -16,8 +16,8 @@ #include "cvc4_public.h" -#ifndef __CVC4__RECORD_H -#define __CVC4__RECORD_H +#ifndef CVC4__RECORD_H +#define CVC4__RECORD_H #include #include @@ -90,4 +90,4 @@ std::ostream& operator<<(std::ostream& os, const Record& r) CVC4_PUBLIC; }/* CVC4 namespace */ -#endif /* __CVC4__RECORD_H */ +#endif /* CVC4__RECORD_H */ diff --git a/src/expr/symbol_table.h b/src/expr/symbol_table.h index ec89dd8b3..07f557059 100644 --- a/src/expr/symbol_table.h +++ b/src/expr/symbol_table.h @@ -16,8 +16,8 @@ #include "cvc4_public.h" -#ifndef __CVC4__SYMBOL_TABLE_H -#define __CVC4__SYMBOL_TABLE_H +#ifndef CVC4__SYMBOL_TABLE_H +#define CVC4__SYMBOL_TABLE_H #include #include @@ -246,4 +246,4 @@ class CVC4_PUBLIC SymbolTable { } // namespace CVC4 -#endif /* __CVC4__SYMBOL_TABLE_H */ +#endif /* CVC4__SYMBOL_TABLE_H */ diff --git a/src/expr/type.h b/src/expr/type.h index 943af2344..2c68c9e73 100644 --- a/src/expr/type.h +++ b/src/expr/type.h @@ -16,8 +16,8 @@ #include "cvc4_public.h" -#ifndef __CVC4__TYPE_H -#define __CVC4__TYPE_H +#ifndef CVC4__TYPE_H +#define CVC4__TYPE_H #include #include @@ -665,4 +665,4 @@ class CVC4_PUBLIC TesterType : public Type { }/* CVC4 namespace */ -#endif /* __CVC4__TYPE_H */ +#endif /* CVC4__TYPE_H */ diff --git a/src/expr/type_checker.h b/src/expr/type_checker.h index b88f6eb5c..8c03cea98 100644 --- a/src/expr/type_checker.h +++ b/src/expr/type_checker.h @@ -19,8 +19,8 @@ // ordering dependence #include "expr/node.h" -#ifndef __CVC4__EXPR__TYPE_CHECKER_H -#define __CVC4__EXPR__TYPE_CHECKER_H +#ifndef CVC4__EXPR__TYPE_CHECKER_H +#define CVC4__EXPR__TYPE_CHECKER_H namespace CVC4 { namespace expr { @@ -40,4 +40,4 @@ public: }/* CVC4::expr namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__EXPR__TYPE_CHECKER_H */ +#endif /* CVC4__EXPR__TYPE_CHECKER_H */ diff --git a/src/expr/type_node.h b/src/expr/type_node.h index 6babc104d..8ed26596b 100644 --- a/src/expr/type_node.h +++ b/src/expr/type_node.h @@ -19,8 +19,8 @@ // circular dependency #include "expr/node_value.h" -#ifndef __CVC4__TYPE_NODE_H -#define __CVC4__TYPE_NODE_H +#ifndef CVC4__TYPE_NODE_H +#define CVC4__TYPE_NODE_H #include @@ -1072,4 +1072,4 @@ static void __attribute__((used)) debugPrintRawTypeNode(const TypeNode& n) { }/* CVC4 namespace */ -#endif /* __CVC4__NODE_H */ +#endif /* CVC4__NODE_H */ diff --git a/src/expr/type_properties_template.h b/src/expr/type_properties_template.h index 8d596ddaa..88447a125 100644 --- a/src/expr/type_properties_template.h +++ b/src/expr/type_properties_template.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__TYPE_PROPERTIES_H -#define __CVC4__TYPE_PROPERTIES_H +#ifndef CVC4__TYPE_PROPERTIES_H +#define CVC4__TYPE_PROPERTIES_H #line 23 "${template}" @@ -138,4 +138,4 @@ ${type_groundterms} }/* CVC4::kind namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__TYPE_PROPERTIES_H */ +#endif /* CVC4__TYPE_PROPERTIES_H */ diff --git a/src/expr/variable_type_map.h b/src/expr/variable_type_map.h index fe0521991..ba1c60549 100644 --- a/src/expr/variable_type_map.h +++ b/src/expr/variable_type_map.h @@ -17,8 +17,8 @@ #include "cvc4_public.h" -#ifndef __CVC4__VARIABLE_TYPE_MAP_H -#define __CVC4__VARIABLE_TYPE_MAP_H +#ifndef CVC4__VARIABLE_TYPE_MAP_H +#define CVC4__VARIABLE_TYPE_MAP_H #include @@ -60,4 +60,4 @@ struct CVC4_PUBLIC ExprManagerMapCollection { }/* CVC4 namespace */ -#endif /* __CVC4__VARIABLE_MAP_H */ +#endif /* CVC4__VARIABLE_MAP_H */ diff --git a/src/include/cvc4.h b/src/include/cvc4.h index 9f3332988..86433731f 100644 --- a/src/include/cvc4.h +++ b/src/include/cvc4.h @@ -15,8 +15,8 @@ ** most-commonly used CVC4 public-facing class interfaces. **/ -#ifndef __CVC4__CVC4_H -#define __CVC4__CVC4_H +#ifndef CVC4__CVC4_H +#define CVC4__CVC4_H #include #include @@ -31,4 +31,4 @@ #include #include -#endif /* __CVC4__CVC4_H */ +#endif /* CVC4__CVC4_H */ diff --git a/src/include/cvc4_private.h b/src/include/cvc4_private.h index 14b18e922..cadbbae33 100644 --- a/src/include/cvc4_private.h +++ b/src/include/cvc4_private.h @@ -16,8 +16,8 @@ ** warning when the file is included improperly. **/ -#ifndef __CVC4_PRIVATE_H -#define __CVC4_PRIVATE_H +#ifndef CVC4_PRIVATE_H +#define CVC4_PRIVATE_H #if ! (defined(__BUILDING_CVC4LIB) || defined(__BUILDING_CVC4LIB_UNIT_TEST)) # error A private CVC4 header was included when not building the library or private unit test code. @@ -27,4 +27,4 @@ #include "cvc4_public.h" #include "cvc4autoconfig.h" -#endif /* __CVC4_PRIVATE_H */ +#endif /* CVC4_PRIVATE_H */ diff --git a/src/include/cvc4_private_library.h b/src/include/cvc4_private_library.h index be020666f..6c0c8f324 100644 --- a/src/include/cvc4_private_library.h +++ b/src/include/cvc4_private_library.h @@ -16,8 +16,8 @@ ** warning when the file is included improperly. **/ -#ifndef __CVC4_PRIVATE_LIBRARY_H -#define __CVC4_PRIVATE_LIBRARY_H +#ifndef CVC4_PRIVATE_LIBRARY_H +#define CVC4_PRIVATE_LIBRARY_H #if !(defined(__BUILDING_CVC4LIB) || defined(__BUILDING_CVC4LIB_UNIT_TEST) \ || defined(__BUILDING_CVC4PARSERLIB) \ @@ -29,4 +29,4 @@ #include "cvc4_public.h" #include "cvc4autoconfig.h" -#endif /* __CVC4_PRIVATE_LIBRARY_H */ +#endif /* CVC4_PRIVATE_LIBRARY_H */ diff --git a/src/include/cvc4_public.h b/src/include/cvc4_public.h index 307ba5974..39b919f9f 100644 --- a/src/include/cvc4_public.h +++ b/src/include/cvc4_public.h @@ -16,8 +16,8 @@ ** the libraries and driver binary, and also exported to the user. **/ -#ifndef __CVC4_PUBLIC_H -#define __CVC4_PUBLIC_H +#ifndef CVC4_PUBLIC_H +#define CVC4_PUBLIC_H #include @@ -52,4 +52,4 @@ # define CVC4_WARN_UNUSED_RESULT #endif /* __GNUC__ */ -#endif /* __CVC4_PUBLIC_H */ +#endif /* CVC4_PUBLIC_H */ diff --git a/src/lib/clock_gettime.h b/src/lib/clock_gettime.h index 294722121..d9382f506 100644 --- a/src/lib/clock_gettime.h +++ b/src/lib/clock_gettime.h @@ -16,8 +16,8 @@ #include "cvc4_private_library.h" -#ifndef __CVC4__LIB__CLOCK_GETTIME_H -#define __CVC4__LIB__CLOCK_GETTIME_H +#ifndef CVC4__LIB__CLOCK_GETTIME_H +#define CVC4__LIB__CLOCK_GETTIME_H #include "lib/replacements.h" @@ -72,4 +72,4 @@ long clock_gettime(clockid_t which_clock, struct timespec* tp); #endif /* __cplusplus */ #endif /* HAVE_CLOCK_GETTIME */ -#endif /*__CVC4__LIB__CLOCK_GETTIME_H */ +#endif /*CVC4__LIB__CLOCK_GETTIME_H */ diff --git a/src/lib/ffs.h b/src/lib/ffs.h index be34a98a3..ce7ecc2a1 100644 --- a/src/lib/ffs.h +++ b/src/lib/ffs.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__LIB__FFS_H -#define __CVC4__LIB__FFS_H +#ifndef CVC4__LIB__FFS_H +#define CVC4__LIB__FFS_H //We include this for HAVE_FFS #include "cvc4autoconfig.h" @@ -42,4 +42,4 @@ int ffs(int i); #endif /* __cplusplus */ #endif /* HAVE_FFS */ -#endif /* __CVC4__LIB__FFS_H */ +#endif /* CVC4__LIB__FFS_H */ diff --git a/src/lib/replacements.h b/src/lib/replacements.h index 2a857a4ef..fef6baa28 100644 --- a/src/lib/replacements.h +++ b/src/lib/replacements.h @@ -14,8 +14,8 @@ ** Common header for replacement function sources. **/ -#ifndef __CVC4__LIB__REPLACEMENTS_H -#define __CVC4__LIB__REPLACEMENTS_H +#ifndef CVC4__LIB__REPLACEMENTS_H +#define CVC4__LIB__REPLACEMENTS_H #if (defined(__BUILDING_CVC4LIB) || defined(__BUILDING_CVC4LIB_UNIT_TEST)) && !defined(__BUILDING_STATISTICS_FOR_EXPORT) # include "cvc4_private.h" @@ -31,4 +31,4 @@ # endif #endif -#endif /* __CVC4__LIB__REPLACEMENTS_H */ +#endif /* CVC4__LIB__REPLACEMENTS_H */ diff --git a/src/lib/strtok_r.h b/src/lib/strtok_r.h index 8243157b5..0640893c9 100644 --- a/src/lib/strtok_r.h +++ b/src/lib/strtok_r.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__LIB__STRTOK_R_H -#define __CVC4__LIB__STRTOK_R_H +#ifndef CVC4__LIB__STRTOK_R_H +#define CVC4__LIB__STRTOK_R_H #ifdef HAVE_STRTOK_R @@ -39,4 +39,4 @@ char* strtok_r(char *str, const char *delim, char **saveptr); #endif /* __cplusplus */ #endif /* HAVE_STRTOK_R */ -#endif /* __CVC4__LIB__STRTOK_R_H */ +#endif /* CVC4__LIB__STRTOK_R_H */ diff --git a/src/main/command_executor.h b/src/main/command_executor.h index dde36a453..c71f4d7a5 100644 --- a/src/main/command_executor.h +++ b/src/main/command_executor.h @@ -12,8 +12,8 @@ ** \brief An additional layer between commands and invoking them. **/ -#ifndef __CVC4__MAIN__COMMAND_EXECUTOR_H -#define __CVC4__MAIN__COMMAND_EXECUTOR_H +#ifndef CVC4__MAIN__COMMAND_EXECUTOR_H +#define CVC4__MAIN__COMMAND_EXECUTOR_H #include #include @@ -104,4 +104,4 @@ bool smtEngineInvoke(SmtEngine* smt, Command* cmd, std::ostream *out); }/* CVC4::main namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__MAIN__COMMAND_EXECUTOR_H */ +#endif /* CVC4__MAIN__COMMAND_EXECUTOR_H */ diff --git a/src/main/command_executor_portfolio.h b/src/main/command_executor_portfolio.h index c35fdbcb1..ef3329ef5 100644 --- a/src/main/command_executor_portfolio.h +++ b/src/main/command_executor_portfolio.h @@ -15,8 +15,8 @@ ** threads. **/ -#ifndef __CVC4__MAIN__COMMAND_EXECUTOR_PORTFOLIO_H -#define __CVC4__MAIN__COMMAND_EXECUTOR_PORTFOLIO_H +#ifndef CVC4__MAIN__COMMAND_EXECUTOR_PORTFOLIO_H +#define CVC4__MAIN__COMMAND_EXECUTOR_PORTFOLIO_H #include "main/command_executor.h" #include "main/portfolio_util.h" @@ -82,4 +82,4 @@ private: }/* CVC4::main namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__MAIN__COMMAND_EXECUTOR_PORTFOLIO_H */ +#endif /* CVC4__MAIN__COMMAND_EXECUTOR_PORTFOLIO_H */ diff --git a/src/main/interactive_shell.h b/src/main/interactive_shell.h index b2530dc37..7ed5a1c1f 100644 --- a/src/main/interactive_shell.h +++ b/src/main/interactive_shell.h @@ -12,8 +12,8 @@ ** \brief Interactive shell for CVC4 **/ -#ifndef __CVC4__INTERACTIVE_SHELL_H -#define __CVC4__INTERACTIVE_SHELL_H +#ifndef CVC4__INTERACTIVE_SHELL_H +#define CVC4__INTERACTIVE_SHELL_H #include #include @@ -72,4 +72,4 @@ public: }/* CVC4 namespace */ -#endif /* __CVC4__INTERACTIVE_SHELL_H */ +#endif /* CVC4__INTERACTIVE_SHELL_H */ diff --git a/src/main/main.h b/src/main/main.h index 3199273cb..266d043aa 100644 --- a/src/main/main.h +++ b/src/main/main.h @@ -25,8 +25,8 @@ #include "util/statistics.h" #include "util/statistics_registry.h" -#ifndef __CVC4__MAIN__MAIN_H -#define __CVC4__MAIN__MAIN_H +#ifndef CVC4__MAIN__MAIN_H +#define CVC4__MAIN__MAIN_H namespace CVC4 { namespace main { @@ -70,4 +70,4 @@ void cvc4_shutdown() noexcept; int runCvc4(int argc, char* argv[], CVC4::Options&); void printUsage(CVC4::Options&, bool full = false); -#endif /* __CVC4__MAIN__MAIN_H */ +#endif /* CVC4__MAIN__MAIN_H */ diff --git a/src/main/portfolio.h b/src/main/portfolio.h index 54e38eb3d..2cb23d5c5 100644 --- a/src/main/portfolio.h +++ b/src/main/portfolio.h @@ -13,8 +13,8 @@ ** (potentially cooperative) race **/ -#ifndef __CVC4__PORTFOLIO_H -#define __CVC4__PORTFOLIO_H +#ifndef CVC4__PORTFOLIO_H +#define CVC4__PORTFOLIO_H #include #include @@ -38,4 +38,4 @@ std::pair runPortfolio(int numThreads, }/* CVC4 namespace */ -#endif /* __CVC4__PORTFOLIO_H */ +#endif /* CVC4__PORTFOLIO_H */ diff --git a/src/main/portfolio_util.h b/src/main/portfolio_util.h index ab5f26f90..e5ca296ae 100644 --- a/src/main/portfolio_util.h +++ b/src/main/portfolio_util.h @@ -12,8 +12,8 @@ ** \brief Code relevant only for portfolio builds **/ -#ifndef __CVC4__PORTFOLIO_UTIL_H -#define __CVC4__PORTFOLIO_UTIL_H +#ifndef CVC4__PORTFOLIO_UTIL_H +#define CVC4__PORTFOLIO_UTIL_H #include @@ -177,4 +177,4 @@ void sharingManager(unsigned numThreads, }/* CVC4 namespace */ -#endif /* __CVC4__PORTFOLIO_UTIL_H */ +#endif /* CVC4__PORTFOLIO_UTIL_H */ diff --git a/src/options/argument_extender.h b/src/options/argument_extender.h index 5ba8d09d0..e3cec3c25 100644 --- a/src/options/argument_extender.h +++ b/src/options/argument_extender.h @@ -16,8 +16,8 @@ #include "cvc4_public.h" -#ifndef __CVC4__OPTIONS__ARGUMENT_EXTENDER_H -#define __CVC4__OPTIONS__ARGUMENT_EXTENDER_H +#ifndef CVC4__OPTIONS__ARGUMENT_EXTENDER_H +#define CVC4__OPTIONS__ARGUMENT_EXTENDER_H #include @@ -82,4 +82,4 @@ public: }/* CVC4::options namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__OPTIONS__ARGUMENT_EXTENDER_H */ +#endif /* CVC4__OPTIONS__ARGUMENT_EXTENDER_H */ diff --git a/src/options/argument_extender_implementation.h b/src/options/argument_extender_implementation.h index 33a7ee78e..9906bb420 100644 --- a/src/options/argument_extender_implementation.h +++ b/src/options/argument_extender_implementation.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__OPTIONS__ARGUMENT_EXTENDER_IMPLEMENTATION_H -#define __CVC4__OPTIONS__ARGUMENT_EXTENDER_IMPLEMENTATION_H +#ifndef CVC4__OPTIONS__ARGUMENT_EXTENDER_IMPLEMENTATION_H +#define CVC4__OPTIONS__ARGUMENT_EXTENDER_IMPLEMENTATION_H #include #include @@ -112,4 +112,4 @@ class ArgumentExtenderImplementation : public ArgumentExtender { }/* CVC4::options namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__OPTIONS__ARGUMENT_EXTENDER_IMPLEMENTATION_H */ +#endif /* CVC4__OPTIONS__ARGUMENT_EXTENDER_IMPLEMENTATION_H */ diff --git a/src/options/arith_heuristic_pivot_rule.h b/src/options/arith_heuristic_pivot_rule.h index 7e27a0513..2caa21043 100644 --- a/src/options/arith_heuristic_pivot_rule.h +++ b/src/options/arith_heuristic_pivot_rule.h @@ -17,8 +17,8 @@ #include "cvc4_public.h" -#ifndef __CVC4__THEORY__ARITH__ARITH_HEURISTIC_PIVOT_RULE_H -#define __CVC4__THEORY__ARITH__ARITH_HEURISTIC_PIVOT_RULE_H +#ifndef CVC4__THEORY__ARITH__ARITH_HEURISTIC_PIVOT_RULE_H +#define CVC4__THEORY__ARITH__ARITH_HEURISTIC_PIVOT_RULE_H #include @@ -35,4 +35,4 @@ std::ostream& operator<<(std::ostream& out, ErrorSelectionRule rule) CVC4_PUBLIC }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__ARITH__ARITH_HEURISTIC_PIVOT_RULE_H */ +#endif /* CVC4__THEORY__ARITH__ARITH_HEURISTIC_PIVOT_RULE_H */ diff --git a/src/options/arith_propagation_mode.h b/src/options/arith_propagation_mode.h index fbbef3f96..b2c6b4c61 100644 --- a/src/options/arith_propagation_mode.h +++ b/src/options/arith_propagation_mode.h @@ -17,8 +17,8 @@ #include "cvc4_public.h" -#ifndef __CVC4__THEORY__ARITH__ARITH_PROPAGATION_MODE_H -#define __CVC4__THEORY__ARITH__ARITH_PROPAGATION_MODE_H +#ifndef CVC4__THEORY__ARITH__ARITH_PROPAGATION_MODE_H +#define CVC4__THEORY__ARITH__ARITH_PROPAGATION_MODE_H #include @@ -35,4 +35,4 @@ std::ostream& operator<<(std::ostream& out, ArithPropagationMode rule) CVC4_PUBL }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__ARITH__ARITH_PROPAGATION_MODE_H */ +#endif /* CVC4__THEORY__ARITH__ARITH_PROPAGATION_MODE_H */ diff --git a/src/options/arith_unate_lemma_mode.h b/src/options/arith_unate_lemma_mode.h index f626dad65..a917b83fd 100644 --- a/src/options/arith_unate_lemma_mode.h +++ b/src/options/arith_unate_lemma_mode.h @@ -17,8 +17,8 @@ #include "cvc4_public.h" -#ifndef __CVC4__THEORY__ARITH__ARITH_UNATE_LEMMA_MODE_H -#define __CVC4__THEORY__ARITH__ARITH_UNATE_LEMMA_MODE_H +#ifndef CVC4__THEORY__ARITH__ARITH_UNATE_LEMMA_MODE_H +#define CVC4__THEORY__ARITH__ARITH_UNATE_LEMMA_MODE_H #include @@ -35,4 +35,4 @@ std::ostream& operator<<(std::ostream& out, ArithUnateLemmaMode rule) CVC4_PUBLI }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__ARITH__ARITH_UNATE_LEMMA_MODE_H */ +#endif /* CVC4__THEORY__ARITH__ARITH_UNATE_LEMMA_MODE_H */ diff --git a/src/options/base_handlers.h b/src/options/base_handlers.h index 58c963145..fae6549f3 100644 --- a/src/options/base_handlers.h +++ b/src/options/base_handlers.h @@ -17,8 +17,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__BASE_HANDLERS_H -#define __CVC4__BASE_HANDLERS_H +#ifndef CVC4__BASE_HANDLERS_H +#define CVC4__BASE_HANDLERS_H #include #include @@ -83,4 +83,4 @@ struct not_equal : public comparator { }/* CVC4::options namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__BASE_HANDLERS_H */ +#endif /* CVC4__BASE_HANDLERS_H */ diff --git a/src/options/bool_to_bv_mode.h b/src/options/bool_to_bv_mode.h index e45060872..2dbd723c9 100644 --- a/src/options/bool_to_bv_mode.h +++ b/src/options/bool_to_bv_mode.h @@ -17,8 +17,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__PREPROCESSING__PASSES__BOOL_TO_BV_MODE_H -#define __CVC4__PREPROCESSING__PASSES__BOOL_TO_BV_MODE_H +#ifndef CVC4__PREPROCESSING__PASSES__BOOL_TO_BV_MODE_H +#define CVC4__PREPROCESSING__PASSES__BOOL_TO_BV_MODE_H #include @@ -54,4 +54,4 @@ std::ostream& operator<<(std::ostream& out, preprocessing::passes::BoolToBVMode } -#endif /* __CVC4__PREPROCESSING__PASSES__BOOL_TO_BV_MODE_H */ +#endif /* CVC4__PREPROCESSING__PASSES__BOOL_TO_BV_MODE_H */ diff --git a/src/options/bv_bitblast_mode.h b/src/options/bv_bitblast_mode.h index 270f2346d..7243c38e1 100644 --- a/src/options/bv_bitblast_mode.h +++ b/src/options/bv_bitblast_mode.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__BV__BITBLAST_MODE_H -#define __CVC4__THEORY__BV__BITBLAST_MODE_H +#ifndef CVC4__THEORY__BV__BITBLAST_MODE_H +#define CVC4__THEORY__BV__BITBLAST_MODE_H #include @@ -120,4 +120,4 @@ std::ostream& operator<<(std::ostream& out, theory::bv::BvOptimizeSatProof level }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__BV__BITBLAST_MODE_H */ +#endif /* CVC4__THEORY__BV__BITBLAST_MODE_H */ diff --git a/src/options/datatypes_modes.h b/src/options/datatypes_modes.h index 23ff0651d..8d7ced9e2 100644 --- a/src/options/datatypes_modes.h +++ b/src/options/datatypes_modes.h @@ -17,8 +17,8 @@ #include "cvc4_public.h" -#ifndef __CVC4__BASE__DATATYPES_MODES_H -#define __CVC4__BASE__DATATYPES_MODES_H +#ifndef CVC4__BASE__DATATYPES_MODES_H +#define CVC4__BASE__DATATYPES_MODES_H #include @@ -41,4 +41,4 @@ enum SygusFairMode { }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__BASE__DATATYPES_MODES_H */ +#endif /* CVC4__BASE__DATATYPES_MODES_H */ diff --git a/src/options/decision_mode.h b/src/options/decision_mode.h index 9f653bf27..c90e0a6f0 100644 --- a/src/options/decision_mode.h +++ b/src/options/decision_mode.h @@ -17,8 +17,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__SMT__DECISION_MODE_H -#define __CVC4__SMT__DECISION_MODE_H +#ifndef CVC4__SMT__DECISION_MODE_H +#define CVC4__SMT__DECISION_MODE_H #include @@ -61,4 +61,4 @@ std::ostream& operator<<(std::ostream& out, decision::DecisionMode mode); }/* CVC4 namespace */ -#endif /* __CVC4__SMT__DECISION_MODE_H */ +#endif /* CVC4__SMT__DECISION_MODE_H */ diff --git a/src/options/decision_weight.h b/src/options/decision_weight.h index 95afd53c3..16c12a3b4 100644 --- a/src/options/decision_weight.h +++ b/src/options/decision_weight.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__OPTIONS__DECISION_WEIGHT_H -#define __CVC4__OPTIONS__DECISION_WEIGHT_H +#ifndef CVC4__OPTIONS__DECISION_WEIGHT_H +#define CVC4__OPTIONS__DECISION_WEIGHT_H namespace CVC4 { namespace decision { @@ -27,4 +27,4 @@ typedef uint64_t DecisionWeight; }/* CVC4::decision namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__OPTIONS__DECISION_WEIGHT_H */ +#endif /* CVC4__OPTIONS__DECISION_WEIGHT_H */ diff --git a/src/options/language.h b/src/options/language.h index f40b1960a..4d213c305 100644 --- a/src/options/language.h +++ b/src/options/language.h @@ -16,8 +16,8 @@ #include "cvc4_public.h" -#ifndef __CVC4__LANGUAGE_H -#define __CVC4__LANGUAGE_H +#ifndef CVC4__LANGUAGE_H +#define CVC4__LANGUAGE_H #include #include @@ -232,4 +232,4 @@ OutputLanguage toOutputLanguage(std::string language) CVC4_PUBLIC; }/* CVC4::language namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__LANGUAGE_H */ +#endif /* CVC4__LANGUAGE_H */ diff --git a/src/options/module_template.h b/src/options/module_template.h index b61dd95e7..2ffe070d2 100644 --- a/src/options/module_template.h +++ b/src/options/module_template.h @@ -17,8 +17,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__OPTIONS__${id}$_H -#define __CVC4__OPTIONS__${id}$_H +#ifndef CVC4__OPTIONS__${id}$_H +#define CVC4__OPTIONS__${id}$_H #include "options/options.h" @@ -48,4 +48,4 @@ ${inls}$ } // namespace options } // namespace CVC4 -#endif /* __CVC4__OPTIONS__${id}$_H */ +#endif /* CVC4__OPTIONS__${id}$_H */ diff --git a/src/options/open_ostream.h b/src/options/open_ostream.h index 0334b2cbc..592db925f 100644 --- a/src/options/open_ostream.h +++ b/src/options/open_ostream.h @@ -17,8 +17,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__OPEN_OSTREAM_H -#define __CVC4__OPEN_OSTREAM_H +#ifndef CVC4__OPEN_OSTREAM_H +#define CVC4__OPEN_OSTREAM_H #include #include @@ -59,4 +59,4 @@ std::string cvc4_errno_failreason(); }/* CVC4 namespace */ -#endif /* __CVC4__OPEN_OSTREAM_H */ +#endif /* CVC4__OPEN_OSTREAM_H */ diff --git a/src/options/option_exception.h b/src/options/option_exception.h index 41f850483..d337d4c9b 100644 --- a/src/options/option_exception.h +++ b/src/options/option_exception.h @@ -16,8 +16,8 @@ #include "cvc4_public.h" -#ifndef __CVC4__OPTION_EXCEPTION_H -#define __CVC4__OPTION_EXCEPTION_H +#ifndef CVC4__OPTION_EXCEPTION_H +#define CVC4__OPTION_EXCEPTION_H #include "base/exception.h" @@ -64,4 +64,4 @@ class CVC4_PUBLIC UnrecognizedOptionException : public CVC4::OptionException { }/* CVC4 namespace */ -#endif /* __CVC4__OPTION_EXCEPTION_H */ +#endif /* CVC4__OPTION_EXCEPTION_H */ diff --git a/src/options/options.h b/src/options/options.h index 3767bb8fd..3f2d72b7e 100644 --- a/src/options/options.h +++ b/src/options/options.h @@ -16,8 +16,8 @@ #include "cvc4_public.h" -#ifndef __CVC4__OPTIONS__OPTIONS_H -#define __CVC4__OPTIONS__OPTIONS_H +#ifndef CVC4__OPTIONS__OPTIONS_H +#define CVC4__OPTIONS__OPTIONS_H #include #include @@ -560,4 +560,4 @@ public: }/* CVC4 namespace */ -#endif /* __CVC4__OPTIONS__OPTIONS_H */ +#endif /* CVC4__OPTIONS__OPTIONS_H */ diff --git a/src/options/options_handler.h b/src/options/options_handler.h index 5c354be57..06f7ab6e4 100644 --- a/src/options/options_handler.h +++ b/src/options/options_handler.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__OPTIONS__OPTIONS_HANDLER_H -#define __CVC4__OPTIONS__OPTIONS_HANDLER_H +#ifndef CVC4__OPTIONS__OPTIONS_HANDLER_H +#define CVC4__OPTIONS__OPTIONS_HANDLER_H #include #include @@ -286,4 +286,4 @@ public: }/* CVC4::options namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__OPTIONS__OPTIONS_HANDLER_H */ +#endif /* CVC4__OPTIONS__OPTIONS_HANDLER_H */ diff --git a/src/options/options_holder_template.h b/src/options/options_holder_template.h index 877fc6cdb..4cd77a441 100644 --- a/src/options/options_holder_template.h +++ b/src/options/options_holder_template.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__OPTIONS__OPTIONS_HOLDER_H -#define __CVC4__OPTIONS__OPTIONS_HOLDER_H +#ifndef CVC4__OPTIONS__OPTIONS_HOLDER_H +#define CVC4__OPTIONS__OPTIONS_HOLDER_H ${headers_module}$ @@ -35,4 +35,4 @@ struct OptionsHolder { } // namespace options } // namespace CVC4 -#endif /* __CVC4__OPTIONS__OPTIONS_HOLDER_H */ +#endif /* CVC4__OPTIONS__OPTIONS_HOLDER_H */ diff --git a/src/options/printer_modes.h b/src/options/printer_modes.h index 5160a2b47..79c57828b 100644 --- a/src/options/printer_modes.h +++ b/src/options/printer_modes.h @@ -17,8 +17,8 @@ #include "cvc4_public.h" -#ifndef __CVC4__PRINTER__MODES_H -#define __CVC4__PRINTER__MODES_H +#ifndef CVC4__PRINTER__MODES_H +#define CVC4__PRINTER__MODES_H #include @@ -45,4 +45,4 @@ std::ostream& operator<<(std::ostream& out, InstFormatMode mode) CVC4_PUBLIC; }/* CVC4 namespace */ -#endif /* __CVC4__PRINTER__MODEL_FORMAT_H */ +#endif /* CVC4__PRINTER__MODEL_FORMAT_H */ diff --git a/src/options/quantifiers_modes.h b/src/options/quantifiers_modes.h index 1562693cb..c9aeda154 100644 --- a/src/options/quantifiers_modes.h +++ b/src/options/quantifiers_modes.h @@ -17,8 +17,8 @@ #include "cvc4_public.h" -#ifndef __CVC4__BASE__QUANTIFIERS_MODES_H -#define __CVC4__BASE__QUANTIFIERS_MODES_H +#ifndef CVC4__BASE__QUANTIFIERS_MODES_H +#define CVC4__BASE__QUANTIFIERS_MODES_H #include @@ -316,4 +316,4 @@ std::ostream& operator<<(std::ostream& out, theory::quantifiers::InstWhenMode mo }/* CVC4 namespace */ -#endif /* __CVC4__BASE__QUANTIFIERS_MODES_H */ +#endif /* CVC4__BASE__QUANTIFIERS_MODES_H */ diff --git a/src/options/set_language.h b/src/options/set_language.h index 185740728..0e3b32dd7 100644 --- a/src/options/set_language.h +++ b/src/options/set_language.h @@ -16,8 +16,8 @@ #include "cvc4_public.h" -#ifndef __CVC4__OPTIONS__SET_LANGUAGE_H -#define __CVC4__OPTIONS__SET_LANGUAGE_H +#ifndef CVC4__OPTIONS__SET_LANGUAGE_H +#define CVC4__OPTIONS__SET_LANGUAGE_H #include #include "options/language.h" @@ -96,4 +96,4 @@ std::ostream& operator<<(std::ostream& out, SetLanguage l) CVC4_PUBLIC; }/* CVC4::language namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__OPTIONS__SET_LANGUAGE_H */ +#endif /* CVC4__OPTIONS__SET_LANGUAGE_H */ diff --git a/src/options/smt_modes.h b/src/options/smt_modes.h index aebe0ade4..ed40a28a1 100644 --- a/src/options/smt_modes.h +++ b/src/options/smt_modes.h @@ -17,8 +17,8 @@ #include "cvc4_public.h" -#ifndef __CVC4__SMT__MODES_H -#define __CVC4__SMT__MODES_H +#ifndef CVC4__SMT__MODES_H +#define CVC4__SMT__MODES_H #include @@ -55,4 +55,4 @@ enum ModelCoresMode } // namespace CVC4 -#endif /* __CVC4__SMT__MODES_H */ +#endif /* CVC4__SMT__MODES_H */ diff --git a/src/options/strings_process_loop_mode.h b/src/options/strings_process_loop_mode.h index 2933e034f..fb2248eec 100644 --- a/src/options/strings_process_loop_mode.h +++ b/src/options/strings_process_loop_mode.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__STRINGS__PROCESS_LOOP_MODE_H -#define __CVC4__THEORY__STRINGS__PROCESS_LOOP_MODE_H +#ifndef CVC4__THEORY__STRINGS__PROCESS_LOOP_MODE_H +#define CVC4__THEORY__STRINGS__PROCESS_LOOP_MODE_H #include @@ -52,4 +52,4 @@ std::ostream& operator<<(std::ostream& out, } // namespace CVC4 -#endif /* __CVC4__THEORY__BV__BITBLAST_MODE_H */ +#endif /* CVC4__THEORY__BV__BITBLAST_MODE_H */ diff --git a/src/options/sygus_out_mode.h b/src/options/sygus_out_mode.h index 5222d60ba..79480946a 100644 --- a/src/options/sygus_out_mode.h +++ b/src/options/sygus_out_mode.h @@ -14,8 +14,8 @@ #include "cvc4_public.h" -#ifndef __CVC4__SMT__SYGUS_OUT_MODE_H -#define __CVC4__SMT__SYGUS_OUT_MODE_H +#ifndef CVC4__SMT__SYGUS_OUT_MODE_H +#define CVC4__SMT__SYGUS_OUT_MODE_H #include @@ -36,4 +36,4 @@ enum SygusSolutionOutMode } /* CVC4 namespace */ -#endif /* __CVC4__SMT__SYGUS_OUT_MODE_H */ +#endif /* CVC4__SMT__SYGUS_OUT_MODE_H */ diff --git a/src/options/ufss_mode.h b/src/options/ufss_mode.h index a03d46c07..d6a106ecf 100644 --- a/src/options/ufss_mode.h +++ b/src/options/ufss_mode.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__BASE__UFSS_MODE_H -#define __CVC4__BASE__UFSS_MODE_H +#ifndef CVC4__BASE__UFSS_MODE_H +#define CVC4__BASE__UFSS_MODE_H namespace CVC4 { namespace theory { @@ -36,4 +36,4 @@ enum UfssMode{ }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__BASE__UFSS_MODE_H */ +#endif /* CVC4__BASE__UFSS_MODE_H */ diff --git a/src/parser/antlr_input.h b/src/parser/antlr_input.h index 17e21e21f..9c53e0349 100644 --- a/src/parser/antlr_input.h +++ b/src/parser/antlr_input.h @@ -14,8 +14,8 @@ ** Base for ANTLR parser classes. **/ -#ifndef __CVC4__PARSER__ANTLR_INPUT_H -#define __CVC4__PARSER__ANTLR_INPUT_H +#ifndef CVC4__PARSER__ANTLR_INPUT_H +#define CVC4__PARSER__ANTLR_INPUT_H #include "cvc4parser_private.h" @@ -299,4 +299,4 @@ inline BitVector AntlrInput::tokenToBitvector(pANTLR3_COMMON_TOKEN number, pANTL }/* CVC4::parser namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__PARSER__ANTLR_INPUT_H */ +#endif /* CVC4__PARSER__ANTLR_INPUT_H */ diff --git a/src/parser/antlr_line_buffered_input.h b/src/parser/antlr_line_buffered_input.h index 3a1843ee5..34cb72f1e 100644 --- a/src/parser/antlr_line_buffered_input.h +++ b/src/parser/antlr_line_buffered_input.h @@ -22,8 +22,8 @@ #include "cvc4parser_private.h" -#ifndef __CVC4__PARSER__ANTLR_LINE_BUFFERED_INPUT_H -#define __CVC4__PARSER__ANTLR_LINE_BUFFERED_INPUT_H +#ifndef CVC4__PARSER__ANTLR_LINE_BUFFERED_INPUT_H +#define CVC4__PARSER__ANTLR_LINE_BUFFERED_INPUT_H #include #include @@ -47,4 +47,4 @@ pANTLR3_INPUT_STREAM antlr3LineBufferedStreamNew(std::istream& in, }/* CVC4::parser namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__PARSER__ANTLR_LINE_BUFFERED_INPUT_H */ +#endif /* CVC4__PARSER__ANTLR_LINE_BUFFERED_INPUT_H */ diff --git a/src/parser/antlr_tracing.h b/src/parser/antlr_tracing.h index 77d16aedb..d2eb742c2 100644 --- a/src/parser/antlr_tracing.h +++ b/src/parser/antlr_tracing.h @@ -15,8 +15,8 @@ ** \todo document this file **/ -#ifndef __CVC4__PARSER__ANTLR_TRACING_H -#define __CVC4__PARSER__ANTLR_TRACING_H +#ifndef CVC4__PARSER__ANTLR_TRACING_H +#define CVC4__PARSER__ANTLR_TRACING_H // only enable the hack with -DCVC4_TRACE_ANTLR #ifdef CVC4_TRACE_ANTLR @@ -83,4 +83,4 @@ static struct __Cvc4System { #endif /* CVC4_TRACE_ANTLR */ -#endif /* __CVC4__PARSER__ANTLR_TRACING_H */ +#endif /* CVC4__PARSER__ANTLR_TRACING_H */ diff --git a/src/parser/bounded_token_buffer.h b/src/parser/bounded_token_buffer.h index 3258441b8..8afe6864a 100644 --- a/src/parser/bounded_token_buffer.h +++ b/src/parser/bounded_token_buffer.h @@ -25,8 +25,8 @@ #include "cvc4parser_private.h" -#ifndef __CVC4__PARSER__BOUNDED_TOKEN_BUFFER_H -#define __CVC4__PARSER__BOUNDED_TOKEN_BUFFER_H +#ifndef CVC4__PARSER__BOUNDED_TOKEN_BUFFER_H +#define CVC4__PARSER__BOUNDED_TOKEN_BUFFER_H #include @@ -61,4 +61,4 @@ BoundedTokenBufferFree(pBOUNDED_TOKEN_BUFFER buffer); }/* CVC4::parser namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__PARSER__BOUNDED_TOKEN_BUFFER_H */ +#endif /* CVC4__PARSER__BOUNDED_TOKEN_BUFFER_H */ diff --git a/src/parser/bounded_token_factory.h b/src/parser/bounded_token_factory.h index f44218786..f2df9ac36 100644 --- a/src/parser/bounded_token_factory.h +++ b/src/parser/bounded_token_factory.h @@ -19,8 +19,8 @@ #include "cvc4parser_private.h" -#ifndef __CVC4__PARSER__BOUNDED_TOKEN_FACTORY_H -#define __CVC4__PARSER__BOUNDED_TOKEN_FACTORY_H +#ifndef CVC4__PARSER__BOUNDED_TOKEN_FACTORY_H +#define CVC4__PARSER__BOUNDED_TOKEN_FACTORY_H namespace CVC4 { namespace parser { @@ -48,4 +48,4 @@ BoundedTokenFactoryNew(pANTLR3_INPUT_STREAM input,ANTLR3_UINT32 size); }/* CVC4::parser namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__PARSER__BOUNDED_TOKEN_FACTORY_H */ +#endif /* CVC4__PARSER__BOUNDED_TOKEN_FACTORY_H */ diff --git a/src/parser/cvc/cvc_input.h b/src/parser/cvc/cvc_input.h index 944a125c2..098efd580 100644 --- a/src/parser/cvc/cvc_input.h +++ b/src/parser/cvc/cvc_input.h @@ -16,8 +16,8 @@ #include "cvc4parser_private.h" -#ifndef __CVC4__PARSER__CVC_INPUT_H -#define __CVC4__PARSER__CVC_INPUT_H +#ifndef CVC4__PARSER__CVC_INPUT_H +#define CVC4__PARSER__CVC_INPUT_H #include "parser/antlr_input.h" #include "parser/cvc/CvcLexer.h" @@ -74,4 +74,4 @@ class CvcInput : public AntlrInput { }/* CVC4::parser namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__PARSER__CVC_INPUT_H */ +#endif /* CVC4__PARSER__CVC_INPUT_H */ diff --git a/src/parser/input.h b/src/parser/input.h index c8d6bbb0e..5627dc15e 100644 --- a/src/parser/input.h +++ b/src/parser/input.h @@ -16,8 +16,8 @@ #include "cvc4parser_public.h" -#ifndef __CVC4__PARSER__INPUT_H -#define __CVC4__PARSER__INPUT_H +#ifndef CVC4__PARSER__INPUT_H +#define CVC4__PARSER__INPUT_H #include #include @@ -178,4 +178,4 @@ class CVC4_PUBLIC Input { }/* CVC4::parser namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__PARSER__ANTLR_INPUT_H */ +#endif /* CVC4__PARSER__ANTLR_INPUT_H */ diff --git a/src/parser/line_buffer.h b/src/parser/line_buffer.h index d493ed7ae..e8ab05691 100644 --- a/src/parser/line_buffer.h +++ b/src/parser/line_buffer.h @@ -18,8 +18,8 @@ #include "cvc4parser_private.h" -#ifndef __CVC4__PARSER__LINE_BUFFER_H -#define __CVC4__PARSER__LINE_BUFFER_H +#ifndef CVC4__PARSER__LINE_BUFFER_H +#define CVC4__PARSER__LINE_BUFFER_H #include #include @@ -73,4 +73,4 @@ class LineBuffer { } // namespace parser } // namespace CVC4 -#endif /* __CVC4__PARSER__LINE_BUFFER_H */ +#endif /* CVC4__PARSER__LINE_BUFFER_H */ diff --git a/src/parser/memory_mapped_input_buffer.h b/src/parser/memory_mapped_input_buffer.h index efa739912..ee143c6b3 100644 --- a/src/parser/memory_mapped_input_buffer.h +++ b/src/parser/memory_mapped_input_buffer.h @@ -16,8 +16,8 @@ #include "cvc4parser_private.h" -#ifndef __CVC4__PARSER__MEMORY_MAPPED_INPUT_BUFFER_H -#define __CVC4__PARSER__MEMORY_MAPPED_INPUT_BUFFER_H +#ifndef CVC4__PARSER__MEMORY_MAPPED_INPUT_BUFFER_H +#define CVC4__PARSER__MEMORY_MAPPED_INPUT_BUFFER_H #include #include @@ -39,4 +39,4 @@ MemoryMappedInputBufferNew(const std::string& filename); }/* CVC4::parser namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__PARSER__MEMORY_MAPPED_INPUT_BUFFER_H */ +#endif /* CVC4__PARSER__MEMORY_MAPPED_INPUT_BUFFER_H */ diff --git a/src/parser/parser.h b/src/parser/parser.h index 8bdc28d15..826d460b2 100644 --- a/src/parser/parser.h +++ b/src/parser/parser.h @@ -16,8 +16,8 @@ #include "cvc4parser_public.h" -#ifndef __CVC4__PARSER__PARSER_STATE_H -#define __CVC4__PARSER__PARSER_STATE_H +#ifndef CVC4__PARSER__PARSER_STATE_H +#define CVC4__PARSER__PARSER_STATE_H #include #include @@ -835,4 +835,4 @@ public: }/* CVC4::parser namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__PARSER__PARSER_STATE_H */ +#endif /* CVC4__PARSER__PARSER_STATE_H */ diff --git a/src/parser/parser_builder.h b/src/parser/parser_builder.h index 3f48b0bdb..1a9ca719e 100644 --- a/src/parser/parser_builder.h +++ b/src/parser/parser_builder.h @@ -16,8 +16,8 @@ #include "cvc4parser_public.h" -#ifndef __CVC4__PARSER__PARSER_BUILDER_H -#define __CVC4__PARSER__PARSER_BUILDER_H +#ifndef CVC4__PARSER__PARSER_BUILDER_H +#define CVC4__PARSER__PARSER_BUILDER_H #include @@ -180,4 +180,4 @@ class CVC4_PUBLIC ParserBuilder { }/* CVC4::parser namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__PARSER__PARSER_BUILDER_H */ +#endif /* CVC4__PARSER__PARSER_BUILDER_H */ diff --git a/src/parser/parser_exception.h b/src/parser/parser_exception.h index 5e7e2500e..cd5e162d2 100644 --- a/src/parser/parser_exception.h +++ b/src/parser/parser_exception.h @@ -16,8 +16,8 @@ #include "cvc4parser_public.h" -#ifndef __CVC4__PARSER__PARSER_EXCEPTION_H -#define __CVC4__PARSER__PARSER_EXCEPTION_H +#ifndef CVC4__PARSER__PARSER_EXCEPTION_H +#define CVC4__PARSER__PARSER_EXCEPTION_H #include #include @@ -99,4 +99,4 @@ class CVC4_PUBLIC ParserEndOfFileException : public ParserException { }/* CVC4::parser namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__PARSER__PARSER_EXCEPTION_H */ +#endif /* CVC4__PARSER__PARSER_EXCEPTION_H */ diff --git a/src/parser/smt1/smt1.h b/src/parser/smt1/smt1.h index f8a018806..32867e692 100644 --- a/src/parser/smt1/smt1.h +++ b/src/parser/smt1/smt1.h @@ -14,8 +14,8 @@ #include "cvc4parser_private.h" -#ifndef __CVC4__PARSER__SMT1_H -#define __CVC4__PARSER__SMT1_H +#ifndef CVC4__PARSER__SMT1_H +#define CVC4__PARSER__SMT1_H #include #include @@ -130,4 +130,4 @@ private: }/* CVC4::parser namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__PARSER__SMT1_H */ +#endif /* CVC4__PARSER__SMT1_H */ diff --git a/src/parser/smt1/smt1_input.h b/src/parser/smt1/smt1_input.h index 511ddfd53..fcdc63ee2 100644 --- a/src/parser/smt1/smt1_input.h +++ b/src/parser/smt1/smt1_input.h @@ -16,8 +16,8 @@ #include "cvc4parser_private.h" -#ifndef __CVC4__PARSER__SMT1_INPUT_H -#define __CVC4__PARSER__SMT1_INPUT_H +#ifndef CVC4__PARSER__SMT1_INPUT_H +#define CVC4__PARSER__SMT1_INPUT_H #include "parser/antlr_input.h" #include "parser/smt1/Smt1Lexer.h" @@ -82,4 +82,4 @@ public: }/* CVC4::parser namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__PARSER__SMT1_INPUT_H */ +#endif /* CVC4__PARSER__SMT1_INPUT_H */ diff --git a/src/parser/smt2/smt2.h b/src/parser/smt2/smt2.h index 7a3c3b0c3..ee694db06 100644 --- a/src/parser/smt2/smt2.h +++ b/src/parser/smt2/smt2.h @@ -16,8 +16,8 @@ #include "cvc4parser_private.h" -#ifndef __CVC4__PARSER__SMT2_H -#define __CVC4__PARSER__SMT2_H +#ifndef CVC4__PARSER__SMT2_H +#define CVC4__PARSER__SMT2_H #include #include @@ -414,4 +414,4 @@ private: }/* CVC4::parser namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__PARSER__SMT2_H */ +#endif /* CVC4__PARSER__SMT2_H */ diff --git a/src/parser/smt2/smt2_input.h b/src/parser/smt2/smt2_input.h index a456a33f8..e8b736a16 100644 --- a/src/parser/smt2/smt2_input.h +++ b/src/parser/smt2/smt2_input.h @@ -16,8 +16,8 @@ #include "cvc4parser_private.h" -#ifndef __CVC4__PARSER__SMT2_INPUT_H -#define __CVC4__PARSER__SMT2_INPUT_H +#ifndef CVC4__PARSER__SMT2_INPUT_H +#define CVC4__PARSER__SMT2_INPUT_H #include "parser/antlr_input.h" #include "parser/smt2/Smt2Lexer.h" @@ -83,4 +83,4 @@ class Smt2Input : public AntlrInput { }/* CVC4::parser namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__PARSER__SMT2_INPUT_H */ +#endif /* CVC4__PARSER__SMT2_INPUT_H */ diff --git a/src/parser/smt2/sygus_input.h b/src/parser/smt2/sygus_input.h index 23227e96c..a0e3e81ef 100644 --- a/src/parser/smt2/sygus_input.h +++ b/src/parser/smt2/sygus_input.h @@ -16,8 +16,8 @@ #include "cvc4parser_private.h" -#ifndef __CVC4__PARSER__SYGUS_INPUT_H -#define __CVC4__PARSER__SYGUS_INPUT_H +#ifndef CVC4__PARSER__SYGUS_INPUT_H +#define CVC4__PARSER__SYGUS_INPUT_H #include "parser/antlr_input.h" #include "parser/smt2/Smt2Lexer.h" @@ -83,4 +83,4 @@ class SygusInput : public AntlrInput { }/* CVC4::parser namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__PARSER__SYGUS_INPUT_H */ +#endif /* CVC4__PARSER__SYGUS_INPUT_H */ diff --git a/src/parser/tptp/tptp.h b/src/parser/tptp/tptp.h index db08311f0..082b905df 100644 --- a/src/parser/tptp/tptp.h +++ b/src/parser/tptp/tptp.h @@ -18,8 +18,8 @@ #include "cvc4parser_private.h" -#ifndef __CVC4__PARSER__TPTP_H -#define __CVC4__PARSER__TPTP_H +#ifndef CVC4__PARSER__TPTP_H +#define CVC4__PARSER__TPTP_H #include #include @@ -196,4 +196,4 @@ enum NonAssoc { }/* CVC4::parser namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__PARSER__TPTP_INPUT_H */ +#endif /* CVC4__PARSER__TPTP_INPUT_H */ diff --git a/src/parser/tptp/tptp_input.h b/src/parser/tptp/tptp_input.h index dab98b91b..5205cbc17 100644 --- a/src/parser/tptp/tptp_input.h +++ b/src/parser/tptp/tptp_input.h @@ -16,8 +16,8 @@ #include "cvc4parser_private.h" -#ifndef __CVC4__PARSER__TPTP_INPUT_H -#define __CVC4__PARSER__TPTP_INPUT_H +#ifndef CVC4__PARSER__TPTP_INPUT_H +#define CVC4__PARSER__TPTP_INPUT_H #include "parser/antlr_input.h" #include "parser/tptp/TptpLexer.h" @@ -83,4 +83,4 @@ class TptpInput : public AntlrInput { }/* CVC4::parser namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__PARSER__TPTP_INPUT_H */ +#endif /* CVC4__PARSER__TPTP_INPUT_H */ diff --git a/src/preprocessing/assertion_pipeline.h b/src/preprocessing/assertion_pipeline.h index aea2554bd..cc9d1c2af 100644 --- a/src/preprocessing/assertion_pipeline.h +++ b/src/preprocessing/assertion_pipeline.h @@ -15,8 +15,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__PREPROCESSING__ASSERTION_PIPELINE_H -#define __CVC4__PREPROCESSING__ASSERTION_PIPELINE_H +#ifndef CVC4__PREPROCESSING__ASSERTION_PIPELINE_H +#define CVC4__PREPROCESSING__ASSERTION_PIPELINE_H #include @@ -117,4 +117,4 @@ class AssertionPipeline } // namespace preprocessing } // namespace CVC4 -#endif /* __CVC4__PREPROCESSING__ASSERTION_PIPELINE_H */ +#endif /* CVC4__PREPROCESSING__ASSERTION_PIPELINE_H */ diff --git a/src/preprocessing/passes/apply_substs.h b/src/preprocessing/passes/apply_substs.h index ea8585506..f20ffa61e 100644 --- a/src/preprocessing/passes/apply_substs.h +++ b/src/preprocessing/passes/apply_substs.h @@ -17,8 +17,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__PREPROCESSING__PASSES__APPLY_SUBSTS_H -#define __CVC4__PREPROCESSING__PASSES__APPLY_SUBSTS_H +#ifndef CVC4__PREPROCESSING__PASSES__APPLY_SUBSTS_H +#define CVC4__PREPROCESSING__PASSES__APPLY_SUBSTS_H #include "preprocessing/preprocessing_pass.h" #include "preprocessing/preprocessing_pass_context.h" diff --git a/src/preprocessing/passes/apply_to_const.h b/src/preprocessing/passes/apply_to_const.h index 3ff8dec75..4c1df22ca 100644 --- a/src/preprocessing/passes/apply_to_const.h +++ b/src/preprocessing/passes/apply_to_const.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__PREPROCESSING__PASSES__APPLY_TO_CONST_H -#define __CVC4__PREPROCESSING__PASSES__APPLY_TO_CONST_H +#ifndef CVC4__PREPROCESSING__PASSES__APPLY_TO_CONST_H +#define CVC4__PREPROCESSING__PASSES__APPLY_TO_CONST_H #include @@ -48,4 +48,4 @@ class ApplyToConst : public PreprocessingPass } // namespace preprocessing } // namespace CVC4 -#endif /* __CVC4__PREPROCESSING__PASSES__APPLY_TO_CONST_H */ +#endif /* CVC4__PREPROCESSING__PASSES__APPLY_TO_CONST_H */ diff --git a/src/preprocessing/passes/bool_to_bv.h b/src/preprocessing/passes/bool_to_bv.h index 57f69a6e3..11cb551fa 100644 --- a/src/preprocessing/passes/bool_to_bv.h +++ b/src/preprocessing/passes/bool_to_bv.h @@ -15,8 +15,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__PREPROCESSING__PASSES__BOOL_TO_BV_H -#define __CVC4__PREPROCESSING__PASSES__BOOL_TO_BV_H +#ifndef CVC4__PREPROCESSING__PASSES__BOOL_TO_BV_H +#define CVC4__PREPROCESSING__PASSES__BOOL_TO_BV_H #include "preprocessing/preprocessing_pass.h" #include "preprocessing/preprocessing_pass_context.h" @@ -70,4 +70,4 @@ class BoolToBV : public PreprocessingPass } // namespace preprocessing } // namespace CVC4 -#endif /* __CVC4__PREPROCESSING__PASSES__BOOL_TO_BV_H */ +#endif /* CVC4__PREPROCESSING__PASSES__BOOL_TO_BV_H */ diff --git a/src/preprocessing/passes/bv_abstraction.h b/src/preprocessing/passes/bv_abstraction.h index 963e99570..b5840b355 100644 --- a/src/preprocessing/passes/bv_abstraction.h +++ b/src/preprocessing/passes/bv_abstraction.h @@ -23,8 +23,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__PREPROCESSING__PASSES__BV_ABSTRACTION_H -#define __CVC4__PREPROCESSING__PASSES__BV_ABSTRACTION_H +#ifndef CVC4__PREPROCESSING__PASSES__BV_ABSTRACTION_H +#define CVC4__PREPROCESSING__PASSES__BV_ABSTRACTION_H #include "preprocessing/preprocessing_pass.h" #include "preprocessing/preprocessing_pass_context.h" @@ -47,4 +47,4 @@ class BvAbstraction : public PreprocessingPass } // namespace preprocessing } // namespace CVC4 -#endif /* __CVC4__PREPROCESSING__PASSES__BV_ABSTRACTION_H */ +#endif /* CVC4__PREPROCESSING__PASSES__BV_ABSTRACTION_H */ diff --git a/src/preprocessing/passes/bv_ackermann.h b/src/preprocessing/passes/bv_ackermann.h index 645dd72aa..98d1080bd 100644 --- a/src/preprocessing/passes/bv_ackermann.h +++ b/src/preprocessing/passes/bv_ackermann.h @@ -23,8 +23,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__PREPROCESSING__PASSES__BV_ACKERMANN_H -#define __CVC4__PREPROCESSING__PASSES__BV_ACKERMANN_H +#ifndef CVC4__PREPROCESSING__PASSES__BV_ACKERMANN_H +#define CVC4__PREPROCESSING__PASSES__BV_ACKERMANN_H #include #include "expr/node.h" diff --git a/src/preprocessing/passes/bv_eager_atoms.h b/src/preprocessing/passes/bv_eager_atoms.h index c83a16491..4ed685855 100644 --- a/src/preprocessing/passes/bv_eager_atoms.h +++ b/src/preprocessing/passes/bv_eager_atoms.h @@ -17,8 +17,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__PREPROCESSING__PASSES__BV_EAGER_ATOMS_H -#define __CVC4__PREPROCESSING__PASSES__BV_EAGER_ATOMS_H +#ifndef CVC4__PREPROCESSING__PASSES__BV_EAGER_ATOMS_H +#define CVC4__PREPROCESSING__PASSES__BV_EAGER_ATOMS_H #include "preprocessing/preprocessing_pass.h" #include "preprocessing/preprocessing_pass_context.h" @@ -41,4 +41,4 @@ class BvEagerAtoms : public PreprocessingPass } // namespace preprocessing } // namespace CVC4 -#endif /* __CVC4__PREPROCESSING__PASSES__BV_EAGER_ATOMS_H */ +#endif /* CVC4__PREPROCESSING__PASSES__BV_EAGER_ATOMS_H */ diff --git a/src/preprocessing/passes/bv_gauss.h b/src/preprocessing/passes/bv_gauss.h index e991b17c4..862777a9b 100644 --- a/src/preprocessing/passes/bv_gauss.h +++ b/src/preprocessing/passes/bv_gauss.h @@ -17,8 +17,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__PREPROCESSING__PASSES__BV_GAUSS_ELIM_H -#define __CVC4__PREPROCESSING__PASSES__BV_GAUSS_ELIM_H +#ifndef CVC4__PREPROCESSING__PASSES__BV_GAUSS_ELIM_H +#define CVC4__PREPROCESSING__PASSES__BV_GAUSS_ELIM_H #include "preprocessing/preprocessing_pass.h" #include "preprocessing/preprocessing_pass_context.h" diff --git a/src/preprocessing/passes/bv_intro_pow2.h b/src/preprocessing/passes/bv_intro_pow2.h index c0238b01e..86d5ebfef 100644 --- a/src/preprocessing/passes/bv_intro_pow2.h +++ b/src/preprocessing/passes/bv_intro_pow2.h @@ -18,8 +18,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__PREPROCESSING__PASSES__BV_INTRO_POW2_H -#define __CVC4__PREPROCESSING__PASSES__BV_INTRO_POW2_H +#ifndef CVC4__PREPROCESSING__PASSES__BV_INTRO_POW2_H +#define CVC4__PREPROCESSING__PASSES__BV_INTRO_POW2_H #include "preprocessing/preprocessing_pass.h" #include "preprocessing/preprocessing_pass_context.h" @@ -42,4 +42,4 @@ class BvIntroPow2 : public PreprocessingPass } // namespace preprocessing } // namespace CVC4 -#endif /* __CVC4__PREPROCESSING__PASSES__BV_INTRO_POW2_H */ +#endif /* CVC4__PREPROCESSING__PASSES__BV_INTRO_POW2_H */ diff --git a/src/preprocessing/passes/bv_to_bool.h b/src/preprocessing/passes/bv_to_bool.h index 83502e3d8..dc0494943 100644 --- a/src/preprocessing/passes/bv_to_bool.h +++ b/src/preprocessing/passes/bv_to_bool.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__PREPROCESSING__PASSES__BV_TO_BOOL_H -#define __CVC4__PREPROCESSING__PASSES__BV_TO_BOOL_H +#ifndef CVC4__PREPROCESSING__PASSES__BV_TO_BOOL_H +#define CVC4__PREPROCESSING__PASSES__BV_TO_BOOL_H #include "preprocessing/preprocessing_pass.h" #include "preprocessing/preprocessing_pass_context.h" @@ -76,4 +76,4 @@ class BVToBool : public PreprocessingPass } // namespace preprocessing } // namespace CVC4 -#endif /* __CVC4__PREPROCESSING__PASSES__BV_TO_BOOL_H */ +#endif /* CVC4__PREPROCESSING__PASSES__BV_TO_BOOL_H */ diff --git a/src/preprocessing/passes/extended_rewriter_pass.h b/src/preprocessing/passes/extended_rewriter_pass.h index aa379329b..dbaaa05ad 100644 --- a/src/preprocessing/passes/extended_rewriter_pass.h +++ b/src/preprocessing/passes/extended_rewriter_pass.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__PREPROCESSING__PASSES__EXTENDED_REWRITER_PASS_H -#define __CVC4__PREPROCESSING__PASSES__EXTENDED_REWRITER_PASS_H +#ifndef CVC4__PREPROCESSING__PASSES__EXTENDED_REWRITER_PASS_H +#define CVC4__PREPROCESSING__PASSES__EXTENDED_REWRITER_PASS_H #include "preprocessing/preprocessing_pass.h" #include "preprocessing/preprocessing_pass_context.h" @@ -40,4 +40,4 @@ class ExtRewPre : public PreprocessingPass } // namespace preprocessing } // namespace CVC4 -#endif /* __CVC4__PREPROCESSING__PASSES__EXTENDED_REWRITER_PASS_H */ +#endif /* CVC4__PREPROCESSING__PASSES__EXTENDED_REWRITER_PASS_H */ diff --git a/src/preprocessing/passes/global_negate.h b/src/preprocessing/passes/global_negate.h index 84d78d959..89c3a3e3e 100644 --- a/src/preprocessing/passes/global_negate.h +++ b/src/preprocessing/passes/global_negate.h @@ -22,8 +22,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__PREPROCESSING__PASSES__GLOBAL_NEGATE_H -#define __CVC4__PREPROCESSING__PASSES__GLOBAL_NEGATE_H +#ifndef CVC4__PREPROCESSING__PASSES__GLOBAL_NEGATE_H +#define CVC4__PREPROCESSING__PASSES__GLOBAL_NEGATE_H #include "preprocessing/preprocessing_pass.h" #include "preprocessing/preprocessing_pass_context.h" @@ -49,4 +49,4 @@ class GlobalNegate : public PreprocessingPass } // namespace preprocessing } // namespace CVC4 -#endif /* __CVC4__PREPROCESSING_PASSES__GLOBAL_NEGATE_H */ +#endif /* CVC4__PREPROCESSING_PASSES__GLOBAL_NEGATE_H */ diff --git a/src/preprocessing/passes/int_to_bv.h b/src/preprocessing/passes/int_to_bv.h index 225f9945f..95f31621a 100644 --- a/src/preprocessing/passes/int_to_bv.h +++ b/src/preprocessing/passes/int_to_bv.h @@ -18,8 +18,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__PREPROCESSING__PASSES__INT_TO_BV_H -#define __CVC4__PREPROCESSING__PASSES__INT_TO_BV_H +#ifndef CVC4__PREPROCESSING__PASSES__INT_TO_BV_H +#define CVC4__PREPROCESSING__PASSES__INT_TO_BV_H #include "preprocessing/preprocessing_pass.h" #include "preprocessing/preprocessing_pass_context.h" @@ -42,4 +42,4 @@ class IntToBV : public PreprocessingPass } // namespace preprocessing } // namespace CVC4 -#endif /* __CVC4__PREPROCESSING__PASSES__INT_TO_BV_H */ +#endif /* CVC4__PREPROCESSING__PASSES__INT_TO_BV_H */ diff --git a/src/preprocessing/passes/ite_removal.h b/src/preprocessing/passes/ite_removal.h index cdc104dbe..5620b4afb 100644 --- a/src/preprocessing/passes/ite_removal.h +++ b/src/preprocessing/passes/ite_removal.h @@ -17,8 +17,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__PREPROCESSING__PASSES__ITE_REMOVAL_H -#define __CVC4__PREPROCESSING__PASSES__ITE_REMOVAL_H +#ifndef CVC4__PREPROCESSING__PASSES__ITE_REMOVAL_H +#define CVC4__PREPROCESSING__PASSES__ITE_REMOVAL_H #include #include @@ -43,4 +43,4 @@ class IteRemoval : public PreprocessingPass } // namespace preprocessing } // namespace CVC4 -#endif // __CVC4__PREPROCESSING__PASSES__ITE_REMOVAL_H +#endif // CVC4__PREPROCESSING__PASSES__ITE_REMOVAL_H diff --git a/src/preprocessing/passes/ite_simp.h b/src/preprocessing/passes/ite_simp.h index 8d7ad648a..44976bded 100644 --- a/src/preprocessing/passes/ite_simp.h +++ b/src/preprocessing/passes/ite_simp.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__PREPROCESSING__PASSES__ITE_SIMP_H -#define __CVC4__PREPROCESSING__PASSES__ITE_SIMP_H +#ifndef CVC4__PREPROCESSING__PASSES__ITE_SIMP_H +#define CVC4__PREPROCESSING__PASSES__ITE_SIMP_H #include "preprocessing/preprocessing_pass.h" #include "preprocessing/preprocessing_pass_context.h" diff --git a/src/preprocessing/passes/miplib_trick.h b/src/preprocessing/passes/miplib_trick.h index 93fa701d1..f1748d635 100644 --- a/src/preprocessing/passes/miplib_trick.h +++ b/src/preprocessing/passes/miplib_trick.h @@ -15,8 +15,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__PREPROCESSING__PASSES__MIPLIB_TRICK_H -#define __CVC4__PREPROCESSING__PASSES__MIPLIB_TRICK_H +#ifndef CVC4__PREPROCESSING__PASSES__MIPLIB_TRICK_H +#define CVC4__PREPROCESSING__PASSES__MIPLIB_TRICK_H #include "preprocessing/preprocessing_pass.h" #include "preprocessing/preprocessing_pass_context.h" @@ -59,4 +59,4 @@ class MipLibTrick : public PreprocessingPass, public NodeManagerListener } // namespace preprocessing } // namespace CVC4 -#endif /* __CVC4__PREPROCESSING__PASSES__MIPLIB_TRICK_H */ +#endif /* CVC4__PREPROCESSING__PASSES__MIPLIB_TRICK_H */ diff --git a/src/preprocessing/passes/nl_ext_purify.h b/src/preprocessing/passes/nl_ext_purify.h index dcaf12b5e..7744df824 100644 --- a/src/preprocessing/passes/nl_ext_purify.h +++ b/src/preprocessing/passes/nl_ext_purify.h @@ -17,8 +17,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__PREPROCESSING__PASSES__NL_EXT_PURIFY_H -#define __CVC4__PREPROCESSING__PASSES__NL_EXT_PURIFY_H +#ifndef CVC4__PREPROCESSING__PASSES__NL_EXT_PURIFY_H +#define CVC4__PREPROCESSING__PASSES__NL_EXT_PURIFY_H #include #include @@ -54,4 +54,4 @@ class NlExtPurify : public PreprocessingPass } // namespace preprocessing } // namespace CVC4 -#endif /* __CVC4__PREPROCESSING__PASSES__NL_EXT_PURIFY_H */ +#endif /* CVC4__PREPROCESSING__PASSES__NL_EXT_PURIFY_H */ diff --git a/src/preprocessing/passes/non_clausal_simp.h b/src/preprocessing/passes/non_clausal_simp.h index 61706e382..cb4ece4a9 100644 --- a/src/preprocessing/passes/non_clausal_simp.h +++ b/src/preprocessing/passes/non_clausal_simp.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__PREPROCESSING__PASSES__NON_CLAUSAL_SIMP_H -#define __CVC4__PREPROCESSING__PASSES__NON_CLAUSAL_SIMP_H +#ifndef CVC4__PREPROCESSING__PASSES__NON_CLAUSAL_SIMP_H +#define CVC4__PREPROCESSING__PASSES__NON_CLAUSAL_SIMP_H #include diff --git a/src/preprocessing/passes/pseudo_boolean_processor.h b/src/preprocessing/passes/pseudo_boolean_processor.h index efbcb502e..e73b721ff 100644 --- a/src/preprocessing/passes/pseudo_boolean_processor.h +++ b/src/preprocessing/passes/pseudo_boolean_processor.h @@ -17,8 +17,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__PREPROCESSING__PASSES__PSEUDO_BOOLEAN_PROCESSOR_H -#define __CVC4__PREPROCESSING__PASSES__PSEUDO_BOOLEAN_PROCESSOR_H +#ifndef CVC4__PREPROCESSING__PASSES__PSEUDO_BOOLEAN_PROCESSOR_H +#define CVC4__PREPROCESSING__PASSES__PSEUDO_BOOLEAN_PROCESSOR_H #include #include @@ -114,4 +114,4 @@ class PseudoBooleanProcessor : public PreprocessingPass } // namespace preprocessing } // namespace CVC4 -#endif // __CVC4__PREPROCESSING__PASSES__PSEUDO_BOOLEAN_PROCESSOR_H +#endif // CVC4__PREPROCESSING__PASSES__PSEUDO_BOOLEAN_PROCESSOR_H diff --git a/src/preprocessing/passes/quantifier_macros.h b/src/preprocessing/passes/quantifier_macros.h index d92d8599c..6b62c4d31 100644 --- a/src/preprocessing/passes/quantifier_macros.h +++ b/src/preprocessing/passes/quantifier_macros.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__PREPROCESSING__PASSES__QUANTIFIER_MACROS_H -#define __CVC4__PREPROCESSING__PASSES__QUANTIFIER_MACROS_H +#ifndef CVC4__PREPROCESSING__PASSES__QUANTIFIER_MACROS_H +#define CVC4__PREPROCESSING__PASSES__QUANTIFIER_MACROS_H #include #include @@ -86,4 +86,4 @@ class QuantifierMacros : public PreprocessingPass } // preprocessing } // CVC4 -#endif /*__CVC4__PREPROCESSING__PASSES__QUANTIFIER_MACROS_H */ +#endif /*CVC4__PREPROCESSING__PASSES__QUANTIFIER_MACROS_H */ diff --git a/src/preprocessing/passes/quantifiers_preprocess.h b/src/preprocessing/passes/quantifiers_preprocess.h index bb5d8f8e7..991b3dd05 100644 --- a/src/preprocessing/passes/quantifiers_preprocess.h +++ b/src/preprocessing/passes/quantifiers_preprocess.h @@ -19,8 +19,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__PREPROCESSING__PASSES__QUANTIFIERS_PREPROCESS_H -#define __CVC4__PREPROCESSING__PASSES__QUANTIFIERS_PREPROCESS_H +#ifndef CVC4__PREPROCESSING__PASSES__QUANTIFIERS_PREPROCESS_H +#define CVC4__PREPROCESSING__PASSES__QUANTIFIERS_PREPROCESS_H #include "preprocessing/preprocessing_pass.h" #include "preprocessing/preprocessing_pass_context.h" @@ -43,4 +43,4 @@ class QuantifiersPreprocess : public PreprocessingPass } // namespace preprocessing } // namespace CVC4 -#endif /* __CVC4__PREPROCESSING__PASSES__QUANTIFIERS_PREPROCESS_H */ +#endif /* CVC4__PREPROCESSING__PASSES__QUANTIFIERS_PREPROCESS_H */ diff --git a/src/preprocessing/passes/real_to_int.h b/src/preprocessing/passes/real_to_int.h index a3d95b549..7949fb051 100644 --- a/src/preprocessing/passes/real_to_int.h +++ b/src/preprocessing/passes/real_to_int.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__PREPROCESSING__PASSES__REAL_TO_INT_H -#define __CVC4__PREPROCESSING__PASSES__REAL_TO_INT_H +#ifndef CVC4__PREPROCESSING__PASSES__REAL_TO_INT_H +#define CVC4__PREPROCESSING__PASSES__REAL_TO_INT_H #include #include @@ -49,4 +49,4 @@ class RealToInt : public PreprocessingPass } // namespace preprocessing } // namespace CVC4 -#endif /* __CVC4__PREPROCESSING__PASSES__REAL_TO_INT_H */ +#endif /* CVC4__PREPROCESSING__PASSES__REAL_TO_INT_H */ diff --git a/src/preprocessing/passes/rewrite.h b/src/preprocessing/passes/rewrite.h index a3d42d660..e83cafb85 100644 --- a/src/preprocessing/passes/rewrite.h +++ b/src/preprocessing/passes/rewrite.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__PREPROCESSING__PASSES__REWRITE_H -#define __CVC4__PREPROCESSING__PASSES__REWRITE_H +#ifndef CVC4__PREPROCESSING__PASSES__REWRITE_H +#define CVC4__PREPROCESSING__PASSES__REWRITE_H #include "preprocessing/preprocessing_pass.h" #include "preprocessing/preprocessing_pass_context.h" @@ -40,5 +40,5 @@ class Rewrite : public PreprocessingPass } // namespace preprocessing } // namespace CVC4 -#endif /* __CVC4__PREPROCESSING__PASSES__REWRITE_H */ +#endif /* CVC4__PREPROCESSING__PASSES__REWRITE_H */ diff --git a/src/preprocessing/passes/sep_skolem_emp.h b/src/preprocessing/passes/sep_skolem_emp.h index a8ea8db1c..1a5e36c40 100644 --- a/src/preprocessing/passes/sep_skolem_emp.h +++ b/src/preprocessing/passes/sep_skolem_emp.h @@ -15,8 +15,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__PREPROCESSING__PASSES__SEP_SKOLEM_EMP_H -#define __CVC4__PREPROCESSING__PASSES__SEP_SKOLEM_EMP_H +#ifndef CVC4__PREPROCESSING__PASSES__SEP_SKOLEM_EMP_H +#define CVC4__PREPROCESSING__PASSES__SEP_SKOLEM_EMP_H #include "preprocessing/preprocessing_pass.h" #include "preprocessing/preprocessing_pass_context.h" @@ -39,4 +39,4 @@ class SepSkolemEmp : public PreprocessingPass } // namespace preprocessing } // namespace CVC4 -#endif /* __CVC4__PREPROCESSING__PASSES__SEP_SKOLEM_EMP_H */ +#endif /* CVC4__PREPROCESSING__PASSES__SEP_SKOLEM_EMP_H */ diff --git a/src/preprocessing/passes/sort_infer.h b/src/preprocessing/passes/sort_infer.h index e0ecd50c5..ae722529d 100644 --- a/src/preprocessing/passes/sort_infer.h +++ b/src/preprocessing/passes/sort_infer.h @@ -12,8 +12,8 @@ ** \brief Sort inference preprocessing pass **/ -#ifndef __CVC4__PREPROCESSING__PASSES__SORT_INFERENCE_PASS_H_ -#define __CVC4__PREPROCESSING__PASSES__SORT_INFERENCE_PASS_H_ +#ifndef CVC4__PREPROCESSING__PASSES__SORT_INFERENCE_PASS_H_ +#define CVC4__PREPROCESSING__PASSES__SORT_INFERENCE_PASS_H_ #include #include @@ -46,4 +46,4 @@ class SortInferencePass : public PreprocessingPass } // namespace preprocessing } // namespace CVC4 -#endif /* __CVC4__PREPROCESSING__PASSES__SORT_INFERENCE_PASS_H_ */ +#endif /* CVC4__PREPROCESSING__PASSES__SORT_INFERENCE_PASS_H_ */ diff --git a/src/preprocessing/passes/static_learning.h b/src/preprocessing/passes/static_learning.h index 27fb6f86b..f200755c5 100644 --- a/src/preprocessing/passes/static_learning.h +++ b/src/preprocessing/passes/static_learning.h @@ -15,8 +15,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__PREPROCESSING__PASSES__STATIC_LEARNING_H -#define __CVC4__PREPROCESSING__PASSES__STATIC_LEARNING_H +#ifndef CVC4__PREPROCESSING__PASSES__STATIC_LEARNING_H +#define CVC4__PREPROCESSING__PASSES__STATIC_LEARNING_H #include "preprocessing/preprocessing_pass.h" #include "preprocessing/preprocessing_pass_context.h" @@ -39,4 +39,4 @@ class StaticLearning : public PreprocessingPass } // namespace preprocessing } // namespace CVC4 -#endif /* __CVC4__PREPROCESSING__PASSES__STATIC_LEARNING_H */ +#endif /* CVC4__PREPROCESSING__PASSES__STATIC_LEARNING_H */ diff --git a/src/preprocessing/passes/sygus_abduct.h b/src/preprocessing/passes/sygus_abduct.h index 8e83bf1d7..0e0868cda 100644 --- a/src/preprocessing/passes/sygus_abduct.h +++ b/src/preprocessing/passes/sygus_abduct.h @@ -13,8 +13,8 @@ ** input into an abduction problem. **/ -#ifndef __CVC4__PREPROCESSING__PASSES__SYGUS_ABDUCT_H -#define __CVC4__PREPROCESSING__PASSES__SYGUS_ABDUCT_H +#ifndef CVC4__PREPROCESSING__PASSES__SYGUS_ABDUCT_H +#define CVC4__PREPROCESSING__PASSES__SYGUS_ABDUCT_H #include "preprocessing/preprocessing_pass.h" #include "preprocessing/preprocessing_pass_context.h" @@ -69,4 +69,4 @@ class SygusAbduct : public PreprocessingPass } // namespace preprocessing } // namespace CVC4 -#endif /* __CVC4__PREPROCESSING__PASSES__SYGUS_ABDUCT_H_ */ +#endif /* CVC4__PREPROCESSING__PASSES__SYGUS_ABDUCT_H_ */ diff --git a/src/preprocessing/passes/sygus_inference.h b/src/preprocessing/passes/sygus_inference.h index 9350a15c7..91deb445c 100644 --- a/src/preprocessing/passes/sygus_inference.h +++ b/src/preprocessing/passes/sygus_inference.h @@ -12,8 +12,8 @@ ** \brief SygusInference **/ -#ifndef __CVC4__PREPROCESSING__PASSES__SYGUS_INFERENCE_H_ -#define __CVC4__PREPROCESSING__PASSES__SYGUS_INFERENCE_H_ +#ifndef CVC4__PREPROCESSING__PASSES__SYGUS_INFERENCE_H_ +#define CVC4__PREPROCESSING__PASSES__SYGUS_INFERENCE_H_ #include #include @@ -68,4 +68,4 @@ class SygusInference : public PreprocessingPass } // namespace preprocessing } // namespace CVC4 -#endif /* __CVC4__PREPROCESSING__PASSES__SYGUS_INFERENCE_H_ */ +#endif /* CVC4__PREPROCESSING__PASSES__SYGUS_INFERENCE_H_ */ diff --git a/src/preprocessing/passes/symmetry_breaker.h b/src/preprocessing/passes/symmetry_breaker.h index 6f3cd5e0b..6bb10ebb8 100644 --- a/src/preprocessing/passes/symmetry_breaker.h +++ b/src/preprocessing/passes/symmetry_breaker.h @@ -12,8 +12,8 @@ ** \brief Symmetry breaker for theories **/ -#ifndef __CVC4__PREPROCESSING__PASSES__SYMMETRY_BREAKER_H_ -#define __CVC4__PREPROCESSING__PASSES__SYMMETRY_BREAKER_H_ +#ifndef CVC4__PREPROCESSING__PASSES__SYMMETRY_BREAKER_H_ +#define CVC4__PREPROCESSING__PASSES__SYMMETRY_BREAKER_H_ #include #include @@ -106,4 +106,4 @@ class SymBreakerPass : public PreprocessingPass } // namespace preprocessing } // namespace CVC4 -#endif /* __CVC4__PREPROCESSING__PASSES__SYMMETRY_BREAKER_H_ */ +#endif /* CVC4__PREPROCESSING__PASSES__SYMMETRY_BREAKER_H_ */ diff --git a/src/preprocessing/passes/symmetry_detect.h b/src/preprocessing/passes/symmetry_detect.h index 1bc354419..07a545723 100644 --- a/src/preprocessing/passes/symmetry_detect.h +++ b/src/preprocessing/passes/symmetry_detect.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__PREPROCESSING__PASSES__SYMMETRY_DETECT_H -#define __CVC4__PREPROCESSING__PASSES__SYMMETRY_DETECT_H +#ifndef CVC4__PREPROCESSING__PASSES__SYMMETRY_DETECT_H +#define CVC4__PREPROCESSING__PASSES__SYMMETRY_DETECT_H #include #include diff --git a/src/preprocessing/passes/synth_rew_rules.h b/src/preprocessing/passes/synth_rew_rules.h index 4319c0243..38ef98b35 100644 --- a/src/preprocessing/passes/synth_rew_rules.h +++ b/src/preprocessing/passes/synth_rew_rules.h @@ -13,8 +13,8 @@ ** where t1 and t2 are subterms of the input. **/ -#ifndef __CVC4__PREPROCESSING__PASSES__SYNTH_REW_RULES_H -#define __CVC4__PREPROCESSING__PASSES__SYNTH_REW_RULES_H +#ifndef CVC4__PREPROCESSING__PASSES__SYNTH_REW_RULES_H +#define CVC4__PREPROCESSING__PASSES__SYNTH_REW_RULES_H #include "preprocessing/preprocessing_pass.h" #include "preprocessing/preprocessing_pass_context.h" @@ -74,4 +74,4 @@ class SynthRewRulesPass : public PreprocessingPass } // namespace preprocessing } // namespace CVC4 -#endif /* __CVC4__PREPROCESSING__PASSES__SYNTH_REW_RULES_H */ +#endif /* CVC4__PREPROCESSING__PASSES__SYNTH_REW_RULES_H */ diff --git a/src/preprocessing/passes/theory_preprocess.h b/src/preprocessing/passes/theory_preprocess.h index d8f75e4ba..cfa9ab0b5 100644 --- a/src/preprocessing/passes/theory_preprocess.h +++ b/src/preprocessing/passes/theory_preprocess.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__PREPROCESSING__PASSES__THEORY_PREPROCESS_H -#define __CVC4__PREPROCESSING__PASSES__THEORY_PREPROCESS_H +#ifndef CVC4__PREPROCESSING__PASSES__THEORY_PREPROCESS_H +#define CVC4__PREPROCESSING__PASSES__THEORY_PREPROCESS_H #include "preprocessing/preprocessing_pass.h" #include "preprocessing/preprocessing_pass_context.h" @@ -40,4 +40,4 @@ class TheoryPreprocess : public PreprocessingPass } // namespace preprocessing } // namespace CVC4 -#endif /* __CVC4__PREPROCESSING__PASSES__THEORY_PREPROCESS_H */ +#endif /* CVC4__PREPROCESSING__PASSES__THEORY_PREPROCESS_H */ diff --git a/src/preprocessing/passes/unconstrained_simplifier.h b/src/preprocessing/passes/unconstrained_simplifier.h index f56b86489..ac4fd0a03 100644 --- a/src/preprocessing/passes/unconstrained_simplifier.h +++ b/src/preprocessing/passes/unconstrained_simplifier.h @@ -18,8 +18,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__PREPROCESSING_PASSES_UNCONSTRAINED_SIMPLIFIER_H -#define __CVC4__PREPROCESSING_PASSES_UNCONSTRAINED_SIMPLIFIER_H +#ifndef CVC4__PREPROCESSING_PASSES_UNCONSTRAINED_SIMPLIFIER_H +#define CVC4__PREPROCESSING_PASSES_UNCONSTRAINED_SIMPLIFIER_H #include #include diff --git a/src/preprocessing/preprocessing_pass.h b/src/preprocessing/preprocessing_pass.h index 7ffd5dc67..4a2e71488 100644 --- a/src/preprocessing/preprocessing_pass.h +++ b/src/preprocessing/preprocessing_pass.h @@ -28,8 +28,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__PREPROCESSING__PREPROCESSING_PASS_H -#define __CVC4__PREPROCESSING__PREPROCESSING_PASS_H +#ifndef CVC4__PREPROCESSING__PREPROCESSING_PASS_H +#define CVC4__PREPROCESSING__PREPROCESSING_PASS_H #include @@ -82,4 +82,4 @@ class PreprocessingPass { } // namespace preprocessing } // namespace CVC4 -#endif /* __CVC4__PREPROCESSING__PREPROCESSING_PASS_H */ +#endif /* CVC4__PREPROCESSING__PREPROCESSING_PASS_H */ diff --git a/src/preprocessing/preprocessing_pass_context.h b/src/preprocessing/preprocessing_pass_context.h index d6a3b9f0f..e37680538 100644 --- a/src/preprocessing/preprocessing_pass_context.h +++ b/src/preprocessing/preprocessing_pass_context.h @@ -18,8 +18,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__PREPROCESSING__PREPROCESSING_PASS_CONTEXT_H -#define __CVC4__PREPROCESSING__PREPROCESSING_PASS_CONTEXT_H +#ifndef CVC4__PREPROCESSING__PREPROCESSING_PASS_CONTEXT_H +#define CVC4__PREPROCESSING__PREPROCESSING_PASS_CONTEXT_H #include "context/cdo.h" #include "context/context.h" @@ -121,4 +121,4 @@ class PreprocessingPassContext } // namespace preprocessing } // namespace CVC4 -#endif /* __CVC4__PREPROCESSING__PREPROCESSING_PASS_CONTEXT_H */ +#endif /* CVC4__PREPROCESSING__PREPROCESSING_PASS_CONTEXT_H */ diff --git a/src/preprocessing/preprocessing_pass_registry.h b/src/preprocessing/preprocessing_pass_registry.h index 786e59135..9cc109897 100644 --- a/src/preprocessing/preprocessing_pass_registry.h +++ b/src/preprocessing/preprocessing_pass_registry.h @@ -16,8 +16,8 @@ **/ #include "cvc4_private.h" -#ifndef __CVC4__PREPROCESSING__PREPROCESSING_PASS_REGISTRY_H -#define __CVC4__PREPROCESSING__PREPROCESSING_PASS_REGISTRY_H +#ifndef CVC4__PREPROCESSING__PREPROCESSING_PASS_REGISTRY_H +#define CVC4__PREPROCESSING__PREPROCESSING_PASS_REGISTRY_H #include #include @@ -97,4 +97,4 @@ class PreprocessingPassRegistry { } // namespace preprocessing } // namespace CVC4 -#endif /* __CVC4__PREPROCESSING__PREPROCESSING_PASS_REGISTRY_H */ +#endif /* CVC4__PREPROCESSING__PREPROCESSING_PASS_REGISTRY_H */ diff --git a/src/preprocessing/util/ite_utilities.h b/src/preprocessing/util/ite_utilities.h index 383a087c1..ad195e62e 100644 --- a/src/preprocessing/util/ite_utilities.h +++ b/src/preprocessing/util/ite_utilities.h @@ -20,8 +20,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__ITE_UTILITIES_H -#define __CVC4__ITE_UTILITIES_H +#ifndef CVC4__ITE_UTILITIES_H +#define CVC4__ITE_UTILITIES_H #include #include diff --git a/src/printer/ast/ast_printer.h b/src/printer/ast/ast_printer.h index d49e17da2..fa109c779 100644 --- a/src/printer/ast/ast_printer.h +++ b/src/printer/ast/ast_printer.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__PRINTER__AST_PRINTER_H -#define __CVC4__PRINTER__AST_PRINTER_H +#ifndef CVC4__PRINTER__AST_PRINTER_H +#define CVC4__PRINTER__AST_PRINTER_H #include @@ -54,4 +54,4 @@ class AstPrinter : public CVC4::Printer { }/* CVC4::printer namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__PRINTER__AST_PRINTER_H */ +#endif /* CVC4__PRINTER__AST_PRINTER_H */ diff --git a/src/printer/cvc/cvc_printer.h b/src/printer/cvc/cvc_printer.h index e85a66a05..d379af7e3 100644 --- a/src/printer/cvc/cvc_printer.h +++ b/src/printer/cvc/cvc_printer.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__PRINTER__CVC_PRINTER_H -#define __CVC4__PRINTER__CVC_PRINTER_H +#ifndef CVC4__PRINTER__CVC_PRINTER_H +#define CVC4__PRINTER__CVC_PRINTER_H #include @@ -57,4 +57,4 @@ class CvcPrinter : public CVC4::Printer { }/* CVC4::printer namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__PRINTER__CVC_PRINTER_H */ +#endif /* CVC4__PRINTER__CVC_PRINTER_H */ diff --git a/src/printer/dagification_visitor.h b/src/printer/dagification_visitor.h index ed0f1ada7..18f31e662 100644 --- a/src/printer/dagification_visitor.h +++ b/src/printer/dagification_visitor.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__PRINTER__DAGIFICATION_VISITOR_H -#define __CVC4__PRINTER__DAGIFICATION_VISITOR_H +#ifndef CVC4__PRINTER__DAGIFICATION_VISITOR_H +#define CVC4__PRINTER__DAGIFICATION_VISITOR_H #include #include @@ -175,4 +175,4 @@ public: }/* CVC4::printer namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__PRINTER__DAGIFICATION_VISITOR_H */ +#endif /* CVC4__PRINTER__DAGIFICATION_VISITOR_H */ diff --git a/src/printer/printer.h b/src/printer/printer.h index 051eb6c97..85b7d498f 100644 --- a/src/printer/printer.h +++ b/src/printer/printer.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__PRINTER__PRINTER_H -#define __CVC4__PRINTER__PRINTER_H +#ifndef CVC4__PRINTER__PRINTER_H +#define CVC4__PRINTER__PRINTER_H #include #include @@ -113,4 +113,4 @@ class Printer } // namespace CVC4 -#endif /* __CVC4__PRINTER__PRINTER_H */ +#endif /* CVC4__PRINTER__PRINTER_H */ diff --git a/src/printer/smt2/smt2_printer.h b/src/printer/smt2/smt2_printer.h index 3f80f0612..579231364 100644 --- a/src/printer/smt2/smt2_printer.h +++ b/src/printer/smt2/smt2_printer.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__PRINTER__SMT2_PRINTER_H -#define __CVC4__PRINTER__SMT2_PRINTER_H +#ifndef CVC4__PRINTER__SMT2_PRINTER_H +#define CVC4__PRINTER__SMT2_PRINTER_H #include @@ -80,4 +80,4 @@ class Smt2Printer : public CVC4::Printer { }/* CVC4::printer namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__PRINTER__SMT2_PRINTER_H */ +#endif /* CVC4__PRINTER__SMT2_PRINTER_H */ diff --git a/src/printer/sygus_print_callback.h b/src/printer/sygus_print_callback.h index 5b099aa1f..d956fd4c6 100644 --- a/src/printer/sygus_print_callback.h +++ b/src/printer/sygus_print_callback.h @@ -14,8 +14,8 @@ #include "cvc4_public.h" -#ifndef __CVC4__PRINTER__SYGUS_PRINT_CALLBACK_H -#define __CVC4__PRINTER__SYGUS_PRINT_CALLBACK_H +#ifndef CVC4__PRINTER__SYGUS_PRINT_CALLBACK_H +#define CVC4__PRINTER__SYGUS_PRINT_CALLBACK_H #include @@ -172,4 +172,4 @@ class CVC4_PUBLIC SygusEmptyPrintCallback : public SygusPrintCallback } /* CVC4::printer namespace */ } /* CVC4 namespace */ -#endif /* __CVC4__PRINTER__SYGUS_PRINT_CALLBACK_H */ +#endif /* CVC4__PRINTER__SYGUS_PRINT_CALLBACK_H */ diff --git a/src/printer/tptp/tptp_printer.h b/src/printer/tptp/tptp_printer.h index ae7817a47..63272891e 100644 --- a/src/printer/tptp/tptp_printer.h +++ b/src/printer/tptp/tptp_printer.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__PRINTER__TPTP_PRINTER_H -#define __CVC4__PRINTER__TPTP_PRINTER_H +#ifndef CVC4__PRINTER__TPTP_PRINTER_H +#define CVC4__PRINTER__TPTP_PRINTER_H #include @@ -58,4 +58,4 @@ class TptpPrinter : public CVC4::Printer { }/* CVC4::printer namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__PRINTER__TPTP_PRINTER_H */ +#endif /* CVC4__PRINTER__TPTP_PRINTER_H */ diff --git a/src/proof/arith_proof.h b/src/proof/arith_proof.h index a93bf4c57..a1df24fac 100644 --- a/src/proof/arith_proof.h +++ b/src/proof/arith_proof.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__ARITH__PROOF_H -#define __CVC4__ARITH__PROOF_H +#ifndef CVC4__ARITH__PROOF_H +#define CVC4__ARITH__PROOF_H #include #include @@ -172,4 +172,4 @@ public: }/* CVC4 namespace */ -#endif /* __CVC4__ARITH__PROOF_H */ +#endif /* CVC4__ARITH__PROOF_H */ diff --git a/src/proof/arith_proof_recorder.h b/src/proof/arith_proof_recorder.h index fe7bffbd0..3fff6968d 100644 --- a/src/proof/arith_proof_recorder.h +++ b/src/proof/arith_proof_recorder.h @@ -42,8 +42,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__PROOF__ARITH_PROOF_RECORDER_H -#define __CVC4__PROOF__ARITH_PROOF_RECORDER_H +#ifndef CVC4__PROOF__ARITH_PROOF_RECORDER_H +#define CVC4__PROOF__ARITH_PROOF_RECORDER_H #include #include diff --git a/src/proof/array_proof.h b/src/proof/array_proof.h index 7e3340af0..372ad1f67 100644 --- a/src/proof/array_proof.h +++ b/src/proof/array_proof.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__ARRAY__PROOF_H -#define __CVC4__ARRAY__PROOF_H +#ifndef CVC4__ARRAY__PROOF_H +#define CVC4__ARRAY__PROOF_H #include #include @@ -117,4 +117,4 @@ public: }/* CVC4 namespace */ -#endif /* __CVC4__ARRAY__PROOF_H */ +#endif /* CVC4__ARRAY__PROOF_H */ diff --git a/src/proof/bitvector_proof.h b/src/proof/bitvector_proof.h index 91c07fcb5..f0a0717fa 100644 --- a/src/proof/bitvector_proof.h +++ b/src/proof/bitvector_proof.h @@ -17,8 +17,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__BITVECTOR_PROOF_H -#define __CVC4__BITVECTOR_PROOF_H +#ifndef CVC4__BITVECTOR_PROOF_H +#define CVC4__BITVECTOR_PROOF_H #include #include @@ -276,4 +276,4 @@ class BitVectorProof : public TheoryProof }/* CVC4 namespace */ -#endif /* __CVC4__BITVECTOR__PROOF_H */ +#endif /* CVC4__BITVECTOR__PROOF_H */ diff --git a/src/proof/clausal_bitvector_proof.h b/src/proof/clausal_bitvector_proof.h index b53bcd5e2..b10b1ad1c 100644 --- a/src/proof/clausal_bitvector_proof.h +++ b/src/proof/clausal_bitvector_proof.h @@ -18,8 +18,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__PROOF__CLAUSAL_BITVECTOR_PROOF_H -#define __CVC4__PROOF__CLAUSAL_BITVECTOR_PROOF_H +#ifndef CVC4__PROOF__CLAUSAL_BITVECTOR_PROOF_H +#define CVC4__PROOF__CLAUSAL_BITVECTOR_PROOF_H #include #include @@ -135,4 +135,4 @@ class LfscErBitVectorProof : public LfscClausalBitVectorProof } // namespace CVC4 -#endif /* __CVC4__PROOF__CLAUSAL_BITVECTOR_PROOF_H */ +#endif /* CVC4__PROOF__CLAUSAL_BITVECTOR_PROOF_H */ diff --git a/src/proof/clause_id.h b/src/proof/clause_id.h index e8b9841c8..4a9ebc74a 100644 --- a/src/proof/clause_id.h +++ b/src/proof/clause_id.h @@ -17,8 +17,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__PROOF__CLAUSE_ID_H -#define __CVC4__PROOF__CLAUSE_ID_H +#ifndef CVC4__PROOF__CLAUSE_ID_H +#define CVC4__PROOF__CLAUSE_ID_H namespace CVC4 { @@ -30,4 +30,4 @@ typedef unsigned ClauseId; }/* CVC4 namespace */ -#endif /* __CVC4__PROOF__CLAUSE_ID_H */ +#endif /* CVC4__PROOF__CLAUSE_ID_H */ diff --git a/src/proof/cnf_proof.h b/src/proof/cnf_proof.h index a17777c66..e589950bc 100644 --- a/src/proof/cnf_proof.h +++ b/src/proof/cnf_proof.h @@ -18,8 +18,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__CNF_PROOF_H -#define __CVC4__CNF_PROOF_H +#ifndef CVC4__CNF_PROOF_H +#define CVC4__CNF_PROOF_H #include #include @@ -212,4 +212,4 @@ public: } /* CVC4 namespace */ -#endif /* __CVC4__CNF_PROOF_H */ +#endif /* CVC4__CNF_PROOF_H */ diff --git a/src/proof/dimacs_printer.h b/src/proof/dimacs_printer.h index f46cb51ec..2ae4abefa 100644 --- a/src/proof/dimacs_printer.h +++ b/src/proof/dimacs_printer.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__PROOF__DIMACS_PRINTER_H -#define __CVC4__PROOF__DIMACS_PRINTER_H +#ifndef CVC4__PROOF__DIMACS_PRINTER_H +#define CVC4__PROOF__DIMACS_PRINTER_H #include #include @@ -63,4 +63,4 @@ void printDimacs( } // namespace proof } // namespace CVC4 -#endif // __CVC4__PROOF__DIMACS_PRINTER_H +#endif // CVC4__PROOF__DIMACS_PRINTER_H diff --git a/src/proof/drat/drat_proof.h b/src/proof/drat/drat_proof.h index c4b7c2e02..082107d0a 100644 --- a/src/proof/drat/drat_proof.h +++ b/src/proof/drat/drat_proof.h @@ -19,8 +19,8 @@ ** **/ -#ifndef __CVC4__PROOF__DRAT__DRAT_PROOF_H -#define __CVC4__PROOF__DRAT__DRAT_PROOF_H +#ifndef CVC4__PROOF__DRAT__DRAT_PROOF_H +#define CVC4__PROOF__DRAT__DRAT_PROOF_H #include "cvc4_private.h" #include "prop/sat_solver.h" @@ -137,4 +137,4 @@ class DratProof } // namespace proof } // namespace CVC4 -#endif // __CVC4__PROOF__DRAT__DRAT_PROOF_H +#endif // CVC4__PROOF__DRAT__DRAT_PROOF_H diff --git a/src/proof/er/er_proof.h b/src/proof/er/er_proof.h index 0a0038738..f5af0783b 100644 --- a/src/proof/er/er_proof.h +++ b/src/proof/er/er_proof.h @@ -23,8 +23,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__PROOF__ER__ER_PROOF_H -#define __CVC4__PROOF__ER__ER_PROOF_H +#ifndef CVC4__PROOF__ER__ER_PROOF_H +#define CVC4__PROOF__ER__ER_PROOF_H #include #include @@ -205,4 +205,4 @@ class ErProof } // namespace proof } // namespace CVC4 -#endif // __CVC4__PROOF__ER__ER_PROOF_H +#endif // CVC4__PROOF__ER__ER_PROOF_H diff --git a/src/proof/lemma_proof.h b/src/proof/lemma_proof.h index b4b40ef1b..7dfce57cf 100644 --- a/src/proof/lemma_proof.h +++ b/src/proof/lemma_proof.h @@ -15,8 +15,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__LEMMA_PROOF_H -#define __CVC4__LEMMA_PROOF_H +#ifndef CVC4__LEMMA_PROOF_H +#define CVC4__LEMMA_PROOF_H #include "expr/expr.h" #include "proof/clause_id.h" @@ -112,4 +112,4 @@ std::ostream& operator<<(std::ostream & out, const LemmaProofRecipe & recipe); } /* CVC4 namespace */ -#endif /* __CVC4__LEMMA_PROOF_H */ +#endif /* CVC4__LEMMA_PROOF_H */ diff --git a/src/proof/lfsc_proof_printer.h b/src/proof/lfsc_proof_printer.h index beef4823e..f2f55aa94 100644 --- a/src/proof/lfsc_proof_printer.h +++ b/src/proof/lfsc_proof_printer.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__PROOF__LFSC_PROOF_PRINTER_H -#define __CVC4__PROOF__LFSC_PROOF_PRINTER_H +#ifndef CVC4__PROOF__LFSC_PROOF_PRINTER_H +#define CVC4__PROOF__LFSC_PROOF_PRINTER_H #include #include @@ -151,4 +151,4 @@ class LFSCProofPrinter } // namespace proof } // namespace CVC4 -#endif /* __CVC4__PROOF__LFSC_PROOF_PRINTER_H */ +#endif /* CVC4__PROOF__LFSC_PROOF_PRINTER_H */ diff --git a/src/proof/lrat/lrat_proof.h b/src/proof/lrat/lrat_proof.h index f231e5a6b..33b2fad3f 100644 --- a/src/proof/lrat/lrat_proof.h +++ b/src/proof/lrat/lrat_proof.h @@ -23,8 +23,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__PROOF__LRAT__LRAT_PROOF_H -#define __CVC4__PROOF__LRAT__LRAT_PROOF_H +#ifndef CVC4__PROOF__LRAT__LRAT_PROOF_H +#define CVC4__PROOF__LRAT__LRAT_PROOF_H #include #include diff --git a/src/proof/proof.h b/src/proof/proof.h index b39d73134..9e7e20a22 100644 --- a/src/proof/proof.h +++ b/src/proof/proof.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__PROOF__PROOF_H -#define __CVC4__PROOF__PROOF_H +#ifndef CVC4__PROOF__PROOF_H +#define CVC4__PROOF__PROOF_H #include "options/smt_options.h" @@ -67,4 +67,4 @@ # define PSTATS(x) #endif /* CVC4_PROOF_STATS */ -#endif /* __CVC4__PROOF__PROOF_H */ +#endif /* CVC4__PROOF__PROOF_H */ diff --git a/src/proof/proof_manager.h b/src/proof/proof_manager.h index 0d3250b12..eb5942bea 100644 --- a/src/proof/proof_manager.h +++ b/src/proof/proof_manager.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__PROOF_MANAGER_H -#define __CVC4__PROOF_MANAGER_H +#ifndef CVC4__PROOF_MANAGER_H +#define CVC4__PROOF_MANAGER_H #include #include @@ -351,4 +351,4 @@ std::ostream& operator<<(std::ostream& out, CVC4::ProofRule k); -#endif /* __CVC4__PROOF_MANAGER_H */ +#endif /* CVC4__PROOF_MANAGER_H */ diff --git a/src/proof/proof_output_channel.h b/src/proof/proof_output_channel.h index 9bf1e0e5c..ff84a3743 100644 --- a/src/proof/proof_output_channel.h +++ b/src/proof/proof_output_channel.h @@ -13,8 +13,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__PROOF_OUTPUT_CHANNEL_H -#define __CVC4__PROOF_OUTPUT_CHANNEL_H +#ifndef CVC4__PROOF_OUTPUT_CHANNEL_H +#define CVC4__PROOF_OUTPUT_CHANNEL_H #include #include @@ -74,4 +74,4 @@ public: } /* CVC4 namespace */ -#endif /* __CVC4__PROOF_OUTPUT_CHANNEL_H */ +#endif /* CVC4__PROOF_OUTPUT_CHANNEL_H */ diff --git a/src/proof/resolution_bitvector_proof.h b/src/proof/resolution_bitvector_proof.h index 24d1bc76f..5fd11092f 100644 --- a/src/proof/resolution_bitvector_proof.h +++ b/src/proof/resolution_bitvector_proof.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__PROOF__RESOLUTION_BITVECTOR_PROOF_H -#define __CVC4__PROOF__RESOLUTION_BITVECTOR_PROOF_H +#ifndef CVC4__PROOF__RESOLUTION_BITVECTOR_PROOF_H +#define CVC4__PROOF__RESOLUTION_BITVECTOR_PROOF_H #include @@ -110,4 +110,4 @@ class LfscResolutionBitVectorProof : public ResolutionBitVectorProof } // namespace CVC4 -#endif /* __CVC4__PROOF__RESOLUTIONBITVECTORPROOF_H */ +#endif /* CVC4__PROOF__RESOLUTIONBITVECTORPROOF_H */ diff --git a/src/proof/sat_proof.h b/src/proof/sat_proof.h index 82bd93947..ec0928c07 100644 --- a/src/proof/sat_proof.h +++ b/src/proof/sat_proof.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__SAT__PROOF_H -#define __CVC4__SAT__PROOF_H +#ifndef CVC4__SAT__PROOF_H +#define CVC4__SAT__PROOF_H #include @@ -373,4 +373,4 @@ void toSatClause(const typename Solver::TClause& minisat_cl, } /* CVC4 namespace */ -#endif /* __CVC4__SAT__PROOF_H */ +#endif /* CVC4__SAT__PROOF_H */ diff --git a/src/proof/sat_proof_implementation.h b/src/proof/sat_proof_implementation.h index bc32b7959..d9c959ae4 100644 --- a/src/proof/sat_proof_implementation.h +++ b/src/proof/sat_proof_implementation.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__SAT__PROOF_IMPLEMENTATION_H -#define __CVC4__SAT__PROOF_IMPLEMENTATION_H +#ifndef CVC4__SAT__PROOF_IMPLEMENTATION_H +#define CVC4__SAT__PROOF_IMPLEMENTATION_H #include "proof/clause_id.h" #include "proof/cnf_proof.h" @@ -1081,4 +1081,4 @@ inline std::ostream& operator<<(std::ostream& out, CVC4::ClauseKind k) { } /* CVC4 namespace */ -#endif /* __CVC4__SAT__PROOF_IMPLEMENTATION_H */ +#endif /* CVC4__SAT__PROOF_IMPLEMENTATION_H */ diff --git a/src/proof/simplify_boolean_node.h b/src/proof/simplify_boolean_node.h index 0b1cf4990..fe8b7174b 100644 --- a/src/proof/simplify_boolean_node.h +++ b/src/proof/simplify_boolean_node.h @@ -15,8 +15,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__SIMPLIFY_BOOLEAN_NODE_H -#define __CVC4__SIMPLIFY_BOOLEAN_NODE_H +#ifndef CVC4__SIMPLIFY_BOOLEAN_NODE_H +#define CVC4__SIMPLIFY_BOOLEAN_NODE_H namespace CVC4 { @@ -24,4 +24,4 @@ Node simplifyBooleanNode(const Node &n); }/* CVC4 namespace */ -#endif /* __CVC4__SIMPLIFY_BOOLEAN_NODE_H */ +#endif /* CVC4__SIMPLIFY_BOOLEAN_NODE_H */ diff --git a/src/proof/skolemization_manager.h b/src/proof/skolemization_manager.h index 54b30e6f0..cb23268f3 100644 --- a/src/proof/skolemization_manager.h +++ b/src/proof/skolemization_manager.h @@ -17,8 +17,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__SKOLEMIZATION_MANAGER_H -#define __CVC4__SKOLEMIZATION_MANAGER_H +#ifndef CVC4__SKOLEMIZATION_MANAGER_H +#define CVC4__SKOLEMIZATION_MANAGER_H #include #include @@ -52,4 +52,4 @@ private: -#endif /* __CVC4__SKOLEMIZATION_MANAGER_H */ +#endif /* CVC4__SKOLEMIZATION_MANAGER_H */ diff --git a/src/proof/theory_proof.h b/src/proof/theory_proof.h index 94765d95a..b487b62a8 100644 --- a/src/proof/theory_proof.h +++ b/src/proof/theory_proof.h @@ -17,8 +17,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY_PROOF_H -#define __CVC4__THEORY_PROOF_H +#ifndef CVC4__THEORY_PROOF_H +#define CVC4__THEORY_PROOF_H #include #include @@ -401,4 +401,4 @@ public: } /* CVC4 namespace */ -#endif /* __CVC4__THEORY_PROOF_H */ +#endif /* CVC4__THEORY_PROOF_H */ diff --git a/src/proof/uf_proof.h b/src/proof/uf_proof.h index e5fd396c5..ca8b3f90e 100644 --- a/src/proof/uf_proof.h +++ b/src/proof/uf_proof.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__UF__PROOF_H -#define __CVC4__UF__PROOF_H +#ifndef CVC4__UF__PROOF_H +#define CVC4__UF__PROOF_H #include #include @@ -102,4 +102,4 @@ public: }/* CVC4 namespace */ -#endif /* __CVC4__UF__PROOF_H */ +#endif /* CVC4__UF__PROOF_H */ diff --git a/src/proof/unsat_core.h b/src/proof/unsat_core.h index 6e0c84840..0217b6326 100644 --- a/src/proof/unsat_core.h +++ b/src/proof/unsat_core.h @@ -17,8 +17,8 @@ #include "cvc4_public.h" -#ifndef __CVC4__UNSAT_CORE_H -#define __CVC4__UNSAT_CORE_H +#ifndef CVC4__UNSAT_CORE_H +#define CVC4__UNSAT_CORE_H #include #include @@ -71,4 +71,4 @@ public: }/* CVC4 namespace */ -#endif /* __CVC4__UNSAT_CORE_H */ +#endif /* CVC4__UNSAT_CORE_H */ diff --git a/src/prop/bv_sat_solver_notify.h b/src/prop/bv_sat_solver_notify.h index d5a361eb8..77163cfe6 100644 --- a/src/prop/bv_sat_solver_notify.h +++ b/src/prop/bv_sat_solver_notify.h @@ -15,8 +15,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__PROP__BVSATSOLVERNOTIFY_H -#define __CVC4__PROP__BVSATSOLVERNOTIFY_H +#ifndef CVC4__PROP__BVSATSOLVERNOTIFY_H +#define CVC4__PROP__BVSATSOLVERNOTIFY_H #include "prop/sat_solver_types.h" diff --git a/src/prop/cadical.h b/src/prop/cadical.h index 747c9ddb2..e43a2d278 100644 --- a/src/prop/cadical.h +++ b/src/prop/cadical.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__PROP__CADICAL_H -#define __CVC4__PROP__CADICAL_H +#ifndef CVC4__PROP__CADICAL_H +#define CVC4__PROP__CADICAL_H #ifdef CVC4_USE_CADICAL @@ -87,4 +87,4 @@ class CadicalSolver : public SatSolver } // namespace CVC4 #endif // CVC4_USE_CADICAL -#endif // __CVC4__PROP__CADICAL_H +#endif // CVC4__PROP__CADICAL_H diff --git a/src/prop/cnf_stream.h b/src/prop/cnf_stream.h index c35b3d2fa..8e60863fa 100644 --- a/src/prop/cnf_stream.h +++ b/src/prop/cnf_stream.h @@ -22,8 +22,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__PROP__CNF_STREAM_H -#define __CVC4__PROP__CNF_STREAM_H +#ifndef CVC4__PROP__CNF_STREAM_H +#define CVC4__PROP__CNF_STREAM_H #include "context/cdinsert_hashmap.h" #include "context/cdlist.h" @@ -338,4 +338,4 @@ class TseitinCnfStream : public CnfStream { } /* CVC4::prop namespace */ } /* CVC4 namespace */ -#endif /* __CVC4__PROP__CNF_STREAM_H */ +#endif /* CVC4__PROP__CNF_STREAM_H */ diff --git a/src/prop/cryptominisat.h b/src/prop/cryptominisat.h index 4aa53909a..d3c5aeb30 100644 --- a/src/prop/cryptominisat.h +++ b/src/prop/cryptominisat.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__PROP__CRYPTOMINISAT_H -#define __CVC4__PROP__CRYPTOMINISAT_H +#ifndef CVC4__PROP__CRYPTOMINISAT_H +#define CVC4__PROP__CRYPTOMINISAT_H #ifdef CVC4_USE_CRYPTOMINISAT @@ -95,4 +95,4 @@ public: } // namespace CVC4 #endif // CVC4_USE_CRYPTOMINISAT -#endif // __CVC4__PROP__CRYPTOMINISAT_H +#endif // CVC4__PROP__CRYPTOMINISAT_H diff --git a/src/prop/prop_engine.h b/src/prop/prop_engine.h index 4815a3c35..aaa65b85a 100644 --- a/src/prop/prop_engine.h +++ b/src/prop/prop_engine.h @@ -18,8 +18,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__PROP_ENGINE_H -#define __CVC4__PROP_ENGINE_H +#ifndef CVC4__PROP_ENGINE_H +#define CVC4__PROP_ENGINE_H #include @@ -248,4 +248,4 @@ public: }/* CVC4::prop namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__PROP_ENGINE_H */ +#endif /* CVC4__PROP_ENGINE_H */ diff --git a/src/prop/registrar.h b/src/prop/registrar.h index 01d69e14c..0846b8829 100644 --- a/src/prop/registrar.h +++ b/src/prop/registrar.h @@ -20,8 +20,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__PROP__REGISTRAR_H -#define __CVC4__PROP__REGISTRAR_H +#ifndef CVC4__PROP__REGISTRAR_H +#define CVC4__PROP__REGISTRAR_H namespace CVC4 { namespace prop { @@ -42,4 +42,4 @@ public: }/* CVC4::prop namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__PROP__REGISTRAR_H */ +#endif /* CVC4__PROP__REGISTRAR_H */ diff --git a/src/prop/sat_solver.h b/src/prop/sat_solver.h index c3716aeea..45bfca4d6 100644 --- a/src/prop/sat_solver.h +++ b/src/prop/sat_solver.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__PROP__SAT_SOLVER_H -#define __CVC4__PROP__SAT_SOLVER_H +#ifndef CVC4__PROP__SAT_SOLVER_H +#define CVC4__PROP__SAT_SOLVER_H #include @@ -192,4 +192,4 @@ inline std::ostream& operator <<(std::ostream& out, prop::SatValue val) { }/* CVC4::prop namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__PROP__SAT_MODULE_H */ +#endif /* CVC4__PROP__SAT_MODULE_H */ diff --git a/src/prop/sat_solver_factory.h b/src/prop/sat_solver_factory.h index 68c23de0b..5f8649768 100644 --- a/src/prop/sat_solver_factory.h +++ b/src/prop/sat_solver_factory.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__PROP__SAT_SOLVER_FACTORY_H -#define __CVC4__PROP__SAT_SOLVER_FACTORY_H +#ifndef CVC4__PROP__SAT_SOLVER_FACTORY_H +#define CVC4__PROP__SAT_SOLVER_FACTORY_H #include #include @@ -50,4 +50,4 @@ class SatSolverFactory } // namespace prop } // namespace CVC4 -#endif // __CVC4__PROP__SAT_SOLVER_FACTORY_H +#endif // CVC4__PROP__SAT_SOLVER_FACTORY_H diff --git a/src/prop/theory_proxy.h b/src/prop/theory_proxy.h index 9b1069fc7..3bb15aa4e 100644 --- a/src/prop/theory_proxy.h +++ b/src/prop/theory_proxy.h @@ -16,12 +16,12 @@ #include "cvc4_private.h" -#ifndef __CVC4__PROP__SAT_H -#define __CVC4__PROP__SAT_H +#ifndef CVC4__PROP__SAT_H +#define CVC4__PROP__SAT_H // Just defining this for now, since there's no other SAT solver bindings. // Optional blocks below will be unconditionally included -#define __CVC4_USE_MINISAT +#define CVC4_USE_MINISAT #include #include @@ -152,4 +152,4 @@ public: }/* CVC4 namespace */ -#endif /* __CVC4__PROP__SAT_H */ +#endif /* CVC4__PROP__SAT_H */ diff --git a/src/smt/command.h b/src/smt/command.h index f3b17b318..68f9d1881 100644 --- a/src/smt/command.h +++ b/src/smt/command.h @@ -19,8 +19,8 @@ #include "cvc4_public.h" -#ifndef __CVC4__COMMAND_H -#define __CVC4__COMMAND_H +#ifndef CVC4__COMMAND_H +#define CVC4__COMMAND_H #include #include @@ -1396,4 +1396,4 @@ class CVC4_PUBLIC DeclarationSequence : public CommandSequence } /* CVC4 namespace */ -#endif /* __CVC4__COMMAND_H */ +#endif /* CVC4__COMMAND_H */ diff --git a/src/smt/command_list.h b/src/smt/command_list.h index 61226da41..0b1aaecf2 100644 --- a/src/smt/command_list.h +++ b/src/smt/command_list.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__SMT__COMMAND_LIST_H -#define __CVC4__SMT__COMMAND_LIST_H +#ifndef CVC4__SMT__COMMAND_LIST_H +#define CVC4__SMT__COMMAND_LIST_H #include "context/cdlist.h" @@ -36,4 +36,4 @@ typedef context::CDList CommandList; }/* CVC4::smt namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__SMT__COMMAND_LIST_H */ +#endif /* CVC4__SMT__COMMAND_LIST_H */ diff --git a/src/smt/dump.h b/src/smt/dump.h index a68f712ca..4946341af 100644 --- a/src/smt/dump.h +++ b/src/smt/dump.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__DUMP_H -#define __CVC4__DUMP_H +#ifndef CVC4__DUMP_H +#define CVC4__DUMP_H #include "base/output.h" #include "smt/command.h" @@ -110,4 +110,4 @@ extern DumpC DumpChannel CVC4_PUBLIC; }/* CVC4 namespace */ -#endif /* __CVC4__DUMP_H */ +#endif /* CVC4__DUMP_H */ diff --git a/src/smt/logic_exception.h b/src/smt/logic_exception.h index 5b197a124..e5da2a6e8 100644 --- a/src/smt/logic_exception.h +++ b/src/smt/logic_exception.h @@ -19,8 +19,8 @@ #include "cvc4_public.h" -#ifndef __CVC4__SMT__LOGIC_EXCEPTION_H -#define __CVC4__SMT__LOGIC_EXCEPTION_H +#ifndef CVC4__SMT__LOGIC_EXCEPTION_H +#define CVC4__SMT__LOGIC_EXCEPTION_H #include "base/exception.h" @@ -44,4 +44,4 @@ class CVC4_PUBLIC LogicException : public CVC4::Exception { }/* CVC4 namespace */ -#endif /* __CVC4__SMT__LOGIC_EXCEPTION_H */ +#endif /* CVC4__SMT__LOGIC_EXCEPTION_H */ diff --git a/src/smt/logic_request.h b/src/smt/logic_request.h index 4d2957f87..432d5469c 100644 --- a/src/smt/logic_request.h +++ b/src/smt/logic_request.h @@ -23,8 +23,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__LOGIC_REQUEST_H -#define __CVC4__LOGIC_REQUEST_H +#ifndef CVC4__LOGIC_REQUEST_H +#define CVC4__LOGIC_REQUEST_H #include "expr/kind.h" @@ -49,4 +49,4 @@ public: }/* CVC4 namespace */ -#endif /* __CVC4__LOGIC_REQUEST_H */ +#endif /* CVC4__LOGIC_REQUEST_H */ diff --git a/src/smt/managed_ostreams.h b/src/smt/managed_ostreams.h index a78bf57ee..f495f8e72 100644 --- a/src/smt/managed_ostreams.h +++ b/src/smt/managed_ostreams.h @@ -17,8 +17,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__MANAGED_OSTREAMS_H -#define __CVC4__MANAGED_OSTREAMS_H +#ifndef CVC4__MANAGED_OSTREAMS_H +#define CVC4__MANAGED_OSTREAMS_H #include @@ -179,4 +179,4 @@ class ManagedReplayLogOstream : public ManagedOstream { }/* CVC4 namespace */ -#endif /* __CVC4__MANAGED_OSTREAMS_H */ +#endif /* CVC4__MANAGED_OSTREAMS_H */ diff --git a/src/smt/model.h b/src/smt/model.h index 214581778..b435fb5e2 100644 --- a/src/smt/model.h +++ b/src/smt/model.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__MODEL_H -#define __CVC4__MODEL_H +#ifndef CVC4__MODEL_H +#define CVC4__MODEL_H #include #include @@ -107,4 +107,4 @@ public: }/* CVC4 namespace */ -#endif /* __CVC4__MODEL_H */ +#endif /* CVC4__MODEL_H */ diff --git a/src/smt/model_core_builder.h b/src/smt/model_core_builder.h index 1fbe9011a..0c179e287 100644 --- a/src/smt/model_core_builder.h +++ b/src/smt/model_core_builder.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__MODEL_CORE_BUILDER_H -#define __CVC4__THEORY__MODEL_CORE_BUILDER_H +#ifndef CVC4__THEORY__MODEL_CORE_BUILDER_H +#define CVC4__THEORY__MODEL_CORE_BUILDER_H #include @@ -61,4 +61,4 @@ class ModelCoreBuilder } // namespace CVC4 -#endif /* __CVC4__THEORY__MODEL_CORE_BUILDER_H */ +#endif /* CVC4__THEORY__MODEL_CORE_BUILDER_H */ diff --git a/src/smt/smt_engine.h b/src/smt/smt_engine.h index 39264fb01..165e93997 100644 --- a/src/smt/smt_engine.h +++ b/src/smt/smt_engine.h @@ -16,8 +16,8 @@ #include "cvc4_public.h" -#ifndef __CVC4__SMT_ENGINE_H -#define __CVC4__SMT_ENGINE_H +#ifndef CVC4__SMT_ENGINE_H +#define CVC4__SMT_ENGINE_H #include #include @@ -1064,4 +1064,4 @@ class CVC4_PUBLIC SmtEngine { }/* CVC4 namespace */ -#endif /* __CVC4__SMT_ENGINE_H */ +#endif /* CVC4__SMT_ENGINE_H */ diff --git a/src/smt/smt_engine_scope.h b/src/smt/smt_engine_scope.h index b6db0c20c..d72d58caa 100644 --- a/src/smt/smt_engine_scope.h +++ b/src/smt/smt_engine_scope.h @@ -17,8 +17,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__SMT__SMT_ENGINE_SCOPE_H -#define __CVC4__SMT__SMT_ENGINE_SCOPE_H +#ifndef CVC4__SMT__SMT_ENGINE_SCOPE_H +#define CVC4__SMT__SMT_ENGINE_SCOPE_H #include "expr/node_manager.h" @@ -56,4 +56,4 @@ public: }/* CVC4::smt namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__SMT__SMT_ENGINE_SCOPE_H */ +#endif /* CVC4__SMT__SMT_ENGINE_SCOPE_H */ diff --git a/src/smt/update_ostream.h b/src/smt/update_ostream.h index 30fb98c02..0427f4058 100644 --- a/src/smt/update_ostream.h +++ b/src/smt/update_ostream.h @@ -17,8 +17,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__UPDATE_OSTREAM_H -#define __CVC4__UPDATE_OSTREAM_H +#ifndef CVC4__UPDATE_OSTREAM_H +#define CVC4__UPDATE_OSTREAM_H #include @@ -121,4 +121,4 @@ class TraceOstreamUpdate : public OstreamUpdate { }/* CVC4 namespace */ -#endif /* __CVC4__UPDATE_OSTREAM_H */ +#endif /* CVC4__UPDATE_OSTREAM_H */ diff --git a/src/smt_util/boolean_simplification.h b/src/smt_util/boolean_simplification.h index 71e0b55f3..c1e2e4d76 100644 --- a/src/smt_util/boolean_simplification.h +++ b/src/smt_util/boolean_simplification.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__BOOLEAN_SIMPLIFICATION_H -#define __CVC4__BOOLEAN_SIMPLIFICATION_H +#ifndef CVC4__BOOLEAN_SIMPLIFICATION_H +#define CVC4__BOOLEAN_SIMPLIFICATION_H #include #include @@ -238,4 +238,4 @@ class BooleanSimplification { }/* CVC4 namespace */ -#endif /* __CVC4__BOOLEAN_SIMPLIFICATION_H */ +#endif /* CVC4__BOOLEAN_SIMPLIFICATION_H */ diff --git a/src/smt_util/lemma_channels.h b/src/smt_util/lemma_channels.h index beafac58f..40c58dd24 100644 --- a/src/smt_util/lemma_channels.h +++ b/src/smt_util/lemma_channels.h @@ -25,8 +25,8 @@ #include "cvc4_public.h" -#ifndef __CVC4__SMT_UTIL__LEMMA_CHANNELS_H -#define __CVC4__SMT_UTIL__LEMMA_CHANNELS_H +#ifndef CVC4__SMT_UTIL__LEMMA_CHANNELS_H +#define CVC4__SMT_UTIL__LEMMA_CHANNELS_H #include #include @@ -74,4 +74,4 @@ class CVC4_PUBLIC LemmaChannels { } /* namespace CVC4 */ -#endif /* __CVC4__SMT_UTIL__LEMMA_CHANNELS_H */ +#endif /* CVC4__SMT_UTIL__LEMMA_CHANNELS_H */ diff --git a/src/smt_util/lemma_input_channel.h b/src/smt_util/lemma_input_channel.h index 2140e9297..16bb457c8 100644 --- a/src/smt_util/lemma_input_channel.h +++ b/src/smt_util/lemma_input_channel.h @@ -17,8 +17,8 @@ #include "cvc4_public.h" -#ifndef __CVC4__LEMMA_INPUT_CHANNEL_H -#define __CVC4__LEMMA_INPUT_CHANNEL_H +#ifndef CVC4__LEMMA_INPUT_CHANNEL_H +#define CVC4__LEMMA_INPUT_CHANNEL_H #include "expr/expr.h" @@ -35,4 +35,4 @@ public: }/* CVC4 namespace */ -#endif /* __CVC4__LEMMA_INPUT_CHANNEL_H */ +#endif /* CVC4__LEMMA_INPUT_CHANNEL_H */ diff --git a/src/smt_util/lemma_output_channel.h b/src/smt_util/lemma_output_channel.h index e53f1b8bc..e2218775d 100644 --- a/src/smt_util/lemma_output_channel.h +++ b/src/smt_util/lemma_output_channel.h @@ -18,8 +18,8 @@ #include "cvc4_public.h" -#ifndef __CVC4__LEMMA_OUTPUT_CHANNEL_H -#define __CVC4__LEMMA_OUTPUT_CHANNEL_H +#ifndef CVC4__LEMMA_OUTPUT_CHANNEL_H +#define CVC4__LEMMA_OUTPUT_CHANNEL_H #include "expr/expr.h" @@ -43,4 +43,4 @@ public: }/* CVC4 namespace */ -#endif /* __CVC4__LEMMA_OUTPUT_CHANNEL_H */ +#endif /* CVC4__LEMMA_OUTPUT_CHANNEL_H */ diff --git a/src/theory/arith/arith_ite_utils.h b/src/theory/arith/arith_ite_utils.h index 2d06e4be9..a9e7aa92c 100644 --- a/src/theory/arith/arith_ite_utils.h +++ b/src/theory/arith/arith_ite_utils.h @@ -19,8 +19,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__ARITH__ARITH_ITE_UTILS_H -#define __CVC4__THEORY__ARITH__ARITH_ITE_UTILS_H +#ifndef CVC4__THEORY__ARITH__ARITH_ITE_UTILS_H +#define CVC4__THEORY__ARITH__ARITH_ITE_UTILS_H #include @@ -115,4 +115,4 @@ private: }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__ARITH__ARITH_ITE_UTILS_H */ +#endif /* CVC4__THEORY__ARITH__ARITH_ITE_UTILS_H */ diff --git a/src/theory/arith/arith_msum.h b/src/theory/arith/arith_msum.h index 44cce854c..8a9dbf791 100644 --- a/src/theory/arith/arith_msum.h +++ b/src/theory/arith/arith_msum.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__ARITH__MSUM_H -#define __CVC4__THEORY__ARITH__MSUM_H +#ifndef CVC4__THEORY__ARITH__MSUM_H +#define CVC4__THEORY__ARITH__MSUM_H #include @@ -185,4 +185,4 @@ class ArithMSum } /* CVC4::theory namespace */ } /* CVC4 namespace */ -#endif /* __CVC4__THEORY__ARITH__MSUM_H */ +#endif /* CVC4__THEORY__ARITH__MSUM_H */ diff --git a/src/theory/arith/arith_rewriter.h b/src/theory/arith/arith_rewriter.h index 88b931229..de6b3f228 100644 --- a/src/theory/arith/arith_rewriter.h +++ b/src/theory/arith/arith_rewriter.h @@ -17,8 +17,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__ARITH__ARITH_REWRITER_H -#define __CVC4__THEORY__ARITH__ARITH_REWRITER_H +#ifndef CVC4__THEORY__ARITH__ARITH_REWRITER_H +#define CVC4__THEORY__ARITH__ARITH_REWRITER_H #include "theory/theory.h" #include "theory/rewriter.h" @@ -76,4 +76,4 @@ private: }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__ARITH__ARITH_REWRITER_H */ +#endif /* CVC4__THEORY__ARITH__ARITH_REWRITER_H */ diff --git a/src/theory/arith/arith_static_learner.h b/src/theory/arith/arith_static_learner.h index d5f432187..bc77f8ec0 100644 --- a/src/theory/arith/arith_static_learner.h +++ b/src/theory/arith/arith_static_learner.h @@ -17,8 +17,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__ARITH__ARITH_STATIC_LEARNER_H -#define __CVC4__THEORY__ARITH__ARITH_STATIC_LEARNER_H +#ifndef CVC4__THEORY__ARITH__ARITH_STATIC_LEARNER_H +#define CVC4__THEORY__ARITH__ARITH_STATIC_LEARNER_H #include @@ -72,4 +72,4 @@ private: }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__ARITH__ARITH_STATIC_LEARNER_H */ +#endif /* CVC4__THEORY__ARITH__ARITH_STATIC_LEARNER_H */ diff --git a/src/theory/arith/arith_utilities.h b/src/theory/arith/arith_utilities.h index aabc5326d..c8e92dfd3 100644 --- a/src/theory/arith/arith_utilities.h +++ b/src/theory/arith/arith_utilities.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__ARITH__ARITH_UTILITIES_H -#define __CVC4__THEORY__ARITH__ARITH_UTILITIES_H +#ifndef CVC4__THEORY__ARITH__ARITH_UTILITIES_H +#define CVC4__THEORY__ARITH__ARITH_UTILITIES_H #include #include @@ -307,4 +307,4 @@ inline Node mkPi() }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__ARITH__ARITH_UTILITIES_H */ +#endif /* CVC4__THEORY__ARITH__ARITH_UTILITIES_H */ diff --git a/src/theory/arith/arithvar_node_map.h b/src/theory/arith/arithvar_node_map.h index 308d63b0c..03b061504 100644 --- a/src/theory/arith/arithvar_node_map.h +++ b/src/theory/arith/arithvar_node_map.h @@ -17,8 +17,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__ARITH__ARITHVAR_NODE_MAP_H -#define __CVC4__THEORY__ARITH__ARITHVAR_NODE_MAP_H +#ifndef CVC4__THEORY__ARITH__ARITHVAR_NODE_MAP_H +#define CVC4__THEORY__ARITH__ARITHVAR_NODE_MAP_H #include "theory/arith/arithvar.h" @@ -92,4 +92,4 @@ public: }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__ARITH__ARITHVAR_NODE_MAP_H */ +#endif /* CVC4__THEORY__ARITH__ARITHVAR_NODE_MAP_H */ diff --git a/src/theory/arith/constraint.h b/src/theory/arith/constraint.h index 36a347feb..f2c0c4b02 100644 --- a/src/theory/arith/constraint.h +++ b/src/theory/arith/constraint.h @@ -72,8 +72,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__ARITH__CONSTRAINT_H -#define __CVC4__THEORY__ARITH__CONSTRAINT_H +#ifndef CVC4__THEORY__ARITH__CONSTRAINT_H +#define CVC4__THEORY__ARITH__CONSTRAINT_H #include #include @@ -1209,4 +1209,4 @@ private: }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__ARITH__CONSTRAINT_H */ +#endif /* CVC4__THEORY__ARITH__CONSTRAINT_H */ diff --git a/src/theory/arith/constraint_forward.h b/src/theory/arith/constraint_forward.h index 4be468f80..5f3f2251d 100644 --- a/src/theory/arith/constraint_forward.h +++ b/src/theory/arith/constraint_forward.h @@ -16,8 +16,8 @@ ** minimize interaction between header files. **/ -#ifndef __CVC4__THEORY__ARITH__CONSTRAINT_FORWARD_H -#define __CVC4__THEORY__ARITH__CONSTRAINT_FORWARD_H +#ifndef CVC4__THEORY__ARITH__CONSTRAINT_FORWARD_H +#define CVC4__THEORY__ARITH__CONSTRAINT_FORWARD_H #include "cvc4_private.h" #include @@ -46,4 +46,4 @@ static const RationalVectorP RationalVectorPSentinel = NULL; }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__ARITH__CONSTRAINT_FORWARD_H */ +#endif /* CVC4__THEORY__ARITH__CONSTRAINT_FORWARD_H */ diff --git a/src/theory/arith/dio_solver.h b/src/theory/arith/dio_solver.h index a7842ddb2..0c26f9c55 100644 --- a/src/theory/arith/dio_solver.h +++ b/src/theory/arith/dio_solver.h @@ -17,8 +17,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__ARITH__DIO_SOLVER_H -#define __CVC4__THEORY__ARITH__DIO_SOLVER_H +#ifndef CVC4__THEORY__ARITH__DIO_SOLVER_H +#define CVC4__THEORY__ARITH__DIO_SOLVER_H #include #include @@ -423,4 +423,4 @@ public: }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__ARITH__DIO_SOLVER_H */ +#endif /* CVC4__THEORY__ARITH__DIO_SOLVER_H */ diff --git a/src/theory/arith/nonlinear_extension.h b/src/theory/arith/nonlinear_extension.h index 043aa0db7..7452e322b 100644 --- a/src/theory/arith/nonlinear_extension.h +++ b/src/theory/arith/nonlinear_extension.h @@ -15,8 +15,8 @@ ** multiplication via axiom instantiations. **/ -#ifndef __CVC4__THEORY__ARITH__NONLINEAR_EXTENSION_H -#define __CVC4__THEORY__ARITH__NONLINEAR_EXTENSION_H +#ifndef CVC4__THEORY__ARITH__NONLINEAR_EXTENSION_H +#define CVC4__THEORY__ARITH__NONLINEAR_EXTENSION_H #include @@ -1013,4 +1013,4 @@ class NonlinearExtension { } // namespace theory } // namespace CVC4 -#endif /* __CVC4__THEORY__ARITH__NONLINEAR_EXTENSION_H */ +#endif /* CVC4__THEORY__ARITH__NONLINEAR_EXTENSION_H */ diff --git a/src/theory/arith/normal_form.h b/src/theory/arith/normal_form.h index 36f8f20ad..a3d173cc7 100644 --- a/src/theory/arith/normal_form.h +++ b/src/theory/arith/normal_form.h @@ -17,8 +17,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__ARITH__NORMAL_FORM_H -#define __CVC4__THEORY__ARITH__NORMAL_FORM_H +#ifndef CVC4__THEORY__ARITH__NORMAL_FORM_H +#define CVC4__THEORY__ARITH__NORMAL_FORM_H #include #include @@ -1393,4 +1393,4 @@ public: }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__ARITH__NORMAL_FORM_H */ +#endif /* CVC4__THEORY__ARITH__NORMAL_FORM_H */ diff --git a/src/theory/arith/partial_model.h b/src/theory/arith/partial_model.h index 6bc01f2f2..5006c6a9c 100644 --- a/src/theory/arith/partial_model.h +++ b/src/theory/arith/partial_model.h @@ -18,8 +18,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__ARITH__PARTIAL_MODEL_H -#define __CVC4__THEORY__ARITH__PARTIAL_MODEL_H +#ifndef CVC4__THEORY__ARITH__PARTIAL_MODEL_H +#define CVC4__THEORY__ARITH__PARTIAL_MODEL_H #include #include @@ -416,4 +416,4 @@ private: }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__ARITH__PARTIAL_MODEL_H */ +#endif /* CVC4__THEORY__ARITH__PARTIAL_MODEL_H */ diff --git a/src/theory/arith/theory_arith_type_rules.h b/src/theory/arith/theory_arith_type_rules.h index b75563f76..c32b612e2 100644 --- a/src/theory/arith/theory_arith_type_rules.h +++ b/src/theory/arith/theory_arith_type_rules.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__ARITH__THEORY_ARITH_TYPE_RULES_H -#define __CVC4__THEORY__ARITH__THEORY_ARITH_TYPE_RULES_H +#ifndef CVC4__THEORY__ARITH__THEORY_ARITH_TYPE_RULES_H +#define CVC4__THEORY__ARITH__THEORY_ARITH_TYPE_RULES_H namespace CVC4 { namespace theory { @@ -185,4 +185,4 @@ class DivisibleOpTypeRule }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__ARITH__THEORY_ARITH_TYPE_RULES_H */ +#endif /* CVC4__THEORY__ARITH__THEORY_ARITH_TYPE_RULES_H */ diff --git a/src/theory/arith/type_enumerator.h b/src/theory/arith/type_enumerator.h index 2a6d55715..5c6bf63ce 100644 --- a/src/theory/arith/type_enumerator.h +++ b/src/theory/arith/type_enumerator.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__ARITH__TYPE_ENUMERATOR_H -#define __CVC4__THEORY__ARITH__TYPE_ENUMERATOR_H +#ifndef CVC4__THEORY__ARITH__TYPE_ENUMERATOR_H +#define CVC4__THEORY__ARITH__TYPE_ENUMERATOR_H #include "expr/kind.h" #include "expr/type_node.h" @@ -104,4 +104,4 @@ class IntegerEnumerator : public TypeEnumeratorBase { }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__ARITH__TYPE_ENUMERATOR_H */ +#endif /* CVC4__THEORY__ARITH__TYPE_ENUMERATOR_H */ diff --git a/src/theory/arrays/array_info.h b/src/theory/arrays/array_info.h index c221569bb..7e18f9ed2 100644 --- a/src/theory/arrays/array_info.h +++ b/src/theory/arrays/array_info.h @@ -15,8 +15,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__ARRAYS__ARRAY_INFO_H -#define __CVC4__THEORY__ARRAYS__ARRAY_INFO_H +#ifndef CVC4__THEORY__ARRAYS__ARRAY_INFO_H +#define CVC4__THEORY__ARRAYS__ARRAY_INFO_H #include #include @@ -211,4 +211,4 @@ public: }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__ARRAYS__ARRAY_INFO_H */ +#endif /* CVC4__THEORY__ARRAYS__ARRAY_INFO_H */ diff --git a/src/theory/arrays/array_proof_reconstruction.h b/src/theory/arrays/array_proof_reconstruction.h index 3c656de1a..37b014d35 100644 --- a/src/theory/arrays/array_proof_reconstruction.h +++ b/src/theory/arrays/array_proof_reconstruction.h @@ -15,8 +15,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__ARRAYS__ARRAY_PROOF_RECONSTRUCTION_H -#define __CVC4__THEORY__ARRAYS__ARRAY_PROOF_RECONSTRUCTION_H +#ifndef CVC4__THEORY__ARRAYS__ARRAY_PROOF_RECONSTRUCTION_H +#define CVC4__THEORY__ARRAYS__ARRAY_PROOF_RECONSTRUCTION_H #include "theory/uf/equality_engine.h" @@ -56,4 +56,4 @@ private: }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__ARRAYS__ARRAY_PROOF_RECONSTRUCTION_H */ +#endif /* CVC4__THEORY__ARRAYS__ARRAY_PROOF_RECONSTRUCTION_H */ diff --git a/src/theory/arrays/static_fact_manager.h b/src/theory/arrays/static_fact_manager.h index 135e46790..6b68edf26 100644 --- a/src/theory/arrays/static_fact_manager.h +++ b/src/theory/arrays/static_fact_manager.h @@ -18,8 +18,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__ARRAYS__STATIC_FACT_MANAGER_H -#define __CVC4__THEORY__ARRAYS__STATIC_FACT_MANAGER_H +#ifndef CVC4__THEORY__ARRAYS__STATIC_FACT_MANAGER_H +#define CVC4__THEORY__ARRAYS__STATIC_FACT_MANAGER_H #include #include @@ -113,4 +113,4 @@ inline void StaticFactManager::setCanon(TNode n, TNode newParent) { }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /*__CVC4__THEORY__ARRAYS__STATIC_FACT_MANAGER_H */ +#endif /*CVC4__THEORY__ARRAYS__STATIC_FACT_MANAGER_H */ diff --git a/src/theory/arrays/theory_arrays.h b/src/theory/arrays/theory_arrays.h index 51e95844f..be80a081d 100644 --- a/src/theory/arrays/theory_arrays.h +++ b/src/theory/arrays/theory_arrays.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__ARRAYS__THEORY_ARRAYS_H -#define __CVC4__THEORY__ARRAYS__THEORY_ARRAYS_H +#ifndef CVC4__THEORY__ARRAYS__THEORY_ARRAYS_H +#define CVC4__THEORY__ARRAYS__THEORY_ARRAYS_H #include #include @@ -491,4 +491,4 @@ class TheoryArrays : public Theory { }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__ARRAYS__THEORY_ARRAYS_H */ +#endif /* CVC4__THEORY__ARRAYS__THEORY_ARRAYS_H */ diff --git a/src/theory/arrays/theory_arrays_rewriter.h b/src/theory/arrays/theory_arrays_rewriter.h index 21cc56dbc..5f3fcf48d 100644 --- a/src/theory/arrays/theory_arrays_rewriter.h +++ b/src/theory/arrays/theory_arrays_rewriter.h @@ -17,8 +17,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__ARRAYS__THEORY_ARRAYS_REWRITER_H -#define __CVC4__THEORY__ARRAYS__THEORY_ARRAYS_REWRITER_H +#ifndef CVC4__THEORY__ARRAYS__THEORY_ARRAYS_REWRITER_H +#define CVC4__THEORY__ARRAYS__THEORY_ARRAYS_REWRITER_H #include #include @@ -509,4 +509,4 @@ public: }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__ARRAYS__THEORY_ARRAYS_REWRITER_H */ +#endif /* CVC4__THEORY__ARRAYS__THEORY_ARRAYS_REWRITER_H */ diff --git a/src/theory/arrays/theory_arrays_type_rules.h b/src/theory/arrays/theory_arrays_type_rules.h index e789b8445..78756176d 100644 --- a/src/theory/arrays/theory_arrays_type_rules.h +++ b/src/theory/arrays/theory_arrays_type_rules.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__ARRAYS__THEORY_ARRAYS_TYPE_RULES_H -#define __CVC4__THEORY__ARRAYS__THEORY_ARRAYS_TYPE_RULES_H +#ifndef CVC4__THEORY__ARRAYS__THEORY_ARRAYS_TYPE_RULES_H +#define CVC4__THEORY__ARRAYS__THEORY_ARRAYS_TYPE_RULES_H #include "theory/arrays/theory_arrays_rewriter.h" // for array-constant attributes #include "theory/type_enumerator.h" @@ -227,4 +227,4 @@ struct ArrayPartialSelectTypeRule { }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__ARRAYS__THEORY_ARRAYS_TYPE_RULES_H */ +#endif /* CVC4__THEORY__ARRAYS__THEORY_ARRAYS_TYPE_RULES_H */ diff --git a/src/theory/arrays/type_enumerator.h b/src/theory/arrays/type_enumerator.h index 2e09763e4..5ca156b2e 100644 --- a/src/theory/arrays/type_enumerator.h +++ b/src/theory/arrays/type_enumerator.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__ARRAYS__TYPE_ENUMERATOR_H -#define __CVC4__THEORY__ARRAYS__TYPE_ENUMERATOR_H +#ifndef CVC4__THEORY__ARRAYS__TYPE_ENUMERATOR_H +#define CVC4__THEORY__ARRAYS__TYPE_ENUMERATOR_H #include "theory/type_enumerator.h" #include "expr/type_node.h" @@ -158,4 +158,4 @@ class ArrayEnumerator : public TypeEnumeratorBase { }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__ARRAYS__TYPE_ENUMERATOR_H */ +#endif /* CVC4__THEORY__ARRAYS__TYPE_ENUMERATOR_H */ diff --git a/src/theory/arrays/union_find.h b/src/theory/arrays/union_find.h index 5b552c7f8..1f38f1280 100644 --- a/src/theory/arrays/union_find.h +++ b/src/theory/arrays/union_find.h @@ -18,8 +18,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__ARRAYS__UNION_FIND_H -#define __CVC4__THEORY__ARRAYS__UNION_FIND_H +#ifndef CVC4__THEORY__ARRAYS__UNION_FIND_H +#define CVC4__THEORY__ARRAYS__UNION_FIND_H #include #include @@ -139,4 +139,4 @@ inline void UnionFind::setCanon(TNode n, TNode newParent) { }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /*__CVC4__THEORY__ARRAYS__UNION_FIND_H */ +#endif /*CVC4__THEORY__ARRAYS__UNION_FIND_H */ diff --git a/src/theory/assertion.h b/src/theory/assertion.h index d68ff87aa..863a7e893 100644 --- a/src/theory/assertion.h +++ b/src/theory/assertion.h @@ -17,8 +17,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__ASSERTION_H -#define __CVC4__THEORY__ASSERTION_H +#ifndef CVC4__THEORY__ASSERTION_H +#define CVC4__THEORY__ASSERTION_H #include "expr/node.h" @@ -49,4 +49,4 @@ std::ostream& operator<<(std::ostream& out, const Assertion& a); }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__ASSERTION_H */ +#endif /* CVC4__THEORY__ASSERTION_H */ diff --git a/src/theory/booleans/circuit_propagator.h b/src/theory/booleans/circuit_propagator.h index c5e1cc022..9c4798898 100644 --- a/src/theory/booleans/circuit_propagator.h +++ b/src/theory/booleans/circuit_propagator.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__BOOLEANS__CIRCUIT_PROPAGATOR_H -#define __CVC4__THEORY__BOOLEANS__CIRCUIT_PROPAGATOR_H +#ifndef CVC4__THEORY__BOOLEANS__CIRCUIT_PROPAGATOR_H +#define CVC4__THEORY__BOOLEANS__CIRCUIT_PROPAGATOR_H #include #include @@ -313,4 +313,4 @@ class CircuitPropagator } // namespace theory } // namespace CVC4 -#endif /* __CVC4__THEORY__BOOLEANS__CIRCUIT_PROPAGATOR_H */ +#endif /* CVC4__THEORY__BOOLEANS__CIRCUIT_PROPAGATOR_H */ diff --git a/src/theory/booleans/theory_bool.h b/src/theory/booleans/theory_bool.h index 44abdf87d..abe024282 100644 --- a/src/theory/booleans/theory_bool.h +++ b/src/theory/booleans/theory_bool.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__BOOLEANS__THEORY_BOOL_H -#define __CVC4__THEORY__BOOLEANS__THEORY_BOOL_H +#ifndef CVC4__THEORY__BOOLEANS__THEORY_BOOL_H +#define CVC4__THEORY__BOOLEANS__THEORY_BOOL_H #include "theory/theory.h" #include "context/context.h" @@ -44,4 +44,4 @@ public: }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__BOOLEANS__THEORY_BOOL_H */ +#endif /* CVC4__THEORY__BOOLEANS__THEORY_BOOL_H */ diff --git a/src/theory/booleans/theory_bool_rewriter.cpp b/src/theory/booleans/theory_bool_rewriter.cpp index d071e4e3d..02267cf2c 100644 --- a/src/theory/booleans/theory_bool_rewriter.cpp +++ b/src/theory/booleans/theory_bool_rewriter.cpp @@ -77,7 +77,7 @@ RewriteResponse flattenNode(TNode n, TNode trivialNode, TNode skipNode) /* Trickery to stay under number of children possible in a node */ NodeManager* nodeManager = NodeManager::currentNM(); - static const unsigned MAX_CHILDREN = (1u << __CVC4__EXPR__NODE_VALUE__NBITS__NCHILDREN ) - 1; + static const unsigned MAX_CHILDREN = (1u << CVC4__EXPR__NODE_VALUE__NBITS__NCHILDREN ) - 1; if (childList.size() < MAX_CHILDREN) { Node retNode = nodeManager->mkNode(k, childList); return RewriteResponse(REWRITE_DONE, retNode); diff --git a/src/theory/booleans/theory_bool_rewriter.h b/src/theory/booleans/theory_bool_rewriter.h index 4aad1e63f..250f36efa 100644 --- a/src/theory/booleans/theory_bool_rewriter.h +++ b/src/theory/booleans/theory_bool_rewriter.h @@ -17,8 +17,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__BOOLEANS__THEORY_BOOL_REWRITER_H -#define __CVC4__THEORY__BOOLEANS__THEORY_BOOL_REWRITER_H +#ifndef CVC4__THEORY__BOOLEANS__THEORY_BOOL_REWRITER_H +#define CVC4__THEORY__BOOLEANS__THEORY_BOOL_REWRITER_H #include "theory/rewriter.h" @@ -42,4 +42,4 @@ public: }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__BOOLEANS__THEORY_BOOL_REWRITER_H */ +#endif /* CVC4__THEORY__BOOLEANS__THEORY_BOOL_REWRITER_H */ diff --git a/src/theory/booleans/theory_bool_type_rules.h b/src/theory/booleans/theory_bool_type_rules.h index 427a1addb..18329b8b9 100644 --- a/src/theory/booleans/theory_bool_type_rules.h +++ b/src/theory/booleans/theory_bool_type_rules.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY_BOOL_TYPE_RULES_H -#define __CVC4__THEORY_BOOL_TYPE_RULES_H +#ifndef CVC4__THEORY_BOOL_TYPE_RULES_H +#define CVC4__THEORY_BOOL_TYPE_RULES_H namespace CVC4 { namespace theory { @@ -74,4 +74,4 @@ public: }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY_BOOL_TYPE_RULES_H */ +#endif /* CVC4__THEORY_BOOL_TYPE_RULES_H */ diff --git a/src/theory/booleans/type_enumerator.h b/src/theory/booleans/type_enumerator.h index 9628ee6e2..361216b10 100644 --- a/src/theory/booleans/type_enumerator.h +++ b/src/theory/booleans/type_enumerator.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__BOOLEANS__TYPE_ENUMERATOR_H -#define __CVC4__THEORY__BOOLEANS__TYPE_ENUMERATOR_H +#ifndef CVC4__THEORY__BOOLEANS__TYPE_ENUMERATOR_H +#define CVC4__THEORY__BOOLEANS__TYPE_ENUMERATOR_H #include "theory/type_enumerator.h" #include "expr/type_node.h" @@ -67,4 +67,4 @@ class BooleanEnumerator : public TypeEnumeratorBase { }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__BOOLEANS__TYPE_ENUMERATOR_H */ +#endif /* CVC4__THEORY__BOOLEANS__TYPE_ENUMERATOR_H */ diff --git a/src/theory/builtin/theory_builtin.h b/src/theory/builtin/theory_builtin.h index 3b2a57397..8a7d1bf7b 100644 --- a/src/theory/builtin/theory_builtin.h +++ b/src/theory/builtin/theory_builtin.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__BUILTIN__THEORY_BUILTIN_H -#define __CVC4__THEORY__BUILTIN__THEORY_BUILTIN_H +#ifndef CVC4__THEORY__BUILTIN__THEORY_BUILTIN_H +#define CVC4__THEORY__BUILTIN__THEORY_BUILTIN_H #include "theory/theory.h" @@ -38,4 +38,4 @@ public: }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__BUILTIN__THEORY_BUILTIN_H */ +#endif /* CVC4__THEORY__BUILTIN__THEORY_BUILTIN_H */ diff --git a/src/theory/builtin/theory_builtin_rewriter.h b/src/theory/builtin/theory_builtin_rewriter.h index 2fe91e8cb..5f703fa00 100644 --- a/src/theory/builtin/theory_builtin_rewriter.h +++ b/src/theory/builtin/theory_builtin_rewriter.h @@ -17,8 +17,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__BUILTIN__THEORY_BUILTIN_REWRITER_H -#define __CVC4__THEORY__BUILTIN__THEORY_BUILTIN_REWRITER_H +#ifndef CVC4__THEORY__BUILTIN__THEORY_BUILTIN_REWRITER_H +#define CVC4__THEORY__BUILTIN__THEORY_BUILTIN_REWRITER_H #include "theory/rewriter.h" #include "theory/theory.h" @@ -130,4 +130,4 @@ private: }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__BUILTIN__THEORY_BUILTIN_REWRITER_H */ +#endif /* CVC4__THEORY__BUILTIN__THEORY_BUILTIN_REWRITER_H */ diff --git a/src/theory/builtin/theory_builtin_type_rules.h b/src/theory/builtin/theory_builtin_type_rules.h index adeec48a9..2c726d12f 100644 --- a/src/theory/builtin/theory_builtin_type_rules.h +++ b/src/theory/builtin/theory_builtin_type_rules.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__BUILTIN__THEORY_BUILTIN_TYPE_RULES_H -#define __CVC4__THEORY__BUILTIN__THEORY_BUILTIN_TYPE_RULES_H +#ifndef CVC4__THEORY__BUILTIN__THEORY_BUILTIN_TYPE_RULES_H +#define CVC4__THEORY__BUILTIN__THEORY_BUILTIN_TYPE_RULES_H #include "expr/node.h" #include "expr/type_node.h" @@ -375,4 +375,4 @@ class SExprProperties { }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__BUILTIN__THEORY_BUILTIN_TYPE_RULES_H */ +#endif /* CVC4__THEORY__BUILTIN__THEORY_BUILTIN_TYPE_RULES_H */ diff --git a/src/theory/builtin/type_enumerator.h b/src/theory/builtin/type_enumerator.h index 63c34161c..8ce17306f 100644 --- a/src/theory/builtin/type_enumerator.h +++ b/src/theory/builtin/type_enumerator.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__BUILTIN__TYPE_ENUMERATOR_H -#define __CVC4__THEORY__BUILTIN__TYPE_ENUMERATOR_H +#ifndef CVC4__THEORY__BUILTIN__TYPE_ENUMERATOR_H +#define CVC4__THEORY__BUILTIN__TYPE_ENUMERATOR_H #include "expr/kind.h" #include "expr/type_node.h" @@ -108,4 +108,4 @@ class FunctionEnumerator : public TypeEnumeratorBase }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__BUILTIN_TYPE_ENUMERATOR_H */ +#endif /* CVC4__THEORY__BUILTIN_TYPE_ENUMERATOR_H */ diff --git a/src/theory/bv/abstraction.h b/src/theory/bv/abstraction.h index 09e3ce10c..5472aa5a2 100644 --- a/src/theory/bv/abstraction.h +++ b/src/theory/bv/abstraction.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__BV__ABSTRACTION_H -#define __CVC4__THEORY__BV__ABSTRACTION_H +#ifndef CVC4__THEORY__BV__ABSTRACTION_H +#define CVC4__THEORY__BV__ABSTRACTION_H #include #include diff --git a/src/theory/bv/bitblast/aig_bitblaster.h b/src/theory/bv/bitblast/aig_bitblaster.h index cc821d333..8b63a9aa6 100644 --- a/src/theory/bv/bitblast/aig_bitblaster.h +++ b/src/theory/bv/bitblast/aig_bitblaster.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__BV__BITBLAST__AIG_BITBLASTER_H -#define __CVC4__THEORY__BV__BITBLAST__AIG_BITBLASTER_H +#ifndef CVC4__THEORY__BV__BITBLAST__AIG_BITBLASTER_H +#define CVC4__THEORY__BV__BITBLAST__AIG_BITBLASTER_H #include "theory/bv/bitblast/bitblaster.h" #include "prop/sat_solver.h" @@ -111,4 +111,4 @@ class AigBitblaster : public TBitblaster } // namespace bv } // namespace theory } // namespace CVC4 -#endif // __CVC4__THEORY__BV__BITBLAST__AIG_BITBLASTER_H +#endif // CVC4__THEORY__BV__BITBLAST__AIG_BITBLASTER_H diff --git a/src/theory/bv/bitblast/bitblast_strategies_template.h b/src/theory/bv/bitblast/bitblast_strategies_template.h index 6b8cafb7b..9e668e258 100644 --- a/src/theory/bv/bitblast/bitblast_strategies_template.h +++ b/src/theory/bv/bitblast/bitblast_strategies_template.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__BV__BITBLAST__BITBLAST_STRATEGIES_TEMPLATE_H -#define __CVC4__THEORY__BV__BITBLAST__BITBLAST_STRATEGIES_TEMPLATE_H +#ifndef CVC4__THEORY__BV__BITBLAST__BITBLAST_STRATEGIES_TEMPLATE_H +#define CVC4__THEORY__BV__BITBLAST__BITBLAST_STRATEGIES_TEMPLATE_H #include #include diff --git a/src/theory/bv/bitblast/bitblast_utils.h b/src/theory/bv/bitblast/bitblast_utils.h index a4c4261d2..f2bee22e5 100644 --- a/src/theory/bv/bitblast/bitblast_utils.h +++ b/src/theory/bv/bitblast/bitblast_utils.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__BV__BITBLAST__BITBLAST_UTILS_H -#define __CVC4__THEORY__BV__BITBLAST__BITBLAST_UTILS_H +#ifndef CVC4__THEORY__BV__BITBLAST__BITBLAST_UTILS_H +#define CVC4__THEORY__BV__BITBLAST__BITBLAST_UTILS_H #include @@ -269,4 +269,4 @@ T inline sLessThanBB(const std::vector&a, const std::vector& b, bool orEqu } // namespace theory } // namespace CVC4 -#endif // __CVC4__THEORY__BV__BITBLAST__BITBLAST_UTILS_H +#endif // CVC4__THEORY__BV__BITBLAST__BITBLAST_UTILS_H diff --git a/src/theory/bv/bitblast/bitblaster.h b/src/theory/bv/bitblast/bitblaster.h index f29882b0d..df7cc4f11 100644 --- a/src/theory/bv/bitblast/bitblaster.h +++ b/src/theory/bv/bitblast/bitblaster.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__BV__BITBLAST__BITBLASTER_H -#define __CVC4__THEORY__BV__BITBLAST__BITBLASTER_H +#ifndef CVC4__THEORY__BV__BITBLAST__BITBLASTER_H +#define CVC4__THEORY__BV__BITBLAST__BITBLASTER_H #include #include @@ -286,4 +286,4 @@ Node TBitblaster::getTermModel(TNode node, bool fullModel) } // namespace theory } // namespace CVC4 -#endif /* __CVC4__THEORY__BV__BITBLAST__BITBLASTER_H */ +#endif /* CVC4__THEORY__BV__BITBLAST__BITBLASTER_H */ diff --git a/src/theory/bv/bitblast/eager_bitblaster.h b/src/theory/bv/bitblast/eager_bitblaster.h index 296014b76..d407b8131 100644 --- a/src/theory/bv/bitblast/eager_bitblaster.h +++ b/src/theory/bv/bitblast/eager_bitblaster.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__BV__BITBLAST__EAGER_BITBLASTER_H -#define __CVC4__THEORY__BV__BITBLAST__EAGER_BITBLASTER_H +#ifndef CVC4__THEORY__BV__BITBLAST__EAGER_BITBLASTER_H +#define CVC4__THEORY__BV__BITBLAST__EAGER_BITBLASTER_H #include @@ -88,4 +88,4 @@ class BitblastingRegistrar : public prop::Registrar } // namespace bv } // namespace theory } // namespace CVC4 -#endif // __CVC4__THEORY__BV__BITBLAST__EAGER_BITBLASTER_H +#endif // CVC4__THEORY__BV__BITBLAST__EAGER_BITBLASTER_H diff --git a/src/theory/bv/bitblast/lazy_bitblaster.h b/src/theory/bv/bitblast/lazy_bitblaster.h index 920b669a6..ac5cd5c7f 100644 --- a/src/theory/bv/bitblast/lazy_bitblaster.h +++ b/src/theory/bv/bitblast/lazy_bitblaster.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__BV__BITBLAST__LAZY_BITBLASTER_H -#define __CVC4__THEORY__BV__BITBLAST__LAZY_BITBLASTER_H +#ifndef CVC4__THEORY__BV__BITBLAST__LAZY_BITBLASTER_H +#define CVC4__THEORY__BV__BITBLAST__LAZY_BITBLASTER_H #include "proof/resolution_bitvector_proof.h" #include "theory/bv/bitblast/bitblaster.h" @@ -176,4 +176,4 @@ class TLazyBitblaster : public TBitblaster } // namespace bv } // namespace theory } // namespace CVC4 -#endif // __CVC4__THEORY__BV__BITBLAST__LAZY_BITBLASTER_H +#endif // CVC4__THEORY__BV__BITBLAST__LAZY_BITBLASTER_H diff --git a/src/theory/bv/bv_eager_solver.h b/src/theory/bv/bv_eager_solver.h index 5322cca9a..8e42d5cab 100644 --- a/src/theory/bv/bv_eager_solver.h +++ b/src/theory/bv/bv_eager_solver.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__BV__BV_EAGER_SOLVER_H -#define __CVC4__THEORY__BV__BV_EAGER_SOLVER_H +#ifndef CVC4__THEORY__BV__BV_EAGER_SOLVER_H +#define CVC4__THEORY__BV__BV_EAGER_SOLVER_H #include #include @@ -68,4 +68,4 @@ class EagerBitblastSolver { } // namespace theory } // namespace CVC4 -#endif // __CVC4__THEORY__BV__BV_EAGER_SOLVER_H +#endif // CVC4__THEORY__BV__BV_EAGER_SOLVER_H diff --git a/src/theory/bv/bv_inequality_graph.h b/src/theory/bv/bv_inequality_graph.h index a3a2f0445..07facf4af 100644 --- a/src/theory/bv/bv_inequality_graph.h +++ b/src/theory/bv/bv_inequality_graph.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__BV__BV_INEQUALITY__GRAPH_H -#define __CVC4__THEORY__BV__BV_INEQUALITY__GRAPH_H +#ifndef CVC4__THEORY__BV__BV_INEQUALITY__GRAPH_H +#define CVC4__THEORY__BV__BV_INEQUALITY__GRAPH_H #include #include @@ -282,4 +282,4 @@ public: } } -#endif /* __CVC4__THEORY__BV__BV_INEQUALITY__GRAPH_H */ +#endif /* CVC4__THEORY__BV__BV_INEQUALITY__GRAPH_H */ diff --git a/src/theory/bv/bv_quick_check.h b/src/theory/bv/bv_quick_check.h index c1ac95946..75f39b6e0 100644 --- a/src/theory/bv/bv_quick_check.h +++ b/src/theory/bv/bv_quick_check.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__BV_QUICK_CHECK_H -#define __CVC4__BV_QUICK_CHECK_H +#ifndef CVC4__BV_QUICK_CHECK_H +#define CVC4__BV_QUICK_CHECK_H #include #include @@ -172,4 +172,4 @@ public: } /* theory namespace */ } /* CVC4 namespace */ -#endif /* __CVC4__BV_QUICK_CHECK_H */ +#endif /* CVC4__BV_QUICK_CHECK_H */ diff --git a/src/theory/bv/bv_subtheory.h b/src/theory/bv/bv_subtheory.h index 84a6f1b35..60660eda9 100644 --- a/src/theory/bv/bv_subtheory.h +++ b/src/theory/bv/bv_subtheory.h @@ -14,8 +14,8 @@ ** Interface for bit-vectors sub-solvers. **/ -#ifndef __CVC4__THEORY__BV__BV_SUBTHEORY_H -#define __CVC4__THEORY__BV__BV_SUBTHEORY_H +#ifndef CVC4__THEORY__BV__BV_SUBTHEORY_H +#define CVC4__THEORY__BV__BV_SUBTHEORY_H #include "cvc4_private.h" #include "context/context.h" @@ -117,4 +117,4 @@ class SubtheorySolver { } // namespace theory } // namespace CVC4 -#endif /* __CVC4__THEORY__BV__BV_SUBTHEORY_H */ +#endif /* CVC4__THEORY__BV__BV_SUBTHEORY_H */ diff --git a/src/theory/bv/bv_subtheory_inequality.h b/src/theory/bv/bv_subtheory_inequality.h index b64b229f9..e18c886df 100644 --- a/src/theory/bv/bv_subtheory_inequality.h +++ b/src/theory/bv/bv_subtheory_inequality.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__BV__BV_SUBTHEORY__INEQUALITY_H -#define __CVC4__THEORY__BV__BV_SUBTHEORY__INEQUALITY_H +#ifndef CVC4__THEORY__BV__BV_SUBTHEORY__INEQUALITY_H +#define CVC4__THEORY__BV__BV_SUBTHEORY__INEQUALITY_H #include @@ -83,4 +83,4 @@ public: } } -#endif /* __CVC4__THEORY__BV__BV_SUBTHEORY__INEQUALITY_H */ +#endif /* CVC4__THEORY__BV__BV_SUBTHEORY__INEQUALITY_H */ diff --git a/src/theory/bv/slicer.h b/src/theory/bv/slicer.h index ec715d2f5..3ddbcaf36 100644 --- a/src/theory/bv/slicer.h +++ b/src/theory/bv/slicer.h @@ -28,8 +28,8 @@ #include "util/index.h" #include "util/statistics_registry.h" -#ifndef __CVC4__THEORY__BV__SLICER_BV_H -#define __CVC4__THEORY__BV__SLICER_BV_H +#ifndef CVC4__THEORY__BV__SLICER_BV_H +#define CVC4__THEORY__BV__SLICER_BV_H namespace CVC4 { @@ -251,4 +251,4 @@ public: }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__BV__SLICER_BV_H */ +#endif /* CVC4__THEORY__BV__SLICER_BV_H */ diff --git a/src/theory/bv/theory_bv.h b/src/theory/bv/theory_bv.h index 55aad0ba7..7ca98f2ea 100644 --- a/src/theory/bv/theory_bv.h +++ b/src/theory/bv/theory_bv.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__BV__THEORY_BV_H -#define __CVC4__THEORY__BV__THEORY_BV_H +#ifndef CVC4__THEORY__BV__THEORY_BV_H +#define CVC4__THEORY__BV__THEORY_BV_H #include #include @@ -273,4 +273,4 @@ public: }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__BV__THEORY_BV_H */ +#endif /* CVC4__THEORY__BV__THEORY_BV_H */ diff --git a/src/theory/bv/theory_bv_rewriter.h b/src/theory/bv/theory_bv_rewriter.h index 8009daf3c..bf707c268 100644 --- a/src/theory/bv/theory_bv_rewriter.h +++ b/src/theory/bv/theory_bv_rewriter.h @@ -17,8 +17,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__BV__THEORY_BV_REWRITER_H -#define __CVC4__THEORY__BV__THEORY_BV_REWRITER_H +#ifndef CVC4__THEORY__BV__THEORY_BV_REWRITER_H +#define CVC4__THEORY__BV__THEORY_BV_REWRITER_H #include "theory/rewriter.h" #include "util/statistics_registry.h" @@ -109,4 +109,4 @@ public: }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__BV__THEORY_BV_REWRITER_H */ +#endif /* CVC4__THEORY__BV__THEORY_BV_REWRITER_H */ diff --git a/src/theory/bv/theory_bv_type_rules.h b/src/theory/bv/theory_bv_type_rules.h index 79c69b9f0..64d04a37e 100644 --- a/src/theory/bv/theory_bv_type_rules.h +++ b/src/theory/bv/theory_bv_type_rules.h @@ -18,8 +18,8 @@ #include -#ifndef __CVC4__THEORY__BV__THEORY_BV_TYPE_RULES_H -#define __CVC4__THEORY__BV__THEORY_BV_TYPE_RULES_H +#ifndef CVC4__THEORY__BV__THEORY_BV_TYPE_RULES_H +#define CVC4__THEORY__BV__THEORY_BV_TYPE_RULES_H namespace CVC4 { namespace theory { @@ -525,4 +525,4 @@ class BitVectorAckermanizationUremTypeRule } // namespace theory } // namespace CVC4 -#endif /* __CVC4__THEORY__BV__THEORY_BV_TYPE_RULES_H */ +#endif /* CVC4__THEORY__BV__THEORY_BV_TYPE_RULES_H */ diff --git a/src/theory/bv/type_enumerator.h b/src/theory/bv/type_enumerator.h index 0bb67be42..90aae339b 100644 --- a/src/theory/bv/type_enumerator.h +++ b/src/theory/bv/type_enumerator.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__BV__TYPE_ENUMERATOR_H -#define __CVC4__THEORY__BV__TYPE_ENUMERATOR_H +#ifndef CVC4__THEORY__BV__TYPE_ENUMERATOR_H +#define CVC4__THEORY__BV__TYPE_ENUMERATOR_H #include "expr/kind.h" #include "expr/type_node.h" @@ -63,4 +63,4 @@ public: }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__BV__TYPE_ENUMERATOR_H */ +#endif /* CVC4__THEORY__BV__TYPE_ENUMERATOR_H */ diff --git a/src/theory/care_graph.h b/src/theory/care_graph.h index 12e63aa26..55851c1a4 100644 --- a/src/theory/care_graph.h +++ b/src/theory/care_graph.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__CARE_GRAPH_H -#define __CVC4__THEORY__CARE_GRAPH_H +#ifndef CVC4__THEORY__CARE_GRAPH_H +#define CVC4__THEORY__CARE_GRAPH_H #include @@ -59,4 +59,4 @@ typedef std::set CareGraph; } // namespace theory } // namespace CVC4 -#endif /* __CVC4__THEORY__CARE_GRAPH_H */ +#endif /* CVC4__THEORY__CARE_GRAPH_H */ diff --git a/src/theory/datatypes/datatypes_rewriter.h b/src/theory/datatypes/datatypes_rewriter.h index a6103a8c5..6c1d64e5b 100644 --- a/src/theory/datatypes/datatypes_rewriter.h +++ b/src/theory/datatypes/datatypes_rewriter.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__DATATYPES__DATATYPES_REWRITER_H -#define __CVC4__THEORY__DATATYPES__DATATYPES_REWRITER_H +#ifndef CVC4__THEORY__DATATYPES__DATATYPES_REWRITER_H +#define CVC4__THEORY__DATATYPES__DATATYPES_REWRITER_H #include "expr/node_manager_attributes.h" #include "options/datatypes_options.h" @@ -258,4 +258,4 @@ private: }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__DATATYPES__DATATYPES_REWRITER_H */ +#endif /* CVC4__THEORY__DATATYPES__DATATYPES_REWRITER_H */ diff --git a/src/theory/datatypes/datatypes_sygus.h b/src/theory/datatypes/datatypes_sygus.h index b10ec169b..95c259f2b 100644 --- a/src/theory/datatypes/datatypes_sygus.h +++ b/src/theory/datatypes/datatypes_sygus.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__DATATYPES__DATATYPES_SYGUS_NEW_H -#define __CVC4__THEORY__DATATYPES__DATATYPES_SYGUS_NEW_H +#ifndef CVC4__THEORY__DATATYPES__DATATYPES_SYGUS_NEW_H +#define CVC4__THEORY__DATATYPES__DATATYPES_SYGUS_NEW_H #include #include diff --git a/src/theory/datatypes/sygus_simple_sym.h b/src/theory/datatypes/sygus_simple_sym.h index 0a4ed0c6e..815466d00 100644 --- a/src/theory/datatypes/sygus_simple_sym.h +++ b/src/theory/datatypes/sygus_simple_sym.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__DATATYPES__SIMPLE_SYM_BREAK_H -#define __CVC4__THEORY__DATATYPES__SIMPLE_SYM_BREAK_H +#ifndef CVC4__THEORY__DATATYPES__SIMPLE_SYM_BREAK_H +#define CVC4__THEORY__DATATYPES__SIMPLE_SYM_BREAK_H #include #include "theory/quantifiers/sygus/term_database_sygus.h" @@ -104,4 +104,4 @@ class SygusSimpleSymBreak } // namespace theory } // namespace CVC4 -#endif /* __CVC4__THEORY__DATATYPES__SIMPLE_SYM_BREAK_H */ +#endif /* CVC4__THEORY__DATATYPES__SIMPLE_SYM_BREAK_H */ diff --git a/src/theory/datatypes/theory_datatypes.h b/src/theory/datatypes/theory_datatypes.h index e5d037b38..b4803e69a 100644 --- a/src/theory/datatypes/theory_datatypes.h +++ b/src/theory/datatypes/theory_datatypes.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__DATATYPES__THEORY_DATATYPES_H -#define __CVC4__THEORY__DATATYPES__THEORY_DATATYPES_H +#ifndef CVC4__THEORY__DATATYPES__THEORY_DATATYPES_H +#define CVC4__THEORY__DATATYPES__THEORY_DATATYPES_H #include #include @@ -370,4 +370,4 @@ private: }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__DATATYPES__THEORY_DATATYPES_H */ +#endif /* CVC4__THEORY__DATATYPES__THEORY_DATATYPES_H */ diff --git a/src/theory/datatypes/theory_datatypes_type_rules.h b/src/theory/datatypes/theory_datatypes_type_rules.h index 6f7635209..22ac074f0 100644 --- a/src/theory/datatypes/theory_datatypes_type_rules.h +++ b/src/theory/datatypes/theory_datatypes_type_rules.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__DATATYPES__THEORY_DATATYPES_TYPE_RULES_H -#define __CVC4__THEORY__DATATYPES__THEORY_DATATYPES_TYPE_RULES_H +#ifndef CVC4__THEORY__DATATYPES__THEORY_DATATYPES_TYPE_RULES_H +#define CVC4__THEORY__DATATYPES__THEORY_DATATYPES_TYPE_RULES_H #include "expr/matcher.h" //#include "expr/attribute.h" @@ -433,4 +433,4 @@ class DtSyguEvalTypeRule } /* CVC4::theory namespace */ } /* CVC4 namespace */ -#endif /* __CVC4__THEORY__DATATYPES__THEORY_DATATYPES_TYPE_RULES_H */ +#endif /* CVC4__THEORY__DATATYPES__THEORY_DATATYPES_TYPE_RULES_H */ diff --git a/src/theory/datatypes/type_enumerator.h b/src/theory/datatypes/type_enumerator.h index fff4731f3..a294324fa 100644 --- a/src/theory/datatypes/type_enumerator.h +++ b/src/theory/datatypes/type_enumerator.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__DATATYPES__TYPE_ENUMERATOR_H -#define __CVC4__THEORY__DATATYPES__TYPE_ENUMERATOR_H +#ifndef CVC4__THEORY__DATATYPES__TYPE_ENUMERATOR_H +#define CVC4__THEORY__DATATYPES__TYPE_ENUMERATOR_H #include "theory/type_enumerator.h" #include "expr/type_node.h" @@ -185,4 +185,4 @@ class DatatypesEnumerator : public TypeEnumeratorBase { }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__DATATYPES__TYPE_ENUMERATOR_H */ +#endif /* CVC4__THEORY__DATATYPES__TYPE_ENUMERATOR_H */ diff --git a/src/theory/decision_manager.h b/src/theory/decision_manager.h index 1cf0e5115..6825c1cf4 100644 --- a/src/theory/decision_manager.h +++ b/src/theory/decision_manager.h @@ -15,8 +15,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__DECISION_MANAGER__H -#define __CVC4__THEORY__DECISION_MANAGER__H +#ifndef CVC4__THEORY__DECISION_MANAGER__H +#define CVC4__THEORY__DECISION_MANAGER__H #include #include "theory/decision_strategy.h" @@ -116,4 +116,4 @@ class DecisionManager } // namespace theory } // namespace CVC4 -#endif /* __CVC4__THEORY__DECISION_MANAGER__H */ +#endif /* CVC4__THEORY__DECISION_MANAGER__H */ diff --git a/src/theory/decision_strategy.h b/src/theory/decision_strategy.h index a01cf25c0..65b80b7f6 100644 --- a/src/theory/decision_strategy.h +++ b/src/theory/decision_strategy.h @@ -15,8 +15,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__DECISION_STRATEGY__H -#define __CVC4__THEORY__DECISION_STRATEGY__H +#ifndef CVC4__THEORY__DECISION_STRATEGY__H +#define CVC4__THEORY__DECISION_STRATEGY__H #include #include "context/cdo.h" @@ -143,4 +143,4 @@ class DecisionStrategySingleton : public DecisionStrategyFmf } // namespace theory } // namespace CVC4 -#endif /* __CVC4__THEORY__DECISION_STRATEGY__H */ +#endif /* CVC4__THEORY__DECISION_STRATEGY__H */ diff --git a/src/theory/evaluator.h b/src/theory/evaluator.h index fc96ea115..5c0e9b944 100644 --- a/src/theory/evaluator.h +++ b/src/theory/evaluator.h @@ -17,8 +17,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__EVALUATOR_H -#define __CVC4__THEORY__EVALUATOR_H +#ifndef CVC4__THEORY__EVALUATOR_H +#define CVC4__THEORY__EVALUATOR_H #include #include @@ -110,4 +110,4 @@ class Evaluator } // namespace theory } // namespace CVC4 -#endif /* __CVC4__THEORY__EVALUATOR_H */ +#endif /* CVC4__THEORY__EVALUATOR_H */ diff --git a/src/theory/example/ecdata.h b/src/theory/example/ecdata.h index 9941a6b89..c646725e8 100644 --- a/src/theory/example/ecdata.h +++ b/src/theory/example/ecdata.h @@ -17,8 +17,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__UF__TIM__ECDATA_H -#define __CVC4__THEORY__UF__TIM__ECDATA_H +#ifndef CVC4__THEORY__UF__TIM__ECDATA_H +#define CVC4__THEORY__UF__TIM__ECDATA_H #include "expr/node.h" #include "context/context.h" @@ -255,4 +255,4 @@ public: }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__UF__TIM__ECDATA_H */ +#endif /* CVC4__THEORY__UF__TIM__ECDATA_H */ diff --git a/src/theory/example/theory_uf_tim.h b/src/theory/example/theory_uf_tim.h index ba9733a95..20fd6bcfb 100644 --- a/src/theory/example/theory_uf_tim.h +++ b/src/theory/example/theory_uf_tim.h @@ -22,8 +22,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__UF__TIM__THEORY_UF_TIM_H -#define __CVC4__THEORY__UF__TIM__THEORY_UF_TIM_H +#ifndef CVC4__THEORY__UF__TIM__THEORY_UF_TIM_H +#define CVC4__THEORY__UF__TIM__THEORY_UF_TIM_H #include "expr/node.h" #include "expr/attribute.h" @@ -210,4 +210,4 @@ typedef expr::Attribute ECAttr; }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__UF__TIM__THEORY_UF_TIM_H */ +#endif /* CVC4__THEORY__UF__TIM__THEORY_UF_TIM_H */ diff --git a/src/theory/ext_theory.h b/src/theory/ext_theory.h index 0ad314f6f..7ac79a4d6 100644 --- a/src/theory/ext_theory.h +++ b/src/theory/ext_theory.h @@ -30,8 +30,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__EXT_THEORY_H -#define __CVC4__THEORY__EXT_THEORY_H +#ifndef CVC4__THEORY__EXT_THEORY_H +#define CVC4__THEORY__EXT_THEORY_H #include #include @@ -247,4 +247,4 @@ class ExtTheory } /* CVC4::theory namespace */ } /* CVC4 namespace */ -#endif /* __CVC4__THEORY__EXT_THEORY_H */ +#endif /* CVC4__THEORY__EXT_THEORY_H */ diff --git a/src/theory/fp/fp_converter.h b/src/theory/fp/fp_converter.h index 163da6fac..753030408 100644 --- a/src/theory/fp/fp_converter.h +++ b/src/theory/fp/fp_converter.h @@ -18,8 +18,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__FP__FP_CONVERTER_H -#define __CVC4__THEORY__FP__FP_CONVERTER_H +#ifndef CVC4__THEORY__FP__FP_CONVERTER_H +#define CVC4__THEORY__FP__FP_CONVERTER_H #include "base/cvc4_assert.h" #include "context/cdhashmap.h" @@ -355,4 +355,4 @@ class FpConverter } // namespace theory } // namespace CVC4 -#endif /* __CVC4__THEORY__FP__THEORY_FP_H */ +#endif /* CVC4__THEORY__FP__THEORY_FP_H */ diff --git a/src/theory/fp/theory_fp.h b/src/theory/fp/theory_fp.h index 49d457d7a..ad093f924 100644 --- a/src/theory/fp/theory_fp.h +++ b/src/theory/fp/theory_fp.h @@ -17,8 +17,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__FP__THEORY_FP_H -#define __CVC4__THEORY__FP__THEORY_FP_H +#ifndef CVC4__THEORY__FP__THEORY_FP_H +#define CVC4__THEORY__FP__THEORY_FP_H #include #include @@ -148,4 +148,4 @@ class TheoryFp : public Theory { } // namespace theory } // namespace CVC4 -#endif /* __CVC4__THEORY__FP__THEORY_FP_H */ +#endif /* CVC4__THEORY__FP__THEORY_FP_H */ diff --git a/src/theory/fp/theory_fp_rewriter.h b/src/theory/fp/theory_fp_rewriter.h index ec042dfe9..fef97afea 100644 --- a/src/theory/fp/theory_fp_rewriter.h +++ b/src/theory/fp/theory_fp_rewriter.h @@ -17,8 +17,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__FP__THEORY_FP_REWRITER_H -#define __CVC4__THEORY__FP__THEORY_FP_REWRITER_H +#ifndef CVC4__THEORY__FP__THEORY_FP_REWRITER_H +#define CVC4__THEORY__FP__THEORY_FP_REWRITER_H #include "theory/rewriter.h" @@ -64,4 +64,4 @@ class TheoryFpRewriter { }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__FP__THEORY_FP_REWRITER_H */ +#endif /* CVC4__THEORY__FP__THEORY_FP_REWRITER_H */ diff --git a/src/theory/fp/theory_fp_type_rules.h b/src/theory/fp/theory_fp_type_rules.h index 307247608..4022cc278 100644 --- a/src/theory/fp/theory_fp_type_rules.h +++ b/src/theory/fp/theory_fp_type_rules.h @@ -20,8 +20,8 @@ // This is only needed for checking that components are only applied to leaves. #include "theory/theory.h" -#ifndef __CVC4__THEORY__FP__THEORY_FP_TYPE_RULES_H -#define __CVC4__THEORY__FP__THEORY_FP_TYPE_RULES_H +#ifndef CVC4__THEORY__FP__THEORY_FP_TYPE_RULES_H +#define CVC4__THEORY__FP__THEORY_FP_TYPE_RULES_H namespace CVC4 { namespace theory { @@ -806,4 +806,4 @@ public: }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__FP__THEORY_FP_TYPE_RULES_H */ +#endif /* CVC4__THEORY__FP__THEORY_FP_TYPE_RULES_H */ diff --git a/src/theory/fp/type_enumerator.h b/src/theory/fp/type_enumerator.h index cd73ff824..4494fd40f 100644 --- a/src/theory/fp/type_enumerator.h +++ b/src/theory/fp/type_enumerator.h @@ -17,8 +17,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__FP__TYPE_ENUMERATOR_H -#define __CVC4__THEORY__FP__TYPE_ENUMERATOR_H +#ifndef CVC4__THEORY__FP__TYPE_ENUMERATOR_H +#define CVC4__THEORY__FP__TYPE_ENUMERATOR_H #include "expr/kind.h" #include "expr/type_node.h" @@ -132,4 +132,4 @@ class RoundingModeEnumerator } // namespace theory } // namespace CVC4 -#endif /* __CVC4__THEORY__FP__TYPE_ENUMERATOR_H */ +#endif /* CVC4__THEORY__FP__TYPE_ENUMERATOR_H */ diff --git a/src/theory/interrupted.h b/src/theory/interrupted.h index 291528a78..905a98689 100644 --- a/src/theory/interrupted.h +++ b/src/theory/interrupted.h @@ -26,8 +26,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__INTERRUPTED_H -#define __CVC4__THEORY__INTERRUPTED_H +#ifndef CVC4__THEORY__INTERRUPTED_H +#define CVC4__THEORY__INTERRUPTED_H #include "base/exception.h" @@ -40,4 +40,4 @@ class Interrupted : public CVC4::Exception { }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__INTERRUPTED_H */ +#endif /* CVC4__THEORY__INTERRUPTED_H */ diff --git a/src/theory/logic_info.h b/src/theory/logic_info.h index 4c35b8d7f..a765472dd 100644 --- a/src/theory/logic_info.h +++ b/src/theory/logic_info.h @@ -18,8 +18,8 @@ #include "cvc4_public.h" -#ifndef __CVC4__LOGIC_INFO_H -#define __CVC4__LOGIC_INFO_H +#ifndef CVC4__LOGIC_INFO_H +#define CVC4__LOGIC_INFO_H #include #include @@ -279,4 +279,4 @@ std::ostream& operator<<(std::ostream& out, const LogicInfo& logic) CVC4_PUBLIC; }/* CVC4 namespace */ -#endif /* __CVC4__LOGIC_INFO_H */ +#endif /* CVC4__LOGIC_INFO_H */ diff --git a/src/theory/output_channel.h b/src/theory/output_channel.h index 38fd94003..347177b93 100644 --- a/src/theory/output_channel.h +++ b/src/theory/output_channel.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__OUTPUT_CHANNEL_H -#define __CVC4__THEORY__OUTPUT_CHANNEL_H +#ifndef CVC4__THEORY__OUTPUT_CHANNEL_H +#define CVC4__THEORY__OUTPUT_CHANNEL_H #include @@ -194,4 +194,4 @@ class OutputChannel { } // namespace theory } // namespace CVC4 -#endif /* __CVC4__THEORY__OUTPUT_CHANNEL_H */ +#endif /* CVC4__THEORY__OUTPUT_CHANNEL_H */ diff --git a/src/theory/quantifiers/alpha_equivalence.h b/src/theory/quantifiers/alpha_equivalence.h index 5ab7d0fc2..b5d68f233 100644 --- a/src/theory/quantifiers/alpha_equivalence.h +++ b/src/theory/quantifiers/alpha_equivalence.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__ALPHA_EQUIVALENCE_H -#define __CVC4__ALPHA_EQUIVALENCE_H +#ifndef CVC4__ALPHA_EQUIVALENCE_H +#define CVC4__ALPHA_EQUIVALENCE_H #include "theory/quantifiers_engine.h" diff --git a/src/theory/quantifiers/anti_skolem.h b/src/theory/quantifiers/anti_skolem.h index e02c85866..3a7dc2da8 100644 --- a/src/theory/quantifiers/anti_skolem.h +++ b/src/theory/quantifiers/anti_skolem.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__QUANT_ANTI_SKOLEM_H -#define __CVC4__THEORY__QUANT_ANTI_SKOLEM_H +#ifndef CVC4__THEORY__QUANT_ANTI_SKOLEM_H +#define CVC4__THEORY__QUANT_ANTI_SKOLEM_H #include #include diff --git a/src/theory/quantifiers/bv_inverter.h b/src/theory/quantifiers/bv_inverter.h index b4cfe2bed..746bfba9a 100644 --- a/src/theory/quantifiers/bv_inverter.h +++ b/src/theory/quantifiers/bv_inverter.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__BV_INVERTER_H -#define __CVC4__BV_INVERTER_H +#ifndef CVC4__BV_INVERTER_H +#define CVC4__BV_INVERTER_H #include #include @@ -130,4 +130,4 @@ class BvInverter } // namespace theory } // namespace CVC4 -#endif /* __CVC4__BV_INVERTER_H */ +#endif /* CVC4__BV_INVERTER_H */ diff --git a/src/theory/quantifiers/bv_inverter_utils.h b/src/theory/quantifiers/bv_inverter_utils.h index 4ab677f0e..264b42ef5 100644 --- a/src/theory/quantifiers/bv_inverter_utils.h +++ b/src/theory/quantifiers/bv_inverter_utils.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__BV_INVERTER_UTILS_H -#define __CVC4__BV_INVERTER_UTILS_H +#ifndef CVC4__BV_INVERTER_UTILS_H +#define CVC4__BV_INVERTER_UTILS_H #include "expr/node.h" diff --git a/src/theory/quantifiers/candidate_rewrite_database.h b/src/theory/quantifiers/candidate_rewrite_database.h index 9daaa970e..b68b20998 100644 --- a/src/theory/quantifiers/candidate_rewrite_database.h +++ b/src/theory/quantifiers/candidate_rewrite_database.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__QUANTIFIERS__CANDIDATE_REWRITE_DATABASE_H -#define __CVC4__THEORY__QUANTIFIERS__CANDIDATE_REWRITE_DATABASE_H +#ifndef CVC4__THEORY__QUANTIFIERS__CANDIDATE_REWRITE_DATABASE_H +#define CVC4__THEORY__QUANTIFIERS__CANDIDATE_REWRITE_DATABASE_H #include #include @@ -145,4 +145,4 @@ class CandidateRewriteDatabaseGen } /* CVC4::theory namespace */ } /* CVC4 namespace */ -#endif /* __CVC4__THEORY__QUANTIFIERS__CANDIDATE_REWRITE_DATABASE_H */ +#endif /* CVC4__THEORY__QUANTIFIERS__CANDIDATE_REWRITE_DATABASE_H */ diff --git a/src/theory/quantifiers/candidate_rewrite_filter.h b/src/theory/quantifiers/candidate_rewrite_filter.h index 63d5d6fec..af9ac6d87 100644 --- a/src/theory/quantifiers/candidate_rewrite_filter.h +++ b/src/theory/quantifiers/candidate_rewrite_filter.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__QUANTIFIERS__CANDIDATE_REWRITE_FILTER_H -#define __CVC4__THEORY__QUANTIFIERS__CANDIDATE_REWRITE_FILTER_H +#ifndef CVC4__THEORY__QUANTIFIERS__CANDIDATE_REWRITE_FILTER_H +#define CVC4__THEORY__QUANTIFIERS__CANDIDATE_REWRITE_FILTER_H #include #include "theory/quantifiers/dynamic_rewrite.h" @@ -223,4 +223,4 @@ class CandidateRewriteFilter } // namespace theory } // namespace CVC4 -#endif /* __CVC4__THEORY__QUANTIFIERS__CANDIDATE_REWRITE_FILTER_H */ +#endif /* CVC4__THEORY__QUANTIFIERS__CANDIDATE_REWRITE_FILTER_H */ diff --git a/src/theory/quantifiers/cegqi/ceg_arith_instantiator.h b/src/theory/quantifiers/cegqi/ceg_arith_instantiator.h index 5bc75f801..8799ce1cd 100644 --- a/src/theory/quantifiers/cegqi/ceg_arith_instantiator.h +++ b/src/theory/quantifiers/cegqi/ceg_arith_instantiator.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__QUANTIFIERS__CEG_ARITH_INSTANTIATOR_H -#define __CVC4__THEORY__QUANTIFIERS__CEG_ARITH_INSTANTIATOR_H +#ifndef CVC4__THEORY__QUANTIFIERS__CEG_ARITH_INSTANTIATOR_H +#define CVC4__THEORY__QUANTIFIERS__CEG_ARITH_INSTANTIATOR_H #include #include "expr/node.h" @@ -203,4 +203,4 @@ class ArithInstantiator : public Instantiator } // namespace theory } // namespace CVC4 -#endif /* __CVC4__THEORY__QUANTIFIERS__CEG_ARITH_INSTANTIATOR_H */ +#endif /* CVC4__THEORY__QUANTIFIERS__CEG_ARITH_INSTANTIATOR_H */ diff --git a/src/theory/quantifiers/cegqi/ceg_bv_instantiator.h b/src/theory/quantifiers/cegqi/ceg_bv_instantiator.h index b9c35b3e0..466eba6a2 100644 --- a/src/theory/quantifiers/cegqi/ceg_bv_instantiator.h +++ b/src/theory/quantifiers/cegqi/ceg_bv_instantiator.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__QUANTIFIERS__CEG_BV_INSTANTIATOR_H -#define __CVC4__THEORY__QUANTIFIERS__CEG_BV_INSTANTIATOR_H +#ifndef CVC4__THEORY__QUANTIFIERS__CEG_BV_INSTANTIATOR_H +#define CVC4__THEORY__QUANTIFIERS__CEG_BV_INSTANTIATOR_H #include #include "theory/quantifiers/bv_inverter.h" @@ -211,4 +211,4 @@ class BvInstantiatorPreprocess : public InstantiatorPreprocess } // namespace theory } // namespace CVC4 -#endif /* __CVC4__THEORY__QUANTIFIERS__CEG_BV_INSTANTIATOR_H */ +#endif /* CVC4__THEORY__QUANTIFIERS__CEG_BV_INSTANTIATOR_H */ diff --git a/src/theory/quantifiers/cegqi/ceg_bv_instantiator_utils.h b/src/theory/quantifiers/cegqi/ceg_bv_instantiator_utils.h index 3156e745c..7c72a29f2 100644 --- a/src/theory/quantifiers/cegqi/ceg_bv_instantiator_utils.h +++ b/src/theory/quantifiers/cegqi/ceg_bv_instantiator_utils.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__BV_INSTANTIATOR_UTILS_H -#define __CVC4__BV_INSTANTIATOR_UTILS_H +#ifndef CVC4__BV_INSTANTIATOR_UTILS_H +#define CVC4__BV_INSTANTIATOR_UTILS_H #include "expr/attribute.h" #include "expr/node.h" diff --git a/src/theory/quantifiers/cegqi/ceg_dt_instantiator.h b/src/theory/quantifiers/cegqi/ceg_dt_instantiator.h index ea3db0e9b..cf9736abe 100644 --- a/src/theory/quantifiers/cegqi/ceg_dt_instantiator.h +++ b/src/theory/quantifiers/cegqi/ceg_dt_instantiator.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__QUANTIFIERS__CEG_DT_INSTANTIATOR_H -#define __CVC4__THEORY__QUANTIFIERS__CEG_DT_INSTANTIATOR_H +#ifndef CVC4__THEORY__QUANTIFIERS__CEG_DT_INSTANTIATOR_H +#define CVC4__THEORY__QUANTIFIERS__CEG_DT_INSTANTIATOR_H #include "expr/node.h" #include "theory/quantifiers/cegqi/ceg_instantiator.h" @@ -93,4 +93,4 @@ class DtInstantiator : public Instantiator } // namespace theory } // namespace CVC4 -#endif /* __CVC4__THEORY__QUANTIFIERS__CEG_DT_INSTANTIATOR_H */ +#endif /* CVC4__THEORY__QUANTIFIERS__CEG_DT_INSTANTIATOR_H */ diff --git a/src/theory/quantifiers/cegqi/ceg_epr_instantiator.h b/src/theory/quantifiers/cegqi/ceg_epr_instantiator.h index 2ed76ba27..05932de7e 100644 --- a/src/theory/quantifiers/cegqi/ceg_epr_instantiator.h +++ b/src/theory/quantifiers/cegqi/ceg_epr_instantiator.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__QUANTIFIERS__CEG_EPR_INSTANTIATOR_H -#define __CVC4__THEORY__QUANTIFIERS__CEG_EPR_INSTANTIATOR_H +#ifndef CVC4__THEORY__QUANTIFIERS__CEG_EPR_INSTANTIATOR_H +#define CVC4__THEORY__QUANTIFIERS__CEG_EPR_INSTANTIATOR_H #include #include @@ -106,4 +106,4 @@ class EprInstantiator : public Instantiator } // namespace theory } // namespace CVC4 -#endif /* __CVC4__THEORY__QUANTIFIERS__CEG_EPR_INSTANTIATOR_H */ +#endif /* CVC4__THEORY__QUANTIFIERS__CEG_EPR_INSTANTIATOR_H */ diff --git a/src/theory/quantifiers/cegqi/ceg_instantiator.h b/src/theory/quantifiers/cegqi/ceg_instantiator.h index a813c91b0..0a09f39c7 100644 --- a/src/theory/quantifiers/cegqi/ceg_instantiator.h +++ b/src/theory/quantifiers/cegqi/ceg_instantiator.h @@ -15,8 +15,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__QUANTIFIERS__CEG_INSTANTIATOR_H -#define __CVC4__THEORY__QUANTIFIERS__CEG_INSTANTIATOR_H +#ifndef CVC4__THEORY__QUANTIFIERS__CEG_INSTANTIATOR_H +#define CVC4__THEORY__QUANTIFIERS__CEG_INSTANTIATOR_H #include "theory/quantifiers_engine.h" #include "util/statistics_registry.h" diff --git a/src/theory/quantifiers/cegqi/inst_strategy_cegqi.h b/src/theory/quantifiers/cegqi/inst_strategy_cegqi.h index c5c90b64a..ebebb808d 100644 --- a/src/theory/quantifiers/cegqi/inst_strategy_cegqi.h +++ b/src/theory/quantifiers/cegqi/inst_strategy_cegqi.h @@ -15,8 +15,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__QUANTIFIERS__INST_STRATEGY_CEGQI_H -#define __CVC4__THEORY__QUANTIFIERS__INST_STRATEGY_CEGQI_H +#ifndef CVC4__THEORY__QUANTIFIERS__INST_STRATEGY_CEGQI_H +#define CVC4__THEORY__QUANTIFIERS__INST_STRATEGY_CEGQI_H #include "theory/decision_manager.h" #include "theory/quantifiers/cegqi/ceg_instantiator.h" diff --git a/src/theory/quantifiers/dynamic_rewrite.h b/src/theory/quantifiers/dynamic_rewrite.h index 6d0a1625c..969b6bf93 100644 --- a/src/theory/quantifiers/dynamic_rewrite.h +++ b/src/theory/quantifiers/dynamic_rewrite.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__QUANTIFIERS__DYNAMIC_REWRITER_H -#define __CVC4__THEORY__QUANTIFIERS__DYNAMIC_REWRITER_H +#ifndef CVC4__THEORY__QUANTIFIERS__DYNAMIC_REWRITER_H +#define CVC4__THEORY__QUANTIFIERS__DYNAMIC_REWRITER_H #include @@ -121,4 +121,4 @@ class DynamicRewriter } /* CVC4::theory namespace */ } /* CVC4 namespace */ -#endif /* __CVC4__THEORY__QUANTIFIERS__DYNAMIC_REWRITER_H */ +#endif /* CVC4__THEORY__QUANTIFIERS__DYNAMIC_REWRITER_H */ diff --git a/src/theory/quantifiers/ematching/candidate_generator.h b/src/theory/quantifiers/ematching/candidate_generator.h index d2718fa1f..8cff12477 100644 --- a/src/theory/quantifiers/ematching/candidate_generator.h +++ b/src/theory/quantifiers/ematching/candidate_generator.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__QUANTIFIERS__CANDIDATE_GENERATOR_H -#define __CVC4__THEORY__QUANTIFIERS__CANDIDATE_GENERATOR_H +#ifndef CVC4__THEORY__QUANTIFIERS__CANDIDATE_GENERATOR_H +#define CVC4__THEORY__QUANTIFIERS__CANDIDATE_GENERATOR_H #include "theory/theory.h" #include "theory/uf/equality_engine.h" @@ -212,4 +212,4 @@ class CandidateGeneratorConsExpand : public CandidateGeneratorQE }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__QUANTIFIERS__CANDIDATE_GENERATOR_H */ +#endif /* CVC4__THEORY__QUANTIFIERS__CANDIDATE_GENERATOR_H */ diff --git a/src/theory/quantifiers/ematching/ho_trigger.h b/src/theory/quantifiers/ematching/ho_trigger.h index b57db5799..6f0ff0635 100644 --- a/src/theory/quantifiers/ematching/ho_trigger.h +++ b/src/theory/quantifiers/ematching/ho_trigger.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__QUANTIFIERS__HO_TRIGGER_H -#define __CVC4__THEORY__QUANTIFIERS__HO_TRIGGER_H +#ifndef CVC4__THEORY__QUANTIFIERS__HO_TRIGGER_H +#define CVC4__THEORY__QUANTIFIERS__HO_TRIGGER_H #include #include @@ -275,4 +275,4 @@ class HigherOrderTrigger : public Trigger } /* CVC4::theory namespace */ } /* CVC4 namespace */ -#endif /* __CVC4__THEORY__QUANTIFIERS__HO_TRIGGER_H */ +#endif /* CVC4__THEORY__QUANTIFIERS__HO_TRIGGER_H */ diff --git a/src/theory/quantifiers/ematching/inst_match_generator.h b/src/theory/quantifiers/ematching/inst_match_generator.h index f9fd2be25..3995c67b4 100644 --- a/src/theory/quantifiers/ematching/inst_match_generator.h +++ b/src/theory/quantifiers/ematching/inst_match_generator.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__QUANTIFIERS__INST_MATCH_GENERATOR_H -#define __CVC4__THEORY__QUANTIFIERS__INST_MATCH_GENERATOR_H +#ifndef CVC4__THEORY__QUANTIFIERS__INST_MATCH_GENERATOR_H +#define CVC4__THEORY__QUANTIFIERS__INST_MATCH_GENERATOR_H #include #include "expr/node_trie.h" diff --git a/src/theory/quantifiers/ematching/inst_strategy_e_matching.h b/src/theory/quantifiers/ematching/inst_strategy_e_matching.h index d715d7f7a..5eb992368 100644 --- a/src/theory/quantifiers/ematching/inst_strategy_e_matching.h +++ b/src/theory/quantifiers/ematching/inst_strategy_e_matching.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__INST_STRATEGY_E_MATCHING_H -#define __CVC4__INST_STRATEGY_E_MATCHING_H +#ifndef CVC4__INST_STRATEGY_E_MATCHING_H +#define CVC4__INST_STRATEGY_E_MATCHING_H #include "context/context.h" #include "context/context_mm.h" diff --git a/src/theory/quantifiers/ematching/instantiation_engine.h b/src/theory/quantifiers/ematching/instantiation_engine.h index cd82e67a3..139adcb04 100644 --- a/src/theory/quantifiers/ematching/instantiation_engine.h +++ b/src/theory/quantifiers/ematching/instantiation_engine.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__QUANTIFIERS__INSTANTIATION_ENGINE_H -#define __CVC4__THEORY__QUANTIFIERS__INSTANTIATION_ENGINE_H +#ifndef CVC4__THEORY__QUANTIFIERS__INSTANTIATION_ENGINE_H +#define CVC4__THEORY__QUANTIFIERS__INSTANTIATION_ENGINE_H #include @@ -95,4 +95,4 @@ class InstantiationEngine : public QuantifiersModule { }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__QUANTIFIERS__INSTANTIATION_ENGINE_H */ +#endif /* CVC4__THEORY__QUANTIFIERS__INSTANTIATION_ENGINE_H */ diff --git a/src/theory/quantifiers/ematching/trigger.h b/src/theory/quantifiers/ematching/trigger.h index 9a65f0c02..f276585d6 100644 --- a/src/theory/quantifiers/ematching/trigger.h +++ b/src/theory/quantifiers/ematching/trigger.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__QUANTIFIERS__TRIGGER_H -#define __CVC4__THEORY__QUANTIFIERS__TRIGGER_H +#ifndef CVC4__THEORY__QUANTIFIERS__TRIGGER_H +#define CVC4__THEORY__QUANTIFIERS__TRIGGER_H #include @@ -464,4 +464,4 @@ public: }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__QUANTIFIERS__TRIGGER_H */ +#endif /* CVC4__THEORY__QUANTIFIERS__TRIGGER_H */ diff --git a/src/theory/quantifiers/equality_infer.h b/src/theory/quantifiers/equality_infer.h index be1d6d81d..69cd12a70 100644 --- a/src/theory/quantifiers/equality_infer.h +++ b/src/theory/quantifiers/equality_infer.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__QUANTIFIERS__EQUALITY_INFER_H -#define __CVC4__THEORY__QUANTIFIERS__EQUALITY_INFER_H +#ifndef CVC4__THEORY__QUANTIFIERS__EQUALITY_INFER_H +#define CVC4__THEORY__QUANTIFIERS__EQUALITY_INFER_H #include #include diff --git a/src/theory/quantifiers/equality_query.h b/src/theory/quantifiers/equality_query.h index 9b62c5714..e4eeeffa7 100644 --- a/src/theory/quantifiers/equality_query.h +++ b/src/theory/quantifiers/equality_query.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__QUANTIFIERS_EQUALITY_QUERY_H -#define __CVC4__THEORY__QUANTIFIERS_EQUALITY_QUERY_H +#ifndef CVC4__THEORY__QUANTIFIERS_EQUALITY_QUERY_H +#define CVC4__THEORY__QUANTIFIERS_EQUALITY_QUERY_H #include "context/cdo.h" #include "context/context.h" @@ -120,4 +120,4 @@ class EqualityQueryQuantifiersEngine : public EqualityQuery }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__QUANTIFIERS_EQUALITY_QUERY_H */ +#endif /* CVC4__THEORY__QUANTIFIERS_EQUALITY_QUERY_H */ diff --git a/src/theory/quantifiers/expr_miner.h b/src/theory/quantifiers/expr_miner.h index 9420b495a..233ef39f7 100644 --- a/src/theory/quantifiers/expr_miner.h +++ b/src/theory/quantifiers/expr_miner.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__QUANTIFIERS__EXPRESSION_MINER_H -#define __CVC4__THEORY__QUANTIFIERS__EXPRESSION_MINER_H +#ifndef CVC4__THEORY__QUANTIFIERS__EXPRESSION_MINER_H +#define CVC4__THEORY__QUANTIFIERS__EXPRESSION_MINER_H #include #include @@ -106,4 +106,4 @@ class ExprMiner } // namespace theory } // namespace CVC4 -#endif /* __CVC4__THEORY__QUANTIFIERS__EXPRESSION_MINER_H */ +#endif /* CVC4__THEORY__QUANTIFIERS__EXPRESSION_MINER_H */ diff --git a/src/theory/quantifiers/expr_miner_manager.h b/src/theory/quantifiers/expr_miner_manager.h index dc0a8fab5..1c8aab826 100644 --- a/src/theory/quantifiers/expr_miner_manager.h +++ b/src/theory/quantifiers/expr_miner_manager.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__QUANTIFIERS__EXPR_MINER_MANAGER_H -#define __CVC4__THEORY__QUANTIFIERS__EXPR_MINER_MANAGER_H +#ifndef CVC4__THEORY__QUANTIFIERS__EXPR_MINER_MANAGER_H +#define CVC4__THEORY__QUANTIFIERS__EXPR_MINER_MANAGER_H #include "expr/node.h" #include "theory/quantifiers/candidate_rewrite_database.h" @@ -120,4 +120,4 @@ class ExpressionMinerManager } // namespace theory } // namespace CVC4 -#endif /* __CVC4__THEORY__QUANTIFIERS__EXPR_MINER_MANAGER_H */ +#endif /* CVC4__THEORY__QUANTIFIERS__EXPR_MINER_MANAGER_H */ diff --git a/src/theory/quantifiers/extended_rewrite.h b/src/theory/quantifiers/extended_rewrite.h index 920732e0f..836e15b7b 100644 --- a/src/theory/quantifiers/extended_rewrite.h +++ b/src/theory/quantifiers/extended_rewrite.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__QUANTIFIERS__EXTENDED_REWRITE_H -#define __CVC4__THEORY__QUANTIFIERS__EXTENDED_REWRITE_H +#ifndef CVC4__THEORY__QUANTIFIERS__EXTENDED_REWRITE_H +#define CVC4__THEORY__QUANTIFIERS__EXTENDED_REWRITE_H #include @@ -250,4 +250,4 @@ class ExtendedRewriter } /* CVC4::theory namespace */ } /* CVC4 namespace */ -#endif /* __CVC4__THEORY__QUANTIFIERS__EXTENDED_REWRITE_H */ +#endif /* CVC4__THEORY__QUANTIFIERS__EXTENDED_REWRITE_H */ diff --git a/src/theory/quantifiers/first_order_model.h b/src/theory/quantifiers/first_order_model.h index dc257ea0a..bdf1d7c15 100644 --- a/src/theory/quantifiers/first_order_model.h +++ b/src/theory/quantifiers/first_order_model.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__FIRST_ORDER_MODEL_H -#define __CVC4__FIRST_ORDER_MODEL_H +#ifndef CVC4__FIRST_ORDER_MODEL_H +#define CVC4__FIRST_ORDER_MODEL_H #include "theory/theory_model.h" #include "theory/uf/theory_uf_model.h" @@ -218,4 +218,4 @@ class FirstOrderModelFmc : public FirstOrderModel }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__FIRST_ORDER_MODEL_H */ +#endif /* CVC4__FIRST_ORDER_MODEL_H */ diff --git a/src/theory/quantifiers/fmf/bounded_integers.h b/src/theory/quantifiers/fmf/bounded_integers.h index 1eab28fd9..55ed5bdd2 100644 --- a/src/theory/quantifiers/fmf/bounded_integers.h +++ b/src/theory/quantifiers/fmf/bounded_integers.h @@ -15,8 +15,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__BOUNDED_INTEGERS_H -#define __CVC4__BOUNDED_INTEGERS_H +#ifndef CVC4__BOUNDED_INTEGERS_H +#define CVC4__BOUNDED_INTEGERS_H #include "theory/quantifiers_engine.h" diff --git a/src/theory/quantifiers/fmf/full_model_check.h b/src/theory/quantifiers/fmf/full_model_check.h index d662898c3..7dd1991f5 100644 --- a/src/theory/quantifiers/fmf/full_model_check.h +++ b/src/theory/quantifiers/fmf/full_model_check.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__QUANTIFIERS__FULL_MODEL_CHECK_H -#define __CVC4__THEORY__QUANTIFIERS__FULL_MODEL_CHECK_H +#ifndef CVC4__THEORY__QUANTIFIERS__FULL_MODEL_CHECK_H +#define CVC4__THEORY__QUANTIFIERS__FULL_MODEL_CHECK_H #include "theory/quantifiers/fmf/model_builder.h" #include "theory/quantifiers/first_order_model.h" @@ -162,4 +162,4 @@ public: }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__QUANTIFIERS__FULL_MODEL_CHECK_H */ +#endif /* CVC4__THEORY__QUANTIFIERS__FULL_MODEL_CHECK_H */ diff --git a/src/theory/quantifiers/fmf/model_builder.h b/src/theory/quantifiers/fmf/model_builder.h index b5f9c809a..1b4d24779 100644 --- a/src/theory/quantifiers/fmf/model_builder.h +++ b/src/theory/quantifiers/fmf/model_builder.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__QUANTIFIERS__MODEL_BUILDER_H -#define __CVC4__THEORY__QUANTIFIERS__MODEL_BUILDER_H +#ifndef CVC4__THEORY__QUANTIFIERS__MODEL_BUILDER_H +#define CVC4__THEORY__QUANTIFIERS__MODEL_BUILDER_H #include "theory/quantifiers_engine.h" #include "theory/theory_model_builder.h" @@ -60,4 +60,4 @@ public: }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__QUANTIFIERS__MODEL_BUILDER_H */ +#endif /* CVC4__THEORY__QUANTIFIERS__MODEL_BUILDER_H */ diff --git a/src/theory/quantifiers/fmf/model_engine.h b/src/theory/quantifiers/fmf/model_engine.h index 4202988ae..41bc312e7 100644 --- a/src/theory/quantifiers/fmf/model_engine.h +++ b/src/theory/quantifiers/fmf/model_engine.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__QUANTIFIERS__MODEL_ENGINE_H -#define __CVC4__THEORY__QUANTIFIERS__MODEL_ENGINE_H +#ifndef CVC4__THEORY__QUANTIFIERS__MODEL_ENGINE_H +#define CVC4__THEORY__QUANTIFIERS__MODEL_ENGINE_H #include "theory/quantifiers_engine.h" #include "theory/quantifiers/fmf/model_builder.h" @@ -67,4 +67,4 @@ public: }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__QUANTIFIERS__MODEL_ENGINE_H */ +#endif /* CVC4__THEORY__QUANTIFIERS__MODEL_ENGINE_H */ diff --git a/src/theory/quantifiers/fun_def_process.h b/src/theory/quantifiers/fun_def_process.h index f455d4a47..0282f0e40 100644 --- a/src/theory/quantifiers/fun_def_process.h +++ b/src/theory/quantifiers/fun_def_process.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__QUANTIFIERS_FUN_DEF_PROCESS_H -#define __CVC4__QUANTIFIERS_FUN_DEF_PROCESS_H +#ifndef CVC4__QUANTIFIERS_FUN_DEF_PROCESS_H +#define CVC4__QUANTIFIERS_FUN_DEF_PROCESS_H #include #include diff --git a/src/theory/quantifiers/inst_match.h b/src/theory/quantifiers/inst_match.h index db2f7b8a0..d298c43a8 100644 --- a/src/theory/quantifiers/inst_match.h +++ b/src/theory/quantifiers/inst_match.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__QUANTIFIERS__INST_MATCH_H -#define __CVC4__THEORY__QUANTIFIERS__INST_MATCH_H +#ifndef CVC4__THEORY__QUANTIFIERS__INST_MATCH_H +#define CVC4__THEORY__QUANTIFIERS__INST_MATCH_H #include @@ -102,4 +102,4 @@ typedef CVC4::theory::inst::InstMatch InstMatch; }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__QUANTIFIERS__INST_MATCH_H */ +#endif /* CVC4__THEORY__QUANTIFIERS__INST_MATCH_H */ diff --git a/src/theory/quantifiers/inst_match_trie.h b/src/theory/quantifiers/inst_match_trie.h index 6f5b16bb1..4854616db 100644 --- a/src/theory/quantifiers/inst_match_trie.h +++ b/src/theory/quantifiers/inst_match_trie.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__QUANTIFIERS__INST_MATCH_TRIE_H -#define __CVC4__THEORY__QUANTIFIERS__INST_MATCH_TRIE_H +#ifndef CVC4__THEORY__QUANTIFIERS__INST_MATCH_TRIE_H +#define CVC4__THEORY__QUANTIFIERS__INST_MATCH_TRIE_H #include @@ -436,4 +436,4 @@ class InstMatchTrieOrdered } /* CVC4::theory namespace */ } /* CVC4 namespace */ -#endif /* __CVC4__THEORY__QUANTIFIERS__INST_MATCH_H */ +#endif /* CVC4__THEORY__QUANTIFIERS__INST_MATCH_H */ diff --git a/src/theory/quantifiers/inst_propagator.h b/src/theory/quantifiers/inst_propagator.h index d82991b0a..d45b078ce 100644 --- a/src/theory/quantifiers/inst_propagator.h +++ b/src/theory/quantifiers/inst_propagator.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__QUANTIFIERS_INST_PROPAGATOR_H -#define __CVC4__QUANTIFIERS_INST_PROPAGATOR_H +#ifndef CVC4__QUANTIFIERS_INST_PROPAGATOR_H +#define CVC4__QUANTIFIERS_INST_PROPAGATOR_H #include #include diff --git a/src/theory/quantifiers/inst_strategy_enumerative.h b/src/theory/quantifiers/inst_strategy_enumerative.h index f011efdfc..920e643bc 100644 --- a/src/theory/quantifiers/inst_strategy_enumerative.h +++ b/src/theory/quantifiers/inst_strategy_enumerative.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__INST_STRATEGY_ENUMERATIVE_H -#define __CVC4__INST_STRATEGY_ENUMERATIVE_H +#ifndef CVC4__INST_STRATEGY_ENUMERATIVE_H +#define CVC4__INST_STRATEGY_ENUMERATIVE_H #include "context/context.h" #include "context/context_mm.h" diff --git a/src/theory/quantifiers/instantiate.h b/src/theory/quantifiers/instantiate.h index 25f333fbb..2fdb494e9 100644 --- a/src/theory/quantifiers/instantiate.h +++ b/src/theory/quantifiers/instantiate.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__QUANTIFIERS__INSTANTIATE_H -#define __CVC4__THEORY__QUANTIFIERS__INSTANTIATE_H +#ifndef CVC4__THEORY__QUANTIFIERS__INSTANTIATE_H +#define CVC4__THEORY__QUANTIFIERS__INSTANTIATE_H #include @@ -374,4 +374,4 @@ class Instantiate : public QuantifiersUtil } /* CVC4::theory namespace */ } /* CVC4 namespace */ -#endif /* __CVC4__THEORY__QUANTIFIERS__INSTANTIATE_H */ +#endif /* CVC4__THEORY__QUANTIFIERS__INSTANTIATE_H */ diff --git a/src/theory/quantifiers/lazy_trie.h b/src/theory/quantifiers/lazy_trie.h index ce6d841cc..8f822fcc0 100644 --- a/src/theory/quantifiers/lazy_trie.h +++ b/src/theory/quantifiers/lazy_trie.h @@ -12,8 +12,8 @@ ** \brief lazy trie **/ -#ifndef __CVC4__THEORY__QUANTIFIERS__LAZY_TRIE_H -#define __CVC4__THEORY__QUANTIFIERS__LAZY_TRIE_H +#ifndef CVC4__THEORY__QUANTIFIERS__LAZY_TRIE_H +#define CVC4__THEORY__QUANTIFIERS__LAZY_TRIE_H #include "expr/node.h" @@ -170,4 +170,4 @@ class LazyTrieMulti } /* CVC4::theory namespace */ } /* CVC4 namespace */ -#endif /* __CVC4__THEORY__QUANTIFIERS__LAZY_TRIE_H */ +#endif /* CVC4__THEORY__QUANTIFIERS__LAZY_TRIE_H */ diff --git a/src/theory/quantifiers/local_theory_ext.h b/src/theory/quantifiers/local_theory_ext.h index 7a6182394..9793ea0a7 100644 --- a/src/theory/quantifiers/local_theory_ext.h +++ b/src/theory/quantifiers/local_theory_ext.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__LOCAL_THEORY_EXT_H -#define __CVC4__THEORY__LOCAL_THEORY_EXT_H +#ifndef CVC4__THEORY__LOCAL_THEORY_EXT_H +#define CVC4__THEORY__LOCAL_THEORY_EXT_H #include "context/cdo.h" #include "expr/node_trie.h" diff --git a/src/theory/quantifiers/quant_epr.h b/src/theory/quantifiers/quant_epr.h index 9eda74d25..1284dde33 100644 --- a/src/theory/quantifiers/quant_epr.h +++ b/src/theory/quantifiers/quant_epr.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__QUANT_EPR_H -#define __CVC4__THEORY__QUANT_EPR_H +#ifndef CVC4__THEORY__QUANT_EPR_H +#define CVC4__THEORY__QUANT_EPR_H #include @@ -101,4 +101,4 @@ class QuantEPR } /* CVC4::theory namespace */ } /* CVC4 namespace */ -#endif /* __CVC4__THEORY__QUANT_EPR_H */ +#endif /* CVC4__THEORY__QUANT_EPR_H */ diff --git a/src/theory/quantifiers/quant_relevance.h b/src/theory/quantifiers/quant_relevance.h index 43bb4c548..26a4630cd 100644 --- a/src/theory/quantifiers/quant_relevance.h +++ b/src/theory/quantifiers/quant_relevance.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__QUANT_RELEVANCE_H -#define __CVC4__THEORY__QUANT_RELEVANCE_H +#ifndef CVC4__THEORY__QUANT_RELEVANCE_H +#define CVC4__THEORY__QUANT_RELEVANCE_H #include @@ -68,4 +68,4 @@ class QuantRelevance : public QuantifiersUtil } /* CVC4::theory namespace */ } /* CVC4 namespace */ -#endif /* __CVC4__THEORY__QUANT_RELEVANCE_H */ +#endif /* CVC4__THEORY__QUANT_RELEVANCE_H */ diff --git a/src/theory/quantifiers/quant_split.h b/src/theory/quantifiers/quant_split.h index ec40bc52f..1a2aaa6cf 100644 --- a/src/theory/quantifiers/quant_split.h +++ b/src/theory/quantifiers/quant_split.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__QUANT_SPLIT_H -#define __CVC4__THEORY__QUANT_SPLIT_H +#ifndef CVC4__THEORY__QUANT_SPLIT_H +#define CVC4__THEORY__QUANT_SPLIT_H #include "theory/quantifiers_engine.h" #include "context/cdo.h" diff --git a/src/theory/quantifiers/quant_util.h b/src/theory/quantifiers/quant_util.h index ba59c18e8..43861d6e9 100644 --- a/src/theory/quantifiers/quant_util.h +++ b/src/theory/quantifiers/quant_util.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__QUANT_UTIL_H -#define __CVC4__THEORY__QUANT_UTIL_H +#ifndef CVC4__THEORY__QUANT_UTIL_H +#define CVC4__THEORY__QUANT_UTIL_H #include #include @@ -237,4 +237,4 @@ public: } } -#endif /* __CVC4__THEORY__QUANT_UTIL_H */ +#endif /* CVC4__THEORY__QUANT_UTIL_H */ diff --git a/src/theory/quantifiers/quantifiers_attributes.h b/src/theory/quantifiers/quantifiers_attributes.h index 46cb5a4ce..329f9d08a 100644 --- a/src/theory/quantifiers/quantifiers_attributes.h +++ b/src/theory/quantifiers/quantifiers_attributes.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__QUANTIFIERS__QUANTIFIERS_ATTRIBUTES_H -#define __CVC4__THEORY__QUANTIFIERS__QUANTIFIERS_ATTRIBUTES_H +#ifndef CVC4__THEORY__QUANTIFIERS__QUANTIFIERS_ATTRIBUTES_H +#define CVC4__THEORY__QUANTIFIERS__QUANTIFIERS_ATTRIBUTES_H #include "expr/attribute.h" #include "expr/node.h" diff --git a/src/theory/quantifiers/quantifiers_rewriter.h b/src/theory/quantifiers/quantifiers_rewriter.h index e44672d66..09f26b65b 100644 --- a/src/theory/quantifiers/quantifiers_rewriter.h +++ b/src/theory/quantifiers/quantifiers_rewriter.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__QUANTIFIERS__QUANTIFIERS_REWRITER_H -#define __CVC4__THEORY__QUANTIFIERS__QUANTIFIERS_REWRITER_H +#ifndef CVC4__THEORY__QUANTIFIERS__QUANTIFIERS_REWRITER_H +#define CVC4__THEORY__QUANTIFIERS__QUANTIFIERS_REWRITER_H #include "theory/rewriter.h" #include "theory/quantifiers_engine.h" @@ -188,6 +188,6 @@ public: }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__QUANTIFIERS__QUANTIFIERS_REWRITER_H */ +#endif /* CVC4__THEORY__QUANTIFIERS__QUANTIFIERS_REWRITER_H */ diff --git a/src/theory/quantifiers/query_generator.h b/src/theory/quantifiers/query_generator.h index b283d818b..749c78c85 100644 --- a/src/theory/quantifiers/query_generator.h +++ b/src/theory/quantifiers/query_generator.h @@ -15,8 +15,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__QUANTIFIERS__QUERY_GENERATOR_H -#define __CVC4__THEORY__QUANTIFIERS__QUERY_GENERATOR_H +#ifndef CVC4__THEORY__QUANTIFIERS__QUERY_GENERATOR_H +#define CVC4__THEORY__QUANTIFIERS__QUERY_GENERATOR_H #include #include @@ -113,4 +113,4 @@ class QueryGenerator : public ExprMiner } // namespace theory } // namespace CVC4 -#endif /* __CVC4__THEORY__QUANTIFIERS___H */ +#endif /* CVC4__THEORY__QUANTIFIERS___H */ diff --git a/src/theory/quantifiers/relevant_domain.h b/src/theory/quantifiers/relevant_domain.h index ff419666f..8f348b471 100644 --- a/src/theory/quantifiers/relevant_domain.h +++ b/src/theory/quantifiers/relevant_domain.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__QUANTIFIERS__RELEVANT_DOMAIN_H -#define __CVC4__THEORY__QUANTIFIERS__RELEVANT_DOMAIN_H +#ifndef CVC4__THEORY__QUANTIFIERS__RELEVANT_DOMAIN_H +#define CVC4__THEORY__QUANTIFIERS__RELEVANT_DOMAIN_H #include "theory/quantifiers/first_order_model.h" #include "theory/quantifiers/quant_util.h" @@ -163,4 +163,4 @@ class RelevantDomain : public QuantifiersUtil }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__QUANTIFIERS__RELEVANT_DOMAIN_H */ +#endif /* CVC4__THEORY__QUANTIFIERS__RELEVANT_DOMAIN_H */ diff --git a/src/theory/quantifiers/rewrite_engine.h b/src/theory/quantifiers/rewrite_engine.h index 88a9882ca..bbd6a1534 100644 --- a/src/theory/quantifiers/rewrite_engine.h +++ b/src/theory/quantifiers/rewrite_engine.h @@ -15,8 +15,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__REWRITE_ENGINE_H -#define __CVC4__REWRITE_ENGINE_H +#ifndef CVC4__REWRITE_ENGINE_H +#define CVC4__REWRITE_ENGINE_H #include "context/context.h" #include "context/context_mm.h" diff --git a/src/theory/quantifiers/single_inv_partition.h b/src/theory/quantifiers/single_inv_partition.h index 1a01f3b8b..0a4af3185 100644 --- a/src/theory/quantifiers/single_inv_partition.h +++ b/src/theory/quantifiers/single_inv_partition.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__QUANTIFIERS__SINGLE_INV_PARTITION_H -#define __CVC4__THEORY__QUANTIFIERS__SINGLE_INV_PARTITION_H +#ifndef CVC4__THEORY__QUANTIFIERS__SINGLE_INV_PARTITION_H +#define CVC4__THEORY__QUANTIFIERS__SINGLE_INV_PARTITION_H #include #include @@ -294,4 +294,4 @@ class SingleInvocationPartition } /* namespace CVC4::theory */ } /* namespace CVC4 */ -#endif /* __CVC4__THEORY__QUANTIFIERS__SINGLE_INV_PARTITION_H */ +#endif /* CVC4__THEORY__QUANTIFIERS__SINGLE_INV_PARTITION_H */ diff --git a/src/theory/quantifiers/skolemize.h b/src/theory/quantifiers/skolemize.h index 3db3aa838..f07bbdfd3 100644 --- a/src/theory/quantifiers/skolemize.h +++ b/src/theory/quantifiers/skolemize.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__QUANTIFIERS__SKOLEMIZE_H -#define __CVC4__THEORY__QUANTIFIERS__SKOLEMIZE_H +#ifndef CVC4__THEORY__QUANTIFIERS__SKOLEMIZE_H +#define CVC4__THEORY__QUANTIFIERS__SKOLEMIZE_H #include #include @@ -143,4 +143,4 @@ class Skolemize } /* CVC4::theory namespace */ } /* CVC4 namespace */ -#endif /* __CVC4__THEORY__QUANTIFIERS__SKOLEMIZE_H */ +#endif /* CVC4__THEORY__QUANTIFIERS__SKOLEMIZE_H */ diff --git a/src/theory/quantifiers/solution_filter.h b/src/theory/quantifiers/solution_filter.h index 80af05eb8..bd4c62a09 100644 --- a/src/theory/quantifiers/solution_filter.h +++ b/src/theory/quantifiers/solution_filter.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__QUANTIFIERS__SOLUTION_FILTER_H -#define __CVC4__THEORY__QUANTIFIERS__SOLUTION_FILTER_H +#ifndef CVC4__THEORY__QUANTIFIERS__SOLUTION_FILTER_H +#define CVC4__THEORY__QUANTIFIERS__SOLUTION_FILTER_H #include #include @@ -72,4 +72,4 @@ class SolutionFilterStrength : public ExprMiner } // namespace theory } // namespace CVC4 -#endif /* __CVC4__THEORY__QUANTIFIERS__SOLUTION_FILTER_H */ +#endif /* CVC4__THEORY__QUANTIFIERS__SOLUTION_FILTER_H */ diff --git a/src/theory/quantifiers/sygus/ce_guided_single_inv.h b/src/theory/quantifiers/sygus/ce_guided_single_inv.h index 93b972fbc..4b24cbb1c 100644 --- a/src/theory/quantifiers/sygus/ce_guided_single_inv.h +++ b/src/theory/quantifiers/sygus/ce_guided_single_inv.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__QUANTIFIERS__CE_GUIDED_SINGLE_INV_H -#define __CVC4__THEORY__QUANTIFIERS__CE_GUIDED_SINGLE_INV_H +#ifndef CVC4__THEORY__QUANTIFIERS__CE_GUIDED_SINGLE_INV_H +#define CVC4__THEORY__QUANTIFIERS__CE_GUIDED_SINGLE_INV_H #include "context/cdlist.h" #include "theory/quantifiers/sygus/ce_guided_single_inv_sol.h" diff --git a/src/theory/quantifiers/sygus/ce_guided_single_inv_sol.h b/src/theory/quantifiers/sygus/ce_guided_single_inv_sol.h index bdafe7bef..40117af6c 100644 --- a/src/theory/quantifiers/sygus/ce_guided_single_inv_sol.h +++ b/src/theory/quantifiers/sygus/ce_guided_single_inv_sol.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__QUANTIFIERS__CE_GUIDED_SINGLE_INV_SOL_H -#define __CVC4__THEORY__QUANTIFIERS__CE_GUIDED_SINGLE_INV_SOL_H +#ifndef CVC4__THEORY__QUANTIFIERS__CE_GUIDED_SINGLE_INV_SOL_H +#define CVC4__THEORY__QUANTIFIERS__CE_GUIDED_SINGLE_INV_SOL_H #include "context/cdhashmap.h" #include "theory/quantifiers_engine.h" diff --git a/src/theory/quantifiers/sygus/cegis.h b/src/theory/quantifiers/sygus/cegis.h index f706e3d97..a295f6a40 100644 --- a/src/theory/quantifiers/sygus/cegis.h +++ b/src/theory/quantifiers/sygus/cegis.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__QUANTIFIERS__CEGIS_H -#define __CVC4__THEORY__QUANTIFIERS__CEGIS_H +#ifndef CVC4__THEORY__QUANTIFIERS__CEGIS_H +#define CVC4__THEORY__QUANTIFIERS__CEGIS_H #include #include "theory/quantifiers/sygus/sygus_module.h" @@ -209,4 +209,4 @@ class Cegis : public SygusModule } /* CVC4::theory namespace */ } /* CVC4 namespace */ -#endif /* __CVC4__THEORY__QUANTIFIERS__CEGIS_H */ +#endif /* CVC4__THEORY__QUANTIFIERS__CEGIS_H */ diff --git a/src/theory/quantifiers/sygus/cegis_unif.h b/src/theory/quantifiers/sygus/cegis_unif.h index 4255966c6..a2e7be1c1 100644 --- a/src/theory/quantifiers/sygus/cegis_unif.h +++ b/src/theory/quantifiers/sygus/cegis_unif.h @@ -13,8 +13,8 @@ **/ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__QUANTIFIERS__SYGUS__CEGIS_UNIF_H -#define __CVC4__THEORY__QUANTIFIERS__SYGUS__CEGIS_UNIF_H +#ifndef CVC4__THEORY__QUANTIFIERS__SYGUS__CEGIS_UNIF_H +#define CVC4__THEORY__QUANTIFIERS__SYGUS__CEGIS_UNIF_H #include #include diff --git a/src/theory/quantifiers/sygus/enum_stream_substitution.h b/src/theory/quantifiers/sygus/enum_stream_substitution.h index 4d4c85703..687641e60 100644 --- a/src/theory/quantifiers/sygus/enum_stream_substitution.h +++ b/src/theory/quantifiers/sygus/enum_stream_substitution.h @@ -14,8 +14,8 @@ **/ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__QUANTIFIERS__SYGUS__ENUM_STREAM_SUBSTITUTION_H -#define __CVC4__THEORY__QUANTIFIERS__SYGUS__ENUM_STREAM_SUBSTITUTION_H +#ifndef CVC4__THEORY__QUANTIFIERS__SYGUS__ENUM_STREAM_SUBSTITUTION_H +#define CVC4__THEORY__QUANTIFIERS__SYGUS__ENUM_STREAM_SUBSTITUTION_H #include "expr/node.h" #include "theory/quantifiers/sygus/synth_conjecture.h" diff --git a/src/theory/quantifiers/sygus/sygus_enumerator.h b/src/theory/quantifiers/sygus/sygus_enumerator.h index 5bfe60f49..d4c466b03 100644 --- a/src/theory/quantifiers/sygus/sygus_enumerator.h +++ b/src/theory/quantifiers/sygus/sygus_enumerator.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__QUANTIFIERS__SYGUS_ENUMERATOR_H -#define __CVC4__THEORY__QUANTIFIERS__SYGUS_ENUMERATOR_H +#ifndef CVC4__THEORY__QUANTIFIERS__SYGUS_ENUMERATOR_H +#define CVC4__THEORY__QUANTIFIERS__SYGUS_ENUMERATOR_H #include #include @@ -454,4 +454,4 @@ class SygusEnumerator : public EnumValGenerator } // namespace theory } // namespace CVC4 -#endif /* __CVC4__THEORY__QUANTIFIERS__SYGUS_ENUMERATOR_H */ +#endif /* CVC4__THEORY__QUANTIFIERS__SYGUS_ENUMERATOR_H */ diff --git a/src/theory/quantifiers/sygus/sygus_eval_unfold.h b/src/theory/quantifiers/sygus/sygus_eval_unfold.h index ad1e3331d..adc54c6a7 100644 --- a/src/theory/quantifiers/sygus/sygus_eval_unfold.h +++ b/src/theory/quantifiers/sygus/sygus_eval_unfold.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__QUANTIFIERS__SYGUS_EVAL_UNFOLD_H -#define __CVC4__THEORY__QUANTIFIERS__SYGUS_EVAL_UNFOLD_H +#ifndef CVC4__THEORY__QUANTIFIERS__SYGUS_EVAL_UNFOLD_H +#define CVC4__THEORY__QUANTIFIERS__SYGUS_EVAL_UNFOLD_H #include #include "expr/node.h" @@ -113,4 +113,4 @@ class SygusEvalUnfold } // namespace theory } // namespace CVC4 -#endif /* __CVC4__THEORY__QUANTIFIERS__SYGUS_EVAL_UNFOLD_H */ +#endif /* CVC4__THEORY__QUANTIFIERS__SYGUS_EVAL_UNFOLD_H */ diff --git a/src/theory/quantifiers/sygus/sygus_explain.h b/src/theory/quantifiers/sygus/sygus_explain.h index 522d6ee8a..ec29ab2a1 100644 --- a/src/theory/quantifiers/sygus/sygus_explain.h +++ b/src/theory/quantifiers/sygus/sygus_explain.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__QUANTIFIERS__SYGUS_EXPLAIN_H -#define __CVC4__THEORY__QUANTIFIERS__SYGUS_EXPLAIN_H +#ifndef CVC4__THEORY__QUANTIFIERS__SYGUS_EXPLAIN_H +#define CVC4__THEORY__QUANTIFIERS__SYGUS_EXPLAIN_H #include @@ -241,4 +241,4 @@ class SygusExplain } /* CVC4::theory namespace */ } /* CVC4 namespace */ -#endif /* __CVC4__THEORY__QUANTIFIERS__SYGUS_EXPLAIN_H */ +#endif /* CVC4__THEORY__QUANTIFIERS__SYGUS_EXPLAIN_H */ diff --git a/src/theory/quantifiers/sygus/sygus_grammar_cons.h b/src/theory/quantifiers/sygus/sygus_grammar_cons.h index e39943866..7dfa9b478 100644 --- a/src/theory/quantifiers/sygus/sygus_grammar_cons.h +++ b/src/theory/quantifiers/sygus/sygus_grammar_cons.h @@ -15,8 +15,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__QUANTIFIERS__SYGUS_GRAMMAR_CONS_H -#define __CVC4__THEORY__QUANTIFIERS__SYGUS_GRAMMAR_CONS_H +#ifndef CVC4__THEORY__QUANTIFIERS__SYGUS_GRAMMAR_CONS_H +#define CVC4__THEORY__QUANTIFIERS__SYGUS_GRAMMAR_CONS_H #include "theory/quantifiers_engine.h" diff --git a/src/theory/quantifiers/sygus/sygus_grammar_norm.h b/src/theory/quantifiers/sygus/sygus_grammar_norm.h index e186fb02c..ae701113c 100644 --- a/src/theory/quantifiers/sygus/sygus_grammar_norm.h +++ b/src/theory/quantifiers/sygus/sygus_grammar_norm.h @@ -14,8 +14,8 @@ **/ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__QUANTIFIERS__SYGUS_GRAMMAR_NORM_H -#define __CVC4__THEORY__QUANTIFIERS__SYGUS_GRAMMAR_NORM_H +#ifndef CVC4__THEORY__QUANTIFIERS__SYGUS_GRAMMAR_NORM_H +#define CVC4__THEORY__QUANTIFIERS__SYGUS_GRAMMAR_NORM_H #include #include diff --git a/src/theory/quantifiers/sygus/sygus_grammar_red.h b/src/theory/quantifiers/sygus/sygus_grammar_red.h index eb43b5c3c..8ed080a30 100644 --- a/src/theory/quantifiers/sygus/sygus_grammar_red.h +++ b/src/theory/quantifiers/sygus/sygus_grammar_red.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__QUANTIFIERS__SYGUS_GRAMMAR_RED_H -#define __CVC4__THEORY__QUANTIFIERS__SYGUS_GRAMMAR_RED_H +#ifndef CVC4__THEORY__QUANTIFIERS__SYGUS_GRAMMAR_RED_H +#define CVC4__THEORY__QUANTIFIERS__SYGUS_GRAMMAR_RED_H #include #include "theory/quantifiers_engine.h" @@ -116,4 +116,4 @@ class SygusRedundantCons } /* CVC4::theory namespace */ } /* CVC4 namespace */ -#endif /* __CVC4__THEORY__QUANTIFIERS__SYGUS_GRAMMAR_RED_H */ +#endif /* CVC4__THEORY__QUANTIFIERS__SYGUS_GRAMMAR_RED_H */ diff --git a/src/theory/quantifiers/sygus/sygus_invariance.h b/src/theory/quantifiers/sygus/sygus_invariance.h index a5b32cb0d..feb2d3313 100644 --- a/src/theory/quantifiers/sygus/sygus_invariance.h +++ b/src/theory/quantifiers/sygus/sygus_invariance.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__QUANTIFIERS__SYGUS_INVARIANCE_H -#define __CVC4__THEORY__QUANTIFIERS__SYGUS_INVARIANCE_H +#ifndef CVC4__THEORY__QUANTIFIERS__SYGUS_INVARIANCE_H +#define CVC4__THEORY__QUANTIFIERS__SYGUS_INVARIANCE_H #include #include @@ -300,4 +300,4 @@ class NegContainsSygusInvarianceTest : public SygusInvarianceTest } /* CVC4::theory namespace */ } /* CVC4 namespace */ -#endif /* __CVC4__THEORY__QUANTIFIERS__SYGUS_INVARIANCE_H */ +#endif /* CVC4__THEORY__QUANTIFIERS__SYGUS_INVARIANCE_H */ diff --git a/src/theory/quantifiers/sygus/sygus_module.h b/src/theory/quantifiers/sygus/sygus_module.h index 07bce1791..d5e1de3fc 100644 --- a/src/theory/quantifiers/sygus/sygus_module.h +++ b/src/theory/quantifiers/sygus/sygus_module.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__QUANTIFIERS__SYGUS_MODULE_H -#define __CVC4__THEORY__QUANTIFIERS__SYGUS_MODULE_H +#ifndef CVC4__THEORY__QUANTIFIERS__SYGUS_MODULE_H +#define CVC4__THEORY__QUANTIFIERS__SYGUS_MODULE_H #include #include "expr/node.h" @@ -148,4 +148,4 @@ class SygusModule } /* CVC4::theory namespace */ } /* CVC4 namespace */ -#endif /* __CVC4__THEORY__QUANTIFIERS__SYGUS_MODULE_H */ +#endif /* CVC4__THEORY__QUANTIFIERS__SYGUS_MODULE_H */ diff --git a/src/theory/quantifiers/sygus/sygus_pbe.h b/src/theory/quantifiers/sygus/sygus_pbe.h index 3738c40b7..e82ce01da 100644 --- a/src/theory/quantifiers/sygus/sygus_pbe.h +++ b/src/theory/quantifiers/sygus/sygus_pbe.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__QUANTIFIERS__SYGUS_PBE_H -#define __CVC4__THEORY__QUANTIFIERS__SYGUS_PBE_H +#ifndef CVC4__THEORY__QUANTIFIERS__SYGUS_PBE_H +#define CVC4__THEORY__QUANTIFIERS__SYGUS_PBE_H #include "context/cdhashmap.h" #include "theory/quantifiers/sygus/sygus_module.h" diff --git a/src/theory/quantifiers/sygus/sygus_process_conj.h b/src/theory/quantifiers/sygus/sygus_process_conj.h index 86e066b6b..e9ee340f4 100644 --- a/src/theory/quantifiers/sygus/sygus_process_conj.h +++ b/src/theory/quantifiers/sygus/sygus_process_conj.h @@ -15,8 +15,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__QUANTIFIERS__SYGUS_PROCESS_CONJ_H -#define __CVC4__THEORY__QUANTIFIERS__SYGUS_PROCESS_CONJ_H +#ifndef CVC4__THEORY__QUANTIFIERS__SYGUS_PROCESS_CONJ_H +#define CVC4__THEORY__QUANTIFIERS__SYGUS_PROCESS_CONJ_H #include #include diff --git a/src/theory/quantifiers/sygus/sygus_repair_const.h b/src/theory/quantifiers/sygus/sygus_repair_const.h index ee23d9732..bc3a58f9e 100644 --- a/src/theory/quantifiers/sygus/sygus_repair_const.h +++ b/src/theory/quantifiers/sygus/sygus_repair_const.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__QUANTIFIERS__SYGUS_REPAIR_CONST_H -#define __CVC4__THEORY__QUANTIFIERS__SYGUS_REPAIR_CONST_H +#ifndef CVC4__THEORY__QUANTIFIERS__SYGUS_REPAIR_CONST_H +#define CVC4__THEORY__QUANTIFIERS__SYGUS_REPAIR_CONST_H #include #include "expr/node.h" @@ -215,4 +215,4 @@ class SygusRepairConst } /* CVC4::theory namespace */ } /* CVC4 namespace */ -#endif /* __CVC4__THEORY__QUANTIFIERS__SYGUS_REPAIR_CONST_H */ +#endif /* CVC4__THEORY__QUANTIFIERS__SYGUS_REPAIR_CONST_H */ diff --git a/src/theory/quantifiers/sygus/sygus_unif.h b/src/theory/quantifiers/sygus/sygus_unif.h index f7a218ec0..a5215628c 100644 --- a/src/theory/quantifiers/sygus/sygus_unif.h +++ b/src/theory/quantifiers/sygus/sygus_unif.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__QUANTIFIERS__SYGUS_UNIF_H -#define __CVC4__THEORY__QUANTIFIERS__SYGUS_UNIF_H +#ifndef CVC4__THEORY__QUANTIFIERS__SYGUS_UNIF_H +#define CVC4__THEORY__QUANTIFIERS__SYGUS_UNIF_H #include #include "expr/node.h" @@ -196,4 +196,4 @@ class SygusUnif } /* CVC4::theory namespace */ } /* CVC4 namespace */ -#endif /* __CVC4__THEORY__QUANTIFIERS__SYGUS_UNIF_H */ +#endif /* CVC4__THEORY__QUANTIFIERS__SYGUS_UNIF_H */ diff --git a/src/theory/quantifiers/sygus/sygus_unif_io.h b/src/theory/quantifiers/sygus/sygus_unif_io.h index fced29871..7e9c5abd2 100644 --- a/src/theory/quantifiers/sygus/sygus_unif_io.h +++ b/src/theory/quantifiers/sygus/sygus_unif_io.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__QUANTIFIERS__SYGUS_UNIF_IO_H -#define __CVC4__THEORY__QUANTIFIERS__SYGUS_UNIF_IO_H +#ifndef CVC4__THEORY__QUANTIFIERS__SYGUS_UNIF_IO_H +#define CVC4__THEORY__QUANTIFIERS__SYGUS_UNIF_IO_H #include #include "theory/quantifiers/sygus/sygus_unif.h" @@ -489,4 +489,4 @@ class SygusUnifIo : public SygusUnif } /* CVC4::theory namespace */ } /* CVC4 namespace */ -#endif /* __CVC4__THEORY__QUANTIFIERS__SYGUS_UNIF_IO_H */ +#endif /* CVC4__THEORY__QUANTIFIERS__SYGUS_UNIF_IO_H */ diff --git a/src/theory/quantifiers/sygus/sygus_unif_rl.h b/src/theory/quantifiers/sygus/sygus_unif_rl.h index 0f0b2c533..ada99dbaf 100644 --- a/src/theory/quantifiers/sygus/sygus_unif_rl.h +++ b/src/theory/quantifiers/sygus/sygus_unif_rl.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__QUANTIFIERS__SYGUS_UNIF_RL_H -#define __CVC4__THEORY__QUANTIFIERS__SYGUS_UNIF_RL_H +#ifndef CVC4__THEORY__QUANTIFIERS__SYGUS_UNIF_RL_H +#define CVC4__THEORY__QUANTIFIERS__SYGUS_UNIF_RL_H #include #include "options/main_options.h" @@ -434,4 +434,4 @@ class SygusUnifRl : public SygusUnif } // namespace theory } // namespace CVC4 -#endif /* __CVC4__THEORY__QUANTIFIERS__SYGUS_UNIF_RL_H */ +#endif /* CVC4__THEORY__QUANTIFIERS__SYGUS_UNIF_RL_H */ diff --git a/src/theory/quantifiers/sygus/sygus_unif_strat.h b/src/theory/quantifiers/sygus/sygus_unif_strat.h index 54933a2af..1c691bd84 100644 --- a/src/theory/quantifiers/sygus/sygus_unif_strat.h +++ b/src/theory/quantifiers/sygus/sygus_unif_strat.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__QUANTIFIERS__SYGUS_UNIF_STRAT_H -#define __CVC4__THEORY__QUANTIFIERS__SYGUS_UNIF_STRAT_H +#ifndef CVC4__THEORY__QUANTIFIERS__SYGUS_UNIF_STRAT_H +#define CVC4__THEORY__QUANTIFIERS__SYGUS_UNIF_STRAT_H #include #include "expr/node.h" @@ -429,4 +429,4 @@ class SygusUnifStrategy } /* CVC4::theory namespace */ } /* CVC4 namespace */ -#endif /* __CVC4__THEORY__QUANTIFIERS__SYGUS_UNIF_H */ +#endif /* CVC4__THEORY__QUANTIFIERS__SYGUS_UNIF_H */ diff --git a/src/theory/quantifiers/sygus/synth_conjecture.h b/src/theory/quantifiers/sygus/synth_conjecture.h index 923d1d57c..83a7eaa45 100644 --- a/src/theory/quantifiers/sygus/synth_conjecture.h +++ b/src/theory/quantifiers/sygus/synth_conjecture.h @@ -15,8 +15,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__QUANTIFIERS__SYNTH_CONJECTURE_H -#define __CVC4__THEORY__QUANTIFIERS__SYNTH_CONJECTURE_H +#ifndef CVC4__THEORY__QUANTIFIERS__SYNTH_CONJECTURE_H +#define CVC4__THEORY__QUANTIFIERS__SYNTH_CONJECTURE_H #include diff --git a/src/theory/quantifiers/sygus/synth_engine.h b/src/theory/quantifiers/sygus/synth_engine.h index 2dbd20827..d5337e5d1 100644 --- a/src/theory/quantifiers/sygus/synth_engine.h +++ b/src/theory/quantifiers/sygus/synth_engine.h @@ -15,8 +15,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__QUANTIFIERS__SYNTH_ENGINE_H -#define __CVC4__THEORY__QUANTIFIERS__SYNTH_ENGINE_H +#ifndef CVC4__THEORY__QUANTIFIERS__SYNTH_ENGINE_H +#define CVC4__THEORY__QUANTIFIERS__SYNTH_ENGINE_H #include "context/cdhashmap.h" #include "theory/quantifiers/sygus/synth_conjecture.h" diff --git a/src/theory/quantifiers/sygus/term_database_sygus.h b/src/theory/quantifiers/sygus/term_database_sygus.h index cdeaf1803..0f3d650d3 100644 --- a/src/theory/quantifiers/sygus/term_database_sygus.h +++ b/src/theory/quantifiers/sygus/term_database_sygus.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__QUANTIFIERS__TERM_DATABASE_SYGUS_H -#define __CVC4__THEORY__QUANTIFIERS__TERM_DATABASE_SYGUS_H +#ifndef CVC4__THEORY__QUANTIFIERS__TERM_DATABASE_SYGUS_H +#define CVC4__THEORY__QUANTIFIERS__TERM_DATABASE_SYGUS_H #include @@ -599,4 +599,4 @@ class TermDbSygus { }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__QUANTIFIERS__TERM_DATABASE_H */ +#endif /* CVC4__THEORY__QUANTIFIERS__TERM_DATABASE_H */ diff --git a/src/theory/quantifiers/sygus_sampler.h b/src/theory/quantifiers/sygus_sampler.h index 3a2c42b9d..429b6f511 100644 --- a/src/theory/quantifiers/sygus_sampler.h +++ b/src/theory/quantifiers/sygus_sampler.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__QUANTIFIERS__SYGUS_SAMPLER_H -#define __CVC4__THEORY__QUANTIFIERS__SYGUS_SAMPLER_H +#ifndef CVC4__THEORY__QUANTIFIERS__SYGUS_SAMPLER_H +#define CVC4__THEORY__QUANTIFIERS__SYGUS_SAMPLER_H #include #include "theory/evaluator.h" @@ -322,4 +322,4 @@ class SygusSampler : public LazyTrieEvaluator } /* CVC4::theory namespace */ } /* CVC4 namespace */ -#endif /* __CVC4__THEORY__QUANTIFIERS__SYGUS_SAMPLER_H */ +#endif /* CVC4__THEORY__QUANTIFIERS__SYGUS_SAMPLER_H */ diff --git a/src/theory/quantifiers/term_canonize.h b/src/theory/quantifiers/term_canonize.h index b433992c8..8f7b8722e 100644 --- a/src/theory/quantifiers/term_canonize.h +++ b/src/theory/quantifiers/term_canonize.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__QUANTIFIERS__TERM_CANONIZE_H -#define __CVC4__THEORY__QUANTIFIERS__TERM_CANONIZE_H +#ifndef CVC4__THEORY__QUANTIFIERS__TERM_CANONIZE_H +#define CVC4__THEORY__QUANTIFIERS__TERM_CANONIZE_H #include #include "expr/node.h" @@ -89,4 +89,4 @@ class TermCanonize } // namespace theory } // namespace CVC4 -#endif /* __CVC4__THEORY__QUANTIFIERS__TERM_CANONIZE_H */ +#endif /* CVC4__THEORY__QUANTIFIERS__TERM_CANONIZE_H */ diff --git a/src/theory/quantifiers/term_database.h b/src/theory/quantifiers/term_database.h index fcbd65729..148a18958 100644 --- a/src/theory/quantifiers/term_database.h +++ b/src/theory/quantifiers/term_database.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__QUANTIFIERS__TERM_DATABASE_H -#define __CVC4__THEORY__QUANTIFIERS__TERM_DATABASE_H +#ifndef CVC4__THEORY__QUANTIFIERS__TERM_DATABASE_H +#define CVC4__THEORY__QUANTIFIERS__TERM_DATABASE_H #include #include @@ -409,4 +409,4 @@ class TermDb : public QuantifiersUtil { }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__QUANTIFIERS__TERM_DATABASE_H */ +#endif /* CVC4__THEORY__QUANTIFIERS__TERM_DATABASE_H */ diff --git a/src/theory/quantifiers/term_enumeration.h b/src/theory/quantifiers/term_enumeration.h index ed6529ef1..279680b1f 100644 --- a/src/theory/quantifiers/term_enumeration.h +++ b/src/theory/quantifiers/term_enumeration.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__QUANTIFIERS__TERM_ENUMERATION_H -#define __CVC4__THEORY__QUANTIFIERS__TERM_ENUMERATION_H +#ifndef CVC4__THEORY__QUANTIFIERS__TERM_ENUMERATION_H +#define CVC4__THEORY__QUANTIFIERS__TERM_ENUMERATION_H #include #include @@ -82,4 +82,4 @@ class TermEnumeration } /* CVC4::theory namespace */ } /* CVC4 namespace */ -#endif /* __CVC4__THEORY__QUANTIFIERS__TERM_ENUMERATION_H */ +#endif /* CVC4__THEORY__QUANTIFIERS__TERM_ENUMERATION_H */ diff --git a/src/theory/quantifiers/term_util.h b/src/theory/quantifiers/term_util.h index 061da81df..1f2eea1c5 100644 --- a/src/theory/quantifiers/term_util.h +++ b/src/theory/quantifiers/term_util.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__QUANTIFIERS__TERM_UTIL_H -#define __CVC4__THEORY__QUANTIFIERS__TERM_UTIL_H +#ifndef CVC4__THEORY__QUANTIFIERS__TERM_UTIL_H +#define CVC4__THEORY__QUANTIFIERS__TERM_UTIL_H #include #include @@ -379,4 +379,4 @@ public: }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__QUANTIFIERS__TERM_UTIL_H */ +#endif /* CVC4__THEORY__QUANTIFIERS__TERM_UTIL_H */ diff --git a/src/theory/quantifiers/theory_quantifiers.h b/src/theory/quantifiers/theory_quantifiers.h index f6e19f700..b5b07f2e6 100644 --- a/src/theory/quantifiers/theory_quantifiers.h +++ b/src/theory/quantifiers/theory_quantifiers.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__QUANTIFIERS__THEORY_QUANTIFIERS_H -#define __CVC4__THEORY__QUANTIFIERS__THEORY_QUANTIFIERS_H +#ifndef CVC4__THEORY__QUANTIFIERS__THEORY_QUANTIFIERS_H +#define CVC4__THEORY__QUANTIFIERS__THEORY_QUANTIFIERS_H #include "context/cdhashmap.h" #include "context/context.h" @@ -62,4 +62,4 @@ class TheoryQuantifiers : public Theory { }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__QUANTIFIERS__THEORY_QUANTIFIERS_H */ +#endif /* CVC4__THEORY__QUANTIFIERS__THEORY_QUANTIFIERS_H */ diff --git a/src/theory/quantifiers/theory_quantifiers_type_rules.h b/src/theory/quantifiers/theory_quantifiers_type_rules.h index 18aa7f6ee..ad1c4c69b 100644 --- a/src/theory/quantifiers/theory_quantifiers_type_rules.h +++ b/src/theory/quantifiers/theory_quantifiers_type_rules.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__QUANTIFIERS__THEORY_QUANTIFIERS_TYPE_RULES_H -#define __CVC4__THEORY__QUANTIFIERS__THEORY_QUANTIFIERS_TYPE_RULES_H +#ifndef CVC4__THEORY__QUANTIFIERS__THEORY_QUANTIFIERS_TYPE_RULES_H +#define CVC4__THEORY__QUANTIFIERS__THEORY_QUANTIFIERS_TYPE_RULES_H #include "expr/matcher.h" @@ -229,4 +229,4 @@ public: }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__QUANTIFIERS__THEORY_QUANTIFIERS_TYPE_RULES_H */ +#endif /* CVC4__THEORY__QUANTIFIERS__THEORY_QUANTIFIERS_TYPE_RULES_H */ diff --git a/src/theory/quantifiers_engine.h b/src/theory/quantifiers_engine.h index 37d2deb40..61e9053f5 100644 --- a/src/theory/quantifiers_engine.h +++ b/src/theory/quantifiers_engine.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__QUANTIFIERS_ENGINE_H -#define __CVC4__THEORY__QUANTIFIERS_ENGINE_H +#ifndef CVC4__THEORY__QUANTIFIERS_ENGINE_H +#define CVC4__THEORY__QUANTIFIERS_ENGINE_H #include #include @@ -431,4 +431,4 @@ public: }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__QUANTIFIERS_ENGINE_H */ +#endif /* CVC4__THEORY__QUANTIFIERS_ENGINE_H */ diff --git a/src/theory/rep_set.h b/src/theory/rep_set.h index 6e990051a..d972a7a84 100644 --- a/src/theory/rep_set.h +++ b/src/theory/rep_set.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__REP_SET_H -#define __CVC4__THEORY__REP_SET_H +#ifndef CVC4__THEORY__REP_SET_H +#define CVC4__THEORY__REP_SET_H #include #include @@ -313,4 +313,4 @@ class RepBoundExt }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__REP_SET_H */ +#endif /* CVC4__THEORY__REP_SET_H */ diff --git a/src/theory/sep/theory_sep.h b/src/theory/sep/theory_sep.h index 8d5d3442a..ae044f6d7 100644 --- a/src/theory/sep/theory_sep.h +++ b/src/theory/sep/theory_sep.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__SEP__THEORY_SEP_H -#define __CVC4__THEORY__SEP__THEORY_SEP_H +#ifndef CVC4__THEORY__SEP__THEORY_SEP_H +#define CVC4__THEORY__SEP__THEORY_SEP_H #include "context/cdhashmap.h" #include "context/cdhashset.h" @@ -331,4 +331,4 @@ class TheorySep : public Theory { }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__SEP__THEORY_SEP_H */ +#endif /* CVC4__THEORY__SEP__THEORY_SEP_H */ diff --git a/src/theory/sep/theory_sep_rewriter.h b/src/theory/sep/theory_sep_rewriter.h index 6112632d8..f4639efa3 100644 --- a/src/theory/sep/theory_sep_rewriter.h +++ b/src/theory/sep/theory_sep_rewriter.h @@ -17,8 +17,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__SEP__THEORY_SEP_REWRITER_H -#define __CVC4__THEORY__SEP__THEORY_SEP_REWRITER_H +#ifndef CVC4__THEORY__SEP__THEORY_SEP_REWRITER_H +#define CVC4__THEORY__SEP__THEORY_SEP_REWRITER_H #include "theory/rewriter.h" #include "theory/type_enumerator.h" @@ -49,4 +49,4 @@ public: }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__SEP__THEORY_SEP_REWRITER_H */ +#endif /* CVC4__THEORY__SEP__THEORY_SEP_REWRITER_H */ diff --git a/src/theory/sep/theory_sep_type_rules.h b/src/theory/sep/theory_sep_type_rules.h index 52a72e5dc..29adeda5a 100644 --- a/src/theory/sep/theory_sep_type_rules.h +++ b/src/theory/sep/theory_sep_type_rules.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__SEP__THEORY_SEP_TYPE_RULES_H -#define __CVC4__THEORY__SEP__THEORY_SEP_TYPE_RULES_H +#ifndef CVC4__THEORY__SEP__THEORY_SEP_TYPE_RULES_H +#define CVC4__THEORY__SEP__THEORY_SEP_TYPE_RULES_H namespace CVC4 { namespace theory { @@ -112,4 +112,4 @@ struct SepNilTypeRule { }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__SEP__THEORY_SEP_TYPE_RULES_H */ +#endif /* CVC4__THEORY__SEP__THEORY_SEP_TYPE_RULES_H */ diff --git a/src/theory/sets/normal_form.h b/src/theory/sets/normal_form.h index 9c5e4e9c8..d7c68a574 100644 --- a/src/theory/sets/normal_form.h +++ b/src/theory/sets/normal_form.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__SETS__NORMAL_FORM_H -#define __CVC4__THEORY__SETS__NORMAL_FORM_H +#ifndef CVC4__THEORY__SETS__NORMAL_FORM_H +#define CVC4__THEORY__SETS__NORMAL_FORM_H namespace CVC4 { namespace theory { diff --git a/src/theory/sets/theory_sets.h b/src/theory/sets/theory_sets.h index 3caa4ae16..414ba4b28 100644 --- a/src/theory/sets/theory_sets.h +++ b/src/theory/sets/theory_sets.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__SETS__THEORY_SETS_H -#define __CVC4__THEORY__SETS__THEORY_SETS_H +#ifndef CVC4__THEORY__SETS__THEORY_SETS_H +#define CVC4__THEORY__SETS__THEORY_SETS_H #include @@ -71,4 +71,4 @@ class TheorySets : public Theory }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__SETS__THEORY_SETS_H */ +#endif /* CVC4__THEORY__SETS__THEORY_SETS_H */ diff --git a/src/theory/sets/theory_sets_private.h b/src/theory/sets/theory_sets_private.h index 5cda78271..3014b2f2a 100644 --- a/src/theory/sets/theory_sets_private.h +++ b/src/theory/sets/theory_sets_private.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__SETS__THEORY_SETS_PRIVATE_H -#define __CVC4__THEORY__SETS__THEORY_SETS_PRIVATE_H +#ifndef CVC4__THEORY__SETS__THEORY_SETS_PRIVATE_H +#define CVC4__THEORY__SETS__THEORY_SETS_PRIVATE_H #include "context/cdhashset.h" #include "context/cdqueue.h" @@ -334,4 +334,4 @@ public: }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__SETS__THEORY_SETS_PRIVATE_H */ +#endif /* CVC4__THEORY__SETS__THEORY_SETS_PRIVATE_H */ diff --git a/src/theory/sets/theory_sets_rewriter.h b/src/theory/sets/theory_sets_rewriter.h index af071dc60..463d02d6d 100644 --- a/src/theory/sets/theory_sets_rewriter.h +++ b/src/theory/sets/theory_sets_rewriter.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__SETS__THEORY_SETS_REWRITER_H -#define __CVC4__THEORY__SETS__THEORY_SETS_REWRITER_H +#ifndef CVC4__THEORY__SETS__THEORY_SETS_REWRITER_H +#define CVC4__THEORY__SETS__THEORY_SETS_REWRITER_H #include "theory/rewriter.h" @@ -89,4 +89,4 @@ public: }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__SETS__THEORY_SETS_REWRITER_H */ +#endif /* CVC4__THEORY__SETS__THEORY_SETS_REWRITER_H */ diff --git a/src/theory/sets/theory_sets_type_enumerator.h b/src/theory/sets/theory_sets_type_enumerator.h index cb6532abf..5a6745367 100644 --- a/src/theory/sets/theory_sets_type_enumerator.h +++ b/src/theory/sets/theory_sets_type_enumerator.h @@ -18,8 +18,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__SETS__TYPE_ENUMERATOR_H -#define __CVC4__THEORY__SETS__TYPE_ENUMERATOR_H +#ifndef CVC4__THEORY__SETS__TYPE_ENUMERATOR_H +#define CVC4__THEORY__SETS__TYPE_ENUMERATOR_H #include "theory/type_enumerator.h" #include "expr/type_node.h" @@ -183,4 +183,4 @@ class SetEnumerator : public TypeEnumeratorBase { }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__SETS__TYPE_ENUMERATOR_H */ +#endif /* CVC4__THEORY__SETS__TYPE_ENUMERATOR_H */ diff --git a/src/theory/sets/theory_sets_type_rules.h b/src/theory/sets/theory_sets_type_rules.h index 1ba30f1e6..7e6038423 100644 --- a/src/theory/sets/theory_sets_type_rules.h +++ b/src/theory/sets/theory_sets_type_rules.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__SETS__THEORY_SETS_TYPE_RULES_H -#define __CVC4__THEORY__SETS__THEORY_SETS_TYPE_RULES_H +#ifndef CVC4__THEORY__SETS__THEORY_SETS_TYPE_RULES_H +#define CVC4__THEORY__SETS__THEORY_SETS_TYPE_RULES_H #include "theory/sets/normal_form.h" @@ -428,4 +428,4 @@ struct SetsProperties { }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__SETS__THEORY_SETS_TYPE_RULES_H */ +#endif /* CVC4__THEORY__SETS__THEORY_SETS_TYPE_RULES_H */ diff --git a/src/theory/sort_inference.h b/src/theory/sort_inference.h index 98c85ebe7..5b28f669d 100644 --- a/src/theory/sort_inference.h +++ b/src/theory/sort_inference.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__SORT_INFERENCE_H -#define __CVC4__SORT_INFERENCE_H +#ifndef CVC4__SORT_INFERENCE_H +#define CVC4__SORT_INFERENCE_H #include #include diff --git a/src/theory/strings/normal_form.h b/src/theory/strings/normal_form.h index 73036e68f..3d1326570 100644 --- a/src/theory/strings/normal_form.h +++ b/src/theory/strings/normal_form.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__STRINGS__NORMAL_FORM_H -#define __CVC4__THEORY__STRINGS__NORMAL_FORM_H +#ifndef CVC4__THEORY__STRINGS__NORMAL_FORM_H +#define CVC4__THEORY__STRINGS__NORMAL_FORM_H #include #include @@ -156,4 +156,4 @@ class NormalForm } // namespace theory } // namespace CVC4 -#endif /* __CVC4__THEORY__STRINGS__NORMAL_FORM_H */ +#endif /* CVC4__THEORY__STRINGS__NORMAL_FORM_H */ diff --git a/src/theory/strings/regexp_elim.h b/src/theory/strings/regexp_elim.h index 6d2f28eaa..dbd4102b6 100644 --- a/src/theory/strings/regexp_elim.h +++ b/src/theory/strings/regexp_elim.h @@ -14,8 +14,8 @@ **/ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__STRINGS__REGEXP_ELIM_H -#define __CVC4__THEORY__STRINGS__REGEXP_ELIM_H +#ifndef CVC4__THEORY__STRINGS__REGEXP_ELIM_H +#define CVC4__THEORY__STRINGS__REGEXP_ELIM_H #include "expr/node.h" @@ -63,4 +63,4 @@ class RegExpElimination } // namespace theory } // namespace CVC4 -#endif /* __CVC4__THEORY__STRINGS__REGEXP_ELIM_H */ +#endif /* CVC4__THEORY__STRINGS__REGEXP_ELIM_H */ diff --git a/src/theory/strings/regexp_operation.h b/src/theory/strings/regexp_operation.h index 4a7b7b293..b2e3667fc 100644 --- a/src/theory/strings/regexp_operation.h +++ b/src/theory/strings/regexp_operation.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__STRINGS__REGEXP__OPERATION_H -#define __CVC4__THEORY__STRINGS__REGEXP__OPERATION_H +#ifndef CVC4__THEORY__STRINGS__REGEXP__OPERATION_H +#define CVC4__THEORY__STRINGS__REGEXP__OPERATION_H #include #include @@ -100,4 +100,4 @@ class RegExpOpr { }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__STRINGS__REGEXP__OPERATION_H */ +#endif /* CVC4__THEORY__STRINGS__REGEXP__OPERATION_H */ diff --git a/src/theory/strings/regexp_solver.h b/src/theory/strings/regexp_solver.h index 8b78e6ebc..13b66557a 100644 --- a/src/theory/strings/regexp_solver.h +++ b/src/theory/strings/regexp_solver.h @@ -15,8 +15,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__STRINGS__REGEXP_SOLVER_H -#define __CVC4__THEORY__STRINGS__REGEXP_SOLVER_H +#ifndef CVC4__THEORY__STRINGS__REGEXP_SOLVER_H +#define CVC4__THEORY__STRINGS__REGEXP_SOLVER_H #include #include "context/cdhashset.h" @@ -103,4 +103,4 @@ class RegExpSolver } // namespace theory } // namespace CVC4 -#endif /* __CVC4__THEORY__STRINGS__THEORY_STRINGS_H */ +#endif /* CVC4__THEORY__STRINGS__THEORY_STRINGS_H */ diff --git a/src/theory/strings/skolem_cache.h b/src/theory/strings/skolem_cache.h index fd40e2521..c1e3c7214 100644 --- a/src/theory/strings/skolem_cache.h +++ b/src/theory/strings/skolem_cache.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__STRINGS__SKOLEM_CACHE_H -#define __CVC4__THEORY__STRINGS__SKOLEM_CACHE_H +#ifndef CVC4__THEORY__STRINGS__SKOLEM_CACHE_H +#define CVC4__THEORY__STRINGS__SKOLEM_CACHE_H #include #include @@ -168,4 +168,4 @@ class SkolemCache } // namespace theory } // namespace CVC4 -#endif /* __CVC4__THEORY__STRINGS__SKOLEM_CACHE_H */ +#endif /* CVC4__THEORY__STRINGS__SKOLEM_CACHE_H */ diff --git a/src/theory/strings/theory_strings.h b/src/theory/strings/theory_strings.h index e9d82a7b2..8371a27ea 100644 --- a/src/theory/strings/theory_strings.h +++ b/src/theory/strings/theory_strings.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__STRINGS__THEORY_STRINGS_H -#define __CVC4__THEORY__STRINGS__THEORY_STRINGS_H +#ifndef CVC4__THEORY__STRINGS__THEORY_STRINGS_H +#define CVC4__THEORY__STRINGS__THEORY_STRINGS_H #include "context/cdhashset.h" #include "context/cdlist.h" @@ -1166,4 +1166,4 @@ private: }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__STRINGS__THEORY_STRINGS_H */ +#endif /* CVC4__THEORY__STRINGS__THEORY_STRINGS_H */ diff --git a/src/theory/strings/theory_strings_preprocess.h b/src/theory/strings/theory_strings_preprocess.h index daa109682..b96d619ef 100644 --- a/src/theory/strings/theory_strings_preprocess.h +++ b/src/theory/strings/theory_strings_preprocess.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__STRINGS__PREPROCESS_H -#define __CVC4__THEORY__STRINGS__PREPROCESS_H +#ifndef CVC4__THEORY__STRINGS__PREPROCESS_H +#define CVC4__THEORY__STRINGS__PREPROCESS_H #include #include "context/cdhashmap.h" @@ -86,4 +86,4 @@ private: }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__STRINGS__PREPROCESS_H */ +#endif /* CVC4__THEORY__STRINGS__PREPROCESS_H */ diff --git a/src/theory/strings/theory_strings_rewriter.h b/src/theory/strings/theory_strings_rewriter.h index 61031ea87..e8886d43b 100644 --- a/src/theory/strings/theory_strings_rewriter.h +++ b/src/theory/strings/theory_strings_rewriter.h @@ -15,8 +15,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__STRINGS__THEORY_STRINGS_REWRITER_H -#define __CVC4__THEORY__STRINGS__THEORY_STRINGS_REWRITER_H +#ifndef CVC4__THEORY__STRINGS__THEORY_STRINGS_REWRITER_H +#define CVC4__THEORY__STRINGS__THEORY_STRINGS_REWRITER_H #include #include @@ -751,4 +751,4 @@ class TheoryStringsRewriter { }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__STRINGS__THEORY_STRINGS_REWRITER_H */ +#endif /* CVC4__THEORY__STRINGS__THEORY_STRINGS_REWRITER_H */ diff --git a/src/theory/strings/theory_strings_type_rules.h b/src/theory/strings/theory_strings_type_rules.h index 3ad28ee0f..91de8ac01 100644 --- a/src/theory/strings/theory_strings_type_rules.h +++ b/src/theory/strings/theory_strings_type_rules.h @@ -17,8 +17,8 @@ #include "cvc4_private.h" #include "options/strings_options.h" -#ifndef __CVC4__THEORY__STRINGS__THEORY_STRINGS_TYPE_RULES_H -#define __CVC4__THEORY__STRINGS__THEORY_STRINGS_TYPE_RULES_H +#ifndef CVC4__THEORY__STRINGS__THEORY_STRINGS_TYPE_RULES_H +#define CVC4__THEORY__STRINGS__THEORY_STRINGS_TYPE_RULES_H namespace CVC4 { namespace theory { @@ -490,4 +490,4 @@ public: }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__STRINGS__THEORY_STRINGS_TYPE_RULES_H */ +#endif /* CVC4__THEORY__STRINGS__THEORY_STRINGS_TYPE_RULES_H */ diff --git a/src/theory/strings/type_enumerator.h b/src/theory/strings/type_enumerator.h index 7327042e2..5ca0b624d 100644 --- a/src/theory/strings/type_enumerator.h +++ b/src/theory/strings/type_enumerator.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__STRINGS__TYPE_ENUMERATOR_H -#define __CVC4__THEORY__STRINGS__TYPE_ENUMERATOR_H +#ifndef CVC4__THEORY__STRINGS__TYPE_ENUMERATOR_H +#define CVC4__THEORY__STRINGS__TYPE_ENUMERATOR_H #include @@ -128,4 +128,4 @@ class StringEnumeratorLength { }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__STRINGS__TYPE_ENUMERATOR_H */ +#endif /* CVC4__THEORY__STRINGS__TYPE_ENUMERATOR_H */ diff --git a/src/theory/subs_minimize.h b/src/theory/subs_minimize.h index 3f351de7e..3ffd588f1 100644 --- a/src/theory/subs_minimize.h +++ b/src/theory/subs_minimize.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__SUBS_MINIMIZE_H -#define __CVC4__THEORY__SUBS_MINIMIZE_H +#ifndef CVC4__THEORY__SUBS_MINIMIZE_H +#define CVC4__THEORY__SUBS_MINIMIZE_H #include @@ -97,4 +97,4 @@ class SubstitutionMinimize } // namespace theory } // namespace CVC4 -#endif /* __CVC4__THEORY__SUBS_MINIMIZE_H */ +#endif /* CVC4__THEORY__SUBS_MINIMIZE_H */ diff --git a/src/theory/substitutions.h b/src/theory/substitutions.h index 31e98de3b..c19fb12f6 100644 --- a/src/theory/substitutions.h +++ b/src/theory/substitutions.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__SUBSTITUTIONS_H -#define __CVC4__THEORY__SUBSTITUTIONS_H +#ifndef CVC4__THEORY__SUBSTITUTIONS_H +#define CVC4__THEORY__SUBSTITUTIONS_H //#include #include @@ -199,4 +199,4 @@ std::ostream& operator<<(std::ostream& out, const theory::SubstitutionMap::itera }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__SUBSTITUTIONS_H */ +#endif /* CVC4__THEORY__SUBSTITUTIONS_H */ diff --git a/src/theory/theory.h b/src/theory/theory.h index 02a0c9caf..cabb17f48 100644 --- a/src/theory/theory.h +++ b/src/theory/theory.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__THEORY_H -#define __CVC4__THEORY__THEORY_H +#ifndef CVC4__THEORY__THEORY_H +#define CVC4__THEORY__THEORY_H #include #include @@ -915,4 +915,4 @@ public: }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__THEORY_H */ +#endif /* CVC4__THEORY__THEORY_H */ diff --git a/src/theory/theory_engine.h b/src/theory/theory_engine.h index ca761f97d..701d5cefb 100644 --- a/src/theory/theory_engine.h +++ b/src/theory/theory_engine.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY_ENGINE_H -#define __CVC4__THEORY_ENGINE_H +#ifndef CVC4__THEORY_ENGINE_H +#define CVC4__THEORY_ENGINE_H #include #include @@ -932,4 +932,4 @@ private: }/* CVC4 namespace */ -#endif /* __CVC4__THEORY_ENGINE_H */ +#endif /* CVC4__THEORY_ENGINE_H */ diff --git a/src/theory/theory_model.h b/src/theory/theory_model.h index c2bece0b4..baf3a401c 100644 --- a/src/theory/theory_model.h +++ b/src/theory/theory_model.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__THEORY_MODEL_H -#define __CVC4__THEORY__THEORY_MODEL_H +#ifndef CVC4__THEORY__THEORY_MODEL_H +#define CVC4__THEORY__THEORY_MODEL_H #include #include @@ -351,4 +351,4 @@ public: }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__THEORY_MODEL_H */ +#endif /* CVC4__THEORY__THEORY_MODEL_H */ diff --git a/src/theory/theory_model_builder.h b/src/theory/theory_model_builder.h index 91734fcf8..ce090b14d 100644 --- a/src/theory/theory_model_builder.h +++ b/src/theory/theory_model_builder.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__THEORY_MODEL_BUILDER_H -#define __CVC4__THEORY__THEORY_MODEL_BUILDER_H +#ifndef CVC4__THEORY__THEORY_MODEL_BUILDER_H +#define CVC4__THEORY__THEORY_MODEL_BUILDER_H #include #include @@ -259,4 +259,4 @@ class TheoryEngineModelBuilder : public ModelBuilder } /* CVC4::theory namespace */ } /* CVC4 namespace */ -#endif /* __CVC4__THEORY__THEORY_MODEL_BUILDER_H */ +#endif /* CVC4__THEORY__THEORY_MODEL_BUILDER_H */ diff --git a/src/theory/theory_registrar.h b/src/theory/theory_registrar.h index 2e46fa4d8..822ae086c 100644 --- a/src/theory/theory_registrar.h +++ b/src/theory/theory_registrar.h @@ -20,8 +20,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__THEORY_REGISTRAR_H -#define __CVC4__THEORY__THEORY_REGISTRAR_H +#ifndef CVC4__THEORY__THEORY_REGISTRAR_H +#define CVC4__THEORY__THEORY_REGISTRAR_H #include "prop/registrar.h" #include "theory/theory_engine.h" @@ -44,4 +44,4 @@ public: }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__THEORY_REGISTRAR_H */ +#endif /* CVC4__THEORY__THEORY_REGISTRAR_H */ diff --git a/src/theory/theory_test_utils.h b/src/theory/theory_test_utils.h index 889ea6eb1..ecda12dee 100644 --- a/src/theory/theory_test_utils.h +++ b/src/theory/theory_test_utils.h @@ -16,8 +16,8 @@ #include "cvc4_public.h" -#ifndef __CVC4__THEORY__THEORY_TEST_UTILS_H -#define __CVC4__THEORY__THEORY_TEST_UTILS_H +#ifndef CVC4__THEORY__THEORY_TEST_UTILS_H +#define CVC4__THEORY__THEORY_TEST_UTILS_H #include #include @@ -124,4 +124,4 @@ public: }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__THEORY_TEST_UTILS_H */ +#endif /* CVC4__THEORY__THEORY_TEST_UTILS_H */ diff --git a/src/theory/type_enumerator.h b/src/theory/type_enumerator.h index a68e3ca61..a92cfd2af 100644 --- a/src/theory/type_enumerator.h +++ b/src/theory/type_enumerator.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__TYPE_ENUMERATOR_H -#define __CVC4__THEORY__TYPE_ENUMERATOR_H +#ifndef CVC4__THEORY__TYPE_ENUMERATOR_H +#define CVC4__THEORY__TYPE_ENUMERATOR_H #include "base/exception.h" #include "base/cvc4_assert.h" @@ -185,4 +185,4 @@ class TypeEnumerator { }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__TYPE_ENUMERATOR_H */ +#endif /* CVC4__THEORY__TYPE_ENUMERATOR_H */ diff --git a/src/theory/type_set.h b/src/theory/type_set.h index cada9422d..aed7ad80c 100644 --- a/src/theory/type_set.h +++ b/src/theory/type_set.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__TYPE_SET_H -#define __CVC4__THEORY__TYPE_SET_H +#ifndef CVC4__THEORY__TYPE_SET_H +#define CVC4__THEORY__TYPE_SET_H #include #include @@ -87,4 +87,4 @@ class TypeSet } /* CVC4::theory namespace */ } /* CVC4 namespace */ -#endif /* __CVC4__THEORY__TYPE_SET_H */ +#endif /* CVC4__THEORY__TYPE_SET_H */ diff --git a/src/theory/uf/equality_engine_types.h b/src/theory/uf/equality_engine_types.h index 75216d10e..3813bb697 100644 --- a/src/theory/uf/equality_engine_types.h +++ b/src/theory/uf/equality_engine_types.h @@ -17,8 +17,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__UF__EQUALITY_ENGINE_TYPES_H -#define __CVC4__THEORY__UF__EQUALITY_ENGINE_TYPES_H +#ifndef CVC4__THEORY__UF__EQUALITY_ENGINE_TYPES_H +#define CVC4__THEORY__UF__EQUALITY_ENGINE_TYPES_H #include #include @@ -360,4 +360,4 @@ struct TriggerInfo { } // namespace theory } // namespace CVC4 -#endif /* __CVC4__THEORY__UF__EQUALITY_ENGINE_TYPES_H */ +#endif /* CVC4__THEORY__UF__EQUALITY_ENGINE_TYPES_H */ diff --git a/src/theory/uf/symmetry_breaker.h b/src/theory/uf/symmetry_breaker.h index dd79b571a..d528e948f 100644 --- a/src/theory/uf/symmetry_breaker.h +++ b/src/theory/uf/symmetry_breaker.h @@ -41,8 +41,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__UF__SYMMETRY_BREAKER_H -#define __CVC4__THEORY__UF__SYMMETRY_BREAKER_H +#ifndef CVC4__THEORY__UF__SYMMETRY_BREAKER_H +#define CVC4__THEORY__UF__SYMMETRY_BREAKER_H #include #include @@ -176,4 +176,4 @@ std::ostream& operator<<(std::ostream& out, const ::CVC4::theory::uf::SymmetryBr }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__UF__SYMMETRY_BREAKER_H */ +#endif /* CVC4__THEORY__UF__SYMMETRY_BREAKER_H */ diff --git a/src/theory/uf/theory_uf.h b/src/theory/uf/theory_uf.h index fb873e7dc..72dc04b10 100644 --- a/src/theory/uf/theory_uf.h +++ b/src/theory/uf/theory_uf.h @@ -17,8 +17,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__UF__THEORY_UF_H -#define __CVC4__THEORY__UF__THEORY_UF_H +#ifndef CVC4__THEORY__UF__THEORY_UF_H +#define CVC4__THEORY__UF__THEORY_UF_H #include "context/cdhashset.h" #include "context/cdo.h" @@ -315,4 +315,4 @@ private: }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__UF__THEORY_UF_H */ +#endif /* CVC4__THEORY__UF__THEORY_UF_H */ diff --git a/src/theory/uf/theory_uf_model.h b/src/theory/uf/theory_uf_model.h index f8c947d7a..4454b7e8c 100644 --- a/src/theory/uf/theory_uf_model.h +++ b/src/theory/uf/theory_uf_model.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY_UF_MODEL_H -#define __CVC4__THEORY_UF_MODEL_H +#ifndef CVC4__THEORY_UF_MODEL_H +#define CVC4__THEORY_UF_MODEL_H #include "theory/theory_model.h" diff --git a/src/theory/uf/theory_uf_rewriter.h b/src/theory/uf/theory_uf_rewriter.h index d9b2cccaa..bad4189d6 100644 --- a/src/theory/uf/theory_uf_rewriter.h +++ b/src/theory/uf/theory_uf_rewriter.h @@ -17,8 +17,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__UF__THEORY_UF_REWRITER_H -#define __CVC4__THEORY__UF__THEORY_UF_REWRITER_H +#ifndef CVC4__THEORY__UF__THEORY_UF_REWRITER_H +#define CVC4__THEORY__UF__THEORY_UF_REWRITER_H #include "expr/node_algorithm.h" #include "theory/rewriter.h" @@ -213,4 +213,4 @@ public: //conversion between HO_APPLY AND APPLY_UF }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__UF__THEORY_UF_REWRITER_H */ +#endif /* CVC4__THEORY__UF__THEORY_UF_REWRITER_H */ diff --git a/src/theory/uf/theory_uf_strong_solver.h b/src/theory/uf/theory_uf_strong_solver.h index 41577f217..5dac994aa 100644 --- a/src/theory/uf/theory_uf_strong_solver.h +++ b/src/theory/uf/theory_uf_strong_solver.h @@ -14,8 +14,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY_UF_STRONG_SOLVER_H -#define __CVC4__THEORY_UF_STRONG_SOLVER_H +#ifndef CVC4__THEORY_UF_STRONG_SOLVER_H +#define CVC4__THEORY_UF_STRONG_SOLVER_H #include "context/cdhashmap.h" #include "context/context.h" @@ -476,4 +476,4 @@ public: }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY_UF_STRONG_SOLVER_H */ +#endif /* CVC4__THEORY_UF_STRONG_SOLVER_H */ diff --git a/src/theory/uf/theory_uf_type_rules.h b/src/theory/uf/theory_uf_type_rules.h index 013eb89a0..cb373b535 100644 --- a/src/theory/uf/theory_uf_type_rules.h +++ b/src/theory/uf/theory_uf_type_rules.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__UF__THEORY_UF_TYPE_RULES_H -#define __CVC4__THEORY__UF__THEORY_UF_TYPE_RULES_H +#ifndef CVC4__THEORY__UF__THEORY_UF_TYPE_RULES_H +#define CVC4__THEORY__UF__THEORY_UF_TYPE_RULES_H namespace CVC4 { namespace theory { @@ -178,4 +178,4 @@ class HoApplyTypeRule { } /* CVC4::theory namespace */ } /* CVC4 namespace */ -#endif /* __CVC4__THEORY__UF__THEORY_UF_TYPE_RULES_H */ +#endif /* CVC4__THEORY__UF__THEORY_UF_TYPE_RULES_H */ diff --git a/src/theory/valuation.h b/src/theory/valuation.h index c5abdb6ae..89f286a5e 100644 --- a/src/theory/valuation.h +++ b/src/theory/valuation.h @@ -18,8 +18,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__THEORY__VALUATION_H -#define __CVC4__THEORY__VALUATION_H +#ifndef CVC4__THEORY__VALUATION_H +#define CVC4__THEORY__VALUATION_H #include "expr/node.h" #include "options/theoryof_mode.h" @@ -151,4 +151,4 @@ public: }/* CVC4::theory namespace */ }/* CVC4 namespace */ -#endif /* __CVC4__THEORY__VALUATION_H */ +#endif /* CVC4__THEORY__VALUATION_H */ diff --git a/src/util/bin_heap.h b/src/util/bin_heap.h index be54dfa03..d6a7c95d7 100644 --- a/src/util/bin_heap.h +++ b/src/util/bin_heap.h @@ -20,8 +20,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__BIN_HEAP_H -#define __CVC4__BIN_HEAP_H +#ifndef CVC4__BIN_HEAP_H +#define CVC4__BIN_HEAP_H #include #include @@ -365,4 +365,4 @@ const size_t BinaryHeap::MAX_SIZE = (std::numeric_limits::m }/* CVC4 namespace */ -#endif /* __CVC4__BIN_HEAP_H */ +#endif /* CVC4__BIN_HEAP_H */ diff --git a/src/util/bitvector.h b/src/util/bitvector.h index 8b1d58e80..f13db5417 100644 --- a/src/util/bitvector.h +++ b/src/util/bitvector.h @@ -16,8 +16,8 @@ #include "cvc4_public.h" -#ifndef __CVC4__BITVECTOR_H -#define __CVC4__BITVECTOR_H +#ifndef CVC4__BITVECTOR_H +#define CVC4__BITVECTOR_H #include #include @@ -434,4 +434,4 @@ inline std::ostream& operator<<(std::ostream& os, const IntToBitVector& bv) } // namespace CVC4 -#endif /* __CVC4__BITVECTOR_H */ +#endif /* CVC4__BITVECTOR_H */ diff --git a/src/util/bool.h b/src/util/bool.h index 1c88ad601..32f3741f8 100644 --- a/src/util/bool.h +++ b/src/util/bool.h @@ -16,8 +16,8 @@ #include "cvc4_public.h" -#ifndef __CVC4__BOOL_H -#define __CVC4__BOOL_H +#ifndef CVC4__BOOL_H +#define CVC4__BOOL_H namespace CVC4 { @@ -29,4 +29,4 @@ struct BoolHashFunction { }/* CVC4 namespace */ -#endif /* __CVC4__BOOL_H */ +#endif /* CVC4__BOOL_H */ diff --git a/src/util/cardinality.h b/src/util/cardinality.h index b3021db64..b06d72286 100644 --- a/src/util/cardinality.h +++ b/src/util/cardinality.h @@ -17,8 +17,8 @@ #include "cvc4_public.h" -#ifndef __CVC4__CARDINALITY_H -#define __CVC4__CARDINALITY_H +#ifndef CVC4__CARDINALITY_H +#define CVC4__CARDINALITY_H #include #include @@ -225,4 +225,4 @@ std::ostream& operator<<(std::ostream& out, const Cardinality& c) CVC4_PUBLIC; } /* CVC4 namespace */ -#endif /* __CVC4__CARDINALITY_H */ +#endif /* CVC4__CARDINALITY_H */ diff --git a/src/util/channel.h b/src/util/channel.h index 8587800c1..00776921f 100644 --- a/src/util/channel.h +++ b/src/util/channel.h @@ -22,8 +22,8 @@ #include "cvc4_public.h" -#ifndef __CVC4__CHANNEL_H -#define __CVC4__CHANNEL_H +#ifndef CVC4__CHANNEL_H +#define CVC4__CHANNEL_H #include #include @@ -118,4 +118,4 @@ public: }/* CVC4 namespace */ -#endif /* __CVC4__CHANNEL_H */ +#endif /* CVC4__CHANNEL_H */ diff --git a/src/util/debug.h b/src/util/debug.h index 516908d3d..e25ca8168 100644 --- a/src/util/debug.h +++ b/src/util/debug.h @@ -20,8 +20,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__DEBUG_H -#define __CVC4__DEBUG_H +#ifndef CVC4__DEBUG_H +#define CVC4__DEBUG_H #include @@ -34,4 +34,4 @@ # define cvc4assert(x) /*__builtin_expect( ( x ), true )*/ #endif /* CVC4_ASSERTIONS */ -#endif /* __CVC4__DEBUG_H */ +#endif /* CVC4__DEBUG_H */ diff --git a/src/util/divisible.h b/src/util/divisible.h index f545ab9d8..a0c730436 100644 --- a/src/util/divisible.h +++ b/src/util/divisible.h @@ -17,8 +17,8 @@ #include "cvc4_public.h" -#ifndef __CVC4__DIVISIBLE_H -#define __CVC4__DIVISIBLE_H +#ifndef CVC4__DIVISIBLE_H +#define CVC4__DIVISIBLE_H #include @@ -60,4 +60,4 @@ inline std::ostream& operator <<(std::ostream& os, const Divisible& d) { }/* CVC4 namespace */ -#endif /* __CVC4__DIVISIBLE_H */ +#endif /* CVC4__DIVISIBLE_H */ diff --git a/src/util/floatingpoint.h.in b/src/util/floatingpoint.h.in index 5ba02b30f..bac0fbd59 100644 --- a/src/util/floatingpoint.h.in +++ b/src/util/floatingpoint.h.in @@ -17,8 +17,8 @@ **/ #include "cvc4_public.h" -#ifndef __CVC4__FLOATINGPOINT_H -#define __CVC4__FLOATINGPOINT_H +#ifndef CVC4__FLOATINGPOINT_H +#define CVC4__FLOATINGPOINT_H #include "util/bitvector.h" #include "util/rational.h" @@ -551,4 +551,4 @@ namespace CVC4 { }/* CVC4 namespace */ -#endif /* __CVC4__FLOATINGPOINT_H */ +#endif /* CVC4__FLOATINGPOINT_H */ diff --git a/src/util/gmp_util.h b/src/util/gmp_util.h index 2bc4a392f..3ba388564 100644 --- a/src/util/gmp_util.h +++ b/src/util/gmp_util.h @@ -17,8 +17,8 @@ #include "cvc4_public.h" -#ifndef __CVC4__GMP_UTIL_H -#define __CVC4__GMP_UTIL_H +#ifndef CVC4__GMP_UTIL_H +#define CVC4__GMP_UTIL_H /* * Older versions of GMP in combination with newer versions of GCC and C++11 @@ -44,4 +44,4 @@ inline size_t gmpz_hash(const mpz_t toHash) { }/* CVC4 namespace */ -#endif /* __CVC4__GMP_UTIL_H */ +#endif /* CVC4__GMP_UTIL_H */ diff --git a/src/util/hash.h b/src/util/hash.h index ef8567464..14167bc82 100644 --- a/src/util/hash.h +++ b/src/util/hash.h @@ -17,8 +17,8 @@ #include "cvc4_public.h" -#ifndef __CVC4__HASH_H -#define __CVC4__HASH_H +#ifndef CVC4__HASH_H +#define CVC4__HASH_H #include #include @@ -67,4 +67,4 @@ struct PairHashFunction { }/* CVC4 namespace */ -#endif /* __CVC4__HASH_H */ +#endif /* CVC4__HASH_H */ diff --git a/src/util/index.h b/src/util/index.h index 8000c049a..2ee6ff19e 100644 --- a/src/util/index.h +++ b/src/util/index.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__INDEX_H -#define __CVC4__INDEX_H +#ifndef CVC4__INDEX_H +#define CVC4__INDEX_H #include @@ -28,4 +28,4 @@ using Index = uint32_t; }/* CVC4 namespace */ -#endif /* __CVC4__INDEX_H */ +#endif /* CVC4__INDEX_H */ diff --git a/src/util/integer_cln_imp.h b/src/util/integer_cln_imp.h index 4b030efa8..aba5b6a3a 100644 --- a/src/util/integer_cln_imp.h +++ b/src/util/integer_cln_imp.h @@ -17,8 +17,8 @@ #include "cvc4_public.h" -#ifndef __CVC4__INTEGER_H -#define __CVC4__INTEGER_H +#ifndef CVC4__INTEGER_H +#define CVC4__INTEGER_H #include #include @@ -559,4 +559,4 @@ inline std::ostream& operator<<(std::ostream& os, const Integer& n) { }/* CVC4 namespace */ -#endif /* __CVC4__INTEGER_H */ +#endif /* CVC4__INTEGER_H */ diff --git a/src/util/integer_gmp_imp.h b/src/util/integer_gmp_imp.h index f9cf3b6e2..144e88536 100644 --- a/src/util/integer_gmp_imp.h +++ b/src/util/integer_gmp_imp.h @@ -17,8 +17,8 @@ #include "cvc4_public.h" -#ifndef __CVC4__INTEGER_H -#define __CVC4__INTEGER_H +#ifndef CVC4__INTEGER_H +#define CVC4__INTEGER_H #include #include @@ -540,4 +540,4 @@ inline std::ostream& operator<<(std::ostream& os, const Integer& n) { }/* CVC4 namespace */ -#endif /* __CVC4__INTEGER_H */ +#endif /* CVC4__INTEGER_H */ diff --git a/src/util/maybe.h b/src/util/maybe.h index c3247d307..33c6c6511 100644 --- a/src/util/maybe.h +++ b/src/util/maybe.h @@ -24,8 +24,8 @@ **/ #include "cvc4_public.h" -#ifndef __CVC4__UTIL__MAYBE_H -#define __CVC4__UTIL__MAYBE_H +#ifndef CVC4__UTIL__MAYBE_H +#define CVC4__UTIL__MAYBE_H #include @@ -86,4 +86,4 @@ inline std::ostream& operator<<(std::ostream& out, const Maybe& m){ }/* CVC4 namespace */ -#endif /* __CVC4__UTIL__MAYBE_H */ +#endif /* CVC4__UTIL__MAYBE_H */ diff --git a/src/util/ostream_util.h b/src/util/ostream_util.h index d5fd93ce9..45d30a01c 100644 --- a/src/util/ostream_util.h +++ b/src/util/ostream_util.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__UTIL__OSTREAM_UTIL_H -#define __CVC4__UTIL__OSTREAM_UTIL_H +#ifndef CVC4__UTIL__OSTREAM_UTIL_H +#define CVC4__UTIL__OSTREAM_UTIL_H #include #include @@ -46,4 +46,4 @@ class StreamFormatScope } // namespace CVC4 -#endif /* __CVC4__UTIL__OSTREAM_UTIL_H */ +#endif /* CVC4__UTIL__OSTREAM_UTIL_H */ diff --git a/src/util/proof.h b/src/util/proof.h index 1440d0a91..ac129e3aa 100644 --- a/src/util/proof.h +++ b/src/util/proof.h @@ -17,8 +17,8 @@ #include "cvc4_public.h" -#ifndef __CVC4__PROOF_H -#define __CVC4__PROOF_H +#ifndef CVC4__PROOF_H +#define CVC4__PROOF_H #include #include @@ -41,4 +41,4 @@ class CVC4_PUBLIC Proof }/* CVC4 namespace */ -#endif /* __CVC4__PROOF_H */ +#endif /* CVC4__PROOF_H */ diff --git a/src/util/random.h b/src/util/random.h index d031a6b80..0b46a1f04 100644 --- a/src/util/random.h +++ b/src/util/random.h @@ -18,8 +18,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__UTIL__RANDOM_H -#define __CVC4__UTIL__RANDOM_H +#ifndef CVC4__UTIL__RANDOM_H +#define CVC4__UTIL__RANDOM_H namespace CVC4 { diff --git a/src/util/rational_cln_imp.h b/src/util/rational_cln_imp.h index 03bda2c7d..660c4b075 100644 --- a/src/util/rational_cln_imp.h +++ b/src/util/rational_cln_imp.h @@ -17,8 +17,8 @@ #include "cvc4_public.h" -#ifndef __CVC4__RATIONAL_H -#define __CVC4__RATIONAL_H +#ifndef CVC4__RATIONAL_H +#define CVC4__RATIONAL_H #include #include @@ -373,4 +373,4 @@ CVC4_PUBLIC std::ostream& operator<<(std::ostream& os, const Rational& n); }/* CVC4 namespace */ -#endif /* __CVC4__RATIONAL_H */ +#endif /* CVC4__RATIONAL_H */ diff --git a/src/util/rational_gmp_imp.h b/src/util/rational_gmp_imp.h index ab4b5c5a8..ff8a0f776 100644 --- a/src/util/rational_gmp_imp.h +++ b/src/util/rational_gmp_imp.h @@ -17,8 +17,8 @@ #include "cvc4_public.h" -#ifndef __CVC4__RATIONAL_H -#define __CVC4__RATIONAL_H +#ifndef CVC4__RATIONAL_H +#define CVC4__RATIONAL_H /* * Older versions of GMP in combination with newer versions of GCC and C++11 @@ -358,4 +358,4 @@ CVC4_PUBLIC std::ostream& operator<<(std::ostream& os, const Rational& n); }/* CVC4 namespace */ -#endif /* __CVC4__RATIONAL_H */ +#endif /* CVC4__RATIONAL_H */ diff --git a/src/util/regexp.h b/src/util/regexp.h index 64b05b900..f7c6fb2ae 100644 --- a/src/util/regexp.h +++ b/src/util/regexp.h @@ -17,8 +17,8 @@ #include "cvc4_public.h" -#ifndef __CVC4__REGEXP_H -#define __CVC4__REGEXP_H +#ifndef CVC4__REGEXP_H +#define CVC4__REGEXP_H #include #include @@ -246,4 +246,4 @@ std::ostream& operator<<(std::ostream& os, const String& s) CVC4_PUBLIC; } // namespace CVC4 -#endif /* __CVC4__REGEXP_H */ +#endif /* CVC4__REGEXP_H */ diff --git a/src/util/resource_manager.h b/src/util/resource_manager.h index 03fcfaffb..264565a76 100644 --- a/src/util/resource_manager.h +++ b/src/util/resource_manager.h @@ -17,8 +17,8 @@ #include "cvc4_public.h" -#ifndef __CVC4__RESOURCE_MANAGER_H -#define __CVC4__RESOURCE_MANAGER_H +#ifndef CVC4__RESOURCE_MANAGER_H +#define CVC4__RESOURCE_MANAGER_H #include #include @@ -197,4 +197,4 @@ public: }/* CVC4 namespace */ -#endif /* __CVC4__RESOURCE_MANAGER_H */ +#endif /* CVC4__RESOURCE_MANAGER_H */ diff --git a/src/util/result.h b/src/util/result.h index 29fef9362..f34a9bb5a 100644 --- a/src/util/result.h +++ b/src/util/result.h @@ -16,8 +16,8 @@ #include "cvc4_public.h" -#ifndef __CVC4__RESULT_H -#define __CVC4__RESULT_H +#ifndef CVC4__RESULT_H +#define CVC4__RESULT_H #include #include @@ -151,4 +151,4 @@ bool operator!=(enum Result::Validity v, const Result& r) CVC4_PUBLIC; } /* CVC4 namespace */ -#endif /* __CVC4__RESULT_H */ +#endif /* CVC4__RESULT_H */ diff --git a/src/util/safe_print.h b/src/util/safe_print.h index a8a096d11..75a517b18 100644 --- a/src/util/safe_print.h +++ b/src/util/safe_print.h @@ -29,8 +29,8 @@ #include "cvc4_private_library.h" -#ifndef __CVC4__SAFE_PRINT_H -#define __CVC4__SAFE_PRINT_H +#ifndef CVC4__SAFE_PRINT_H +#define CVC4__SAFE_PRINT_H #if __cplusplus >= 201103L // For c++11 and newer @@ -96,4 +96,4 @@ void safe_print_right_aligned(int fd, uint64_t i, ssize_t width); } /* CVC4 namespace */ -#endif /* __CVC4__SAFE_PRINT_H */ +#endif /* CVC4__SAFE_PRINT_H */ diff --git a/src/util/sampler.h b/src/util/sampler.h index 0c727d8d4..aa473ba0c 100644 --- a/src/util/sampler.h +++ b/src/util/sampler.h @@ -17,8 +17,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__UTIL_FLOATINGPOINT_SAMPLER_H -#define __CVC4__UTIL_FLOATINGPOINT_SAMPLER_H +#ifndef CVC4__UTIL_FLOATINGPOINT_SAMPLER_H +#define CVC4__UTIL_FLOATINGPOINT_SAMPLER_H #include "util/floatingpoint.h" #include "util/random.h" @@ -55,4 +55,4 @@ class Sampler } // namespace CVC4 -#endif /* __CVC4__UTIL_FLOATINGPOINT_SAMPLER_H */ +#endif /* CVC4__UTIL_FLOATINGPOINT_SAMPLER_H */ diff --git a/src/util/sexpr.h b/src/util/sexpr.h index 573b4fcd4..bdc85df41 100644 --- a/src/util/sexpr.h +++ b/src/util/sexpr.h @@ -23,8 +23,8 @@ #include "cvc4_public.h" -#ifndef __CVC4__SEXPR_H -#define __CVC4__SEXPR_H +#ifndef CVC4__SEXPR_H +#define CVC4__SEXPR_H #include #include @@ -301,4 +301,4 @@ std::ostream& operator<<(std::ostream& out, PrettySExprs ps); } /* CVC4 namespace */ -#endif /* __CVC4__SEXPR_H */ +#endif /* CVC4__SEXPR_H */ diff --git a/src/util/smt2_quote_string.h b/src/util/smt2_quote_string.h index 36d542306..f91874a2e 100644 --- a/src/util/smt2_quote_string.h +++ b/src/util/smt2_quote_string.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__UTIL__SMT2_QUOTE_STRING_H -#define __CVC4__UTIL__SMT2_QUOTE_STRING_H +#ifndef CVC4__UTIL__SMT2_QUOTE_STRING_H +#define CVC4__UTIL__SMT2_QUOTE_STRING_H #include @@ -30,4 +30,4 @@ std::string quoteSymbol(const std::string& s); }/* CVC4 namespace */ -#endif /* __CVC4__UTIL__SMT2_QUOTE_STRING_H */ +#endif /* CVC4__UTIL__SMT2_QUOTE_STRING_H */ diff --git a/src/util/statistics.h b/src/util/statistics.h index 626db9c70..68d8d6fda 100644 --- a/src/util/statistics.h +++ b/src/util/statistics.h @@ -17,8 +17,8 @@ #include "cvc4_public.h" -#ifndef __CVC4__STATISTICS_H -#define __CVC4__STATISTICS_H +#ifndef CVC4__STATISTICS_H +#define CVC4__STATISTICS_H #include #include @@ -132,4 +132,4 @@ public: }/* CVC4 namespace */ -#endif /* __CVC4__STATISTICS_H */ +#endif /* CVC4__STATISTICS_H */ diff --git a/src/util/statistics_registry.cpp b/src/util/statistics_registry.cpp index cad0e63fa..2ccbc2971 100644 --- a/src/util/statistics_registry.cpp +++ b/src/util/statistics_registry.cpp @@ -26,9 +26,9 @@ #include "util/ostream_util.h" #ifdef CVC4_STATISTICS_ON -# define __CVC4_USE_STATISTICS true +# define CVC4_USE_STATISTICS true #else -# define __CVC4_USE_STATISTICS false +# define CVC4_USE_STATISTICS false #endif @@ -148,7 +148,7 @@ std::ostream& operator<<(std::ostream& os, const timespec& t) { StatisticsRegistry::StatisticsRegistry(const std::string& name) : Stat(name) { d_prefix = name; - if(__CVC4_USE_STATISTICS) { + if(CVC4_USE_STATISTICS) { PrettyCheckArgument(d_name.find(s_regDelim) == std::string::npos, name, "StatisticsRegistry names cannot contain the string \"%s\"", s_regDelim.c_str()); @@ -194,7 +194,7 @@ void StatisticsRegistry::safeFlushInformation(int fd) const { } void TimerStat::start() { - if(__CVC4_USE_STATISTICS) { + if(CVC4_USE_STATISTICS) { PrettyCheckArgument(!d_running, *this, "timer already running"); clock_gettime(CLOCK_MONOTONIC, &d_start); d_running = true; @@ -202,7 +202,7 @@ void TimerStat::start() { }/* TimerStat::start() */ void TimerStat::stop() { - if(__CVC4_USE_STATISTICS) { + if(CVC4_USE_STATISTICS) { CVC4_CHECK(d_running) << "timer not running"; ::timespec end; clock_gettime(CLOCK_MONOTONIC, &end); @@ -217,7 +217,7 @@ bool TimerStat::running() const { timespec TimerStat::getData() const { ::timespec data = d_data; - if(__CVC4_USE_STATISTICS && d_running) { + if(CVC4_USE_STATISTICS && d_running) { ::timespec end; clock_gettime(CLOCK_MONOTONIC, &end); data += end - d_start; @@ -227,7 +227,7 @@ timespec TimerStat::getData() const { SExpr TimerStat::getValue() const { ::timespec data = d_data; - if(__CVC4_USE_STATISTICS && d_running) { + if(CVC4_USE_STATISTICS && d_running) { ::timespec end; clock_gettime(CLOCK_MONOTONIC, &end); data += end - d_start; @@ -253,4 +253,4 @@ RegisterStatistic::~RegisterStatistic() { }/* CVC4 namespace */ -#undef __CVC4_USE_STATISTICS +#undef CVC4_USE_STATISTICS diff --git a/src/util/statistics_registry.h b/src/util/statistics_registry.h index 304d22002..a369be272 100644 --- a/src/util/statistics_registry.h +++ b/src/util/statistics_registry.h @@ -33,8 +33,8 @@ #include "cvc4_private_library.h" -#ifndef __CVC4__STATISTICS_REGISTRY_H -#define __CVC4__STATISTICS_REGISTRY_H +#ifndef CVC4__STATISTICS_REGISTRY_H +#define CVC4__STATISTICS_REGISTRY_H #include @@ -60,9 +60,9 @@ namespace CVC4 { std::ostream& operator<<(std::ostream& os, const timespec& t) CVC4_PUBLIC; #ifdef CVC4_STATISTICS_ON -# define __CVC4_USE_STATISTICS true +# define CVC4_USE_STATISTICS true #else -# define __CVC4_USE_STATISTICS false +# define CVC4_USE_STATISTICS false #endif @@ -93,7 +93,7 @@ public: */ Stat(const std::string& name) : d_name(name) { - if(__CVC4_USE_STATISTICS) { + if(CVC4_USE_STATISTICS) { CheckArgument(d_name.find(", ") == std::string::npos, name, "Statistics names cannot include a comma (',')"); } @@ -122,7 +122,7 @@ public: * May be redefined by a child class */ virtual void flushStat(std::ostream& out) const { - if(__CVC4_USE_STATISTICS) { + if(CVC4_USE_STATISTICS) { out << d_name << ", "; flushInformation(out); } @@ -135,7 +135,7 @@ public: * May be redefined by a child class */ virtual void safeFlushStat(int fd) const { - if (__CVC4_USE_STATISTICS) { + if (CVC4_USE_STATISTICS) { safe_print(fd, d_name); safe_print(fd, ", "); safeFlushInformation(fd); @@ -230,14 +230,14 @@ public: /** Flush the value of the statistic to the given output stream. */ void flushInformation(std::ostream& out) const override { - if(__CVC4_USE_STATISTICS) { + if(CVC4_USE_STATISTICS) { out << getData(); } } void safeFlushInformation(int fd) const override { - if (__CVC4_USE_STATISTICS) { + if (CVC4_USE_STATISTICS) { safe_print(fd, getDataRef()); } } @@ -317,7 +317,7 @@ public: /** Set this reference statistic to refer to the given data cell. */ void setData(const T& t) override { - if(__CVC4_USE_STATISTICS) { + if(CVC4_USE_STATISTICS) { d_data = &t; } } @@ -352,14 +352,14 @@ public: /** Set the underlying data value to the given value. */ void setData(const T& t) override { - if(__CVC4_USE_STATISTICS) { + if(CVC4_USE_STATISTICS) { d_data = t; } } /** Identical to setData(). */ BackedStat& operator=(const T& t) { - if(__CVC4_USE_STATISTICS) { + if(CVC4_USE_STATISTICS) { d_data = t; } return *this; @@ -443,7 +443,7 @@ public: /** Increment the underlying integer statistic. */ IntStat& operator++() { - if(__CVC4_USE_STATISTICS) { + if(CVC4_USE_STATISTICS) { ++d_data; } return *this; @@ -451,7 +451,7 @@ public: /** Increment the underlying integer statistic by the given amount. */ IntStat& operator+=(int64_t val) { - if(__CVC4_USE_STATISTICS) { + if(CVC4_USE_STATISTICS) { d_data += val; } return *this; @@ -459,7 +459,7 @@ public: /** Keep the maximum of the current statistic value and the given one. */ void maxAssign(int64_t val) { - if(__CVC4_USE_STATISTICS) { + if(CVC4_USE_STATISTICS) { if(d_data < val) { d_data = val; } @@ -468,7 +468,7 @@ public: /** Keep the minimum of the current statistic value and the given one. */ void minAssign(int64_t val) { - if(__CVC4_USE_STATISTICS) { + if(CVC4_USE_STATISTICS) { if(d_data > val) { d_data = val; } @@ -530,7 +530,7 @@ public: /** Add an entry to the running-average calculation. */ void addEntry(double e) { - if(__CVC4_USE_STATISTICS) { + if(CVC4_USE_STATISTICS) { ++d_count; d_sum += e; setData(d_sum / d_count); @@ -589,7 +589,7 @@ public: void flushInformation(std::ostream& out) const override { - if(__CVC4_USE_STATISTICS) { + if(CVC4_USE_STATISTICS) { typename Histogram::const_iterator i = d_hist.begin(); typename Histogram::const_iterator end = d_hist.end(); out << "["; @@ -608,7 +608,7 @@ public: void safeFlushInformation(int fd) const override { - if (__CVC4_USE_STATISTICS) { + if (CVC4_USE_STATISTICS) { typename Histogram::const_iterator i = d_hist.begin(); typename Histogram::const_iterator end = d_hist.end(); safe_print(fd, "["); @@ -630,7 +630,7 @@ public: } HistogramStat& operator<<(const T& val){ - if(__CVC4_USE_STATISTICS) { + if(CVC4_USE_STATISTICS) { if(d_hist.find(val) == d_hist.end()){ d_hist.insert(std::make_pair(val,0)); } @@ -797,8 +797,8 @@ private: };/* class RegisterStatistic */ -#undef __CVC4_USE_STATISTICS +#undef CVC4_USE_STATISTICS }/* CVC4 namespace */ -#endif /* __CVC4__STATISTICS_REGISTRY_H */ +#endif /* CVC4__STATISTICS_REGISTRY_H */ diff --git a/src/util/tuple.h b/src/util/tuple.h index 0e6b04dab..13b605794 100644 --- a/src/util/tuple.h +++ b/src/util/tuple.h @@ -16,8 +16,8 @@ #include "cvc4_public.h" -#ifndef __CVC4__TUPLE_H -#define __CVC4__TUPLE_H +#ifndef CVC4__TUPLE_H +#define CVC4__TUPLE_H #include #include @@ -50,4 +50,4 @@ inline std::ostream& operator<<(std::ostream& out, const TupleUpdate& t) { }/* CVC4 namespace */ -#endif /* __CVC4__TUPLE_H */ +#endif /* CVC4__TUPLE_H */ diff --git a/src/util/unsafe_interrupt_exception.h b/src/util/unsafe_interrupt_exception.h index faee0a5cf..5c8360cdf 100644 --- a/src/util/unsafe_interrupt_exception.h +++ b/src/util/unsafe_interrupt_exception.h @@ -15,8 +15,8 @@ #include "cvc4_public.h" -#ifndef __CVC4__UNSAFE_INTERRUPT_EXCEPTION_H -#define __CVC4__UNSAFE_INTERRUPT_EXCEPTION_H +#ifndef CVC4__UNSAFE_INTERRUPT_EXCEPTION_H +#define CVC4__UNSAFE_INTERRUPT_EXCEPTION_H #include "base/exception.h" @@ -40,4 +40,4 @@ public: }/* CVC4 namespace */ -#endif /* __CVC4__UNSAFE_INTERRUPT_EXCEPTION_H */ +#endif /* CVC4__UNSAFE_INTERRUPT_EXCEPTION_H */ diff --git a/src/util/utility.h b/src/util/utility.h index e77be32ac..275efd9d0 100644 --- a/src/util/utility.h +++ b/src/util/utility.h @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__UTILITY_H -#define __CVC4__UTILITY_H +#ifndef CVC4__UTILITY_H +#define CVC4__UTILITY_H #include #include @@ -87,4 +87,4 @@ void container_to_stream(std::ostream& out, }/* CVC4 namespace */ -#endif /* __CVC4__UTILITY_H */ +#endif /* CVC4__UTILITY_H */ -- cgit v1.2.3