azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Transform *Array.size to properties

Browse Source
This commit is contained in:
Denis Zharkov
2015-10-14 13:56:18 +03:00
parent b050324869
commit bd37a10677
38 changed files with 147 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/box/arrays/kt2997.kt
Vendored
+9 -9
View File
@@ -5,48 +5,48 @@ fun foo(a: Any): Int {
a.get(0)
a.set(0, 1)
a.iterator()
return a.size()
return a.size
}
if (a is ShortArray) {
a.get(0)
a.set(0, 1)
a.iterator()
return a.size()
return a.size
}
if (a is ByteArray) {
a.get(0)
a.set(0, 1)
a.iterator()
return a.size()
return a.size
}
if (a is FloatArray) {
a.get(0)
a.set(0, 1.toFloat())
a.iterator()
return a.size()
return a.size
}
if (a is DoubleArray) {
a.get(0)
a.set(0, 1.0)
a.iterator()
return a.size()
return a.size
}
if (a is BooleanArray) {
a.get(0)
a.set(0, false)
a.iterator()
return a.size()
return a.size
}
if (a is CharArray) {
a.get(0)
a.set(0, 'a')
a.iterator()
return a.size()
return a.size
}
if (a is Array<*>) {
if (a.size() > 0) a.get(0)
if (a.size > 0) a.get(0)
a.iterator()
return a.size()
return a.size
}
return 0
compiler/testData/codegen/box/arrays/kt503.kt
Vendored
+1 -1
View File
@@ -26,4 +26,4 @@ fun box() : String {
}
fun thirdElementIsThree(a : IntArray) =
a.size() >= 3 && a[2] == 3
a.size >= 3 && a[2] == 3
compiler/testData/codegen/box/arrays/kt779.kt
Vendored
+1 -1
View File
@@ -1,3 +1,3 @@
val <T> Array<T>.length : Int get() = this.size()
val <T> Array<T>.length : Int get() = this.size
fun box() = if(arrayOfNulls<Int>(10).length == 10) "OK" else "fail"
compiler/testData/codegen/box/classes/kt1018.kt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
public class StockMarketTableModel() {
public fun getColumnCount() : Int {
return COLUMN_TITLES?.size()!!
return COLUMN_TITLES?.size!!
}
companion object {
compiler/testData/codegen/box/controlStructures/quicksort.kt
Vendored
+2 -2
View File
@@ -4,7 +4,7 @@ fun IntArray.swap(i:Int, j:Int) {
this[j] = temp
}
fun IntArray.quicksort() = quicksort(0, size()-1)
fun IntArray.quicksort() = quicksort(0, size-1)
fun IntArray.quicksort(L: Int, R:Int) {
val m = this[(L + R) / 2]
@@ -34,7 +34,7 @@ fun box() : String {
a[2*i+1] = -2*i-1
}
a.quicksort()
for(i in 0..a.size()-2) {
for(i in 0..a.size-2) {
if (a[i] > a[i+1]) return "Fail $i: ${a[i]} > ${a[i+1]}"
}
return "OK"
compiler/testData/codegen/box/enum/companionObjectInEnum.kt
Vendored
+2 -2
View File
@@ -14,9 +14,9 @@ enum class Game {
fun box(): String {
if (Game.foo() != Game.ROCK) return "Fail 1"
if (Game.bar != Game.PAPER) return "Fail 2: ${Game.bar}"
if (Game.values().size() != 3) return "Fail 3"
if (Game.values().size != 3) return "Fail 3"
if (Game.valueOf("SCISSORS") != Game.SCISSORS) return "Fail 4"
if (Game.values2.size() != 3) return "Fail 5"
if (Game.values2.size != 3) return "Fail 5"
if (Game.scissors != Game.SCISSORS) return "Fail 6"
return "OK"
}
compiler/testData/codegen/box/enum/emptyEnumValuesValueOf.kt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
enum class Empty
fun box(): String {
if (Empty.values().size() != 0) return "Fail: ${Empty.values()}"
if (Empty.values().size != 0) return "Fail: ${Empty.values()}"
try {
val found = Empty.valueOf("nonExistentEntry")
compiler/testData/codegen/box/functions/kt3214.kt
Vendored
+2 -2
View File
@@ -1,9 +1,9 @@
class A {
fun get(vararg x: Int) = x.size()
fun get(vararg x: Int) = x.size
}
class B {
fun get(vararg x: Unit) = x.size()
fun get(vararg x: Unit) = x.size
}
fun test1(a: A): Int {
compiler/testData/codegen/box/operatorConventions/compareTo/extensionArray.kt
Vendored
+1 -1
View File
@@ -7,7 +7,7 @@ fun checkLess(x: Array<Int>, y: Array<Int>) = when {
else -> "OK"
}
fun Array<Int>.compareTo(other: Array<Int>) = size() - other.size()
fun Array<Int>.compareTo(other: Array<Int>) = size - other.size
fun box(): String {
val a = arrayOfNulls<Int>(0) as Array<Int>
compiler/testData/codegen/box/primitiveTypes/kt935.kt
Vendored
+1 -1
View File
@@ -27,4 +27,4 @@ fun bottlesOfBeer(count : Int) : String {
fun print(message : String) { System.out?.print(message) }
fun println(message : String) { System.out?.println(message) }
fun StringBuilder.plusAssign(o : Any) { append(o) }
val <T> Array<T>.isEmpty : Boolean get() = size() == 0
val <T> Array<T>.isEmpty : Boolean get() = size == 0
compiler/testData/codegen/box/strings/rawStringsWithManyQuotes.kt
Vendored
+1 -1
View File
@@ -19,7 +19,7 @@ fun box() : String {
P(""""" """"", "\"\" \"\"")
)
for (i in 0..data.size()-1) {
for (i in 0..data.size-1) {
val p = data[i]
if (p.actual != p.expected) return "Fail at #$i. actual='${p.actual}', expected='${p.expected}'"
}
compiler/testData/codegen/box/vararg/kt581.kt
Vendored
+1 -1
View File
@@ -4,7 +4,7 @@ import java.util.HashSet
fun iarray(vararg a : Int) = a // BUG
val IntArray.indices: IntRange get() = IntRange(0, lastIndex())
fun IntArray.lastIndex() = size() - 1
fun IntArray.lastIndex() = size - 1
fun box() : String {
val vals = iarray(789, 678, 567, 456, 345, 234, 123, 12)
compiler/testData/codegen/box/vararg/kt6192.kt
Vendored
+17 -17
View File
@@ -50,21 +50,21 @@ fun box(): String {
val aZ = BooleanArray(3)
if (barB(*aB, 23.toByte()).size() != 4) return "fail: Byte"
if (barB(11.toByte(), *aB, 23.toByte(), *aB).size() != 8) return "fail: Byte"
if (barB(*aB, 23.toByte()).size != 4) return "fail: Byte"
if (barB(11.toByte(), *aB, 23.toByte(), *aB).size != 8) return "fail: Byte"
if (barC(*aC, 'A').size() != 4) return "fail: Char"
if (barC('A', *aC, 'A', *aC).size() != 8) return "fail: Char"
if (barC(*aC, 'A').size != 4) return "fail: Char"
if (barC('A', *aC, 'A', *aC).size != 8) return "fail: Char"
if (barD(*aD, 2.3).size() != 4) return "fail: Double"
if (barD(*aD, *aD, 2.3).size() != 7) return "fail: Double"
if (barD(*aD, 2.3).size != 4) return "fail: Double"
if (barD(*aD, *aD, 2.3).size != 7) return "fail: Double"
if (barF(*aF, 2.3f).size() != 4) return "fail: Float"
if (barF(*aF, 2.3f, 1.1f).size() != 5) return "fail: Float"
if (barF(*aF, 2.3f).size != 4) return "fail: Float"
if (barF(*aF, 2.3f, 1.1f).size != 5) return "fail: Float"
if (barI(*aI, 23).size() != 4) return "fail: Int"
if (barI(11, 10, *aI, 23).size() != 6) return "fail: Int"
if (barI(100, *aI, *aI).size() != 7) return "fail: Int 3"
if (barI(*aI, 23).size != 4) return "fail: Int"
if (barI(11, 10, *aI, 23).size != 6) return "fail: Int"
if (barI(100, *aI, *aI).size != 7) return "fail: Int 3"
if (sumInt(100, *aI) != 106) return "fail: sumInt 1"
if (sumInt(100, *aI, 200) != 306) return "fail: sumInt 2"
@@ -80,14 +80,14 @@ fun box(): String {
if (concatParameters(*aI, 7, 8, *bI) != "1237845") return "fail: concatParameters 6"
if (concatParameters(*aI, 7, *bI, *aI, 9) != "1237451239") return "fail: concatParameters 7"
if (barJ(*aJ, 23L).size() != 4) return "fail: Long"
if (barJ(*aJ, 23L, *aJ, *aJ).size() != 10) return "fail: Long"
if (barJ(*aJ, 23L).size != 4) return "fail: Long"
if (barJ(*aJ, 23L, *aJ, *aJ).size != 10) return "fail: Long"
if (barS(*aS, 23.toShort()).size() != 4) return "fail: Short"
if (barS(*aS, *aS, 23.toShort(), *aS).size() != 10) return "fail: Short"
if (barS(*aS, 23.toShort()).size != 4) return "fail: Short"
if (barS(*aS, *aS, 23.toShort(), *aS).size != 10) return "fail: Short"
if (barZ(*aZ, true).size() != 4) return "fail: Boolean"
if (barZ(false, *aZ, true, *aZ).size() != 8) return "fail: Boolean"
if (barZ(*aZ, true).size != 4) return "fail: Boolean"
if (barZ(false, *aZ, true, *aZ).size != 8) return "fail: Boolean"
return "OK"
}
compiler/testData/codegen/box/vararg/varargsAndFunctionLiterals.kt
Vendored
+3 -3
View File
@@ -3,13 +3,13 @@ fun foo(a: Int, vararg b: Int, f: (IntArray) -> String): String {
}
fun box(): String {
val test1 = foo(1) {a -> "" + a.size()}
val test1 = foo(1) {a -> "" + a.size}
if (test1 != "test1 0") return test1
val test2 = foo(2, 2) {a -> "" + a.size()}
val test2 = foo(2, 2) {a -> "" + a.size}
if (test2 != "test2 1") return test2
val test3 = foo(3, 2, 3) {a -> "" + a.size()}
val test3 = foo(3, 2, 3) {a -> "" + a.size}
if (test3 != "test3 2") return test3
return "OK"