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

Unit.VALUE -> Unit in testData

Browse Source
This commit is contained in:
Zalim Bashorov
2014-07-12 21:25:00 +04:00
parent 4a8519615a
commit c767ffc3e7
49 changed files with 103 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/override/EqualityOfIntersectionTypes.kt
+3 -3
View File
@@ -4,12 +4,12 @@ trait Bar
trait A {
fun <T> foo()
where T : Foo, T : Bar
= Unit.VALUE
= Unit
}
class B : A {
override fun <T> foo()
where T : Foo, T : Bar
= Unit.VALUE
= Unit
}
}
compiler/testData/diagnostics/tests/override/NonGenerics.kt
+9 -9
View File
@@ -15,8 +15,8 @@ open class MyClass() : MyTrait, MyAbstractClass() {
override fun foo() {}
override fun bar() {}
override val pr : Unit = Unit.VALUE
override val prr : Unit = Unit.VALUE
override val pr : Unit = Unit
override val prr : Unit = Unit
}
class MyChildClass() : MyClass() {}
@@ -25,14 +25,14 @@ class <!ABSTRACT_MEMBER_NOT_IMPLEMENTED!>MyIllegalClass<!> : MyTrait, MyAbstract
class <!ABSTRACT_MEMBER_NOT_IMPLEMENTED!>MyIllegalClass2<!>() : MyTrait, MyAbstractClass() {
override fun foo() {}
override val pr : Unit = Unit.VALUE
override val prr : Unit = Unit.VALUE
override val pr : Unit = Unit
override val prr : Unit = Unit
}
class <!ABSTRACT_MEMBER_NOT_IMPLEMENTED!>MyIllegalClass3<!>() : MyTrait, MyAbstractClass() {
override fun bar() {}
override val pr : Unit = Unit.VALUE
override val prr : Unit = Unit.VALUE
override val pr : Unit = Unit
override val prr : Unit = Unit
}
class <!ABSTRACT_MEMBER_NOT_IMPLEMENTED!>MyIllegalClass4<!>() : MyTrait, MyAbstractClass() {
@@ -44,7 +44,7 @@ class <!ABSTRACT_MEMBER_NOT_IMPLEMENTED!>MyIllegalClass4<!>() : MyTrait, MyAbstr
class MyChildClass1() : MyClass() {
<!VIRTUAL_MEMBER_HIDDEN!>fun foo()<!> {}
<!VIRTUAL_MEMBER_HIDDEN!>val pr : Unit<!> = Unit.VALUE
<!VIRTUAL_MEMBER_HIDDEN!>val pr : Unit<!> = Unit
override fun bar() {}
override val prr : Unit = Unit.VALUE
}
override val prr : Unit = Unit
}