diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowBuilder.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/KotlinControlFlowBuilder.java similarity index 99% rename from compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowBuilder.java rename to compiler/frontend/src/org/jetbrains/kotlin/cfg/KotlinControlFlowBuilder.java index a77de11ae91..2c00ec03aec 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowBuilder.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/KotlinControlFlowBuilder.java @@ -30,7 +30,7 @@ import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue; import java.util.List; import java.util.Map; -public interface JetControlFlowBuilder { +public interface KotlinControlFlowBuilder { // Subroutines void enterSubroutine(@NotNull KtElement subroutine); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowBuilderAdapter.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/KotlinControlFlowBuilderAdapter.java similarity index 98% rename from compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowBuilderAdapter.java rename to compiler/frontend/src/org/jetbrains/kotlin/cfg/KotlinControlFlowBuilderAdapter.java index 73cf3f045e8..bc28e37fd72 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowBuilderAdapter.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/KotlinControlFlowBuilderAdapter.java @@ -30,10 +30,10 @@ import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue; import java.util.List; import java.util.Map; -public abstract class JetControlFlowBuilderAdapter implements JetControlFlowBuilder { +public abstract class KotlinControlFlowBuilderAdapter implements KotlinControlFlowBuilder { @NotNull - protected abstract JetControlFlowBuilder getDelegateBuilder(); + protected abstract KotlinControlFlowBuilder getDelegateBuilder(); @Override public void loadUnit(@NotNull KtExpression expression) { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowProcessor.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/KotlinControlFlowProcessor.java similarity index 99% rename from compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowProcessor.java rename to compiler/frontend/src/org/jetbrains/kotlin/cfg/KotlinControlFlowProcessor.java index b68d4ed84d3..fe9d4f17188 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowProcessor.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/KotlinControlFlowProcessor.java @@ -29,7 +29,7 @@ import kotlin.jvm.functions.Function1; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; -import org.jetbrains.kotlin.cfg.pseudocode.JetControlFlowInstructionsGenerator; +import org.jetbrains.kotlin.cfg.pseudocode.KotlinControlFlowInstructionsGenerator; import org.jetbrains.kotlin.cfg.pseudocode.PseudoValue; import org.jetbrains.kotlin.cfg.pseudocode.Pseudocode; import org.jetbrains.kotlin.cfg.pseudocode.PseudocodeImpl; @@ -61,17 +61,17 @@ import org.jetbrains.kotlin.types.expressions.OperatorConventions; import java.util.*; -import static org.jetbrains.kotlin.cfg.JetControlFlowBuilder.PredefinedOperation.*; +import static org.jetbrains.kotlin.cfg.KotlinControlFlowBuilder.PredefinedOperation.*; import static org.jetbrains.kotlin.diagnostics.Errors.*; import static org.jetbrains.kotlin.lexer.KtTokens.*; -public class JetControlFlowProcessor { +public class KotlinControlFlowProcessor { - private final JetControlFlowBuilder builder; + private final KotlinControlFlowBuilder builder; private final BindingTrace trace; - public JetControlFlowProcessor(BindingTrace trace) { - this.builder = new JetControlFlowInstructionsGenerator(); + public KotlinControlFlowProcessor(BindingTrace trace) { + this.builder = new KotlinControlFlowInstructionsGenerator(); this.trace = trace; } @@ -127,7 +127,7 @@ public class JetControlFlowProcessor { } private class CFPVisitor extends KtVisitorVoid { - private final JetControlFlowBuilder builder; + private final KotlinControlFlowBuilder builder; private final KtVisitorVoid conditionVisitor = new KtVisitorVoid() { @@ -174,7 +174,7 @@ public class JetControlFlowProcessor { } }; - private CFPVisitor(@NotNull JetControlFlowBuilder builder) { + private CFPVisitor(@NotNull KotlinControlFlowBuilder builder) { this.builder = builder; } @@ -411,7 +411,7 @@ public class JetControlFlowProcessor { generateInstructions(right); } builder.bindLabel(resultLabel); - JetControlFlowBuilder.PredefinedOperation operation = operationType == ANDAND ? AND : OR; + KotlinControlFlowBuilder.PredefinedOperation operation = operationType == ANDAND ? AND : OR; builder.predefinedOperation(expression, operation, elementsToValues(Arrays.asList(left, right))); } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetFlowInformationProvider.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/KotlinFlowInformationProvider.java similarity index 96% rename from compiler/frontend/src/org/jetbrains/kotlin/cfg/JetFlowInformationProvider.java rename to compiler/frontend/src/org/jetbrains/kotlin/cfg/KotlinFlowInformationProvider.java index d79a1fd7aac..4b2f89b279f 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetFlowInformationProvider.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/KotlinFlowInformationProvider.java @@ -36,7 +36,7 @@ import org.jetbrains.kotlin.cfg.pseudocode.PseudocodeUtil; import org.jetbrains.kotlin.cfg.pseudocode.PseudocodeUtilsKt; import org.jetbrains.kotlin.cfg.pseudocode.instructions.Instruction; import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionVisitor; -import org.jetbrains.kotlin.cfg.pseudocode.instructions.JetElementInstruction; +import org.jetbrains.kotlin.cfg.pseudocode.instructions.KtElementInstruction; import org.jetbrains.kotlin.cfg.pseudocode.instructions.eval.*; import org.jetbrains.kotlin.cfg.pseudocode.instructions.jumps.*; import org.jetbrains.kotlin.cfg.pseudocode.instructions.special.LocalFunctionDeclarationInstruction; @@ -67,21 +67,20 @@ import java.util.*; import static org.jetbrains.kotlin.cfg.PseudocodeVariablesData.VariableUseState.*; import static org.jetbrains.kotlin.cfg.TailRecursionKind.*; -import static org.jetbrains.kotlin.cfg.pseudocodeTraverser.TraversalOrder.FORWARD; import static org.jetbrains.kotlin.diagnostics.Errors.*; import static org.jetbrains.kotlin.diagnostics.Errors.UNREACHABLE_CODE; import static org.jetbrains.kotlin.resolve.BindingContext.*; import static org.jetbrains.kotlin.types.TypeUtils.NO_EXPECTED_TYPE; import static org.jetbrains.kotlin.types.TypeUtils.noExpectedType; -public class JetFlowInformationProvider { +public class KotlinFlowInformationProvider { private final KtElement subroutine; private final Pseudocode pseudocode; private final BindingTrace trace; private PseudocodeVariablesData pseudocodeVariablesData; - private JetFlowInformationProvider( + private KotlinFlowInformationProvider( @NotNull KtElement declaration, @NotNull BindingTrace trace, @NotNull Pseudocode pseudocode @@ -91,11 +90,11 @@ public class JetFlowInformationProvider { this.pseudocode = pseudocode; } - public JetFlowInformationProvider( + public KotlinFlowInformationProvider( @NotNull KtElement declaration, @NotNull BindingTrace trace ) { - this(declaration, trace, new JetControlFlowProcessor(trace).generatePseudocode(declaration)); + this(declaration, trace, new KotlinControlFlowProcessor(trace).generatePseudocode(declaration)); } public PseudocodeVariablesData getPseudocodeVariablesData() { @@ -190,8 +189,8 @@ public class JetFlowInformationProvider { @Override public void visitInstruction(@NotNull Instruction instruction) { - if (instruction instanceof JetElementInstruction) { - JetElementInstruction elementInstruction = (JetElementInstruction) instruction; + if (instruction instanceof KtElementInstruction) { + KtElementInstruction elementInstruction = (KtElementInstruction) instruction; returnedExpressions.add(elementInstruction.getElement()); } else { @@ -212,8 +211,8 @@ public class JetFlowInformationProvider { (CallableDescriptor) trace.getBindingContext().get(BindingContext.DECLARATION_TO_DESCRIPTOR, localDeclaration); KotlinType expectedType = functionDescriptor != null ? functionDescriptor.getReturnType() : null; - JetFlowInformationProvider providerForLocalDeclaration = - new JetFlowInformationProvider(localDeclaration, trace, localDeclarationInstruction.getBody()); + KotlinFlowInformationProvider providerForLocalDeclaration = + new KotlinFlowInformationProvider(localDeclaration, trace, localDeclarationInstruction.getBody()); providerForLocalDeclaration.checkFunction(expectedType); } @@ -270,12 +269,12 @@ public class JetFlowInformationProvider { Set reachableElements = Sets.newHashSet(); Set unreachableElements = Sets.newHashSet(); for (Instruction instruction : pseudocode.getInstructionsIncludingDeadCode()) { - if (!(instruction instanceof JetElementInstruction) + if (!(instruction instanceof KtElementInstruction) || instruction instanceof LoadUnitValueInstruction || instruction instanceof MergeInstruction || (instruction instanceof MagicInstruction && ((MagicInstruction) instruction).getSynthetic())) continue; - KtElement element = ((JetElementInstruction) instruction).getElement(); + KtElement element = ((KtElementInstruction) instruction).getElement(); if (instruction instanceof JumpInstruction) { boolean isJumpElement = element instanceof KtBreakExpression @@ -312,7 +311,7 @@ public class JetFlowInformationProvider { final Map> reportedDiagnosticMap = Maps.newHashMap(); PseudocodeTraverserKt.traverse( - pseudocode, FORWARD, initializers, + pseudocode, TraversalOrder.FORWARD, initializers, new InstructionDataAnalyzeStrategy>() { @Override public void execute( @@ -650,12 +649,12 @@ public class JetFlowInformationProvider { public void markUnusedExpressions() { final Map> reportedDiagnosticMap = Maps.newHashMap(); PseudocodeTraverserKt.traverse( - pseudocode, FORWARD, new JetFlowInformationProvider.FunctionVoid1() { + pseudocode, TraversalOrder.FORWARD, new KotlinFlowInformationProvider.FunctionVoid1() { @Override public void execute(@NotNull Instruction instruction) { - if (!(instruction instanceof JetElementInstruction)) return; + if (!(instruction instanceof KtElementInstruction)) return; - KtElement element = ((JetElementInstruction)instruction).getElement(); + KtElement element = ((KtElementInstruction)instruction).getElement(); if (!(element instanceof KtExpression)) return; if (BindingContextUtilsKt.isUsedAsStatement((KtExpression) element, trace.getBindingContext()) @@ -678,7 +677,7 @@ public class JetFlowInformationProvider { public void markStatements() { PseudocodeTraverserKt.traverse( - pseudocode, FORWARD, new JetFlowInformationProvider.FunctionVoid1() { + pseudocode, TraversalOrder.FORWARD, new KotlinFlowInformationProvider.FunctionVoid1() { @Override public void execute(@NotNull Instruction instruction) { PseudoValue value = instruction instanceof InstructionWithValue @@ -696,7 +695,7 @@ public class JetFlowInformationProvider { public void markIfWithoutElse() { PseudocodeTraverserKt.traverse( - pseudocode, FORWARD, new JetFlowInformationProvider.FunctionVoid1() { + pseudocode, TraversalOrder.FORWARD, new KotlinFlowInformationProvider.FunctionVoid1() { @Override public void execute(@NotNull Instruction instruction) { PseudoValue value = instruction instanceof InstructionWithValue @@ -718,7 +717,7 @@ public class JetFlowInformationProvider { public void markWhenWithoutElse() { PseudocodeTraverserKt.traverse( - pseudocode, FORWARD, new JetFlowInformationProvider.FunctionVoid1() { + pseudocode, TraversalOrder.FORWARD, new KotlinFlowInformationProvider.FunctionVoid1() { @Override public void execute(@NotNull Instruction instruction) { PseudoValue value = instruction instanceof InstructionWithValue @@ -767,7 +766,7 @@ public class JetFlowInformationProvider { final Map calls = new HashMap(); PseudocodeTraverserKt.traverse( pseudocode, - FORWARD, + TraversalOrder.FORWARD, new FunctionVoid1() { public void execute(@NotNull Instruction instruction) { if (!(instruction instanceof CallInstruction)) return; @@ -797,7 +796,7 @@ public class JetFlowInformationProvider { boolean isTail = PseudocodeTraverserKt.traverseFollowingInstructions( callInstruction, new HashSet(), - FORWARD, + TraversalOrder.FORWARD, new TailRecursionDetector(subroutine, callInstruction) ); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/JetControlFlowInstructionsGenerator.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/KotlinControlFlowInstructionsGenerator.java similarity index 95% rename from compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/JetControlFlowInstructionsGenerator.java rename to compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/KotlinControlFlowInstructionsGenerator.java index 95aacf721a3..12702325304 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/JetControlFlowInstructionsGenerator.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/KotlinControlFlowInstructionsGenerator.java @@ -35,32 +35,32 @@ import org.jetbrains.kotlin.types.KotlinType; import java.util.*; -public class JetControlFlowInstructionsGenerator extends JetControlFlowBuilderAdapter { - private JetControlFlowBuilder builder = null; +public class KotlinControlFlowInstructionsGenerator extends KotlinControlFlowBuilderAdapter { + private KotlinControlFlowBuilder builder = null; private final Stack loopInfo = new Stack(); private final Stack lexicalScopes = new Stack(); private final Map elementToBlockInfo = new HashMap(); private int labelCount = 0; - private final Stack builders = new Stack(); + private final Stack builders = new Stack(); private final Stack allBlocks = new Stack(); @NotNull @Override - protected JetControlFlowBuilder getDelegateBuilder() { + protected KotlinControlFlowBuilder getDelegateBuilder() { return builder; } private void pushBuilder(KtElement scopingElement, KtElement subroutine) { - JetControlFlowInstructionsGeneratorWorker worker = new JetControlFlowInstructionsGeneratorWorker(scopingElement, subroutine); + KotlinControlFlowInstructionsGeneratorWorker worker = new KotlinControlFlowInstructionsGeneratorWorker(scopingElement, subroutine); builders.push(worker); builder = worker; } - private JetControlFlowInstructionsGeneratorWorker popBuilder(@NotNull KtElement element) { - JetControlFlowInstructionsGeneratorWorker worker = builders.pop(); + private KotlinControlFlowInstructionsGeneratorWorker popBuilder(@NotNull KtElement element) { + KotlinControlFlowInstructionsGeneratorWorker worker = builders.pop(); if (!builders.isEmpty()) { builder = builders.peek(); } @@ -88,15 +88,15 @@ public class JetControlFlowInstructionsGenerator extends JetControlFlowBuilderAd public Pseudocode exitSubroutine(@NotNull KtElement subroutine) { super.exitSubroutine(subroutine); builder.exitLexicalScope(subroutine); - JetControlFlowInstructionsGeneratorWorker worker = popBuilder(subroutine); + KotlinControlFlowInstructionsGeneratorWorker worker = popBuilder(subroutine); if (!builders.empty()) { - JetControlFlowInstructionsGeneratorWorker builder = builders.peek(); + KotlinControlFlowInstructionsGeneratorWorker builder = builders.peek(); builder.declareFunction(subroutine, worker.getPseudocode()); } return worker.getPseudocode(); } - private class JetControlFlowInstructionsGeneratorWorker implements JetControlFlowBuilder { + private class KotlinControlFlowInstructionsGeneratorWorker implements KotlinControlFlowBuilder { private final PseudocodeImpl pseudocode; private final Label error; @@ -115,7 +115,7 @@ public class JetControlFlowInstructionsGenerator extends JetControlFlowBuilderAd } }; - private JetControlFlowInstructionsGeneratorWorker(@NotNull KtElement scopingElement, @NotNull KtElement returnSubroutine) { + private KotlinControlFlowInstructionsGeneratorWorker(@NotNull KtElement scopingElement, @NotNull KtElement returnSubroutine) { this.pseudocode = new PseudocodeImpl(scopingElement); this.error = pseudocode.createLabel("error", null); this.sink = pseudocode.createLabel("sink", null); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/PseudocodeImpl.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/PseudocodeImpl.java index fbe63a90415..c22e349f450 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/PseudocodeImpl.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/PseudocodeImpl.java @@ -228,8 +228,8 @@ public class PseudocodeImpl implements Pseudocode { mutableInstructionList.add(instruction); instruction.setOwner(this); - if (instruction instanceof JetElementInstruction) { - JetElementInstruction elementInstruction = (JetElementInstruction) instruction; + if (instruction instanceof KtElementInstruction) { + KtElementInstruction elementInstruction = (KtElementInstruction) instruction; representativeInstructions.put(elementInstruction.getElement(), instruction); } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/PseudocodeUtil.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/PseudocodeUtil.java index 55b4748a994..d1124bee2cc 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/PseudocodeUtil.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/PseudocodeUtil.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.cfg.pseudocode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.kotlin.cfg.JetControlFlowProcessor; +import org.jetbrains.kotlin.cfg.KotlinControlFlowProcessor; import org.jetbrains.kotlin.cfg.pseudocode.instructions.Instruction; import org.jetbrains.kotlin.cfg.pseudocode.instructions.eval.AccessTarget; import org.jetbrains.kotlin.cfg.pseudocode.instructions.eval.AccessValueInstruction; @@ -84,7 +84,7 @@ public class PseudocodeUtil { public void report(@NotNull Diagnostic diagnostic) { } }; - return new JetControlFlowProcessor(mockTrace).generatePseudocode(declaration); + return new KotlinControlFlowProcessor(mockTrace).generatePseudocode(declaration); } @Nullable diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/InstructionWithNext.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/InstructionWithNext.kt index c3c3999ba61..6fc82983616 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/InstructionWithNext.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/InstructionWithNext.kt @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.utils.emptyOrSingletonList public abstract class InstructionWithNext( element: KtElement, lexicalScope: LexicalScope -) : JetElementInstructionImpl(element, lexicalScope) { +) : KtElementInstructionImpl(element, lexicalScope) { public var next: Instruction? = null set(value: Instruction?) { field = outgoingEdgeTo(value) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/JetElementInstruction.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/KtElementInstruction.kt similarity index 93% rename from compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/JetElementInstruction.kt rename to compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/KtElementInstruction.kt index 1554a13e3ef..a17cb5a5de6 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/JetElementInstruction.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/KtElementInstruction.kt @@ -18,6 +18,6 @@ package org.jetbrains.kotlin.cfg.pseudocode.instructions import org.jetbrains.kotlin.psi.KtElement -public interface JetElementInstruction : Instruction { +public interface KtElementInstruction : Instruction { public val element: KtElement } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/JetElementInstructionImpl.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/KtElementInstructionImpl.kt similarity index 89% rename from compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/JetElementInstructionImpl.kt rename to compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/KtElementInstructionImpl.kt index 79bb47797e3..6561cccc606 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/JetElementInstructionImpl.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/KtElementInstructionImpl.kt @@ -19,10 +19,10 @@ package org.jetbrains.kotlin.cfg.pseudocode.instructions import com.intellij.psi.PsiElement import org.jetbrains.kotlin.psi.KtElement -public abstract class JetElementInstructionImpl( +public abstract class KtElementInstructionImpl( override val element: KtElement, lexicalScope: LexicalScope -) : InstructionImpl(lexicalScope), JetElementInstruction { +) : InstructionImpl(lexicalScope), KtElementInstruction { protected fun render(element: PsiElement): String = element.getText()?.replace("\\s+".toRegex(), " ") ?: "" } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/eval/InstructionWithValue.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/eval/InstructionWithValue.kt index 6296332ffd7..032674d312a 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/eval/InstructionWithValue.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/eval/InstructionWithValue.kt @@ -16,9 +16,9 @@ package org.jetbrains.kotlin.cfg.pseudocode.instructions.eval -import org.jetbrains.kotlin.cfg.pseudocode.instructions.JetElementInstruction +import org.jetbrains.kotlin.cfg.pseudocode.instructions.KtElementInstruction import org.jetbrains.kotlin.cfg.pseudocode.PseudoValue -public interface InstructionWithValue : JetElementInstruction { +public interface InstructionWithValue : KtElementInstruction { public val outputValue: PseudoValue? } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/jumps/AbstractJumpInstruction.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/jumps/AbstractJumpInstruction.kt index 64f1951ae92..2c6a7071740 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/jumps/AbstractJumpInstruction.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/jumps/AbstractJumpInstruction.kt @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.cfg.pseudocode.instructions.jumps import org.jetbrains.kotlin.psi.KtElement import org.jetbrains.kotlin.cfg.Label import org.jetbrains.kotlin.cfg.pseudocode.instructions.LexicalScope -import org.jetbrains.kotlin.cfg.pseudocode.instructions.JetElementInstructionImpl +import org.jetbrains.kotlin.cfg.pseudocode.instructions.KtElementInstructionImpl import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionImpl import org.jetbrains.kotlin.cfg.pseudocode.instructions.Instruction import org.jetbrains.kotlin.utils.emptyOrSingletonList @@ -28,7 +28,7 @@ public abstract class AbstractJumpInstruction( element: KtElement, public val targetLabel: Label, lexicalScope: LexicalScope -) : JetElementInstructionImpl(element, lexicalScope), JumpInstruction { +) : KtElementInstructionImpl(element, lexicalScope), JumpInstruction { public var resolvedTarget: Instruction? = null set(value: Instruction?) { field = outgoingEdgeTo(value) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/jumps/NondeterministicJumpInstruction.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/jumps/NondeterministicJumpInstruction.kt index 42d1660dd75..1befe2a8963 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/jumps/NondeterministicJumpInstruction.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/jumps/NondeterministicJumpInstruction.kt @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.cfg.Label import com.google.common.collect.Maps import com.google.common.collect.Lists import org.jetbrains.kotlin.cfg.pseudocode.instructions.LexicalScope -import org.jetbrains.kotlin.cfg.pseudocode.instructions.JetElementInstructionImpl +import org.jetbrains.kotlin.cfg.pseudocode.instructions.KtElementInstructionImpl import org.jetbrains.kotlin.cfg.pseudocode.instructions.Instruction import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionVisitor import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionVisitorWithResult @@ -34,7 +34,7 @@ public class NondeterministicJumpInstruction( targetLabels: List