Merge pull request #3644 from diffblue/type2name-cleanup

type2name cleanup

Author: tautschnig

src/ansi-c/c_typecheck_type.cpp

@@ -766,7 +766,7 @@ void c_typecheck_baset::typecheck_compound_type(struct_union_typet &type)
 
     typecheck_compound_body(to_struct_union_type(compound_symbol.type));
 
-    std::string typestr=type2name(compound_symbol.type);
+    std::string typestr = type2name(compound_symbol.type, *this);
     compound_symbol.base_name="#anon-"+typestr;
     compound_symbol.name="tag-#anon#"+typestr;
     identifier=compound_symbol.name;

src/ansi-c/type2name.cpp

@@ -26,12 +26,12 @@ static std::string type2name(
   const namespacet &ns,
   symbol_numbert &symbol_number);
 
-static std::string type2name_symbol(
-  const typet &type,
+static std::string type2name_tag(
+  const tag_typet &type,
   const namespacet &ns,
   symbol_numbert &symbol_number)
 {
-  const irep_idt &identifier=type.get(ID_identifier);
+  const irep_idt &identifier = type.get_identifier();
 
   const symbolt *symbol;
 
@@ -91,7 +91,6 @@ static std::string pointer_offset_bits_as_string(
   return integer2string(*bits);
 }
 
-static bool parent_is_sym_check=false;
 static std::string type2name(
   const typet &type,
   const namespacet &ns,
@@ -193,17 +192,14 @@ static std::string type2name(
     }
   }
   else if(
-    type.id() == ID_symbol_type || type.id() == ID_c_enum_tag ||
-    type.id() == ID_struct_tag || type.id() == ID_union_tag)
+    type.id() == ID_c_enum_tag || type.id() == ID_struct_tag ||
+    type.id() == ID_union_tag)
   {
-    parent_is_sym_check=true;
-    result+=type2name_symbol(type, ns, symbol_number);
+    result += type2name_tag(to_tag_type(type), ns, symbol_number);
   }
   else if(type.id()==ID_struct ||
           type.id()==ID_union)
   {
-    assert(parent_is_sym_check);
-    parent_is_sym_check=false;
     if(type.id()==ID_struct)
       result+="ST";
     if(type.id()==ID_union)
@@ -277,13 +273,6 @@ static std::string type2name(
 
 std::string type2name(const typet &type, const namespacet &ns)
 {
-  parent_is_sym_check=true;
   symbol_numbert symbol_number;
   return type2name(type, ns, symbol_number);
 }
-
-std::string type2name(const typet &type)
-{
-  symbol_tablet symbol_table;
-  return type2name(type, namespacet(symbol_table));
-}

src/ansi-c/type2name.h

@@ -18,7 +18,6 @@ Author: Daniel Kroening, [email protected]
 
 class namespacet;
 
-std::string type2name(const typet &type);
 std::string type2name(const typet &type, const namespacet &ns);
 
 #endif // CPROVER_ANSI_C_TYPE2NAME_H