Add emplace method to forward_list_as_mapt and simplify where possible

Author: Remi Delmas

src/util/forward_list_as_map.h

@@ -94,6 +94,23 @@ class forward_list_as_mapt : public std::forward_list<std::pair<keyt, mappedt>>
     return it->second;
   }
 
+  mappedt &emplace(const keyt &name, const mappedt &irep)
+  {
+    iterator it = mutable_lower_bound(name);
+
+    if(it == this->end() || it->first != name)
+    {
+      iterator before = this->before_begin();
+      while(std::next(before) != it)
+        ++before;
+      it = this->emplace_after(before, name, irep);
+    }
+    else
+      it->second = irep;
+
+    return it->second;
+  }
+
   std::size_t size() const
   {
     return narrow<std::size_t>(std::distance(this->begin(), this->end()));

src/util/irep_serialization.cpp

@@ -75,31 +75,18 @@ irept irep_serializationt::read_irep(std::istream &in)
     sub.push_back(reference_convert(in));
   }
 
-#if NAMED_SUB_IS_FORWARD_LIST
-  irept::named_subt::iterator before = named_sub.before_begin();
-#endif
   while(in.peek()=='N')
   {
     in.get();
     irep_idt id = read_string_ref(in);
-#if NAMED_SUB_IS_FORWARD_LIST
-    named_sub.emplace_after(before, id, reference_convert(in));
-    ++before;
-#else
     named_sub.emplace(id, reference_convert(in));
-#endif
   }
 
   while(in.peek()=='C')
   {
     in.get();
     irep_idt id = read_string_ref(in);
-#if NAMED_SUB_IS_FORWARD_LIST
-    named_sub.emplace_after(before, id, reference_convert(in));
-    ++before;
-#else
     named_sub.emplace(id, reference_convert(in));
-#endif
   }
 
   if(in.get()!=0)