From 55d4d17dc3aee4b6bd8e003ad770b755810f2522 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Sat, 7 Nov 2015 07:19:20 +0300 Subject: [PATCH] Fix dropped DoubleRange and FloatRange usages in tests --- .../codegen/box/primitiveTypes/rangeTo.kt | 66 +------------------ .../multipleBreakpoints/clearCache.kt | 6 +- .../stubBuilder/Annotations/Annotations.kt | 2 +- .../stubBuilder/Annotations/Annotations.txt | 2 +- 4 files changed, 6 insertions(+), 70 deletions(-) diff --git a/compiler/testData/codegen/box/primitiveTypes/rangeTo.kt b/compiler/testData/codegen/box/primitiveTypes/rangeTo.kt index 798246e70d3..b1531024656 100644 --- a/compiler/testData/codegen/box/primitiveTypes/rangeTo.kt +++ b/compiler/testData/codegen/box/primitiveTypes/rangeTo.kt @@ -4,8 +4,6 @@ fun box(): String { val s: Short = 239 val i: Int = -1 val j: Long = -42L - val f: Float = 3.14f - val d: Double = -2.72 b.rangeTo(b) b rangeTo b @@ -19,12 +17,6 @@ fun box(): String { b.rangeTo(j) b rangeTo j b..j - b.rangeTo(f) - b rangeTo f - b..f - b.rangeTo(d) - b rangeTo d - b..d c.rangeTo(c) c rangeTo c @@ -42,12 +34,6 @@ fun box(): String { s.rangeTo(j) s rangeTo j s..j - s.rangeTo(f) - s rangeTo f - s..f - s.rangeTo(d) - s rangeTo d - s..d i.rangeTo(b) i rangeTo b @@ -61,12 +47,6 @@ fun box(): String { i.rangeTo(j) i rangeTo j i..j - i.rangeTo(f) - i rangeTo f - i..f - i.rangeTo(d) - i rangeTo d - i..d j.rangeTo(b) j rangeTo b @@ -80,57 +60,13 @@ fun box(): String { j.rangeTo(j) j rangeTo j j..j - j.rangeTo(f) - j rangeTo f - j..f - j.rangeTo(d) - j rangeTo d - j..d - - f.rangeTo(b) - f rangeTo b - f..b - f.rangeTo(s) - f rangeTo s - f..s - f.rangeTo(i) - f rangeTo i - f..i - f.rangeTo(j) - f rangeTo j - f..j - f.rangeTo(f) - f rangeTo f - f..f - f.rangeTo(d) - f rangeTo d - f..d - - d.rangeTo(b) - d rangeTo b - d..b - d.rangeTo(s) - d rangeTo s - d..s - d.rangeTo(i) - d rangeTo i - d..i - d.rangeTo(j) - d rangeTo j - d..j - d.rangeTo(f) - d rangeTo f - d..f - d.rangeTo(d) - d rangeTo d - d..d return "OK" } /* fun main(args: Array) { - val s = "bcsijfd" + val s = "bcsij" for (i in s) { for (j in s) { if ((i == 'c') != (j == 'c')) continue diff --git a/idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/clearCache.kt b/idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/clearCache.kt index 7dfb34152b9..cf8dc535aba 100644 --- a/idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/clearCache.kt +++ b/idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/clearCache.kt @@ -31,12 +31,12 @@ fun primitiveTypes() { val b = 1 } - for (i in 5.0..6.0) { + for (i in 'a'..'b') { // EXPRESSION: i - // RESULT: 5.0: D + // RESULT: 97: C // EXPRESSION: i - // RESULT: 6.0: D + // RESULT: 98: C //Breakpoint! val b = 1 diff --git a/idea/testData/decompiler/stubBuilder/Annotations/Annotations.kt b/idea/testData/decompiler/stubBuilder/Annotations/Annotations.kt index 14db8d4d6d1..fb56700ce11 100644 --- a/idea/testData/decompiler/stubBuilder/Annotations/Annotations.kt +++ b/idea/testData/decompiler/stubBuilder/Annotations/Annotations.kt @@ -22,7 +22,7 @@ class Nested @a private @b(E.E1) @b(E.E2) constructor() - fun types(param: @a @b(E.E1) DoubleRange): @a @b(E.E2) Unit {} + fun types(param: @a @b(E.E1) LongRange): @a @b(E.E2) Unit {} } @Target(AnnotationTarget.PROPERTY, AnnotationTarget.VALUE_PARAMETER, AnnotationTarget.FUNCTION, diff --git a/idea/testData/decompiler/stubBuilder/Annotations/Annotations.txt b/idea/testData/decompiler/stubBuilder/Annotations/Annotations.txt index 59ed89fe9f6..dc61763b9f7 100644 --- a/idea/testData/decompiler/stubBuilder/Annotations/Annotations.txt +++ b/idea/testData/decompiler/stubBuilder/Annotations/Annotations.txt @@ -156,7 +156,7 @@ PsiJetFileStubImpl[package=] USER_TYPE:[isAbsoluteInRootPackage=false] USER_TYPE:[isAbsoluteInRootPackage=false] REFERENCE_EXPRESSION:[referencedName=kotlin] - REFERENCE_EXPRESSION:[referencedName=DoubleRange] + REFERENCE_EXPRESSION:[referencedName=LongRange] TYPE_REFERENCE: ANNOTATION_ENTRY:[hasValueArguments=false, shortName=a] CONSTRUCTOR_CALLEE: