Rename remove to erase to allow simplifications

Remi Delmas · Remi Delmas · commit c52c0f689168 · 2023-02-14T16:00:55.000Z
diff --git a/src/util/forward_list_as_map.h b/src/util/forward_list_as_map.h
@@ -34,7 +34,7 @@ class forward_list_as_mapt : public std::forward_list<std::pair<keyt, mappedt>>
   {
   }
 
-  void remove(const keyt &name)
+  void erase(const keyt &name)
   {
     const_iterator it = this->lower_bound(name);
 
diff --git a/src/util/irep.cpp b/src/util/irep.cpp
@@ -94,12 +94,8 @@ void irept::set_size_t(const irep_idt &name, const std::size_t value)
 
 void irept::remove(const irep_idt &name)
 {
-#if NAMED_SUB_IS_FORWARD_LIST
-  return get_named_sub().remove(name);
-#else
   named_subt &s = get_named_sub();
   s.erase(name);
-#endif
 }
 
 const irept &irept::find(const irep_idt &name) const

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ class forward_list_as_mapt : public std::forward_list<std::pair<keyt, mappedt>>`
`34`	`34`	`{`
`35`	`35`	`}`
`36`	`36`
`37`		`- void remove(const keyt &name)`
	`37`	`+ void erase(const keyt &name)`
`38`	`38`	`{`
`39`	`39`	`const_iterator it = this->lower_bound(name);`
`40`	`40`
Original file line number	Diff line number	Diff line change
`@@ -94,12 +94,8 @@ void irept::set_size_t(const irep_idt &name, const std::size_t value)`
`94`	`94`
`95`	`95`	`void irept::remove(const irep_idt &name)`
`96`	`96`	`{`
`97`		`-#if NAMED_SUB_IS_FORWARD_LIST`
`98`		`- return get_named_sub().remove(name);`
`99`		`-#else`
`100`	`97`	`named_subt &s = get_named_sub();`
`101`	`98`	`s.erase(name);`
`102`		`-#endif`
`103`	`99`	`}`
`104`	`100`
`105`	`101`	`const irept &irept::find(const irep_idt &name) const`