Changeset 1f44196 for src/SynTree/TypeSubstitution.cc

Timestamp:

Nov 29, 2016, 3:30:59 PM (9 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

8e5724e

Parents:

3a2128f (diff), 9129a84 (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 plg2:software/cfa/cfa-cc

Conflicts:

src/Parser/parser.cc

File:

• src/SynTree/TypeSubstitution.cc (modified) (3 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() ) {
@@ -149 +149 @@
         // bind type variables from forall-qualifiers
         if ( freeOnly ) {
-                for ( std::list< TypeDecl* >::const_iterator tyvar = type->get_forall().begin(); tyvar != type->get_forall().end(); ++tyvar ) {
+                for ( Type::ForallList::const_iterator tyvar = type->get_forall().begin(); tyvar != type->get_forall().end(); ++tyvar ) {
                         boundVars.insert( (*tyvar )->get_name() );
                 } // for
@@ -163 +163 @@
         // bind type variables from forall-qualifiers
         if ( freeOnly ) {
-                for ( std::list< TypeDecl* >::const_iterator tyvar = type->get_forall().begin(); tyvar != type->get_forall().end(); ++tyvar ) {
+                for ( Type::ForallList::const_iterator tyvar = type->get_forall().begin(); tyvar != type->get_forall().end(); ++tyvar ) {
                         boundVars.insert( (*tyvar )->get_name() );
                 } // for