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

"type" is not a keyword anymore ("typealias" reserved instead)

Browse Source
This commit is contained in:
Andrey Breslav
2014-10-11 02:17:50 +04:00
parent b20439027c
commit cc68ed894b
41 changed files with 695 additions and 717 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/psi/annotation/ShortAnnotations.kt
+2 -2
View File
@@ -5,7 +5,7 @@ foo bar(1) buzz<T>(1) zoo object B
foo bar(1) buzz<T>(1) zoo fun a() {}
foo bar(1) buzz<T>(1) zoo val c : Int = 0
foo bar(1) buzz<T>(1) zoo var v : Int = 0
foo bar(1) buzz<T>(1) zoo type T = Int
foo bar(1) buzz<T>(1) zoo typealias T = Int
class Foo {
@@ -15,7 +15,7 @@ class Foo {
foo bar(1) buzz<T>(1) zoo fun a() {}
foo bar(1) buzz<T>(1) zoo val c : Int = 0
foo bar(1) buzz<T>(1) zoo var v : Int = 0
foo bar(1) buzz<T>(1) zoo type T = Int
foo bar(1) buzz<T>(1) zoo typealias T = Int
foo bar(1) buzz<T>(1) zoo {}
}
compiler/testData/psi/annotation/ShortAnnotations.txt
+2 -2
View File
@@ -406,7 +406,7 @@ JetFile: ShortAnnotations.kt
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('zoo')
PsiWhiteSpace(' ')
PsiElement(type)('type')
PsiElement(typealias)('typealias')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('T')
PsiWhiteSpace(' ')
@@ -836,7 +836,7 @@ JetFile: ShortAnnotations.kt
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('zoo')
PsiWhiteSpace(' ')
PsiElement(type)('type')
PsiElement(typealias)('typealias')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('T')
PsiWhiteSpace(' ')
compiler/testData/psi/annotation/TypeAnnotations.kt
+1 -1
View File
@@ -1,3 +1,3 @@
class F(a : [a] [b] B)
type f = [b] [x] F<[x] A, B>
typealias f = [b] [x] F<[x] A, B>
compiler/testData/psi/annotation/TypeAnnotations.txt
+1 -1
View File
@@ -39,7 +39,7 @@ JetFile: TypeAnnotations.kt
PsiElement(RPAR)(')')
PsiWhiteSpace('\n\n')
TYPEDEF
PsiElement(type)('type')
PsiElement(typealias)('typealias')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('f')
PsiWhiteSpace(' ')