Changeset 1cdfa82 for src/GenPoly/GenPoly.cc

Timestamp:

Apr 25, 2018, 4:55:53 PM (6 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

new-env, with_gc

Children:

42107b4

Parents:

2efe4b8 (diff), 9d5fb67 (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 remote-tracking branch 'origin/master' into with_gc

File:

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

src/GenPoly/GenPoly.cc

@@ -100 +100 @@
                 if ( dynamic_cast< TypeInstType * >( type ) ) {
                         return type;
+                } else if ( ArrayType * arrayType = dynamic_cast< ArrayType * >( type ) ) {
+                        return isPolyType( arrayType->base, env );
                 } else if ( StructInstType *structType = dynamic_cast< StructInstType* >( type ) ) {
                         if ( hasPolyParams( structType->get_parameters(), env ) ) return type;
@@ -115 +117 @@
                                 return type;
                         }
+                } else if ( ArrayType * arrayType = dynamic_cast< ArrayType * >( type ) ) {
+                        return isPolyType( arrayType->base, tyVars, env );
                 } else if ( StructInstType *structType = dynamic_cast< StructInstType* >( type ) ) {
                         if ( hasPolyParams( structType->get_parameters(), tyVars, env ) ) return type;