Make simplify_exprt::get_values file-local

This procedure is used in exactly one method, and does not use any class
members. Thus, move it to the file that method resides in. Also remove
the now-unnecessary forall_ macro and replace the previous use by ranged
for.

Author: tautschnig

.clang-format

@@ -55,7 +55,6 @@ ForEachMacros: [
   'Forall_irep',
   'forall_named_irep',
   'Forall_named_irep',
-  'forall_value_list',
   'forall_symbol_base_map',
   'forall_subtypes',
   'Forall_subtypes']

src/util/simplify_expr.cpp

@@ -1331,31 +1331,6 @@ simplify_exprt::simplify_dereference(const dereference_exprt &expr)
   return unchanged(expr);
 }
 
-bool simplify_exprt::get_values(
-  const exprt &expr,
-  value_listt &value_list)
-{
-  if(expr.is_constant())
-  {
-    mp_integer int_value;
-    if(to_integer(to_constant_expr(expr), int_value))
-      return true;
-
-    value_list.insert(int_value);
-
-    return false;
-  }
-  else if(expr.id()==ID_if)
-  {
-    const auto &if_expr = to_if_expr(expr);
-
-    return get_values(if_expr.true_case(), value_list) ||
-           get_values(if_expr.false_case(), value_list);
-  }
-
-  return true;
-}
-
 simplify_exprt::resultt<>
 simplify_exprt::simplify_lambda(const lambda_exprt &expr)
 {

src/util/simplify_expr_class.h

@@ -66,10 +66,6 @@ class unary_plus_exprt;
 class update_exprt;
 class with_exprt;
 
-#define forall_value_list(it, value_list) \
-  for(simplify_exprt::value_listt::const_iterator it=(value_list).begin(); \
-      it!=(value_list).end(); ++it)
-
 class simplify_exprt
 {
 public:
@@ -221,9 +217,6 @@ class simplify_exprt
 
   virtual bool simplify(exprt &expr);
 
-  typedef std::set<mp_integer> value_listt;
-  bool get_values(const exprt &expr, value_listt &value_list);
-
   static bool is_bitvector_type(const typet &type)
   {
     return type.id()==ID_unsignedbv ||

src/util/simplify_expr_int.cpp

@@ -1460,6 +1460,30 @@ static bool eliminate_common_addends(exprt &op0, exprt &op1)
   return true;
 }
 
+typedef std::set<mp_integer> value_listt;
+static bool get_values(const exprt &expr, value_listt &value_list)
+{
+  if(expr.is_constant())
+  {
+    mp_integer int_value;
+    if(to_integer(to_constant_expr(expr), int_value))
+      return true;
+
+    value_list.insert(int_value);
+
+    return false;
+  }
+  else if(expr.id() == ID_if)
+  {
+    const auto &if_expr = to_if_expr(expr);
+
+    return get_values(if_expr.true_case(), value_list) ||
+           get_values(if_expr.false_case(), value_list);
+  }
+
+  return true;
+}
+
 simplify_exprt::resultt<> simplify_exprt::simplify_inequality_no_constant(
   const binary_relation_exprt &expr)
 {
@@ -1528,12 +1552,11 @@ simplify_exprt::resultt<> simplify_exprt::simplify_inequality_no_constant(
 
     // compare possible values
 
-    forall_value_list(it0, values0)
-      forall_value_list(it1, values1)
+    for(const mp_integer &int_value0 : values0)
+    {
+      for(const mp_integer &int_value1 : values1)
       {
         bool tmp;
-        const mp_integer &int_value0=*it0;
-        const mp_integer &int_value1=*it1;
 
         if(expr.id()==ID_ge)
           tmp=(int_value0>=int_value1);
@@ -1556,6 +1579,7 @@ simplify_exprt::resultt<> simplify_exprt::simplify_inequality_no_constant(
           break;
         }
       }
+    }
 
     if(ok)
     {