Changeset 33a7b6d for src/ResolvExpr

Timestamp:

Nov 15, 2016, 5:30:52 PM (8 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:

d9fa60a

Parents:

8f9cc50

Message:

changed use of formal types to actual types for boxing return parameters and passing type variables, fix bug where generic struct's members would change types when a member is accessed on a concrete instantiation

File:

• src/ResolvExpr/AlternativeFinder.cc (modified) (2 diffs)

src/ResolvExpr/AlternativeFinder.cc

@@ -218 +218 @@
                 std::list< Declaration* > members;
                 aggInst->lookup( name, members );
+                TypeSubstitution sub = TypeSubstitution( aggInst->get_baseParameters()->begin(), aggInst->get_baseParameters()->end(), aggInst->get_parameters().begin() );
                 for ( std::list< Declaration* >::const_iterator i = members.begin(); i != members.end(); ++i ) {
                         if ( DeclarationWithType *dwt = dynamic_cast< DeclarationWithType* >( *i ) ) {
-                                alternatives.push_back( Alternative( new MemberExpr( dwt, expr->clone() ), env, newCost ) );
+                                MemberExpr * memExpr = new MemberExpr( dwt, expr->clone() );
+                                sub.apply( memExpr );
+                                alternatives.push_back( Alternative( memExpr, env, newCost ) );
                                 renameTypes( alternatives.back().expr );
                         } else {
@@ -800 +803 @@
                 AlternativeFinder funcFinder( indexer, env );
                 funcFinder.findWithAdjustment( memberExpr->get_aggregate() );
-
                 for ( AltList::const_iterator agg = funcFinder.alternatives.begin(); agg != funcFinder.alternatives.end(); ++agg ) {
                         if ( StructInstType *structInst = dynamic_cast< StructInstType* >( agg->expr->get_result() ) ) {