azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename: JetNodeTypes.LABEL_REFERENCE -> LABEL

Browse Source 
There is LABEL_REFERENCE node in LabeledExpression, but it isn't a reference there
This commit is contained in:
Svetlana Isakova
2014-05-16 15:07:37 +04:00
parent e0f37bbef0
commit cab8709f1c
8 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/JetNodeTypes.java
+1 -1
View File
@@ -117,7 +117,7 @@ public interface JetNodeTypes {
JetNodeType REFERENCE_EXPRESSION = new JetNodeType("REFERENCE_EXPRESSION", JetSimpleNameExpression.class); JetNodeType REFERENCE_EXPRESSION = new JetNodeType("REFERENCE_EXPRESSION", JetSimpleNameExpression.class);
JetNodeType OPERATION_REFERENCE = new JetNodeType("OPERATION_REFERENCE", 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); JetNodeType LABEL_QUALIFIER = new JetNodeType("LABEL_QUALIFIER", JetContainerNode.class);
compiler/frontend/src/org/jetbrains/jet/checkers/DebugInfoUtil.java
+1 -1
View File
@@ -97,7 +97,7 @@ public class DebugInfoUtil {
return; return;
} }
} }
if (elementType == JetNodeTypes.LABEL_REFERENCE || if (elementType == JetNodeTypes.LABEL ||
nameExpression.getReferencedNameElementType() == JetTokens.THIS_KEYWORD) { nameExpression.getReferencedNameElementType() == JetTokens.THIS_KEYWORD) {
return; return;
} }
compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java
+1 -1
View File
@@ -1616,7 +1616,7 @@ public class JetExpressionParsing extends AbstractJetParsing {
PsiBuilder.Marker mark = mark(); PsiBuilder.Marker mark = mark();
advance(); // LABEL_IDENTIFIER advance(); // LABEL_IDENTIFIER
mark.done(LABEL_REFERENCE); mark.done(LABEL);
labelWrap.done(LABEL_QUALIFIER); labelWrap.done(LABEL_QUALIFIER);
} }
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetExpressionWithLabel.java
+1 -1
View File
@@ -31,7 +31,7 @@ public class JetExpressionWithLabel extends JetExpressionImpl {
public JetSimpleNameExpression getTargetLabel() { public JetSimpleNameExpression getTargetLabel() {
JetContainerNode qualifier = (JetContainerNode) findChildByType(JetNodeTypes.LABEL_QUALIFIER); JetContainerNode qualifier = (JetContainerNode) findChildByType(JetNodeTypes.LABEL_QUALIFIER);
if (qualifier == null) return null; if (qualifier == null) return null;
return (JetSimpleNameExpression) qualifier.findChildByType(JetNodeTypes.LABEL_REFERENCE); return (JetSimpleNameExpression) qualifier.findChildByType(JetNodeTypes.LABEL);
} }
@Nullable @Nullable
compiler/testData/psi/ControlStructures.txt
+6 -6
View File
@@ -82,7 +82,7 @@ JetFile: ControlStructures.kt
PsiElement(break)('break') PsiElement(break)('break')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
LABEL_QUALIFIER LABEL_QUALIFIER
LABEL_REFERENCE LABEL
PsiElement(LABEL_IDENTIFIER)('@la') PsiElement(LABEL_IDENTIFIER)('@la')
PsiElement(COMMA)(',') PsiElement(COMMA)(',')
PsiWhiteSpace('\n ') PsiWhiteSpace('\n ')
@@ -118,7 +118,7 @@ JetFile: ControlStructures.kt
PsiElement(continue)('continue') PsiElement(continue)('continue')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
LABEL_QUALIFIER LABEL_QUALIFIER
LABEL_REFERENCE LABEL
PsiElement(LABEL_IDENTIFIER)('@la') PsiElement(LABEL_IDENTIFIER)('@la')
PsiElement(COMMA)(',') PsiElement(COMMA)(',')
PsiWhiteSpace('\n ') PsiWhiteSpace('\n ')
@@ -201,14 +201,14 @@ JetFile: ControlStructures.kt
PsiWhiteSpace('\n ') PsiWhiteSpace('\n ')
LABELED_EXPRESSION LABELED_EXPRESSION
LABEL_QUALIFIER LABEL_QUALIFIER
LABEL_REFERENCE LABEL
PsiElement(LABEL_IDENTIFIER)('@la') PsiElement(LABEL_IDENTIFIER)('@la')
PsiWhiteSpace('\n ') PsiWhiteSpace('\n ')
BREAK BREAK
PsiElement(break)('break') PsiElement(break)('break')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
LABEL_QUALIFIER LABEL_QUALIFIER
LABEL_REFERENCE LABEL
PsiElement(LABEL_IDENTIFIER)('@la') PsiElement(LABEL_IDENTIFIER)('@la')
PsiWhiteSpace('\n ') PsiWhiteSpace('\n ')
CONTINUE CONTINUE
@@ -216,14 +216,14 @@ JetFile: ControlStructures.kt
PsiWhiteSpace('\n ') PsiWhiteSpace('\n ')
LABELED_EXPRESSION LABELED_EXPRESSION
LABEL_QUALIFIER LABEL_QUALIFIER
LABEL_REFERENCE LABEL
PsiElement(LABEL_IDENTIFIER)('@la') PsiElement(LABEL_IDENTIFIER)('@la')
PsiWhiteSpace('\n ') PsiWhiteSpace('\n ')
CONTINUE CONTINUE
PsiElement(continue)('continue') PsiElement(continue)('continue')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
LABEL_QUALIFIER LABEL_QUALIFIER
LABEL_REFERENCE LABEL
PsiElement(LABEL_IDENTIFIER)('@la') PsiElement(LABEL_IDENTIFIER)('@la')
PsiWhiteSpace('\n ') PsiWhiteSpace('\n ')
IF IF
compiler/testData/psi/Labels.txt
+13 -13
View File
@@ -28,7 +28,7 @@ JetFile: Labels.kt
PsiElement(LPAR)('(') PsiElement(LPAR)('(')
LABELED_EXPRESSION LABELED_EXPRESSION
LABEL_QUALIFIER LABEL_QUALIFIER
LABEL_REFERENCE LABEL
PsiElement(LABEL_IDENTIFIER)('@a') PsiElement(LABEL_IDENTIFIER)('@a')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
INTEGER_CONSTANT INTEGER_CONSTANT
@@ -78,13 +78,13 @@ JetFile: Labels.kt
RETURN RETURN
PsiElement(return)('return') PsiElement(return)('return')
LABEL_QUALIFIER LABEL_QUALIFIER
LABEL_REFERENCE LABEL
PsiElement(LABEL_IDENTIFIER)('@a') PsiElement(LABEL_IDENTIFIER)('@a')
PsiWhiteSpace('\n ') PsiWhiteSpace('\n ')
RETURN RETURN
PsiElement(return)('return') PsiElement(return)('return')
LABEL_QUALIFIER LABEL_QUALIFIER
LABEL_REFERENCE LABEL
PsiElement(LABEL_IDENTIFIER)('@a') PsiElement(LABEL_IDENTIFIER)('@a')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
INTEGER_CONSTANT INTEGER_CONSTANT
@@ -93,14 +93,14 @@ JetFile: Labels.kt
RETURN RETURN
PsiElement(return)('return') PsiElement(return)('return')
LABEL_QUALIFIER LABEL_QUALIFIER
LABEL_REFERENCE LABEL
PsiElement(LABEL_IDENTIFIER)('@a') PsiElement(LABEL_IDENTIFIER)('@a')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
PARENTHESIZED PARENTHESIZED
PsiElement(LPAR)('(') PsiElement(LPAR)('(')
LABELED_EXPRESSION LABELED_EXPRESSION
LABEL_QUALIFIER LABEL_QUALIFIER
LABEL_REFERENCE LABEL
PsiElement(LABEL_IDENTIFIER)('@a') PsiElement(LABEL_IDENTIFIER)('@a')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
INTEGER_CONSTANT INTEGER_CONSTANT
@@ -110,12 +110,12 @@ JetFile: Labels.kt
RETURN RETURN
PsiElement(return)('return') PsiElement(return)('return')
LABEL_QUALIFIER LABEL_QUALIFIER
LABEL_REFERENCE LABEL
PsiElement(LABEL_IDENTIFIER)('@a') PsiElement(LABEL_IDENTIFIER)('@a')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
LABELED_EXPRESSION LABELED_EXPRESSION
LABEL_QUALIFIER LABEL_QUALIFIER
LABEL_REFERENCE LABEL
PsiElement(LABEL_IDENTIFIER)('@a') PsiElement(LABEL_IDENTIFIER)('@a')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
INTEGER_CONSTANT INTEGER_CONSTANT
@@ -151,7 +151,7 @@ JetFile: Labels.kt
BREAK BREAK
PsiElement(break)('break') PsiElement(break)('break')
LABEL_QUALIFIER LABEL_QUALIFIER
LABEL_REFERENCE LABEL
PsiElement(LABEL_IDENTIFIER)('@a') PsiElement(LABEL_IDENTIFIER)('@a')
PsiWhiteSpace('\n\n ') PsiWhiteSpace('\n\n ')
CONTINUE CONTINUE
@@ -165,7 +165,7 @@ JetFile: Labels.kt
CONTINUE CONTINUE
PsiElement(continue)('continue') PsiElement(continue)('continue')
LABEL_QUALIFIER LABEL_QUALIFIER
LABEL_REFERENCE LABEL
PsiElement(LABEL_IDENTIFIER)('@a') PsiElement(LABEL_IDENTIFIER)('@a')
PsiWhiteSpace('\n\n ') PsiWhiteSpace('\n\n ')
DOT_QUALIFIED_EXPRESSION DOT_QUALIFIED_EXPRESSION
@@ -178,7 +178,7 @@ JetFile: Labels.kt
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
LABELED_EXPRESSION LABELED_EXPRESSION
LABEL_QUALIFIER LABEL_QUALIFIER
LABEL_REFERENCE LABEL
PsiElement(LABEL_IDENTIFIER)('@f') PsiElement(LABEL_IDENTIFIER)('@f')
FUNCTION_LITERAL_EXPRESSION FUNCTION_LITERAL_EXPRESSION
FUNCTION_LITERAL FUNCTION_LITERAL
@@ -201,7 +201,7 @@ JetFile: Labels.kt
RETURN RETURN
PsiElement(return)('return') PsiElement(return)('return')
LABEL_QUALIFIER LABEL_QUALIFIER
LABEL_REFERENCE LABEL
PsiElement(LABEL_IDENTIFIER)('@f') PsiElement(LABEL_IDENTIFIER)('@f')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
BOOLEAN_CONSTANT BOOLEAN_CONSTANT
@@ -262,7 +262,7 @@ JetFile: Labels.kt
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
PsiElement(this)('this') PsiElement(this)('this')
LABEL_QUALIFIER LABEL_QUALIFIER
LABEL_REFERENCE LABEL
PsiElement(LABEL_IDENTIFIER)('@a') PsiElement(LABEL_IDENTIFIER)('@a')
PsiWhiteSpace('\n\n ') PsiWhiteSpace('\n\n ')
SUPER_EXPRESSION SUPER_EXPRESSION
@@ -297,7 +297,7 @@ JetFile: Labels.kt
PsiElement(IDENTIFIER)('A') PsiElement(IDENTIFIER)('A')
PsiElement(GT)('>') PsiElement(GT)('>')
LABEL_QUALIFIER LABEL_QUALIFIER
LABEL_REFERENCE LABEL
PsiElement(LABEL_IDENTIFIER)('@a') PsiElement(LABEL_IDENTIFIER)('@a')
PsiWhiteSpace('\n') PsiWhiteSpace('\n')
PsiElement(RBRACE)('}') PsiElement(RBRACE)('}')
compiler/testData/psi/SimpleExpressions.txt
+6 -6
View File
@@ -558,7 +558,7 @@ JetFile: SimpleExpressions.kt
PsiElement(break)('break') PsiElement(break)('break')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
LABEL_QUALIFIER LABEL_QUALIFIER
LABEL_REFERENCE LABEL
PsiElement(LABEL_IDENTIFIER)('@la') PsiElement(LABEL_IDENTIFIER)('@la')
PsiElement(COMMA)(',') PsiElement(COMMA)(',')
PsiWhiteSpace('\n ') PsiWhiteSpace('\n ')
@@ -594,7 +594,7 @@ JetFile: SimpleExpressions.kt
PsiElement(continue)('continue') PsiElement(continue)('continue')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
LABEL_QUALIFIER LABEL_QUALIFIER
LABEL_REFERENCE LABEL
PsiElement(LABEL_IDENTIFIER)('@la') PsiElement(LABEL_IDENTIFIER)('@la')
PsiElement(COMMA)(',') PsiElement(COMMA)(',')
PsiWhiteSpace('\n ') PsiWhiteSpace('\n ')
@@ -703,14 +703,14 @@ JetFile: SimpleExpressions.kt
PsiWhiteSpace('\n ') PsiWhiteSpace('\n ')
LABELED_EXPRESSION LABELED_EXPRESSION
LABEL_QUALIFIER LABEL_QUALIFIER
LABEL_REFERENCE LABEL
PsiElement(LABEL_IDENTIFIER)('@la') PsiElement(LABEL_IDENTIFIER)('@la')
PsiWhiteSpace('\n ') PsiWhiteSpace('\n ')
BREAK BREAK
PsiElement(break)('break') PsiElement(break)('break')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
LABEL_QUALIFIER LABEL_QUALIFIER
LABEL_REFERENCE LABEL
PsiElement(LABEL_IDENTIFIER)('@la') PsiElement(LABEL_IDENTIFIER)('@la')
PsiWhiteSpace('\n ') PsiWhiteSpace('\n ')
CONTINUE CONTINUE
@@ -718,14 +718,14 @@ JetFile: SimpleExpressions.kt
PsiWhiteSpace('\n ') PsiWhiteSpace('\n ')
LABELED_EXPRESSION LABELED_EXPRESSION
LABEL_QUALIFIER LABEL_QUALIFIER
LABEL_REFERENCE LABEL
PsiElement(LABEL_IDENTIFIER)('@la') PsiElement(LABEL_IDENTIFIER)('@la')
PsiWhiteSpace('\n ') PsiWhiteSpace('\n ')
CONTINUE CONTINUE
PsiElement(continue)('continue') PsiElement(continue)('continue')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
LABEL_QUALIFIER LABEL_QUALIFIER
LABEL_REFERENCE LABEL
PsiElement(LABEL_IDENTIFIER)('@la') PsiElement(LABEL_IDENTIFIER)('@la')
PsiWhiteSpace('\n') PsiWhiteSpace('\n')
PsiElement(RBRACE)('}') PsiElement(RBRACE)('}')
compiler/testData/psi/Super.txt
+1 -1
View File
@@ -75,7 +75,7 @@ JetFile: Super.kt
PsiElement(IDENTIFIER)('Int') PsiElement(IDENTIFIER)('Int')
PsiElement(GT)('>') PsiElement(GT)('>')
LABEL_QUALIFIER LABEL_QUALIFIER
LABEL_REFERENCE LABEL
PsiElement(LABEL_IDENTIFIER)('@label') PsiElement(LABEL_IDENTIFIER)('@label')
PsiElement(DOT)('.') PsiElement(DOT)('.')
CALL_EXPRESSION CALL_EXPRESSION