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

Fix testData in compiler: add collections and ranges package to fq-names.

Browse Source
This commit is contained in:
Ilya Gorbunov
2015-11-28 01:42:20 +03:00
parent 98e2d27c77
commit f4822cd757
524 changed files with 1594 additions and 1552 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/genericClassFunction.txt
Vendored
+3 -3
View File
@@ -3,7 +3,7 @@ package
public open class B {
public constructor B()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final fun foo(/*0*/ l: kotlin.List<kotlin.String>): kotlin.Unit
public final fun foo(/*0*/ l: kotlin.collections.List<kotlin.String>): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
@@ -11,8 +11,8 @@ public open class B {
public final class C : B {
public constructor C()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final fun foo(/*0*/ l: kotlin.List<kotlin.Int>): kotlin.Unit
public final override /*1*/ /*fake_override*/ fun foo(/*0*/ l: kotlin.List<kotlin.String>): kotlin.Unit
public final fun foo(/*0*/ l: kotlin.collections.List<kotlin.Int>): kotlin.Unit
public final override /*1*/ /*fake_override*/ fun foo(/*0*/ l: kotlin.collections.List<kotlin.String>): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/collections.txt
Vendored
+2 -2
View File
@@ -1,4 +1,4 @@
package
public fun foo(/*0*/ s: kotlin.List<kotlin.String>): kotlin.Unit
public fun foo(/*0*/ s: kotlin.MutableList<kotlin.String>): kotlin.Unit
public fun foo(/*0*/ s: kotlin.collections.List<kotlin.String>): kotlin.Unit
public fun foo(/*0*/ s: kotlin.collections.MutableList<kotlin.String>): kotlin.Unit
compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegateToTwoTraits.txt
Vendored
+4 -4
View File
@@ -2,7 +2,7 @@ package
public interface Bar</*0*/ T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract fun foo(/*0*/ l: kotlin.List<T>): kotlin.Unit
public abstract fun foo(/*0*/ l: kotlin.collections.List<T>): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
@@ -10,15 +10,15 @@ public interface Bar</*0*/ T> {
public final class Baz : Foo<kotlin.String>, Bar<kotlin.Int> {
public constructor Baz(/*0*/ f: Foo<kotlin.String>, /*1*/ b: Bar<kotlin.Int>)
public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*delegation*/ fun foo(/*0*/ l: kotlin.List<kotlin.Int>): kotlin.Unit
public open override /*1*/ /*delegation*/ fun foo(/*0*/ l: kotlin.List<kotlin.String>): kotlin.Unit
public open override /*1*/ /*delegation*/ fun foo(/*0*/ l: kotlin.collections.List<kotlin.Int>): kotlin.Unit
public open override /*1*/ /*delegation*/ fun foo(/*0*/ l: kotlin.collections.List<kotlin.String>): kotlin.Unit
public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
}
public interface Foo</*0*/ T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract fun foo(/*0*/ l: kotlin.List<T>): kotlin.Unit
public abstract fun foo(/*0*/ l: kotlin.collections.List<T>): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegationAndOwnMethod.txt
Vendored
+3 -3
View File
@@ -3,15 +3,15 @@ package
public final class Bar : Foo<kotlin.String> {
public constructor Bar(/*0*/ f: Foo<kotlin.String>)
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final fun foo(/*0*/ l: kotlin.List<kotlin.Int>): kotlin.Unit
public open override /*1*/ /*delegation*/ fun foo(/*0*/ l: kotlin.List<kotlin.String>): kotlin.Unit
public final fun foo(/*0*/ l: kotlin.collections.List<kotlin.Int>): kotlin.Unit
public open override /*1*/ /*delegation*/ fun foo(/*0*/ l: kotlin.collections.List<kotlin.String>): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public interface Foo</*0*/ T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract fun foo(/*0*/ l: kotlin.List<T>): kotlin.Unit
public abstract fun foo(/*0*/ l: kotlin.collections.List<T>): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegationToTraitImplAndOwnMethod.txt
Vendored
+4 -4
View File
@@ -3,8 +3,8 @@ package
public final class Bar : Foo<kotlin.String> {
public constructor Bar(/*0*/ f: Foo<kotlin.String>)
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final fun foo(/*0*/ l: kotlin.List<kotlin.Int>): kotlin.Unit
public open override /*1*/ /*delegation*/ fun foo(/*0*/ l: kotlin.List<kotlin.String>): kotlin.Unit
public final fun foo(/*0*/ l: kotlin.collections.List<kotlin.Int>): kotlin.Unit
public open override /*1*/ /*delegation*/ fun foo(/*0*/ l: kotlin.collections.List<kotlin.String>): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
@@ -12,14 +12,14 @@ public final class Bar : Foo<kotlin.String> {
public final class BarOther : Foo<kotlin.String> {
public constructor BarOther(/*0*/ f: Foo<kotlin.String>)
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ fun foo(/*0*/ l: kotlin.List<kotlin.String>): kotlin.Unit
public open override /*1*/ fun foo(/*0*/ l: kotlin.collections.List<kotlin.String>): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public interface Foo</*0*/ T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open fun foo(/*0*/ l: kotlin.List<T>): kotlin.Unit
public open fun foo(/*0*/ l: kotlin.collections.List<T>): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/inheritFromTwoTraits.txt
Vendored
+4 -4
View File
@@ -2,7 +2,7 @@ package
public interface Bar</*0*/ T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open fun foo(/*0*/ l: kotlin.List<T>): kotlin.Unit
public open fun foo(/*0*/ l: kotlin.collections.List<T>): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
@@ -10,15 +10,15 @@ public interface Bar</*0*/ T> {
public final class Baz : Foo<kotlin.String>, Bar<kotlin.Int> {
public constructor Baz()
public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun foo(/*0*/ l: kotlin.List<kotlin.Int>): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun foo(/*0*/ l: kotlin.List<kotlin.String>): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun foo(/*0*/ l: kotlin.collections.List<kotlin.Int>): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun foo(/*0*/ l: kotlin.collections.List<kotlin.String>): kotlin.Unit
public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
}
public interface Foo</*0*/ T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open fun foo(/*0*/ l: kotlin.List<T>): kotlin.Unit
public open fun foo(/*0*/ l: kotlin.collections.List<T>): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/kotlinAndJavaCollections.txt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
package
public fun foo(/*0*/ s: java.util.List<kotlin.String>): kotlin.Unit
public fun foo(/*0*/ s: kotlin.List<kotlin.String>): kotlin.Unit
public fun foo(/*0*/ s: kotlin.collections.List<kotlin.String>): kotlin.Unit
compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/superTraitAndDelegationToTraitImpl.txt
Vendored
+5 -5
View File
@@ -2,14 +2,14 @@ package
public interface A</*0*/ T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract fun foo(/*0*/ l: kotlin.List<T>): kotlin.Unit
public abstract fun foo(/*0*/ l: kotlin.collections.List<T>): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public interface B {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open fun foo(/*0*/ l: kotlin.List<kotlin.Int>): kotlin.Unit
public open fun foo(/*0*/ l: kotlin.collections.List<kotlin.Int>): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
@@ -17,8 +17,8 @@ public interface B {
public final class C : A<kotlin.String>, B {
public constructor C(/*0*/ f: A<kotlin.String>)
public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun foo(/*0*/ l: kotlin.List<kotlin.Int>): kotlin.Unit
public open override /*1*/ /*delegation*/ fun foo(/*0*/ l: kotlin.List<kotlin.String>): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun foo(/*0*/ l: kotlin.collections.List<kotlin.Int>): kotlin.Unit
public open override /*1*/ /*delegation*/ fun foo(/*0*/ l: kotlin.collections.List<kotlin.String>): kotlin.Unit
public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
}
@@ -26,7 +26,7 @@ public final class C : A<kotlin.String>, B {
public final class D : A<kotlin.Int>, B {
public constructor D(/*0*/ f: A<kotlin.Int>)
public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*2*/ /*delegation*/ fun foo(/*0*/ l: kotlin.List<kotlin.Int>): kotlin.Unit
public open override /*2*/ /*delegation*/ fun foo(/*0*/ l: kotlin.collections.List<kotlin.Int>): kotlin.Unit
public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
}
compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/twoTraitsAndOwnFunction.txt
Vendored
+5 -5
View File
@@ -2,7 +2,7 @@ package
public interface Bar</*0*/ T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open fun foo(/*0*/ l: kotlin.List<T>): kotlin.Unit
public open fun foo(/*0*/ l: kotlin.collections.List<T>): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
@@ -10,16 +10,16 @@ public interface Bar</*0*/ T> {
public final class Baz : Foo<kotlin.String>, Bar<kotlin.Int> {
public constructor Baz()
public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun foo(/*0*/ l: kotlin.List<kotlin.Int>): kotlin.Unit
public final fun foo(/*0*/ l: kotlin.List<kotlin.Long>): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun foo(/*0*/ l: kotlin.List<kotlin.String>): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun foo(/*0*/ l: kotlin.collections.List<kotlin.Int>): kotlin.Unit
public final fun foo(/*0*/ l: kotlin.collections.List<kotlin.Long>): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun foo(/*0*/ l: kotlin.collections.List<kotlin.String>): kotlin.Unit
public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
}
public interface Foo</*0*/ T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open fun foo(/*0*/ l: kotlin.List<T>): kotlin.Unit
public open fun foo(/*0*/ l: kotlin.collections.List<T>): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}