From 3528762e2de7895badbac73f79cf67429e7fdf0f Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Wed, 6 May 2015 11:31:42 +0300 Subject: [PATCH] Minor, drop constant parameters and rename method --- .../src/org/jetbrains/kotlin/parsing/JetParsing.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/parsing/JetParsing.java b/compiler/frontend/src/org/jetbrains/kotlin/parsing/JetParsing.java index 6c4795497f8..0de8c0d14f7 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/parsing/JetParsing.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/parsing/JetParsing.java @@ -1179,7 +1179,7 @@ public class JetParsing extends AbstractJetParsing { if (setter) { PsiBuilder.Marker parameterList = 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)); if (at(COLON)) { @@ -1564,7 +1564,7 @@ public class JetParsing extends AbstractJetParsing { 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); @@ -1840,7 +1840,7 @@ public class JetParsing extends AbstractJetParsing { // TokenSet lookFor = TokenSet.create(IDENTIFIER); // TokenSet stopAt = TokenSet.create(COMMA, COLON, GT); -// parseModifierListWithShortAnnotations(MODIFIER_LIST, lookFor, stopAt); +// parseModifierListWithUnescapedAnnotations(MODIFIER_LIST, lookFor, stopAt); // Currently we do not allow annotations parseModifierList(ONLY_ESCAPED_REGULAR_ANNOTATIONS); @@ -1866,8 +1866,8 @@ public class JetParsing extends AbstractJetParsing { return atGT; } - private void parseModifierListWithShortAnnotations(IElementType modifierList, TokenSet lookFor, TokenSet stopAt) { - int lastId = findLastBefore(lookFor, stopAt, false); + private void parseModifierListWithUnescapedAnnotations(TokenSet stopAt) { + int lastId = findLastBefore(IDENTIFIER, stopAt, false); createTruncatedBuilder(lastId).parseModifierList(ALLOW_UNESCAPED_REGULAR_ANNOTATIONS); } @@ -2011,7 +2011,7 @@ public class JetParsing extends AbstractJetParsing { private boolean parseValueParameter(boolean rollbackOnFailure, boolean typeRequired) { 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)) { advance(); // VAR_KEYWORD | VAL_KEYWORD