Adjust testData to CharSequence.length transformation

2015-10-12 20:29:01 +03:00
parent cb562e7ea5
commit f0e3fd617d
348 changed files with 524 additions and 540 deletions
@@ -1,7 +1,7 @@
 class Outer(val foo: StringBuilder) {
  inner class Inner() {
    fun len() : Int {
-      return foo.length()
+      return foo.length
    }
  }

@@ -4,8 +4,8 @@ fun box() : String {
    val w = object : Comparator<String?> {

        override fun compare(o1 : String?, o2 : String?) : Int {
-            val l1 : Int = o1?.length() ?: 0
-            val l2 = o2?.length() ?: 0
+            val l1 : Int = o1?.length ?: 0
+            val l2 = o2?.length ?: 0
            return l1 - l2
        }

@@ -3,12 +3,12 @@ interface  B<T> {
 }

 fun String.foo() = object : B<String> {
-    override val bar: String = length().toString()
+    override val bar: String = length.toString()
 }

 class C {

-    fun String.extension() = this.length()
+    fun String.extension() = this.length

    fun String.fooInClass() = object : B<String> {
        override val bar: String = extension().toString()
@@ -8,7 +8,7 @@ fun box(): String {
    if (y != 5) return "Fail 2 $y"
    
    var z = ""
-    do { z += z.length() } while (z.length() < 5)
+    do { z += z.length } while (z.length < 5)
    if (z != "01234") return "Fail 3 $z"
    
    return "OK"
@@ -12,7 +12,7 @@ public fun testCoalesce() {
        else -> "Hello world"
    }

-    printlnMock(value.length())
+    printlnMock(value.length)
 }

 fun box(): String {
@@ -34,7 +34,7 @@ object StringHandler {
 fun box(): String {
    val a = A()
    a.foo = 42
-    a.foo = a.foo + baz.length()
+    a.foo = a.foo + baz.length
    a.foo = 239
    A.bar = baz + a.foo
    baz + A.bar
@@ -6,7 +6,7 @@ fun escapeChar(c : Char) : String? = when (c) {
 }

 tailrec fun String.escape(i : Int = 0, result : StringBuilder = StringBuilder()) : String =
-        if (i == length()) result.toString()
+        if (i == length) result.toString()
        else escape(i + 1, result.append(escapeChar(get(i))))

 fun box() : String {
@@ -4,5 +4,5 @@ tailrec fun String.repeat(num : Int, acc : StringBuilder = StringBuilder()) : St

 fun box() : String {
    val s = "a".repeat(10000)
-    return if (s.length() == 10000) "OK" else "FAIL: ${s.length()}"
+    return if (s.length == 10000) "OK" else "FAIL: ${s.length}"
 }
@@ -1,5 +1,5 @@
 fun StringBuilder.takeFirst(): Char {
-  if (this.length() == 0) return 0.toChar()
+  if (this.length == 0) return 0.toChar()
  val c = this.get(0)
  this.deleteCharAt(0)
  return c
@@ -11,6 +11,6 @@ fun box(): String {
        }
    }
    
-    if (sb.length() == 0) return "OK"
+    if (sb.length == 0) return "OK"
    return "Fail:\n$sb"
 }
@@ -2,6 +2,6 @@ fun box(): String {
    val list = java.util.ArrayList<String>()
    list.add("0")
    list[0][0]
-    list[0].length()
+    list[0].length
    return "OK"
 }
@@ -6,7 +6,7 @@ fun escapeChar(c : Char) : String? = when (c) {
 }

 fun String.escape(i : Int = 0, result : String = "") : String =
-  if (i == length()) result
+  if (i == length) result
  else escape(i + 1, result + escapeChar(get(i)))

 fun box() : String {
@@ -19,7 +19,7 @@ fun box() : String {
  System.out?.println("}");
  System.out?.println();
  System.out?.println("fun String.escape(i : Int = 0, result : String = \"\") : String =");
-  System.out?.println("  if (i == length()) result");
+  System.out?.println("  if (i == length) result");
  System.out?.println("  else escape(i + 1, result + escapeChar(this.get(i)))");
  System.out?.println();
  System.out?.println("fun main(args : Array<String>) {");
@@ -3,7 +3,7 @@ class Test {
    private val b : String get() = a

    fun outer() : Int {
-        return b.length()
+        return b.length
    }
 }

@@ -1,7 +1,7 @@
 fun t1() : Boolean {
    val s1 : String? = "sff"
    val s2 : String? = null
-    return s1?.length() == 3 && s2?.length() == null
+    return s1?.length == 3 && s2?.length == null
 }

 fun t2() : Boolean {
@@ -1,6 +1,6 @@
 class Thing(delegate: CharSequence) : CharSequence by delegate
  
 fun box(): String {
-    val l = Thing("hello there").length()
+    val l = Thing("hello there").length
    return if (l == 11) "OK" else "Fail $l"
 }
@@ -4,7 +4,7 @@ class Thing(val delegate: CharSequence) : CharSequence {
    override fun get(index: Int): Char {
        throw UnsupportedOperationException()
    }
-    override fun length(): Int = 0
+    override val length: Int get() = 0
    override fun subSequence(start: Int, end: Int) = delegate.subSequence(start, end)
 }

@@ -14,7 +14,7 @@ fun box() : String {

    val test5 =
 """
-  ${s.length()}
+  ${s.length}
 """
    if (test5 != "\n  3\n") return "Fail 5: $test5"

@@ -13,7 +13,7 @@ fun box(): String {

        override fun condition(): Boolean {
            result = "OK"
-            return result.length() == 2
+            return result.length== 2
        }
    }

@@ -2,16 +2,6 @@ import java.lang.*;
 import java.util.*;

 public class Test {
-    public static class IterableImpl implements Iterable<String> {
-        public Iterator<String> iterator() { return new IteratorImpl(); }
-    }
-
-    public static class IteratorImpl implements Iterator<String> {
-        public boolean hasNext() { return false; }
-        public String next() { return null; }
-        public void remove() { }
-    }
-
    public static class MapEntryImpl implements Map.Entry<String, String> {
        public String getKey() { return null; }
        public String getValue() { return null; }
@@ -1,14 +1,8 @@
-class MyIterable : Test.IterableImpl()
-class MyIterator : Test.IteratorImpl()
+//class MyIterable : Test.IterableImpl()
+//class MyIterator : Test.IteratorImpl()
 class MyMapEntry : Test.MapEntryImpl()

 fun box(): String {
-    MyIterable().iterator()
-
-    val a = MyIterator()
-    a.hasNext()
-    a.next()
-    a.remove()

    val b = MyMapEntry()
    b.getKey()
@@ -1,2 +1,2 @@
 fun box(): String =
-        if (listOf("abc", "de", "f").map(String::length) == listOf(3, 2, 1)) "OK" else "Fail"
+        if (listOf("abc", "de", "f").map(String::length.getter) == listOf(3, 2, 1)) "OK" else "Fail"
@@ -1,6 +1,6 @@
 class Evaluator(val expr: StringBuilder) {
  fun evaluateArg(): Int {
-    return expr.length()
+    return expr.length
  }
 }