Fix module type check defined in parent member bodies (#1936)
This commit is contained in:
1 parent
05d8e88592
commit
0cb9843af7
6 files changed
+34
-4
No files matched your search
@@ -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)
|
||||
|
||||
+1
@@ -0,0 +1 @@
|
||||
extends "moduleInParentMemberBase.pkl"
|
||||
+1
@@ -0,0 +1 @@
|
||||
extends "moduleInParentMemberBase.pkl"
|
||||
Vendored
+8
@@ -0,0 +1,8 @@
|
||||
open module moduleInParentMemberBase
|
||||
|
||||
hidden check = (it: module) -> it
|
||||
|
||||
hidden readLocal {
|
||||
local `local`: module = outer
|
||||
res = `local`
|
||||
}
|
||||
Vendored
+12
@@ -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
|
||||
}
|
||||
Vendored
+8
@@ -0,0 +1,8 @@
|
||||
check {
|
||||
a {}
|
||||
b {}
|
||||
}
|
||||
`local` {
|
||||
a = true
|
||||
b = true
|
||||
}
|
||||
Reference in new issue
Block a user