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

CONFLICTING_PLATFORM_DECLARATIONS moved to a JVM-specific class

Browse Source
This commit is contained in:
Andrey Breslav
2014-05-28 17:59:11 +04:00
parent 22c47c2f82
commit 38333d6cea
43 changed files with 178 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/class.kt
+2 -2
View File
@@ -1,4 +1,4 @@
class C {
<!CONFLICTING_PLATFORM_DECLARATIONS!>val x<!> = 1
<!CONFLICTING_PLATFORM_DECLARATIONS!>fun getX()<!> = 1
<!CONFLICTING_JVM_DECLARATIONS!>val x<!> = 1
<!CONFLICTING_JVM_DECLARATIONS!>fun getX()<!> = 1
}
compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/classObject.kt
+2 -2
View File
@@ -1,6 +1,6 @@
class C {
class object {
<!CONFLICTING_PLATFORM_DECLARATIONS!>val x<!> = 1
<!CONFLICTING_PLATFORM_DECLARATIONS!>fun getX()<!> = 1
<!CONFLICTING_JVM_DECLARATIONS!>val x<!> = 1
<!CONFLICTING_JVM_DECLARATIONS!>fun getX()<!> = 1
}
}
compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/extensionFunctionAndNormalFunction.kt
+2 -2
View File
@@ -1,6 +1,6 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER
class C {
<!CONFLICTING_PLATFORM_DECLARATIONS!>fun foo(x: Any)<!> {}
<!CONFLICTING_PLATFORM_DECLARATIONS!>fun Any.foo()<!> {}
<!CONFLICTING_JVM_DECLARATIONS!>fun foo(x: Any)<!> {}
<!CONFLICTING_JVM_DECLARATIONS!>fun Any.foo()<!> {}
}
compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/extensionPropertyAndFunction.kt
+2 -2
View File
@@ -1,7 +1,7 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER
class C {
<!CONFLICTING_PLATFORM_DECLARATIONS!>fun getX(t: Any)<!> = 1
<!CONFLICTING_JVM_DECLARATIONS!>fun getX(t: Any)<!> = 1
val Any.x: Int
<!CONFLICTING_PLATFORM_DECLARATIONS!>get()<!> = 1
<!CONFLICTING_JVM_DECLARATIONS!>get()<!> = 1
}
compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/functionAndSetter.kt
+2 -2
View File
@@ -1,7 +1,7 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER
class C {
<!CONFLICTING_PLATFORM_DECLARATIONS!>fun setX(x: Int)<!> {}
<!CONFLICTING_JVM_DECLARATIONS!>fun setX(x: Int)<!> {}
<!CONFLICTING_PLATFORM_DECLARATIONS!>var x: Int<!> = 1
<!CONFLICTING_JVM_DECLARATIONS!>var x: Int<!> = 1
}
compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/functionAndVar.kt
+2 -2
View File
@@ -1,8 +1,8 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER
class C {
<!CONFLICTING_PLATFORM_DECLARATIONS!>fun setX(x: Int)<!> {}
<!CONFLICTING_JVM_DECLARATIONS!>fun setX(x: Int)<!> {}
var x: Int = 1
<!CONFLICTING_PLATFORM_DECLARATIONS!>set(v) {}<!>
<!CONFLICTING_JVM_DECLARATIONS!>set(v) {}<!>
}
compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/localClass.kt
+2 -2
View File
@@ -1,6 +1,6 @@
fun foo() {
class C {
<!CONFLICTING_PLATFORM_DECLARATIONS!>val x<!> = 1
<!CONFLICTING_PLATFORM_DECLARATIONS!>fun getX()<!> = 1
<!CONFLICTING_JVM_DECLARATIONS!>val x<!> = 1
<!CONFLICTING_JVM_DECLARATIONS!>fun getX()<!> = 1
}
}
compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/nestedClass.kt
+2 -2
View File
@@ -1,6 +1,6 @@
class B {
class C {
<!CONFLICTING_PLATFORM_DECLARATIONS!>val x<!> = 1
<!CONFLICTING_PLATFORM_DECLARATIONS!>fun getX()<!> = 1
<!CONFLICTING_JVM_DECLARATIONS!>val x<!> = 1
<!CONFLICTING_JVM_DECLARATIONS!>fun getX()<!> = 1
}
}
compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/object.kt
+2 -2
View File
@@ -1,4 +1,4 @@
object C {
<!CONFLICTING_PLATFORM_DECLARATIONS!>val x<!> = 1
<!CONFLICTING_PLATFORM_DECLARATIONS!>fun getX()<!> = 1
<!CONFLICTING_JVM_DECLARATIONS!>val x<!> = 1
<!CONFLICTING_JVM_DECLARATIONS!>fun getX()<!> = 1
}
compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/objectExpression.kt
+2 -2
View File
@@ -1,5 +1,5 @@
fun foo() =
object {
<!CONFLICTING_PLATFORM_DECLARATIONS!>val x<!> = 1
<!CONFLICTING_PLATFORM_DECLARATIONS!>fun getX()<!> = 1
<!CONFLICTING_JVM_DECLARATIONS!>val x<!> = 1
<!CONFLICTING_JVM_DECLARATIONS!>fun getX()<!> = 1
}
compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevel.kt
+2 -2
View File
@@ -1,2 +1,2 @@
<!CONFLICTING_PLATFORM_DECLARATIONS!>val x<!> = 1
<!CONFLICTING_PLATFORM_DECLARATIONS!>fun getX()<!> = 1
<!CONFLICTING_JVM_DECLARATIONS!>val x<!> = 1
<!CONFLICTING_JVM_DECLARATIONS!>fun getX()<!> = 1
compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevelDifferentFiles.kt
+2 -2
View File
@@ -1,5 +1,5 @@
// FILE: a.kt
<!CONFLICTING_PLATFORM_DECLARATIONS!>val x<!> = 1
<!CONFLICTING_JVM_DECLARATIONS!>val x<!> = 1
// FILE: b.kt
<!CONFLICTING_PLATFORM_DECLARATIONS!>fun getX()<!> = 1
<!CONFLICTING_JVM_DECLARATIONS!>fun getX()<!> = 1
compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevelGetter.kt
+2 -2
View File
@@ -1,3 +1,3 @@
val x: Int
<!CONFLICTING_PLATFORM_DECLARATIONS!>get()<!> = 1
<!CONFLICTING_PLATFORM_DECLARATIONS!>fun getX()<!> = 1
<!CONFLICTING_JVM_DECLARATIONS!>get()<!> = 1
<!CONFLICTING_JVM_DECLARATIONS!>fun getX()<!> = 1
compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/trait.kt
+2 -2
View File
@@ -1,5 +1,5 @@
trait T {
val x: Int
<!CONFLICTING_PLATFORM_DECLARATIONS!>get()<!> = 1
<!CONFLICTING_PLATFORM_DECLARATIONS!>fun getX()<!> = 1
<!CONFLICTING_JVM_DECLARATIONS!>get()<!> = 1
<!CONFLICTING_JVM_DECLARATIONS!>fun getX()<!> = 1
}