keep typedefs when dumping c with --use-system-headers

Author: nsv2020

src/ansi-c/ansi_c_convert_type.cpp

@@ -253,7 +253,9 @@ Function: ansi_c_convert_typet::write
 
 void ansi_c_convert_typet::write(typet &type)
 {
+  irep_idt _typedef = type.get(ID_typedef);
   type.clear();
+  type.set(ID_typedef,_typedef);
 
   // first, do "other"
 

src/ansi-c/ansi_c_declaration.cpp

@@ -138,6 +138,10 @@ typet ansi_c_declarationt::full_type(
   }
 
   *p=type();
+
+  // retain typedef for dump-c
+  if(get_is_typedef())
+    result.set(ID_typedef,declarator.get_name());
 
   return result;
 }
@@ -169,7 +173,7 @@ void ansi_c_declarationt::to_symbol(
   symbol.is_macro=get_is_typedef() || get_is_enum_constant();
   symbol.is_parameter=get_is_parameter();
   symbol.is_weak=get_is_weak();
-  
+
   // is it a function?
 
   if(symbol.type.id()==ID_code && !symbol.is_type)

src/ansi-c/c_typecheck_base.cpp

@@ -17,6 +17,8 @@ Author: Daniel Kroening, [email protected]
 #include "type2name.h"
 #include "c_storage_spec.h"
 
+#include <iostream>
+
 /*******************************************************************\
 
 Function: c_typecheck_baset::to_string
@@ -96,7 +98,10 @@ void c_typecheck_baset::typecheck_symbol(symbolt &symbol)
   bool is_function=symbol.type.id()==ID_code;
 
   const typet &final_type=follow(symbol.type);
-  
+//  std::cout << "BASENAME: " << symbol.base_name << std::endl;
+//  std::cout << "TYPE: " << symbol.type.pretty() << std::endl;
+//  std::cout << "FINAL: " << final_type.pretty() << std::endl;
+
   // set a few flags
   symbol.is_lvalue=!symbol.is_type && !symbol.is_macro;
 
@@ -127,13 +132,23 @@ void c_typecheck_baset::typecheck_symbol(symbolt &symbol)
      (final_type.id()==ID_struct ||
       final_type.id()==ID_incomplete_struct))
   {
-    symbol.pretty_name="struct "+id2string(symbol.base_name);
+    if(symbol.type.find(ID_typedef).is_not_nil())
+      symbol.pretty_name=symbol.type.get(ID_typedef);
+    else
+      symbol.pretty_name="struct "+id2string(symbol.base_name);
   }
   else if(symbol.is_type &&
           (final_type.id()==ID_union ||
            final_type.id()==ID_incomplete_union))
   {
-    symbol.pretty_name="union "+id2string(symbol.base_name);
+    if(symbol.type.find(ID_typedef).is_not_nil())
+    {
+      symbol.pretty_name=symbol.type.get(ID_typedef);
+      symbol_table.symbols.find(symbol.type.get(ID_identifier))->second.pretty_name=symbol.type.get(ID_typedef);
+      symbol_table.symbols.find(symbol.type.get(ID_identifier))->second.type.set(ID_typedef,symbol.pretty_name);
+    }
+    else
+      symbol.pretty_name="union "+id2string(symbol.base_name);
   }
   else if(symbol.is_type &&
           (final_type.id()==ID_c_enum ||
@@ -148,6 +163,7 @@ void c_typecheck_baset::typecheck_symbol(symbolt &symbol)
 
   // see if we have it already
   symbol_tablet::symbolst::iterator old_it=symbol_table.symbols.find(symbol.name);
+
 
   if(old_it==symbol_table.symbols.end())
   {

src/ansi-c/c_typecheck_type.cpp

@@ -23,6 +23,8 @@ Author: Daniel Kroening, [email protected]
 #include "type2name.h"
 #include "ansi_c_convert_type.h"
 
+#include <iostream>
+
 /*******************************************************************\
 
 Function: c_typecheck_baset::typecheck_type
@@ -52,12 +54,14 @@ void c_typecheck_baset::typecheck_type(typet &type)
     c_qualifiers+=c_qualifierst(type.subtype());
     bool packed=type.get_bool(ID_C_packed);
     exprt alignment=static_cast<const exprt &>(type.find(ID_C_alignment));
+    irept _typedef=type.find(ID_typedef);
 
     type.swap(type.subtype());
 
     c_qualifiers.write(type);
     if(packed) type.set(ID_C_packed, true);
     if(alignment.is_not_nil()) type.add(ID_C_alignment, alignment);
+    if(_typedef.is_not_nil()) type.add(ID_typedef, _typedef);
 
     return; // done
   }
@@ -720,25 +724,32 @@ void c_typecheck_baset::typecheck_compound_type(struct_union_typet &type)
   irep_idt identifier;
 
   bool have_body=type.find(ID_components).is_not_nil();
-  
+
   if(type.find(ID_tag).is_nil())
   {
     // Anonymous? Must come with body.
     assert(have_body);
 
+//    std::cout << "__TYPE: " << type.pretty() << std::endl;
+
     // produce symbol
     symbolt compound_symbol;
     compound_symbol.is_type=true;
     compound_symbol.type=type;
     compound_symbol.location=type.source_location();
+    if(compound_symbol.type.find(ID_typedef).is_not_nil())
+      compound_symbol.pretty_name=compound_symbol.type.get(ID_typedef);
 
     typecheck_compound_body(to_struct_union_type(compound_symbol.type));
 
     std::string typestr=type2name(compound_symbol.type);
     compound_symbol.base_name="#anon-"+typestr;
     compound_symbol.name="tag-#anon#"+typestr;
     identifier=compound_symbol.name;
-    
+
+//  std::cout << "TYPEDEF: " << compound_symbol.type.get_string(ID_typedef) << std::endl;
+//  std::cout << "BASENAME: " << id2string(compound_symbol.base_name) << std::endl;    
+   
     // We might already have the same anonymous union/struct,
     // and this is simply ok. Note that the C standard treats
     // these as different types.

src/ansi-c/expr2c.cpp

@@ -365,7 +365,12 @@ std::string expr2ct::convert_rec(
   {
     const struct_typet &struct_type=to_struct_type(src);
 
-    std::string dest=q+"struct";
+    std::string dest=q;
+
+    if(src.find(ID_typedef).is_not_nil())
+      dest+="typedef struct";
+    else 
+      dest+="struct";
 
     const irep_idt &tag=struct_type.get_tag();
     if(tag!="") dest+=" "+id2string(tag);
@@ -383,7 +388,10 @@ std::string expr2ct::convert_rec(
 
     dest+=" }";
 
-    dest+=d;
+    if(src.find(ID_typedef).is_not_nil())
+      dest+=src.get_string(ID_typedef);
+    else 
+      dest+=d;
 
     return dest;
   }
@@ -401,7 +409,12 @@ std::string expr2ct::convert_rec(
   {
     const union_typet &union_type=to_union_type(src);
 
-    std::string dest=q+"union";
+    std::string dest=q;
+
+    if(src.find(ID_typedef).is_not_nil())
+      dest+="typedef union";
+    else 
+      dest+="union";
 
     const irep_idt &tag=union_type.get_tag();
     if(tag!="") dest+=" "+id2string(tag);
@@ -419,7 +432,10 @@ std::string expr2ct::convert_rec(
 
     dest+=" }";
 
-    dest+=d;
+    if(src.find(ID_typedef).is_not_nil())
+      dest+=src.get_string(ID_typedef);
+    else 
+      dest+=d;
 
     return dest;
   }
@@ -547,6 +563,8 @@ std::string expr2ct::convert_rec(
 
     if(followed.id()==ID_struct)
     {
+      if(followed.find(ID_typedef).is_not_nil())
+        return followed.get_string(ID_typedef)+d;
       std::string dest=q+"struct";
       const irep_idt &tag=to_struct_type(followed).get_tag();
       if(tag!="") dest+=" "+id2string(tag);
@@ -555,6 +573,8 @@ std::string expr2ct::convert_rec(
     }
     else if(followed.id()==ID_union)
     {
+      if(followed.find(ID_typedef).is_not_nil())
+        return followed.get_string(ID_typedef)+d;
       std::string dest=q+"union";
       const irep_idt &tag=to_union_type(followed).get_tag();
       if(tag!="") dest+=" "+id2string(tag);
@@ -566,6 +586,8 @@ std::string expr2ct::convert_rec(
   }
   else if(src.id()==ID_struct_tag)
   {
+    if(src.find(ID_typedef).is_not_nil())
+      return src.get_string(ID_typedef)+d;
     const struct_tag_typet &struct_tag_type=
       to_struct_tag_type(src);
 
@@ -578,6 +600,8 @@ std::string expr2ct::convert_rec(
   }
   else if(src.id()==ID_union_tag)
   {
+    if(src.find(ID_typedef).is_not_nil())
+      return src.get_string(ID_typedef)+d;
     const union_tag_typet &union_tag_type=
       to_union_tag_type(src);