mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-19 12:23:38 +00:00
Code Activity

random compiler nits

Browse source
This commit is contained in:
Nikolaj Bjorner 2020-09-29 03:38:54 -07:00
parent d007f7a601
commit ee909b6374
3 changed files with 42 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/ast/rewriter/arith_rewriter.h
View file

@ -27,9 +27,9 @@ protected:
typedef rational numeral; typedef rational numeral;
arith_util m_util; arith_util m_util;
scoped_ptr<seq_util> m_seq; scoped_ptr<seq_util> m_seq;
bool m_expand_power; bool m_expand_power{ false };
bool m_mul2power; bool m_mul2power{ false };
bool m_expand_tan; bool m_expand_tan{ false };
ast_manager & m() const { return m_util.get_manager(); } ast_manager & m() const { return m_util.get_manager(); }
family_id get_fid() const { return m_util.get_family_id(); } family_id get_fid() const { return m_util.get_family_id(); }

2
src/ast/rewriter/pb2bv_rewriter.cpp
View file

@ -1015,7 +1015,7 @@ struct pb2bv_rewriter::imp {
if (enc == symbol("ordered")) return sorting_network_encoding::ordered_at_most; if (enc == symbol("ordered")) return sorting_network_encoding::ordered_at_most;
if (enc == symbol("unate")) return sorting_network_encoding::unate_at_most; if (enc == symbol("unate")) return sorting_network_encoding::unate_at_most;
if (enc == symbol("circuit")) return sorting_network_encoding::circuit_at_most; if (enc == symbol("circuit")) return sorting_network_encoding::circuit_at_most;
return grouped_at_most; return sorting_network_encoding::grouped_at_most;
} }

76
src/util/sorting_network.h
View file

