Changes in / [aadb0c8:8a3d5e7]

File:

• src/GenPoly/Box.cc (modified) (5 diffs)

src/GenPoly/Box.cc

@@ -95 +95 @@
                         /// Pass the extra type parameters from polymorphic generic arguments or return types into a function application
                         /// Will insert 0, 2 or 3 more arguments.
-                        std::list< Expression *>::iterator passArgTypeVars( ApplicationExpr *appExpr, Type *parmType, Type *argBaseType, std::list< Expression *>::iterator arg, const TyVarMap &exprTyVars, std::set< std::string > &seenTypes );
+                        void passArgTypeVars( ApplicationExpr *appExpr, Type *parmType, Type *argBaseType, std::list< Expression *>::iterator &arg, const TyVarMap &exprTyVars, std::set< std::string > &seenTypes );
                         /// passes extra type parameters into a polymorphic function application
                         /// Returns an iterator to the first argument after the added
@@ -531 +531 @@
                 }
 
-                std::list< Expression *>::iterator Pass1::passArgTypeVars( ApplicationExpr *appExpr, Type *parmType, Type *argBaseType, std::list< Expression *>::iterator arg, const TyVarMap &exprTyVars, std::set< std::string > &seenTypes ) {
+                void Pass1::passArgTypeVars( ApplicationExpr *appExpr, Type *parmType, Type *argBaseType, std::list< Expression *>::iterator &arg, const TyVarMap &exprTyVars, std::set< std::string > &seenTypes ) {
                         Type *polyType = isPolyType( parmType, exprTyVars );
                         if ( polyType && ! dynamic_cast< TypeInstType* >( polyType ) ) {
                                 std::string typeName = mangleType( polyType );
-                                if ( seenTypes.count( typeName ) ) return arg;
+                                if ( seenTypes.count( typeName ) ) return;
 
                                 arg = appExpr->get_args().insert( arg, new SizeofExpr( argBaseType->clone() ) );
@@ -555 +555 @@
                                 seenTypes.insert( typeName );
                         }
-                        return arg;
                 }
 
@@ -594 +593 @@
                         if ( polyRetType ) {
                                 Type *concRetType = replaceWithConcrete( polyRetType, env );
-                                arg = passArgTypeVars( appExpr, polyRetType, concRetType, arg, exprTyVars, seenTypes );
+                                passArgTypeVars( appExpr, polyRetType, concRetType, arg, exprTyVars, seenTypes );
                                 // Skip the return parameter in the argument list.
                                 fnArg = arg + 1;
@@ -606 +605 @@
                                 Type * argType = (*fnArg)->get_result();
                                 if ( ! argType ) continue;
-                                arg = passArgTypeVars( appExpr, (*fnParm)->get_type(), argType, arg, exprTyVars, seenTypes );
+                                passArgTypeVars( appExpr, (*fnParm)->get_type(), argType, arg, exprTyVars, seenTypes );
                         }
                         return arg;