Skip to content

Commit 905fba4

Browse files
Stop output of useless warning
The thing we warn about is not an error in itself and it's unlikely the user will understand what this talks about.
1 parent 7943595 commit 905fba4

File tree

1 file changed

+9
-14
lines changed

1 file changed

+9
-14
lines changed

src/solvers/refinement/string_refinement.cpp

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@ static void update_index_set(
105105
/// \param val: an index expression
106106
/// \return `axiom` with substitued `qvar`
107107
static exprt instantiate(
108-
messaget::mstreamt &stream,
109108
const string_constraintt &axiom,
110109
const exprt &str,
111110
const exprt &val);
@@ -229,7 +228,6 @@ static void display_index_set(
229228
/// (See `instantiate(const string_not_contains_constraintt&,const index_set_pairt&,const string_constraint_generatort&,const std::map<string_not_contains_constraintt, symbol_exprt>&)`
230229
/// for details)
231230
static std::vector<exprt> generate_instantiations(
232-
messaget::mstreamt &stream,
233231
const string_constraint_generatort &generator,
234232
const index_set_pairt &index_set,
235233
const string_axiomst &axioms,
@@ -242,7 +240,7 @@ static std::vector<exprt> generate_instantiations(
242240
for(const auto &univ_axiom : axioms.universal)
243241
{
244242
for(const auto &j : i.second)
245-
lemmas.push_back(instantiate(stream, univ_axiom, i.first, j));
243+
lemmas.push_back(instantiate(univ_axiom, i.first, j));
246244
}
247245
}
248246
for(const auto &nc_axiom : axioms.not_contains)
@@ -762,8 +760,9 @@ decision_proceduret::resultt string_refinementt::dec_solve()
762760
initial_index_set(index_sets, ns, axioms);
763761
update_index_set(index_sets, ns, current_constraints);
764762
current_constraints.clear();
765-
for(const auto &instance : generate_instantiations(
766-
debug(), generator, index_sets, axioms, not_contain_witnesses))
763+
const auto instances = generate_instantiations(
764+
generator, index_sets, axioms, not_contain_witnesses);
765+
for(const auto &instance : instances)
767766
add_lemma(instance);
768767

769768
while((loop_bound_--)>0)
@@ -819,8 +818,9 @@ decision_proceduret::resultt string_refinementt::dec_solve()
819818
}
820819
}
821820
current_constraints.clear();
822-
for(const auto &instance : generate_instantiations(
823-
debug(), generator, index_sets, axioms, not_contain_witnesses))
821+
const auto instances = generate_instantiations(
822+
generator, index_sets, axioms, not_contain_witnesses);
823+
for(const auto &instance : instances)
824824
add_lemma(instance);
825825
}
826826
else
@@ -1519,7 +1519,6 @@ exprt simplify_sum(const exprt &f)
15191519
/// $q + x$, `compute_inverse_function(q,v,f)` returns an expression
15201520
/// for $v - x$.
15211521
static exprt compute_inverse_function(
1522-
messaget::mstreamt &stream,
15231522
const exprt &qvar,
15241523
const exprt &val,
15251524
const exprt &f)
@@ -1550,8 +1549,6 @@ static exprt compute_inverse_function(
15501549
"a proper function must have exactly one "
15511550
"occurrences after reduction, or it cancelled out, and it does not"
15521551
" have one"));
1553-
stream << "in string_refinementt::compute_inverse_function:"
1554-
<< " warning: occurrences of qvar cancelled out " << messaget::eom;
15551552
}
15561553

15571554
elems.erase(it);
@@ -1830,13 +1827,11 @@ find_indexes(const exprt &expr, const exprt &str, const symbol_exprt &qvar)
18301827
/// For instance, if `axiom` corresponds to \f$\forall q. s[q+x]={\tt 'a'} \land
18311828
/// t[q]={\tt 'b'} \f$, `instantiate(axiom,s,v)` would return an expression for
18321829
/// \f$s[v]={\tt 'a'} \land t[v-x]={\tt 'b'}\f$.
1833-
/// \param stream: a message stream
18341830
/// \param axiom: a universally quantified formula `axiom`
18351831
/// \param str: an array of characters
18361832
/// \param val: an index expression
18371833
/// \return instantiated formula
18381834
static exprt instantiate(
1839-
messaget::mstreamt &stream,
18401835
const string_constraintt &axiom,
18411836
const exprt &str,
18421837
const exprt &val)
@@ -1849,8 +1844,8 @@ static exprt instantiate(
18491844
for(const auto &index : indexes)
18501845
{
18511846
const exprt univ_var_value =
1852-
compute_inverse_function(stream, axiom.univ_var, val, index);
1853-
implies_exprt instance(
1847+
compute_inverse_function(axiom.univ_var, val, index);
1848+
exprt instance = implies_exprt(
18541849
and_exprt(
18551850
binary_relation_exprt(axiom.univ_var, ID_ge, axiom.lower_bound),
18561851
binary_relation_exprt(axiom.univ_var, ID_lt, axiom.upper_bound)),

0 commit comments

Comments
 (0)