diff --git a/pkl-core/src/main/java/org/pkl/core/ast/type/UnresolvedTypeNode.java b/pkl-core/src/main/java/org/pkl/core/ast/type/UnresolvedTypeNode.java index 94084df1a..ea6940b5c 100644 --- a/pkl-core/src/main/java/org/pkl/core/ast/type/UnresolvedTypeNode.java +++ b/pkl-core/src/main/java/org/pkl/core/ast/type/UnresolvedTypeNode.java @@ -25,7 +25,7 @@ import org.pkl.core.PklBugException; import org.pkl.core.TypeParameter; import org.pkl.core.ast.ExpressionNode; import org.pkl.core.ast.PklNode; -import org.pkl.core.ast.expression.primary.GetModuleNode; +import org.pkl.core.ast.expression.primary.GetModuleOwnerNode; import org.pkl.core.ast.type.TypeNode.*; import org.pkl.core.ast.type.TypeNodeFactory.*; import org.pkl.core.runtime.*; @@ -91,18 +91,18 @@ public abstract class UnresolvedTypeNode extends PklNode { /** The `module` type. */ public static final class Module extends UnresolvedTypeNode { - @Child private ExpressionNode getModuleNode; + @Child private ExpressionNode getModuleOwnerNode; public Module(SourceSection sourceSection) { super(sourceSection); - getModuleNode = new GetModuleNode(sourceSection); + getModuleOwnerNode = new GetModuleOwnerNode(sourceSection); } @Override public TypeNode execute(VirtualFrame frame) { CompilerDirectives.transferToInterpreter(); - var module = (VmTyped) getModuleNode.executeGeneric(frame); + var module = (VmTyped) getModuleOwnerNode.executeGeneric(frame); var moduleClass = module.getVmClass(); return moduleClass.isClosed() ? FinalSelfTypeNode.moduleType(sourceSection, moduleClass) diff --git a/pkl-core/src/test/files/LanguageSnippetTests/input-helper/types/moduleInParentMemberA.pkl b/pkl-core/src/test/files/LanguageSnippetTests/input-helper/types/moduleInParentMemberA.pkl new file mode 100644 index 000000000..c9c6ced17 --- /dev/null +++ b/pkl-core/src/test/files/LanguageSnippetTests/input-helper/types/moduleInParentMemberA.pkl @@ -0,0 +1 @@ +extends "moduleInParentMemberBase.pkl" diff --git a/pkl-core/src/test/files/LanguageSnippetTests/input-helper/types/moduleInParentMemberB.pkl b/pkl-core/src/test/files/LanguageSnippetTests/input-helper/types/moduleInParentMemberB.pkl new file mode 100644 index 000000000..c9c6ced17 --- /dev/null +++ b/pkl-core/src/test/files/LanguageSnippetTests/input-helper/types/moduleInParentMemberB.pkl @@ -0,0 +1 @@ +extends "moduleInParentMemberBase.pkl" diff --git a/pkl-core/src/test/files/LanguageSnippetTests/input-helper/types/moduleInParentMemberBase.pkl b/pkl-core/src/test/files/LanguageSnippetTests/input-helper/types/moduleInParentMemberBase.pkl new file mode 100644 index 000000000..139275984 --- /dev/null +++ b/pkl-core/src/test/files/LanguageSnippetTests/input-helper/types/moduleInParentMemberBase.pkl @@ -0,0 +1,8 @@ +open module moduleInParentMemberBase + +hidden check = (it: module) -> it + +hidden readLocal { + local `local`: module = outer + res = `local` +} diff --git a/pkl-core/src/test/files/LanguageSnippetTests/input/types/currentModuleTypeInParentMembers.pkl b/pkl-core/src/test/files/LanguageSnippetTests/input/types/currentModuleTypeInParentMembers.pkl new file mode 100644 index 000000000..e6d173e50 --- /dev/null +++ b/pkl-core/src/test/files/LanguageSnippetTests/input/types/currentModuleTypeInParentMembers.pkl @@ -0,0 +1,12 @@ +import ".../input-helper/types/moduleInParentMemberA.pkl" as A +import ".../input-helper/types/moduleInParentMemberB.pkl" as B + +check { + a = A.check.apply(A) + b = B.check.apply(B) +} + +`local` { + a = A.readLocal.res is A + b = B.readLocal.res is B +} diff --git a/pkl-core/src/test/files/LanguageSnippetTests/output/types/currentModuleTypeInParentMembers.pcf b/pkl-core/src/test/files/LanguageSnippetTests/output/types/currentModuleTypeInParentMembers.pcf new file mode 100644 index 000000000..9c346dab0 --- /dev/null +++ b/pkl-core/src/test/files/LanguageSnippetTests/output/types/currentModuleTypeInParentMembers.pcf @@ -0,0 +1,8 @@ +check { + a {} + b {} +} +`local` { + a = true + b = true +}