jlengrand/kotlin
1
0
Fork 0
mirror of https://github.com/jlengrand/kotlin.git synced 2026-05-09 15:53:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Support parameter annotations. Fix class path and test data

Browse Source
This commit is contained in:
Andrey Breslav
2013-10-30 15:44:57 +04:00
parent c034d5e675
commit 083644ea43
11 changed files with 43 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
compiler/testData/loadJava/compiledJavaCompareWithKotlin/mutability/LoadIterable.kt
View File

@@ -1,9 +1,13 @@
package test
public trait LoadIterable<T> : java.lang.Object {
public fun getIterable(): MutableIterable<T>?
public fun setIterable(p0: MutableIterable<T>?)
import org.jetbrains.annotations.*
public trait LoadIterable<T> : java.lang.Object {
Mutable
public fun getIterable(): MutableIterable<T>?
public fun setIterable([Mutable] p0: MutableIterable<T>?)
ReadOnly
public fun getReadOnlyIterable(): Iterable<T>?
public fun setReadOnlyIterable(p0: Iterable<T>?)
public fun setReadOnlyIterable([ReadOnly] p0: Iterable<T>?)
}

8
compiler/testData/loadJava/compiledJavaCompareWithKotlin/mutability/LoadIterable.txt
View File

@@ -1,8 +1,8 @@
package test
public trait LoadIterable</*0*/ T> : java.lang.Object {
public abstract fun getIterable(): jet.MutableIterable<T>?
public abstract fun getReadOnlyIterable(): jet.Iterable<T>?
public abstract fun setIterable(/*0*/ p0: jet.MutableIterable<T>?): jet.Unit
public abstract fun setReadOnlyIterable(/*0*/ p0: jet.Iterable<T>?): jet.Unit
org.jetbrains.annotations.Mutable() public abstract fun getIterable(): jet.MutableIterable<T>?
org.jetbrains.annotations.ReadOnly() public abstract fun getReadOnlyIterable(): jet.Iterable<T>?
public abstract fun setIterable(/*0*/ org.jetbrains.annotations.Mutable() p0: jet.MutableIterable<T>?): jet.Unit
public abstract fun setReadOnlyIterable(/*0*/ org.jetbrains.annotations.ReadOnly() p0: jet.Iterable<T>?): jet.Unit
}

5
compiler/testData/loadJava/compiledJavaCompareWithKotlin/mutability/LoadIterableWithConflict.kt
View File

@@ -1,6 +1,9 @@
package test
import org.jetbrains.annotations.*
public trait LoadIterableWithConflict<T> : java.lang.Object {
[ReadOnly] [Mutable]
public fun getIterable(): MutableIterable<T>?
public fun setIterable(p0: MutableIterable<T>?)
public fun setIterable([ReadOnly] [Mutable] p0: MutableIterable<T>?)
}

4
compiler/testData/loadJava/compiledJavaCompareWithKotlin/mutability/LoadIterableWithConflict.txt
View File

@@ -1,6 +1,6 @@
package test
public trait LoadIterableWithConflict</*0*/ T> : java.lang.Object {
public abstract fun getIterable(): jet.MutableIterable<T>?
public abstract fun setIterable(/*0*/ p0: jet.MutableIterable<T>?): jet.Unit
org.jetbrains.annotations.ReadOnly() org.jetbrains.annotations.Mutable() public abstract fun getIterable(): jet.MutableIterable<T>?
public abstract fun setIterable(/*0*/ org.jetbrains.annotations.ReadOnly() org.jetbrains.annotations.Mutable() p0: jet.MutableIterable<T>?): jet.Unit
}

12
compiler/testData/loadJava/compiledJavaCompareWithKotlin/mutability/LoadIterableWithNullability.kt
View File

@@ -1,9 +1,13 @@
package test
public trait LoadIterableWithNullability<T> : java.lang.Object {
public fun getIterable(): MutableIterable<T>
public fun setIterable(p0: MutableIterable<T>)
import org.jetbrains.annotations.*
public trait LoadIterableWithNullability<T> : java.lang.Object {
Mutable
public fun getIterable(): MutableIterable<T>
public fun setIterable([Mutable] p0: MutableIterable<T>)
ReadOnly
public fun getReadOnlyIterable(): Iterable<T>
public fun setReadOnlyIterable(p0: Iterable<T>)
public fun setReadOnlyIterable([ReadOnly] p0: Iterable<T>)
}

8
compiler/testData/loadJava/compiledJavaCompareWithKotlin/mutability/LoadIterableWithNullability.txt
View File

@@ -1,8 +1,8 @@
package test
public trait LoadIterableWithNullability</*0*/ T> : java.lang.Object {
public abstract fun getIterable(): jet.MutableIterable<T>
public abstract fun getReadOnlyIterable(): jet.Iterable<T>
public abstract fun setIterable(/*0*/ p0: jet.MutableIterable<T>): jet.Unit
public abstract fun setReadOnlyIterable(/*0*/ p0: jet.Iterable<T>): jet.Unit
org.jetbrains.annotations.Mutable() public abstract fun getIterable(): jet.MutableIterable<T>
org.jetbrains.annotations.ReadOnly() public abstract fun getReadOnlyIterable(): jet.Iterable<T>
public abstract fun setIterable(/*0*/ org.jetbrains.annotations.Mutable() p0: jet.MutableIterable<T>): jet.Unit
public abstract fun setReadOnlyIterable(/*0*/ org.jetbrains.annotations.ReadOnly() p0: jet.Iterable<T>): jet.Unit
}

7
compiler/testData/loadJava/compiledJavaCompareWithKotlin/mutability/LoadIterableWithPropagation.kt
View File

@@ -1,14 +1,17 @@
package test
import java.util.ArrayList
import org.jetbrains.annotations.*
public trait LoadIterableWithPropagation: java.lang.Object {
public trait LoadIterable<T> : java.lang.Object {
Mutable
public fun getIterable(): MutableIterable<T>?
public fun setIterable(p0: MutableIterable<T>?)
public fun setIterable([Mutable] p0: MutableIterable<T>?)
ReadOnly
public fun getReadOnlyIterable(): Iterable<T>?
public fun setReadOnlyIterable(p0: Iterable<T>?)
public fun setReadOnlyIterable([ReadOnly] p0: Iterable<T>?)
}
public open class LoadIterableImpl<T> : LoadIterable<T> {

8
compiler/testData/loadJava/compiledJavaCompareWithKotlin/mutability/LoadIterableWithPropagation.txt
View File

@@ -3,10 +3,10 @@ package test
public trait LoadIterableWithPropagation : java.lang.Object {
public trait LoadIterable</*0*/ T> : java.lang.Object {
public abstract fun getIterable(): jet.MutableIterable<T>?
public abstract fun getReadOnlyIterable(): jet.Iterable<T>?
public abstract fun setIterable(/*0*/ p0: jet.MutableIterable<T>?): jet.Unit
public abstract fun setReadOnlyIterable(/*0*/ p0: jet.Iterable<T>?): jet.Unit
org.jetbrains.annotations.Mutable() public abstract fun getIterable(): jet.MutableIterable<T>?
org.jetbrains.annotations.ReadOnly() public abstract fun getReadOnlyIterable(): jet.Iterable<T>?
public abstract fun setIterable(/*0*/ org.jetbrains.annotations.Mutable() p0: jet.MutableIterable<T>?): jet.Unit
public abstract fun setReadOnlyIterable(/*0*/ org.jetbrains.annotations.ReadOnly() p0: jet.Iterable<T>?): jet.Unit
}
public open class LoadIterableImpl</*0*/ T> : test.LoadIterableWithPropagation.LoadIterable<T> {