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

Minor, extract methods

Browse Source
This commit is contained in:
Denis Zharkov
2015-05-12 19:59:19 +03:00
parent aa4a20dddc
commit 488464dd3b
1 changed files with 55 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/parsing/JetParsing.java
+36 -23
View File
@@ -541,26 +541,37 @@ public class JetParsing extends AbstractJetParsing {
*/ */
private boolean parseAnnotation(AnnotationParsingMode mode) { private boolean parseAnnotation(AnnotationParsingMode mode) {
if (at(LBRACKET)) { if (at(LBRACKET)) {
return parseAnnotationList(mode);
}
else if (mode.allowShortAnnotations && at(IDENTIFIER)) {
parseAnnotationEntry();
return true;
}
else if (mode.allowAtAnnotations && at(AT)) {
if (myBuilder.rawLookup(1) == IDENTIFIER) {
parseAnnotationEntry();
}
else {
errorAndAdvance("Expected annotation identifier after '@'", 1); // AT
}
return true;
}
return false;
}
private boolean parseAnnotationList(AnnotationParsingMode mode) {
PsiBuilder.Marker annotation = mark(); PsiBuilder.Marker annotation = mark();
myBuilder.disableNewlines(); myBuilder.disableNewlines();
advance(); // LBRACKET advance(); // LBRACKET
if (mode.isFileAnnotationParsingMode) { if (!parseAnnotationTargetIfNeeded(mode)) {
if (mode == FILE_ANNOTATIONS_WHEN_PACKAGE_OMITTED && !(at(FILE_KEYWORD) && lookahead(1) == COLON)) {
annotation.rollbackTo(); annotation.rollbackTo();
myBuilder.restoreNewlinesState(); myBuilder.restoreNewlinesState();
return false; return false;
} }
String message = "Expecting \"" + FILE_KEYWORD.getValue() + COLON.getValue() + "\" prefix for file annotations";
expect(FILE_KEYWORD, message);
expect(COLON, message, TokenSet.create(IDENTIFIER, RBRACKET));
}
else if (at(FILE_KEYWORD) && lookahead(1) == COLON) {
errorAndAdvance("File annotations are only allowed before package declaration", 2);
}
if (!at(IDENTIFIER)) { if (!at(IDENTIFIER)) {
error("Expecting a list of annotations"); error("Expecting a list of annotations");
} }
@@ -584,21 +595,23 @@ public class JetParsing extends AbstractJetParsing {
annotation.done(ANNOTATION); annotation.done(ANNOTATION);
return true; return true;
} }
else if (mode.allowShortAnnotations && at(IDENTIFIER)) {
parseAnnotationEntry(); // Returns true if we should continue parse annotation
return true; private boolean parseAnnotationTargetIfNeeded(AnnotationParsingMode mode) {
} if (mode.isFileAnnotationParsingMode) {
else if (mode.allowAtAnnotations && at(AT)) { if (mode == FILE_ANNOTATIONS_WHEN_PACKAGE_OMITTED && !(at(FILE_KEYWORD) && lookahead(1) == COLON)) {
if (myBuilder.rawLookup(1) == IDENTIFIER) { return false;
parseAnnotationEntry();
}
else {
errorAndAdvance("Expected annotation identifier after '@'", 1); // AT
}
return true;
} }
return false; String message = "Expecting \"" + FILE_KEYWORD.getValue() + COLON.getValue() + "\" prefix for file annotations";
expect(FILE_KEYWORD, message);
expect(COLON, message, TokenSet.create(IDENTIFIER, RBRACKET));
}
else if (at(FILE_KEYWORD) && lookahead(1) == COLON) {
errorAndAdvance("File annotations are only allowed before package declaration", 2);
}
return true;
} }
/* /*