Renamed eager generator scope

Author: stackoverflow

pkl-core/src/main/java/org/pkl/core/ast/builder/AstBuilder.java

@@ -1287,7 +1287,7 @@ public GeneratorMemberNode visitObjectMethod(ObjectMethod memberNode) {
   @Override
   public GeneratorMemberNode visitMemberPredicate(MemberPredicate ctx) {
     var keyNode =
-        symbolTable.enterForEager(
+        symbolTable.enterEagerGenerator(
             (scp) -> symbolTable.enterCustomThisScope(scope -> visitExpr(ctx.getPred())));
     var member =
         doVisitObjectEntryBody(createSourceSection(ctx), keyNode, ctx.getExpr(), ctx.getBodyList());
@@ -1336,7 +1336,8 @@ public GeneratorMemberNode visitWhenGenerator(WhenGenerator member) {
     // when predicates cannot see their direct scope
     var prev = isLevelUpUnreliable;
     isLevelUpUnreliable = true;
-    var predicateNode = symbolTable.enterForEager((scope) -> visitExpr(member.getPredicate()));
+    var predicateNode =
+        symbolTable.enterEagerGenerator((scope) -> visitExpr(member.getPredicate()));
     isLevelUpUnreliable = prev;
     return new GeneratorWhenNode(sourceSection, predicateNode, thenNodes, elseNodes);
   }
@@ -1389,15 +1390,12 @@ public GeneratorMemberNode visitForGenerator(ForGenerator ctx) {
     var memberDescriptorBuilder = currentScope.newForGeneratorMemberDescriptorBuilder();
     var keySlot = -1;
     var valueSlot = -1;
-    var nestLevel = -1;
     if (keyIdentifier != null) {
       keySlot = generatorDescriptorBuilder.addSlot(FrameSlotKind.Illegal, keyIdentifier, null);
-      nestLevel = keySlot;
       memberDescriptorBuilder.addSlot(FrameSlotKind.Illegal, keyIdentifier, null);
     }
     if (valueIdentifier != null) {
       valueSlot = generatorDescriptorBuilder.addSlot(FrameSlotKind.Illegal, valueIdentifier, null);
-      if (nestLevel == -1) nestLevel = valueSlot;
       memberDescriptorBuilder.addSlot(FrameSlotKind.Illegal, valueIdentifier, null);
     }
     var unresolvedKeyTypeNode =
@@ -1422,12 +1420,11 @@ public GeneratorMemberNode visitForGenerator(ForGenerator ctx) {
             : null;
     var prev = isLevelUpUnreliable;
     isLevelUpUnreliable = true;
-    var iterableNode = symbolTable.enterForEager(scope -> visitExpr(ctx.getExpr()));
+    var iterableNode = symbolTable.enterEagerGenerator(scope -> visitExpr(ctx.getExpr()));
     isLevelUpUnreliable = prev;
     var memberNodes =
         symbolTable.enterForGenerator(
             params,
-            nestLevel,
             generatorDescriptorBuilder,
             memberDescriptorBuilder,
             scope -> doVisitForWhenBody(ctx.getBody()));
@@ -2460,7 +2457,7 @@ private ObjectMember doVisitObjectProperty(
   }
 
   private Pair<ExpressionNode, ObjectMember> doVisitObjectEntry(ObjectEntry entry) {
-    var keyNode = symbolTable.enterForEager((scp) -> visitExpr(entry.getKey()));
+    var keyNode = symbolTable.enterEagerGenerator((scp) -> visitExpr(entry.getKey()));
     // var keyNode = visitExpr(entry.getKey());
 
     var member =

pkl-core/src/main/java/org/pkl/core/ast/builder/SymbolTable.java

@@ -123,13 +123,12 @@ public <T> T enterMethod(
         nodeFactory);
   }
 
-  public <T> T enterForEager(Function<ForEagerScope, T> nodeFactory) {
-    return doEnter(new ForEagerScope(currentScope, currentScope.qualifiedName), nodeFactory);
+  public <T> T enterEagerGenerator(Function<EagerGeneratorScope, T> nodeFactory) {
+    return doEnter(new EagerGeneratorScope(currentScope, currentScope.qualifiedName), nodeFactory);
   }
 
   public <T> T enterForGenerator(
       List<String> params,
-      int nestLevel,
       FrameDescriptor.Builder frameDescriptorBuilder,
       FrameDescriptor.Builder memberDescriptorBuilder,
       Function<ForGeneratorScope, T> nodeFactory) {
@@ -138,7 +137,6 @@ public <T> T enterForGenerator(
             currentScope,
             currentScope.qualifiedName,
             params,
-            nestLevel,
             frameDescriptorBuilder,
             memberDescriptorBuilder),
         nodeFactory);
@@ -419,7 +417,7 @@ private interface ResolutionFunction<T> {
       var shouldSkip = false;
       for (var scope = this; scope != null; scope = scope.getParent()) {
         // for headers resolve variables one scope up
-        if (scope instanceof ForEagerScope) {
+        if (scope instanceof EagerGeneratorScope) {
           shouldSkip = true;
           continue;
         }
@@ -767,29 +765,26 @@ public LambdaScope(
     }
   }
 
-  // A scope used only for variable resolution
-  public static final class ForEagerScope extends Scope {
-    private ForEagerScope(@Nullable Scope parent, String qualifiedName) {
+  // A generator scope that is resolved eagerly and one level above
+  public static final class EagerGeneratorScope extends Scope {
+    private EagerGeneratorScope(@Nullable Scope parent, String qualifiedName) {
       super(parent, null, qualifiedName, ConstLevel.NONE, FrameDescriptor.newBuilder());
     }
   }
 
   public static final class ForGeneratorScope extends Scope implements LexicalScope {
     private final FrameDescriptor.Builder memberDescriptorBuilder;
     final List<String> params;
-    private final int nestLevel;
 
     public ForGeneratorScope(
         Scope parent,
         String qualifiedName,
         List<String> params,
-        int nestLevel,
         FrameDescriptor.Builder frameDescriptorBuilder,
         FrameDescriptor.Builder memberDescriptorBuilder) {
       super(parent, null, qualifiedName, ConstLevel.NONE, frameDescriptorBuilder);
       this.memberDescriptorBuilder = memberDescriptorBuilder;
       this.params = params;
-      this.nestLevel = nestLevel;
     }
 
     public FrameDescriptor buildMemberDescriptor() {