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

Removed special support for parsing annotations for multi-declaration in for

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-10-12 19:50:57 +03:00
parent 98dc8f234e
commit d84020b1f3
5 changed files with 2 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/parsing/JetExpressionParsing.java
+1 -1
View File
@@ -1342,7 +1342,7 @@ public class JetExpressionParsing extends AbstractJetParsing {
PsiBuilder.Marker parameter = mark(); PsiBuilder.Marker parameter = mark();
if (!at(IN_KEYWORD)) { if (!at(IN_KEYWORD)) {
myJetParsing.parseModifierListWithLookForStopAt(TokenSet.create(IDENTIFIER, LPAR), TokenSet.create(IN_KEYWORD, RPAR, COLON)); myJetParsing.parseModifierList(ONLY_ESCAPED_REGULAR_ANNOTATIONS, TokenSet.create(IN_KEYWORD, RPAR, COLON));
} }
if (at(VAL_KEYWORD) || at(VAR_KEYWORD)) advance(); // VAL_KEYWORD or VAR_KEYWORD if (at(VAL_KEYWORD) || at(VAR_KEYWORD)) advance(); // VAL_KEYWORD or VAR_KEYWORD
compiler/frontend/src/org/jetbrains/kotlin/parsing/JetParsing.java
-32
View File
@@ -2084,38 +2084,6 @@ public class JetParsing extends AbstractJetParsing {
return atGT; return atGT;
} }
public void parseModifierListWithLookForStopAt(TokenSet lookFor, TokenSet stopAt) {
int lastId = matchTokenStreamPredicate(new LastBefore(new AtSet(lookFor), new AnnotationTargetStop(stopAt, ANNOTATION_TARGETS), false));
createTruncatedBuilder(lastId).parseModifierList(ONLY_ESCAPED_REGULAR_ANNOTATIONS, null);
}
private class AnnotationTargetStop extends AbstractTokenStreamPredicate {
private final TokenSet stopAt;
private final TokenSet annotationTargets;
private IElementType previousToken;
private IElementType tokenBeforePrevious;
public AnnotationTargetStop(TokenSet stopAt, TokenSet annotationTargets) {
this.stopAt = stopAt;
this.annotationTargets = annotationTargets;
}
@Override
public boolean matching(boolean topLevel) {
if (atSet(stopAt)) return true;
if (at(COLON) && !(tokenBeforePrevious == AT && (previousToken == IDENTIFIER || annotationTargets.contains(previousToken)))) {
return true;
}
tokenBeforePrevious = previousToken;
previousToken = tt();
return false;
}
}
/* /*
* functionType * functionType
* : "(" (parameter | modifiers type){","}? ")" "->" type? * : "(" (parameter | modifiers type){","}? ")" "->" type?
compiler/testData/diagnostics/tests/annotations/forParameterAnnotationResolve.kt
Vendored
+1 -1
View File
@@ -10,5 +10,5 @@ fun foo() {
for (<!WRONG_ANNOTATION_TARGET!>@Ann(3)<!> (x, @Ann(4) y) in bar()) {} for (<!WRONG_ANNOTATION_TARGET!>@Ann(3)<!> (x, @Ann(4) y) in bar()) {}
for (<!UNRESOLVED_REFERENCE!>@Err<!> (x,y) in bar()) {} for (<!UNRESOLVED_REFERENCE!>@Err<!>() (x,y) in bar()) {}
} }
compiler/testData/psi/annotation/forParameters.kt
Vendored
-2
View File
@@ -11,10 +11,8 @@ fun foo() {
for (@Volatile x in 1..100) {} for (@Volatile x in 1..100) {}
for (@Volatile(1) x in 1..100) {} for (@Volatile(1) x in 1..100) {}
for (@Volatile() (x, @Volatile y) in 1..100) {} for (@Volatile() (x, @Volatile y) in 1..100) {}
for (@Volatile (x, @Volatile y) in 1..100) {}
for (@Volatile var x in 1..100) {} for (@Volatile var x in 1..100) {}
for (@Volatile val (x, @Volatile y) in 1..100) {}
for (private @Volatile var x in 1..100) {} for (private @Volatile var x in 1..100) {}
for (private @Volatile val (x, @Volatile y) in 1..100) {} for (private @Volatile val (x, @Volatile y) in 1..100) {}
compiler/testData/psi/annotation/forParameters.txt
Vendored
-100
View File
@@ -300,55 +300,6 @@ JetFile: forParameters.kt
BLOCK BLOCK
PsiElement(LBRACE)('{') PsiElement(LBRACE)('{')
PsiElement(RBRACE)('}') PsiElement(RBRACE)('}')
PsiWhiteSpace('\n ')
FOR
PsiElement(for)('for')
PsiWhiteSpace(' ')
PsiElement(LPAR)('(')
MULTI_VARIABLE_DECLARATION
MODIFIER_LIST
ANNOTATION_ENTRY
PsiElement(AT)('@')
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Volatile')
PsiWhiteSpace(' ')
PsiElement(LPAR)('(')
MULTI_VARIABLE_DECLARATION_ENTRY
PsiElement(IDENTIFIER)('x')
PsiElement(COMMA)(',')
PsiWhiteSpace(' ')
MULTI_VARIABLE_DECLARATION_ENTRY
MODIFIER_LIST
ANNOTATION_ENTRY
PsiElement(AT)('@')
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Volatile')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('y')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
PsiElement(in)('in')
PsiWhiteSpace(' ')
LOOP_RANGE
BINARY_EXPRESSION
INTEGER_CONSTANT
PsiElement(INTEGER_LITERAL)('1')
OPERATION_REFERENCE
PsiElement(RANGE)('..')
INTEGER_CONSTANT
PsiElement(INTEGER_LITERAL)('100')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
BODY
BLOCK
PsiElement(LBRACE)('{')
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n\n ') PsiWhiteSpace('\n\n ')
FOR FOR
PsiElement(for)('for') PsiElement(for)('for')
@@ -384,57 +335,6 @@ JetFile: forParameters.kt
BLOCK BLOCK
PsiElement(LBRACE)('{') PsiElement(LBRACE)('{')
PsiElement(RBRACE)('}') PsiElement(RBRACE)('}')
PsiWhiteSpace('\n ')
FOR
PsiElement(for)('for')
PsiWhiteSpace(' ')
PsiElement(LPAR)('(')
MULTI_VARIABLE_DECLARATION
MODIFIER_LIST
ANNOTATION_ENTRY
PsiElement(AT)('@')
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Volatile')
PsiWhiteSpace(' ')
PsiElement(val)('val')
PsiWhiteSpace(' ')
PsiElement(LPAR)('(')
MULTI_VARIABLE_DECLARATION_ENTRY
PsiElement(IDENTIFIER)('x')
PsiElement(COMMA)(',')
PsiWhiteSpace(' ')
MULTI_VARIABLE_DECLARATION_ENTRY
MODIFIER_LIST
ANNOTATION_ENTRY
PsiElement(AT)('@')
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Volatile')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('y')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
PsiElement(in)('in')
PsiWhiteSpace(' ')
LOOP_RANGE
BINARY_EXPRESSION
INTEGER_CONSTANT
PsiElement(INTEGER_LITERAL)('1')
OPERATION_REFERENCE
PsiElement(RANGE)('..')
INTEGER_CONSTANT
PsiElement(INTEGER_LITERAL)('100')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
BODY
BLOCK
PsiElement(LBRACE)('{')
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n\n ') PsiWhiteSpace('\n\n ')
FOR FOR
PsiElement(for)('for') PsiElement(for)('for')