Changeset aadc9a4 for src/GenPoly/Box.cc

Timestamp:

Jan 12, 2016, 6:12:10 PM (9 years ago)

Author:

Aaron Moss <a3moss@…>

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, string, with_gc

Children:

4d7e8f5

Parents:

ebe9b3a

Message:

Refactor isPolyRet to include generic return types

File:

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

src/GenPoly/Box.cc

@@ -231 +231 @@
                                 // process polymorphic return value
                                 retval = 0;
-                                std::string typeName;
-                                if ( isPolyRet( functionDecl->get_functionType(), typeName ) && functionDecl->get_linkage() == LinkageSpec::Cforall ) {
+                                if ( isPolyRet( functionDecl->get_functionType() ) && functionDecl->get_linkage() == LinkageSpec::Cforall ) {
                                         retval = functionDecl->get_functionType()->get_returnVals().front();
 
@@ -787 +786 @@
                         std::list< Expression *>::iterator paramBegin = appExpr->get_args().begin();
 
-                        std::string typeName;
-                        if ( isPolyRet( function, typeName ) ) {
-                                ret = addPolyRetParam( appExpr, function, typeName, arg );
+                        if ( ReferenceToType *polyType = isPolyRet( function ) ) {
+                                ret = addPolyRetParam( appExpr, function, polyType->get_name(), arg );
                         } else if ( needsAdapter( function, scopeTyVars ) ) {
                                 // std::cerr << "needs adapter: ";
@@ -994 +992 @@
 
                         // move polymorphic return type to parameter list
-                        std::string typeName;
-                        if ( isPolyRet( funcType, typeName ) ) {
+                        if ( isPolyRet( funcType ) ) {
                                 DeclarationWithType *ret = funcType->get_returnVals().front();
                                 ret->set_type( new PointerType( Type::Qualifiers(), ret->get_type() ) );