Changes in src/GenPoly/InstantiateGeneric.cc [be9288a:f6582243]

File:

• src/GenPoly/InstantiateGeneric.cc (modified) (4 diffs)

src/GenPoly/InstantiateGeneric.cc

@@ -13 +13 @@
 // Update Count     : 1
 //
+
+#include <cassert>
+#include <list>
+#include <unordered_map>
+#include <utility>
+#include <vector>
+
 #include "InstantiateGeneric.h"
 
-#include <cassert>                     // for assertf, assert
-#include <iterator>                    // for back_inserter, inserter
-#include <list>                        // for list, _List_const_iterator
-#include <utility>                     // for move, pair
-#include <vector>                      // for vector
-
-#include "Common/PassVisitor.h"        // for PassVisitor, WithDeclsToAdd
-#include "Common/ScopedMap.h"          // for ScopedMap
-#include "Common/SemanticError.h"      // for SemanticError
-#include "Common/UniqueName.h"         // for UniqueName
-#include "Common/utility.h"            // for deleteAll, cloneAll
-#include "GenPoly.h"                   // for isPolyType, typesPolyCompatible
-#include "ScopedSet.h"                 // for ScopedSet, ScopedSet<>::iterator
-#include "ScrubTyVars.h"               // for ScrubTyVars
-#include "SynTree/Declaration.h"       // for StructDecl, UnionDecl, TypeDecl
-#include "SynTree/Expression.h"        // for TypeExpr, Expression
-#include "SynTree/Mutator.h"           // for mutateAll
-#include "SynTree/Type.h"              // for StructInstType, UnionInstType
-#include "SynTree/TypeSubstitution.h"  // for TypeSubstitution
-#include "SynTree/Visitor.h"           // for acceptAll
+#include "GenPoly.h"
+#include "ScopedSet.h"
+#include "ScrubTyVars.h"
+
+#include "Common/PassVisitor.h"
+#include "Common/ScopedMap.h"
+#include "Common/UniqueName.h"
+#include "Common/utility.h"
+
+#include "ResolvExpr/typeops.h"
+
+#include "SynTree/Declaration.h"
+#include "SynTree/Expression.h"
+#include "SynTree/Type.h"
+
+
+#include "InitTweak/InitTweak.h"
 
 
@@ -162 +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_") {}
 
@@ -167 +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;
@@ -414 +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();