Changeset f80e0218 for src/SynTree/TypeSubstitution.cc

Timestamp:

Jun 30, 2016, 4:32:56 PM (10 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

ea29e73

Parents:

1b5c81ed (diff), 84d4d6f (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' into gc_noraii

Conflicts:

Jenkinsfile
src/SymTab/Validate.cc

File:

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

src/SynTree/TypeSubstitution.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// TypeSubstitution.cc -- 
+// TypeSubstitution.cc --
 //
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Mar  2 17:29:15 2016
+// Last Modified By : Rob Schluntz
+// Last Modified On : Tue Apr 26 11:15:29 2016
 // Update Count     : 3
 //
@@ -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
 }
 
@@ -96 +117 @@
         BoundVarsType::const_iterator bound = boundVars.find( inst->get_name() );
         if ( bound != boundVars.end() ) return inst;
-        
+
         TypeEnvType::const_iterator i = typeEnv.find( inst->get_name() );
         if ( i == typeEnv.end() ) {
@@ -217 +238 @@
 }
 
+std::ostream & operator<<( std::ostream & out, const TypeSubstitution & sub ) {
+        sub.print( out );
+        return out;
+}
+
+
 // Local Variables: //
 // tab-width: 4 //