KT-621 Remove .foo() pattern matching from when (Rename method and correct grammar)

This commit is contained in:
Nikolay Krasko
2011-11-28 15:29:01 +04:00
parent 517947288c
commit c09e9368e8
3 changed files with 8 additions and 4 deletions
@@ -120,6 +120,11 @@ import static org.jetbrains.jet.lexer.JetTokens.*;
myBuilder.advanceLexer(); myBuilder.advanceLexer();
} }
protected void advanceAtSet(final TokenSet set) {
assert _atSet(set);
myBuilder.advanceLexer();
}
protected IElementType tt() { protected IElementType tt() {
return myBuilder.getTokenType(); return myBuilder.getTokenType();
} }
@@ -275,7 +275,7 @@ public class JetExpressionParsing extends AbstractJetParsing {
precedence.parseHigherPrecedence(this); precedence.parseHigherPrecedence(this);
while (!breakedWithNewLine() && atSet(precedence.getOperations())) { while (!interruptedWithNewLine() && atSet(precedence.getOperations())) {
IElementType operation = tt(); IElementType operation = tt();
parseOperationReference(); parseOperationReference();
@@ -331,7 +331,7 @@ public class JetExpressionParsing extends AbstractJetParsing {
PsiBuilder.Marker expression = mark(); PsiBuilder.Marker expression = mark();
parseAtomicExpression(); parseAtomicExpression();
while (true) { while (true) {
if (breakedWithNewLine()) { if (interruptedWithNewLine()) {
break; break;
} }
else if (at(LBRACKET)) { else if (at(LBRACKET)) {
@@ -1708,7 +1708,7 @@ public class JetExpressionParsing extends AbstractJetParsing {
return myJetParsing.create(builder); return myJetParsing.create(builder);
} }
private boolean breakedWithNewLine() { private boolean interruptedWithNewLine() {
return !ALLOW_NEWLINE_OPERATIONS.contains(tt()) && myBuilder.newlineBeforeCurrentToken(); return !ALLOW_NEWLINE_OPERATIONS.contains(tt()) && myBuilder.newlineBeforeCurrentToken();
} }
} }
-1
View File
@@ -18,7 +18,6 @@ whenEntry
whenCondition whenCondition
: expression : expression
: ("." | "?.") postfixUnaryExpression typeArguments? valueArguments?
: ("in" | "!in") expression : ("in" | "!in") expression
: ("is" | "!is") isRHS : ("is" | "!is") isRHS
; ;