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

Test data fixed

Browse Source
This commit is contained in:
Andrey Breslav
2014-06-03 19:58:18 +04:00
parent 38333d6cea
commit 592328aa27
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithTwoBounds.kt
+1 -1
View File
@@ -3,6 +3,6 @@
trait Foo
trait Bar
<!CONFLICTING_JVM_DECLARATIONS!>fun <T: Foo> foo(x: T): T where T: Bar<!> {null!!}
<!CONFLICTING_JVM_DECLARATIONS!>fun <T: Foo> foo(x: T): T<!> where T: Bar {null!!}
<!CONFLICTING_JVM_DECLARATIONS!>fun foo(x: Foo): Foo<!> {null!!}
fun foo(x: Bar): Bar {null!!}
compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithTwoBoundsInWhere.kt
+1 -1
View File
@@ -3,6 +3,6 @@
trait Foo
trait Bar
<!CONFLICTING_JVM_DECLARATIONS!>fun <T> foo(x: T): T where T: Foo, T: Bar<!> {null!!}
<!CONFLICTING_JVM_DECLARATIONS!>fun <T> foo(x: T): T<!> where T: Foo, T: Bar {null!!}
<!CONFLICTING_JVM_DECLARATIONS!>fun foo(x: Foo): Foo<!> {null!!}
fun foo(x: Bar): Bar {null!!}
compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/functionAndVar.kt
+1 -1
View File
@@ -4,5 +4,5 @@ class C {
<!CONFLICTING_JVM_DECLARATIONS!>fun setX(x: Int)<!> {}
var x: Int = 1
<!CONFLICTING_JVM_DECLARATIONS!>set(v) {}<!>
<!CONFLICTING_JVM_DECLARATIONS!>set(v)<!> {}
}
compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/defaults.kt
+1 -1
View File
@@ -1,6 +1,6 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER
<!CONFLICTING_JVM_DECLARATIONS!>class C<!> {
class <!CONFLICTING_JVM_DECLARATIONS!>C<!> {
<!CONFLICTING_JVM_DECLARATIONS!>fun `a$default`(c: C, x: Int, m: Int)<!> {}
fun a(x: Int = 1) {}
}
compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/innerClassField.kt
+1 -1
View File
@@ -1,7 +1,7 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER
class C {
<!CONFLICTING_JVM_DECLARATIONS!>inner class D<!> {
inner class <!CONFLICTING_JVM_DECLARATIONS!>D<!> {
<!CONFLICTING_JVM_DECLARATIONS!>val `this$0`: C?<!> = null
}
}