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

Parse ;; as a single token

Browse Source
This commit is contained in:
Yan Zhulanow
2015-10-02 12:53:34 +03:00
parent 8d5cbeeab0
commit e85d76f9cc
7 changed files with 428 additions and 440 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/psi/ControlStructures.txt
Vendored
+6 -7
View File
@@ -970,18 +970,17 @@ JetFile: ControlStructures.kt
BODY
BLOCK
PsiElement(LBRACE)('{')
PsiElement(SEMICOLON)(';')
PsiElement(SEMICOLON)(';')
PsiErrorElement:Expecting an element
PsiElement(DOUBLE_SEMICOLON)(';;')
PsiElement(SEMICOLON)(';')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('foo')
PsiElement(SEMICOLON)(';')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('bar')
PsiElement(SEMICOLON)(';')
PsiElement(SEMICOLON)(';')
PsiElement(SEMICOLON)(';')
PsiElement(SEMICOLON)(';')
PsiErrorElement:Unexpected tokens (use ';' to separate expressions on the same line)
PsiElement(DOUBLE_SEMICOLON)(';;')
PsiElement(DOUBLE_SEMICOLON)(';;')
PsiWhiteSpace(' ')
PsiElement(RBRACE)('}')
PsiWhiteSpace(' ')
@@ -993,4 +992,4 @@ JetFile: ControlStructures.kt
PsiElement(IDENTIFIER)('r')
PsiElement(RPAR)(')')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
compiler/testData/psi/Expressions_ERR.txt
Vendored
+11 -10
View File
@@ -34,19 +34,20 @@ JetFile: Expressions_ERR.kt
PsiWhiteSpace('\n ')
PsiErrorElement:Expecting an element
PsiElement(RPAR)(')')
PsiElement(SEMICOLON)(';')
PsiElement(SEMICOLON)(';')
PsiElement(SEMICOLON)(';')
PsiErrorElement:Unexpected tokens (use ';' to separate expressions on the same line)
PsiElement(DOUBLE_SEMICOLON)(';;')
PsiErrorElement:Expecting an element
PsiElement(SEMICOLON)(';')
PsiErrorElement:Unexpected tokens (use ';' to separate expressions on the same line)
PsiElement(RPAR)(')')
PsiElement(SEMICOLON)(';')
PsiElement(SEMICOLON)(';')
PsiElement(SEMICOLON)(';')
PsiElement(DOUBLE_SEMICOLON)(';;')
PsiErrorElement:Expecting an element
PsiElement(SEMICOLON)(';')
PsiErrorElement:Unexpected tokens (use ';' to separate expressions on the same line)
PsiElement(BAD_CHARACTER)('~')
PsiElement(SEMICOLON)(';')
PsiElement(SEMICOLON)(';')
PsiElement(SEMICOLON)(';')
PsiElement(DOUBLE_SEMICOLON)(';;')
PsiErrorElement:Expecting an element
PsiElement(SEMICOLON)(';')
PsiWhiteSpace('\n ')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('srgsdfg')
@@ -57,4 +58,4 @@ JetFile: Expressions_ERR.kt
PsiErrorElement:Expecting an element
PsiElement(RBRACKET)(']')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
compiler/testData/psi/semicolonBetweenDeclarations.txt
Vendored
+4 -5
View File
@@ -30,10 +30,9 @@ JetFile: semicolonBetweenDeclarations.kt
PsiWhiteSpace(' ')
INTEGER_CONSTANT
PsiElement(INTEGER_LITERAL)('1')
PsiElement(SEMICOLON)(';')
PsiElement(SEMICOLON)(';')
PsiElement(SEMICOLON)(';')
PsiElement(SEMICOLON)(';')
PsiErrorElement:Property getter or setter expected
PsiElement(DOUBLE_SEMICOLON)(';;')
PsiElement(DOUBLE_SEMICOLON)(';;')
PsiWhiteSpace('\n')
CLASS
PsiElement(class)('class')
@@ -178,4 +177,4 @@ JetFile: semicolonBetweenDeclarations.kt
<empty list>
PsiElement(SEMICOLON)(';')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')