Adjust testData to CharSequence.length transformation

This commit is contained in:
Denis Zharkov
2015-10-12 20:29:01 +03:00
committed by Mikhail Glukhikh
parent cb562e7ea5
commit f0e3fd617d
348 changed files with 524 additions and 540 deletions
+3 -3
View File
@@ -9,7 +9,7 @@ fun takeFirst(expr: StringBuilder): Char {
}
fun evaluateArg(expr: CharSequence, numbers: ArrayList<Int>): Int {
if (expr.length() == 0) throw Exception("Syntax error: Character expected");
if (expr.length == 0) throw Exception("Syntax error: Character expected");
val c = takeFirst(<error>expr</error>)
if (c >= '0' && c <= '9') {
val n = c - '0'
@@ -22,7 +22,7 @@ fun evaluateArg(expr: CharSequence, numbers: ArrayList<Int>): Int {
fun evaluateAdd(expr: StringBuilder, numbers: ArrayList<Int>): Int {
val lhs = evaluateArg(expr, numbers)
if (expr.length() > 0) {
if (expr.length > 0) {
}
return lhs
@@ -30,7 +30,7 @@ fun evaluateAdd(expr: StringBuilder, numbers: ArrayList<Int>): Int {
fun evaluate(expr: StringBuilder, numbers: ArrayList<Int>): Int {
val lhs = evaluateAdd(expr, numbers)
if (expr.length() > 0) {
if (expr.length > 0) {
val <warning>c</warning> = expr.get(0)
expr.deleteCharAt(0)
}
+1 -1
View File
@@ -3,7 +3,7 @@ package jet121
fun box(): String {
val answer = apply("OK") {
get(0)
length()
length
}
return if (answer == 2) "OK" else "FAIL"
+2 -2
View File
@@ -2,8 +2,8 @@ LineBreakpoint created at unsafeCall.kt:8
!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! unsafeCall.UnsafeCallPackage
Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
unsafeCall.kt:8
Compile bytecode for s1.length()
Compile bytecode for s2.length()
Compile bytecode for s1.length
Compile bytecode for s2.length
Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
Process finished with exit code 0
@@ -8,8 +8,8 @@ fun main(args: Array<String>) {
args.size()
}
// EXPRESSION: s1.length()
// EXPRESSION: s1.length
// RESULT: 1: I
// EXPRESSION: s2.length()
// EXPRESSION: s2.length
// RESULT: java.lang.NullPointerException: Ljava/lang/NullPointerException;
+2 -2
View File
@@ -20,11 +20,11 @@ fun foo() {
}
fun unnecessarySafeCall(x: String) {
x?.length()
x?.length
}
fun unnecessaryExclExcl(x: String) {
x!!.length()
x!!.length
}
fun unnecessaryCast(x: String) = x as String
+2 -2
View File
@@ -19,11 +19,11 @@ fun foo() {
}
fun unnecessarySafeCall(x: String) {
x.length()
x.length
}
fun unnecessaryExclExcl(x: String) {
x.length()
x.length
}
fun unnecessaryCast(x: String) = x
@@ -1,3 +1,3 @@
fun String.foo() {
println(length())
println(length)
}
@@ -2,4 +2,4 @@ private fun String.foo() {
otherExt()
}
fun String.otherExt() = length()
fun String.otherExt() = length
@@ -1,5 +1,5 @@
fun String.foo() {
fun String.local() {
println(length())
println(length)
}
}
@@ -1,5 +1,5 @@
val String.doubleLength: Int
get() = length() * 2
get() = length * 2
fun main(args: Array<String>) {
"".doubleLength
@@ -5,7 +5,7 @@ fun main(args: Array<String>) {
val foo: String? = "abc"
if (foo != null<caret>) {
doSomething ("Hello")
foo.length()
foo.length
}
else null
}
@@ -3,7 +3,7 @@ fun main(args: Array<String>) {
var foo: String? = "foo"
var bar: String? = "bar"
if (foo != null<caret>) {
bar?.length()
bar?.length
}
else null
}
@@ -2,7 +2,7 @@
fun main(args: Array<String>) {
val foo = "foo"
if (null == <caret>null) {
foo.length()
foo.length
}
else null
}
@@ -4,7 +4,7 @@ fun <T> T.compareTo(a: T): Int = 0
fun main(args: Array<String>) {
val foo = "foo"
if (foo > null<caret>) {
foo.length()
foo.length
}
else null
}
@@ -4,7 +4,7 @@ fun String?.times(a: Int): Boolean = a == 0
fun main(args: Array<String>) {
val foo: String = "foo"
if (foo * 10<caret>) {
foo.length()
foo.length
}
else null
}
@@ -8,7 +8,7 @@ fun main(args: Array<String>) {
val foo = maybeFoo()
doSomething(foo)
if (foo != null<caret>) {
foo.length()
foo.length
}
else {
null
@@ -7,5 +7,5 @@ fun doSomething<T>(a: T) {}
fun main(args: Array<String>) {
val foo = maybeFoo()
doSomething(foo)
foo?.length()
foo?.length
}
@@ -6,7 +6,7 @@ val x = maybeFoo()
fun main(args: Array<String>) {
if (x !=<caret> null) {
x.length()
x.length
} else {
null
}
@@ -5,5 +5,5 @@ fun maybeFoo(): String? {
val x = maybeFoo()
fun main(args: Array<String>) {
x?.length()
x?.length
}
@@ -2,7 +2,7 @@
fun main(args: Array<String>) {
val foo = "foo"
if (<caret>) {
foo.length()
foo.length
}
else null
}
@@ -5,7 +5,7 @@ fun maybeFoo(): String? {
fun main(args: Array<String>) {
val foo = maybeFoo()
if (foo != null<caret>) {
foo.length()
foo.length
}
else {
@@ -3,5 +3,5 @@ fun maybeFoo(): String? {
}
fun main(args: Array<String>) {
maybeFoo()?.length()
maybeFoo()?.length
}
@@ -7,6 +7,6 @@ fun main(args: Array<String>) {
if (foo == null<caret>) {
}
else {
foo.length()
foo.length
}
}
@@ -3,5 +3,5 @@ fun maybeFoo(): String? {
}
fun main(args: Array<String>) {
maybeFoo()?.length()
maybeFoo()?.length
}
@@ -5,7 +5,7 @@ fun maybeFoo(): String? {
fun main(args: Array<String>) {
val foo = maybeFoo()
if (foo != null<caret>) {
foo.length()
foo.length
}
else {
null
@@ -3,5 +3,5 @@ fun maybeFoo(): String? {
}
fun main(args: Array<String>) {
maybeFoo()?.length()
maybeFoo()?.length
}
@@ -5,7 +5,7 @@ fun maybeFoo(): String? {
fun main(args: Array<String>) {
val foo = maybeFoo()
if (foo != null<caret>)
foo.length()
foo.length
else
null
}
@@ -3,5 +3,5 @@ fun maybeFoo(): String? {
}
fun main(args: Array<String>) {
maybeFoo()?.length()
maybeFoo()?.length
}
@@ -8,6 +8,6 @@ fun main(args: Array<String>) {
null
}
else {
foo.length()
foo.length
}
}
@@ -3,5 +3,5 @@ fun maybeFoo(): String? {
}
fun main(args: Array<String>) {
val x = maybeFoo()?.length()
val x = maybeFoo()?.length
}
@@ -7,5 +7,5 @@ fun main(args: Array<String>) {
if (foo == null<caret>)
null
else
foo.length()
foo.length
}
@@ -3,5 +3,5 @@ fun maybeFoo(): String? {
}
fun main(args: Array<String>) {
maybeFoo()?.length()
maybeFoo()?.length
}
@@ -5,7 +5,7 @@ fun maybeFoo(): String? {
fun main(args: Array<String>) {
val foo = maybeFoo()
if (foo != null<caret>)
foo.length()
foo.length
else
null
}
@@ -3,5 +3,5 @@ fun maybeFoo(): String? {
}
fun main(args: Array<String>) {
maybeFoo()?.length()
maybeFoo()?.length
}
@@ -3,6 +3,6 @@
fun main(args: Array<String>) {
val foo: String? = "foo"
if<caret> {
foo.length()
foo.length
} else null
}
@@ -5,6 +5,6 @@ fun maybeFoo(): String? {
fun main(args: Array<String>) {
val foo = maybeFoo()
if (foo != null<caret>) {
foo.length()
foo.length
}
}
@@ -3,5 +3,5 @@ fun maybeFoo(): String? {
}
fun main(args: Array<String>) {
maybeFoo()?.length()
maybeFoo()?.length
}
@@ -3,7 +3,7 @@ fun main(args: Array<String>) {
val foo: String? = "foo"
val bar: String? = null
if (foo == bar<caret>) {
foo?.length()
foo?.length
}
else null
}
@@ -3,7 +3,7 @@ fun main(args: Array<String>) {
val foo: String? = "foo"
val bar: String? = null
if (foo == bar<caret>) {
bar?.length()
bar?.length
}
else null
}
@@ -5,6 +5,6 @@ fun maybeFoo(): String? {
fun main(args: Array<String>) {
val foo = maybeFoo()
if (foo == null<caret>) else {
foo.length()
foo.length
}
}
@@ -3,5 +3,5 @@ fun maybeFoo(): String? {
}
fun main(args: Array<String>) {
maybeFoo()?.length()
maybeFoo()?.length
}
@@ -7,5 +7,5 @@ fun main(args: Array<String>) {
if (maybeFoo() == null<caret>)
null
else
maybeFoo()?.length()
maybeFoo()?.length
}
@@ -8,5 +8,5 @@ fun main(args: Array<String>) {
if (foo == null<caret>)
null
else
foo?.length()
foo?.length
}
@@ -4,7 +4,7 @@ fun doSomething<T>(a: T) {}
fun main(args: Array<String>) {
val foo: String? = "abc"
if (foo != null<caret>) {
foo.length()
foo.length
}
else {
doSomething("Hi")
@@ -7,5 +7,5 @@ fun main(args: Array<String>) {
if (null == foo<caret>)
null
else
foo.length()
foo.length
}
@@ -3,5 +3,5 @@ fun maybeFoo(): String? {
}
fun main(args: Array<String>) {
maybeFoo()?.length()
maybeFoo()?.length
}
@@ -5,7 +5,7 @@ fun maybeFoo(): String? {
fun main(args: Array<String>) {
val foo = maybeFoo()
if (null != foo<caret>)
foo.length()
foo.length
else
null
}
@@ -3,5 +3,5 @@ fun maybeFoo(): String? {
}
fun main(args: Array<String>) {
maybeFoo()?.length()
maybeFoo()?.length
}
@@ -3,9 +3,9 @@
fun main(args: Array<String>) {
val foo: String? = "foo"
if (foo == null<caret>) {
foo.length()
foo.length
}
else {
foo.length()
foo.length
}
}
@@ -1,5 +1,5 @@
fun main(args: Array<String>) {
val x: String? = null
val y: String? = "Hello"
val z = (x ?: y)?.<caret>length()
val z = (x ?: y)?.<caret>length
}
@@ -2,5 +2,5 @@ fun main(args: Array<String>) {
val x: String? = null
val y: String? = "Hello"
val s = x ?: y
val z = if (s != null) s.length() else null
val z = if (s != null) s.length else null
}
@@ -1,4 +1,4 @@
fun foo(): String? = "foo"
fun main(args: Array<String>) {
foo()?.<caret>length()
foo()?.<caret>length
}
@@ -1,5 +1,5 @@
fun foo(): String? = "foo"
fun main(args: Array<String>) {
val foo = foo()
if (foo != null) foo.length()
if (foo != null) foo.length
}
@@ -1,4 +1,4 @@
fun foo(): String? = "foo"
fun main(args: Array<String>) {
(foo())?.<caret>length()
(foo())?.<caret>length
}
@@ -1,5 +1,5 @@
fun foo(): String? = "foo"
fun main(args: Array<String>) {
val foo = foo()
if (foo != null) foo.length()
if (foo != null) foo.length
}
@@ -9,5 +9,5 @@ class Foo {
fun main(args: Array<String>) {
val a = Foo()
doSomething(a.b?.<caret>length())
doSomething(a.b?.<caret>length)
}
@@ -10,5 +10,5 @@ class Foo {
fun main(args: Array<String>) {
val a = Foo()
val b = a.b
doSomething(if (b != null) b.length() else null)
doSomething(if (b != null) b.length else null)
}
@@ -1,4 +1,4 @@
fun main(args: Array<String>) {
val x: String? = "abc"
x?.<caret>length()
x?.<caret>length
}
@@ -1,4 +1,4 @@
fun main(args: Array<String>) {
val x: String? = "abc"
if (x != null) x.length()
if (x != null) x.length
}
@@ -2,5 +2,5 @@ fun doSomething<T>(a: T) {}
fun main(args: Array<String>) {
val a: String? = "A"
doSomething(a?.<caret>length())
doSomething(a?.<caret>length)
}
@@ -2,5 +2,5 @@ fun doSomething<T>(a: T) {}
fun main(args: Array<String>) {
val a: String? = "A"
doSomething(if (a != null) a.length() else null)
doSomething(if (a != null) a.length else null)
}
@@ -2,6 +2,6 @@ fun doSomething<T>(a: T) {}
fun main(args: Array<String>) {
var a: String? = "A"
doSomething(a?.<caret>length())
doSomething(a?.<caret>length)
}
@@ -3,6 +3,6 @@ fun doSomething<T>(a: T) {}
fun main(args: Array<String>) {
var a: String? = "A"
val a1 = a
doSomething(if (a1 != null) a1.length() else null)
doSomething(if (a1 != null) a1.length else null)
}
@@ -1,4 +1,4 @@
fun main(args: Array<String>) {
val x: String? = "abc"
val y = x?.<caret>length()
val y = x?.<caret>length
}
@@ -1,4 +1,4 @@
fun main(args: Array<String>) {
val x: String? = "abc"
val y = if (x != null) x.length() else null
val y = if (x != null) x.length else null
}
@@ -3,5 +3,5 @@ fun f(s: Int?) {
fun main(args: Array<String>) {
val x: String? = "foo"
f(x?.<caret>length())
f(x?.<caret>length)
}
@@ -3,5 +3,5 @@ fun f(s: Int?) {
fun main(args: Array<String>) {
val x: String? = "foo"
f(if (x != null) x.length() else null)
f(if (x != null) x.length else null)
}
@@ -1,4 +1,4 @@
fun main(args: Array<String>) {
val foo: String? = "foo"
foo?.<caret>length()
foo?.<caret>length
}
@@ -1,4 +1,4 @@
fun main(args: Array<String>) {
val foo: String? = "foo"
if (foo != null) foo.length()
if (foo != null) foo.length
}
@@ -1,4 +1,4 @@
fun main(args: Array<String>) {
val foo: String? = "foo"
(foo)?.<caret>length()
(foo)?.<caret>length
}
@@ -1,4 +1,4 @@
fun main(args: Array<String>) {
val foo: String? = "foo"
if (foo != null) foo.length()
if (foo != null) foo.length
}
@@ -2,5 +2,5 @@ fun doSomething<T>(a: T) {}
val a: String? = "A"
fun main(args: Array<String>) {
doSomething(a?.<caret>length())
doSomething(a?.<caret>length)
}
@@ -2,5 +2,5 @@ fun doSomething<T>(a: T) {}
val a: String? = "A"
fun main(args: Array<String>) {
doSomething(if (a != null) a.length() else null)
doSomething(if (a != null) a.length else null)
}
@@ -4,5 +4,5 @@ val a: String?
get() = ""
fun main(args: Array<String>) {
doSomething(a?.<caret>length())
doSomething(a?.<caret>length)
}
@@ -5,5 +5,5 @@ val a: String?
fun main(args: Array<String>) {
val a1 = a
doSomething(if (a1 != null) a1.length() else null)
doSomething(if (a1 != null) a1.length else null)
}
@@ -1,4 +1,4 @@
var a: String? = "A"
fun main(args: Array<String>) {
a<caret>?.length()
a<caret>?.length
}
@@ -1,5 +1,5 @@
var a: String? = "A"
fun main(args: Array<String>) {
val a1 = a
if (a1 != null) a1.length()
if (a1 != null) a1.length
}
@@ -3,5 +3,5 @@ var a: String?
set(v) {}
fun main(args: Array<String>) {
a?.<caret>length()
a?.<caret>length
}
@@ -4,5 +4,5 @@ var a: String?
fun main(args: Array<String>) {
val a1 = a
if (a1 != null) a1.length()
if (a1 != null) a1.length
}
@@ -1,4 +1,4 @@
fun foo(arg: String?): Int? = arg?.<caret>length()
fun foo(arg: String?): Int? = arg?.<caret>length
fun main(args: Array<String>) {
foo("bar")
}
@@ -1,4 +1,4 @@
fun foo(arg: String?): Int? = if (arg != null) arg.length() else null
fun foo(arg: String?): Int? = if (arg != null) arg.length else null
fun main(args: Array<String>) {
foo("bar")
}
@@ -1,4 +1,4 @@
fun main(args: Array<String>) {
val foo: String? = "foo"
val y = if (true) foo?.<caret>length() else null
val y = if (true) foo?.<caret>length else null
}
@@ -1,4 +1,4 @@
fun main(args: Array<String>) {
val foo: String? = "foo"
val y = if (true) if (foo != null) foo.length() else null else null
val y = if (true) if (foo != null) foo.length else null else null
}
@@ -1,6 +1,6 @@
fun doSth(): Int? {
val x: String? = "abc"
return x?.<caret>length()
return x?.<caret>length
}
fun main(args: Array<String>) {
val y = doSth()
@@ -1,6 +1,6 @@
fun doSth(): Int? {
val x: String? = "abc"
return if (x != null) x.length() else null
return if (x != null) x.length else null
}
fun main(args: Array<String>) {
val y = doSth()
@@ -1,6 +1,6 @@
fun main(args: Array<String>) {
val foo: String? = "foo"
if (true) {
foo?.<caret>length()
foo?.<caret>length
}
}
@@ -1,6 +1,6 @@
fun main(args: Array<String>) {
val foo: String? = "foo"
if (true) {
if (foo != null) foo.length()
if (foo != null) foo.length
}
}
@@ -1,5 +1,5 @@
fun String.not(): Boolean {
return length() == 0
return length == 0
}
fun foo(a: Boolean, b: Boolean) : Boolean {
@@ -1,5 +1,5 @@
fun String.not(): Boolean {
return length() == 0
return length == 0
}
fun foo(a: Boolean, b: Boolean) : Boolean {
@@ -1,6 +1,6 @@
// IS_APPLICABLE: false
val foo = { <caret>s: String, n: Int -> s.length() - n/2 > 1 }
val foo = { <caret>s: String, n: Int -> s.length - n/2 > 1 }
fun test() {
foo("1", 2)
@@ -1,6 +1,6 @@
fun test() {
fun foo(<caret>s: String, n: Int): Boolean {
return s.length() - n/2 > 1
return s.length - n/2 > 1
}
foo("1", 2)
@@ -1,6 +1,6 @@
fun test() {
fun String.foo(n: Int): Boolean {
return length() - n/2 > 1
return length - n/2 > 1
}
"1".foo(2)
@@ -1,7 +1,7 @@
// WITH_RUNTIME
class A {
fun foo(<caret>s: String, n: Int): Boolean {
return s.length() - n/2 > 1
return s.length - n/2 > 1
}
fun test() {
@@ -1,7 +1,7 @@
// WITH_RUNTIME
class A {
fun String.foo(n: Int): Boolean {
return length() - n/2 > 1
return length - n/2 > 1
}
fun test() {
@@ -1,6 +1,6 @@
// IS_APPLICABLE: false
fun <caret>foo(s: String, n: Int): Boolean {
return s.length() - n/2 > 1
return s.length - n/2 > 1
}
fun test() {
@@ -1,5 +1,5 @@
fun foo(<caret>s: String, n: Int): Boolean {
return s.length() - n/2 > 1
return s.length - n/2 > 1
}
fun test() {
@@ -1,5 +1,5 @@
fun String.foo(n: Int): Boolean {
return length() - n/2 > 1
return length - n/2 > 1
}
fun test() {
@@ -1,6 +1,6 @@
// IS_APPLICABLE: false
fun Any.foo(<caret>s: String, n: Int): Boolean {
return s.length() - n/2 > 1
return s.length - n/2 > 1
}
fun test() {
@@ -1,6 +1,6 @@
fun test() {
fun <caret>String.foo(n: Int): Boolean {
return length() - n/2 > 1
return length - n/2 > 1
}
"1".foo(2)
@@ -1,6 +1,6 @@
fun test() {
fun foo(s: String, n: Int): Boolean {
return s.length() - n/2 > 1
return s.length - n/2 > 1
}
foo("1", 2)

Some files were not shown because too many files have changed in this diff Show More