BlockFrameDescriptorInfo -> BlockDescriptorInfo

eregon · eregon · commit be521f1cf48e · 2023-08-18T12:49:44.000+02:00
* The Frame part is redundant and makes the class name quite long.
diff --git a/src/main/java/org/truffleruby/RubyLanguage.java b/src/main/java/org/truffleruby/RubyLanguage.java
@@ -110,7 +110,7 @@
 import org.truffleruby.language.objects.classvariables.ClassVariableStorage;
 import org.truffleruby.language.threadlocal.SpecialVariableStorage;
 import org.truffleruby.options.LanguageOptions;
-import org.truffleruby.parser.BlockFrameDescriptorInfo;
+import org.truffleruby.parser.BlockDescriptorInfo;
 import org.truffleruby.parser.ParserContext;
 import org.truffleruby.parser.ParsingParameters;
 import org.truffleruby.parser.RubySource;
@@ -190,7 +190,7 @@ public final class RubyLanguage extends TruffleLanguage<RubyContext> {
 
     /** This is a truly empty frame descriptor and should only by dummy root nodes which require no variables. Any other
      * root nodes should should use either {@link TranslatorEnvironment#newFrameDescriptorBuilderForMethod()} or
-     * {@link TranslatorEnvironment#newFrameDescriptorBuilderForBlock(BlockFrameDescriptorInfo)}. */
+     * {@link TranslatorEnvironment#newFrameDescriptorBuilderForBlock(BlockDescriptorInfo)}. */
     public static final FrameDescriptor EMPTY_FRAME_DESCRIPTOR = new FrameDescriptor(nil);
 
     private RubyThread getOrCreateForeignThread(RubyContext context, Thread thread) {
diff --git a/src/main/java/org/truffleruby/core/binding/BindingNodes.java b/src/main/java/org/truffleruby/core/binding/BindingNodes.java
@@ -57,7 +57,7 @@
 import com.oracle.truffle.api.source.SourceSection;
 import org.truffleruby.language.locals.WriteFrameSlotNode;
 import org.truffleruby.language.locals.WriteFrameSlotNodeGen;
-import org.truffleruby.parser.BlockFrameDescriptorInfo;
+import org.truffleruby.parser.BlockDescriptorInfo;
 import org.truffleruby.parser.TranslatorEnvironment;
 
 @CoreModule(value = "Binding", isClass = true)
@@ -80,7 +80,7 @@ public static RubyBinding createBinding(RubyContext context, RubyLanguage langua
     @TruffleBoundary
     public static FrameDescriptor newFrameDescriptor(RubyBinding binding) {
         FrameDescriptor parentDescriptor = binding.getFrame().getFrameDescriptor();
-        var ref = new BlockFrameDescriptorInfo(parentDescriptor);
+        var ref = new BlockDescriptorInfo(parentDescriptor);
         return TranslatorEnvironment.newFrameDescriptorBuilderForBlock(ref).build();
     }
 
@@ -90,7 +90,7 @@ public static FrameDescriptor newFrameDescriptor(RubyBinding binding) {
     public static FrameDescriptor newFrameDescriptor(FrameDescriptor parentDescriptor, String name) {
         assert name != null && !name.isEmpty();
 
-        var ref = new BlockFrameDescriptorInfo(parentDescriptor);
+        var ref = new BlockDescriptorInfo(parentDescriptor);
         var builder = TranslatorEnvironment.newFrameDescriptorBuilderForBlock(ref);
         int index = builder.addSlot(FrameSlotKind.Illegal, name, null);
         if (index != NEW_VAR_INDEX) {
diff --git a/src/main/java/org/truffleruby/debug/DebugHelpers.java b/src/main/java/org/truffleruby/debug/DebugHelpers.java
@@ -22,7 +22,7 @@
 import org.truffleruby.language.arguments.RubyArguments;
 import org.truffleruby.language.loader.CodeLoader;
 import org.truffleruby.language.methods.DeclarationContext;
-import org.truffleruby.parser.BlockFrameDescriptorInfo;
+import org.truffleruby.parser.BlockDescriptorInfo;
 import org.truffleruby.parser.ParserContext;
 import org.truffleruby.parser.RubySource;
 import org.truffleruby.parser.TranslatorEnvironment;
@@ -68,7 +68,7 @@ public static Object eval(RubyContext context, String code, Object... arguments)
 
 
         var builder = TranslatorEnvironment
-                .newFrameDescriptorBuilderForBlock(new BlockFrameDescriptorInfo(currentFrameDescriptor));
+                .newFrameDescriptorBuilderForBlock(new BlockDescriptorInfo(currentFrameDescriptor));
 
         for (int i = 0; i < nArgs; i++) {
             final Object identifier = arguments[i * 2];
diff --git a/src/main/java/org/truffleruby/language/RubyRootNode.java b/src/main/java/org/truffleruby/language/RubyRootNode.java
@@ -25,7 +25,7 @@
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.source.SourceSection;
 import org.truffleruby.annotations.Split;
-import org.truffleruby.parser.BlockFrameDescriptorInfo;
+import org.truffleruby.parser.BlockDescriptorInfo;
 
 import java.util.ArrayList;
 import java.util.IdentityHashMap;
@@ -83,8 +83,8 @@ public Object execute(VirtualFrame frame) {
     @Override
     public FrameDescriptor getParentFrameDescriptor() {
         var info = getFrameDescriptor().getInfo();
-        if (info instanceof BlockFrameDescriptorInfo) {
-            return ((BlockFrameDescriptorInfo) info).getParentDescriptor();
+        if (info instanceof BlockDescriptorInfo) {
+            return ((BlockDescriptorInfo) info).getParentDescriptor();
         } else {
             return null;
         }
diff --git a/src/main/java/org/truffleruby/language/SpecialVariablesSendingNode.java b/src/main/java/org/truffleruby/language/SpecialVariablesSendingNode.java
@@ -17,7 +17,7 @@
 import org.truffleruby.language.arguments.ReadCallerVariablesNode;
 
 import org.truffleruby.language.threadlocal.SpecialVariableStorage;
-import org.truffleruby.parser.BlockFrameDescriptorInfo;
+import org.truffleruby.parser.BlockDescriptorInfo;
 
 /** Some Ruby methods need access to the caller special variables: see usages of {@link ReadCallerVariablesNode}. This
  * is used for methods which need to access the last regexp MatchData or the last IO line.
@@ -49,8 +49,8 @@ protected Assumption getSpecialVariableAssumption(Frame frame) {
 
         if (SpecialVariableStorage.hasSpecialVariableAssumption(descriptor)) {
             return SpecialVariableStorage.getAssumption(descriptor);
-        } else if (descriptor.getInfo() instanceof BlockFrameDescriptorInfo blockFrameDescriptorInfo) {
-            return blockFrameDescriptorInfo.getSpecialVariableAssumption();
+        } else if (descriptor.getInfo() instanceof BlockDescriptorInfo blockDescriptorInfo) {
+            return blockDescriptorInfo.getSpecialVariableAssumption();
         } else {
             return Assumption.ALWAYS_VALID;
         }
diff --git a/src/main/java/org/truffleruby/language/locals/ReadDeclarationVariableNode.java b/src/main/java/org/truffleruby/language/locals/ReadDeclarationVariableNode.java
@@ -15,7 +15,7 @@
 
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.frame.VirtualFrame;
-import org.truffleruby.parser.BlockFrameDescriptorInfo;
+import org.truffleruby.parser.BlockDescriptorInfo;
 
 public final class ReadDeclarationVariableNode extends ReadLocalNode {
 
@@ -57,7 +57,7 @@ public WriteLocalNode makeWriteNode(RubyNode rhs) {
 
     @Override
     protected String getVariableName() {
-        var descriptor = BlockFrameDescriptorInfo.getDeclarationFrameDescriptor(
+        var descriptor = BlockDescriptorInfo.getDeclarationFrameDescriptor(
                 getRootNode().getFrameDescriptor(), frameDepth);
         return descriptor.getSlotName(frameSlot).toString();
     }
diff --git a/src/main/java/org/truffleruby/language/locals/WriteDeclarationVariableNode.java b/src/main/java/org/truffleruby/language/locals/WriteDeclarationVariableNode.java
@@ -16,7 +16,7 @@
 
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.frame.VirtualFrame;
-import org.truffleruby.parser.BlockFrameDescriptorInfo;
+import org.truffleruby.parser.BlockDescriptorInfo;
 
 public final class WriteDeclarationVariableNode extends WriteLocalNode {
 
@@ -60,7 +60,7 @@ public AssignableNode cloneUninitializedAssignable() {
 
     @Override
     protected String getVariableName() {
-        var descriptor = BlockFrameDescriptorInfo.getDeclarationFrameDescriptor(
+        var descriptor = BlockDescriptorInfo.getDeclarationFrameDescriptor(
                 getRootNode().getFrameDescriptor(), frameDepth);
         return descriptor.getSlotName(frameSlot).toString();
     }
diff --git a/src/main/java/org/truffleruby/parser/BlockDescriptorInfo.java b/src/main/java/org/truffleruby/parser/BlockDescriptorInfo.java
@@ -17,34 +17,34 @@
 
 /** This is the {@link FrameDescriptor#getInfo() descriptor info} for blocks. The descriptor info for methods is an
  * {@link SpecialVariableStorage#getAssumption(FrameDescriptor) Assumption}. */
-public final class BlockFrameDescriptorInfo {
+public final class BlockDescriptorInfo {
 
     @ExplodeLoop
     public static FrameDescriptor getDeclarationFrameDescriptor(FrameDescriptor topDescriptor, int depth) {
         assert depth > 0;
         FrameDescriptor descriptor = topDescriptor;
         for (int i = 0; i < depth; i++) {
-            descriptor = ((BlockFrameDescriptorInfo) descriptor.getInfo()).getParentDescriptor();
+            descriptor = ((BlockDescriptorInfo) descriptor.getInfo()).getParentDescriptor();
         }
         return descriptor;
     }
 
     @CompilationFinal private FrameDescriptor parentDescriptor;
     private final Assumption specialVariableAssumption;
 
-    public BlockFrameDescriptorInfo(Assumption specialVariableAssumption) {
+    public BlockDescriptorInfo(Assumption specialVariableAssumption) {
         assert SpecialVariableStorage.isSpecialVariableAssumption(specialVariableAssumption);
         this.specialVariableAssumption = specialVariableAssumption;
     }
 
-    public BlockFrameDescriptorInfo(FrameDescriptor parentDescriptor) {
+    public BlockDescriptorInfo(FrameDescriptor parentDescriptor) {
         this.parentDescriptor = parentDescriptor;
         this.specialVariableAssumption = getSpecialVariableAssumptionFromDescriptor(parentDescriptor);
     }
 
     private Assumption getSpecialVariableAssumptionFromDescriptor(FrameDescriptor descriptor) {
-        if (descriptor.getInfo() instanceof BlockFrameDescriptorInfo blockFrameDescriptorInfo) {
-            return blockFrameDescriptorInfo.getSpecialVariableAssumption();
+        if (descriptor.getInfo() instanceof BlockDescriptorInfo blockDescriptorInfo) {
+            return blockDescriptorInfo.getSpecialVariableAssumption();
         } else {
             return SpecialVariableStorage.getAssumption(descriptor);
         }
diff --git a/src/main/java/org/truffleruby/parser/TranslatorEnvironment.java b/src/main/java/org/truffleruby/parser/TranslatorEnvironment.java
@@ -49,7 +49,7 @@ public final class TranslatorEnvironment {
     /** The descriptor info is shared for all blocks at the same level (i.e., for TranslatorEnvironment direct
      * children), in order to save footprint. It is therefore created in the parent TranslatorEnvironment of those
      * blocks using that descriptor info. */
-    private final BlockFrameDescriptorInfo descriptorInfoForChildren;
+    private final BlockDescriptorInfo descriptorInfoForChildren;
 
     private final List<Integer> flipFlopStates = new ArrayList<>();
 
@@ -85,18 +85,18 @@ public TranslatorEnvironment(
 
         if (descriptor == null) {
             if (blockDepth > 0) {
-                BlockFrameDescriptorInfo descriptorInfo = Objects.requireNonNull(parent.descriptorInfoForChildren);
+                BlockDescriptorInfo descriptorInfo = Objects.requireNonNull(parent.descriptorInfoForChildren);
                 this.frameDescriptorBuilder = newFrameDescriptorBuilderForBlock(descriptorInfo);
-                this.descriptorInfoForChildren = new BlockFrameDescriptorInfo(
+                this.descriptorInfoForChildren = new BlockDescriptorInfo(
                         descriptorInfo.getSpecialVariableAssumption());
             } else {
                 var specialVariableAssumption = createSpecialVariableAssumption();
                 this.frameDescriptorBuilder = newFrameDescriptorBuilderForMethod(specialVariableAssumption);
-                this.descriptorInfoForChildren = new BlockFrameDescriptorInfo(specialVariableAssumption);
+                this.descriptorInfoForChildren = new BlockDescriptorInfo(specialVariableAssumption);
             }
         } else {
             this.frameDescriptor = descriptor;
-            this.descriptorInfoForChildren = new BlockFrameDescriptorInfo(descriptor);
+            this.descriptorInfoForChildren = new BlockDescriptorInfo(descriptor);
 
             assert descriptor.getNumberOfAuxiliarySlots() == 0;
             int slots = descriptor.getNumberOfSlots();
@@ -151,7 +151,7 @@ public boolean isTopLevelObjectScope() {
     }
 
     // region frame descriptor
-    public static FrameDescriptor.Builder newFrameDescriptorBuilderForBlock(BlockFrameDescriptorInfo descriptorInfo) {
+    public static FrameDescriptor.Builder newFrameDescriptorBuilderForBlock(BlockDescriptorInfo descriptorInfo) {
         var builder = FrameDescriptor.newBuilder().defaultValue(Nil.INSTANCE);
         builder.info(Objects.requireNonNull(descriptorInfo));
 
