Changes in src/GenPoly/GenPoly.cc [3df4cd9:c97b448]

File:

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

src/GenPoly/GenPoly.cc

@@ -48 +48 @@
                 }
 
-                bool hasPolyParams( const std::vector<ast::ptr<ast::Expr>> & params, const ast::TypeSubstitution * env ) {
-                        for ( auto &param : params ) {
-                                auto paramType = param.as<ast::TypeExpr>();
-                                assertf( paramType, "Aggregate parameters should be type expressions" );
-                                if ( isPolyType( paramType->type, env ) ) return true;
+                bool hasPolyParams( const std::vector<ast::ptr<ast::Expr>> & params, const ast::TypeSubstitution * env) {
+                        for (auto &param : params) {
+                                auto paramType = param.strict_as<ast::TypeExpr>();
+                                if (isPolyType(paramType->type, env)) return true;
                         }
                         return false;
@@ -63 +62 @@
                                 assertf(paramType, "Aggregate parameters should be type expressions");
                                 if ( isPolyType( paramType->get_type(), tyVars, env ) ) return true;
-                        }
-                        return false;
-                }
-
-                bool hasPolyParams( const std::vector<ast::ptr<ast::Expr>> & params, const TypeVarMap & typeVars, const ast::TypeSubstitution * env ) {
-                        for ( auto & param : params ) {
-                                auto paramType = param.as<ast::TypeExpr>();
-                                assertf( paramType, "Aggregate parameters should be type expressions" );
-                                if ( isPolyType( paramType->type, typeVars, env ) ) return true;
                         }
                         return false;
@@ -195 +185 @@
         }
 
+        const ast::Type * isPolyType(const ast::Type * type, const TyVarMap & tyVars, const ast::TypeSubstitution * env) {
+                type = replaceTypeInst( type, env );
+
+                if ( auto typeInst = dynamic_cast< const ast::TypeInstType * >( type ) ) {
+                        if ( tyVars.contains( typeInst->typeString() ) ) return type;
+                } else if ( auto arrayType = dynamic_cast< const ast::ArrayType * >( type ) ) {
+                        return isPolyType( arrayType->base, env );
+                } else if ( auto structType = dynamic_cast< const ast::StructInstType* >( type ) ) {
+                        if ( hasPolyParams( structType->params, env ) ) return type;
+                } else if ( auto unionType = dynamic_cast< const ast::UnionInstType* >( type ) ) {
+                        if ( hasPolyParams( unionType->params, env ) ) return type;
+                }
+                return nullptr;
+        }
+
 const ast::Type * isPolyType( const ast::Type * type,
                 const TypeVarMap & typeVars, const ast::TypeSubstitution * subst ) {
@@ -202 +207 @@
                 if ( typeVars.contains( *inst ) ) return type;
         } else if ( auto array = dynamic_cast< const ast::ArrayType * >( type ) ) {
-                return isPolyType( array->base, typeVars, subst );
+                return isPolyType( array->base, subst );
         } else if ( auto sue = dynamic_cast< const ast::StructInstType * >( type ) ) {
-                if ( hasPolyParams( sue->params, typeVars, subst ) ) return type;
+                if ( hasPolyParams( sue->params, subst ) ) return type;
         } else if ( auto sue = dynamic_cast< const ast::UnionInstType * >( type ) ) {
-                if ( hasPolyParams( sue->params, typeVars, subst ) ) return type;
+                if ( hasPolyParams( sue->params, subst ) ) return type;
         }
         return nullptr;