C++: use struct_tag type

Author: Daniel Kroening

src/cpp/cpp_typecheck_resolve.cpp

@@ -335,9 +335,13 @@ exprt cpp_typecheck_resolvet::convert_identifier(
       {
         e.type()=c_enum_tag_typet(symbol.name);
       }
-      else // will need to do struct, union
+      else if(symbol.type.id()==ID_struct)
       {
-        e.type()=symbol_typet(symbol.name);
+        e.type()=struct_tag_typet(symbol.name);
+      }
+      else if(symbol.type.id()==ID_union)
+      {
+        e.type()=union_tag_typet(symbol.name);
       }
     }
     else if(symbol.is_macro)
@@ -898,7 +902,7 @@ cpp_scopet &cpp_typecheck_resolvet::resolve_scope(
         cpp_typecheck.cpp_scopes.current_scope().print(std::cout);
         std::cout << "X: " << id_set.size() << '\n';
 #endif
-        symbol_typet instance=
+        struct_tag_typet instance=
           disambiguate_template_classes(final_base_name, id_set, template_args);
 
         instance.add_source_location()=source_location;
@@ -944,7 +948,7 @@ cpp_scopet &cpp_typecheck_resolvet::resolve_scope(
         // the "::" triggers template elaboration
         if(!cpp_typecheck.cpp_scopes.current_scope().class_identifier.empty())
         {
-          symbol_typet instance(
+          struct_tag_typet instance(
             cpp_typecheck.cpp_scopes.current_scope().class_identifier);
           cpp_typecheck.elaborate_class_template(instance);
         }
@@ -986,7 +990,7 @@ cpp_scopet &cpp_typecheck_resolvet::resolve_scope(
 }
 
 /// disambiguate partial specialization
-symbol_typet cpp_typecheck_resolvet::disambiguate_template_classes(
+struct_tag_typet cpp_typecheck_resolvet::disambiguate_template_classes(
   const irep_idt &base_name,
   const cpp_scopest::id_sett &id_set,
   const cpp_template_args_non_tct &full_template_args)
@@ -1182,7 +1186,7 @@ symbol_typet cpp_typecheck_resolvet::disambiguate_template_classes(
     throw 0;
   }
 
-  symbol_typet result(instance.name);
+  struct_tag_typet result(instance.name);
   result.add_source_location()=source_location;
 
   return result;
@@ -1196,7 +1200,7 @@ symbol_typet cpp_typecheck_resolvet::disambiguate_template_classes(
       match.specialization_args,
       match.full_args);
 
-  symbol_typet result(instance.name);
+  struct_tag_typet result(instance.name);
   result.add_source_location()=source_location;
 
   return result;
@@ -2062,7 +2066,7 @@ void cpp_typecheck_resolvet::apply_template_args(
         template_args_tc,
         template_args_tc);
 
-    expr=exprt(ID_type, symbol_typet(new_symbol.name));
+    expr=type_exprt(struct_tag_typet(new_symbol.name));
     expr.add_source_location()=source_location;
   }
   else
@@ -2207,11 +2211,7 @@ void cpp_typecheck_resolvet::filter_for_named_scopes(
         assert(pcomp.get_bool(ID_is_type));
         const typet &type=pcomp.type();
         assert(type.id()!=ID_struct);
-
-        if(type.id() == ID_symbol_type)
-          identifier = to_symbol_type(type).get_identifier();
-        else
-          continue;
+        continue;
       }
 
       while(true)
@@ -2230,8 +2230,6 @@ void cpp_typecheck_resolvet::filter_for_named_scopes(
           new_set.insert(&class_id);
           break;
         }
-        else if(symbol.type.id() == ID_symbol_type)
-          identifier = to_symbol_type(symbol.type).get_identifier();
         else
           break;
       }