Changeset 2a301ff for src/Validate/GenericParameter.cpp

Timestamp:

Aug 31, 2023, 11:31:15 PM (13 months ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

950c58e

Parents:

92355883 (diff), 686912c (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:

Resolve conflict

File:

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

src/Validate/GenericParameter.cpp

@@ -16 +16 @@
 #include "GenericParameter.hpp"
 
-#include "AST/Copy.hpp"
 #include "AST/Decl.hpp"
 #include "AST/Expr.hpp"
@@ -165 +164 @@
 
 struct TranslateDimensionCore :
-                public WithNoIdSymbolTable, public ast::WithGuards {
+                public WithNoIdSymbolTable, public ast::WithGuards,
+                public ast::WithVisitorRef<TranslateDimensionCore> {
 
         // SUIT: Struct- or Union- InstType
@@ -190 +190 @@
 
         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 );
@@ -195 +198 @@
 };
 
+// Declaration of type variable: forall( [N] )  ->  forall( N & | sized( N ) )
 const ast::TypeDecl * TranslateDimensionCore::postvisit(
                 const ast::TypeDecl * decl ) {
@@ -206 +210 @@
         }
         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;
 }