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

KT-1130 Remove ref from keywords

Browse Source
This commit is contained in:
Andrey Breslav
2012-01-25 13:13:38 +04:00
parent 90b98a63b5
commit 408b91e43d
2 changed files with 77 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/psi/examples/BinaryTree.jet
+5 -5
View File
@@ -46,14 +46,14 @@ class BinaryTree<T> : IMutableSet<T> {
// In principle, this has access to item anyway, but then it's unreachable code // In principle, this has access to item anyway, but then it's unreachable code
// BAD: the naive implementation of ref will create H(T) ref objects, but can be optimized to create only one // BAD: the naive implementation of ref will create H(T) ref objects, but can be optimized to create only one
fun add(node : Ref<TreeNode?>, parent : TreeNode) : Boolean { fun add(node : Ref<TreeNode?>, parent : TreeNode) : Boolean {
if (node[] == null) { if (node.value == null) {
node[] = TreeNode(item, parent) node.value = TreeNode(item, parent)
return true return true
} }
when (compare(item, node[].value)) { when (compare(item, node.value.value)) {
EQ -> false EQ -> false
LS -> add(ref node[].left, node) LS -> add(ref node.value.left, node)
GT -> add(ref node[].right, node) GT -> add(ref node.value.right, node)
} }
} }
compiler/testData/psi/examples/BinaryTree.txt
+72 -28
View File
@@ -544,10 +544,15 @@ JetFile: BinaryTree.jet
VALUE_ARGUMENT_LIST VALUE_ARGUMENT_LIST
PsiElement(LPAR)('(') PsiElement(LPAR)('(')
VALUE_ARGUMENT VALUE_ARGUMENT
PsiElement(ref)('ref') CALL_EXPRESSION
PsiWhiteSpace(' ') REFERENCE_EXPRESSION
REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('Ref')
PsiElement(IDENTIFIER)('root') VALUE_ARGUMENT_LIST
PsiElement(LPAR)('(')
VALUE_ARGUMENT
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('root')
PsiElement(RPAR)(')')
PsiElement(COMMA)(',') PsiElement(COMMA)(',')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
VALUE_ARGUMENT VALUE_ARGUMENT
@@ -597,9 +602,6 @@ JetFile: BinaryTree.jet
VALUE_PARAMETER_LIST VALUE_PARAMETER_LIST
PsiElement(LPAR)('(') PsiElement(LPAR)('(')
VALUE_PARAMETER VALUE_PARAMETER
MODIFIER_LIST
PsiElement(ref)('ref')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('node') PsiElement(IDENTIFIER)('node')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
PsiElement(COLON)(':') PsiElement(COLON)(':')
@@ -607,7 +609,17 @@ JetFile: BinaryTree.jet
TYPE_REFERENCE TYPE_REFERENCE
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('TreeNode') PsiElement(IDENTIFIER)('Ref')
TYPE_ARGUMENT_LIST
PsiElement(LT)('<')
TYPE_PROJECTION
TYPE_REFERENCE
NULLABLE_TYPE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('TreeNode')
PsiElement(QUEST)('?')
PsiElement(GT)('>')
PsiElement(COMMA)(',') PsiElement(COMMA)(',')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
VALUE_PARAMETER VALUE_PARAMETER
@@ -637,8 +649,12 @@ JetFile: BinaryTree.jet
PsiElement(LPAR)('(') PsiElement(LPAR)('(')
CONDITION CONDITION
BINARY_EXPRESSION BINARY_EXPRESSION
REFERENCE_EXPRESSION DOT_QUALIFIED_EXPRESSION
PsiElement(IDENTIFIER)('node') REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('node')
PsiElement(DOT)('.')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('value')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
OPERATION_REFERENCE OPERATION_REFERENCE
PsiElement(EQEQ)('==') PsiElement(EQEQ)('==')
@@ -652,8 +668,12 @@ JetFile: BinaryTree.jet
PsiElement(LBRACE)('{') PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ') PsiWhiteSpace('\n ')
BINARY_EXPRESSION BINARY_EXPRESSION
REFERENCE_EXPRESSION DOT_QUALIFIED_EXPRESSION
PsiElement(IDENTIFIER)('node') REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('node')
PsiElement(DOT)('.')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('value')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
OPERATION_REFERENCE OPERATION_REFERENCE
PsiElement(EQ)('=') PsiElement(EQ)('=')
@@ -697,8 +717,12 @@ JetFile: BinaryTree.jet
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
VALUE_ARGUMENT VALUE_ARGUMENT
DOT_QUALIFIED_EXPRESSION DOT_QUALIFIED_EXPRESSION
REFERENCE_EXPRESSION DOT_QUALIFIED_EXPRESSION
PsiElement(IDENTIFIER)('node') REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('node')
PsiElement(DOT)('.')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('value')
PsiElement(DOT)('.') PsiElement(DOT)('.')
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('value') PsiElement(IDENTIFIER)('value')
@@ -732,14 +756,24 @@ JetFile: BinaryTree.jet
VALUE_ARGUMENT_LIST VALUE_ARGUMENT_LIST
PsiElement(LPAR)('(') PsiElement(LPAR)('(')
VALUE_ARGUMENT VALUE_ARGUMENT
PsiElement(ref)('ref') BINARY_EXPRESSION
PsiWhiteSpace(' ') BINARY_EXPRESSION
DOT_QUALIFIED_EXPRESSION BINARY_EXPRESSION
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('node') PsiElement(IDENTIFIER)('ref')
PsiElement(DOT)('.') PsiWhiteSpace(' ')
REFERENCE_EXPRESSION OPERATION_REFERENCE
PsiElement(IDENTIFIER)('node')
PsiErrorElement:Expecting an element
PsiElement(DOT)('.')
OPERATION_REFERENCE
PsiElement(IDENTIFIER)('value')
PsiErrorElement:Expecting an element
PsiElement(DOT)('.')
OPERATION_REFERENCE
PsiElement(IDENTIFIER)('left') PsiElement(IDENTIFIER)('left')
PsiErrorElement:Expecting an element
<empty list>
PsiElement(COMMA)(',') PsiElement(COMMA)(',')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
VALUE_ARGUMENT VALUE_ARGUMENT
@@ -761,14 +795,24 @@ JetFile: BinaryTree.jet
VALUE_ARGUMENT_LIST VALUE_ARGUMENT_LIST
PsiElement(LPAR)('(') PsiElement(LPAR)('(')
VALUE_ARGUMENT VALUE_ARGUMENT
PsiElement(ref)('ref') BINARY_EXPRESSION
PsiWhiteSpace(' ') BINARY_EXPRESSION
DOT_QUALIFIED_EXPRESSION BINARY_EXPRESSION
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('node') PsiElement(IDENTIFIER)('ref')
PsiElement(DOT)('.') PsiWhiteSpace(' ')
REFERENCE_EXPRESSION OPERATION_REFERENCE
PsiElement(IDENTIFIER)('node')
PsiErrorElement:Expecting an element
PsiElement(DOT)('.')
OPERATION_REFERENCE
PsiElement(IDENTIFIER)('value')
PsiErrorElement:Expecting an element
PsiElement(DOT)('.')
OPERATION_REFERENCE
PsiElement(IDENTIFIER)('right') PsiElement(IDENTIFIER)('right')
PsiErrorElement:Expecting an element
<empty list>
PsiElement(COMMA)(',') PsiElement(COMMA)(',')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
VALUE_ARGUMENT VALUE_ARGUMENT