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

Made parser aware of templates in parameters, return type positions for all functions; of name, receiver positions for extension functions.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-02-01 16:41:02 +04:00
parent 8d67d794b3
commit ecdcfdb45a
1 changed files with 38 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetParsing.java
+38 -26
View File
@@ -965,7 +965,9 @@ public class JetParsing extends AbstractJetParsing {
if (at(COLON)) {
advance(); // COLON
parseTypeRef();
if (!parseIdeTemplate()) {
parseTypeRef();
}
}
parseTypeConstraintsGuarded(typeParameterListOccurred);
@@ -992,16 +994,23 @@ public class JetParsing extends AbstractJetParsing {
expect(IDENTIFIER, "Expecting " + title + " name or receiver type", nameFollow);
}
} else {
createTruncatedBuilder(lastDot).parseTypeRef();
if (atSet(RECEIVER_TYPE_TERMINATORS)) {
advance(); // expectation
if (parseIdeTemplate()) {
expect(DOT, "Expecting '.' after receiver template");
}
else {
errorWithRecovery("Expecting '.' before a " + title + " name", nameFollow);
createTruncatedBuilder(lastDot).parseTypeRef();
if (atSet(RECEIVER_TYPE_TERMINATORS)) {
advance(); // expectation
}
else {
errorWithRecovery("Expecting '.' before a " + title + " name", nameFollow);
}
}
expect(IDENTIFIER, "Expecting " + title + " name", nameFollow);
if (!parseIdeTemplate()) {
expect(IDENTIFIER, "Expecting " + title + " name", nameFollow);
}
}
}
@@ -1537,29 +1546,32 @@ public class JetParsing extends AbstractJetParsing {
myBuilder.disableNewlines();
expect(LPAR, "Expecting '(", recoverySet);
if (!at(RPAR) && !atSet(recoverySet)) {
while (true) {
if (at(COMMA)) {
errorAndAdvance("Expecting a parameter declaration");
}
else if (at(RPAR)) {
error("Expecting a parameter declaration");
break;
}
if (isFunctionTypeContents) {
if (!tryParseValueParameter()) {
PsiBuilder.Marker valueParameter = mark();
parseModifierList(MODIFIER_LIST, false); // lazy, out, ref
parseTypeRef();
valueParameter.done(VALUE_PARAMETER);
if (!parseIdeTemplate()) {
if (!at(RPAR) && !atSet(recoverySet)) {
while (true) {
if (at(COMMA)) {
errorAndAdvance("Expecting a parameter declaration");
}
} else {
parseValueParameter();
else if (at(RPAR)) {
error("Expecting a parameter declaration");
break;
}
if (isFunctionTypeContents) {
if (!tryParseValueParameter()) {
PsiBuilder.Marker valueParameter = mark();
parseModifierList(MODIFIER_LIST, false); // lazy, out, ref
parseTypeRef();
valueParameter.done(VALUE_PARAMETER);
}
} else {
parseValueParameter();
}
if (!at(COMMA)) break;
advance(); // COMMA
}
if (!at(COMMA)) break;
advance(); // COMMA
}
}
expect(RPAR, "Expecting ')'", recoverySet);
myBuilder.restoreNewlinesState();