Changes in src/Validate/GenericParameter.cpp [f02f546:bccd70a]

File:

• src/Validate/GenericParameter.cpp (modified) (7 diffs)

src/Validate/GenericParameter.cpp

@@ -16 +16 @@
 #include "GenericParameter.hpp"
 
+#include "AST/Copy.hpp"
 #include "AST/Decl.hpp"
 #include "AST/Expr.hpp"
@@ -119 +120 @@
 }
 
-bool isSizedPolymorphic( const ast::AggregateDecl * decl ) {
-        for ( const auto & param : decl->params ) {
-                if ( param->sized ) return true;
-        }
-        return false;
-}
-
-struct ValidateGenericParamsCore :
-                public ast::WithCodeLocation, public ast::WithGuards {
-        // Generic parameter filling and checks:
+struct ValidateGenericParamsCore : public ast::WithCodeLocation {
         const ast::StructInstType * previsit( const ast::StructInstType * type ) {
                 assert( location );
@@ -138 +130 @@
                 return validateGeneric( *location, type );
         }
-
-        // Check parameter and bitfield combinations:
-        bool insideSized = false;
-        void previsit( const ast::StructDecl * decl ) {
-                if ( isSizedPolymorphic( decl ) && !insideSized ) {
-                        GuardValue( insideSized ) = true;
-                }
-        }
-
-        void previsit( const ast::UnionDecl * decl ) {
-                if ( isSizedPolymorphic( decl ) && !insideSized ) {
-                        GuardValue( insideSized ) = true;
-                }
-        }
-
-        void previsit( const ast::ObjectDecl * decl ) {
-                if ( insideSized && decl->bitfieldWidth ) {
-                        SemanticError( decl->location, decl,
-                                "Cannot have bitfields inside a sized polymorphic structure." );
-                }
-        }
 };
 
@@ -164 +135 @@
 
 struct TranslateDimensionCore :
-                public WithNoIdSymbolTable, public ast::WithGuards,
-                public ast::WithVisitorRef<TranslateDimensionCore> {
+                public WithNoIdSymbolTable, public ast::WithGuards {
 
         // SUIT: Struct- or Union- InstType
@@ -190 +160 @@
 
         const ast::TypeDecl * postvisit( const ast::TypeDecl * decl );
-        const ast::Type * postvisit( const ast::FunctionType * type );
-        const ast::Type * postvisit( const ast::TypeInstType * type );
-
         const ast::Expr * postvisit( const ast::DimensionExpr * expr );
         const ast::Expr * postvisit( const ast::Expr * expr );
@@ -198 +165 @@
 };
 
-// Declaration of type variable: forall( [N] )  ->  forall( N & | sized( N ) )
 const ast::TypeDecl * TranslateDimensionCore::postvisit(
                 const ast::TypeDecl * decl ) {
@@ -210 +176 @@
         }
         return decl;
-}
-
-// Makes postvisit( TypeInstType ) get called on the entries of the function declaration's type's forall list.
-// Pass.impl.hpp's visit( FunctionType ) does not consider the forall entries to be child nodes.
-// Workaround is: during the current TranslateDimension pass, manually visit down there.
-const ast::Type * TranslateDimensionCore::postvisit(
-                const ast::FunctionType * type ) {
-        visitor->maybe_accept( type, &ast::FunctionType::forall );
-        return type;
-}
-
-// Use of type variable, assuming `forall( [N] )` in scope:  void (*)( foo( /*dimension*/ N ) & )  ->  void (*)( foo( /*dtype*/ N ) & )
-const ast::Type * TranslateDimensionCore::postvisit(
-                const ast::TypeInstType * type ) {
-        if ( type->kind == ast::TypeDecl::Dimension ) {
-                auto mutType = ast::mutate( type );
-                mutType->kind = ast::TypeDecl::Dtype;
-                return mutType;
-        }
-        return type;
 }