Refactoring: Make entryt::get_key()

Author: Owen Jones

cbmc/src/pointer-analysis/value_set.cpp

@@ -56,15 +56,8 @@ value_sett::entryt &value_sett::get_entry(
   const typet &type,
   const namespacet &ns)
 {
-  irep_idt index;
-
-  if(field_sensitive(e.identifier, type, ns))
-    index=id2string(e.identifier)+e.suffix;
-  else
-    index=e.identifier;
-
-  std::pair<valuest::iterator, bool> r=
-    values.insert(std::pair<idt, entryt>(index, e));
+  std::pair<valuest::iterator, bool> r =
+    values.insert(std::pair<idt, entryt>(e.get_key(type, ns), e));
 
   return r.first->second;
 }

cbmc/src/pointer-analysis/value_set.h

@@ -298,6 +298,14 @@ class value_sett
     {
       return !(*this==other);
     }
+
+    const irep_idt get_key(const typet &type, const namespacet &ns) const
+    {
+      if(field_sensitive(identifier, type, ns))
+        return id2string(identifier) + suffix;
+
+      return identifier;
+    }
   };
 
   /// Set of expressions; only used for the `get` API, not for internal