From 0a3557d331cf09ca377a18e425fc6a293bf2fb62 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Fri, 29 Nov 2013 15:22:07 +0400 Subject: [PATCH] Rename class --- .../jet/lang/cfg/JetControlFlowProcessor.java | 6 +++--- .../jet/lang/cfg/JetFlowInformationProvider.java | 2 +- .../jet/lang/cfg/PseudocodeTraverser.java | 14 +++++++------- .../jet/lang/cfg/PseudocodeVariablesData.java | 8 ++++---- .../lang/cfg/pseudocode/InstructionVisitor.java | 2 +- .../JetControlFlowInstructionsGenerator.java | 2 +- ... => LocalFunctionDeclarationInstruction.java} | 9 ++++----- .../jet/lang/cfg/pseudocode/Pseudocode.java | 2 +- .../jet/lang/cfg/pseudocode/PseudocodeImpl.java | 16 ++++++++-------- .../jet/cfg/AbstractControlFlowTest.java | 12 ++++++------ 10 files changed, 36 insertions(+), 37 deletions(-) rename compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/{LocalDeclarationInstruction.java => LocalFunctionDeclarationInstruction.java} (83%) diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java index 9ca5999322f..fb6536513af 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java @@ -23,7 +23,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.JetNodeTypes; import org.jetbrains.jet.lang.cfg.pseudocode.JetControlFlowInstructionsGenerator; -import org.jetbrains.jet.lang.cfg.pseudocode.LocalDeclarationInstruction; +import org.jetbrains.jet.lang.cfg.pseudocode.LocalFunctionDeclarationInstruction; import org.jetbrains.jet.lang.cfg.pseudocode.Pseudocode; import org.jetbrains.jet.lang.cfg.pseudocode.PseudocodeImpl; import org.jetbrains.jet.lang.psi.*; @@ -56,8 +56,8 @@ public class JetControlFlowProcessor { public Pseudocode generatePseudocode(@NotNull JetElement subroutine) { Pseudocode pseudocode = generate(subroutine); ((PseudocodeImpl) pseudocode).postProcess(); - for (LocalDeclarationInstruction localDeclarationInstruction : pseudocode.getLocalDeclarations()) { - ((PseudocodeImpl)localDeclarationInstruction.getBody()).postProcess(); + for (LocalFunctionDeclarationInstruction localFunctionDeclarationInstruction : pseudocode.getLocalDeclarations()) { + ((PseudocodeImpl) localFunctionDeclarationInstruction.getBody()).postProcess(); } return pseudocode; } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetFlowInformationProvider.java b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetFlowInformationProvider.java index 4ae33ffda35..8520ee972b2 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetFlowInformationProvider.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetFlowInformationProvider.java @@ -225,7 +225,7 @@ public class JetFlowInformationProvider { Pseudocode pseudocode = pseudocodeVariablesData.getPseudocode(); Map>> initializers = pseudocodeVariablesData.getVariableInitializers(); recordInitializedVariables(pseudocode, initializers); - for (LocalDeclarationInstruction instruction : pseudocode.getLocalDeclarations()) { + for (LocalFunctionDeclarationInstruction instruction : pseudocode.getLocalDeclarations()) { recordInitializedVariables(instruction.getBody(), initializers); } } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/PseudocodeTraverser.java b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/PseudocodeTraverser.java index c3b0549f19e..83a87050e56 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/PseudocodeTraverser.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/PseudocodeTraverser.java @@ -68,7 +68,7 @@ public class PseudocodeTraverser { } private static boolean shouldLookInside(Instruction instruction, LookInsideStrategy lookInside) { - return lookInside == LookInsideStrategy.ANALYSE_LOCAL_DECLARATIONS && instruction instanceof LocalDeclarationInstruction; + return lookInside == LookInsideStrategy.ANALYSE_LOCAL_DECLARATIONS && instruction instanceof LocalFunctionDeclarationInstruction; } public static Map> collectData( @@ -99,7 +99,7 @@ public class PseudocodeTraverser { for (Instruction instruction : instructions) { edgesMap.put(instruction, initialEdge); if (shouldLookInside(instruction, lookInside)) { - initializeEdgesMap(((LocalDeclarationInstruction) instruction).getBody(), lookInside, edgesMap, initialDataValue); + initializeEdgesMap(((LocalFunctionDeclarationInstruction) instruction).getBody(), lookInside, edgesMap, initialDataValue); } } } @@ -131,7 +131,7 @@ public class PseudocodeTraverser { } if (shouldLookInside(instruction, lookInside)) { - Pseudocode subroutinePseudocode = ((LocalDeclarationInstruction) instruction).getBody(); + Pseudocode subroutinePseudocode = ((LocalFunctionDeclarationInstruction) instruction).getBody(); collectDataFromSubgraph(subroutinePseudocode, traversalOrder, lookInside, edgesMap, instructionDataMergeStrategy, previousInstructions, changed, true); @@ -168,8 +168,8 @@ public class PseudocodeTraverser { List instructions = getInstructions(pseudocode, traversalOrder); for (Instruction instruction : instructions) { - if (instruction instanceof LocalDeclarationInstruction) { - traverse(((LocalDeclarationInstruction) instruction).getBody(), traversalOrder, instructionAnalyzeStrategy); + if (instruction instanceof LocalFunctionDeclarationInstruction) { + traverse(((LocalFunctionDeclarationInstruction) instruction).getBody(), traversalOrder, instructionAnalyzeStrategy); } instructionAnalyzeStrategy.execute(instruction); } @@ -182,8 +182,8 @@ public class PseudocodeTraverser { List instructions = getInstructions(pseudocode, traversalOrder); for (Instruction instruction : instructions) { - if (instruction instanceof LocalDeclarationInstruction) { - traverse(((LocalDeclarationInstruction) instruction).getBody(), traversalOrder, edgesMap, + if (instruction instanceof LocalFunctionDeclarationInstruction) { + traverse(((LocalFunctionDeclarationInstruction) instruction).getBody(), traversalOrder, edgesMap, instructionDataAnalyzeStrategy); } Edges edges = edgesMap.get(instruction); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/PseudocodeVariablesData.java b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/PseudocodeVariablesData.java index 1896f51b129..3cc2ff38068 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/PseudocodeVariablesData.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/PseudocodeVariablesData.java @@ -86,8 +86,8 @@ public class PseudocodeVariablesData { Set declaredVariables = Sets.newHashSet(); declaredVariables.addAll(getUpperLevelDeclaredVariables(pseudocode)); - for (LocalDeclarationInstruction localDeclarationInstruction : pseudocode.getLocalDeclarations()) { - Pseudocode localPseudocode = localDeclarationInstruction.getBody(); + for (LocalFunctionDeclarationInstruction localFunctionDeclarationInstruction : pseudocode.getLocalDeclarations()) { + Pseudocode localPseudocode = localFunctionDeclarationInstruction.getBody(); declaredVariables.addAll(getUpperLevelDeclaredVariables(localPseudocode)); } return declaredVariables; @@ -154,8 +154,8 @@ public class PseudocodeVariablesData { }); - for (LocalDeclarationInstruction localDeclarationInstruction : pseudocode.getLocalDeclarations()) { - Pseudocode localPseudocode = localDeclarationInstruction.getBody(); + for (LocalFunctionDeclarationInstruction localFunctionDeclarationInstruction : pseudocode.getLocalDeclarations()) { + Pseudocode localPseudocode = localFunctionDeclarationInstruction.getBody(); Map>> initializersForLocalDeclaration = getVariableInitializers(localPseudocode); for (Instruction instruction : initializersForLocalDeclaration.keySet()) { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/InstructionVisitor.java b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/InstructionVisitor.java index 3eb4e3e59e5..0914136b638 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/InstructionVisitor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/InstructionVisitor.java @@ -21,7 +21,7 @@ public class InstructionVisitor { visitInstructionWithNext(instruction); } - public void visitLocalDeclarationInstruction(LocalDeclarationInstruction instruction) { + public void visitLocalFunctionDeclarationInstruction(LocalFunctionDeclarationInstruction instruction) { visitInstructionWithNext(instruction); } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/JetControlFlowInstructionsGenerator.java b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/JetControlFlowInstructionsGenerator.java index 31a058a27da..c14b3c88389 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/JetControlFlowInstructionsGenerator.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/JetControlFlowInstructionsGenerator.java @@ -74,7 +74,7 @@ public class JetControlFlowInstructionsGenerator extends JetControlFlowBuilderAd JetControlFlowInstructionsGeneratorWorker worker = popBuilder(subroutine); if (!builders.empty()) { JetControlFlowInstructionsGeneratorWorker builder = builders.peek(); - LocalDeclarationInstruction instruction = new LocalDeclarationInstruction(subroutine, worker.getPseudocode()); + LocalFunctionDeclarationInstruction instruction = new LocalFunctionDeclarationInstruction(subroutine, worker.getPseudocode()); builder.add(instruction); } return worker.getPseudocode(); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/LocalDeclarationInstruction.java b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/LocalFunctionDeclarationInstruction.java similarity index 83% rename from compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/LocalDeclarationInstruction.java rename to compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/LocalFunctionDeclarationInstruction.java index b5191570a78..5ce9209a1de 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/LocalDeclarationInstruction.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/LocalFunctionDeclarationInstruction.java @@ -18,18 +18,17 @@ package org.jetbrains.jet.lang.cfg.pseudocode; import com.google.common.collect.Lists; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.JetDeclaration; import org.jetbrains.jet.lang.psi.JetElement; import java.util.ArrayList; import java.util.Collection; -public class LocalDeclarationInstruction extends InstructionWithNext { +public class LocalFunctionDeclarationInstruction extends InstructionWithNext { private final Pseudocode body; private Instruction sink; - public LocalDeclarationInstruction(@NotNull JetElement element, Pseudocode body) { + public LocalFunctionDeclarationInstruction(@NotNull JetElement element, Pseudocode body) { super(element); this.body = body; } @@ -55,7 +54,7 @@ public class LocalDeclarationInstruction extends InstructionWithNext { @Override public void accept(InstructionVisitor visitor) { - visitor.visitLocalDeclarationInstruction(this); + visitor.visitLocalFunctionDeclarationInstruction(this); } @Override @@ -65,6 +64,6 @@ public class LocalDeclarationInstruction extends InstructionWithNext { @Override protected Instruction createCopy() { - return new LocalDeclarationInstruction((JetDeclaration) element, body); + return new LocalFunctionDeclarationInstruction(element, body); } } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/Pseudocode.java b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/Pseudocode.java index 95120406486..23a3e2dae83 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/Pseudocode.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/Pseudocode.java @@ -27,7 +27,7 @@ public interface Pseudocode { JetElement getCorrespondingElement(); @NotNull - Set getLocalDeclarations(); + Set getLocalDeclarations(); @NotNull List getInstructions(); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/PseudocodeImpl.java b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/PseudocodeImpl.java index 19403d6281a..6dd42109889 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/PseudocodeImpl.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/PseudocodeImpl.java @@ -74,7 +74,7 @@ public class PseudocodeImpl implements Pseudocode { private final List mutableInstructionList = new ArrayList(); private final List instructions = new ArrayList(); - private Set localDeclarations = null; + private Set localDeclarations = null; //todo getters private final Map representativeInstructions = new HashMap(); private final Map loopInfo = Maps.newHashMap(); @@ -99,7 +99,7 @@ public class PseudocodeImpl implements Pseudocode { @NotNull @Override - public Set getLocalDeclarations() { + public Set getLocalDeclarations() { if (localDeclarations == null) { localDeclarations = getLocalDeclarations(this); } @@ -107,12 +107,12 @@ public class PseudocodeImpl implements Pseudocode { } @NotNull - private static Set getLocalDeclarations(@NotNull Pseudocode pseudocode) { - Set localDeclarations = Sets.newLinkedHashSet(); + private static Set getLocalDeclarations(@NotNull Pseudocode pseudocode) { + Set localDeclarations = Sets.newLinkedHashSet(); for (Instruction instruction : pseudocode.getInstructions()) { - if (instruction instanceof LocalDeclarationInstruction) { - localDeclarations.add((LocalDeclarationInstruction) instruction); - localDeclarations.addAll(getLocalDeclarations(((LocalDeclarationInstruction)instruction).getBody())); + if (instruction instanceof LocalFunctionDeclarationInstruction) { + localDeclarations.add((LocalFunctionDeclarationInstruction) instruction); + localDeclarations.addAll(getLocalDeclarations(((LocalFunctionDeclarationInstruction)instruction).getBody())); } } return localDeclarations; @@ -287,7 +287,7 @@ public class PseudocodeImpl implements Pseudocode { } @Override - public void visitLocalDeclarationInstruction(LocalDeclarationInstruction instruction) { + public void visitLocalFunctionDeclarationInstruction(LocalFunctionDeclarationInstruction instruction) { ((PseudocodeImpl)instruction.getBody()).postProcess(); instruction.setNext(getSinkInstruction()); } diff --git a/compiler/tests/org/jetbrains/jet/cfg/AbstractControlFlowTest.java b/compiler/tests/org/jetbrains/jet/cfg/AbstractControlFlowTest.java index b1698b855d4..8c80548cb61 100644 --- a/compiler/tests/org/jetbrains/jet/cfg/AbstractControlFlowTest.java +++ b/compiler/tests/org/jetbrains/jet/cfg/AbstractControlFlowTest.java @@ -55,7 +55,7 @@ public abstract class AbstractControlFlowTest extends KotlinTestWithEnvironment for (JetDeclaration declaration : declarations) { Pseudocode pseudocode = PseudocodeUtil.generatePseudocode(declaration, bindingContext); data.put(declaration, pseudocode); - for (LocalDeclarationInstruction instruction : pseudocode.getLocalDeclarations()) { + for (LocalFunctionDeclarationInstruction instruction : pseudocode.getLocalDeclarations()) { Pseudocode localPseudocode = instruction.getBody(); data.put(localPseudocode.getCorrespondingElement(), localPseudocode); } @@ -228,9 +228,9 @@ public abstract class AbstractControlFlowTest extends KotlinTestWithEnvironment } for (int i = 0, instructionsSize = instructions.size(); i < instructionsSize; i++) { Instruction instruction = instructions.get(i); - if (instruction instanceof LocalDeclarationInstruction) { - LocalDeclarationInstruction localDeclarationInstruction = (LocalDeclarationInstruction) instruction; - locals.add((PseudocodeImpl) localDeclarationInstruction.getBody()); + if (instruction instanceof LocalFunctionDeclarationInstruction) { + LocalFunctionDeclarationInstruction localFunctionDeclarationInstruction = (LocalFunctionDeclarationInstruction) instruction; + locals.add((PseudocodeImpl) localFunctionDeclarationInstruction.getBody()); } for (PseudocodeImpl.PseudocodeLabel label: labels) { if (label.getTargetInstructionIndex() == i) { @@ -251,7 +251,7 @@ public abstract class AbstractControlFlowTest extends KotlinTestWithEnvironment for (Instruction fromInst : instructions) { fromInst.accept(new InstructionVisitor() { @Override - public void visitLocalDeclarationInstruction(LocalDeclarationInstruction instruction) { + public void visitLocalFunctionDeclarationInstruction(LocalFunctionDeclarationInstruction instruction) { int index = count[0]; // instruction.getBody().dumpSubgraph(out, "subgraph cluster_" + index, count, "color=blue;\nlabel = \"f" + index + "\";", nodeToName); printEdge(out, nodeToName.get(instruction), nodeToName.get(((PseudocodeImpl)instruction.getBody()).getAllInstructions().get(0)), null); @@ -336,7 +336,7 @@ public abstract class AbstractControlFlowTest extends KotlinTestWithEnvironment else if (node instanceof UnsupportedElementInstruction) { shape = "box, fillcolor=red, style=filled"; } - else if (node instanceof LocalDeclarationInstruction) { + else if (node instanceof LocalFunctionDeclarationInstruction) { shape = "Mcircle"; } else if (node instanceof SubroutineEnterInstruction || node instanceof SubroutineExitInstruction) {