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

Generate blocks-statements through CodegenStatementVisitor

Browse Source
This commit is contained in:
Denis Zharkov
2014-09-22 20:19:14 +04:00
committed by Alexander Udalov
parent 4ed744428b
commit 78cde5c740
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/CodegenStatementVisitor.java
+5
View File
@@ -45,4 +45,9 @@ public class CodegenStatementVisitor extends JetVisitor<StackValue, StackValue>
public StackValue visitWhenExpression(@NotNull JetWhenExpression expression, StackValue data) { public StackValue visitWhenExpression(@NotNull JetWhenExpression expression, StackValue data) {
return codegen.generateWhenExpression(expression, true); return codegen.generateWhenExpression(expression, true);
} }
@Override
public StackValue visitBlockExpression(@NotNull JetBlockExpression expression, StackValue data) {
return codegen.generateBlock(expression, true);
}
} }
compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
+6 -9
View File
@@ -443,7 +443,7 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
statements.addAll(doWhileStatements); statements.addAll(doWhileStatements);
statements.add(condition); statements.add(condition);
conditionValue = generateBlock(statements, true, continueLabel); conditionValue = generateBlock(statements, false, continueLabel);
} }
else { else {
if (body != null) { if (body != null) {
@@ -1277,10 +1277,7 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
@Override @Override
public StackValue visitBlockExpression(@NotNull JetBlockExpression expression, StackValue receiver) { public StackValue visitBlockExpression(@NotNull JetBlockExpression expression, StackValue receiver) {
List<JetElement> statements = expression.getStatements(); return generateBlock(expression, false);
JetType unitType = KotlinBuiltIns.getInstance().getUnitType();
boolean lastStatementIsExpression = !unitType.equals(bindingContext.get(EXPRESSION_TYPE, expression));
return generateBlock(statements, lastStatementIsExpression);
} }
@Override @Override
@@ -1413,11 +1410,11 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
} }
} }
private StackValue generateBlock(List<JetElement> statements, boolean lastStatementIsExpression) { /* package */ StackValue generateBlock(@NotNull JetBlockExpression expression, boolean isStatement) {
return generateBlock(statements, lastStatementIsExpression, null); return generateBlock(expression.getStatements(), isStatement, null);
} }
private StackValue generateBlock(List<JetElement> statements, boolean lastStatementIsExpression, Label labelBeforeLastExpression) { private StackValue generateBlock(List<JetElement> statements, boolean isStatement, Label labelBeforeLastExpression) {
Label blockEnd = new Label(); Label blockEnd = new Label();
List<Function<StackValue, Void>> leaveTasks = Lists.newArrayList(); List<Function<StackValue, Void>> leaveTasks = Lists.newArrayList();
@@ -1449,7 +1446,7 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
generateLocalFunctionDeclaration((JetNamedFunction) statement, leaveTasks); generateLocalFunctionDeclaration((JetNamedFunction) statement, leaveTasks);
} }
boolean isExpression = !iterator.hasNext() && lastStatementIsExpression; boolean isExpression = !iterator.hasNext() && !isStatement;
if (isExpression && labelBeforeLastExpression != null) { if (isExpression && labelBeforeLastExpression != null) {
v.mark(labelBeforeLastExpression); v.mark(labelBeforeLastExpression);
} }