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

Refactor translation of if expression in ExpressionVisitor.

Browse Source 
Adapted from https://github.com/develar/kotlin/commit/a9e0a42fb1347fa8e21c86b5a073ef8a7c873da0.
This commit is contained in:
Pavel V. Talanov
2012-08-13 15:12:57 +04:00
parent cb60e938d3
commit 124ba541ac
1 changed files with 22 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.translator/src/org/jetbrains/k2js/translate/expression/ExpressionVisitor.java
+22 -30
View File
@@ -147,17 +147,29 @@ public final class ExpressionVisitor extends TranslatorVisitor<JsNode> {
@Override
@NotNull
public JsNode visitIfExpression(@NotNull JetIfExpression expression, @NotNull TranslationContext context) {
JsIf ifStatement = translateAsIfStatement(expression, context);
if (BindingUtils.isStatement(context.bindingContext(), expression)) {
return ifStatement;
JsExpression testExpression = translateConditionExpression(expression.getCondition(), context);
JetExpression thenExpression = expression.getThen();
JetExpression elseExpression = expression.getElse();
assert thenExpression != null;
JsNode thenNode = thenExpression.accept(this, context);
JsNode elseNode = elseExpression == null ? null : elseExpression.accept(this, context);
boolean isKotlinStatement = BindingUtils.isStatement(context.bindingContext(), expression);
boolean canBeJsExpression = thenNode instanceof JsExpression && elseNode instanceof JsExpression;
if (!isKotlinStatement && canBeJsExpression) {
return new JsConditional(testExpression, convertToExpression(thenNode), convertToExpression(elseNode));
}
else {
JsIf ifStatement = new JsIf(testExpression, convertToStatement(thenNode), elseNode == null ? null : convertToStatement(elseNode));
if (isKotlinStatement) {
return ifStatement;
}
TemporaryVariable result = context.declareTemporary(null);
AssignToExpressionMutator saveResultToTemporaryMutator = new AssignToExpressionMutator(result.reference());
context.addStatementToCurrentBlock(mutateLastExpression(ifStatement, saveResultToTemporaryMutator));
return result.reference();
}
TemporaryVariable result = context.declareTemporary(JsLiteral.NULL);
AssignToExpressionMutator saveResultToTemporaryMutator =
new AssignToExpressionMutator(result.reference());
JsNode mutatedIfStatement = mutateLastExpression(ifStatement, saveResultToTemporaryMutator);
JsStatement resultingStatement = convertToStatement(mutatedIfStatement);
context.addStatementToCurrentBlock(resultingStatement);
return result.reference();
}
@Override
@@ -168,26 +180,6 @@ public final class ExpressionVisitor extends TranslatorVisitor<JsNode> {
}
@NotNull
private JsIf translateAsIfStatement(@NotNull JetIfExpression expression,
@NotNull TranslationContext context) {
JsIf result = new JsIf();
result.setIfExpression(translateConditionExpression(expression.getCondition(), context));
result.setThenStatement(translateNullableExpressionAsNotNullStatement(expression.getThen(), context));
result.setElseStatement(translateElseAsStatement(expression, context));
return result;
}
@Nullable
private JsStatement translateElseAsStatement(@NotNull JetIfExpression expression,
@NotNull TranslationContext context) {
JetExpression jetElse = expression.getElse();
if (jetElse == null) {
return null;
}
return convertToStatement(jetElse.accept(this, context));
}
@NotNull
private JsStatement translateNullableExpressionAsNotNullStatement(@Nullable JetExpression nullableExpression,
@NotNull TranslationContext context) {