Changeset f6582243

Timestamp:

Aug 15, 2017, 7:14:24 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:

1ae06fa

Parents:

c93bc28

Message:

Fix member expressions in the InstantiateGeneric? pass so that they correctly refer to the member from the instantiation

Location:

src

Files:

• GenPoly/InstantiateGeneric.cc (modified) (3 diffs)
• Tuples/TupleExpansion.cc (modified) (1 diff)

src/GenPoly/InstantiateGeneric.cc

@@ -166 +166 @@
                 /// Should not make use of type environment to replace types of function parameter and return values.
                 bool inFunctionType = false;
+                /// Index of current member, used to recreate MemberExprs with the member from an instantiation
+                int memberIndex = -1;
                 GenericInstantiator() : instantiations(), dtypeStatics(), typeNamer("_conc_") {}
 
@@ -171 +173 @@
                 Type* postmutate( UnionInstType *inst );
 
-                void premutate( __attribute__((unused)) FunctionType * ftype ) {
+                // fix MemberExprs to use the member from the instantiation
+                void premutate( MemberExpr * memberExpr );
+                Expression * postmutate( MemberExpr * memberExpr );
+
+                void premutate( FunctionType * ) {
                         GuardValue( inFunctionType );
                         inFunctionType = true;
@@ -418 +424 @@
         }
 
+        namespace {
+                bool isGenericType( Type * t ) {
+                        if ( StructInstType * inst = dynamic_cast< StructInstType * >( t ) ) {
+                                return ! inst->parameters.empty();
+                        } else if ( UnionInstType * inst = dynamic_cast< UnionInstType * >( t ) ) {
+                                return ! inst->parameters.empty();
+                        }
+                        return false;
+                }
+
+                AggregateDecl * getAggr( Type * t ) {
+                        if ( StructInstType * inst = dynamic_cast< StructInstType * >( t ) ) {
+                                return inst->baseStruct;
+                        } else if ( UnionInstType * inst = dynamic_cast< UnionInstType * >( t ) ) {
+                                return inst->baseUnion;
+                        }
+                        assertf( false, "Non-aggregate type: %s", toString( t ).c_str() );
+                }
+        }
+
+        void GenericInstantiator::premutate( MemberExpr * memberExpr ) {
+                GuardValue( memberIndex );
+                memberIndex = -1;
+                if ( isGenericType( memberExpr->aggregate->result ) ) {
+                        // find the location of the member
+                        AggregateDecl * aggr = getAggr( memberExpr->aggregate->result );
+                        std::list< Declaration * > & members = aggr->members;
+                        memberIndex = std::distance( members.begin(), std::find( members.begin(), members.end(), memberExpr->member ) );
+                        assertf( memberIndex < (int)members.size(), "Could not find member %s in generic type %s", toString( memberExpr->member ).c_str(), toString( memberExpr->aggregate ).c_str() );
+                }
+        }
+
+        Expression * GenericInstantiator::postmutate( MemberExpr * memberExpr ) {
+                if ( memberIndex != -1 ) {
+                        // using the location from the generic type, find the member in the instantiation and rebuild the member expression
+                        AggregateDecl * aggr = getAggr( memberExpr->aggregate->result );
+                        assertf( memberIndex < (int)aggr->members.size(), "Instantiation somehow has fewer members than the generic type." );
+                        Declaration * member = *std::next( aggr->members.begin(), memberIndex );
+                        assertf( member->name == memberExpr->member->name, "Instantiation has different member order than the generic type. %s / %s", toString( member ).c_str(), toString( memberExpr->member ).c_str() );
+                        DeclarationWithType * field = safe_dynamic_cast< DeclarationWithType * >( member );
+                        MemberExpr * ret = new MemberExpr( field, memberExpr->aggregate->clone() );
+                        std::swap( ret->env, memberExpr->env );
+                        delete memberExpr;
+                        return ret;
+                }
+                return memberExpr;
+        }
+
         void GenericInstantiator::beginScope() {
                 instantiations.beginScope();

src/Tuples/TupleExpansion.cc

@@ -230 +230 @@
                 for ( auto p : group_iterate( tupleType->get_types(), decl->get_parameters() ) ) {
                         Type * t = std::get<0>(p);
-                        TypeDecl * td = std::get<1>(p);
                         newType->get_parameters().push_back( new TypeExpr( t->clone() ) );
-                        if ( env ) {
-                                // add bindings to the type environment.
-                                // xxx - This may not be sufficient, it may be necessary to rename type variables on StructInstType?
-                                env->add( td->get_name(), t->clone() );
-                        }
                 }
                 delete tupleType;