@@ -105,7 +105,6 @@ static void update_index_set(
105
105
// / \param val: an index expression
106
106
// / \return `axiom` with substitued `qvar`
107
107
static exprt instantiate (
108
- messaget::mstreamt &stream,
109
108
const string_constraintt &axiom,
110
109
const exprt &str,
111
110
const exprt &val);
@@ -229,7 +228,6 @@ static void display_index_set(
229
228
// / (See `instantiate(const string_not_contains_constraintt&,const index_set_pairt&,const string_constraint_generatort&,const std::map<string_not_contains_constraintt, symbol_exprt>&)`
230
229
// / for details)
231
230
static std::vector<exprt> generate_instantiations (
232
- messaget::mstreamt &stream,
233
231
const string_constraint_generatort &generator,
234
232
const index_set_pairt &index_set,
235
233
const string_axiomst &axioms,
@@ -242,7 +240,7 @@ static std::vector<exprt> generate_instantiations(
242
240
for (const auto &univ_axiom : axioms.universal )
243
241
{
244
242
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));
246
244
}
247
245
}
248
246
for (const auto &nc_axiom : axioms.not_contains )
@@ -762,8 +760,9 @@ decision_proceduret::resultt string_refinementt::dec_solve()
762
760
initial_index_set (index_sets, ns, axioms);
763
761
update_index_set (index_sets, ns, current_constraints);
764
762
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)
767
766
add_lemma (instance);
768
767
769
768
while ((loop_bound_--)>0 )
@@ -819,8 +818,9 @@ decision_proceduret::resultt string_refinementt::dec_solve()
819
818
}
820
819
}
821
820
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)
824
824
add_lemma (instance);
825
825
}
826
826
else
@@ -1519,7 +1519,6 @@ exprt simplify_sum(const exprt &f)
1519
1519
// / $q + x$, `compute_inverse_function(q,v,f)` returns an expression
1520
1520
// / for $v - x$.
1521
1521
static exprt compute_inverse_function (
1522
- messaget::mstreamt &stream,
1523
1522
const exprt &qvar,
1524
1523
const exprt &val,
1525
1524
const exprt &f)
@@ -1550,8 +1549,6 @@ static exprt compute_inverse_function(
1550
1549
" a proper function must have exactly one "
1551
1550
" occurrences after reduction, or it cancelled out, and it does not"
1552
1551
" have one" ));
1553
- stream << " in string_refinementt::compute_inverse_function:"
1554
- << " warning: occurrences of qvar cancelled out " << messaget::eom;
1555
1552
}
1556
1553
1557
1554
elems.erase (it);
@@ -1830,13 +1827,11 @@ find_indexes(const exprt &expr, const exprt &str, const symbol_exprt &qvar)
1830
1827
// / For instance, if `axiom` corresponds to \f$\forall q. s[q+x]={\tt 'a'} \land
1831
1828
// / t[q]={\tt 'b'} \f$, `instantiate(axiom,s,v)` would return an expression for
1832
1829
// / \f$s[v]={\tt 'a'} \land t[v-x]={\tt 'b'}\f$.
1833
- // / \param stream: a message stream
1834
1830
// / \param axiom: a universally quantified formula `axiom`
1835
1831
// / \param str: an array of characters
1836
1832
// / \param val: an index expression
1837
1833
// / \return instantiated formula
1838
1834
static exprt instantiate (
1839
- messaget::mstreamt &stream,
1840
1835
const string_constraintt &axiom,
1841
1836
const exprt &str,
1842
1837
const exprt &val)
@@ -1849,7 +1844,7 @@ static exprt instantiate(
1849
1844
for (const auto &index : indexes)
1850
1845
{
1851
1846
const exprt univ_var_value =
1852
- compute_inverse_function (stream, axiom.univ_var , val, index );
1847
+ compute_inverse_function (axiom.univ_var , val, index );
1853
1848
implies_exprt instance (
1854
1849
and_exprt (
1855
1850
binary_relation_exprt (axiom.univ_var , ID_ge, axiom.lower_bound ),
0 commit comments