Changeset d419d8e

Timestamp:

Jun 28, 2018, 3:06:48 PM (6 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

48ed81c

Parents:

15f5c5e

Message:

Rename nested types when hoisting

File:

• src/SymTab/Validate.cc (modified) (3 diffs)

src/SymTab/Validate.cc

@@ -95 +95 @@
                 void previsit( UnionDecl * aggregateDecl );
                 void previsit( StaticAssertDecl * assertDecl );
+                void previsit( StructInstType * type );
+                void previsit( UnionInstType * type );
+                void previsit( EnumInstType * type );
 
           private:
@@ -339 +342 @@
         }
 
+        namespace {
+                void qualifiedName( AggregateDecl * aggr, std::ostringstream & ss ) {
+                        if ( aggr->parent ) qualifiedName( aggr->parent, ss );
+                        ss << "__" << aggr->name;
+                }
+
+                // mangle nested type names using entire parent chain
+                std::string qualifiedName( AggregateDecl * aggr ) {
+                        std::ostringstream ss;
+                        qualifiedName( aggr, ss );
+                        return ss.str();
+                }
+        }
+
         template< typename AggDecl >
         void HoistStruct::handleAggregate( AggDecl *aggregateDecl ) {
                 if ( parentAggr ) {
+                        aggregateDecl->parent = parentAggr;
+                        aggregateDecl->name = qualifiedName( aggregateDecl );
                         // Add elements in stack order corresponding to nesting structure.
                         declsToAddBefore.push_front( aggregateDecl );
@@ -365 +384 @@
                 handleAggregate( aggregateDecl );
         }
+
+        void HoistStruct::previsit( StructInstType * type ) {
+                // need to reset type name after expanding to qualified name
+                assert( type->baseStruct );
+                type->name = type->baseStruct->name;
+        }
+
+        void HoistStruct::previsit( UnionInstType * type ) {
+                assert( type->baseUnion );
+                type->name = type->baseUnion->name;
+        }
+
+        void HoistStruct::previsit( EnumInstType * type ) {
+                assert( type->baseEnum );
+                type->name = type->baseEnum->name;
+        }
+
 
         void EnumAndPointerDecay::previsit( EnumDecl *enumDecl ) {