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

Removed sorting of upper bounds in renderer.

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java
-2
View File
@@ -473,8 +473,6 @@ public class DescriptorRendererImpl implements DescriptorRenderer {
}
}
}
Collections.sort(upperBoundStrings); // TODO workaround for failing load kotlin test
if (!upperBoundStrings.isEmpty()) {
builder.append(" ").append(renderKeyword("where")).append(" ");
builder.append(StringUtil.join(upperBoundStrings, ", "));
compiler/testData/loadJava/kotlinSignature/error/MissingUpperBound.txt
+1 -1
View File
@@ -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?
}
compiler/testData/loadJava/kotlinSignature/propagation/typeParameter/TwoBounds.txt
+2 -2
View File
@@ -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
}
}
compiler/testData/loadKotlin/class/ClassParamUpperClassInterfaceBound.txt
+1 -1
View File
@@ -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>()
}
compiler/testData/loadKotlin/class/ClassParamUpperInterfaceClassBound.kt
-3
View File
@@ -1,3 +0,0 @@
package test
class Clock<A> where A : java.io.Serializable, A : java.lang.Number
compiler/testData/loadKotlin/class/ClassParamUpperInterfaceClassBound.txt
-5
View File
@@ -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>()
}
compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamTwoUpperBounds.txt
+1 -1
View File
@@ -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 {
}
compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamUpperClassInterfaceBound.txt
+1 -1
View File
@@ -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
compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamUpperInterfaceClassBound.kt
-3
View File
@@ -1,3 +0,0 @@
package test
fun <A> cuatro() where A : java.io.Serializable, A : java.lang.Number = 1
compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamUpperInterfaceClassBound.txt
-3
View File
@@ -1,3 +0,0 @@
package test
internal fun </*0*/ A> cuatro() : jet.Int where A : java.io.Serializable, A : java.lang.Number
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.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
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 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
compiler/tests/org/jetbrains/jet/jvm/compiler/LoadCompiledKotlinTestGenerated.java
-10
View File
@@ -95,11 +95,6 @@ public class LoadCompiledKotlinTestGenerated extends AbstractLoadCompiledKotlinT
doTest("compiler/testData/loadKotlin/class/ClassParamUpperInterfaceBound.kt");
}
@TestMetadata("ClassParamUpperInterfaceClassBound.kt")
public void testClassParamUpperInterfaceClassBound() throws Exception {
doTest("compiler/testData/loadKotlin/class/ClassParamUpperInterfaceClassBound.kt");
}
@TestMetadata("ClassTwoParams.kt")
public void testClassTwoParams() throws Exception {
doTest("compiler/testData/loadKotlin/class/ClassTwoParams.kt");
@@ -417,11 +412,6 @@ public class LoadCompiledKotlinTestGenerated extends AbstractLoadCompiledKotlinT
doTest("compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamUpperInterfaceBound.kt");
}
@TestMetadata("FunParamUpperInterfaceClassBound.kt")
public void testFunParamUpperInterfaceClassBound() throws Exception {
doTest("compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamUpperInterfaceClassBound.kt");
}
@TestMetadata("FunParamVaragParam.kt")
public void testFunParamVaragParam() throws Exception {
doTest("compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamVaragParam.kt");
compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java
+2 -12
View File
@@ -97,11 +97,6 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso
doTestCheckingPrimaryConstructors("compiler/testData/loadKotlin/class/ClassParamUpperInterfaceBound.kt");
}
@TestMetadata("ClassParamUpperInterfaceClassBound.kt")
public void testClassParamUpperInterfaceClassBound() throws Exception {
doTestCheckingPrimaryConstructors("compiler/testData/loadKotlin/class/ClassParamUpperInterfaceClassBound.kt");
}
@TestMetadata("ClassTwoParams.kt")
public void testClassTwoParams() throws Exception {
doTestCheckingPrimaryConstructors("compiler/testData/loadKotlin/class/ClassTwoParams.kt");
@@ -419,11 +414,6 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso
doTestCheckingPrimaryConstructors("compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamUpperInterfaceBound.kt");
}
@TestMetadata("FunParamUpperInterfaceClassBound.kt")
public void testFunParamUpperInterfaceClassBound() throws Exception {
doTestCheckingPrimaryConstructors("compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamUpperInterfaceClassBound.kt");
}
@TestMetadata("FunParamVaragParam.kt")
public void testFunParamVaragParam() throws Exception {
doTestCheckingPrimaryConstructors("compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamVaragParam.kt");
@@ -1816,9 +1806,9 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/lazyResolve/namespaceComparator"), "kt", true);
}
@TestMetadata("classObject.kt")
@TestMetadata("ClassObject.kt")
public void testClassObject() throws Exception {
doTestCheckingPrimaryConstructors("compiler/testData/lazyResolve/namespaceComparator/classObject.kt");
doTestCheckingPrimaryConstructors("compiler/testData/lazyResolve/namespaceComparator/ClassObject.kt");
}
@TestMetadata("classObjectAnnotation.kt")
idea/testData/diagnosticMessage/conflictingSubstitutions1.html
+1 -1
View File
@@ -22,7 +22,7 @@ t : T</td>
<td style="white-space:nowrap;font-weight:bold;">
: Unit <b>
where</b>
E : java.io.Closeable, E : java.lang.Cloneable</td>
E : java.lang.Cloneable, E : java.io.Closeable</td>
</tr>
<tr>
<td colspan="8" style="white-space:nowrap;">