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

Fix wrong containingDeclaration for property type parameter.

Browse Source
This commit is contained in:
Stanislav Erokhin
2014-08-21 15:08:01 +04:00
parent b69ed539ea
commit c10c1ad7f6
6 changed files with 375 additions and 351 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/renderer/Classes.kt
+8
View File
@@ -9,6 +9,9 @@ public open class TheClass<out T : Int, X> [AnotherAnnotation] () {
val shouldBeFinal: Int = 5
val <T> T.checkTypeParameterScope: Int get() = 6
val <T> checkTypeParameterScope2 = 6
protected abstract fun foo() {}
private class Inner {}
@@ -40,6 +43,11 @@ public trait TwoUpperBounds<T> where T : Number, T : Any
//<X> defined in rendererTest.TheClass
//private final val privateVal: kotlin.Int defined in rendererTest.TheClass
//internal final val shouldBeFinal: kotlin.Int defined in rendererTest.TheClass
//internal final val <T> T.checkTypeParameterScope: kotlin.Int defined in rendererTest.TheClass
//<T> defined in rendererTest.TheClass.checkTypeParameterScope
//internal final fun T.<get-checkTypeParameterScope>(): kotlin.Int defined in rendererTest.TheClass
//internal final val <T> checkTypeParameterScope2: kotlin.Int defined in rendererTest.TheClass
//<T> defined in rendererTest.TheClass.checkTypeParameterScope2
//protected abstract fun foo(): kotlin.Unit defined in rendererTest.TheClass
//private final class Inner defined in rendererTest.TheClass
//public constructor Inner() defined in rendererTest.TheClass.Inner
compiler/testData/renderer/GlobalProperties.kt
+1 -1
View File
@@ -25,5 +25,5 @@ get() {}
//public fun kotlin.Int.<get-ext>(): kotlin.Int defined in rendererTest
//kotlin.deprecated internal val deprecatedVal: kotlin.Int defined in rendererTest
//public val <T : kotlin.CharSequence> T.extWithTwoUpperBounds: kotlin.Int where T : kotlin.Number defined in rendererTest
//<T : kotlin.CharSequence & kotlin.Number> defined in rendererTest
//<T : kotlin.CharSequence & kotlin.Number> defined in rendererTest.extWithTwoUpperBounds
//public fun T.<get-extWithTwoUpperBounds>(): kotlin.Int defined in rendererTest