Changes in src/GenPoly/GenPoly.cc [ffad73a:69911c11]

File:

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

src/GenPoly/GenPoly.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Tue Nov 24 15:23:08 2015
-// Update Count     : 11
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Dec 15 16:11:18 2015
+// Update Count     : 13
 //
 
@@ -68 +68 @@
 
         namespace {
-                /// Checks a parameter list for polymorphic parameters
+                /// Checks a parameter list for polymorphic parameters; will substitute according to env if present
+                bool hasPolyParams( std::list< Expression* >& params, 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(), env ) ) return true;
+                        }
+                        return false;
+                }
+
+                /// Checks a parameter list for polymorphic parameters from tyVars; will substitute according to env if present
                 bool hasPolyParams( std::list< Expression* >& params, const TyVarMap &tyVars, const TypeSubstitution *env ) {
                         for ( std::list< Expression* >::iterator param = params.begin(); param != params.end(); ++param ) {
@@ -78 +88 @@
                 }
         }
+
+        Type *isPolyType( Type *type, const TypeSubstitution *env ) {
+                if ( TypeInstType *typeInst = dynamic_cast< TypeInstType * >( type ) ) {
+                        if ( env ) {
+                                if ( Type *newType = env->lookup( typeInst->get_name() ) ) {
+                                        return isPolyType( newType, env );
+                                } // if
+                        } // if
+                        return type;
+                } else if ( StructInstType *structType = dynamic_cast< StructInstType* >( type ) ) {
+                        if ( hasPolyParams( structType->get_parameters(), env ) ) return type;
+                } else if ( UnionInstType *unionType = dynamic_cast< UnionInstType* >( type ) ) {
+                        if ( hasPolyParams( unionType->get_parameters(), env ) ) return type;
+                }
+                return 0;
+        }
         
         Type *isPolyType( Type *type, const TyVarMap &tyVars, const TypeSubstitution *env ) {
-                if ( TypeInstType *typeInst = dynamic_cast< TypeInstType* >( type ) ) {
+                if ( TypeInstType *typeInst = dynamic_cast< TypeInstType * >( type ) ) {
                         if ( env ) {
                                 if ( Type *newType = env->lookup( typeInst->get_name() ) ) {
@@ -97 +123 @@
         }
 
+        Type *isPolyPtr( Type *type, const TypeSubstitution *env ) {
+                if ( PointerType *ptr = dynamic_cast< PointerType *>( type ) ) {
+                        return isPolyType( ptr->get_base(), env );
+                } else if ( env ) {
+                        if ( TypeInstType *typeInst = dynamic_cast< TypeInstType *>( type ) ) {
+                                if ( Type *newType = env->lookup( typeInst->get_name() ) ) {
+                                        return isPolyPtr( newType, env );
+                                } // if
+                        } // if
+                } // if
+                return 0;
+        }
+        
         Type *isPolyPtr( Type *type, const TyVarMap &tyVars, const TypeSubstitution *env ) {
                 if ( PointerType *ptr = dynamic_cast< PointerType *>( type ) ) {
@@ -110 +149 @@
         }
 
+        FunctionType * getFunctionType( Type *ty ) {
+                PointerType *ptrType;
+                if ( ( ptrType = dynamic_cast< PointerType* >( ty ) ) ) {
+                        return dynamic_cast< FunctionType* >( ptrType->get_base() ); // pointer if FunctionType, NULL otherwise
+                } else {
+                        return dynamic_cast< FunctionType* >( ty ); // pointer if FunctionType, NULL otherwise
+                }
+        }
+
         void printTyVarMap( std::ostream &os, const TyVarMap &tyVarMap ) {
                 for ( TyVarMap::const_iterator i = tyVarMap.begin(); i != tyVarMap.end(); ++i ) {
@@ -118 +166 @@
 
         std::string sizeofName( Type *ty ) {
-                return std::string( "_sizeof_" ) + SymTab::Mangler::mangle( ty, false, false );
+                return std::string( "_sizeof_" ) + SymTab::Mangler::mangleType( ty );
         }
 
         std::string alignofName( Type *ty ) {
-                return std::string( "_alignof_" ) + SymTab::Mangler::mangle( ty, false, false );
+                return std::string( "_alignof_" ) + SymTab::Mangler::mangleType( ty );
         }
 } // namespace GenPoly