Changeset 7e23d0a for src/GenPoly/GenPoly.cc

Timestamp:

Nov 25, 2015, 2:53:26 PM (8 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:

32d281d, 704c9dd

Parents:

02ec390 (diff), 5189888 (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 plg.uwaterloo.ca:software/cfa/cfa-cc

File:

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

src/GenPoly/GenPoly.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue May 19 07:37:46 2015
-// Update Count     : 1
+// Last Modified On : Thu Nov 19 17:23:44 2015
+// Update Count     : 10
 //
 
@@ -21 +21 @@
 
 namespace GenPoly {
-        // interface functions
-        bool isPolyVal( Type *type, const TyVarMap &tyVars ) {
-                return isPolyVal( type, tyVars, false );
+        // A function needs an adapter if it returns a polymorphic value or if any of its
+        // parameters have polymorphic type
+        bool needsAdapter( FunctionType *adaptee, const TyVarMap &tyVars ) {
+                if ( ! adaptee->get_returnVals().empty() && isPolyVal( adaptee->get_returnVals().front()->get_type(), tyVars ) ) {
+                        return true;
+                } // if
+                for ( std::list< DeclarationWithType* >::const_iterator innerArg = adaptee->get_parameters().begin(); innerArg != adaptee->get_parameters().end(); ++innerArg ) {
+                        if ( isPolyVal( (*innerArg)->get_type(), tyVars ) ) {
+                                return true;
+                        } // if
+                } // for
+                return false;
         }
 
-        bool needsAdapter( FunctionType *adaptee, const TyVarMap &tyVars ) {  
-                return needsAdapter( adaptee, tyVars, false );
+        bool isPolyRet( FunctionType *function, std::string &name, const TyVarMap &otherTyVars ) {
+                bool doTransform = false;
+                if ( ! function->get_returnVals().empty() ) {
+                        if ( TypeInstType *typeInst = dynamic_cast< TypeInstType *>( function->get_returnVals().front()->get_type() ) ) {
+        
+                                // figure out if the return type is specified by a type parameter
+                                for ( std::list< TypeDecl *>::const_iterator tyVar = function->get_forall().begin(); tyVar != function->get_forall().end(); ++tyVar ) {
+                                        if ( (*tyVar)->get_name() == typeInst->get_name() ) {
+                                                doTransform = true;
+                                                name = typeInst->get_name();
+                                                break;
+                                        } // if
+                                } // for
+                                if ( ! doTransform && otherTyVars.find( typeInst->get_name() ) != otherTyVars.end() ) {
+                                        doTransform = true;
+                                } // if
+                        } // if
+                } // if
+                return doTransform;
         }
 
-        bool isPolyVal( Type *type, const TyVarMap &tyVars, bool considerAllTyVars ) {
-                if ( TypeInstType *typeInst = dynamic_cast< TypeInstType* >( type ) ) {
+        bool isPolyRet( FunctionType *function, std::string &name ) {
+                TyVarMap dummyTyVars;
+                return isPolyRet( function, name, dummyTyVars );
+        }
+
+        bool isPolyRet( FunctionType *function, const TyVarMap &otherTyVars ) {
+                std::string dummyString;
+                return isPolyRet( function, dummyString, otherTyVars );
+        }
+
+        bool isPolyVal( Type *type, const TyVarMap &tyVars ) {
+                if ( TypeInstType *typeInst = dynamic_cast< TypeInstType * >( type ) ) {
                         if ( tyVars.find( typeInst->get_name() ) != tyVars.end() ) {
                                 return true;
                         } // if
-                        return considerAllTyVars;
                 } // if
                 return false;
-        }
-
-        // A function needs an adapter if it returns a polymorphic value or if any of its
-        // parameters have polymorphic type
-        bool needsAdapter( FunctionType *adaptee, const TyVarMap &tyVars, bool considerAllTyVars ) {
-                bool needsAdapter = false;
-                if ( ! adaptee->get_returnVals().empty() && isPolyVal( adaptee->get_returnVals().front()->get_type(), tyVars, considerAllTyVars ) ) {
-                        needsAdapter = true;
-                } // if
-                for ( std::list< DeclarationWithType* >::const_iterator innerArg = adaptee->get_parameters().begin(); ! needsAdapter && innerArg != adaptee->get_parameters().end(); ++innerArg ) {
-                        if ( isPolyVal( (*innerArg)->get_type(), tyVars, considerAllTyVars ) ) {
-                                needsAdapter = true;
-                        } // if
-                } // for
-                return needsAdapter;
         }