Make the naming of block arguments consistent.

Author: aardvark179

src/main/java/org/truffleruby/core/inlined/InlinedBlockGivenNode.java

@@ -26,7 +26,7 @@ public abstract class InlinedBlockGivenNode extends UnaryInlinedOperationNode {
 
     public InlinedBlockGivenNode(RubyCallNodeParameters callNodeParameters,  TranslatorEnvironment environment) {
         super(callNodeParameters);
-        this.readNode = environment.findLocalVarOrNilNode(TranslatorEnvironment.IMPLICIT_BLOCK_NAME, null);
+        this.readNode = environment.findLocalVarOrNilNode(TranslatorEnvironment.METHOD_BLOCK_NAME, null);
     }
 
     @Specialization(guards = {

src/main/java/org/truffleruby/core/kernel/KernelNodes.java

@@ -294,7 +294,7 @@ public boolean blockGiven(VirtualFrame frame,
                 @Cached("create(nil())") FindAndReadDeclarationVariableNode readNode,
                 @Cached("createBinaryProfile()") ConditionProfile blockProfile) {
             MaterializedFrame callerFrame = callerFrameNode.execute(frame).materialize();
-            return blockProfile.profile(readNode.execute(callerFrame, TranslatorEnvironment.IMPLICIT_BLOCK_NAME) != nil());
+            return blockProfile.profile(readNode.execute(callerFrame, TranslatorEnvironment.METHOD_BLOCK_NAME) != nil());
         }
     }
 

src/main/java/org/truffleruby/core/proc/ProcNodes.java

@@ -77,7 +77,7 @@ public DynamicObject proc(VirtualFrame frame, DynamicObject procClass, Object[]
             final MaterializedFrame parentFrame = getContext().getCallStack().getCallerFrameIgnoringSend()
                     .getFrame(FrameAccess.MATERIALIZE).materialize();
 
-            DynamicObject parentBlock = (DynamicObject) readNode.execute(parentFrame, TranslatorEnvironment.IMPLICIT_BLOCK_NAME);
+            DynamicObject parentBlock = (DynamicObject) readNode.execute(parentFrame, TranslatorEnvironment.METHOD_BLOCK_NAME);
 
             if (parentBlock == nil()) {
                 parentBlock = tryParentBlockForCExts();

src/main/java/org/truffleruby/parser/BodyTranslator.java

@@ -3056,7 +3056,7 @@ public RubyNode visitYieldNode(YieldParseNode node) {
             argumentsTranslated[i] = arguments[i].accept(this);
         }
 
-        RubyNode readBlock = environment.findLocalVarOrNilNode(TranslatorEnvironment.IMPLICIT_BLOCK_NAME, node.getPosition());
+        RubyNode readBlock = environment.findLocalVarOrNilNode(TranslatorEnvironment.METHOD_BLOCK_NAME, node.getPosition());
         final RubyNode ret = new YieldExpressionNode(unsplat, argumentsTranslated, readBlock);
         ret.unsafeSetSourceSection(node.getPosition());
         return addNewlineIfNeeded(node, ret);

src/main/java/org/truffleruby/parser/LoadArgumentsTranslator.java

@@ -86,7 +86,7 @@ public int getPreviousIndex() {
     }
 
     private final boolean isProc;
-    private final boolean hasImplicitBlock;
+    private final boolean hasMethodBlock;
     private final BodyTranslator methodBodyTranslator;
     private final Deque<ArraySlot> arraySlotStack = new ArrayDeque<>();
 
@@ -105,10 +105,10 @@ private enum State {
     private State state;
     private boolean firstOpt = false;
 
-    public LoadArgumentsTranslator(Node currentNode, ArgsParseNode argsNode, RubyContext context, Source source, ParserContext parserContext, boolean isProc, boolean hasImplicitBlock, BodyTranslator methodBodyTranslator) {
+    public LoadArgumentsTranslator(Node currentNode, ArgsParseNode argsNode, RubyContext context, Source source, ParserContext parserContext, boolean isProc, boolean hasMethodBlock, BodyTranslator methodBodyTranslator) {
         super(currentNode, context, source, parserContext);
         this.isProc = isProc;
-        this.hasImplicitBlock = hasImplicitBlock;
+        this.hasMethodBlock = hasMethodBlock;
         this.methodBodyTranslator = methodBodyTranslator;
         this.argsNode = argsNode;
         this.required = argsNode.getRequiredCount();
@@ -159,8 +159,8 @@ public RubyNode translate() {
 
         // Do this before handling optional arguments as one might get
         // its default value via a `yield`.
-        if (hasImplicitBlock) {
-            sequence.add(visitUnnamedBlockArg());
+        if (hasMethodBlock) {
+            sequence.add(visitMethodBlockArg());
         }
 
         final int optArgCount = argsNode.getOptionalArgsCount();
@@ -342,9 +342,9 @@ public RubyNode visitRestArgNode(RestArgParseNode node) {
         return new WriteLocalVariableNode(slot, readNode);
     }
 
-    public RubyNode visitUnnamedBlockArg() {
+    public RubyNode visitMethodBlockArg() {
         final RubyNode readNode = new ReadBlockNode(context.getCoreLibrary().getNil());
-        final FrameSlot slot = methodBodyTranslator.getEnvironment().getFrameDescriptor().findOrAddFrameSlot(TranslatorEnvironment.IMPLICIT_BLOCK_NAME);
+        final FrameSlot slot = methodBodyTranslator.getEnvironment().getFrameDescriptor().findOrAddFrameSlot(TranslatorEnvironment.METHOD_BLOCK_NAME);
         return new WriteLocalVariableNode(slot, readNode);
     }
 

src/main/java/org/truffleruby/parser/TranslatorEnvironment.java

@@ -30,7 +30,7 @@
 public class TranslatorEnvironment {
 
     public static final char TEMP_PREFIX = '%';
-    public static final String IMPLICIT_BLOCK_NAME = TEMP_PREFIX + "__unnamed_block_arg__";
+    public static final String METHOD_BLOCK_NAME = TEMP_PREFIX + "__method_block_arg__";
 
     private final ParseEnvironment parseEnvironment;