Rename function to find_symbols_or_nexts

This avoids ambiguity with the other find_symbols functions

Author: romainbrenguier

src/ansi-c/expr2c.cpp

@@ -113,7 +113,7 @@ static std::string clean_identifier(const irep_idt &id)
 void expr2ct::get_shorthands(const exprt &expr)
 {
   find_symbols_sett symbols;
-  find_symbols(expr, symbols);
+  find_symbols_or_nexts(expr, symbols);
 
   // avoid renaming parameters, if possible
   for(const auto &symbol_id : symbols)

src/goto-instrument/accelerate/accelerate.cpp

@@ -392,11 +392,11 @@ void acceleratet::add_dirty_checks()
     find_symbols_sett read;
 
     if(it->has_condition())
-      find_symbols(it->get_condition(), read);
+      find_symbols_or_nexts(it->get_condition(), read);
 
     if(it->is_assign())
     {
-      find_symbols(it->get_assign().rhs(), read);
+      find_symbols_or_nexts(it->get_assign().rhs(), read);
     }
 
     for(find_symbols_sett::iterator jt=read.begin();

src/goto-instrument/accelerate/acceleration_utils.cpp

@@ -211,7 +211,8 @@ void acceleration_utilst::stash_variables(
   expr_sett modified,
   substitutiont &substitution)
 {
-  find_symbols_sett vars = find_symbols(modified.begin(), modified.end());
+  find_symbols_sett vars =
+    find_symbols_or_nexts(modified.begin(), modified.end());
   const irep_idt &loop_counter_name =
     to_symbol_expr(loop_counter).get_identifier();
   vars.erase(loop_counter_name);

src/goto-instrument/accelerate/polynomial_accelerator.cpp

@@ -752,7 +752,8 @@ void polynomial_acceleratort::stash_variables(
   expr_sett modified,
   substitutiont &substitution)
 {
-  find_symbols_sett vars = find_symbols(modified.begin(), modified.end());
+  find_symbols_sett vars =
+    find_symbols_or_nexts(modified.begin(), modified.end());
   irep_idt loop_counter_name=to_symbol_expr(loop_counter).get_identifier();
   vars.erase(loop_counter_name);
 

src/goto-instrument/dump_c.cpp

@@ -849,7 +849,7 @@ void dump_ct::convert_global_variable(
 
   find_symbols_sett syms;
   if(symbol.value.is_not_nil())
-    find_symbols(symbol.value, syms);
+    find_symbols_or_nexts(symbol.value, syms);
 
   // add a tentative declaration to cater for symbols in the initializer
   // relying on it this symbol

src/goto-instrument/full_slicer.cpp

@@ -67,7 +67,7 @@ void full_slicert::add_decl_dead(
 
   find_symbols_sett syms;
 
-  node.PC->apply([&syms](const exprt &e) { find_symbols(e, syms); });
+  node.PC->apply([&syms](const exprt &e) { find_symbols_or_nexts(e, syms); });
 
   for(find_symbols_sett::const_iterator
       it=syms.begin();

src/goto-programs/goto_program.cpp

@@ -716,7 +716,7 @@ void goto_programt::instructiont::validate(
   auto expr_symbol_finder = [&](const exprt &e) {
     find_symbols_sett typetags;
     find_type_symbols(e.type(), typetags);
-    find_symbols(e, typetags);
+    find_symbols_or_nexts(e, typetags);
     const symbolt *symbol;
     for(const auto &identifier : typetags)
     {

src/goto-symex/postcondition.cpp

@@ -165,7 +165,7 @@ bool postconditiont::is_used(
     const auto original_names = make_range(expr_set).map(
       [](const exprt &e) { return get_original_name(e); });
     const std::unordered_set<irep_idt> symbols =
-      find_symbols(original_names.begin(), original_names.end());
+      find_symbols_or_nexts(original_names.begin(), original_names.end());
     return symbols.find(identifier)!=symbols.end();
   }
   else

src/goto-symex/precondition.cpp

@@ -115,7 +115,7 @@ void preconditiont::compute_rec(exprt &dest)
     const std::vector<exprt> expr_set = value_sets.get_values(
       SSA_step.source.function_id, target, deref_expr.pointer());
     const std::unordered_set<irep_idt> symbols =
-      find_symbols(expr_set.begin(), expr_set.end());
+      find_symbols_or_nexts(expr_set.begin(), expr_set.end());
 
     if(symbols.find(lhs_identifier)!=symbols.end())
     {

src/goto-symex/symex_dead.cpp

@@ -32,7 +32,7 @@ void goto_symext::symex_dead(statet &state, const symbol_exprt &symbol_expr)
 
   const exprt fields = state.field_sensitivity.get_fields(ns, state, ssa);
   find_symbols_sett fields_set;
-  find_symbols(fields, fields_set);
+  find_symbols_or_nexts(fields, fields_set);
 
   for(const irep_idt &l1_identifier : fields_set)
   {

src/util/find_symbols.cpp

@@ -15,9 +15,7 @@ Author: Daniel Kroening, [email protected]
 
 enum class kindt { F_TYPE, F_TYPE_NON_PTR, F_EXPR, F_BOTH };
 
-void find_symbols(
-  const exprt &src,
-  find_symbols_sett &dest)
+void find_symbols_or_nexts(const exprt &src, find_symbols_sett &dest)
 {
   find_symbols(src, dest, true, true);
 }

src/util/find_symbols.h

@@ -25,20 +25,19 @@ typedef std::unordered_set<irep_idt> find_symbols_sett;
 
 /// Add to the set \p dest the sub-expressions of \p src with id ID_symbol or
 /// ID_next_symbol
-void find_symbols(
-  const exprt &src,
-  find_symbols_sett &dest);
+void find_symbols_or_nexts(const exprt &src, find_symbols_sett &dest);
 
 /// \return set of sub-expressions of the expressions contained in the range
 ///   defined by \p begin and \p end which have id ID_symbol or ID_next_symbol
 template <typename iteratort>
-find_symbols_sett find_symbols(iteratort begin, iteratort end)
+find_symbols_sett find_symbols_or_nexts(iteratort begin, iteratort end)
 {
   static_assert(
     std::is_base_of<exprt, typename iteratort::value_type>::value,
     "find_symbols takes exprt iterators as arguments");
   find_symbols_sett result;
-  std::for_each(begin, end, [&](const exprt &e){ find_symbols(e, result); });
+  std::for_each(
+    begin, end, [&](const exprt &e) { find_symbols_or_nexts(e, result); });
   return result;
 }