Changes in src/GenPoly/GenPoly.cc [e56cfdb0:843054c2]

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 : Thu Nov 19 17:23:44 2015
-// Update Count     : 10
+// Last Modified On : Tue May 19 07:37:46 2015
+// Update Count     : 1
 //
 
@@ -21 +21 @@
 
 namespace GenPoly {
-        // 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 ) ) {
+        // interface functions
+        bool isPolyVal( Type *type, const TyVarMap &tyVars ) {
+                return isPolyVal( type, tyVars, false );
+        }
+
+        bool needsAdapter( FunctionType *adaptee, const TyVarMap &tyVars ) {  
+                return needsAdapter( adaptee, tyVars, false );
+        }
+
+        bool isPolyVal( Type *type, const TyVarMap &tyVars, bool considerAllTyVars ) {
+                if ( TypeInstType *typeInst = dynamic_cast< TypeInstType* >( type ) ) {
+                        if ( tyVars.find( typeInst->get_name() ) != tyVars.end() ) {
                                 return true;
                         } // if
-                } // for
+                        return considerAllTyVars;
+                } // if
                 return 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
+        // 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
-                } // if
-                return doTransform;
-        }
-
-        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
-                } // if
-                return false;
+                } // for
+                return needsAdapter;
         }