Remove base_name, replace display_name

Author: tautschnig

src/ansi-c/ansi_c_declaration.cpp

@@ -131,8 +131,7 @@ void ansi_c_declarationt::to_symbol(
   symbol.value=declarator.value();
   symbol.type=full_type(declarator);
   symbol.name=declarator.get_name();
-  symbol.pretty_name=symbol.name;
-  symbol.base_name=declarator.get_base_name();
+  symbol.display_name=declarator.get_base_name();
   symbol.is_type=get_is_typedef();
   symbol.location=declarator.source_location();
   symbol.is_extern=get_is_extern();

src/util/symbol.cpp

@@ -60,12 +60,10 @@ void symbolt::show(std::ostream &out) const
     out << " volatile";
   if(!mode.empty())
     out << " mode=" << mode;
-  if(!base_name.empty())
-    out << " base_name=" << base_name;
   if(!module.empty())
     out << " module=" << module;
-  if(!pretty_name.empty())
-    out << " pretty_name=" << pretty_name;
+  if(!display_name.empty())
+    out << " display_name=" << display_name;
   out << '\n';
   out << "  location: " << location << '\n';
 
@@ -92,9 +90,8 @@ void symbolt::swap(symbolt &b)
   SYM_SWAP1(type);
   SYM_SWAP1(value);
   SYM_SWAP1(name);
-  SYM_SWAP1(pretty_name);
+  SYM_SWAP1(display_name);
   SYM_SWAP1(module);
-  SYM_SWAP1(base_name);
   SYM_SWAP1(mode);
   SYM_SWAP1(location);
 
@@ -142,10 +139,7 @@ bool symbolt::is_well_formed() const
   // to have it's base name as a suffix to it's more
   // general name.
 
-  // Exception: Java symbols' base names do not have type signatures
-  // (for example, they can have name "someclass.method:(II)V" and base name
-  // "method")
-  if(!has_suffix(id2string(name), id2string(base_name)) && mode != ID_java)
+  if(!has_suffix(id2string(name), id2string(display_name)))
   {
     bool criterion_must_hold = true;
 
@@ -168,6 +162,13 @@ bool symbolt::is_well_formed() const
         criterion_must_hold = false;
       }
     }
+    // Exception: Java symbols' base names do not have type signatures
+    // (for example, they can have name "someclass.method:(II)V" and base name
+    // "method")
+    else if(mode == ID_java)
+    {
+      return id2string(name).find(id2string(display_name)) != std::string::npos;
+    }
 
     // Linker renaming may have added $linkN suffixes to the name, and other
     // suffixes such as #return_value may have then be subsequently added.
@@ -210,9 +211,8 @@ bool symbolt::operator==(const symbolt &other) const
     location == other.location &&
     name == other.name &&
     module == other.module &&
-    base_name == other.base_name &&
     mode == other.mode &&
-    pretty_name == other.pretty_name &&
+    display_name == other.display_name &&
     is_type == other.is_type &&
     is_macro == other.is_macro &&
     is_exported == other.is_exported &&

src/util/symbol.h

@@ -42,20 +42,11 @@ class symbolt
   /// Name of module the symbol belongs to
   irep_idt module;
 
-  /// Base (non-scoped) name
-  irep_idt base_name;
-
   /// Language mode
   irep_idt mode;
 
   /// Language-specific display name
-  irep_idt pretty_name;
-
-  /// Return language specific display name if present.
-  const irep_idt &display_name() const
-  {
-    return pretty_name.empty()?name:pretty_name;
-  }
+  irep_idt display_name;
 
   // global use
   bool is_type, is_macro, is_exported,
@@ -78,7 +69,7 @@ class symbolt
     value.make_nil();
     location.make_nil();
 
-    name=module=base_name=mode=pretty_name=irep_idt();
+    name=module=mode=display_name=irep_idt();
 
     is_type = is_macro = is_exported = is_input = is_output = is_state_var =
       is_property = is_static_lifetime = is_thread_local = is_lvalue =
@@ -159,7 +150,7 @@ class auxiliary_symbolt:public symbolt
     auxiliary_symbolt()
   {
     this->name=name;
-    this->base_name=name;
+    this->display_name = name;
     this->type=type;
   }
 };