using a consistent naming convention for naming tactic subfolders

Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2025-04-27 02:45:51 +00:00 · 2012-10-24 15:11:44 -07:00 · 2012-10-24 15:11:44 -07:00 · 0990a2e045
commit 0990a2e045
parent 67f5ed46c1
140 changed files with 14 additions and 12 deletions
--- a/scripts/mk_make.py
+++ b/scripts/mk_make.py
@ -41,22 +41,22 @@ add_lib('bit_blaster', ['rewriter', 'simplifier', 'old_params', 'tactic'], 'tact
 add_lib('smt', ['bit_blaster', 'macros', 'normal_forms', 'cmd_context', 
                'substitution', 'grobner', 'euclid', 'proof_checker', 'pattern', 'parser_util'])
 add_lib('user_plugin', ['smt'], 'smt/user_plugin')
-add_lib('core_tactics', ['tactic', 'normal_forms'], 'tactic/core_tactics')
-add_lib('sat_tactic', ['tactic', 'sat'], 'tactic/sat_tactic')
-add_lib('arith_tactics', ['core_tactics', 'sat'], 'tactic/arith_tactics')
-add_lib('nlsat_tactic', ['nlsat', 'sat_tactic', 'arith_tactics'], 'tactic/nlsat_tactic')
-add_lib('subpaving_tactic', ['core_tactics', 'subpaving'], 'tactic/subpaving_tactic')
-add_lib('bv_tactics', ['tactic', 'bit_blaster'], 'tactic/bv_tactics')
+add_lib('core_tactics', ['tactic', 'normal_forms'], 'tactic/core')
+add_lib('sat_tactic', ['tactic', 'sat'], 'tactic/sat')
+add_lib('arith_tactics', ['core_tactics', 'sat'], 'tactic/arith')
+add_lib('nlsat_tactic', ['nlsat', 'sat_tactic', 'arith_tactics'], 'tactic/nlsat')
+add_lib('subpaving_tactic', ['core_tactics', 'subpaving'], 'tactic/subpaving')
+add_lib('bv_tactics', ['tactic', 'bit_blaster'], 'tactic/bv')
 add_lib('fuzzing', ['ast'], 'test/fuzzing')
 add_lib('fpa', ['core_tactics', 'bv_tactics', 'sat_tactic'], 'tactic/fpa')
-add_lib('smt_tactic', ['smt'], 'tactic/smt_tactic')
+add_lib('smt_tactic', ['smt'], 'tactic/smt')
 add_lib('extra_cmds', ['cmd_context', 'subpaving_tactic', 'arith_tactics'], 'cmd_context/extra_cmds')
-add_lib('sls_tactic', ['tactic', 'normal_forms', 'core_tactics', 'bv_tactics'], 'tactic/sls_tactic')
+add_lib('sls_tactic', ['tactic', 'normal_forms', 'core_tactics', 'bv_tactics'], 'tactic/sls')
 add_lib('aig', ['tactic'], 'tactic/aig')
 # TODO: split muz_qe into muz, qe. Perhaps, we should also consider breaking muz into muz and pdr.
 add_lib('muz_qe', ['smt', 'sat', 'smt2parser'])
-add_lib('smtlogic_tactics', ['arith_tactics', 'bv_tactics', 'nlsat_tactic', 'smt_tactic', 'aig', 'muz_qe'], 'tactic/smtlogic_tactics')
-add_lib('ufbv_tactic', ['normal_forms', 'core_tactics', 'macros', 'smt_tactic', 'rewriter'], 'tactic/ufbv_tactic')
+add_lib('smtlogic_tactics', ['arith_tactics', 'bv_tactics', 'nlsat_tactic', 'smt_tactic', 'aig', 'muz_qe'], 'tactic/smtlogics')
+add_lib('ufbv_tactic', ['normal_forms', 'core_tactics', 'macros', 'smt_tactic', 'rewriter'], 'tactic/ufbv')
 add_lib('portfolio', ['smtlogic_tactics', 'ufbv_tactic', 'fpa', 'aig', 'muz_qe', 'sls_tactic', 'subpaving_tactic'], 'tactic/portfolio')
 # TODO: delete SMT 1.0 frontend
 add_lib('api', ['portfolio', 'user_plugin'])
--- a/src/api/dll/dll.cpp
+++ b/src/api/dll/dll.cpp
@ -1,6 +1,6 @@
+#ifdef _WINDOWS

-#include "windows.h"
-
+#include<windows.h>

 #ifdef _MANAGED
 #pragma managed(push, off)
@ -25,3 +25,5 @@ BOOL APIENTRY DllMain( HMODULE hModule,
 #ifdef _MANAGED
 #pragma managed(pop)
 #endif
+
+#endif
--- a/src/tactic/arith_tactics/add_bounds_tactic.cpp
+++ b/src/tactic/arith_tactics/add_bounds_tactic.cpp
--- a/src/tactic/arith_tactics/add_bounds_tactic.h
+++ b/src/tactic/arith_tactics/add_bounds_tactic.h
--- a/src/tactic/arith_tactics/bound_manager.cpp
+++ b/src/tactic/arith_tactics/bound_manager.cpp
--- a/src/tactic/arith_tactics/bound_manager.h
+++ b/src/tactic/arith_tactics/bound_manager.h
--- a/src/tactic/arith_tactics/bound_propagator.cpp
+++ b/src/tactic/arith_tactics/bound_propagator.cpp
--- a/src/tactic/arith_tactics/bound_propagator.h
+++ b/src/tactic/arith_tactics/bound_propagator.h
--- a/src/tactic/arith_tactics/bv2int_rewriter.cpp
+++ b/src/tactic/arith_tactics/bv2int_rewriter.cpp
--- a/src/tactic/arith_tactics/bv2int_rewriter.h
+++ b/src/tactic/arith_tactics/bv2int_rewriter.h
--- a/src/tactic/arith_tactics/bv2real_rewriter.cpp
+++ b/src/tactic/arith_tactics/bv2real_rewriter.cpp
--- a/src/tactic/arith_tactics/bv2real_rewriter.h
+++ b/src/tactic/arith_tactics/bv2real_rewriter.h
--- a/src/tactic/arith_tactics/dead/lu.cpp
+++ b/src/tactic/arith_tactics/dead/lu.cpp
--- a/src/tactic/arith_tactics/dead/lu.h
+++ b/src/tactic/arith_tactics/dead/lu.h
--- a/src/tactic/arith_tactics/dead/mip_tactic.cpp
+++ b/src/tactic/arith_tactics/dead/mip_tactic.cpp
--- a/src/tactic/arith_tactics/dead/mip_tactic.h
+++ b/src/tactic/arith_tactics/dead/mip_tactic.h
--- a/src/tactic/arith_tactics/dead/smt_arith.cpp
+++ b/src/tactic/arith_tactics/dead/smt_arith.cpp
--- a/src/tactic/arith_tactics/dead/smt_arith.h
+++ b/src/tactic/arith_tactics/dead/smt_arith.h
--- a/src/tactic/arith_tactics/dead/smt_formula_compiler.cpp
+++ b/src/tactic/arith_tactics/dead/smt_formula_compiler.cpp
--- a/src/tactic/arith_tactics/dead/smt_formula_compiler.h
+++ b/src/tactic/arith_tactics/dead/smt_formula_compiler.h
--- a/src/tactic/arith_tactics/dead/smt_solver_exp.cpp
+++ b/src/tactic/arith_tactics/dead/smt_solver_exp.cpp
--- a/src/tactic/arith_tactics/dead/smt_solver_exp.h
+++ b/src/tactic/arith_tactics/dead/smt_solver_exp.h
--- a/src/tactic/arith_tactics/dead/smt_solver_types.h
+++ b/src/tactic/arith_tactics/dead/smt_solver_types.h
--- a/src/tactic/arith_tactics/degree_shift_tactic.cpp
+++ b/src/tactic/arith_tactics/degree_shift_tactic.cpp
--- a/src/tactic/arith_tactics/degree_shift_tactic.h
+++ b/src/tactic/arith_tactics/degree_shift_tactic.h
--- a/src/tactic/arith_tactics/diff_neq_tactic.cpp
+++ b/src/tactic/arith_tactics/diff_neq_tactic.cpp
--- a/src/tactic/arith_tactics/diff_neq_tactic.h
+++ b/src/tactic/arith_tactics/diff_neq_tactic.h
--- a/src/tactic/arith_tactics/factor_tactic.cpp
+++ b/src/tactic/arith_tactics/factor_tactic.cpp
--- a/src/tactic/arith_tactics/factor_tactic.h
+++ b/src/tactic/arith_tactics/factor_tactic.h
--- a/src/tactic/arith_tactics/fix_dl_var_tactic.cpp
+++ b/src/tactic/arith_tactics/fix_dl_var_tactic.cpp
--- a/src/tactic/arith_tactics/fix_dl_var_tactic.h
+++ b/src/tactic/arith_tactics/fix_dl_var_tactic.h
--- a/src/tactic/arith_tactics/fm_tactic.cpp
+++ b/src/tactic/arith_tactics/fm_tactic.cpp
--- a/src/tactic/arith_tactics/fm_tactic.h
+++ b/src/tactic/arith_tactics/fm_tactic.h
--- a/src/tactic/arith_tactics/lia2pb_tactic.cpp
+++ b/src/tactic/arith_tactics/lia2pb_tactic.cpp
--- a/src/tactic/arith_tactics/lia2pb_tactic.h
+++ b/src/tactic/arith_tactics/lia2pb_tactic.h
--- a/src/tactic/arith_tactics/linear_equation.cpp
+++ b/src/tactic/arith_tactics/linear_equation.cpp
--- a/src/tactic/arith_tactics/linear_equation.h
+++ b/src/tactic/arith_tactics/linear_equation.h
--- a/src/tactic/arith_tactics/nla2bv_tactic.cpp
+++ b/src/tactic/arith_tactics/nla2bv_tactic.cpp
--- a/src/tactic/arith_tactics/nla2bv_tactic.h
+++ b/src/tactic/arith_tactics/nla2bv_tactic.h
--- a/src/tactic/arith_tactics/normalize_bounds_tactic.cpp
+++ b/src/tactic/arith_tactics/normalize_bounds_tactic.cpp
--- a/src/tactic/arith_tactics/normalize_bounds_tactic.h
+++ b/src/tactic/arith_tactics/normalize_bounds_tactic.h
--- a/src/tactic/arith_tactics/pb2bv_model_converter.cpp
+++ b/src/tactic/arith_tactics/pb2bv_model_converter.cpp
--- a/src/tactic/arith_tactics/pb2bv_model_converter.h
+++ b/src/tactic/arith_tactics/pb2bv_model_converter.h
--- a/src/tactic/arith_tactics/pb2bv_tactic.cpp
+++ b/src/tactic/arith_tactics/pb2bv_tactic.cpp
--- a/src/tactic/arith_tactics/pb2bv_tactic.h
+++ b/src/tactic/arith_tactics/pb2bv_tactic.h
--- a/src/tactic/arith_tactics/probe_arith.cpp
+++ b/src/tactic/arith_tactics/probe_arith.cpp
--- a/src/tactic/arith_tactics/probe_arith.h
+++ b/src/tactic/arith_tactics/probe_arith.h
--- a/src/tactic/arith_tactics/propagate_ineqs_tactic.cpp
+++ b/src/tactic/arith_tactics/propagate_ineqs_tactic.cpp
--- a/src/tactic/arith_tactics/propagate_ineqs_tactic.h
+++ b/src/tactic/arith_tactics/propagate_ineqs_tactic.h
--- a/src/tactic/arith_tactics/purify_arith_tactic.cpp
+++ b/src/tactic/arith_tactics/purify_arith_tactic.cpp
--- a/src/tactic/arith_tactics/purify_arith_tactic.h
+++ b/src/tactic/arith_tactics/purify_arith_tactic.h
--- a/src/tactic/arith_tactics/recover_01_tactic.cpp
+++ b/src/tactic/arith_tactics/recover_01_tactic.cpp
--- a/src/tactic/arith_tactics/recover_01_tactic.h
+++ b/src/tactic/arith_tactics/recover_01_tactic.h
--- a/src/tactic/bv_tactics/bit_blaster_tactic.cpp
+++ b/src/tactic/bv_tactics/bit_blaster_tactic.cpp
--- a/src/tactic/bv_tactics/bit_blaster_tactic.h
+++ b/src/tactic/bv_tactics/bit_blaster_tactic.h
--- a/src/tactic/bv_tactics/bv_size_reduction_tactic.cpp
+++ b/src/tactic/bv_tactics/bv_size_reduction_tactic.cpp
--- a/src/tactic/bv_tactics/bv_size_reduction_tactic.h
+++ b/src/tactic/bv_tactics/bv_size_reduction_tactic.h
--- a/src/tactic/bv_tactics/max_bv_sharing_tactic.cpp
+++ b/src/tactic/bv_tactics/max_bv_sharing_tactic.cpp
--- a/src/tactic/bv_tactics/max_bv_sharing_tactic.h
+++ b/src/tactic/bv_tactics/max_bv_sharing_tactic.h
--- a/src/tactic/core_tactics/cofactor_elim_term_ite.cpp
+++ b/src/tactic/core_tactics/cofactor_elim_term_ite.cpp
--- a/src/tactic/core_tactics/cofactor_elim_term_ite.h
+++ b/src/tactic/core_tactics/cofactor_elim_term_ite.h
--- a/src/tactic/core_tactics/cofactor_term_ite_tactic.cpp
+++ b/src/tactic/core_tactics/cofactor_term_ite_tactic.cpp
--- a/src/tactic/core_tactics/cofactor_term_ite_tactic.h
+++ b/src/tactic/core_tactics/cofactor_term_ite_tactic.h
--- a/src/tactic/core_tactics/ctx_simplify_tactic.cpp
+++ b/src/tactic/core_tactics/ctx_simplify_tactic.cpp
--- a/src/tactic/core_tactics/ctx_simplify_tactic.h
+++ b/src/tactic/core_tactics/ctx_simplify_tactic.h
--- a/src/tactic/core_tactics/der_tactic.cpp
+++ b/src/tactic/core_tactics/der_tactic.cpp
--- a/src/tactic/core_tactics/der_tactic.h
+++ b/src/tactic/core_tactics/der_tactic.h
--- a/src/tactic/core_tactics/distribute_forall_tactic.cpp
+++ b/src/tactic/core_tactics/distribute_forall_tactic.cpp
--- a/src/tactic/core_tactics/distribute_forall_tactic.h
+++ b/src/tactic/core_tactics/distribute_forall_tactic.h
--- a/src/tactic/core_tactics/elim_term_ite_tactic.cpp
+++ b/src/tactic/core_tactics/elim_term_ite_tactic.cpp
--- a/src/tactic/core_tactics/elim_term_ite_tactic.h
+++ b/src/tactic/core_tactics/elim_term_ite_tactic.h
--- a/src/tactic/core_tactics/elim_uncnstr_tactic.cpp
+++ b/src/tactic/core_tactics/elim_uncnstr_tactic.cpp
--- a/src/tactic/core_tactics/elim_uncnstr_tactic.h
+++ b/src/tactic/core_tactics/elim_uncnstr_tactic.h
--- a/src/tactic/core_tactics/nnf_tactic.cpp
+++ b/src/tactic/core_tactics/nnf_tactic.cpp
--- a/src/tactic/core_tactics/nnf_tactic.h
+++ b/src/tactic/core_tactics/nnf_tactic.h
--- a/src/tactic/core_tactics/occf_tactic.cpp
+++ b/src/tactic/core_tactics/occf_tactic.cpp
--- a/src/tactic/core_tactics/occf_tactic.h
+++ b/src/tactic/core_tactics/occf_tactic.h
--- a/src/tactic/core_tactics/propagate_values_tactic.cpp
+++ b/src/tactic/core_tactics/propagate_values_tactic.cpp
--- a/src/tactic/core_tactics/propagate_values_tactic.h
+++ b/src/tactic/core_tactics/propagate_values_tactic.h
--- a/src/tactic/core_tactics/reduce_args_tactic.cpp
+++ b/src/tactic/core_tactics/reduce_args_tactic.cpp
--- a/src/tactic/core_tactics/reduce_args_tactic.h
+++ b/src/tactic/core_tactics/reduce_args_tactic.h
--- a/src/tactic/core_tactics/simplify_tactic.cpp
+++ b/src/tactic/core_tactics/simplify_tactic.cpp
--- a/src/tactic/core_tactics/simplify_tactic.h
+++ b/src/tactic/core_tactics/simplify_tactic.h
--- a/src/tactic/core_tactics/solve_eqs_tactic.cpp
+++ b/src/tactic/core_tactics/solve_eqs_tactic.cpp
--- a/src/tactic/core_tactics/solve_eqs_tactic.h
+++ b/src/tactic/core_tactics/solve_eqs_tactic.h
--- a/src/tactic/core_tactics/split_clause_tactic.cpp
+++ b/src/tactic/core_tactics/split_clause_tactic.cpp
--- a/src/tactic/core_tactics/split_clause_tactic.h
+++ b/src/tactic/core_tactics/split_clause_tactic.h
--- a/src/tactic/core_tactics/symmetry_reduce_tactic.cpp
+++ b/src/tactic/core_tactics/symmetry_reduce_tactic.cpp
--- a/src/tactic/core_tactics/symmetry_reduce_tactic.h
+++ b/src/tactic/core_tactics/symmetry_reduce_tactic.h
--- a/src/tactic/core_tactics/tseitin_cnf_tactic.cpp
+++ b/src/tactic/core_tactics/tseitin_cnf_tactic.cpp
--- a/src/tactic/core_tactics/tseitin_cnf_tactic.h
+++ b/src/tactic/core_tactics/tseitin_cnf_tactic.h
--- a/src/tactic/nlsat_tactic/goal2nlsat.cpp
+++ b/src/tactic/nlsat_tactic/goal2nlsat.cpp
--- a/src/tactic/nlsat_tactic/goal2nlsat.h
+++ b/src/tactic/nlsat_tactic/goal2nlsat.h
--- a/src/tactic/nlsat_tactic/nlsat_tactic.cpp
+++ b/src/tactic/nlsat_tactic/nlsat_tactic.cpp
--- a/src/tactic/nlsat_tactic/nlsat_tactic.h
+++ b/src/tactic/nlsat_tactic/nlsat_tactic.h
--- a/src/tactic/nlsat_tactic/qfnra_nlsat_tactic.cpp
+++ b/src/tactic/nlsat_tactic/qfnra_nlsat_tactic.cpp
--- a/src/tactic/nlsat_tactic/qfnra_nlsat_tactic.h
+++ b/src/tactic/nlsat_tactic/qfnra_nlsat_tactic.h
--- a/src/tactic/sat_tactic/atom2bool_var.cpp
+++ b/src/tactic/sat_tactic/atom2bool_var.cpp
--- a/src/tactic/sat_tactic/atom2bool_var.h
+++ b/src/tactic/sat_tactic/atom2bool_var.h
--- a/src/tactic/sat_tactic/goal2sat.cpp
+++ b/src/tactic/sat_tactic/goal2sat.cpp
--- a/Show more
+++ b/Show more