Skip to content

Commit 371a4ee

Browse files
committed
Adop renaming RescueNode#exception to #reference
The field was renamed in YARP itself
1 parent dab44d7 commit 371a4ee

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -298,8 +298,8 @@ public RubyNode visitBeginNode(Nodes.BeginNode node) {
298298
final RubyNode splatTranslated = translateNodeOrNil(splatNode.expression);
299299
RubyNode translatedBody = translateNodeOrNil(rescueClause.statements);
300300

301-
if (rescueClause.exception != null) {
302-
final RubyNode exceptionWriteNode = translateRescueException(rescueClause.exception);
301+
if (rescueClause.reference != null) {
302+
final RubyNode exceptionWriteNode = translateRescueException(rescueClause.reference);
303303
translatedBody = sequence(rescueClause,
304304
Arrays.asList(exceptionWriteNode, translatedBody));
305305
}
@@ -325,8 +325,8 @@ public RubyNode visitBeginNode(Nodes.BeginNode node) {
325325
// exception class isn't specified explicitly so use Ruby StandardError class
326326
RubyNode translatedBody = translateNodeOrNil(rescueClause.statements);
327327

328-
if (rescueClause.exception != null) {
329-
final RubyNode exceptionWriteNode = translateRescueException(rescueClause.exception);
328+
if (rescueClause.reference != null) {
329+
final RubyNode exceptionWriteNode = translateRescueException(rescueClause.reference);
330330
translatedBody = sequence(rescueClause, Arrays.asList(exceptionWriteNode, translatedBody));
331331
}
332332

@@ -351,7 +351,7 @@ public RubyNode visitBeginNode(Nodes.BeginNode node) {
351351

352352
// TODO: this flag should be per RescueNode, not per TryNode
353353
boolean canOmitBacktrace = language.options.BACKTRACES_OMIT_UNUSED &&
354-
rescueClause.exception == null &&
354+
rescueClause.reference == null &&
355355
rescueClause.consequent == null &&
356356
(rescueClause.statements == null || rescueClause.statements.body.length == 1 &&
357357
isSideEffectFreeRescueExpression(rescueClause.statements.body[0]));
@@ -384,9 +384,9 @@ private RescueNode translateExceptionNodes(ArrayList<Nodes.Node> exceptionNodes,
384384
handlingClasses[i] = exceptionNodesArray[i].accept(this);
385385
}
386386

387-
if (rescueClause.exception != null) {
387+
if (rescueClause.reference != null) {
388388
final RubyNode exceptionWriteNode = translateRescueException(
389-
rescueClause.exception);
389+
rescueClause.reference);
390390
translatedBody = sequence(rescueClause,
391391
Arrays.asList(exceptionWriteNode, translatedBody));
392392
}

0 commit comments

Comments
 (0)