Rename methods
This commit is contained in:
@@ -42,8 +42,8 @@ public interface JetControlFlowBuilder {
|
||||
Label getExitPoint(@NotNull JetElement labelElement);
|
||||
|
||||
// Declarations
|
||||
void declare(@NotNull JetParameter parameter);
|
||||
void declare(@NotNull JetVariableDeclaration property);
|
||||
void declareParameter(@NotNull JetParameter parameter);
|
||||
void declareVariable(@NotNull JetVariableDeclaration property);
|
||||
void declareFunction(@NotNull JetElement subroutine, @NotNull Pseudocode pseudocode);
|
||||
|
||||
// Labels
|
||||
|
||||
@@ -196,15 +196,15 @@ public class JetControlFlowBuilderAdapter implements JetControlFlowBuilder {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void declare(@NotNull JetParameter parameter) {
|
||||
public void declareParameter(@NotNull JetParameter parameter) {
|
||||
assert builder != null;
|
||||
builder.declare(parameter);
|
||||
builder.declareParameter(parameter);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void declare(@NotNull JetVariableDeclaration property) {
|
||||
public void declareVariable(@NotNull JetVariableDeclaration property) {
|
||||
assert builder != null;
|
||||
builder.declare(property);
|
||||
builder.declareVariable(property);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -438,7 +438,7 @@ public class JetControlFlowProcessor {
|
||||
}
|
||||
JetParameter catchParameter = catchClause.getCatchParameter();
|
||||
if (catchParameter != null) {
|
||||
builder.declare(catchParameter);
|
||||
builder.declareParameter(catchParameter);
|
||||
builder.write(catchParameter, catchParameter);
|
||||
}
|
||||
JetExpression catchBody = catchClause.getCatchBody();
|
||||
@@ -629,7 +629,7 @@ public class JetControlFlowProcessor {
|
||||
|
||||
@Override
|
||||
public void visitParameter(@NotNull JetParameter parameter) {
|
||||
builder.declare(parameter);
|
||||
builder.declareParameter(parameter);
|
||||
JetExpression defaultValue = parameter.getDefaultValue();
|
||||
if (defaultValue != null) {
|
||||
generateInstructions(defaultValue, inCondition);
|
||||
@@ -697,7 +697,7 @@ public class JetControlFlowProcessor {
|
||||
|
||||
@Override
|
||||
public void visitProperty(@NotNull JetProperty property) {
|
||||
builder.declare(property);
|
||||
builder.declareVariable(property);
|
||||
JetExpression initializer = property.getInitializer();
|
||||
if (initializer != null) {
|
||||
generateInstructions(initializer, false);
|
||||
@@ -720,7 +720,7 @@ public class JetControlFlowProcessor {
|
||||
}
|
||||
List<JetMultiDeclarationEntry> entries = declaration.getEntries();
|
||||
for (JetMultiDeclarationEntry entry : entries) {
|
||||
builder.declare(entry);
|
||||
builder.declareVariable(entry);
|
||||
builder.write(entry, entry);
|
||||
}
|
||||
}
|
||||
|
||||
+2
-2
@@ -237,12 +237,12 @@ public class JetControlFlowInstructionsGenerator extends JetControlFlowBuilderAd
|
||||
}
|
||||
|
||||
@Override
|
||||
public void declare(@NotNull JetParameter parameter) {
|
||||
public void declareParameter(@NotNull JetParameter parameter) {
|
||||
add(new VariableDeclarationInstruction(parameter));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void declare(@NotNull JetVariableDeclaration property) {
|
||||
public void declareVariable(@NotNull JetVariableDeclaration property) {
|
||||
add(new VariableDeclarationInstruction(property));
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user