Skip to content

Commit da03fee

Browse files
committed
Cleanups
1 parent 8382c70 commit da03fee

File tree

4 files changed

+3
-28
lines changed

4 files changed

+3
-28
lines changed

src/main/java/org/truffleruby/language/control/ExecuteAndReturnTrueNode.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2013, 2021 Oracle and/or its affiliates. All rights reserved. This
2+
* Copyright (c) 2022, 2023 Oracle and/or its affiliates. All rights reserved. This
33
* code is released under a tri EPL/GPL/LGPL license. You can use it,
44
* redistribute it and/or modify it under the terms of the:
55
*
@@ -15,6 +15,7 @@
1515
import com.oracle.truffle.api.frame.VirtualFrame;
1616

1717
public final class ExecuteAndReturnTrueNode extends RubyContextSourceNode {
18+
1819
@Child RubyNode child;
1920

2021
public ExecuteAndReturnTrueNode(RubyNode child) {
@@ -23,7 +24,7 @@ public ExecuteAndReturnTrueNode(RubyNode child) {
2324

2425
@Override
2526
public Object execute(VirtualFrame frame) {
26-
child.execute(frame);
27+
child.doExecuteVoid(frame);
2728
return true;
2829
}
2930

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

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,6 @@
151151
import org.truffleruby.parser.ast.ArgsPushParseNode;
152152
import org.truffleruby.parser.ast.ArgumentParseNode;
153153
import org.truffleruby.parser.ast.ArrayParseNode;
154-
import org.truffleruby.parser.ast.ArrayPatternParseNode;
155154
import org.truffleruby.parser.ast.AssignableParseNode;
156155
import org.truffleruby.parser.ast.AttrAssignParseNode;
157156
import org.truffleruby.parser.ast.BackRefParseNode;
@@ -218,7 +217,6 @@
218217
import org.truffleruby.parser.ast.NextParseNode;
219218
import org.truffleruby.parser.ast.NilImplicitParseNode;
220219
import org.truffleruby.parser.ast.NilParseNode;
221-
import org.truffleruby.parser.ast.NilRestArgParseNode;
222220
import org.truffleruby.parser.ast.NthRefParseNode;
223221
import org.truffleruby.parser.ast.OpAsgnAndParseNode;
224222
import org.truffleruby.parser.ast.OpAsgnConstDeclParseNode;
@@ -305,7 +303,6 @@ public BodyTranslator(
305303
}
306304

307305
private RubySymbol translateNameNodeToSymbol(ParseNode node) {
308-
309306
if (node instanceof LiteralParseNode) {
310307
return language.getSymbol(((LiteralParseNode) node).getName());
311308
} else if (node instanceof SymbolParseNode) {
@@ -410,11 +407,6 @@ public RubyNode visitArrayNode(ArrayParseNode node) {
410407
return addNewlineIfNeeded(node, ret);
411408
}
412409

413-
@Override
414-
public RubyNode visitArrayPatternNode(ArrayPatternParseNode node) {
415-
throw CompilerDirectives.shouldNotReachHere("TODO"); // TODO
416-
}
417-
418410
@Override
419411
public RubyNode visitAttrAssignNode(AttrAssignParseNode node) {
420412
final CallParseNode callNode = new CallParseNode(
@@ -2210,10 +2202,6 @@ public RubyNode visitNilNode(NilParseNode node) {
22102202
return addNewlineIfNeeded(node, ret);
22112203
}
22122204

2213-
public RubyNode visitNilRestArgNode(NilRestArgParseNode node) {
2214-
throw CompilerDirectives.shouldNotReachHere("TODO"); // TODO
2215-
}
2216-
22172205
@Override
22182206
public RubyNode visitNthRefNode(NthRefParseNode node) {
22192207
final SourceIndexLength sourceSection = node.getPosition();

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import java.util.Deque;
1616
import java.util.List;
1717

18-
import com.oracle.truffle.api.CompilerDirectives;
1918
import org.truffleruby.RubyLanguage;
2019
import org.truffleruby.core.IsNilNode;
2120
import org.truffleruby.core.array.ArrayIndexNodes;
@@ -51,7 +50,6 @@
5150
import org.truffleruby.parser.ast.LocalAsgnParseNode;
5251
import org.truffleruby.parser.ast.MultipleAsgnParseNode;
5352
import org.truffleruby.parser.ast.NilImplicitParseNode;
54-
import org.truffleruby.parser.ast.NilRestArgParseNode;
5553
import org.truffleruby.parser.ast.NoKeywordsArgParseNode;
5654
import org.truffleruby.parser.ast.OptArgParseNode;
5755
import org.truffleruby.parser.ast.ParseNode;
@@ -264,11 +262,6 @@ public RubyNode visitNoKeywordsArgNode(NoKeywordsArgParseNode node) {
264262
return new CheckNoKeywordArgumentsNode();
265263
}
266264

267-
@Override
268-
public RubyNode visitNilRestArgNode(NilRestArgParseNode node) {
269-
throw CompilerDirectives.shouldNotReachHere("TODO"); // TODO
270-
}
271-
272265
@Override
273266
public RubyNode visitKeywordArgNode(KeywordArgParseNode node) {
274267
final SourceIndexLength sourceSection = node.getPosition();

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import java.util.ArrayList;
1313
import java.util.List;
1414

15-
import com.oracle.truffle.api.CompilerDirectives;
1615
import org.truffleruby.parser.ast.ArgsParseNode;
1716
import org.truffleruby.parser.ast.ArgumentParseNode;
1817
import org.truffleruby.parser.ast.ArrayParseNode;
@@ -24,7 +23,6 @@
2423
import org.truffleruby.parser.ast.ListParseNode;
2524
import org.truffleruby.parser.ast.LocalAsgnParseNode;
2625
import org.truffleruby.parser.ast.MultipleAsgnParseNode;
27-
import org.truffleruby.parser.ast.NilRestArgParseNode;
2826
import org.truffleruby.parser.ast.NoKeywordsArgParseNode;
2927
import org.truffleruby.parser.ast.OptArgParseNode;
3028
import org.truffleruby.parser.ast.ParseNode;
@@ -147,9 +145,4 @@ public Object visitNoKeywordsArgNode(NoKeywordsArgParseNode node) {
147145
return null;
148146
}
149147

150-
@Override
151-
public Object visitNilRestArgNode(NilRestArgParseNode node) {
152-
throw CompilerDirectives.shouldNotReachHere("TODO"); // TODO
153-
}
154-
155148
}

0 commit comments

Comments
 (0)