Remove unnecessary semicolons (Attempt 2) (#10020)

This is another PR towards the goal of getting Z3 to compile cleanly
when included via FetchContents into clang-tidy, which uses a pretty
strict set of warnings.

This is a second version of https://github.com/Z3Prover/z3/pull/9957. I
address @NikolajBjorner 's comments about not changing the semicolons
after macro invocations, because some editors work better with them
present. It now, to the best of my ability, only deletes semis:

* after the closing brace of namespace decl.
* after the closing brace of an extern "C" decl.
* after a function definition.

This PR is very large, but it consists entirely of deletions of
semicolons in these situations.

(If there was a way to update the previous PR, which had been closed,
and that is preferable, please let me know. I couldn't figure it out.)

src/muz/base/dl_context.cpp

@@ -1360,4 +1360,4 @@ namespace datalog {
     }
 
 
-};
+}

src/muz/base/dl_context.h

@@ -620,5 +620,5 @@ namespace datalog {
         void display_rel_decl(std::ostream& out, func_decl* f);
     };
 
-};
+}
 

src/muz/base/dl_costs.cpp

@@ -157,4 +157,4 @@ namespace datalog {
         }
     }
 
-};
+}

src/muz/base/dl_costs.h

@@ -106,6 +106,6 @@ namespace datalog {
         void start(accounted_object *);
         void finish() { start(nullptr); }
     };
-};
+}
 
 

src/muz/base/dl_rule.cpp

@@ -1084,6 +1084,6 @@ namespace datalog {
 
 
 
-};
+}
 
 

src/muz/base/dl_rule.h

@@ -373,7 +373,7 @@ namespace datalog {
 
            This possibly returns a ";"-separated list of names.
         */
-        symbol const& name() const { return m_name; } ;
+        symbol const& name() const { return m_name; }
 
         unsigned hash() const;
 
@@ -386,6 +386,6 @@ namespace datalog {
         unsigned operator()(const rule * r) const;
     };
 
-};
+}
 
 

src/muz/base/dl_rule_set.cpp

@@ -709,4 +709,4 @@ namespace datalog {
 
     }
 
-};
+}

src/muz/base/dl_rule_set.h

@@ -281,5 +281,5 @@ namespace datalog {
 
 
 
-};
+}
 

src/muz/base/dl_rule_subsumption_index.cpp

@@ -80,5 +80,5 @@ namespace datalog {
         return false;
     }
 
-};
+}
 

src/muz/base/dl_rule_subsumption_index.h

@@ -56,6 +56,6 @@ namespace datalog {
         bool is_subsumed(app * query);
     };
 
-};
+}
 
 

src/muz/base/dl_rule_transformer.cpp

@@ -148,4 +148,4 @@ namespace datalog {
 
 
 
-};
+}

src/muz/base/dl_rule_transformer.h

@@ -110,6 +110,6 @@ namespace datalog {
         static void remove_duplicate_tails(app_ref_vector& tail, bool_vector& tail_neg);
 
     };
-};
+}
 
 

src/muz/base/dl_util.cpp

@@ -681,5 +681,5 @@ namespace datalog {
         stm<<num;
         return stm.str();
     }
-};
+}
 

src/muz/base/dl_util.h

@@ -630,6 +630,6 @@ namespace datalog {
        returned.
      */
     bool read_uint64(const char * & s, uint64_t & res);
-};
+}
 
 

src/muz/bmc/dl_bmc_engine.cpp

@@ -1566,6 +1566,6 @@ namespace datalog {
         return nl.compile_query(query_pred, level);
     }
 
-};
+}
 
 template class rewriter_tpl<datalog::bmc::nonlinear::level_replacer_cfg>;

src/muz/bmc/dl_bmc_engine.h

@@ -67,7 +67,7 @@ namespace datalog {
         void compile(rule_set const& rules, expr_ref_vector& fmls, unsigned level);
         expr_ref compile_query(func_decl* query_pred, unsigned level);
     };
