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 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);
compiler/frontend/src/org/jetbrains/jet/checkers/DebugInfoUtil.java
+1 -1
View File
@@ -97,7 +97,7 @@ public class DebugInfoUtil {
return;
}
}
if (elementType == JetNodeTypes.LABEL_REFERENCE ||
if (elementType == JetNodeTypes.LABEL ||
nameExpression.getReferencedNameElementType() == JetTokens.THIS_KEYWORD) {
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();
advance(); // LABEL_IDENTIFIER
mark.done(LABEL_REFERENCE);
mark.done(LABEL);
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() {
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