@ -23,7 +23,7 @@ Notes:
#pragma once #pragma once
enum sorting_network_encoding { enum class sorting_network_encoding {
sorted_at_most, sorted_at_most,
grouped_at_most, grouped_at_most,
bimander_at_most, bimander_at_most,
@ -34,12 +34,12 @@ Notes:
inline std::ostream& operator<<(std::ostream& out, sorting_network_encoding enc) { inline std::ostream& operator<<(std::ostream& out, sorting_network_encoding enc) {
switch (enc) { switch (enc) {
case grouped_at_most: return out << "grouped"; case sorting_network_encoding::grouped_at_most: return out << "grouped";
case bimander_at_most: return out << "bimander"; case sorting_network_encoding::bimander_at_most: return out << "bimander";
case ordered_at_most: return out << "ordered"; case sorting_network_encoding::ordered_at_most: return out << "ordered";
case sorted_at_most: return out << "sorted"; case sorting_network_encoding::sorted_at_most: return out << "sorted";
case unate_at_most: return out << "unate"; case sorting_network_encoding::unate_at_most: return out << "unate";
case circuit_at_most: return out << "circuit"; case sorting_network_encoding::circuit_at_most: return out << "circuit";
} }
return out << "???"; return out << "???";
} }
@ -47,7 +47,7 @@ Notes:
struct sorting_network_config { struct sorting_network_config {
sorting_network_encoding m_encoding; sorting_network_encoding m_encoding;
sorting_network_config() { sorting_network_config() {
m_encoding = sorted_at_most; m_encoding = sorting_network_encoding::sorted_at_most;
} }
}; };
@ -245,18 +245,18 @@ Notes:
} }
else { else {
switch (m_cfg.m_encoding) { switch (m_cfg.m_encoding) {
case sorted_at_most: case sorting_network_encoding::sorted_at_most:
case bimander_at_most: case sorting_network_encoding::bimander_at_most:
case ordered_at_most: case sorting_network_encoding::ordered_at_most:
case grouped_at_most: case sorting_network_encoding::grouped_at_most:
SASSERT(2*k <= n); SASSERT(2*k <= n);
m_t = full?GE_FULL:GE; m_t = full?GE_FULL:GE;
// scoped_stats _ss(m_stats, k, n); // scoped_stats _ss(m_stats, k, n);
psort_nw<psort_expr>::card(k, n, xs, out); psort_nw<psort_expr>::card(k, n, xs, out);
return out[k-1]; return out[k-1];
case unate_at_most: case sorting_network_encoding::unate_at_most:
return unate_ge(full, k, n, xs); return unate_ge(full, k, n, xs);
case circuit_at_most: case sorting_network_encoding::circuit_at_most:
return circuit_ge(full, k, n, xs); return circuit_ge(full, k, n, xs);
default: default:
UNREACHABLE(); UNREACHABLE();
@ -278,14 +278,14 @@ Notes:
literal_vector ors; literal_vector ors;
// scoped_stats _ss(m_stats, k, n); // scoped_stats _ss(m_stats, k, n);
switch (m_cfg.m_encoding) { switch (m_cfg.m_encoding) {
case grouped_at_most: case sorting_network_encoding::grouped_at_most:
case sorted_at_most: case sorting_network_encoding::sorted_at_most:
case unate_at_most: case sorting_network_encoding::unate_at_most:
case circuit_at_most: case sorting_network_encoding::circuit_at_most:
return mk_at_most_1(full, n, xs, ors, false); return mk_at_most_1(full, n, xs, ors, false);
case bimander_at_most: case sorting_network_encoding::bimander_at_most:
return mk_at_most_1_bimander(full, n, xs, ors); return mk_at_most_1_bimander(full, n, xs, ors);
case ordered_at_most: case sorting_network_encoding::ordered_at_most:
return mk_ordered_atmost_1(full, n, xs); return mk_ordered_atmost_1(full, n, xs);
default: default:
@ -295,18 +295,18 @@ Notes:
} }
else { else {
switch (m_cfg.m_encoding) { switch (m_cfg.m_encoding) {
case sorted_at_most: case sorting_network_encoding::sorted_at_most:
case bimander_at_most: case sorting_network_encoding::bimander_at_most:
case ordered_at_most: case sorting_network_encoding::ordered_at_most:
case grouped_at_most: case sorting_network_encoding::grouped_at_most:
SASSERT(2*k <= n); SASSERT(2*k <= n);
m_t = full?LE_FULL:LE; m_t = full?LE_FULL:LE;
// scoped_stats _ss(m_stats, k, n); // scoped_stats _ss(m_stats, k, n);
card(k + 1, n, xs, out); card(k + 1, n, xs, out);
return mk_not(out[k]); return mk_not(out[k]);
case unate_at_most: case sorting_network_encoding::unate_at_most:
return unate_le(full, k, n, xs); return unate_le(full, k, n, xs);
case circuit_at_most: case sorting_network_encoding::circuit_at_most:
return circuit_le(full, k, n, xs); return circuit_le(full, k, n, xs);
default: default:
UNREACHABLE(); UNREACHABLE();
@ -330,10 +330,10 @@ Notes:
} }
else { else {
switch (m_cfg.m_encoding) { switch (m_cfg.m_encoding) {
case sorted_at_most: case sorting_network_encoding::sorted_at_most:
case bimander_at_most: case sorting_network_encoding::bimander_at_most:
case grouped_at_most: case sorting_network_encoding::grouped_at_most:
case ordered_at_most: case sorting_network_encoding::ordered_at_most:
// scoped_stats _ss(m_stats, k, n); // scoped_stats _ss(m_stats, k, n);
SASSERT(2*k <= n); SASSERT(2*k <= n);
m_t = EQ; m_t = EQ;
@ -345,9 +345,9 @@ Notes:
else { else {
return mk_min(out[k-1], mk_not(out[k])); return mk_min(out[k-1], mk_not(out[k]));
} }
case unate_at_most: case sorting_network_encoding::unate_at_most:
return unate_eq(k, n, xs); return unate_eq(k, n, xs);
case circuit_at_most: case sorting_network_encoding::circuit_at_most:
return circuit_eq(k, n, xs); return circuit_eq(k, n, xs);
default: default:
UNREACHABLE(); UNREACHABLE();
@ -698,16 +698,16 @@ Notes:
literal_vector ors; literal_vector ors;
literal r1; literal r1;
switch (m_cfg.m_encoding) { switch (m_cfg.m_encoding) {
case grouped_at_most: case sorting_network_encoding::grouped_at_most:
case sorted_at_most: case sorting_network_encoding::sorted_at_most:
case unate_at_most: case sorting_network_encoding::unate_at_most:
case circuit_at_most: case sorting_network_encoding::circuit_at_most:
r1 = mk_at_most_1(full, n, xs, ors, true); r1 = mk_at_most_1(full, n, xs, ors, true);
break; break;
case bimander_at_most: case sorting_network_encoding::bimander_at_most:
r1 = mk_at_most_1_bimander(full, n, xs, ors); r1 = mk_at_most_1_bimander(full, n, xs, ors);
break; break;
case ordered_at_most: case sorting_network_encoding::ordered_at_most:
return mk_ordered_exactly_1(full, n, xs); return mk_ordered_exactly_1(full, n, xs);
default: default:
UNREACHABLE(); UNREACHABLE();