-};
+}
 
 
 

src/muz/clp/clp_context.cpp

@@ -222,4 +222,4 @@ namespace datalog {
         return m_imp->get_answer();
     }
 
-};
+}

src/muz/clp/clp_context.h

@@ -38,5 +38,5 @@ namespace datalog {
         void display_certificate(std::ostream& out) const override;
         expr_ref get_answer() override;
     };
-};
+}
 

src/muz/ddnf/ddnf.cpp

@@ -878,4 +878,4 @@ namespace datalog {
     expr_ref ddnf::get_answer() {
         return m_imp->get_answer();
     }
-};
+}

src/muz/ddnf/ddnf.h

@@ -65,5 +65,5 @@ namespace datalog {
         void display(std::ostream& out) const;
         void display_statistics(std::ostream& out) const;
     };
-};
+}
 

src/muz/fp/datalog_parser.h

@@ -42,5 +42,5 @@ namespace datalog {
         virtual bool parse_directory(char const * path) = 0;
     };
 
-};
+}
 

src/muz/rel/check_relation.h

@@ -164,6 +164,6 @@ namespace datalog {
             unsigned_vector const& dst_eq,
             unsigned_vector const& neg_eq);
     };
-};
+}
        
 

src/muz/rel/dl_base.h

@@ -631,12 +631,12 @@ namespace datalog {
 
         class identity_mutator_fn : public mutator_fn {
         public:
-            void operator()(base_object & t) override {};
+            void operator()(base_object & t) override {}
         };
 
         class identity_intersection_filter_fn : public intersection_filter_fn {
         public:
-            void operator()(base_object & t, const base_object & neg) override {};
+            void operator()(base_object & t, const base_object & neg) override {}
         };
 
         class default_permutation_rename_fn : public transformer_fn {
@@ -1258,5 +1258,5 @@ namespace datalog {
             expr_ref_vector & renaming_arg);
 
 
-};
+}
 

src/muz/rel/dl_bound_relation.cpp

@@ -676,6 +676,6 @@ namespace datalog {
     }
 
 
-};
+}
 
 

src/muz/rel/dl_bound_relation.h

@@ -168,6 +168,6 @@ namespace datalog {
        
     };
         
-};
+}
 
 

src/muz/rel/dl_check_table.cpp

@@ -435,5 +435,5 @@ namespace datalog {
         return result;
     }
 
-};
+}
 

src/muz/rel/dl_check_table.h

@@ -129,5 +129,5 @@ namespace datalog {
         unsigned get_size_estimate_bytes() const override { return m_tocheck->get_size_estimate_bytes(); }
     };
 
- };
+ }
 

src/muz/rel/dl_compiler.h

@@ -279,6 +279,6 @@ namespace datalog {
     };
 
 
-};
+}
 
 

src/muz/rel/dl_external_relation.cpp

@@ -449,4 +449,4 @@ namespace datalog {
         return alloc(negation_filter_fn, *this, t, negated_obj, joined_col_cnt, t_cols, negated_cols);
     }
 
-};
+}

src/muz/rel/dl_external_relation.h

@@ -147,5 +147,5 @@ namespace datalog {
     };
 
 
-};
+}
 

src/muz/rel/dl_finite_product_relation.cpp

@@ -2372,4 +2372,4 @@ namespace datalog {
         bool_rewriter(m).mk_or(disjs.size(), disjs.data(), fml);
     }
 
-};
+}

src/muz/rel/dl_finite_product_relation.h

@@ -359,6 +359,6 @@ namespace datalog {
         void to_formula(expr_ref& fml) const override;
     };
 
-};
+}
 
 

src/muz/rel/dl_instruction.h

@@ -364,6 +364,6 @@ namespace datalog {
     };
 
 
-};
+}
 
 

src/muz/rel/dl_interval_relation.cpp

@@ -648,5 +648,5 @@ namespace datalog {
         return false;
     }
 
