Changeset 0bfaf80

Timestamp:

Jan 23, 2017, 4:27:33 PM (7 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

4a9ccc3, 63f78f0

Parents:

092528b

Message:

Generic instantiation accounts for sized dtypes

File:

• src/GenPoly/InstantiateGeneric.cc (modified) (1 diff)

src/GenPoly/InstantiateGeneric.cc

@@ -220 +220 @@
                         assert(paramType && "Aggregate parameters should be type expressions");
 
-                        switch ( (*baseParam)->get_kind() ) {
-                        case TypeDecl::Any: {
-                                // substitute parameter for otype; makes the type concrete or dynamic depending on the parameter
+                        if ( (*baseParam)->isComplete() ) {
+                                // substitute parameter for complete (otype or sized dtype) type; makes the struct concrete or dynamic depending on the parameter
                                 out.push_back( paramType->clone() );
                                 gt |= isPolyType( paramType->get_type() ) ? genericType::dynamic : genericType::concrete;
-                                break;
-                        }
-                        case TypeDecl::Dtype:
-                                // can pretend that any dtype is `void`
-                                out.push_back( new TypeExpr( new VoidType( Type::Qualifiers() ) ) );
-                                break;
-                        case TypeDecl::Ftype:
-                                // can pretend that any ftype is `void (*)(void)`
-                                out.push_back( new TypeExpr( new FunctionType( Type::Qualifiers(), false ) ) );
-                                break;
-                        case TypeDecl::Ttype:
-                                assertf( false, "Ttype parameters are not currently allowed as parameters to generic types." );
-                                break;
+                        } else switch ( (*baseParam)->get_kind() ) {
+                                case TypeDecl::Dtype:
+                                        // can pretend that any incomplete dtype is `void`
+                                        out.push_back( new TypeExpr( new VoidType( Type::Qualifiers() ) ) );
+                                        break;
+                                case TypeDecl::Ftype:
+                                        // can pretend that any ftype is `void (*)(void)`
+                                        out.push_back( new TypeExpr( new FunctionType( Type::Qualifiers(), false ) ) );
+                                        break;
+                                case TypeDecl::Ttype:
+                                        assertf( false, "Ttype parameters are not currently allowed as parameters to generic types." );
+                                        break;
+                                case TypeDecl::Any:
+                                        assertf( false, "otype parameters handled by baseParam->isComplete()." );
+                                        break;
                         }
                 }