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

Renames

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-10-13 17:23:11 +03:00
parent 292ea7625c
commit 26768ad34b
2 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/parsing/JetExpressionParsing.java
+6 -6
View File
@@ -33,7 +33,7 @@ import java.util.Set;
import static org.jetbrains.kotlin.JetNodeTypes.*; import static org.jetbrains.kotlin.JetNodeTypes.*;
import static org.jetbrains.kotlin.lexer.JetTokens.*; import static org.jetbrains.kotlin.lexer.JetTokens.*;
import static org.jetbrains.kotlin.parsing.JetParsing.AnnotationParsingMode.ONLY_ESCAPED_REGULAR_ANNOTATIONS; import static org.jetbrains.kotlin.parsing.JetParsing.AnnotationParsingMode.DEFAULT;
import static org.jetbrains.kotlin.parsing.JetParsing.DeclarationParsingMode.LOCAL; import static org.jetbrains.kotlin.parsing.JetParsing.DeclarationParsingMode.LOCAL;
public class JetExpressionParsing extends AbstractJetParsing { public class JetExpressionParsing extends AbstractJetParsing {
@@ -339,7 +339,7 @@ public class JetExpressionParsing extends AbstractJetParsing {
if (at(AT)) { if (at(AT)) {
if (!parseLocalDeclaration()) { if (!parseLocalDeclaration()) {
PsiBuilder.Marker expression = mark(); PsiBuilder.Marker expression = mark();
myJetParsing.parseAnnotations(ONLY_ESCAPED_REGULAR_ANNOTATIONS); myJetParsing.parseAnnotations(DEFAULT);
parsePrefixExpression(); parsePrefixExpression();
expression.done(ANNOTATED_EXPRESSION); expression.done(ANNOTATED_EXPRESSION);
} }
@@ -561,7 +561,7 @@ public class JetExpressionParsing extends AbstractJetParsing {
private boolean parseAnnotatedLambda(boolean preferBlock) { private boolean parseAnnotatedLambda(boolean preferBlock) {
PsiBuilder.Marker annotated = mark(); PsiBuilder.Marker annotated = mark();
boolean wereAnnotations = myJetParsing.parseAnnotations(ONLY_ESCAPED_REGULAR_ANNOTATIONS); boolean wereAnnotations = myJetParsing.parseAnnotations(DEFAULT);
PsiBuilder.Marker labeled = mark(); PsiBuilder.Marker labeled = mark();
boolean wasLabel = isAtLabelDefinitionOrMissingIdentifier(); boolean wasLabel = isAtLabelDefinitionOrMissingIdentifier();
@@ -846,7 +846,7 @@ public class JetExpressionParsing extends AbstractJetParsing {
advanceAt(LPAR); advanceAt(LPAR);
PsiBuilder.Marker property = mark(); PsiBuilder.Marker property = mark();
myJetParsing.parseModifierList(ONLY_ESCAPED_REGULAR_ANNOTATIONS, TokenSet.create(EQ, RPAR)); myJetParsing.parseModifierList(DEFAULT, TokenSet.create(EQ, RPAR));
if (at(VAL_KEYWORD) || at(VAR_KEYWORD)) { if (at(VAL_KEYWORD) || at(VAR_KEYWORD)) {
myJetParsing.parseProperty(true); myJetParsing.parseProperty(true);
property.done(PROPERTY); property.done(PROPERTY);
@@ -1034,7 +1034,7 @@ public class JetExpressionParsing extends AbstractJetParsing {
private boolean parseLocalDeclaration() { private boolean parseLocalDeclaration() {
PsiBuilder.Marker decl = mark(); PsiBuilder.Marker decl = mark();
JetParsing.ModifierDetector detector = new JetParsing.ModifierDetector(); JetParsing.ModifierDetector detector = new JetParsing.ModifierDetector();
myJetParsing.parseModifierList(detector, ONLY_ESCAPED_REGULAR_ANNOTATIONS, TokenSet.EMPTY); myJetParsing.parseModifierList(detector, DEFAULT, TokenSet.EMPTY);
IElementType declType = parseLocalDeclarationRest(detector.isEnumDetected()); IElementType declType = parseLocalDeclarationRest(detector.isEnumDetected());
@@ -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.parseModifierList(ONLY_ESCAPED_REGULAR_ANNOTATIONS, TokenSet.create(IN_KEYWORD, RPAR, COLON)); myJetParsing.parseModifierList(DEFAULT, 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
+17 -17
View File
@@ -196,7 +196,7 @@ public class JetParsing extends AbstractJetParsing {
* ; * ;
*/ */
PsiBuilder.Marker packageDirective = mark(); PsiBuilder.Marker packageDirective = mark();
parseModifierList(ONLY_ESCAPED_REGULAR_ANNOTATIONS, TokenSet.EMPTY); parseModifierList(DEFAULT, TokenSet.EMPTY);
if (at(PACKAGE_KEYWORD)) { if (at(PACKAGE_KEYWORD)) {
advance(); // PACKAGE_KEYWORD advance(); // PACKAGE_KEYWORD
@@ -391,7 +391,7 @@ public class JetParsing extends AbstractJetParsing {
PsiBuilder.Marker decl = mark(); PsiBuilder.Marker decl = mark();
ModifierDetector detector = new ModifierDetector(); ModifierDetector detector = new ModifierDetector();
parseModifierList(detector, ONLY_ESCAPED_REGULAR_ANNOTATIONS, TokenSet.EMPTY); parseModifierList(detector, DEFAULT, TokenSet.EMPTY);
IElementType keywordToken = tt(); IElementType keywordToken = tt();
IElementType declType = null; IElementType declType = null;
@@ -619,7 +619,7 @@ public class JetParsing extends AbstractJetParsing {
continue; continue;
} }
parseAnnotation(ALLOW_UNESCAPED_REGULAR_ANNOTATIONS); parseAnnotation(IN_ANNOTATION_LIST);
while (at(COMMA)) { while (at(COMMA)) {
errorAndAdvance("No commas needed to separate annotations"); errorAndAdvance("No commas needed to separate annotations");
} }
@@ -805,7 +805,7 @@ public class JetParsing extends AbstractJetParsing {
PsiBuilder.Marker beforeConstructorModifiers = mark(); PsiBuilder.Marker beforeConstructorModifiers = mark();
PsiBuilder.Marker primaryConstructorMarker = mark(); PsiBuilder.Marker primaryConstructorMarker = mark();
boolean hasConstructorModifiers = parseModifierList(ONLY_ESCAPED_REGULAR_ANNOTATIONS, TokenSet.EMPTY); boolean hasConstructorModifiers = parseModifierList(DEFAULT, TokenSet.EMPTY);
// Some modifiers found, but no parentheses following: class has already ended, and we are looking at something else // Some modifiers found, but no parentheses following: class has already ended, and we are looking at something else
if (hasConstructorModifiers && !atSet(LPAR, LBRACE, COLON, CONSTRUCTOR_KEYWORD)) { if (hasConstructorModifiers && !atSet(LPAR, LBRACE, COLON, CONSTRUCTOR_KEYWORD)) {
@@ -944,7 +944,7 @@ public class JetParsing extends AbstractJetParsing {
private ParseEnumEntryResult parseEnumEntry() { private ParseEnumEntryResult parseEnumEntry() {
PsiBuilder.Marker entry = mark(); PsiBuilder.Marker entry = mark();
parseModifierList(ONLY_ESCAPED_REGULAR_ANNOTATIONS, TokenSet.create(COMMA, COLON, SEMICOLON, RBRACE)); parseModifierList(DEFAULT, TokenSet.create(COMMA, COLON, SEMICOLON, RBRACE));
if (!atSet(SOFT_KEYWORDS_AT_MEMBER_START) && at(IDENTIFIER)) { if (!atSet(SOFT_KEYWORDS_AT_MEMBER_START) && at(IDENTIFIER)) {
PsiBuilder.Marker nameAsDeclaration = mark(); PsiBuilder.Marker nameAsDeclaration = mark();
@@ -1051,7 +1051,7 @@ public class JetParsing extends AbstractJetParsing {
PsiBuilder.Marker decl = mark(); PsiBuilder.Marker decl = mark();
ModifierDetector detector = new ModifierDetector(); ModifierDetector detector = new ModifierDetector();
parseModifierList(detector, ONLY_ESCAPED_REGULAR_ANNOTATIONS, TokenSet.EMPTY); parseModifierList(detector, DEFAULT, TokenSet.EMPTY);
IElementType declType = parseMemberDeclarationRest(detector.isEnumDetected(), detector.isDefaultDetected()); IElementType declType = parseMemberDeclarationRest(detector.isEnumDetected(), detector.isDefaultDetected());
@@ -1327,7 +1327,7 @@ public class JetParsing extends AbstractJetParsing {
} }
PsiBuilder.Marker property = mark(); PsiBuilder.Marker property = mark();
parseModifierList(ONLY_ESCAPED_REGULAR_ANNOTATIONS, TokenSet.create(COMMA, RPAR, COLON, IN_KEYWORD, EQ)); parseModifierList(DEFAULT, TokenSet.create(COMMA, RPAR, COLON, IN_KEYWORD, EQ));
expect(IDENTIFIER, "Expecting a name", recoverySet); expect(IDENTIFIER, "Expecting a name", recoverySet);
@@ -1359,7 +1359,7 @@ public class JetParsing extends AbstractJetParsing {
private boolean parsePropertyGetterOrSetter() { private boolean parsePropertyGetterOrSetter() {
PsiBuilder.Marker getterOrSetter = mark(); PsiBuilder.Marker getterOrSetter = mark();
parseModifierList(ONLY_ESCAPED_REGULAR_ANNOTATIONS, TokenSet.EMPTY); parseModifierList(DEFAULT, TokenSet.EMPTY);
if (!at(GET_KEYWORD) && !at(SET_KEYWORD)) { if (!at(GET_KEYWORD) && !at(SET_KEYWORD)) {
getterOrSetter.rollbackTo(); getterOrSetter.rollbackTo();
@@ -1386,7 +1386,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();
parseModifierList(ONLY_ESCAPED_REGULAR_ANNOTATIONS, TokenSet.create(COMMA, COLON, RPAR)); parseModifierList(DEFAULT, TokenSet.create(COMMA, COLON, RPAR));
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)) {
@@ -1493,7 +1493,7 @@ public class JetParsing extends AbstractJetParsing {
*/ */
private boolean parseReceiverType(String title, TokenSet nameFollow) { private boolean parseReceiverType(String title, TokenSet nameFollow) {
PsiBuilder.Marker annotations = mark(); PsiBuilder.Marker annotations = mark();
boolean annotationsPresent = parseAnnotations(ONLY_ESCAPED_REGULAR_ANNOTATIONS); boolean annotationsPresent = parseAnnotations(DEFAULT);
int lastDot = lastDotAfterReceiver(); int lastDot = lastDotAfterReceiver();
boolean receiverPresent = lastDot != -1; boolean receiverPresent = lastDot != -1;
if (annotationsPresent) { if (annotationsPresent) {
@@ -1742,7 +1742,7 @@ public class JetParsing extends AbstractJetParsing {
private void parseTypeConstraint() { private void parseTypeConstraint() {
PsiBuilder.Marker constraint = mark(); PsiBuilder.Marker constraint = mark();
parseAnnotations(ONLY_ESCAPED_REGULAR_ANNOTATIONS); parseAnnotations(DEFAULT);
PsiBuilder.Marker reference = mark(); PsiBuilder.Marker reference = mark();
if (expect(IDENTIFIER, "Expecting type parameter name", TokenSet.orSet(TokenSet.create(COLON, COMMA, LBRACE, RBRACE), TYPE_REF_FIRST))) { if (expect(IDENTIFIER, "Expecting type parameter name", TokenSet.orSet(TokenSet.create(COLON, COMMA, LBRACE, RBRACE), TYPE_REF_FIRST))) {
@@ -1772,7 +1772,7 @@ public class JetParsing extends AbstractJetParsing {
PsiBuilder.Marker mark = mark(); PsiBuilder.Marker mark = mark();
parseModifierList(ONLY_ESCAPED_REGULAR_ANNOTATIONS, TokenSet.create(GT, COMMA, COLON)); parseModifierList(DEFAULT, TokenSet.create(GT, COMMA, COLON));
expect(IDENTIFIER, "Type parameter name expected", TokenSet.EMPTY); expect(IDENTIFIER, "Type parameter name expected", TokenSet.EMPTY);
@@ -1813,7 +1813,7 @@ public class JetParsing extends AbstractJetParsing {
// on expression-indicating symbols or not // on expression-indicating symbols or not
private PsiBuilder.Marker parseTypeRefContents(TokenSet extraRecoverySet) { private PsiBuilder.Marker parseTypeRefContents(TokenSet extraRecoverySet) {
PsiBuilder.Marker typeRefMarker = mark(); PsiBuilder.Marker typeRefMarker = mark();
parseAnnotations(ONLY_ESCAPED_REGULAR_ANNOTATIONS); parseAnnotations(DEFAULT);
PsiBuilder.Marker typeElementMarker = mark(); PsiBuilder.Marker typeElementMarker = mark();
@@ -2133,7 +2133,7 @@ public class JetParsing extends AbstractJetParsing {
if (isFunctionTypeContents) { if (isFunctionTypeContents) {
if (!tryParseValueParameter(typeRequired)) { if (!tryParseValueParameter(typeRequired)) {
PsiBuilder.Marker valueParameter = mark(); PsiBuilder.Marker valueParameter = mark();
parseModifierList(ONLY_ESCAPED_REGULAR_ANNOTATIONS, NO_MODIFIER_BEFORE_FOR_VALUE_PARAMETER); // lazy, out, ref parseModifierList(DEFAULT, NO_MODIFIER_BEFORE_FOR_VALUE_PARAMETER); // lazy, out, ref
parseTypeRef(); parseTypeRef();
closeDeclarationWithCommentBinders(valueParameter, VALUE_PARAMETER, false); closeDeclarationWithCommentBinders(valueParameter, VALUE_PARAMETER, false);
} }
@@ -2174,7 +2174,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();
parseModifierList(ONLY_ESCAPED_REGULAR_ANNOTATIONS, NO_MODIFIER_BEFORE_FOR_VALUE_PARAMETER); parseModifierList(DEFAULT, NO_MODIFIER_BEFORE_FOR_VALUE_PARAMETER);
if (at(VAR_KEYWORD) || at(VAL_KEYWORD)) { if (at(VAR_KEYWORD) || at(VAL_KEYWORD)) {
advance(); // VAR_KEYWORD | VAL_KEYWORD advance(); // VAR_KEYWORD | VAL_KEYWORD
@@ -2260,10 +2260,10 @@ public class JetParsing extends AbstractJetParsing {
} }
enum AnnotationParsingMode { enum AnnotationParsingMode {
DEFAULT(false, false, true),
FILE_ANNOTATIONS_BEFORE_PACKAGE(false, true, true), FILE_ANNOTATIONS_BEFORE_PACKAGE(false, true, true),
FILE_ANNOTATIONS_WHEN_PACKAGE_OMITTED(false, true, true), FILE_ANNOTATIONS_WHEN_PACKAGE_OMITTED(false, true, true),
ONLY_ESCAPED_REGULAR_ANNOTATIONS(false, false, true), IN_ANNOTATION_LIST(true, false, true),
ALLOW_UNESCAPED_REGULAR_ANNOTATIONS(true, false, true),
NO_ANNOTATIONS(false, false, false); NO_ANNOTATIONS(false, false, false);
boolean allowShortAnnotations; boolean allowShortAnnotations;