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/Casts.kt
+1 -1
View File
@@ -12,5 +12,5 @@ fun test() : Unit {
y <!USELESS_CAST!>as?<!> Int : Int?
x <!USELESS_CAST!>as?<!> Int? : Int?
y <!USELESS_CAST_STATIC_ASSERT_IS_FINE!>as?<!> Int? : Int?
Unit.VALUE
Unit
}
compiler/testData/diagnostics/tests/FunctionReturnTypes.kt
+4 -4
View File
@@ -6,7 +6,7 @@ fun unitEmptyInfer() {}
fun unitEmpty() : Unit {}
fun unitEmptyReturn() : Unit {return}
fun unitIntReturn() : Unit {return <!CONSTANT_EXPECTED_TYPE_MISMATCH!>1<!>}
fun unitUnitReturn() : Unit {return Unit.VALUE}
fun unitUnitReturn() : Unit {return Unit}
fun test1() : Any = {<!RETURN_NOT_ALLOWED, RETURN_TYPE_MISMATCH!>return<!>}
fun test2() : Any = @a {<!RETURN_NOT_ALLOWED_EXPLICIT_RETURN_TYPE_REQUIRED!>return@a 1<!>}
fun test3() : Any { <!RETURN_TYPE_MISMATCH!>return<!> }
@@ -27,7 +27,7 @@ fun foo(<!UNUSED_PARAMETER!>expr<!>: StringBuilder): Int {
}
fun unitShort() : Unit = Unit.VALUE
fun unitShort() : Unit = Unit
fun unitShortConv() : Unit = <!CONSTANT_EXPECTED_TYPE_MISMATCH!>1<!>
fun unitShortNull() : Unit = <!NULL_FOR_NONNULL_TYPE!>null<!>
@@ -44,7 +44,7 @@ fun intFunctionLiteral(): Int = <!TYPE_MISMATCH!>{ 10 }<!>
fun blockReturnUnitMismatch() : Int {<!RETURN_TYPE_MISMATCH!>return<!>}
fun blockReturnValueTypeMismatch() : Int {return <!CONSTANT_EXPECTED_TYPE_MISMATCH!>3.4<!>}
fun blockReturnValueTypeMatch() : Int {return 1}
fun blockReturnValueTypeMismatchUnit() : Int {return <!TYPE_MISMATCH!>Unit.VALUE<!>}
fun blockReturnValueTypeMismatchUnit() : Int {return <!TYPE_MISMATCH!>Unit<!>}
fun blockAndAndMismatch() : Int {
true && false
@@ -205,4 +205,4 @@ fun testFunctionLiterals() {
object A {}
}
}
}
compiler/testData/diagnostics/tests/LValueAssignment.kt
+1 -1
View File
@@ -43,7 +43,7 @@ fun cannotBe() {
<!UNRESOLVED_REFERENCE!>z<!> = 30;
<!VARIABLE_EXPECTED!>""<!> = "";
<!VARIABLE_EXPECTED!>foo()<!> = Unit.VALUE;
<!VARIABLE_EXPECTED!>foo()<!> = Unit;
(<!VARIABLE_EXPECTED!>i <!USELESS_CAST!>as<!> Int<!>) = 34
(<!VARIABLE_EXPECTED!>i is Int<!>) = false
compiler/testData/diagnostics/tests/Nullability.kt
+8 -8
View File
@@ -39,7 +39,7 @@ fun test() {
<!DEBUG_INFO_AUTOCAST!>out<!>.println();
}
if (out == null || <!DEBUG_INFO_AUTOCAST!>out<!>.println(0) == Unit.VALUE) {
if (out == null || <!DEBUG_INFO_AUTOCAST!>out<!>.println(0) == Unit) {
out?.println(1)
out<!UNSAFE_CALL!>.<!>println(1)
}
@@ -47,21 +47,21 @@ fun test() {
<!DEBUG_INFO_AUTOCAST!>out<!>.println(2)
}
if (out != null && <!DEBUG_INFO_AUTOCAST!>out<!>.println() == Unit.VALUE) {
if (out != null && <!DEBUG_INFO_AUTOCAST!>out<!>.println() == Unit) {
<!DEBUG_INFO_AUTOCAST!>out<!>.println();
}
else {
out?.println();
}
if (out == null || <!DEBUG_INFO_AUTOCAST!>out<!>.println() == Unit.VALUE) {
if (out == null || <!DEBUG_INFO_AUTOCAST!>out<!>.println() == Unit) {
out?.println();
}
else {
<!DEBUG_INFO_AUTOCAST!>out<!>.println();
}
if (1 == 2 || out != null && <!DEBUG_INFO_AUTOCAST!>out<!>.println(1) == Unit.VALUE) {
if (1 == 2 || out != null && <!DEBUG_INFO_AUTOCAST!>out<!>.println(1) == Unit) {
out?.println(2);
out<!UNSAFE_CALL!>.<!>println(2);
}
@@ -98,7 +98,7 @@ fun test() {
<!DEBUG_INFO_AUTOCAST!>out<!>.println();
}
if (out == null || <!DEBUG_INFO_AUTOCAST!>out<!>.println(0) == Unit.VALUE) {
if (out == null || <!DEBUG_INFO_AUTOCAST!>out<!>.println(0) == Unit) {
out?.println(1)
out<!UNSAFE_CALL!>.<!>println(1)
}
@@ -106,7 +106,7 @@ fun test() {
<!DEBUG_INFO_AUTOCAST!>out<!>.println(2)
}
if (out != null && <!DEBUG_INFO_AUTOCAST!>out<!>.println() == Unit.VALUE) {
if (out != null && <!DEBUG_INFO_AUTOCAST!>out<!>.println() == Unit) {
<!DEBUG_INFO_AUTOCAST!>out<!>.println();
}
else {
@@ -114,7 +114,7 @@ fun test() {
out<!UNSAFE_CALL!>.<!>println();
}
if (out == null || <!DEBUG_INFO_AUTOCAST!>out<!>.println() == Unit.VALUE) {
if (out == null || <!DEBUG_INFO_AUTOCAST!>out<!>.println() == Unit) {
out?.println();
out<!UNSAFE_CALL!>.<!>println();
}
@@ -122,7 +122,7 @@ fun test() {
<!DEBUG_INFO_AUTOCAST!>out<!>.println();
}
if (1 == 2 || out != null && <!DEBUG_INFO_AUTOCAST!>out<!>.println(1) == Unit.VALUE) {
if (1 == 2 || out != null && <!DEBUG_INFO_AUTOCAST!>out<!>.println(1) == Unit) {
out?.println(2);
out<!UNSAFE_CALL!>.<!>println(2);
}
compiler/testData/diagnostics/tests/UnitValue.kt
+2 -2
View File
@@ -1,3 +1,3 @@
fun test() {
return Unit.VALUE : Unit
}
return Unit : Unit
}
compiler/testData/diagnostics/tests/dataFlow/EmptyIf.kt
+1 -1
View File
@@ -17,6 +17,6 @@ fun f3(s: Number?) {
fun f4(s: Int?) {
var u = <!IMPLICIT_CAST_TO_UNIT_OR_ANY!>if (s!! == 42)<!>;
if (u == Unit.VALUE) u = if (s == 239);
if (u == Unit) u = if (s == 239);
return u
}
compiler/testData/diagnostics/tests/extensions/ExtensionFunctions.kt
+1 -1
View File
@@ -2,7 +2,7 @@
package outer
fun Int?.optint() : Unit {}
val Int?.optval : Unit get() = Unit.VALUE
val Int?.optval : Unit get() = Unit
fun <T: Any, E> T.foo(<!UNUSED_PARAMETER!>x<!> : E, y : A) : T {
y.plus(1)
compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnUnit.kt
+2 -2
View File
@@ -1,9 +1,9 @@
fun test(a: Int) {
val x = run @f{
if (a > 0) <!RETURN_NOT_ALLOWED_EXPLICIT_RETURN_TYPE_REQUIRED!>return@f<!>
else <!RETURN_NOT_ALLOWED_EXPLICIT_RETURN_TYPE_REQUIRED!>return@f Unit.VALUE<!>
else <!RETURN_NOT_ALLOWED_EXPLICIT_RETURN_TYPE_REQUIRED!>return@f Unit<!>
}
x: Unit
}
fun run<T>(f: () -> T): T { return f() }
fun run<T>(f: () -> T): T { return f() }
compiler/testData/diagnostics/tests/infos/Autocasts.kt
+3 -3
View File
@@ -20,7 +20,7 @@ fun f9(init : A?) {
a?.<!UNRESOLVED_REFERENCE!>bar<!>()
a?.foo()
}
if (!(a is B) || <!DEBUG_INFO_AUTOCAST!>a<!>.bar() == Unit.VALUE) {
if (!(a is B) || <!DEBUG_INFO_AUTOCAST!>a<!>.bar() == Unit) {
a?.<!UNRESOLVED_REFERENCE!>bar<!>()
}
if (!(a is B)) {
@@ -102,7 +102,7 @@ fun f13(a : A?) {
}
a?.foo()
if (a is B && <!DEBUG_INFO_AUTOCAST!>a<!>.foo() == Unit.VALUE) {
if (a is B && <!DEBUG_INFO_AUTOCAST!>a<!>.foo() == Unit) {
<!DEBUG_INFO_AUTOCAST!>a<!>.foo()
<!DEBUG_INFO_AUTOCAST!>a<!>.bar()
}
@@ -216,4 +216,4 @@ fun foo(aa: Any): Int {
return <!AUTOCAST_IMPOSSIBLE!>a<!>
}
return 1
}
}
compiler/testData/diagnostics/tests/j+k/OverrideVararg.kt
+1 -1
View File
@@ -8,5 +8,5 @@ public abstract class Aaa {
// FILE: bbb.kt
class Bbb() : Aaa() {
override fun foo(vararg args: String?) = Unit.VALUE
override fun foo(vararg args: String?) = Unit
}
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
}
compiler/testData/diagnostics/tests/regressions/kt353.kt
+2 -2
View File
@@ -20,7 +20,7 @@ fun foo(a: A) {
a.gen() // unit can be inferred
}
else {
Unit.VALUE
Unit
}
}
@@ -29,4 +29,4 @@ fun foo(a: A) {
}
a.<!TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>gen<!>() // Shouldn't work: no info for inference
}
}
compiler/testData/diagnostics/testsWithStdLib/callableReference/property/memberFromExtension.kt
+1 -1
View File
@@ -1,7 +1,7 @@
import kotlin.reflect.*
class A {
val foo: Unit = Unit.VALUE
val foo: Unit = Unit
var bar: String = ""
var self: A
get() = this