Skip to content

Commit d6738b9

Browse files
committed
Rename org.truffleruby.language.arguments.ReadBlockNode for clarity.
1 parent 1fb8f10 commit d6738b9

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

src/main/java/org/truffleruby/builtins/CoreMethodNodeManager.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
import org.truffleruby.language.arguments.MissingArgumentBehavior;
3535
import org.truffleruby.language.arguments.NotProvidedNode;
3636
import org.truffleruby.language.arguments.ProfileArgumentNodeGen;
37-
import org.truffleruby.language.arguments.ReadBlockNode;
37+
import org.truffleruby.language.arguments.ReadBlockFromCurrentFrameArgumentsNode;
3838
import org.truffleruby.language.arguments.ReadKeywordArgumentNode;
3939
import org.truffleruby.language.arguments.ReadPreArgumentNode;
4040
import org.truffleruby.language.arguments.ReadRemainingArgumentsNode;
@@ -254,7 +254,7 @@ public static RubyNode createCoreMethodNode(NodeFactory<? extends RubyNode> node
254254
}
255255

256256
if (method.needsBlock()) {
257-
argumentsNodes[i++] = new ReadBlockNode(NotProvided.INSTANCE);
257+
argumentsNodes[i++] = new ReadBlockFromCurrentFrameArgumentsNode(NotProvided.INSTANCE);
258258
}
259259

260260
if (!method.keywordAsOptional().isEmpty()) {

src/main/java/org/truffleruby/language/arguments/ReadBlockNode.java renamed to src/main/java/org/truffleruby/language/arguments/ReadBlockFromCurrentFrameArgumentsNode.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616
import org.truffleruby.Layouts;
1717
import org.truffleruby.language.RubyNode;
1818

19-
public class ReadBlockNode extends RubyNode {
19+
public class ReadBlockFromCurrentFrameArgumentsNode extends RubyNode {
2020

2121
private final Object valueIfAbsent;
2222

2323
private final ConditionProfile nullProfile = ConditionProfile.createBinaryProfile();
2424

25-
public ReadBlockNode(Object valueIfAbsent) {
25+
public ReadBlockFromCurrentFrameArgumentsNode(Object valueIfAbsent) {
2626
this.valueIfAbsent = valueIfAbsent;
2727
}
2828

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import org.truffleruby.language.arguments.MissingArgumentBehavior;
2626
import org.truffleruby.language.arguments.MissingKeywordArgumentNode;
2727
import org.truffleruby.language.arguments.ProfileArgumentNodeGen;
28-
import org.truffleruby.language.arguments.ReadBlockNode;
28+
import org.truffleruby.language.arguments.ReadBlockFromCurrentFrameArgumentsNode;
2929
import org.truffleruby.language.arguments.ReadKeywordArgumentNode;
3030
import org.truffleruby.language.arguments.ReadKeywordRestArgumentNode;
3131
import org.truffleruby.language.arguments.ReadOptionalArgumentNode;
@@ -343,14 +343,14 @@ public RubyNode visitRestArgNode(RestArgParseNode node) {
343343
}
344344

345345
public RubyNode saveMethodBlockArg() {
346-
final RubyNode readNode = new ReadBlockNode(context.getCoreLibrary().getNil());
346+
final RubyNode readNode = new ReadBlockFromCurrentFrameArgumentsNode(context.getCoreLibrary().getNil());
347347
final FrameSlot slot = methodBodyTranslator.getEnvironment().getFrameDescriptor().findOrAddFrameSlot(TranslatorEnvironment.METHOD_BLOCK_NAME);
348348
return new WriteLocalVariableNode(slot, readNode);
349349
}
350350

351351
@Override
352352
public RubyNode visitBlockArgNode(BlockArgParseNode node) {
353-
final RubyNode readNode = new ReadBlockNode(context.getCoreLibrary().getNil());
353+
final RubyNode readNode = new ReadBlockFromCurrentFrameArgumentsNode(context.getCoreLibrary().getNil());
354354
final FrameSlot slot = methodBodyTranslator.getEnvironment().getFrameDescriptor().findFrameSlot(node.getName());
355355
return new WriteLocalVariableNode(slot, readNode);
356356
}

0 commit comments

Comments
 (0)