-};
+}
 

src/muz/rel/dl_interval_relation.h

@@ -134,6 +134,6 @@ namespace datalog {
 
     };
         
-};
+}
 
 

src/muz/rel/dl_mk_explanations.cpp

@@ -885,5 +885,5 @@ namespace datalog {
         return res.detach();
     }
     
-};
+}
 

src/muz/rel/dl_mk_explanations.h

@@ -79,6 +79,6 @@ namespace datalog {
 
         static expr* get_explanation(relation_base const& r);
     };
-};
+}
 
 

src/muz/rel/dl_mk_similarity_compressor.cpp

@@ -543,4 +543,4 @@ namespace datalog {
         reset();
         return result;
     }
-};
+}

src/muz/rel/dl_mk_similarity_compressor.h

@@ -71,6 +71,6 @@ namespace datalog {
         rule_set * operator()(rule_set const & source) override;
     };
 
-};
+}
 
 

src/muz/rel/dl_mk_simple_joins.cpp

@@ -751,5 +751,5 @@ namespace datalog {
     }
 
 
-};
+}
 

src/muz/rel/dl_mk_simple_joins.h

@@ -56,6 +56,6 @@ namespace datalog {
         rule_set * operator()(rule_set const & source) override;
     };
 
-};
+}
 
 

src/muz/rel/dl_product_relation.cpp

@@ -1128,7 +1128,7 @@ namespace datalog {
         }
     }
 
-};
+}
 
 
 

src/muz/rel/dl_product_relation.h

@@ -184,6 +184,6 @@ namespace datalog {
         }
     };
         
-};
+}
 
 

src/muz/rel/dl_relation_manager.cpp

@@ -1689,5 +1689,5 @@ namespace datalog {
         return res;
     }
 
-};
+}
 

src/muz/rel/dl_relation_manager.h

@@ -699,6 +699,6 @@ namespace datalog {
 
     };
 
-};
+}
 
 

src/muz/rel/dl_sieve_relation.cpp

@@ -662,4 +662,4 @@ namespace datalog {
     }
 
     
-};
+}

src/muz/rel/dl_sieve_relation.h

@@ -190,6 +190,6 @@ namespace datalog {
     };
 
 
-};
+}
 
 

src/muz/rel/dl_sparse_table.cpp

@@ -1404,5 +1404,5 @@ namespace datalog {
     }
 
 
-};
+}
 

src/muz/rel/dl_sparse_table.h

@@ -494,5 +494,5 @@ namespace datalog {
         bool knows_exact_size() const override { return true; }
     };
 
- };
+ }
 

src/muz/rel/dl_table.cpp

@@ -292,5 +292,5 @@ namespace datalog {
     table_base::iterator bitvector_table::end() const {
         return mk_iterator(alloc(bv_iterator, *this, true));
     }
-};
+}
 

src/muz/rel/dl_table.h

@@ -144,6 +144,6 @@ namespace datalog {
 
 
     
-};
+}
 
 

src/muz/rel/dl_table_relation.cpp

@@ -489,5 +489,5 @@ namespace datalog {
         }
     }
 
-};
+}
 

src/muz/rel/dl_table_relation.h

@@ -126,6 +126,6 @@ namespace datalog {
         bool knows_exact_size() const override { return m_table->knows_exact_size(); }
     };
 
-};
+}
 
 

src/muz/rel/dl_vector_relation.h

@@ -397,6 +397,6 @@ namespace datalog {
 
     };
         
-};
+}
 
 

src/muz/rel/karr_relation.cpp

@@ -789,4 +789,4 @@ namespace datalog {
         }
         return nullptr;
     }
-};
+}

src/muz/rel/karr_relation.h

@@ -80,6 +80,6 @@ namespace datalog {
     };
 
 
-};
+}
 
 

src/muz/rel/rel_context.cpp

@@ -630,4 +630,4 @@ namespace datalog {
     }
 
 
-};
+}

