From 07c0d87a8f89f205aa2e8d0f752b0cca634b3603 Mon Sep 17 00:00:00 2001 From: Svetlana Isakova Date: Wed, 14 May 2014 14:23:07 +0400 Subject: [PATCH] Rename JetLabelQualifiedExpression -> JetExpressionWithLabel JetLabelQualifiedInstanceExpression -> JetInstanceExpressionWithLabel --- .../org/jetbrains/jet/codegen/ExpressionCodegen.java | 2 +- .../jet/lang/cfg/JetControlFlowProcessor.java | 6 +++--- .../org/jetbrains/jet/lang/diagnostics/Errors.java | 6 +++--- .../jetbrains/jet/lang/psi/JetBreakExpression.java | 2 +- .../jet/lang/psi/JetContinueExpression.java | 2 +- ...edExpression.java => JetExpressionWithLabel.java} | 4 ++-- ...sion.java => JetInstanceExpressionWithLabel.java} | 4 ++-- .../jetbrains/jet/lang/psi/JetReturnExpression.java | 2 +- .../jetbrains/jet/lang/psi/JetSuperExpression.java | 2 +- .../jetbrains/jet/lang/psi/JetThisExpression.java | 2 +- .../src/org/jetbrains/jet/lang/psi/JetVisitor.java | 12 ++++++------ .../org/jetbrains/jet/lang/psi/JetVisitorVoid.java | 8 ++++---- .../jet/lang/psi/JetVisitorVoidWithParameter.java | 8 ++++---- .../expressions/BasicExpressionTypingVisitor.java | 2 +- .../jet/lang/types/expressions/LabelResolver.java | 4 ++-- .../highlighter/LabelsHighlightingVisitor.java | 4 ++-- .../k2js/translate/expression/ExpressionVisitor.java | 2 +- 17 files changed, 36 insertions(+), 36 deletions(-) rename compiler/frontend/src/org/jetbrains/jet/lang/psi/{JetLabelQualifiedExpression.java => JetExpressionWithLabel.java} (92%) rename compiler/frontend/src/org/jetbrains/jet/lang/psi/{JetLabelQualifiedInstanceExpression.java => JetInstanceExpressionWithLabel.java} (85%) diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java index c8ba6944cdd..f7711e0e7c9 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java @@ -1136,7 +1136,7 @@ public class ExpressionCodegen extends JetVisitor implem } @NotNull - private StackValue generateBreakOrContinueExpression(@NotNull JetLabelQualifiedExpression expression, boolean isBreak) { + private StackValue generateBreakOrContinueExpression(@NotNull JetExpressionWithLabel expression, boolean isBreak) { assert expression instanceof JetContinueExpression || expression instanceof JetBreakExpression; if (!blockStackElements.isEmpty()) { 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 b150009c25b..b70668bb3ac 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java @@ -229,7 +229,7 @@ public class JetControlFlowProcessor { } @Override - public void visitLabelQualifiedExpressionVoid(@NotNull JetLabelQualifiedExpression expression, CFPContext context) { + public void visitExpressionWithLabelVoid(@NotNull JetExpressionWithLabel expression, CFPContext context) { String labelName = expression.getLabelName(); JetExpression labeledExpression = expression.getLabeledExpression(); if (labelName != null && labeledExpression != null) { @@ -665,7 +665,7 @@ public class JetControlFlowProcessor { } } - private JetElement getCorrespondingLoop(JetLabelQualifiedExpression expression) { + private JetElement getCorrespondingLoop(JetExpressionWithLabel expression) { String labelName = expression.getLabelName(); JetElement loop; if (labelName != null) { @@ -689,7 +689,7 @@ public class JetControlFlowProcessor { return loop; } - private void checkJumpDoesNotCrossFunctionBoundary(@NotNull JetLabelQualifiedExpression jumpExpression, @NotNull JetElement jumpTarget) { + private void checkJumpDoesNotCrossFunctionBoundary(@NotNull JetExpressionWithLabel jumpExpression, @NotNull JetElement jumpTarget) { BindingContext bindingContext = trace.getBindingContext(); FunctionDescriptor labelExprEnclosingFunc = BindingContextUtils.getEnclosingFunctionDescriptor(bindingContext, jumpExpression); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java index 4d51dd1c33d..9c7ae04181d 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java @@ -431,9 +431,9 @@ public interface Errors { DiagnosticFactory0 LABEL_NAME_CLASH = DiagnosticFactory0.create(WARNING); DiagnosticFactory0 AMBIGUOUS_LABEL = DiagnosticFactory0.create(ERROR); - DiagnosticFactory0 BREAK_OR_CONTINUE_OUTSIDE_A_LOOP = DiagnosticFactory0.create(ERROR); - DiagnosticFactory0 BREAK_OR_CONTINUE_JUMPS_ACROSS_FUNCTION_BOUNDARY = DiagnosticFactory0.create(ERROR); - DiagnosticFactory1 NOT_A_LOOP_LABEL = DiagnosticFactory1.create(ERROR); + DiagnosticFactory0 BREAK_OR_CONTINUE_OUTSIDE_A_LOOP = DiagnosticFactory0.create(ERROR); + DiagnosticFactory0 BREAK_OR_CONTINUE_JUMPS_ACROSS_FUNCTION_BOUNDARY = DiagnosticFactory0.create(ERROR); + DiagnosticFactory1 NOT_A_LOOP_LABEL = DiagnosticFactory1.create(ERROR); DiagnosticFactory1 NOT_A_RETURN_LABEL = DiagnosticFactory1.create(ERROR); // Control flow / Data flow diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetBreakExpression.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetBreakExpression.java index 7b422357fda..e58cf1544b9 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetBreakExpression.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetBreakExpression.java @@ -19,7 +19,7 @@ package org.jetbrains.jet.lang.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; -public class JetBreakExpression extends JetLabelQualifiedExpression implements JetStatementExpression { +public class JetBreakExpression extends JetExpressionWithLabel implements JetStatementExpression { public JetBreakExpression(@NotNull ASTNode node) { super(node); } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetContinueExpression.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetContinueExpression.java index ce9cd686f21..62fed0453c1 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetContinueExpression.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetContinueExpression.java @@ -19,7 +19,7 @@ package org.jetbrains.jet.lang.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; -public class JetContinueExpression extends JetLabelQualifiedExpression implements JetStatementExpression { +public class JetContinueExpression extends JetExpressionWithLabel implements JetStatementExpression { public JetContinueExpression(@NotNull ASTNode node) { super(node); } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetLabelQualifiedExpression.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetExpressionWithLabel.java similarity index 92% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetLabelQualifiedExpression.java rename to compiler/frontend/src/org/jetbrains/jet/lang/psi/JetExpressionWithLabel.java index 98b744221dc..b69cb54a101 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetLabelQualifiedExpression.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetExpressionWithLabel.java @@ -21,9 +21,9 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.JetNodeTypes; -public class JetLabelQualifiedExpression extends JetExpressionImpl { +public class JetExpressionWithLabel extends JetExpressionImpl { - public JetLabelQualifiedExpression(@NotNull ASTNode node) { + public JetExpressionWithLabel(@NotNull ASTNode node) { super(node); } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetLabelQualifiedInstanceExpression.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetInstanceExpressionWithLabel.java similarity index 85% rename from compiler/frontend/src/org/jetbrains/jet/lang/psi/JetLabelQualifiedInstanceExpression.java rename to compiler/frontend/src/org/jetbrains/jet/lang/psi/JetInstanceExpressionWithLabel.java index 6f10bc322d0..f8678b8ac83 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetLabelQualifiedInstanceExpression.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetInstanceExpressionWithLabel.java @@ -20,9 +20,9 @@ import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.JetNodeTypes; -public abstract class JetLabelQualifiedInstanceExpression extends JetLabelQualifiedExpression { +public abstract class JetInstanceExpressionWithLabel extends JetExpressionWithLabel { - public JetLabelQualifiedInstanceExpression(@NotNull ASTNode node) { + public JetInstanceExpressionWithLabel(@NotNull ASTNode node) { super(node); } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetReturnExpression.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetReturnExpression.java index a05109848d1..aa325bdbd3f 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetReturnExpression.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetReturnExpression.java @@ -20,7 +20,7 @@ import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -public class JetReturnExpression extends JetLabelQualifiedExpression implements JetStatementExpression { +public class JetReturnExpression extends JetExpressionWithLabel implements JetStatementExpression { public JetReturnExpression(@NotNull ASTNode node) { super(node); } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetSuperExpression.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetSuperExpression.java index 252e0a429cb..09a627fc5be 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetSuperExpression.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetSuperExpression.java @@ -21,7 +21,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.JetNodeTypes; -public class JetSuperExpression extends JetLabelQualifiedInstanceExpression implements JetStatementExpression { +public class JetSuperExpression extends JetInstanceExpressionWithLabel implements JetStatementExpression { public JetSuperExpression(@NotNull ASTNode node) { super(node); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetThisExpression.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetThisExpression.java index 2b31a3f2bd6..4983e7237cc 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetThisExpression.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetThisExpression.java @@ -19,7 +19,7 @@ package org.jetbrains.jet.lang.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; -public class JetThisExpression extends JetLabelQualifiedInstanceExpression { +public class JetThisExpression extends JetInstanceExpressionWithLabel { public JetThisExpression(@NotNull ASTNode node) { super(node); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetVisitor.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetVisitor.java index c33b3ddc5d4..aee9465a913 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetVisitor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetVisitor.java @@ -187,10 +187,10 @@ public class JetVisitor extends PsiElementVisitor { } public R visitReturnExpression(@NotNull JetReturnExpression expression, D data) { - return visitLabelQualifiedExpression(expression, data); + return visitExpressionWithLabel(expression, data); } - public R visitLabelQualifiedExpression(@NotNull JetLabelQualifiedExpression expression, D data) { + public R visitExpressionWithLabel(@NotNull JetExpressionWithLabel expression, D data) { return visitExpression(expression, data); } @@ -199,11 +199,11 @@ public class JetVisitor extends PsiElementVisitor { } public R visitBreakExpression(@NotNull JetBreakExpression expression, D data) { - return visitLabelQualifiedExpression(expression, data); + return visitExpressionWithLabel(expression, data); } public R visitContinueExpression(@NotNull JetContinueExpression expression, D data) { - return visitLabelQualifiedExpression(expression, data); + return visitExpressionWithLabel(expression, data); } public R visitIfExpression(@NotNull JetIfExpression expression, D data) { @@ -287,11 +287,11 @@ public class JetVisitor extends PsiElementVisitor { } public R visitThisExpression(@NotNull JetThisExpression expression, D data) { - return visitLabelQualifiedExpression(expression, data); + return visitExpressionWithLabel(expression, data); } public R visitSuperExpression(@NotNull JetSuperExpression expression, D data) { - return visitLabelQualifiedExpression(expression, data); + return visitExpressionWithLabel(expression, data); } public R visitParenthesizedExpression(@NotNull JetParenthesizedExpression expression, D data) { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetVisitorVoid.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetVisitorVoid.java index 15f2c727bf8..da93daec344 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetVisitorVoid.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetVisitorVoid.java @@ -189,8 +189,8 @@ public class JetVisitorVoid extends JetVisitor { super.visitReturnExpression(expression, null); } - public void visitLabelQualifiedExpression(@NotNull JetLabelQualifiedExpression expression) { - super.visitLabelQualifiedExpression(expression, null); + public void visitExpressionWithLabel(@NotNull JetExpressionWithLabel expression) { + super.visitExpressionWithLabel(expression, null); } public void visitThrowExpression(@NotNull JetThrowExpression expression) { @@ -661,8 +661,8 @@ public class JetVisitorVoid extends JetVisitor { } @Override - public final Void visitLabelQualifiedExpression(@NotNull JetLabelQualifiedExpression expression, Void data) { - visitLabelQualifiedExpression(expression); + public final Void visitExpressionWithLabel(@NotNull JetExpressionWithLabel expression, Void data) { + visitExpressionWithLabel(expression); return null; } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetVisitorVoidWithParameter.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetVisitorVoidWithParameter.java index e6a1048c0f4..11f5e3920b9 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetVisitorVoidWithParameter.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetVisitorVoidWithParameter.java @@ -190,8 +190,8 @@ public class JetVisitorVoidWithParameter

extends JetVisitor { super.visitReturnExpression(expression, data); } - public void visitLabelQualifiedExpressionVoid(@NotNull JetLabelQualifiedExpression expression, P data) { - super.visitLabelQualifiedExpression(expression, data); + public void visitExpressionWithLabelVoid(@NotNull JetExpressionWithLabel expression, P data) { + super.visitExpressionWithLabel(expression, data); } public void visitThrowExpressionVoid(@NotNull JetThrowExpression expression, P data) { @@ -658,8 +658,8 @@ public class JetVisitorVoidWithParameter

extends JetVisitor { } @Override - public final Void visitLabelQualifiedExpression(@NotNull JetLabelQualifiedExpression expression, P data) { - visitLabelQualifiedExpressionVoid(expression, data); + public final Void visitExpressionWithLabel(@NotNull JetExpressionWithLabel expression, P data) { + visitExpressionWithLabelVoid(expression, data); return null; } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java index 36c1ff0a372..6734c8db5d5 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java @@ -370,7 +370,7 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor { @NotNull // No class receivers private static LabelResolver.LabeledReceiverResolutionResult resolveToReceiver( - JetLabelQualifiedInstanceExpression expression, + JetInstanceExpressionWithLabel expression, ExpressionTypingContext context, boolean onlyClassReceivers ) { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/LabelResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/LabelResolver.java index 129d6605126..7d3c6824ca7 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/LabelResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/LabelResolver.java @@ -117,7 +117,7 @@ public class LabelResolver { @Nullable public JetElement resolveControlLabel( - @NotNull JetLabelQualifiedExpression expression, + @NotNull JetExpressionWithLabel expression, @NotNull ResolutionContext context ) { JetSimpleNameExpression labelElement = expression.getTargetLabel(); @@ -170,7 +170,7 @@ public class LabelResolver { @NotNull public LabeledReceiverResolutionResult resolveThisOrSuperLabel( - @NotNull JetLabelQualifiedInstanceExpression expression, + @NotNull JetInstanceExpressionWithLabel expression, @NotNull ResolutionContext context, @NotNull Name labelName ) { diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/LabelsHighlightingVisitor.java b/idea/src/org/jetbrains/jet/plugin/highlighter/LabelsHighlightingVisitor.java index 4551cbb91fc..11e4c093934 100644 --- a/idea/src/org/jetbrains/jet/plugin/highlighter/LabelsHighlightingVisitor.java +++ b/idea/src/org/jetbrains/jet/plugin/highlighter/LabelsHighlightingVisitor.java @@ -18,7 +18,7 @@ package org.jetbrains.jet.plugin.highlighter; import com.intellij.lang.annotation.AnnotationHolder; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.JetLabelQualifiedExpression; +import org.jetbrains.jet.lang.psi.JetExpressionWithLabel; import org.jetbrains.jet.lang.psi.JetPrefixExpression; import org.jetbrains.jet.lang.psi.JetSimpleNameExpression; import org.jetbrains.jet.lexer.JetTokens; @@ -37,7 +37,7 @@ class LabelsHighlightingVisitor extends HighlightingVisitor { } @Override - public void visitLabelQualifiedExpression(@NotNull JetLabelQualifiedExpression expression) { + public void visitExpressionWithLabel(@NotNull JetExpressionWithLabel expression) { JetSimpleNameExpression targetLabel = expression.getTargetLabel(); if (targetLabel != null) { JetPsiChecker.highlightName(holder, targetLabel, JetHighlightingColors.LABEL); diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/expression/ExpressionVisitor.java b/js/js.translator/src/org/jetbrains/k2js/translate/expression/ExpressionVisitor.java index 2228e65d517..ca125eaa479 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/expression/ExpressionVisitor.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/expression/ExpressionVisitor.java @@ -365,7 +365,7 @@ public final class ExpressionVisitor extends TranslatorVisitor { return name.charAt(0) == '@' ? name.substring(1) + '$' : name; } - private static String getTargetLabel(JetLabelQualifiedExpression expression, TranslationContext context) { + private static String getTargetLabel(JetExpressionWithLabel expression, TranslationContext context) { JetSimpleNameExpression labelElement = expression.getTargetLabel(); if (labelElement == null) { return null;