Changeset 7e08acf

Timestamp:

Sep 7, 2018, 3:10:49 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

e15ba975

Parents:

0982a05

Message:

Apply generic substitution to qualified typedefs

File:

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

src/SymTab/Validate.cc

@@ -403 +403 @@
                         assert( aggr ); // TODO: need to handle forward declarations
                         for ( Declaration * member : aggr->members ) {
-                                if ( StructInstType * inst = dynamic_cast< StructInstType * >( child ) ) {
-                                        if ( StructDecl * aggr = dynamic_cast< StructDecl * >( member ) ) {
-                                                if ( aggr->name == inst->name ) {
-                                                        // TODO: is this case, and other non-TypeInstType cases, necessary?
-                                                        return new StructInstType( qualType->get_qualifiers(), aggr );
-                                                }
-                                        }
-                                } else if ( UnionInstType * inst = dynamic_cast< UnionInstType * >( child ) ) {
-                                        if ( UnionDecl * aggr = dynamic_cast< UnionDecl * > ( member ) ) {
-                                                if ( aggr->name == inst->name ) {
-                                                        return new UnionInstType( qualType->get_qualifiers(), aggr );
-                                                }
-                                        }
-                                } else if ( EnumInstType * inst = dynamic_cast< EnumInstType * >( child ) ) {
-                                        if ( EnumDecl * aggr = dynamic_cast< EnumDecl * > ( member ) ) {
-                                                if ( aggr->name == inst->name ) {
-                                                        return new EnumInstType( qualType->get_qualifiers(), aggr );
-                                                }
-                                        }
-                                } else if ( TypeInstType * inst = dynamic_cast< TypeInstType * >( child ) ) {
+                                if ( TypeInstType * inst = dynamic_cast< TypeInstType * >( child ) ) {
                                         // name on the right is a typedef
                                         if ( NamedTypeDecl * aggr = dynamic_cast< NamedTypeDecl * > ( member ) ) {
@@ -429 +410 @@
                                                         Type * ret = aggr->base->clone();
                                                         ret->get_qualifiers() = qualType->get_qualifiers();
+                                                        TypeSubstitution sub = parent->genericSubstitution();
+                                                        sub.apply(ret);
                                                         return ret;
                                                 }