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

Minor, drop constant parameters and rename method

Browse Source
This commit is contained in:
Denis Zharkov
2015-05-06 11:31:42 +03:00
parent 5ce1fc6fbb
commit 3528762e2d
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/parsing/JetParsing.java
+6 -6
View File
@@ -1179,7 +1179,7 @@ public class JetParsing extends AbstractJetParsing {
if (setter) { if (setter) {
PsiBuilder.Marker parameterList = mark(); PsiBuilder.Marker parameterList = mark();
PsiBuilder.Marker setterParameter = mark(); PsiBuilder.Marker setterParameter = mark();
parseModifierListWithShortAnnotations(MODIFIER_LIST, TokenSet.create(IDENTIFIER), TokenSet.create(RPAR, COMMA, COLON)); parseModifierListWithUnescapedAnnotations(TokenSet.create(RPAR, COMMA, COLON));
expect(IDENTIFIER, "Expecting parameter name", TokenSet.create(RPAR, COLON, LBRACE, EQ)); expect(IDENTIFIER, "Expecting parameter name", TokenSet.create(RPAR, COLON, LBRACE, EQ));
if (at(COLON)) { if (at(COLON)) {
@@ -1564,7 +1564,7 @@ public class JetParsing extends AbstractJetParsing {
PsiBuilder.Marker mark = mark(); PsiBuilder.Marker mark = mark();
parseModifierListWithShortAnnotations(MODIFIER_LIST, TokenSet.create(IDENTIFIER), TokenSet.create(COMMA, GT, COLON)); parseModifierListWithUnescapedAnnotations(TokenSet.create(COMMA, GT, COLON));
expect(IDENTIFIER, "Type parameter name expected", TokenSet.EMPTY); expect(IDENTIFIER, "Type parameter name expected", TokenSet.EMPTY);
@@ -1840,7 +1840,7 @@ public class JetParsing extends AbstractJetParsing {
// TokenSet lookFor = TokenSet.create(IDENTIFIER); // TokenSet lookFor = TokenSet.create(IDENTIFIER);
// TokenSet stopAt = TokenSet.create(COMMA, COLON, GT); // TokenSet stopAt = TokenSet.create(COMMA, COLON, GT);
// parseModifierListWithShortAnnotations(MODIFIER_LIST, lookFor, stopAt); // parseModifierListWithUnescapedAnnotations(MODIFIER_LIST, lookFor, stopAt);
// Currently we do not allow annotations // Currently we do not allow annotations
parseModifierList(ONLY_ESCAPED_REGULAR_ANNOTATIONS); parseModifierList(ONLY_ESCAPED_REGULAR_ANNOTATIONS);
@@ -1866,8 +1866,8 @@ public class JetParsing extends AbstractJetParsing {
return atGT; return atGT;
} }
private void parseModifierListWithShortAnnotations(IElementType modifierList, TokenSet lookFor, TokenSet stopAt) { private void parseModifierListWithUnescapedAnnotations(TokenSet stopAt) {
int lastId = findLastBefore(lookFor, stopAt, false); int lastId = findLastBefore(IDENTIFIER, stopAt, false);
createTruncatedBuilder(lastId).parseModifierList(ALLOW_UNESCAPED_REGULAR_ANNOTATIONS); createTruncatedBuilder(lastId).parseModifierList(ALLOW_UNESCAPED_REGULAR_ANNOTATIONS);
} }
@@ -2011,7 +2011,7 @@ public class JetParsing extends AbstractJetParsing {
private boolean parseValueParameter(boolean rollbackOnFailure, boolean typeRequired) { private boolean parseValueParameter(boolean rollbackOnFailure, boolean typeRequired) {
PsiBuilder.Marker parameter = mark(); PsiBuilder.Marker parameter = mark();
parseModifierListWithShortAnnotations(MODIFIER_LIST, TokenSet.create(IDENTIFIER), TokenSet.create(COMMA, RPAR, COLON)); parseModifierListWithUnescapedAnnotations(TokenSet.create(COMMA, RPAR, COLON));
if (at(VAR_KEYWORD) || at(VAL_KEYWORD)) { if (at(VAR_KEYWORD) || at(VAL_KEYWORD)) {
advance(); // VAR_KEYWORD | VAL_KEYWORD advance(); // VAR_KEYWORD | VAL_KEYWORD