Removed sorting of upper bounds in renderer.

Removed corresponding test.
This commit is contained in:
Evgeny Gerashchenko
2012-12-28 11:03:44 +04:00
parent 6fa36d330c
commit c041fc8fea
15 changed files with 11 additions and 47 deletions
@@ -2,5 +2,5 @@ package test
public open class MissingUpperBound : java.lang.Object {
public constructor MissingUpperBound()
public open fun </*0*/ A> foo() : jet.String? where A : java.lang.Cloneable?, A : java.lang.Runnable?
public open fun </*0*/ A> foo() : jet.String? where A : java.lang.Runnable?, A : java.lang.Cloneable?
}
@@ -3,10 +3,10 @@ package test
public trait TwoBounds : java.lang.Object {
public trait Sub : test.TwoBounds.Super {
public abstract override /*1*/ fun </*0*/ B> foo(/*0*/ p0 : B) : Unit where B : java.lang.Cloneable, B : jet.CharSequence
public abstract override /*1*/ fun </*0*/ B> foo(/*0*/ p0 : B) : Unit where B : jet.CharSequence, B : java.lang.Cloneable
}
public trait Super : java.lang.Object {
public abstract fun </*0*/ A> foo(/*0*/ p0 : A) : Unit where A : java.lang.Cloneable, A : jet.CharSequence
public abstract fun </*0*/ A> foo(/*0*/ p0 : A) : Unit where A : jet.CharSequence, A : java.lang.Cloneable
}
}
@@ -1,5 +1,5 @@
package test
internal final class Clock</*0*/ A> where A : java.io.Serializable, A : java.lang.Number {
internal final class Clock</*0*/ A> where A : java.lang.Number, A : java.io.Serializable {
/*primary*/ public constructor Clock</*0*/ A>()
}
@@ -1,3 +0,0 @@
package test
class Clock<A> where A : java.io.Serializable, A : java.lang.Number
@@ -1,5 +0,0 @@
package test
internal final class Clock</*0*/ A> where A : java.io.Serializable, A : java.lang.Number {
/*primary*/ public constructor Clock</*0*/ A>()
}
@@ -1,6 +1,6 @@
package test
internal fun </*0*/ T> foo() : Unit where T : test.Bar, T : test.Foo
internal fun </*0*/ T> foo() : Unit where T : test.Foo, T : test.Bar
internal trait Bar {
}
@@ -1,3 +1,3 @@
package test
internal fun </*0*/ A> tres() : jet.Int where A : java.io.Serializable, A : java.lang.Number
internal fun </*0*/ A> tres() : jet.Int where A : java.lang.Number, A : java.io.Serializable
@@ -1,3 +0,0 @@
package test
fun <A> cuatro() where A : java.io.Serializable, A : java.lang.Number = 1
@@ -1,3 +0,0 @@
package test
internal fun </*0*/ A> cuatro() : jet.Int where A : java.io.Serializable, A : java.lang.Number
+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.Any, T : jet.Number defined in rendererTest
//public trait TwoUpperBounds<T> where T : jet.Number, T : jet.Any defined in rendererTest
//<T : jet.Number & jet.Any> defined in rendererTest.TwoUpperBounds
@@ -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 fun <P> funTypeParameterWithTwoUpperBounds() : jet.Int where P : rendererTest.Bar, P : rendererTest.Foo defined in rendererTest
//internal fun <P> funTypeParameterWithTwoUpperBounds() : jet.Int where P : rendererTest.Foo, P : rendererTest.Bar defined in rendererTest
//<P : rendererTest.Foo & rendererTest.Bar> defined in rendererTest.funTypeParameterWithTwoUpperBounds
//jet.deprecated internal fun deprecatedFun() : Unit defined in rendererTest