mirror of
https://github.com/Z3Prover/z3
synced 2026-07-25 00:12:34 +00:00
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.)
This commit is contained in:
parent
69444de05b
commit
6ac3075022
429 changed files with 477 additions and 476 deletions
|
|
@ -36,7 +36,7 @@ namespace sls {
|
|||
for (unsigned i = 1; i < a.sel->num_args(); ++i)
|
||||
h ^= a.sel->get_arg(i)->get_root()->hash();
|
||||
return h;
|
||||
};
|
||||
}
|
||||
};
|
||||
struct select_args_eq {
|
||||
bool operator()(select_args const& a, select_args const& b) const {
|
||||
|
|
@ -103,13 +103,13 @@ namespace sls {
|
|||
euf::enode* mk_select(euf::egraph& g, euf::enode* b, euf::enode* sel);
|
||||
|
||||
void resolve_conflict();
|
||||
size_t* to_ptr(sat::literal l) { return reinterpret_cast<size_t*>((size_t)(l.index() << 4)); };
|
||||
size_t* to_ptr(sat::literal l) { return reinterpret_cast<size_t*>((size_t)(l.index() << 4)); }
|
||||
size_t* to_ptr(euf::enode* t) { return reinterpret_cast<size_t*>((reinterpret_cast<size_t>(t) << 4) + 1); }
|
||||
size_t* to_ptr(unsigned n) { return reinterpret_cast<size_t*>((size_t)(n << 4) + 3); }
|
||||
bool is_literal(size_t* p) { return (reinterpret_cast<size_t>(p) & 3) == 0; }
|
||||
bool is_index(size_t* p) { return (reinterpret_cast<size_t>(p) & 3) == 3; }
|
||||
bool is_enode(size_t* p) { return (reinterpret_cast<size_t>(p) & 3) == 1; }
|
||||
sat::literal to_literal(size_t* p) { return sat::to_literal(static_cast<unsigned>(reinterpret_cast<size_t>(p) >> 4)); };
|
||||
sat::literal to_literal(size_t* p) { return sat::to_literal(static_cast<unsigned>(reinterpret_cast<size_t>(p) >> 4)); }
|
||||
euf::enode* to_enode(size_t* p) { return reinterpret_cast<euf::enode*>(reinterpret_cast<size_t>(p) >> 4); }
|
||||
unsigned to_index(size_t* p) { return static_cast<unsigned>(reinterpret_cast<size_t>(p) >> 4); }
|
||||
|
||||
|
|
|
|||
|
|
@ -871,8 +871,8 @@ namespace sls {
|
|||
if (m_la.m_config.use_top_level_assertions)
|
||||
return m_la.ctx.input_assertions().get(idx);
|
||||
return m_la.ctx.atom(m_la.ctx.root_literals()[idx].var());
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ class sls_tracker {
|
|||
mpz m_zero, m_one, m_two;
|
||||
|
||||
struct value_score {
|
||||
value_score() : value(unsynch_mpz_manager::mk_z(0)) {};
|
||||
value_score() : value(unsynch_mpz_manager::mk_z(0)) {}
|
||||
value_score(value_score&&) noexcept = default;
|
||||
value_score(const value_score &other) {
|
||||
m = other.m;
|
||||
|
|
|
|||
|
|
@ -44,15 +44,15 @@ namespace sls {
|
|||
virtual expr_ref get_value(expr* e) = 0;
|
||||
virtual bool is_fixed(expr* e, expr_ref& value) { return false; }
|
||||
virtual void initialize() = 0;
|
||||
virtual void start_propagation() {};
|
||||
virtual void start_propagation() {}
|
||||
virtual bool propagate() = 0;
|
||||
virtual void propagate_literal(sat::literal lit) = 0;
|
||||
virtual void repair_literal(sat::literal lit) = 0;
|
||||
virtual bool repair_down(app* e) = 0;
|
||||
virtual void repair_up(app* e) = 0;
|
||||
virtual bool is_sat() = 0;
|
||||
virtual void on_rescale() {};
|
||||
virtual void on_restart() {};
|
||||
virtual void on_rescale() {}
|
||||
virtual void on_restart() {}
|
||||
virtual std::ostream& display(std::ostream& out) const = 0;
|
||||
virtual bool set_value(expr* e, expr* v) = 0;
|
||||
virtual void collect_statistics(statistics& st) const = 0;
|
||||
|
|
|
|||
|
|
@ -52,8 +52,8 @@ namespace sls {
|
|||
|
||||
bool is_user_sort(sort* s) { return s->get_family_id() == user_sort_family_id; }
|
||||
|
||||
size_t* to_ptr(sat::literal l) { return reinterpret_cast<size_t*>((size_t)(l.index() << 4)); };
|
||||
sat::literal to_literal(size_t* p) { return sat::to_literal(static_cast<unsigned>(reinterpret_cast<size_t>(p) >> 4)); };
|
||||
size_t* to_ptr(sat::literal l) { return reinterpret_cast<size_t*>((size_t)(l.index() << 4)); }
|
||||
sat::literal to_literal(size_t* p) { return sat::to_literal(static_cast<unsigned>(reinterpret_cast<size_t>(p) >> 4)); }
|
||||
|
||||
void validate_model();
|
||||
void log_clause(sat::literal_vector const& lits);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue