Changes in src/SymTab/Validate.cc [b95fe40:8e0147a]

File:

• src/SymTab/Validate.cc (modified) (9 diffs)

src/SymTab/Validate.cc

@@ -124 +124 @@
 
         /// Associates forward declarations of aggregates with their definitions
-        struct LinkReferenceToTypes final : public WithIndexer, public WithGuards {
+        struct LinkReferenceToTypes final : public WithIndexer {
                 LinkReferenceToTypes( const Indexer *indexer );
                 void postvisit( TypeInstType *typeInst );
@@ -137 +137 @@
                 void postvisit( UnionDecl *unionDecl );
                 void postvisit( TraitDecl * traitDecl );
-
-                void previsit( StructDecl *structDecl );
-                void previsit( UnionDecl *unionDecl );
-
-                void renameGenericParams( std::list< TypeDecl * > & params );
 
           private:
@@ -152 +147 @@
                 ForwardStructsType forwardStructs;
                 ForwardUnionsType forwardUnions;
-                /// true if currently in a generic type body, so that type parameter instances can be renamed appropriately
-                bool inGeneric = false;
         };
 
@@ -430 +423 @@
         }
 
-        void checkGenericParameters( ReferenceToType * inst ) {
-                for ( Expression * param : inst->parameters ) {
-                        if ( ! dynamic_cast< TypeExpr * >( param ) ) {
-                                throw SemanticError( "Expression parameters for generic types are currently unsupported: ", inst );
-                        }
-                }
-        }
-
         void LinkReferenceToTypes::postvisit( StructInstType *structInst ) {
                 StructDecl *st = local_indexer->lookupStruct( structInst->get_name() );
@@ -449 +434 @@
                         forwardStructs[ structInst->get_name() ].push_back( structInst );
                 } // if
-                checkGenericParameters( structInst );
         }
 
@@ -462 +446 @@
                         forwardUnions[ unionInst->get_name() ].push_back( unionInst );
                 } // if
-                checkGenericParameters( unionInst );
         }
 
@@ -542 +525 @@
                 // need to carry over the 'sized' status of each decl in the instance
                 for ( auto p : group_iterate( traitDecl->get_parameters(), traitInst->get_parameters() ) ) {
-                        TypeExpr * expr = dynamic_cast< TypeExpr * >( std::get<1>(p) );
-                        if ( ! expr ) {
-                                throw SemanticError( "Expression parameters for trait instances are currently unsupported: ", std::get<1>(p) );
-                        }
+                        TypeExpr * expr = strict_dynamic_cast< TypeExpr * >( std::get<1>(p) );
                         if ( TypeInstType * inst = dynamic_cast< TypeInstType * >( expr->get_type() ) ) {
                                 TypeDecl * formalDecl = std::get<0>(p);
@@ -566 +546 @@
                         } // if
                 } // if
-        }
-
-        void LinkReferenceToTypes::renameGenericParams( std::list< TypeDecl * > & params ) {
-                // rename generic type parameters uniquely so that they do not conflict with user-defined function forall parameters, e.g.
-                //   forall(otype T)
-                //   struct Box {
-                //     T x;
-                //   };
-                //   forall(otype T)
-                //   void f(Box(T) b) {
-                //     ...
-                //   }
-                // The T in Box and the T in f are different, so internally the naming must reflect that.
-                GuardValue( inGeneric );
-                inGeneric = ! params.empty();
-                for ( TypeDecl * td : params ) {
-                        td->name = "__" + td->name + "_generic_";
-                }
-        }
-
-        void LinkReferenceToTypes::previsit( StructDecl * structDecl ) {
-                renameGenericParams( structDecl->parameters );
-        }
-
-        void LinkReferenceToTypes::previsit( UnionDecl * unionDecl ) {
-                renameGenericParams( unionDecl->parameters );
         }
 
@@ -621 +575 @@
 
         void LinkReferenceToTypes::postvisit( TypeInstType *typeInst ) {
-                // ensure generic parameter instances are renamed like the base type
-                if ( inGeneric && typeInst->baseType ) typeInst->name = typeInst->baseType->name;
                 if ( NamedTypeDecl *namedTypeDecl = local_indexer->lookupType( typeInst->get_name() ) ) {
                         if ( TypeDecl *typeDecl = dynamic_cast< TypeDecl * >( namedTypeDecl ) ) {