src/muz/rel/rel_context.h

@@ -125,5 +125,5 @@ namespace datalog {
         lbool saturate() override;
 
     };
-};
+}
 

src/muz/rel/udoc_relation.h

@@ -147,6 +147,6 @@ namespace datalog {
 
         void disable_fast_pass() { m_disable_fast_pass = true; }
     };
-};
+}
        
 

src/muz/spacer/spacer_concretize.cpp

@@ -36,7 +36,7 @@ struct proc {
         }
     }
 };
-}; // namespace pattern_var_marker_ns
+} // namespace pattern_var_marker_ns
 namespace spacer {
 void pob_concretizer::mark_pattern_vars() {
     pattern_var_marker_ns::proc proc(m_arith, m_var_marks);

src/muz/spacer/spacer_context.h

@@ -38,7 +38,7 @@ Notes:
 namespace datalog {
 class rule_set;
 class context;
-}; // namespace datalog
+} // namespace datalog
 
 namespace spacer {
 

src/muz/spacer/spacer_convex_closure.h

@@ -155,7 +155,7 @@ class convex_closure {
     void add_row(const vector<rational> &point) {
         SASSERT(point.size() == dims());
         m_data.add_row(point);
-    };
+    }
 
     bool operator()() { return this->compute(); }
     bool compute();

src/muz/spacer/spacer_farkas_learner.cpp

@@ -99,7 +99,7 @@ bool farkas_learner::is_pure_expr(func_decl_set const& symbs, expr* e, ast_manag
         return false;
     }
     return true;
-};
+}
 
 
 /**

src/muz/spacer/spacer_generalizers.cpp

@@ -327,4 +327,4 @@ void lemma_eq_generalizer::operator() (lemma_ref &lemma) {
 }
 
 
-};
+}

src/muz/spacer/spacer_mbc.cpp

@@ -66,7 +66,7 @@ public:
     }
 
 
-    void reset() {reset_partition();};
+    void reset() {reset_partition();}
     void reset_partition() {m_current_part = UINT_MAX;}
     unsigned partition() {return m_current_part;}
     bool found_partition() {return m_current_part < UINT_MAX;}

src/muz/spacer/spacer_proof_utils.cpp

@@ -845,4 +845,4 @@ namespace spacer {
         return res;
     }
 
-};
+}

src/muz/spacer/spacer_qe_project.h

@@ -43,5 +43,5 @@ namespace spacer_qe {
     void array_project_selects (model& model, app_ref_vector& arr_vars, expr_ref& fml, app_ref_vector& aux_vars);
 
     void array_project (model& model, app_ref_vector& arr_vars, expr_ref& fml, app_ref_vector& aux_vars, bool reduce_all_selects = false);
-};
+}
 

src/muz/spacer/spacer_sym_mux.h

@@ -35,7 +35,7 @@ private:
     public:
         func_decl_ref m_main;
         func_decl_ref_vector m_variants;
-        sym_mux_entry(ast_manager &m) : m_main(m), m_variants(m) {};
+        sym_mux_entry(ast_manager &m) : m_main(m), m_variants(m) {}
     };
 
     typedef obj_map<func_decl, sym_mux_entry*> decl2entry_map;

src/muz/spacer/spacer_unsat_core_learner.h

@@ -41,7 +41,7 @@ namespace spacer {
 
     public:
         unsat_core_learner(ast_manager& m, iuc_proof& pr) :
-            m(m), m_pr(pr), m_unsat_core(m) {};
+            m(m), m_pr(pr), m_unsat_core(m) {}
         virtual ~unsat_core_learner();
 
         ast_manager& get_manager() {return m;}

src/muz/spacer/spacer_unsat_core_plugin.cpp

@@ -35,7 +35,7 @@ Revision History:
 namespace spacer {
 
     unsat_core_plugin::unsat_core_plugin(unsat_core_learner& ctx):
-        m(ctx.get_manager()), m_ctx(ctx) {};
+        m(ctx.get_manager()), m_ctx(ctx) {}
 
     void unsat_core_plugin_lemma::compute_partial_core(proof* step) {
         SASSERT(m_ctx.is_a(step));

src/muz/spacer/spacer_unsat_core_plugin.h

@@ -40,7 +40,7 @@ namespace spacer {
 
     class unsat_core_plugin_lemma : public unsat_core_plugin {
     public:
-        unsat_core_plugin_lemma(unsat_core_learner& learner) : unsat_core_plugin(learner){};
+        unsat_core_plugin_lemma(unsat_core_learner& learner) : unsat_core_plugin(learner){}
         void compute_partial_core(proof* step) override;
     private:
         void add_lowest_split_to_core(proof* step) const;
@@ -53,7 +53,7 @@ namespace spacer {
                                        bool use_constant_from_a=true) :
             unsat_core_plugin(learner),
             m_split_literals(split_literals),
-            m_use_constant_from_a(use_constant_from_a) {};
+            m_use_constant_from_a(use_constant_from_a) {}
         void compute_partial_core(proof* step) override;
     private:
         bool m_split_literals;
@@ -66,7 +66,7 @@ namespace spacer {
 
     class unsat_core_plugin_farkas_lemma_optimized : public unsat_core_plugin {
     public:
-        unsat_core_plugin_farkas_lemma_optimized(unsat_core_learner& learner, ast_manager& m) : unsat_core_plugin(learner) {};
+        unsat_core_plugin_farkas_lemma_optimized(unsat_core_learner& learner, ast_manager& m) : unsat_core_plugin(learner) {}
         void compute_partial_core(proof* step) override;
         void finalize() override;
     protected:
@@ -79,7 +79,7 @@ namespace spacer {
 
     class unsat_core_plugin_farkas_lemma_bounded : public unsat_core_plugin_farkas_lemma_optimized {
     public:
-        unsat_core_plugin_farkas_lemma_bounded(unsat_core_learner& learner, ast_manager& m) : unsat_core_plugin_farkas_lemma_optimized(learner, m) {};
+        unsat_core_plugin_farkas_lemma_bounded(unsat_core_learner& learner, ast_manager& m) : unsat_core_plugin_farkas_lemma_optimized(learner, m) {}
         void finalize() override;
     };
 

src/muz/tab/tab_context.cpp

@@ -1306,7 +1306,7 @@ namespace tb {
         }
         return out << "unmatched instruction";
     }
-};
+}
 
 namespace datalog {
 
@@ -1655,4 +1655,4 @@ namespace datalog {
         return m_imp->get_answer();
     }
 
-};
+}

src/muz/tab/tab_context.h

@@ -39,5 +39,5 @@ namespace datalog {
         void display_certificate(std::ostream& out) const override;
         expr_ref get_answer() override;
     };
-};
+}
 

src/muz/transforms/dl_mk_array_blast.cpp

@@ -333,6 +333,6 @@ namespace datalog {
         return rules.detach();        
     }
 
-};
+}
 
 

src/muz/transforms/dl_mk_array_blast.h

@@ -69,6 +69,6 @@ namespace datalog {
 
     };
 
-};
+}
 
 

src/muz/transforms/dl_mk_array_eq_rewrite.h

@@ -44,5 +44,5 @@ namespace datalog {
 
 
 
-};
+}
 

src/muz/transforms/dl_mk_array_instantiation.h

@@ -116,5 +116,5 @@ namespace datalog {
 
 
 
-};
+}
 

src/muz/transforms/dl_mk_backwards.cpp

@@ -73,4 +73,4 @@ namespace datalog {
         return result.detach();
     }
 
-};
+}

src/muz/transforms/dl_mk_backwards.h

@@ -30,6 +30,6 @@ namespace datalog {
         rule_set * operator()(rule_set const & source) override;
     };
 
-};
+}
 
 

src/muz/transforms/dl_mk_bit_blast.cpp

@@ -334,4 +334,4 @@ namespace datalog {
         return (*m_impl)(source);
     }
 
-};
+}

src/muz/transforms/dl_mk_bit_blast.h

@@ -31,6 +31,6 @@ namespace datalog {
         rule_set * operator()(rule_set const & source) override;
     };
 
-};
+}
 
 

src/muz/transforms/dl_mk_coalesce.cpp

@@ -194,6 +194,6 @@ namespace datalog {
         return rules.detach();
     }
 
-};
+}
 
 

src/muz/transforms/dl_mk_coalesce.h

@@ -54,6 +54,6 @@ namespace datalog {
         rule_set * operator()(rule_set const & source) override;
     };
 
-};
+}
 
 

src/muz/transforms/dl_mk_filter_rules.cpp

@@ -166,4 +166,4 @@ namespace datalog {
         return m_result;
     }
 
-};
+}

src/muz/transforms/dl_mk_filter_rules.h

@@ -79,7 +79,7 @@ namespace datalog {
         rule_set * operator()(rule_set const & source) override;
     };
 
-};
+}
 
 
 

src/muz/transforms/dl_mk_interp_tail_simplifier.cpp

@@ -615,4 +615,4 @@ namespace datalog {
         return res.detach();
     }
 
-};
+}

src/muz/transforms/dl_mk_interp_tail_simplifier.h

@@ -102,6 +102,6 @@ namespace datalog {
         rule_set * operator()(rule_set const & source) override;
     };
 
-};
+}
 
 

src/muz/transforms/dl_mk_karr_invariants.cpp

@@ -308,5 +308,5 @@ namespace datalog {
 
 
 
-};
+}
 

src/muz/transforms/dl_mk_karr_invariants.h

@@ -68,6 +68,6 @@ namespace datalog {
     };
 
 
-};
+}
 
 

src/muz/transforms/dl_mk_loop_counter.cpp

@@ -153,4 +153,4 @@ namespace datalog {
         return result;
 
     }
-};
+}

src/muz/transforms/dl_mk_loop_counter.h

@@ -43,6 +43,6 @@ namespace datalog {
         rule_set * revert(rule_set const& source);
     };
 
-};
+}
 
 

src/muz/transforms/dl_mk_magic_sets.cpp

@@ -375,5 +375,5 @@ namespace datalog {
         result->add_rule(back_to_goal_rule);
         return result.detach();
     }
-};
+}
 

src/muz/transforms/dl_mk_magic_sets.h

@@ -128,6 +128,6 @@ namespace datalog {
         rule_set * operator()(rule_set const & source) override;
     };
 
-};
+}
 
 

src/muz/transforms/dl_mk_magic_symbolic.cpp

@@ -130,4 +130,4 @@ namespace datalog {
         return app_ref(m.mk_app(g, q->get_num_args(), q->get_args()), m);        
     }
 
-};
+}

src/muz/transforms/dl_mk_magic_symbolic.h

@@ -32,6 +32,6 @@ namespace datalog {
         rule_set * operator()(rule_set const & source) override;
     };
 
-};
+}
 
 

src/muz/transforms/dl_mk_quantifier_abstraction.cpp

@@ -361,4 +361,4 @@ namespace datalog {
     }
 
 
-};
+}

src/muz/transforms/dl_mk_quantifier_abstraction.h

@@ -55,6 +55,6 @@ namespace datalog {
 
 
 
-};
+}
 
 

src/muz/transforms/dl_mk_quantifier_instantiation.cpp

@@ -289,6 +289,6 @@ namespace datalog {
     }
 
 
-};
+}
 
 

src/muz/transforms/dl_mk_quantifier_instantiation.h

@@ -65,6 +65,6 @@ namespace datalog {
 
 
 
-};
+}
 
 

src/muz/transforms/dl_mk_rule_inliner.cpp

@@ -878,4 +878,4 @@ namespace datalog {
         return res.detach();
     }
 
-};
+}