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

Minor. Rename methods in parser

Browse Source 
Method that was called `parseControlStructureBody` is actually used for
loop bodies only, while `parseExpressionPreferringBlocks` used for
parsing body of control structure (i.e. it must be called
`parseControlStructureBody`)
This commit is contained in:
Denis Zharkov
2016-10-06 13:42:13 +03:00
parent 12efb20869
commit c01b4156d8
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/parsing/KotlinExpressionParsing.java
+14 -14
View File
@@ -880,11 +880,11 @@ public class KotlinExpressionParsing extends AbstractKotlinParsing {
error("Expecting an element");
}
else {
parseExpressionPreferringBlocks();
parseControlStructureBody();
}
}
else if (at(LBRACE)) { // no arrow, probably it's simply missing
parseExpressionPreferringBlocks();
parseControlStructureBody();
}
else if (!atSet(WHEN_CONDITION_RECOVERY_SET)) {
errorAndAdvance("Expecting '->'");
@@ -914,7 +914,7 @@ public class KotlinExpressionParsing extends AbstractKotlinParsing {
error("Expecting an element");
}
else {
parseExpressionPreferringBlocks();
parseControlStructureBody();
}
// SEMI is consumed in parseWhenEntry
}
@@ -1037,6 +1037,9 @@ public class KotlinExpressionParsing extends AbstractKotlinParsing {
parseFunctionLiteral(/* preferBlock = */false, /* collapse = */true);
}
/**
* If it has no ->, it's a block, otherwise a function literal
*/
public void parseFunctionLiteral(boolean preferBlock, boolean collapse) {
assert _at(LBRACE);
@@ -1330,7 +1333,7 @@ public class KotlinExpressionParsing extends AbstractKotlinParsing {
advance(); // DO_KEYWORD
if (!at(WHILE_KEYWORD)) {
parseControlStructureBody();
parseLoopBody();
}
if (expect(WHILE_KEYWORD, "Expecting 'while' followed by a post-condition")) {
@@ -1354,7 +1357,7 @@ public class KotlinExpressionParsing extends AbstractKotlinParsing {
parseCondition();
parseControlStructureBody();
parseLoopBody();
loop.done(WHILE);
}
@@ -1414,15 +1417,12 @@ public class KotlinExpressionParsing extends AbstractKotlinParsing {
myBuilder.restoreNewlinesState();
}
parseControlStructureBody();
parseLoopBody();
loop.done(FOR);
}
/**
* If it has no ->, it's a block, otherwise a function literal
*/
private void parseExpressionPreferringBlocks() {
private void parseControlStructureBody() {
if (!parseAnnotatedLambda(/* preferBlock = */true)) {
parseExpression();
}
@@ -1431,10 +1431,10 @@ public class KotlinExpressionParsing extends AbstractKotlinParsing {
/*
* element
*/
private void parseControlStructureBody() {
private void parseLoopBody() {
PsiBuilder.Marker body = mark();
if (!at(SEMICOLON)) {
parseExpressionPreferringBlocks();
parseControlStructureBody();
}
body.done(BODY);
}
@@ -1526,7 +1526,7 @@ public class KotlinExpressionParsing extends AbstractKotlinParsing {
PsiBuilder.Marker thenBranch = mark();
if (!at(ELSE_KEYWORD) && !at(SEMICOLON)) {
parseExpressionPreferringBlocks();
parseControlStructureBody();
}
if (at(SEMICOLON) && lookahead(1) == ELSE_KEYWORD) {
advance(); // SEMICOLON
@@ -1539,7 +1539,7 @@ public class KotlinExpressionParsing extends AbstractKotlinParsing {
PsiBuilder.Marker elseBranch = mark();
if (!at(SEMICOLON)) {
parseExpressionPreferringBlocks();
parseControlStructureBody();
}
elseBranch.done(ELSE);
}