Changeset 4a8c875 for src/SynTree

Timestamp:

May 27, 2016, 2:38:19 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

2a7e29b

Parents:

9554d9b (diff), e24955a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:/u/cforall/software/cfa/cfa-cc

File:

• src/SynTree/TypeSubstitution.cc (modified) (2 diffs)

src/SynTree/TypeSubstitution.cc

@@ -72 +72 @@
 Type *TypeSubstitution::lookup( std::string formalType ) const {
         TypeEnvType::const_iterator i = typeEnv.find( formalType );
+        
+        // break on not in substitution set
+        if ( i == typeEnv.end() ) return 0;
+        
+        // attempt to transitively follow TypeInstType links.
+        while ( TypeInstType *actualType = dynamic_cast< TypeInstType* >( i->second ) ) {
+                const std::string& typeName = actualType->get_name();
+                
+                // break cycles in the transitive follow
+                if ( formalType == typeName ) break;
+                
+                // Look for the type this maps to, returning previous mapping if none-such
+                i = typeEnv.find( typeName );
+                if ( i == typeEnv.end() ) return actualType;
+        }
+        
+        // return type from substitution set
+        return i->second;
+        
+#if 0
         if ( i == typeEnv.end() ) {
                 return 0;
@@ -77 +97 @@
                 return i->second;
         } // if
+#endif
 }