Skip to content

Commit 16a58c1

Browse files
committed
Cleanups
1 parent fcbbe3e commit 16a58c1

File tree

4 files changed

+4
-20
lines changed

4 files changed

+4
-20
lines changed

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

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -188,15 +188,13 @@
188188
import org.truffleruby.parser.ast.EvStrParseNode;
189189
import org.truffleruby.parser.ast.FCallParseNode;
190190
import org.truffleruby.parser.ast.FalseParseNode;
191-
import org.truffleruby.parser.ast.FindPatternParseNode;
192191
import org.truffleruby.parser.ast.FixnumParseNode;
193192
import org.truffleruby.parser.ast.FlipParseNode;
194193
import org.truffleruby.parser.ast.FloatParseNode;
195194
import org.truffleruby.parser.ast.ForParseNode;
196195
import org.truffleruby.parser.ast.GlobalAsgnParseNode;
197196
import org.truffleruby.parser.ast.GlobalVarParseNode;
198197
import org.truffleruby.parser.ast.HashParseNode;
199-
import org.truffleruby.parser.ast.HashPatternParseNode;
200198
import org.truffleruby.parser.ast.IArgumentNode;
201199
import org.truffleruby.parser.ast.IfParseNode;
202200
import org.truffleruby.parser.ast.InParseNode;
@@ -843,11 +841,9 @@ public RubyNode visitCaseInNode(CaseInParseNode node) {
843841
currentNode, node.getCases(), environment, this);
844842

845843
// Evaluate the case expression and store it in a local
846-
847-
final RubyNode caseExprValue = node.getCaseNode().accept(this);
848844
final int tempSlot = environment.declareLocalTemp("case in value");
849845
final ReadLocalNode readTemp = environment.readNode(tempSlot, sourceSection);
850-
final RubyNode assignTemp = readTemp.makeWriteNode(caseExprValue);
846+
final RubyNode assignTemp = readTemp.makeWriteNode(node.getCaseNode().accept(this));
851847

852848
/* Build an if expression from the ins and else. Work backwards because the first if contains all the others in
853849
* its else clause. */
@@ -856,7 +852,7 @@ public RubyNode visitCaseInNode(CaseInParseNode node) {
856852
if (node.getElseNode() == null) {
857853
elseNode = NoMatchingPatternNodeGen.create(readTemp);
858854
} else {
859-
elseNode = translateNodeOrNil(sourceSection, node.getElseNode());
855+
elseNode = node.getElseNode().accept(this);
860856
}
861857

862858
for (int n = node.getCases().size() - 1; n >= 0; n--) {
@@ -1492,11 +1488,6 @@ public RubyNode visitFalseNode(FalseParseNode node) {
14921488
return addNewlineIfNeeded(node, ret);
14931489
}
14941490

1495-
@Override
1496-
public RubyNode visitFindPatternNode(FindPatternParseNode node) {
1497-
throw CompilerDirectives.shouldNotReachHere("TODO");
1498-
}
1499-
15001491
@Override
15011492
public RubyNode visitFixnumNode(FixnumParseNode node) {
15021493
final SourceIndexLength sourceSection = node.getPosition();
@@ -1812,11 +1803,6 @@ public RubyNode visitHashNode(HashParseNode node) {
18121803
return addNewlineIfNeeded(node, ret);
18131804
}
18141805

1815-
@Override
1816-
public RubyNode visitHashPatternNode(HashPatternParseNode node) {
1817-
throw CompilerDirectives.shouldNotReachHere("TODO");
1818-
}
1819-
18201806
@Override
18211807
public RubyNode visitIfNode(IfParseNode node) {
18221808
final SourceIndexLength sourceSection = node.getPosition();

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -608,5 +608,4 @@ protected RubyNode loadArray(SourceIndexLength sourceSection) {
608608
return node;
609609
}
610610

611-
612611
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,5 +144,4 @@ public Object visitKeywordRestArgNode(KeywordRestArgParseNode node) {
144144
public Object visitNoKeywordsArgNode(NoKeywordsArgParseNode node) {
145145
return null;
146146
}
147-
148147
}

src/main/java/org/truffleruby/parser/ast/ArrayPatternParseNode.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public ArrayPatternParseNode(
5757

5858
@Override
5959
public <T> T accept(NodeVisitor<T> visitor) {
60-
return visitor.visitArrayPatternNode(this); // add this
60+
return visitor.visitArrayPatternNode(this);
6161
}
6262

6363
@Override
@@ -67,7 +67,7 @@ public List<ParseNode> childNodes() {
6767

6868
@Override
6969
public NodeType getNodeType() {
70-
return NodeType.ARRAYPATTERNNODE; // add this
70+
return NodeType.ARRAYPATTERNNODE;
7171
}
7272

7373
public void setConstant(ParseNode constant) {

0 commit comments

Comments
 (0)