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

Need *this* to be an expression and don't need separate node for super type qualifiers - they're all type references

Browse Source
This commit is contained in:
Maxim Shafirov
2011-01-09 00:01:01 +03:00
parent 2ce071dd38
commit 936d3443ea
12 changed files with 77 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java
+3 -1
View File
@@ -1057,6 +1057,7 @@ public class JetExpressionParsing extends AbstractJetParsing {
*/ */
private void parseThisExpression() { private void parseThisExpression() {
assert _at(THIS_KEYWORD); assert _at(THIS_KEYWORD);
PsiBuilder.Marker mark = mark();
advance(); // THIS_KEYWORD advance(); // THIS_KEYWORD
if (at(LT)) { if (at(LT)) {
// This may be "this < foo" or "this<foo>", thus the backtracking // This may be "this < foo" or "this<foo>", thus the backtracking
@@ -1069,13 +1070,14 @@ public class JetExpressionParsing extends AbstractJetParsing {
if (at(GT)) { if (at(GT)) {
advance(); // GT advance(); // GT
supertype.done(SUPERTYE_QUALIFIER); supertype.drop();
} }
else { else {
supertype.rollbackTo(); supertype.rollbackTo();
} }
myBuilder.restoreNewlinesState(); myBuilder.restoreNewlinesState();
} }
mark.done(THIS_EXPRESSION);
} }
/* /*
idea/testData/psi/AnnotatedExpressions.txt
+2 -1
View File
@@ -35,6 +35,7 @@ JetFile: AnnotatedExpressions.jet
PsiElement(IDENTIFIER)('a') PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']') PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
PsiElement(this)('this') THIS_EXPRESSION
PsiElement(this)('this')
PsiWhiteSpace('\n') PsiWhiteSpace('\n')
PsiElement(RBRACE)('}') PsiElement(RBRACE)('}')
idea/testData/psi/Properties.txt
+2 -1
View File
@@ -726,7 +726,8 @@ JetFile: Properties.jet
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
BINARY_EXPRESSION BINARY_EXPRESSION
DOT_QIALIFIED_EXPRESSION DOT_QIALIFIED_EXPRESSION
PsiElement(this)('this') THIS_EXPRESSION
PsiElement(this)('this')
PsiElement(DOT)('.') PsiElement(DOT)('.')
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('size') PsiElement(IDENTIFIER)('size')
idea/testData/psi/SimpleExpressions.txt
+4 -3
View File
@@ -231,7 +231,8 @@ JetFile: SimpleExpressions.jet
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
PsiElement(EQ)('=') PsiElement(EQ)('=')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
PsiElement(this)('this') THIS_EXPRESSION
PsiElement(this)('this')
PsiElement(COMMA)(',') PsiElement(COMMA)(',')
PsiWhiteSpace('\n ') PsiWhiteSpace('\n ')
VALUE_PARAMETER VALUE_PARAMETER
@@ -245,8 +246,8 @@ JetFile: SimpleExpressions.jet
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
PsiElement(EQ)('=') PsiElement(EQ)('=')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
PsiElement(this)('this') THIS_EXPRESSION
SUPERTYE_QUALIFIER PsiElement(this)('this')
PsiElement(LT)('<') PsiElement(LT)('<')
TYPE_REFERENCE TYPE_REFERENCE
USER_TYPE USER_TYPE
idea/testData/psi/examples/BinaryTree.txt
+10 -5
View File
@@ -165,7 +165,8 @@ JetFile: BinaryTree.jet
PsiWhiteSpace('\n ') PsiWhiteSpace('\n ')
BINARY_EXPRESSION BINARY_EXPRESSION
DOT_QIALIFIED_EXPRESSION DOT_QIALIFIED_EXPRESSION
PsiElement(this)('this') THIS_EXPRESSION
PsiElement(this)('this')
PsiElement(DOT)('.') PsiElement(DOT)('.')
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('compare') PsiElement(IDENTIFIER)('compare')
@@ -263,7 +264,8 @@ JetFile: BinaryTree.jet
VALUE_ARGUMENT_LIST VALUE_ARGUMENT_LIST
PsiElement(LPAR)('(') PsiElement(LPAR)('(')
VALUE_ARGUMENT VALUE_ARGUMENT
PsiElement(this)('this') THIS_EXPRESSION
PsiElement(this)('this')
PsiElement(COMMA)(',') PsiElement(COMMA)(',')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
VALUE_ARGUMENT VALUE_ARGUMENT
@@ -1828,7 +1830,8 @@ JetFile: BinaryTree.jet
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('BinaryTree') PsiElement(IDENTIFIER)('BinaryTree')
PsiElement(DOT)('.') PsiElement(DOT)('.')
PsiElement(this)('this') THIS_EXPRESSION
PsiElement(this)('this')
PsiElement(DOT)('.') PsiElement(DOT)('.')
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('version') PsiElement(IDENTIFIER)('version')
@@ -2391,7 +2394,8 @@ JetFile: BinaryTree.jet
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('BinaryTree') PsiElement(IDENTIFIER)('BinaryTree')
PsiElement(DOT)('.') PsiElement(DOT)('.')
PsiElement(this)('this') THIS_EXPRESSION
PsiElement(this)('this')
PsiElement(DOT)('.') PsiElement(DOT)('.')
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('version') PsiElement(IDENTIFIER)('version')
@@ -2435,7 +2439,8 @@ JetFile: BinaryTree.jet
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('BinaryTree') PsiElement(IDENTIFIER)('BinaryTree')
PsiElement(DOT)('.') PsiElement(DOT)('.')
PsiElement(this)('this') THIS_EXPRESSION
PsiElement(this)('this')
PsiElement(DOT)('.') PsiElement(DOT)('.')
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('version') PsiElement(IDENTIFIER)('version')
idea/testData/psi/examples/BitArith.txt
+2 -1
View File
@@ -480,7 +480,8 @@ JetFile: BitArith.jet
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
BINARY_EXPRESSION BINARY_EXPRESSION
BINARY_EXPRESSION BINARY_EXPRESSION
PsiElement(this)('this') THIS_EXPRESSION
PsiElement(this)('this')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('and') PsiElement(IDENTIFIER)('and')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
idea/testData/psi/examples/PolymorphicClassObjects.txt
+2 -1
View File
@@ -332,7 +332,8 @@ JetFile: PolymorphicClassObjects.jet
PsiElement(in)('in') PsiElement(in)('in')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
LOOP_RANGE LOOP_RANGE
PsiElement(this)('this') THIS_EXPRESSION
PsiElement(this)('this')
PsiElement(RPAR)(')') PsiElement(RPAR)(')')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
BODY BODY
idea/testData/psi/examples/UnionFind.txt
+2 -1
View File
@@ -379,7 +379,8 @@ JetFile: UnionFind.jet
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
BINARY_EXPRESSION BINARY_EXPRESSION
BINARY_EXPRESSION BINARY_EXPRESSION
PsiElement(this)('this') THIS_EXPRESSION
PsiElement(this)('this')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
PsiElement(PERC)('%') PsiElement(PERC)('%')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
idea/testData/psi/examples/collections/ArrayList.txt
+2 -1
View File
@@ -343,7 +343,8 @@ JetFile: ArrayList.jet
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('ArrayList') PsiElement(IDENTIFIER)('ArrayList')
PsiElement(DOT)('.') PsiElement(DOT)('.')
PsiElement(this)('this') THIS_EXPRESSION
PsiElement(this)('this')
PsiElement(DOT)('.') PsiElement(DOT)('.')
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('remove') PsiElement(IDENTIFIER)('remove')
idea/testData/psi/examples/collections/HashMap.txt
+6 -3
View File
@@ -44,7 +44,8 @@ JetFile: HashMap.jet
TUPLE TUPLE
PsiElement(LPAR)('(') PsiElement(LPAR)('(')
BINARY_EXPRESSION BINARY_EXPRESSION
PsiElement(this)('this') THIS_EXPRESSION
PsiElement(this)('this')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
PsiElement(as)('as') PsiElement(as)('as')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
@@ -129,7 +130,8 @@ JetFile: HashMap.jet
TUPLE TUPLE
PsiElement(LPAR)('(') PsiElement(LPAR)('(')
BINARY_EXPRESSION BINARY_EXPRESSION
PsiElement(this)('this') THIS_EXPRESSION
PsiElement(this)('this')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
PsiElement(as)('as') PsiElement(as)('as')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
@@ -353,7 +355,8 @@ JetFile: HashMap.jet
VALUE_ARGUMENT_LIST VALUE_ARGUMENT_LIST
PsiElement(LPAR)('(') PsiElement(LPAR)('(')
VALUE_ARGUMENT VALUE_ARGUMENT
PsiElement(this)('this') THIS_EXPRESSION
PsiElement(this)('this')
PsiElement(RPAR)(')') PsiElement(RPAR)(')')
PsiWhiteSpace('\n\n') PsiWhiteSpace('\n\n')
CLASS CLASS
idea/testData/psi/examples/collections/List.txt
+4 -2
View File
@@ -184,7 +184,8 @@ JetFile: List.jet
PsiElement(EQ)('=') PsiElement(EQ)('=')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
BINARY_EXPRESSION BINARY_EXPRESSION
PsiElement(this)('this') THIS_EXPRESSION
PsiElement(this)('this')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
PsiElement(EQEQ)('==') PsiElement(EQEQ)('==')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
@@ -235,7 +236,8 @@ JetFile: List.jet
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('List') PsiElement(IDENTIFIER)('List')
PsiElement(DOT)('.') PsiElement(DOT)('.')
PsiElement(this)('this') THIS_EXPRESSION
PsiElement(this)('this')
PsiWhiteSpace('\n\n ') PsiWhiteSpace('\n\n ')
CALL_EXPRESSION CALL_EXPRESSION
PROPERTY PROPERTY
idea/testData/psi/examples/priorityqueues/BinaryHeap.txt
+38 -19
View File
@@ -120,7 +120,8 @@ JetFile: BinaryHeap.jet
PsiWhiteSpace('\n ') PsiWhiteSpace('\n ')
BINARY_EXPRESSION BINARY_EXPRESSION
DOT_QIALIFIED_EXPRESSION DOT_QIALIFIED_EXPRESSION
PsiElement(this)('this') THIS_EXPRESSION
PsiElement(this)('this')
PsiElement(DOT)('.') PsiElement(DOT)('.')
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('compare') PsiElement(IDENTIFIER)('compare')
@@ -132,7 +133,8 @@ JetFile: BinaryHeap.jet
PsiWhiteSpace('\n ') PsiWhiteSpace('\n ')
BINARY_EXPRESSION BINARY_EXPRESSION
DOT_QIALIFIED_EXPRESSION DOT_QIALIFIED_EXPRESSION
PsiElement(this)('this') THIS_EXPRESSION
PsiElement(this)('this')
PsiElement(DOT)('.') PsiElement(DOT)('.')
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('data') PsiElement(IDENTIFIER)('data')
@@ -227,7 +229,8 @@ JetFile: BinaryHeap.jet
PsiWhiteSpace('\n ') PsiWhiteSpace('\n ')
BINARY_EXPRESSION BINARY_EXPRESSION
DOT_QIALIFIED_EXPRESSION DOT_QIALIFIED_EXPRESSION
PsiElement(this)('this') THIS_EXPRESSION
PsiElement(this)('this')
PsiElement(DOT)('.') PsiElement(DOT)('.')
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('compare') PsiElement(IDENTIFIER)('compare')
@@ -239,7 +242,8 @@ JetFile: BinaryHeap.jet
PsiWhiteSpace('\n ') PsiWhiteSpace('\n ')
BINARY_EXPRESSION BINARY_EXPRESSION
DOT_QIALIFIED_EXPRESSION DOT_QIALIFIED_EXPRESSION
PsiElement(this)('this') THIS_EXPRESSION
PsiElement(this)('this')
PsiElement(DOT)('.') PsiElement(DOT)('.')
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('data') PsiElement(IDENTIFIER)('data')
@@ -266,7 +270,8 @@ JetFile: BinaryHeap.jet
PsiWhiteSpace('\n ') PsiWhiteSpace('\n ')
BINARY_EXPRESSION BINARY_EXPRESSION
DOT_QIALIFIED_EXPRESSION DOT_QIALIFIED_EXPRESSION
PsiElement(this)('this') THIS_EXPRESSION
PsiElement(this)('this')
PsiElement(DOT)('.') PsiElement(DOT)('.')
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('data') PsiElement(IDENTIFIER)('data')
@@ -305,7 +310,8 @@ JetFile: BinaryHeap.jet
PsiWhiteSpace('\n ') PsiWhiteSpace('\n ')
BINARY_EXPRESSION BINARY_EXPRESSION
DOT_QIALIFIED_EXPRESSION DOT_QIALIFIED_EXPRESSION
PsiElement(this)('this') THIS_EXPRESSION
PsiElement(this)('this')
PsiElement(DOT)('.') PsiElement(DOT)('.')
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('comparator') PsiElement(IDENTIFIER)('comparator')
@@ -352,7 +358,8 @@ JetFile: BinaryHeap.jet
PsiElement(LPAR)('(') PsiElement(LPAR)('(')
CONDITION CONDITION
DOT_QIALIFIED_EXPRESSION DOT_QIALIFIED_EXPRESSION
PsiElement(this)('this') THIS_EXPRESSION
PsiElement(this)('this')
PsiElement(DOT)('.') PsiElement(DOT)('.')
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('isEmpty') PsiElement(IDENTIFIER)('isEmpty')
@@ -891,7 +898,8 @@ JetFile: BinaryHeap.jet
TUPLE TUPLE
PsiElement(LPAR)('(') PsiElement(LPAR)('(')
BINARY_EXPRESSION BINARY_EXPRESSION
PsiElement(this)('this') THIS_EXPRESSION
PsiElement(this)('this')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
PsiElement(MINUS)('-') PsiElement(MINUS)('-')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
@@ -924,7 +932,8 @@ JetFile: BinaryHeap.jet
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
BINARY_EXPRESSION BINARY_EXPRESSION
BINARY_EXPRESSION BINARY_EXPRESSION
PsiElement(this)('this') THIS_EXPRESSION
PsiElement(this)('this')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
PsiElement(MUL)('*') PsiElement(MUL)('*')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
@@ -956,7 +965,8 @@ JetFile: BinaryHeap.jet
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
BINARY_EXPRESSION BINARY_EXPRESSION
BINARY_EXPRESSION BINARY_EXPRESSION
PsiElement(this)('this') THIS_EXPRESSION
PsiElement(this)('this')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
PsiElement(MUL)('*') PsiElement(MUL)('*')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
@@ -1004,7 +1014,8 @@ JetFile: BinaryHeap.jet
PsiElement(IDENTIFIER)('data') PsiElement(IDENTIFIER)('data')
INDICES INDICES
PsiElement(LBRACKET)('[') PsiElement(LBRACKET)('[')
PsiElement(this)('this') THIS_EXPRESSION
PsiElement(this)('this')
PsiElement(RBRACKET)(']') PsiElement(RBRACKET)(']')
PsiWhiteSpace('\n ') PsiWhiteSpace('\n ')
PROPERTY_ACCESSOR PROPERTY_ACCESSOR
@@ -1050,7 +1061,8 @@ JetFile: BinaryHeap.jet
TUPLE TUPLE
PsiElement(LPAR)('(') PsiElement(LPAR)('(')
BINARY_EXPRESSION BINARY_EXPRESSION
PsiElement(this)('this') THIS_EXPRESSION
PsiElement(this)('this')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
PsiElement(LT)('<') PsiElement(LT)('<')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
@@ -1067,7 +1079,8 @@ JetFile: BinaryHeap.jet
TUPLE TUPLE
PsiElement(LPAR)('(') PsiElement(LPAR)('(')
BINARY_EXPRESSION BINARY_EXPRESSION
PsiElement(this)('this') THIS_EXPRESSION
PsiElement(this)('this')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
PsiElement(GTEQ)('>=') PsiElement(GTEQ)('>=')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
@@ -1134,7 +1147,8 @@ JetFile: BinaryHeap.jet
VALUE_ARGUMENT_LIST VALUE_ARGUMENT_LIST
PsiElement(LPAR)('(') PsiElement(LPAR)('(')
VALUE_ARGUMENT VALUE_ARGUMENT
PsiElement(this)('this') THIS_EXPRESSION
PsiElement(this)('this')
PsiElement(COMMA)(',') PsiElement(COMMA)(',')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
VALUE_ARGUMENT VALUE_ARGUMENT
@@ -1195,7 +1209,8 @@ JetFile: BinaryHeap.jet
PsiElement(EQ)('=') PsiElement(EQ)('=')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
ARRAY_ACCESS_EXPRESSION ARRAY_ACCESS_EXPRESSION
PsiElement(this)('this') THIS_EXPRESSION
PsiElement(this)('this')
INDICES INDICES
PsiElement(LBRACKET)('[') PsiElement(LBRACKET)('[')
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
@@ -1204,7 +1219,8 @@ JetFile: BinaryHeap.jet
PsiWhiteSpace('\n ') PsiWhiteSpace('\n ')
BINARY_EXPRESSION BINARY_EXPRESSION
ARRAY_ACCESS_EXPRESSION ARRAY_ACCESS_EXPRESSION
PsiElement(this)('this') THIS_EXPRESSION
PsiElement(this)('this')
INDICES INDICES
PsiElement(LBRACKET)('[') PsiElement(LBRACKET)('[')
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
@@ -1214,7 +1230,8 @@ JetFile: BinaryHeap.jet
PsiElement(EQ)('=') PsiElement(EQ)('=')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
ARRAY_ACCESS_EXPRESSION ARRAY_ACCESS_EXPRESSION
PsiElement(this)('this') THIS_EXPRESSION
PsiElement(this)('this')
INDICES INDICES
PsiElement(LBRACKET)('[') PsiElement(LBRACKET)('[')
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
@@ -1223,7 +1240,8 @@ JetFile: BinaryHeap.jet
PsiWhiteSpace('\n ') PsiWhiteSpace('\n ')
BINARY_EXPRESSION BINARY_EXPRESSION
ARRAY_ACCESS_EXPRESSION ARRAY_ACCESS_EXPRESSION
PsiElement(this)('this') THIS_EXPRESSION
PsiElement(this)('this')
INDICES INDICES
PsiElement(LBRACKET)('[') PsiElement(LBRACKET)('[')
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
@@ -1267,7 +1285,8 @@ JetFile: BinaryHeap.jet
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
BINARY_EXPRESSION BINARY_EXPRESSION
DOT_QIALIFIED_EXPRESSION DOT_QIALIFIED_EXPRESSION
PsiElement(this)('this') THIS_EXPRESSION
PsiElement(this)('this')
PsiElement(DOT)('.') PsiElement(DOT)('.')
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('size') PsiElement(IDENTIFIER)('size')