azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

when translator: don't add break after return

Browse Source
This commit is contained in:
develar
2012-06-28 10:29:00 +04:00
parent d6c725bcd9
commit 4ce4cdfbd5
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.translator/src/org/jetbrains/k2js/translate/expression/WhenTranslator.java
+3 -4
View File
@@ -116,12 +116,11 @@ public final class WhenTranslator extends AbstractTranslator {
return statementToExecute; return statementToExecute;
} }
JsExpression condition = translateConditions(entry); JsExpression condition = translateConditions(entry);
return new JsIf(condition, addDummyBreak(statementToExecute), null); return new JsIf(condition, addDummyBreakIfNeed(statementToExecute), null);
} }
@NotNull @NotNull
JsStatement withReturnValueCaptured(@NotNull JsNode node) { JsStatement withReturnValueCaptured(@NotNull JsNode node) {
return convertToStatement(LastExpressionMutator.mutateLastExpression(node, return convertToStatement(LastExpressionMutator.mutateLastExpression(node,
new AssignToExpressionMutator(result.reference()))); new AssignToExpressionMutator(result.reference())));
} }
@@ -172,8 +171,8 @@ public final class WhenTranslator extends AbstractTranslator {
} }
@NotNull @NotNull
private static JsBlock addDummyBreak(@NotNull JsStatement statement) { private static JsStatement addDummyBreakIfNeed(@NotNull JsStatement statement) {
return AstUtil.newBlock(statement, new JsBreak()); return statement instanceof JsReturn ? statement : AstUtil.newBlock(statement, new JsBreak());
} }
@NotNull @NotNull