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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
svtk
2012-01-13 13:28:35 +04:00
parent 119783ef31 f457b1cb7a
commit 3f003a16c2
142 changed files with 2456 additions and 1299 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/psi/Attributes.txt
+1 -1
View File
@@ -1,6 +1,6 @@
JetFile: Attributes.jet
NAMESPACE_HEADER
PsiElement(namespace)('package')
PsiElement(package)('package')
PsiWhiteSpace(' ')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('foo')
compiler/testData/psi/Attributes_ERR.txt
+1 -1
View File
@@ -1,6 +1,6 @@
JetFile: Attributes_ERR.jet
NAMESPACE_HEADER
PsiElement(namespace)('package')
PsiElement(package)('package')
PsiWhiteSpace(' ')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('foo')
compiler/testData/psi/BabySteps.txt
+1 -1
View File
@@ -1,6 +1,6 @@
JetFile: BabySteps.jet
NAMESPACE_HEADER
PsiElement(namespace)('package')
PsiElement(package)('package')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('foo')
PsiWhiteSpace('\n\n')
compiler/testData/psi/BabySteps_ERR.txt
+1 -1
View File
@@ -1,6 +1,6 @@
JetFile: BabySteps_ERR.jet
NAMESPACE_HEADER
PsiElement(namespace)('package')
PsiElement(package)('package')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('foo')
PsiWhiteSpace('\n\n')
compiler/testData/psi/FileStart_ERR.txt
+1 -1
View File
@@ -4,7 +4,7 @@ JetFile: FileStart_ERR.jet
PsiErrorElement:Expecting namespace or top level declaration
PsiElement(DIV)('/')
PsiErrorElement:Expecting namespace or top level declaration
PsiElement(namespace)('package')
PsiElement(package)('package')
PsiWhiteSpace(' ')
MODIFIER_LIST
ANNOTATION_ENTRY
compiler/testData/psi/Imports.txt
+2 -2
View File
@@ -1,6 +1,6 @@
JetFile: Imports.jet
NAMESPACE_HEADER
PsiElement(namespace)('package')
PsiElement(package)('package')
PsiWhiteSpace(' ')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('foo')
@@ -13,7 +13,7 @@ JetFile: Imports.jet
IMPORT_DIRECTIVE
PsiElement(import)('import')
PsiWhiteSpace(' ')
PsiElement(namespace)('package')
PsiElement(package)('package')
PsiElement(DOT)('.')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('foo')
compiler/testData/psi/Imports_ERR.txt
+4 -4
View File
@@ -1,6 +1,6 @@
JetFile: Imports_ERR.jet
NAMESPACE_HEADER
PsiElement(namespace)('package')
PsiElement(package)('package')
PsiWhiteSpace(' ')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('foo')
@@ -13,7 +13,7 @@ JetFile: Imports_ERR.jet
IMPORT_DIRECTIVE
PsiElement(import)('import')
PsiWhiteSpace(' ')
PsiElement(namespace)('package')
PsiElement(package)('package')
PsiErrorElement:Expecting '.'
<empty list>
PsiWhiteSpace(' ')
@@ -25,7 +25,7 @@ JetFile: Imports_ERR.jet
IMPORT_DIRECTIVE
PsiElement(import)('import')
PsiWhiteSpace(' ')
PsiElement(namespace)('package')
PsiElement(package)('package')
PsiElement(DOT)('.')
REFERENCE_EXPRESSION
PsiErrorElement:Expecting qualified name
@@ -36,7 +36,7 @@ JetFile: Imports_ERR.jet
IMPORT_DIRECTIVE
PsiElement(import)('import')
PsiWhiteSpace(' ')
PsiElement(namespace)('package')
PsiElement(package)('package')
PsiElement(DOT)('.')
PsiWhiteSpace(' ')
REFERENCE_EXPRESSION
compiler/testData/psi/NamespaceBlockFirst.txt
+1 -1
View File
@@ -2,7 +2,7 @@ JetFile: NamespaceBlockFirst.jet
NAMESPACE_HEADER
<empty list>
PsiErrorElement:Expecting namespace or top level declaration
PsiElement(namespace)('package')
PsiElement(package)('package')
PsiWhiteSpace(' ')
MODIFIER_LIST
ANNOTATION_ENTRY
compiler/testData/psi/NamespaceModifiers.txt
+1 -1
View File
@@ -13,6 +13,6 @@ JetFile: NamespaceModifiers.jet
PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ')
PsiElement(namespace)('package')
PsiElement(package)('package')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('name')
compiler/testData/psi/RootNamespace.txt
+5 -5
View File
@@ -1,6 +1,6 @@
JetFile: RootNamespace.jet
NAMESPACE_HEADER
PsiElement(namespace)('package')
PsiElement(package)('package')
PsiWhiteSpace(' ')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('foo')
@@ -16,7 +16,7 @@ JetFile: RootNamespace.jet
TYPE_PARAMETER_LIST
<empty list>
PsiErrorElement:Expecting namespace or top level declaration
PsiElement(namespace)('package')
PsiElement(package)('package')
PsiWhiteSpace(' ')
MODIFIER_LIST
ANNOTATION_ENTRY
@@ -48,7 +48,7 @@ JetFile: RootNamespace.jet
DOT_QUALIFIED_EXPRESSION
DOT_QUALIFIED_EXPRESSION
ROOT_NAMESPACE
PsiElement(namespace)('package')
PsiElement(package)('package')
PsiElement(DOT)('.')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('foo')
@@ -63,7 +63,7 @@ JetFile: RootNamespace.jet
DOT_QUALIFIED_EXPRESSION
DOT_QUALIFIED_EXPRESSION
ROOT_NAMESPACE
PsiElement(namespace)('package')
PsiElement(package)('package')
PsiElement(DOT)('.')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('foo')
@@ -97,7 +97,7 @@ JetFile: RootNamespace.jet
DOT_QUALIFIED_EXPRESSION
DOT_QUALIFIED_EXPRESSION
ROOT_NAMESPACE
PsiElement(namespace)('package')
PsiElement(package)('package')
PsiElement(DOT)('.')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('foo')
compiler/testData/psi/ShortAnnotations.txt
+1 -1
View File
@@ -49,7 +49,7 @@ JetFile: ShortAnnotations.jet
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('zoo')
PsiWhiteSpace(' ')
PsiElement(namespace)('package')
PsiElement(package)('package')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('aa')
PsiWhiteSpace('\n\n')
compiler/testData/psi/SimpleModifiers.txt
+1 -1
View File
@@ -1,6 +1,6 @@
JetFile: SimpleModifiers.jet
NAMESPACE_HEADER
PsiElement(namespace)('package')
PsiElement(package)('package')
PsiWhiteSpace(' ')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('foo')
compiler/testData/psi/SoftKeywords.txt
+1 -1
View File
@@ -1,6 +1,6 @@
JetFile: SoftKeywords.jet
NAMESPACE_HEADER
PsiElement(namespace)('package')
PsiElement(package)('package')
PsiWhiteSpace(' ')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('foo')
compiler/testData/psi/TypeDef.txt
+1 -1
View File
@@ -1,6 +1,6 @@
JetFile: TypeDef.jet
NAMESPACE_HEADER
PsiElement(namespace)('package')
PsiElement(package)('package')
PsiWhiteSpace(' ')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('foo')
compiler/testData/psi/When.txt
+1 -1
View File
@@ -598,7 +598,7 @@ JetFile: When.jet
DOT_QUALIFIED_EXPRESSION
DOT_QUALIFIED_EXPRESSION
ROOT_NAMESPACE
PsiElement(namespace)('package')
PsiElement(package)('package')
PsiElement(DOT)('.')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
compiler/testData/readClass/prop/ExtValClass.kt
+4
View File
@@ -0,0 +1,4 @@
package test
val <P> P.anotherJavaClass: java.lang.Class<P>
get() = throw Exception()
compiler/testData/readClass/prop/ExtValInClass.kt
+6
View File
@@ -0,0 +1,6 @@
package test
class ExtPropInClass {
val Int.itIs: Int
get() = this
}
compiler/testData/readClass/prop/ExtValInt.kt
+4
View File
@@ -0,0 +1,4 @@
package test
val Int.itIs: Int
get() = this
compiler/testData/readClass/prop/ExtValIntCharSequence.kt
+6
View File
@@ -0,0 +1,6 @@
package test
import java.lang.CharSequence
val Int.ggg: CharSequence
get() = throw Exception()
compiler/testData/readClass/prop/ExtValIntCharSequenceQ.kt
+6
View File
@@ -0,0 +1,6 @@
package test
import java.lang.CharSequence
val Int.ggg: CharSequence?
get() = throw Exception()
compiler/testData/readClass/prop/ExtValIntListQOfIntInClass.kt
+6
View File
@@ -0,0 +1,6 @@
package test
class ExtValInClass {
val Int.asas: java.util.List<Int>?
get() = throw Exception()
}
compiler/testData/readClass/prop/ExtValIntTInClass.kt
+6
View File
@@ -0,0 +1,6 @@
package test
class ExtValInClass<T> {
val Int.asas: T
get() = throw Exception()
}
compiler/testData/readClass/prop/ExtValIntTQInClass.kt
+6
View File
@@ -0,0 +1,6 @@
package test
class ExtValInClass<P> {
val Int.asas: P?
get() = throw Exception()
}
compiler/testData/readClass/prop/ExtValTIntInClass.kt
+6
View File
@@ -0,0 +1,6 @@
package test
class ExtValPIntInClass<P> {
val P.asas: Int
get() = throw Exception()
}
compiler/testData/readClass/prop/ExtVarClass.kt
+5
View File
@@ -0,0 +1,5 @@
package test
var <P> P.anotherJavaClass: java.lang.Class<P>
get() = throw Exception()
set(p: java.lang.Class<P>) = throw Exception()
compiler/testData/readClass/prop/ExtVarInClass.kt
+7
View File
@@ -0,0 +1,7 @@
package test
class ExtPropInClass {
var Int.itIs: Int
get() = throw Exception()
set(p: Int) = throw Exception()
}
compiler/testData/readClass/prop/ExtVarInt.kt
+5
View File
@@ -0,0 +1,5 @@
package test
var Int.ggg: Int
get() = throw Exception()
set(p) = throw Exception()
compiler/testData/readClass/prop/ExtVarIntTInClass.kt
+7
View File
@@ -0,0 +1,7 @@
package test
class ExtValInClass<P> {
var Int.asas: P
get() = throw Exception()
set(p: P) = throw Exception()
}
compiler/testData/readClass/prop/ExtVarIntTQInClass.kt
+7
View File
@@ -0,0 +1,7 @@
package test
class ExtValInClass<P> {
var Int.asas: P?
get() = throw Exception()
set(p: P?) = throw Exception()
}
compiler/testData/readClass/prop/ExtVarMapPQInt.kt
+7
View File
@@ -0,0 +1,7 @@
package test
import java.util.Map
var <P, Q> Map<P, Q>.asas: Int
get() = throw Exception()
set(i: Int) = throw Exception()
compiler/testData/readClass/prop/ExtVarTIntInClass.kt
+7
View File
@@ -0,0 +1,7 @@
package test
class ExtValPIntInClass<P> {
var P.asas: Int
get() = throw Exception()
set(p: Int) = throw Exception()
}
compiler/testData/readClass/prop/ExtVarTQIntInClass.kt
+7
View File
@@ -0,0 +1,7 @@
package test
class ExtValPIntInClass<P> {
var P?.asas: Int
get() = throw Exception()
set(p: Int) = throw Exception()
}
compiler/testData/readClass/type/ArrayOfCharSequence.kt
+3
View File
@@ -0,0 +1,3 @@
package test
fun nothing(): Array<java.lang.CharSequence> = throw Exception()
compiler/testData/writeSignature/Int.kt
+6
View File
@@ -0,0 +1,6 @@
fun key(): Int = throw Exception()
// method: namespace::key
// jvm signature: ()I
// generic signature: null
// kotlin signature: ()I // TODO: make null
compiler/testData/writeSignature/IntQ.kt
+6
View File
@@ -0,0 +1,6 @@
fun sometimes(): Int? = null
// method: namespace::sometimes
// jvm signature: ()Ljava/lang/Integer;
// generic signature: null
// kotlin signature: ()?Ljava/lang/Integer; // TODO: need to skip kotlin signature
compiler/testData/writeSignature/VarargCharSequence.kt
+6
View File
@@ -0,0 +1,6 @@
fun foo(vararg tail: java.lang.CharSequence) = 1
// method: namespace::foo
// jvm signature: ([Ljava/lang/CharSequence;)I
// generic signature: null
// kotlin signature: ([Ljava/lang/CharSequence;)I // TODO: need to skip kotlin signature
compiler/testData/writeSignature/VarargGeneric.kt
+8
View File
@@ -0,0 +1,8 @@
fun <P> foo(vararg tail: P) = 1
// method: namespace::foo
// jvm signature: (Ljet/TypeInfo;[Ljava/lang/Object;)I
// generic signature: <P:Ljava/lang/Object;>(Ljet/TypeInfo;[TP;)I
// kotlin signature: <P:?Ljava/lang/Object;>(null[TP;)I
// TODO: skip kotlin signature
// TODO: properly serialize typeinfo