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

Sorting upper bounds when rendering "where" to workaround failing test.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-12-26 17:52:16 +04:00
parent 20341a84e6
commit ef1ffa4bf7
4 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/renderer/Classes.kt
+1 -1
View File
@@ -51,5 +51,5 @@ public trait TwoUpperBounds<T> where T: Number, T: Any
//public constructor WithReified<reified A, reified out B>() defined in rendererTest.WithReified
//<reified A> defined in rendererTest.WithReified
//<reified out B> defined in rendererTest.WithReified
//public trait TwoUpperBounds<T> where T : jet.Number, T : jet.Any defined in rendererTest
//public trait TwoUpperBounds<T> where T : jet.Any, T : jet.Number defined in rendererTest
//<T : jet.Number & jet.Any> defined in rendererTest.TwoUpperBounds
compiler/testData/renderer/GlobalFunctions.kt
+1 -1
View File
@@ -33,6 +33,6 @@ deprecated("") fun deprecatedFun()
//value-parameter val a : jet.Array<T> defined in rendererTest.withTypeParam
//internal trait Foo defined in rendererTest
//internal trait Bar defined in rendererTest
//internal final fun <P> funTypeParameterWithTwoUpperBounds() : jet.Int where P : rendererTest.Foo, P : rendererTest.Bar defined in rendererTest
//internal final fun <P> funTypeParameterWithTwoUpperBounds() : jet.Int where P : rendererTest.Bar, P : rendererTest.Foo defined in rendererTest
//<P : rendererTest.Foo & rendererTest.Bar> defined in rendererTest.funTypeParameterWithTwoUpperBounds
//jet.deprecated internal final fun deprecatedFun() : Unit defined in rendererTest