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

Rename methods

Browse Source
This commit is contained in:
Andrey Breslav
2013-11-29 15:39:24 +04:00
parent 5bedec575d
commit 750390704d
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowBuilder.java
+2 -2
View File
@@ -42,8 +42,8 @@ public interface JetControlFlowBuilder {
Label getExitPoint(@NotNull JetElement labelElement); Label getExitPoint(@NotNull JetElement labelElement);
// Declarations // Declarations
void declare(@NotNull JetParameter parameter); void declareParameter(@NotNull JetParameter parameter);
void declare(@NotNull JetVariableDeclaration property); void declareVariable(@NotNull JetVariableDeclaration property);
void declareFunction(@NotNull JetElement subroutine, @NotNull Pseudocode pseudocode); void declareFunction(@NotNull JetElement subroutine, @NotNull Pseudocode pseudocode);
// Labels // Labels
compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowBuilderAdapter.java
+4 -4
View File
@@ -196,15 +196,15 @@ public class JetControlFlowBuilderAdapter implements JetControlFlowBuilder {
} }
@Override @Override
public void declare(@NotNull JetParameter parameter) { public void declareParameter(@NotNull JetParameter parameter) {
assert builder != null; assert builder != null;
builder.declare(parameter); builder.declareParameter(parameter);
} }
@Override @Override
public void declare(@NotNull JetVariableDeclaration property) { public void declareVariable(@NotNull JetVariableDeclaration property) {
assert builder != null; assert builder != null;
builder.declare(property); builder.declareVariable(property);
} }
@Override @Override
compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java
+4 -4
View File
@@ -438,7 +438,7 @@ public class JetControlFlowProcessor {
} }
JetParameter catchParameter = catchClause.getCatchParameter(); JetParameter catchParameter = catchClause.getCatchParameter();
if (catchParameter != null) { if (catchParameter != null) {
builder.declare(catchParameter); builder.declareParameter(catchParameter);
builder.write(catchParameter, catchParameter); builder.write(catchParameter, catchParameter);
} }
JetExpression catchBody = catchClause.getCatchBody(); JetExpression catchBody = catchClause.getCatchBody();
@@ -629,7 +629,7 @@ public class JetControlFlowProcessor {
@Override @Override
public void visitParameter(@NotNull JetParameter parameter) { public void visitParameter(@NotNull JetParameter parameter) {
builder.declare(parameter); builder.declareParameter(parameter);
JetExpression defaultValue = parameter.getDefaultValue(); JetExpression defaultValue = parameter.getDefaultValue();
if (defaultValue != null) { if (defaultValue != null) {
generateInstructions(defaultValue, inCondition); generateInstructions(defaultValue, inCondition);
@@ -697,7 +697,7 @@ public class JetControlFlowProcessor {
@Override @Override
public void visitProperty(@NotNull JetProperty property) { public void visitProperty(@NotNull JetProperty property) {
builder.declare(property); builder.declareVariable(property);
JetExpression initializer = property.getInitializer(); JetExpression initializer = property.getInitializer();
if (initializer != null) { if (initializer != null) {
generateInstructions(initializer, false); generateInstructions(initializer, false);
@@ -720,7 +720,7 @@ public class JetControlFlowProcessor {
} }
List<JetMultiDeclarationEntry> entries = declaration.getEntries(); List<JetMultiDeclarationEntry> entries = declaration.getEntries();
for (JetMultiDeclarationEntry entry : entries) { for (JetMultiDeclarationEntry entry : entries) {
builder.declare(entry); builder.declareVariable(entry);
builder.write(entry, entry); builder.write(entry, entry);
} }
} }
compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/JetControlFlowInstructionsGenerator.java
+2 -2
View File
@@ -237,12 +237,12 @@ public class JetControlFlowInstructionsGenerator extends JetControlFlowBuilderAd
} }
@Override @Override
public void declare(@NotNull JetParameter parameter) { public void declareParameter(@NotNull JetParameter parameter) {
add(new VariableDeclarationInstruction(parameter)); add(new VariableDeclarationInstruction(parameter));
} }
@Override @Override
public void declare(@NotNull JetVariableDeclaration property) { public void declareVariable(@NotNull JetVariableDeclaration property) {
add(new VariableDeclarationInstruction(property)); add(new VariableDeclarationInstruction(property));
} }