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

[dummy commit, the previous was for:] Make in, is, as and : same priority

Browse Source
This commit is contained in:
Andrey Breslav
2011-01-14 21:34:40 +03:00
parent 7879bec299
commit f4c2a88144
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java
+1 -1
View File
@@ -59,7 +59,6 @@ public class JetExpressionParsing extends AbstractJetParsing {
RANGE(JetTokens.RANGE), RANGE(JetTokens.RANGE),
SIMPLE_NAME(IDENTIFIER), SIMPLE_NAME(IDENTIFIER),
ELVIS(JetTokens.ELVIS), ELVIS(JetTokens.ELVIS),
// TODO : make same priority
WITH_TYPE_RHS(IN_KEYWORD, NOT_IN, AS_KEYWORD, COLON, IS_KEYWORD, NOT_IS) { WITH_TYPE_RHS(IN_KEYWORD, NOT_IN, AS_KEYWORD, COLON, IS_KEYWORD, NOT_IS) {
@Override @Override
public JetNodeType parseRightHandSide(IElementType operation, JetExpressionParsing parser) { public JetNodeType parseRightHandSide(IElementType operation, JetExpressionParsing parser) {
@@ -160,6 +159,7 @@ public class JetExpressionParsing extends AbstractJetParsing {
while (!myBuilder.newlineBeforeCurrentToken() && atSet(precedence.getOperations())) { while (!myBuilder.newlineBeforeCurrentToken() && atSet(precedence.getOperations())) {
IElementType operation = tt(); IElementType operation = tt();
advance(); // operation advance(); // operation
JetNodeType resultType = precedence.parseRightHandSide(operation, this); JetNodeType resultType = precedence.parseRightHandSide(operation, this);
expression.done(resultType); expression.done(resultType);
expression = expression.precede(); expression = expression.precede();