mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-27 00:18:45 +00:00
Code Activity

fix #1496

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2018-02-22 08:05:28 +09:00
parent d70ee71a43
commit a4c58ec4c2
6 changed files with 13 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/ast/rewriter/seq_rewriter.cpp
View file

@ -1475,9 +1475,7 @@ br_status seq_rewriter::mk_re_star(expr* a, expr_ref& result) {
return BR_DONE; return BR_DONE;
} }
if (m_util.re.is_full_char(a)) { if (m_util.re.is_full_char(a)) {
sort* seq_sort = nullptr; result = m_util.re.mk_full_seq(m().get_sort(a));
VERIFY(m_util.is_re(a, seq_sort));
result = m_util.re.mk_full_seq(seq_sort);
return BR_DONE; return BR_DONE;
} }
if (m_util.re.is_empty(a)) { if (m_util.re.is_empty(a)) {

8
src/ast/seq_decl_plugin.cpp
View file

@ -671,9 +671,7 @@ func_decl * seq_decl_plugin::mk_func_decl(decl_kind k, unsigned num_parameters,
return m.mk_func_decl(m_sigs[k]->m_name, arity, domain, rng, func_decl_info(m_family_id, k)); return m.mk_func_decl(m_sigs[k]->m_name, arity, domain, rng, func_decl_info(m_family_id, k));
case _OP_REGEXP_FULL_CHAR: case _OP_REGEXP_FULL_CHAR:
if (!range) { if (!range) range = m_re;
range = m_re;
}
match(*m_sigs[k], arity, domain, range, rng); match(*m_sigs[k], arity, domain, range, rng);
return m.mk_func_decl(symbol("re.allchar"), arity, domain, rng, func_decl_info(m_family_id, OP_RE_FULL_CHAR_SET)); return m.mk_func_decl(symbol("re.allchar"), arity, domain, rng, func_decl_info(m_family_id, OP_RE_FULL_CHAR_SET));
@ -690,9 +688,7 @@ func_decl * seq_decl_plugin::mk_func_decl(decl_kind k, unsigned num_parameters,
return m.mk_func_decl(m_sigs[k]->m_name, arity, domain, range, func_decl_info(m_family_id, k)); return m.mk_func_decl(m_sigs[k]->m_name, arity, domain, range, func_decl_info(m_family_id, k));
case _OP_REGEXP_EMPTY: case _OP_REGEXP_EMPTY:
if (!range) { if (!range) range = m_re;
range = m_re;
}
match(*m_sigs[k], arity, domain, range, rng); match(*m_sigs[k], arity, domain, range, rng);
return m.mk_func_decl(symbol("re.nostr"), arity, domain, rng, func_decl_info(m_family_id, OP_RE_EMPTY_SET)); return m.mk_func_decl(symbol("re.nostr"), arity, domain, rng, func_decl_info(m_family_id, OP_RE_EMPTY_SET));

8
src/muz/pdr/pdr_context.cpp
View file

@ -1736,6 +1736,7 @@ namespace pdr {
} }
void context::validate_model() { void context::validate_model() {
IF_VERBOSE(1, verbose_stream() << "(pdr.validate_model)\n";);
std::stringstream msg; std::stringstream msg;
expr_ref_vector refs(m); expr_ref_vector refs(m);
expr_ref tmp(m); expr_ref tmp(m);
@ -1745,11 +1746,10 @@ namespace pdr {
get_level_property(m_inductive_lvl, refs, rs); get_level_property(m_inductive_lvl, refs, rs);
inductive_property ex(m, mc, rs); inductive_property ex(m, mc, rs);
ex.to_model(model); ex.to_model(model);
decl2rel::iterator it = m_rels.begin(), end = m_rels.end();
var_subst vs(m, false); var_subst vs(m, false);
expr_free_vars fv; expr_free_vars fv;
for (; it != end; ++it) { for (auto const& kv : m_rels) {
ptr_vector<datalog::rule> const& rules = it->m_value->rules(); ptr_vector<datalog::rule> const& rules = kv.m_value->rules();
for (unsigned i = 0; i < rules.size(); ++i) { for (unsigned i = 0; i < rules.size(); ++i) {
datalog::rule& r = *rules[i]; datalog::rule& r = *rules[i];
model->eval(r.get_head(), tmp); model->eval(r.get_head(), tmp);
@ -1916,7 +1916,7 @@ namespace pdr {
verbose_stream() << ex.to_string(); verbose_stream() << ex.to_string();
}); });
// upgrade invariants that are known to be inductive. // upgrade invariants that are known to be inductive.
decl2rel::iterator it = m_rels.begin (), end = m_rels.end (); decl2rel::iterator it = m_rels.begin (), end = m_rels.end ();
for (; m_inductive_lvl > 0 && it != end; ++it) { for (; m_inductive_lvl > 0 && it != end; ++it) {
if (it->m_value->head() != m_query_pred) { if (it->m_value->head() != m_query_pred) {

4
src/util/lp/dense_matrix.h
View file

@ -79,8 +79,8 @@ public:
void apply_from_left_to_X(vector<X> & w, lp_settings & ); void apply_from_left_to_X(vector<X> & w, lp_settings & );
virtual void set_number_of_rows(unsigned /*m*/) {} void set_number_of_rows(unsigned /*m*/) override {}
virtual void set_number_of_columns(unsigned /*n*/) { } void set_number_of_columns(unsigned /*n*/) override {}
T get_elem(unsigned i, unsigned j) const { return m_values[i * m_n + j]; } T get_elem(unsigned i, unsigned j) const { return m_values[i * m_n + j]; }

4
src/util/lp/lu.h
View file

@ -74,8 +74,8 @@ public:
#ifdef Z3DEBUG #ifdef Z3DEBUG
unsigned m_m; unsigned m_m;
unsigned m_n; unsigned m_n;
virtual void set_number_of_rows(unsigned m) { m_m = m; m_n = m; } void set_number_of_rows(unsigned m) override { m_m = m; m_n = m; }
virtual void set_number_of_columns(unsigned n) { m_m = n; m_n = n; } void set_number_of_columns(unsigned n) override { m_m = n; m_n = n; }
T m_one_over_val; T m_one_over_val;
T get_elem (unsigned i, unsigned j) const; T get_elem (unsigned i, unsigned j) const;

4
src/util/lp/sparse_matrix.h
View file

@ -305,8 +305,8 @@ public:
T get_elem(unsigned i, unsigned j) const { return get(i, j); } T get_elem(unsigned i, unsigned j) const { return get(i, j); }
unsigned get_number_of_rows() const { return dimension(); } unsigned get_number_of_rows() const { return dimension(); }
unsigned get_number_of_columns() const { return dimension(); } unsigned get_number_of_columns() const { return dimension(); }
virtual void set_number_of_rows(unsigned /*m*/) { } void set_number_of_rows(unsigned /*m*/) override { }
virtual void set_number_of_columns(unsigned /*n*/) { } void set_number_of_columns(unsigned /*n*/) override { }
#endif #endif
template <typename L> template <typename L>
L dot_product_with_row (unsigned row, const vector<L> & y) const; L dot_product_with_row (unsigned row, const vector<L> & y) const;