Changes in src/GenPoly/Box.cc [f18a711:ea5daeb]

File:

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

src/GenPoly/Box.cc

@@ -104 +104 @@
                         Type *replaceWithConcrete( ApplicationExpr *appExpr, Type *type, bool doClone = true );
                         /// wraps a function application returning a polymorphic type with a new temporary for the out-parameter return value
-                        Expression *addDynRetParam( ApplicationExpr *appExpr, FunctionType *function, ReferenceToType *polyType, std::list< Expression *>::iterator &arg );
+                        Expression *addPolyRetParam( ApplicationExpr *appExpr, FunctionType *function, ReferenceToType *polyType, std::list< Expression *>::iterator &arg );
                         Expression *applyAdapter( ApplicationExpr *appExpr, FunctionType *function, std::list< Expression *>::iterator &arg, const TyVarMap &exprTyVars );
                         void boxParam( Type *formal, Expression *&arg, const TyVarMap &exprTyVars );
@@ -661 +661 @@
                                 // process polymorphic return value
                                 retval = 0;
-                                if ( isDynRet( functionDecl->get_functionType() ) && functionDecl->get_linkage() == LinkageSpec::Cforall ) {
+                                if ( isPolyRet( functionDecl->get_functionType() ) && functionDecl->get_linkage() == LinkageSpec::Cforall ) {
                                         retval = functionDecl->get_functionType()->get_returnVals().front();
 
@@ -868 +868 @@
                 }
 
-                Expression *Pass1::addDynRetParam( ApplicationExpr *appExpr, FunctionType *function, ReferenceToType *dynType, std::list< Expression *>::iterator &arg ) {
+                Expression *Pass1::addPolyRetParam( ApplicationExpr *appExpr, FunctionType *function, ReferenceToType *polyType, std::list< Expression *>::iterator &arg ) {
                         assert( env );
-                        Type *concrete = replaceWithConcrete( appExpr, dynType );
+                        Type *concrete = replaceWithConcrete( appExpr, polyType );
                         // add out-parameter for return value
                         return addRetParam( appExpr, function, concrete, arg );
@@ -877 +877 @@
                 Expression *Pass1::applyAdapter( ApplicationExpr *appExpr, FunctionType *function, std::list< Expression *>::iterator &arg, const TyVarMap &tyVars ) {
                         Expression *ret = appExpr;
-//                      if ( ! function->get_returnVals().empty() && isPolyType( function->get_returnVals().front()->get_type(), tyVars ) ) {
-                        if ( isDynRet( function, tyVars ) ) {
+                        if ( ! function->get_returnVals().empty() && isPolyType( function->get_returnVals().front()->get_type(), tyVars ) ) {
                                 ret = addRetParam( appExpr, function, function->get_returnVals().front()->get_type(), arg );
                         } // if
@@ -969 +968 @@
                         // actually make the adapter type
                         FunctionType *adapter = adaptee->clone();
-//                      if ( ! adapter->get_returnVals().empty() && isPolyType( adapter->get_returnVals().front()->get_type(), tyVars ) ) {
-                        if ( isDynRet( adapter, tyVars ) ) {
+                        if ( ! adapter->get_returnVals().empty() && isPolyType( adapter->get_returnVals().front()->get_type(), tyVars ) ) {
                                 makeRetParm( adapter );
                         } // if
@@ -1032 +1030 @@
                                 addAdapterParams( adapteeApp, arg, param, adapterType->get_parameters().end(), realParam, tyVars );
                                 bodyStmt = new ExprStmt( noLabels, adapteeApp );
-//                      } else if ( isPolyType( adaptee->get_returnVals().front()->get_type(), tyVars ) ) {
-                        } else if ( isDynType( adaptee->get_returnVals().front()->get_type(), tyVars ) ) {
+                        } else if ( isPolyType( adaptee->get_returnVals().front()->get_type(), tyVars ) ) {
                                 // return type T
                                 if ( (*param)->get_name() == "" ) {
@@ -1280 +1277 @@
                         TyVarMap exprTyVars( (TypeDecl::Kind)-1 );
                         makeTyVarMap( function, exprTyVars );
-                        ReferenceToType *dynRetType = isDynRet( function, exprTyVars );
-
-                        if ( dynRetType ) {
-                                ret = addDynRetParam( appExpr, function, dynRetType, arg );
+                        ReferenceToType *polyRetType = isPolyRet( function );
+
+                        if ( polyRetType ) {
+                                ret = addPolyRetParam( appExpr, function, polyRetType, arg );
                         } else if ( needsAdapter( function, scopeTyVars ) ) {
                                 // std::cerr << "needs adapter: ";
@@ -1293 +1290 @@
                         arg = appExpr->get_args().begin();
 
-                        passTypeVars( appExpr, dynRetType, arg, exprTyVars );
+                        passTypeVars( appExpr, polyRetType, arg, exprTyVars );
                         addInferredParams( appExpr, function, arg, exprTyVars );
 
@@ -1580 +1577 @@
 
                         // move polymorphic return type to parameter list
-                        if ( isDynRet( funcType ) ) {
+                        if ( isPolyRet( funcType ) ) {
                                 DeclarationWithType *ret = funcType->get_returnVals().front();
                                 ret->set_type( new PointerType( Type::Qualifiers(), ret->get_type() ) );