Changeset 8c49c0e for src/GenPoly/GenPoly.cc

Timestamp:

Sep 19, 2016, 4:39:33 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:

aefcc3b

Parents:

3c13c03

Message:

decouple code that uses Type's forall list from std::list in preparation for trying to replace with a managed list

File:

• src/GenPoly/GenPoly.cc (modified) (3 diffs)

src/GenPoly/GenPoly.cc

@@ -110 +110 @@
         ReferenceToType *isDynRet( FunctionType *function, const TyVarMap &forallTypes ) {
                 if ( function->get_returnVals().empty() ) return 0;
-                
+
                 return (ReferenceToType*)isDynType( function->get_returnVals().front()->get_type(), forallTypes );
         }
@@ -127 +127 @@
 //              } // if
                 if ( isDynRet( adaptee, tyVars ) ) return true;
-                
+
                 for ( std::list< DeclarationWithType* >::const_iterator innerArg = adaptee->get_parameters().begin(); innerArg != adaptee->get_parameters().end(); ++innerArg ) {
 //                      if ( isPolyType( (*innerArg)->get_type(), tyVars ) ) {
@@ -228 +228 @@
 
         void makeTyVarMap( Type *type, TyVarMap &tyVarMap ) {
-                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 ) {
                         assert( *tyVar );
                         tyVarMap[ (*tyVar)->get_name() ] = (*tyVar)->get_kind();