From c989b2e5ba6fd646470d9963289eb1768622c87b Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Wed, 4 Apr 2012 16:01:36 +0400 Subject: [PATCH] Updated "Autocasts" test data in JetPsiCheckerTest. Replaced types with their FQ names. --- idea/testData/checker/infos/Autocasts.jet | 38 +++++++++++------------ 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/idea/testData/checker/infos/Autocasts.jet b/idea/testData/checker/infos/Autocasts.jet index 4197d78d269..a6ce30da598 100644 --- a/idea/testData/checker/infos/Autocasts.jet +++ b/idea/testData/checker/infos/Autocasts.jet @@ -147,78 +147,78 @@ fun f15(a : A?) { fun getStringLength(obj : Any) : Char? { if (obj !is String) return null - return obj.get(0) // no cast to String is needed + return obj.get(0) // no cast to jet.String is needed } -fun toInt(i: Int?): Int = if (i != null) i else 0 +fun toInt(i: Int?): Int = if (i != null) i else 0 fun illegalWhenBody(a: Any): Int = when(a) { - is Int -> a + is Int -> a is String -> a else -> 1 } fun illegalWhenBlock(a: Any): Int { when(a) { - is Int -> return a + is Int -> return a is String -> return a else -> return 1 } } fun declarations(a: Any?) { if (a is String) { - val p4: #(Int, String) = #(2, a) + val p4: #(Int, String) = #(2, a) } if (a is String?) { if (a != null) { - val s: String = a + val s: String = a } } if (a != null) { if (a is String?) { - val s: String = a + val s: String = a } } } fun vars(a: Any?) { var b: Int = 0 if (a is Int) { - b = a + b = a } } fun tuples(a: Any?) { if (a != null) { - val s: #(Any, String) = #(a, a) + val s: #(Any, String) = #(a, a) } if (a is String) { - val s: #(Any, String) = #(a, a) + val s: #(Any, String) = #(a, a) } fun illegalTupleReturnType(): #(Any, String) = #(a, a) if (a is String) { - fun legalTupleReturnType(): #(Any, String) = #(a, a) + fun legalTupleReturnType(): #(Any, String) = #(a, a) } val illegalFunctionLiteral: Function0 = { a } val illegalReturnValueInFunctionLiteral: Function0 = { (): Int -> a } if (a is Int) { - val legalFunctionLiteral: Function0 = { a } - val alsoLegalFunctionLiteral: Function0 = { (): Int -> a } + val legalFunctionLiteral: Function0 = { a } + val alsoLegalFunctionLiteral: Function0 = { (): Int -> a } } } fun returnFunctionLiteralBlock(a: Any?): Function0 { - if (a is Int) return { a } + if (a is Int) return { a } else return { 1 } } fun returnFunctionLiteral(a: Any?): Function0 = - if (a is Int) { (): Int -> a } + if (a is Int) { (): Int -> a } else { () -> 1 } fun illegalTupleReturnType(a: Any): #(Any, String) = #(a, a) -fun declarationInsidePattern(x: #(Any, Any)): String = when(x) { is #(val a is String, *) -> a; else -> "something" } +fun declarationInsidePattern(x: #(Any, Any)): String = when(x) { is #(val a is String, *) -> a; else -> "something" } fun mergeAutocasts(a: Any?) { if (a is String || a is Int) { a.compareTo("") - a.toString() + a.toString() } if (a is Int || a is String) { a.compareTo("") @@ -227,9 +227,9 @@ fun mergeAutocasts(a: Any?) { is String, is Any -> a.compareTo("") } if (a is String && a is Any) { - val i: Int = a.compareTo("") + val i: Int = a.compareTo("") } - if (a is String && a.compareTo("") == 0) {} + if (a is String && a.compareTo("") == 0) {} if (a is String || a.compareTo("") == 0) {} }