From cab8709f1c99a1332fccd4bfea06382260060677 Mon Sep 17 00:00:00 2001 From: Svetlana Isakova Date: Fri, 16 May 2014 15:07:37 +0400 Subject: [PATCH] Rename: JetNodeTypes.LABEL_REFERENCE -> LABEL There is LABEL_REFERENCE node in LabeledExpression, but it isn't a reference there --- .../src/org/jetbrains/jet/JetNodeTypes.java | 2 +- .../jetbrains/jet/checkers/DebugInfoUtil.java | 2 +- .../lang/parsing/JetExpressionParsing.java | 2 +- .../jet/lang/psi/JetExpressionWithLabel.java | 2 +- compiler/testData/psi/ControlStructures.txt | 12 ++++----- compiler/testData/psi/Labels.txt | 26 +++++++++---------- compiler/testData/psi/SimpleExpressions.txt | 12 ++++----- compiler/testData/psi/Super.txt | 2 +- 8 files changed, 30 insertions(+), 30 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/jet/JetNodeTypes.java b/compiler/frontend/src/org/jetbrains/jet/JetNodeTypes.java index 8008bb5f6f6..22b69298078 100644 --- a/compiler/frontend/src/org/jetbrains/jet/JetNodeTypes.java +++ b/compiler/frontend/src/org/jetbrains/jet/JetNodeTypes.java @@ -117,7 +117,7 @@ public interface JetNodeTypes { JetNodeType REFERENCE_EXPRESSION = new JetNodeType("REFERENCE_EXPRESSION", JetSimpleNameExpression.class); JetNodeType OPERATION_REFERENCE = new JetNodeType("OPERATION_REFERENCE", JetSimpleNameExpression.class); - JetNodeType LABEL_REFERENCE = new JetNodeType("LABEL_REFERENCE", JetSimpleNameExpression.class); + JetNodeType LABEL = new JetNodeType("LABEL", JetSimpleNameExpression.class); JetNodeType LABEL_QUALIFIER = new JetNodeType("LABEL_QUALIFIER", JetContainerNode.class); diff --git a/compiler/frontend/src/org/jetbrains/jet/checkers/DebugInfoUtil.java b/compiler/frontend/src/org/jetbrains/jet/checkers/DebugInfoUtil.java index e714aa3e019..a8d8130474a 100644 --- a/compiler/frontend/src/org/jetbrains/jet/checkers/DebugInfoUtil.java +++ b/compiler/frontend/src/org/jetbrains/jet/checkers/DebugInfoUtil.java @@ -97,7 +97,7 @@ public class DebugInfoUtil { return; } } - if (elementType == JetNodeTypes.LABEL_REFERENCE || + if (elementType == JetNodeTypes.LABEL || nameExpression.getReferencedNameElementType() == JetTokens.THIS_KEYWORD) { return; } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java b/compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java index 659ff607f22..9e81e05b271 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java @@ -1616,7 +1616,7 @@ public class JetExpressionParsing extends AbstractJetParsing { PsiBuilder.Marker mark = mark(); advance(); // LABEL_IDENTIFIER - mark.done(LABEL_REFERENCE); + mark.done(LABEL); labelWrap.done(LABEL_QUALIFIER); } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetExpressionWithLabel.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetExpressionWithLabel.java index a8dabf711bd..544be316e56 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetExpressionWithLabel.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetExpressionWithLabel.java @@ -31,7 +31,7 @@ public class JetExpressionWithLabel extends JetExpressionImpl { public JetSimpleNameExpression getTargetLabel() { JetContainerNode qualifier = (JetContainerNode) findChildByType(JetNodeTypes.LABEL_QUALIFIER); if (qualifier == null) return null; - return (JetSimpleNameExpression) qualifier.findChildByType(JetNodeTypes.LABEL_REFERENCE); + return (JetSimpleNameExpression) qualifier.findChildByType(JetNodeTypes.LABEL); } @Nullable diff --git a/compiler/testData/psi/ControlStructures.txt b/compiler/testData/psi/ControlStructures.txt index d4618fd85f3..4c8e671566f 100644 --- a/compiler/testData/psi/ControlStructures.txt +++ b/compiler/testData/psi/ControlStructures.txt @@ -82,7 +82,7 @@ JetFile: ControlStructures.kt PsiElement(break)('break') PsiWhiteSpace(' ') LABEL_QUALIFIER - LABEL_REFERENCE + LABEL PsiElement(LABEL_IDENTIFIER)('@la') PsiElement(COMMA)(',') PsiWhiteSpace('\n ') @@ -118,7 +118,7 @@ JetFile: ControlStructures.kt PsiElement(continue)('continue') PsiWhiteSpace(' ') LABEL_QUALIFIER - LABEL_REFERENCE + LABEL PsiElement(LABEL_IDENTIFIER)('@la') PsiElement(COMMA)(',') PsiWhiteSpace('\n ') @@ -201,14 +201,14 @@ JetFile: ControlStructures.kt PsiWhiteSpace('\n ') LABELED_EXPRESSION LABEL_QUALIFIER - LABEL_REFERENCE + LABEL PsiElement(LABEL_IDENTIFIER)('@la') PsiWhiteSpace('\n ') BREAK PsiElement(break)('break') PsiWhiteSpace(' ') LABEL_QUALIFIER - LABEL_REFERENCE + LABEL PsiElement(LABEL_IDENTIFIER)('@la') PsiWhiteSpace('\n ') CONTINUE @@ -216,14 +216,14 @@ JetFile: ControlStructures.kt PsiWhiteSpace('\n ') LABELED_EXPRESSION LABEL_QUALIFIER - LABEL_REFERENCE + LABEL PsiElement(LABEL_IDENTIFIER)('@la') PsiWhiteSpace('\n ') CONTINUE PsiElement(continue)('continue') PsiWhiteSpace(' ') LABEL_QUALIFIER - LABEL_REFERENCE + LABEL PsiElement(LABEL_IDENTIFIER)('@la') PsiWhiteSpace('\n ') IF diff --git a/compiler/testData/psi/Labels.txt b/compiler/testData/psi/Labels.txt index 0e94f02fad5..fd1bc2b6d37 100644 --- a/compiler/testData/psi/Labels.txt +++ b/compiler/testData/psi/Labels.txt @@ -28,7 +28,7 @@ JetFile: Labels.kt PsiElement(LPAR)('(') LABELED_EXPRESSION LABEL_QUALIFIER - LABEL_REFERENCE + LABEL PsiElement(LABEL_IDENTIFIER)('@a') PsiWhiteSpace(' ') INTEGER_CONSTANT @@ -78,13 +78,13 @@ JetFile: Labels.kt RETURN PsiElement(return)('return') LABEL_QUALIFIER - LABEL_REFERENCE + LABEL PsiElement(LABEL_IDENTIFIER)('@a') PsiWhiteSpace('\n ') RETURN PsiElement(return)('return') LABEL_QUALIFIER - LABEL_REFERENCE + LABEL PsiElement(LABEL_IDENTIFIER)('@a') PsiWhiteSpace(' ') INTEGER_CONSTANT @@ -93,14 +93,14 @@ JetFile: Labels.kt RETURN PsiElement(return)('return') LABEL_QUALIFIER - LABEL_REFERENCE + LABEL PsiElement(LABEL_IDENTIFIER)('@a') PsiWhiteSpace(' ') PARENTHESIZED PsiElement(LPAR)('(') LABELED_EXPRESSION LABEL_QUALIFIER - LABEL_REFERENCE + LABEL PsiElement(LABEL_IDENTIFIER)('@a') PsiWhiteSpace(' ') INTEGER_CONSTANT @@ -110,12 +110,12 @@ JetFile: Labels.kt RETURN PsiElement(return)('return') LABEL_QUALIFIER - LABEL_REFERENCE + LABEL PsiElement(LABEL_IDENTIFIER)('@a') PsiWhiteSpace(' ') LABELED_EXPRESSION LABEL_QUALIFIER - LABEL_REFERENCE + LABEL PsiElement(LABEL_IDENTIFIER)('@a') PsiWhiteSpace(' ') INTEGER_CONSTANT @@ -151,7 +151,7 @@ JetFile: Labels.kt BREAK PsiElement(break)('break') LABEL_QUALIFIER - LABEL_REFERENCE + LABEL PsiElement(LABEL_IDENTIFIER)('@a') PsiWhiteSpace('\n\n ') CONTINUE @@ -165,7 +165,7 @@ JetFile: Labels.kt CONTINUE PsiElement(continue)('continue') LABEL_QUALIFIER - LABEL_REFERENCE + LABEL PsiElement(LABEL_IDENTIFIER)('@a') PsiWhiteSpace('\n\n ') DOT_QUALIFIED_EXPRESSION @@ -178,7 +178,7 @@ JetFile: Labels.kt PsiWhiteSpace(' ') LABELED_EXPRESSION LABEL_QUALIFIER - LABEL_REFERENCE + LABEL PsiElement(LABEL_IDENTIFIER)('@f') FUNCTION_LITERAL_EXPRESSION FUNCTION_LITERAL @@ -201,7 +201,7 @@ JetFile: Labels.kt RETURN PsiElement(return)('return') LABEL_QUALIFIER - LABEL_REFERENCE + LABEL PsiElement(LABEL_IDENTIFIER)('@f') PsiWhiteSpace(' ') BOOLEAN_CONSTANT @@ -262,7 +262,7 @@ JetFile: Labels.kt REFERENCE_EXPRESSION PsiElement(this)('this') LABEL_QUALIFIER - LABEL_REFERENCE + LABEL PsiElement(LABEL_IDENTIFIER)('@a') PsiWhiteSpace('\n\n ') SUPER_EXPRESSION @@ -297,7 +297,7 @@ JetFile: Labels.kt PsiElement(IDENTIFIER)('A') PsiElement(GT)('>') LABEL_QUALIFIER - LABEL_REFERENCE + LABEL PsiElement(LABEL_IDENTIFIER)('@a') PsiWhiteSpace('\n') PsiElement(RBRACE)('}') \ No newline at end of file diff --git a/compiler/testData/psi/SimpleExpressions.txt b/compiler/testData/psi/SimpleExpressions.txt index 02049a00e37..a464a2d6d62 100644 --- a/compiler/testData/psi/SimpleExpressions.txt +++ b/compiler/testData/psi/SimpleExpressions.txt @@ -558,7 +558,7 @@ JetFile: SimpleExpressions.kt PsiElement(break)('break') PsiWhiteSpace(' ') LABEL_QUALIFIER - LABEL_REFERENCE + LABEL PsiElement(LABEL_IDENTIFIER)('@la') PsiElement(COMMA)(',') PsiWhiteSpace('\n ') @@ -594,7 +594,7 @@ JetFile: SimpleExpressions.kt PsiElement(continue)('continue') PsiWhiteSpace(' ') LABEL_QUALIFIER - LABEL_REFERENCE + LABEL PsiElement(LABEL_IDENTIFIER)('@la') PsiElement(COMMA)(',') PsiWhiteSpace('\n ') @@ -703,14 +703,14 @@ JetFile: SimpleExpressions.kt PsiWhiteSpace('\n ') LABELED_EXPRESSION LABEL_QUALIFIER - LABEL_REFERENCE + LABEL PsiElement(LABEL_IDENTIFIER)('@la') PsiWhiteSpace('\n ') BREAK PsiElement(break)('break') PsiWhiteSpace(' ') LABEL_QUALIFIER - LABEL_REFERENCE + LABEL PsiElement(LABEL_IDENTIFIER)('@la') PsiWhiteSpace('\n ') CONTINUE @@ -718,14 +718,14 @@ JetFile: SimpleExpressions.kt PsiWhiteSpace('\n ') LABELED_EXPRESSION LABEL_QUALIFIER - LABEL_REFERENCE + LABEL PsiElement(LABEL_IDENTIFIER)('@la') PsiWhiteSpace('\n ') CONTINUE PsiElement(continue)('continue') PsiWhiteSpace(' ') LABEL_QUALIFIER - LABEL_REFERENCE + LABEL PsiElement(LABEL_IDENTIFIER)('@la') PsiWhiteSpace('\n') PsiElement(RBRACE)('}') \ No newline at end of file diff --git a/compiler/testData/psi/Super.txt b/compiler/testData/psi/Super.txt index f66cee6d7ee..db9dab7aab0 100644 --- a/compiler/testData/psi/Super.txt +++ b/compiler/testData/psi/Super.txt @@ -75,7 +75,7 @@ JetFile: Super.kt PsiElement(IDENTIFIER)('Int') PsiElement(GT)('>') LABEL_QUALIFIER - LABEL_REFERENCE + LABEL PsiElement(LABEL_IDENTIFIER)('@label') PsiElement(DOT)('.') CALL_EXPRESSION