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

Minor: fix warnings in AbstractKotlinParsing.java

Browse Source
This commit is contained in:
Nikolay Krasko
2017-03-16 18:36:45 +03:00
parent 49c2f40f7d
commit 52789df812
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/parsing/AbstractKotlinParsing.java
+10 -12
View File
@@ -92,22 +92,21 @@ import static org.jetbrains.kotlin.lexer.KtTokens.*;
return false; return false;
} }
protected boolean expectNoAdvance(KtToken expectation, String message) { protected void expectNoAdvance(KtToken expectation, String message) {
if (at(expectation)) { if (at(expectation)) {
advance(); // expectation advance(); // expectation
return true; return;
} }
error(message); error(message);
return false;
} }
protected void errorWithRecovery(String message, TokenSet recoverySet) { protected void errorWithRecovery(String message, TokenSet recoverySet) {
IElementType tt = tt(); IElementType tt = tt();
if (recoverySet == null || recoverySet.contains(tt) || tt == LBRACE || tt == RBRACE if (recoverySet == null ||
|| (recoverySet.contains(EOL_OR_SEMICOLON) recoverySet.contains(tt) ||
&& (eof() || tt == SEMICOLON || myBuilder.newlineBeforeCurrentToken()))) { tt == LBRACE || tt == RBRACE ||
(recoverySet.contains(EOL_OR_SEMICOLON) && (eof() || tt == SEMICOLON || myBuilder.newlineBeforeCurrentToken()))) {
error(message); error(message);
} }
else { else {
@@ -115,15 +114,14 @@ import static org.jetbrains.kotlin.lexer.KtTokens.*;
} }
} }
protected boolean errorAndAdvance(String message) { protected void errorAndAdvance(String message) {
return errorAndAdvance(message, 1); errorAndAdvance(message, 1);
} }
protected boolean errorAndAdvance(String message, int advanceTokenCount) { protected void errorAndAdvance(String message, int advanceTokenCount) {
PsiBuilder.Marker err = mark(); PsiBuilder.Marker err = mark();
advance(advanceTokenCount); advance(advanceTokenCount);
err.error(message); err.error(message);
return false;
} }
protected boolean eof() { protected boolean eof() {
@@ -198,7 +196,7 @@ import static org.jetbrains.kotlin.lexer.KtTokens.*;
/** /**
* Side-effect-free version of atSet() * Side-effect-free version of atSet()
*/ */
protected boolean _atSet(TokenSet set) { private boolean _atSet(TokenSet set) {
IElementType token = tt(); IElementType token = tt();
if (set.contains(token)) return true; if (set.contains(token)) return true;
if (set.contains(EOL_OR_SEMICOLON)) { if (set.contains(EOL_OR_SEMICOLON)) {