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

parameter removed from 'jumpToError' method

Browse Source
This commit is contained in:
Svetlana Isakova
2012-12-05 12:55:33 +04:00
parent fcc3a4d0ab
commit b01dc094db
4 changed files with 8 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowBuilder.java
+1 -2
View File
@@ -44,8 +44,7 @@ public interface JetControlFlowBuilder {
void jumpOnTrue(@NotNull Label label); void jumpOnTrue(@NotNull Label label);
void nondeterministicJump(Label label); // Maybe, jump to label void nondeterministicJump(Label label); // Maybe, jump to label
void nondeterministicJump(List<Label> label); void nondeterministicJump(List<Label> label);
void jumpToError(JetThrowExpression expression); void jumpToError();
void jumpToError(JetExpression nothingExpression);
// Entry/exit points // Entry/exit points
Label getEntryPoint(@NotNull JetElement labelElement); Label getEntryPoint(@NotNull JetElement labelElement);
compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowBuilderAdapter.java
+2 -8
View File
@@ -97,15 +97,9 @@ public class JetControlFlowBuilderAdapter implements JetControlFlowBuilder {
} }
@Override @Override
public void jumpToError(JetThrowExpression expression) { public void jumpToError() {
assert builder != null; assert builder != null;
builder.jumpToError(expression); builder.jumpToError();
}
@Override
public void jumpToError(JetExpression nothingExpression) {
assert builder != null;
builder.jumpToError(nothingExpression);
} }
@Override @Override
compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java
+4 -4
View File
@@ -170,7 +170,7 @@ public class JetControlFlowProcessor {
if (trace.get(BindingContext.PROCESSED, expression)) { if (trace.get(BindingContext.PROCESSED, expression)) {
JetType type = trace.getBindingContext().get(BindingContext.EXPRESSION_TYPE, expression); JetType type = trace.getBindingContext().get(BindingContext.EXPRESSION_TYPE, expression);
if (type != null && KotlinBuiltIns.getInstance().isNothing(type)) { if (type != null && KotlinBuiltIns.getInstance().isNothing(type)) {
builder.jumpToError(expression); builder.jumpToError();
} }
} }
} }
@@ -627,7 +627,7 @@ public class JetControlFlowProcessor {
if (trace.get(BindingContext.PROCESSED, expression)) { if (trace.get(BindingContext.PROCESSED, expression)) {
JetType type = trace.getBindingContext().get(BindingContext.EXPRESSION_TYPE, expression); JetType type = trace.getBindingContext().get(BindingContext.EXPRESSION_TYPE, expression);
if (type != null && KotlinBuiltIns.getInstance().isNothing(type)) { if (type != null && KotlinBuiltIns.getInstance().isNothing(type)) {
builder.jumpToError(expression); builder.jumpToError();
} }
} }
} }
@@ -669,7 +669,7 @@ public class JetControlFlowProcessor {
if (trace.get(BindingContext.PROCESSED, expression)) { if (trace.get(BindingContext.PROCESSED, expression)) {
JetType type = trace.getBindingContext().get(BindingContext.EXPRESSION_TYPE, expression); JetType type = trace.getBindingContext().get(BindingContext.EXPRESSION_TYPE, expression);
if (type != null && KotlinBuiltIns.getInstance().isNothing(type)) { if (type != null && KotlinBuiltIns.getInstance().isNothing(type)) {
builder.jumpToError(expression); builder.jumpToError();
} }
} }
} }
@@ -739,7 +739,7 @@ public class JetControlFlowProcessor {
if (thrownExpression != null) { if (thrownExpression != null) {
value(thrownExpression, false); value(thrownExpression, false);
} }
builder.jumpToError(expression); builder.jumpToError();
} }
@Override @Override
compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/JetControlFlowInstructionsGenerator.java
+1 -6
View File
@@ -294,12 +294,7 @@ public class JetControlFlowInstructionsGenerator extends JetControlFlowBuilderAd
} }
@Override @Override
public void jumpToError(JetThrowExpression expression) { public void jumpToError() {
add(new UnconditionalJumpInstruction(error));
}
@Override
public void jumpToError(JetExpression nothingExpression) {
add(new UnconditionalJumpInstruction(error)); add(new UnconditionalJumpInstruction(error));
} }