Changeset c7a3081

Timestamp:

May 18, 2017, 4:58:08 PM (7 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, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

8905f56

Parents:

02153feb

Message:

only bind generic parameters in TypeSubstitution? in freeOnly mode, fix generic instantiation order [fixes #6]

Location:

src

Files:

• GenPoly/InstantiateGeneric.cc (modified) (2 diffs)
• SynTree/TypeSubstitution.cc (modified) (1 diff)

src/GenPoly/InstantiateGeneric.cc

@@ -367 +367 @@
                                 concDecl->set_body( inst->get_baseStruct()->has_body() );
                                 substituteMembers( inst->get_baseStruct()->get_members(), *inst->get_baseParameters(), typeSubs, concDecl->get_members() );
-                                DeclMutator::addDeclaration( concDecl );
-                                insert( inst, typeSubs, concDecl );
+                                insert( inst, typeSubs, concDecl ); // must insert before recursion
                                 concDecl->acceptMutator( *this ); // recursively instantiate members
+                                DeclMutator::addDeclaration( concDecl ); // must occur before declaration is added so that member instantiations appear first
                         }
                         StructInstType *newInst = new StructInstType( inst->get_qualifiers(), concDecl->get_name() );
@@ -422 +422 @@
                                 concDecl->set_body( inst->get_baseUnion()->has_body() );
                                 substituteMembers( inst->get_baseUnion()->get_members(), *inst->get_baseParameters(), typeSubs, concDecl->get_members() );
-                                DeclMutator::addDeclaration( concDecl );
-                                insert( inst, typeSubs, concDecl );
+                                insert( inst, typeSubs, concDecl ); // must insert before recursion
                                 concDecl->acceptMutator( *this ); // recursively instantiate members
+                                DeclMutator::addDeclaration( concDecl ); // must occur before declaration is added so that member instantiations appear first
                         }
                         UnionInstType *newInst = new UnionInstType( inst->get_qualifiers(), concDecl->get_name() );

src/SynTree/TypeSubstitution.cc

@@ -166 +166 @@
                         boundVars.insert( (*tyvar )->get_name() );
                 } // for
-        } // if
-        // bind type variables from generic type instantiations
-        std::list< TypeDecl* > *baseParameters = type->get_baseParameters();
-        if ( baseParameters && ! type->get_parameters().empty() ) {
-                for ( std::list< TypeDecl* >::const_iterator tyvar = baseParameters->begin(); tyvar != baseParameters->end(); ++tyvar ) {
-                        boundVars.insert( (*tyvar)->get_name() );
-                } // for
+                // bind type variables from generic type instantiations
+                std::list< TypeDecl* > *baseParameters = type->get_baseParameters();
+                if ( baseParameters && ! type->get_parameters().empty() ) {
+                        for ( std::list< TypeDecl* >::const_iterator tyvar = baseParameters->begin(); tyvar != baseParameters->end(); ++tyvar ) {
+                                boundVars.insert( (*tyvar)->get_name() );
+                        } // for
+                } // if
         } // if
         Type *ret = Mutator::mutate( type );