C++: bases are now struct tags

Daniel Kroening · Daniel Kroening · commit dea36b3105ba · 2018-11-25T12:09:17.000Z
diff --git a/src/cpp/cpp_typecheck_bases.cpp b/src/cpp/cpp_typecheck_bases.cpp
@@ -43,18 +43,18 @@ void cpp_typecheckt::typecheck_compound_bases(struct_typet &type)
     // elaborate any class template instances given as bases
     elaborate_class_template(base_symbol_expr.type());
 
-    if(base_symbol_expr.type().id() == ID_struct_tag)
-      base_symbol_expr.type().id(ID_symbol_type);
+    if(base_symbol_expr.type().id() == ID_symbol_type)
+      base_symbol_expr.type().id(ID_struct_tag);
 
-    if(base_symbol_expr.type().id() != ID_symbol_type)
+    if(base_symbol_expr.type().id() != ID_struct_tag)
     {
       error().source_location=name.source_location();
       error() << "expected type symbol as struct/class base" << eom;
       throw 0;
     }
 
     const symbolt &base_symbol =
-      lookup(to_symbol_type(base_symbol_expr.type()));
+      lookup(to_struct_tag_type(base_symbol_expr.type()));
 
     if(base_symbol.type.id()==ID_incomplete_struct)
     {

Original file line number	Diff line number	Diff line change
`@@ -43,18 +43,18 @@ void cpp_typecheckt::typecheck_compound_bases(struct_typet &type)`
`43`	`43`	`// elaborate any class template instances given as bases`
`44`	`44`	`elaborate_class_template(base_symbol_expr.type());`
`45`	`45`
`46`		`- if(base_symbol_expr.type().id() == ID_struct_tag)`
`47`		`- base_symbol_expr.type().id(ID_symbol_type);`
	`46`	`+ if(base_symbol_expr.type().id() == ID_symbol_type)`
	`47`	`+ base_symbol_expr.type().id(ID_struct_tag);`
`48`	`48`
`49`		`- if(base_symbol_expr.type().id() != ID_symbol_type)`
	`49`	`+ if(base_symbol_expr.type().id() != ID_struct_tag)`
`50`	`50`	`{`
`51`	`51`	`error().source_location=name.source_location();`
`52`	`52`	`error() << "expected type symbol as struct/class base" << eom;`
`53`	`53`	`throw 0;`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`const symbolt &base_symbol =`
`57`		`- lookup(to_symbol_type(base_symbol_expr.type()));`
	`57`	`+ lookup(to_struct_tag_type(base_symbol_expr.type()));`
`58`	`58`
`59`	`59`	`if(base_symbol.type.id()==ID_incomplete_struct)`
`60`	`60`	`{`