remove unused file & hide a few symbols

src/smt/mam.cpp

@@ -27,6 +27,8 @@ Revision History:
 #include "smt/mam.h"
 #include "smt/smt_context.h"
 
+using namespace smt;
+
 // #define _PROFILE_MAM
 
 // -----------------------------------------
@@ -53,7 +55,7 @@ Revision History:
 
 #define IS_CGR_SUPPORT true
 
-namespace smt {
+namespace {
     // ------------------------------------
     //
     // Trail
@@ -1985,11 +1987,13 @@ namespace smt {
 
         enode * init_continue(cont const * c, unsigned expected_num_args);
 
+#ifdef _TRACE
         void display_reg(std::ostream & out, unsigned reg);
 
         void display_instr_input_reg(std::ostream & out, instruction const * instr);
 
         void display_pc_info(std::ostream & out);
+#endif
 
 #define INIT_ARGS_SIZE 16
 
@@ -2222,6 +2226,7 @@ namespace smt {
         return *(bp.m_it);
     }
 
+#ifdef _TRACE
     void interpreter::display_reg(std::ostream & out, unsigned reg) {
         out << "reg[" << reg << "]: ";
         enode * n = m_registers[reg];
@@ -2273,6 +2278,7 @@ namespace smt {
         out << "\n";
         display_instr_input_reg(out, m_pc);
     }
+#endif
 
     bool interpreter::execute_core(code_tree * t, enode * n) {
         TRACE("trigger_bug", tout << "interpreter::execute_core\n"; t->display(tout); tout << "\nenode\n" << mk_ismt2_pp(n->get_owner(), m) << "\n";);
@@ -2839,6 +2845,7 @@ namespace smt {
         return false;
     } // end of execute_core
 
+#if 0
     void display_trees(std::ostream & out, const ptr_vector<code_tree> & trees) {
         unsigned lbl = 0;
         for (code_tree * tree : trees) {
@@ -2849,6 +2856,7 @@ namespace smt {
             ++lbl;
         }
     }
+#endif
 
     // ------------------------------------
     //
@@ -4010,11 +4018,13 @@ namespace smt {
             SASSERT(approx_subset(r1->get_lbls(), r2->get_lbls()));
         }
     };
+}
 
+namespace smt {
     mam * mk_mam(context & ctx) {
         return alloc(mam_impl, ctx, true);
     }
-};
+}
 
 #ifdef Z3DEBUG
 void pp(smt::code_tree * c) {

src/smt/smt_case_split_queue.cpp

@@ -25,7 +25,9 @@ Revision History:
 #include "util/map.h"
 #include "util/hashtable.h"
 
-namespace smt {
+using namespace smt;
+
+namespace {
 
     typedef map<bool_var, double, int_hash, default_eq<bool_var> > theory_var_priority_map;
 
@@ -1250,8 +1252,9 @@ namespace smt {
 
         ~theory_aware_branching_queue() override {};
     };
+}
 
-
+namespace smt {
     case_split_queue * mk_case_split_queue(context & ctx, smt_params & p) {
         if (ctx.relevancy_lvl() < 2 && (p.m_case_split_strategy == CS_RELEVANCY || p.m_case_split_strategy == CS_RELEVANCY_ACTIVITY || 
                 p.m_case_split_strategy == CS_RELEVANCY_GOAL)) {
@@ -1281,5 +1284,4 @@ namespace smt {
         }
     }
 
-};
-
+}

src/smt/smt_implied_equalities.cpp

@@ -30,7 +30,7 @@ Revision History:
 #include "model/model.h"
 #include "solver/solver.h"
 
-namespace smt {
+namespace {
 
     class get_implied_equalities_impl {
         
@@ -177,7 +177,7 @@ namespace smt {
 
             uint_set non_values;
             
-            if (!is_value_sort(m, srt)) {
+            if (!smt::is_value_sort(m, srt)) {
                 for (unsigned i = 0; i < terms.size(); ++i) {
                     non_values.insert(i);
                 }
@@ -370,12 +370,14 @@ namespace smt {
 
     stopwatch get_implied_equalities_impl::s_timer;
     stopwatch get_implied_equalities_impl::s_stats_val_eq_timer;
+}
 
+namespace smt {
     lbool implied_equalities(ast_manager& m, solver& solver, unsigned num_terms, expr* const* terms, unsigned* class_ids) {        
         get_implied_equalities_impl gi(m, solver);
         return gi(num_terms, terms, class_ids);
     }
-};
+}
 
 
 

src/smt/smt_solver.cpp

@@ -27,7 +27,7 @@ Notes:
 #include "ast/func_decl_dependencies.h"
 #include "util/dec_ref_util.h"
 
-namespace smt {
+namespace {
 
     class smt_solver : public solver_na2as {
 
@@ -445,18 +445,20 @@ namespace smt {
             }
         }
     };
-};
-
-solver * mk_smt_solver(ast_manager & m, params_ref const & p, symbol const & logic) {
-    return alloc(smt::smt_solver, m, p, logic);
 }
 
+solver * mk_smt_solver(ast_manager & m, params_ref const & p, symbol const & logic) {
+    return alloc(smt_solver, m, p, logic);
+}
+
+namespace {
 class smt_solver_factory : public solver_factory {
 public:
     solver * operator()(ast_manager & m, params_ref const & p, bool proofs_enabled, bool models_enabled, bool unsat_core_enabled, symbol const & logic) override {
         return mk_smt_solver(m, p, logic);
     }
 };
+}
 
 solver_factory * mk_smt_solver_factory() {
     return alloc(smt_solver_factory);

src/smt/uses_theory.cpp

@@ -25,7 +25,7 @@ bool uses_theory(expr * n, family_id fid) {
     return uses_theory(n, fid, visited);
 }
 
-namespace uses_theory_ns {
+namespace {
     struct found {}; 
     struct proc {
         family_id m_fid;
@@ -34,16 +34,15 @@ namespace uses_theory_ns {
         void operator()(app * n) { if (n->get_family_id() == m_fid) throw found(); }
         void operator()(quantifier * n) {}
     };
-};
+}
 
 bool uses_theory(expr * n, family_id fid, expr_mark & visited) {
-    uses_theory_ns::proc p(fid);
+    proc p(fid);
     try {
         for_each_expr(p, visited, n);
     }
-    catch (const uses_theory_ns::found &) {
+    catch (const found &) {
         return true;
     }
     return false;
 }
-