Changes in src/GenPoly/GenPoly.cc [cf16f94:ffad73a]

File:

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

src/GenPoly/GenPoly.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Dec  1 15:18:54 2015
-// Update Count     : 12
+// Last Modified By : Rob Schluntz
+// Last Modified On : Tue Nov 24 15:23:08 2015
+// Update Count     : 11
 //
 
 #include "GenPoly.h"
+
+#include "SymTab/Mangler.h"
+#include "SynTree/Expression.h"
 #include "SynTree/Type.h"
 
@@ -21 +24 @@
 
 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 ) ) {
+                if ( ! adaptee->get_returnVals().empty() && isPolyType( 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 ) ) {
+                        if ( isPolyType( (*innerArg)->get_type(), tyVars ) ) {
                                 return true;
                         } // if
@@ -65 +67 @@
         }
 
-        bool isPolyVal( Type *type, const TyVarMap &tyVars ) {
-                if ( TypeInstType *typeInst = dynamic_cast< TypeInstType * >( type ) ) {
+        namespace {
+                /// Checks a parameter list for polymorphic parameters
+                bool hasPolyParams( std::list< Expression* >& params, const TyVarMap &tyVars, const TypeSubstitution *env ) {
+                        for ( std::list< Expression* >::iterator param = params.begin(); param != params.end(); ++param ) {
+                                TypeExpr *paramType = dynamic_cast< TypeExpr* >( *param );
+                                assert(paramType && "Aggregate parameters should be type expressions");
+                                if ( isPolyType( paramType->get_type(), tyVars, env ) ) return true;
+                        }
+                        return false;
+                }
+        }
+        
+        Type *isPolyType( Type *type, const TyVarMap &tyVars, const TypeSubstitution *env ) {
+                if ( TypeInstType *typeInst = dynamic_cast< TypeInstType* >( type ) ) {
+                        if ( env ) {
+                                if ( Type *newType = env->lookup( typeInst->get_name() ) ) {
+                                        return isPolyType( newType, tyVars, env );
+                                } // if
+                        } // if
                         if ( tyVars.find( typeInst->get_name() ) != tyVars.end() ) {
-                                return true;
+                                return type;
+                        }
+                } else if ( StructInstType *structType = dynamic_cast< StructInstType* >( type ) ) {
+                        if ( hasPolyParams( structType->get_parameters(), tyVars, env ) ) return type;
+                } else if ( UnionInstType *unionType = dynamic_cast< UnionInstType* >( type ) ) {
+                        if ( hasPolyParams( unionType->get_parameters(), tyVars, env ) ) return type;
+                }
+                return 0;
+        }
+
+        Type *isPolyPtr( Type *type, const TyVarMap &tyVars, const TypeSubstitution *env ) {
+                if ( PointerType *ptr = dynamic_cast< PointerType *>( type ) ) {
+                        return isPolyType( ptr->get_base(), tyVars, env );
+                } else if ( env ) {
+                        if ( TypeInstType *typeInst = dynamic_cast< TypeInstType *>( type ) ) {
+                                if ( Type *newType = env->lookup( typeInst->get_name() ) ) {
+                                        return isPolyPtr( newType, tyVars, env );
+                                } // if
                         } // if
                 } // if
-                return false;
-        }
-
-        bool isPolyObj( Type *type, const TyVarMap &tyVars ) {
-                if ( isPolyVal( type, tyVars ) ) {
-                        return true;
-                } else if ( PointerType *pt = dynamic_cast<PointerType*>( type ) ) {
-                        return isPolyObj( pt->get_base(), tyVars );
-                } else {
-                        return false;
-                }
+                return 0;
         }
 
@@ -90 +116 @@
                 os << std::endl;
         }
+
+        std::string sizeofName( Type *ty ) {
+                return std::string( "_sizeof_" ) + SymTab::Mangler::mangle( ty, false, false );
+        }
+
+        std::string alignofName( Type *ty ) {
+                return std::string( "_alignof_" ) + SymTab::Mangler::mangle( ty, false, false );
+        }
 } // namespace GenPoly