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

Clarify grammar rules for annotations

Browse Source
This commit is contained in:
Denis Zharkov
2015-06-09 14:00:21 +03:00
parent cf4b1ab7cd
commit 9d87638a11
2 changed files with 35 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/parsing/JetParsing.java
+24 -14
View File
@@ -447,14 +447,14 @@ public class JetParsing extends AbstractJetParsing {
if (at(AT)) { if (at(AT)) {
if (!tryParseModifier(tokenConsumer)) { if (!tryParseModifier(tokenConsumer)) {
parseAnnotation(annotationParsingMode); parseAnnotationOrList(annotationParsingMode);
} }
} }
else if (tryParseModifier(tokenConsumer)) { else if (tryParseModifier(tokenConsumer)) {
// modifier advanced // modifier advanced
} }
else if (annotationParsingMode.allowShortAnnotations && at(IDENTIFIER)) { else if (annotationParsingMode.allowShortAnnotations && at(IDENTIFIER)) {
parseAnnotationEntry(annotationParsingMode); parseAnnotation(annotationParsingMode);
} }
else { else {
break; break;
@@ -513,13 +513,13 @@ public class JetParsing extends AbstractJetParsing {
/* /*
* annotations * annotations
* : annotation* * : (annotation | annotationList)*
* ; * ;
*/ */
boolean parseAnnotations(AnnotationParsingMode mode) { boolean parseAnnotations(AnnotationParsingMode mode) {
if (!parseAnnotation(mode)) return false; if (!parseAnnotationOrList(mode)) return false;
while (parseAnnotation(mode)) { while (parseAnnotationOrList(mode)) {
// do nothing // do nothing
} }
@@ -528,14 +528,20 @@ public class JetParsing extends AbstractJetParsing {
/* /*
* annotation * annotation
* : "[" ("file" ":")? annotationEntry+ "]" * : annotationPrefix? unescapedAnnotation
* : annotationEntry * ;
* : "@" annotationEntry *
* annotationList
* : annotationPrefix "[" unescapedAnnotation+ "]"
* ;
*
* annotationPrefix:
* : ("@" (":" "file")?)
* ; * ;
*/ */
private boolean parseAnnotation(AnnotationParsingMode mode) { private boolean parseAnnotationOrList(AnnotationParsingMode mode) {
if (mode.allowShortAnnotations && at(IDENTIFIER)) { if (mode.allowShortAnnotations && at(IDENTIFIER)) {
return parseAnnotationEntry(mode); return parseAnnotation(mode);
} }
else if (at(AT)) { else if (at(AT)) {
IElementType nextRawToken = myBuilder.rawLookup(1); IElementType nextRawToken = myBuilder.rawLookup(1);
@@ -553,7 +559,7 @@ public class JetParsing extends AbstractJetParsing {
} }
if (tokenToMatch == IDENTIFIER) { if (tokenToMatch == IDENTIFIER) {
return parseAnnotationEntry(mode); return parseAnnotation(mode);
} }
else if (tokenToMatch == LBRACKET) { else if (tokenToMatch == LBRACKET) {
return parseAnnotationList(mode); return parseAnnotationList(mode);
@@ -604,7 +610,7 @@ public class JetParsing extends AbstractJetParsing {
continue; continue;
} }
parseAnnotationEntry(ALLOW_UNESCAPED_REGULAR_ANNOTATIONS); parseAnnotation(ALLOW_UNESCAPED_REGULAR_ANNOTATIONS);
while (at(COMMA)) { while (at(COMMA)) {
errorAndAdvance("No commas needed to separate annotations"); errorAndAdvance("No commas needed to separate annotations");
} }
@@ -650,11 +656,15 @@ public class JetParsing extends AbstractJetParsing {
} }
/* /*
* annotationEntry * annotation
* : annotationPrefix? unescapedAnnotation
* ;
*
* unescapedAnnotation
* : SimpleName{"."} typeArguments? valueArguments? * : SimpleName{"."} typeArguments? valueArguments?
* ; * ;
*/ */
private boolean parseAnnotationEntry(AnnotationParsingMode mode) { private boolean parseAnnotation(AnnotationParsingMode mode) {
assert _at(IDENTIFIER) || assert _at(IDENTIFIER) ||
(_at(AT) && !WHITE_SPACE_OR_COMMENT_BIT_SET.contains(myBuilder.rawLookup(1))); (_at(AT) && !WHITE_SPACE_OR_COMMENT_BIT_SET.contains(myBuilder.rawLookup(1)));
grammar/src/attributes.grm
+11 -4
View File
@@ -3,14 +3,21 @@
*/ */
annotations annotations
: annotation* : (annotation | annotationList)*
; ;
annotation annotation
: "@"? "[" annotationEntry+ "]" : annotationPrefix? unescapedAnnotation
: "@"? annotationEntry
; ;
annotationEntry annotationList
: annotationPrefix "[" unescapedAnnotation+ "]"
;
annotationPrefix:
: ("@" (":" "file")?)
;
unescapedAnnotation
: SimpleName{"."} typeArguments? valueArguments? : SimpleName{"."} typeArguments? valueArguments?
; ;