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

Implement reduce and reduceRight functions

Browse Source
This commit is contained in:
Alexander Zolotov
2012-06-16 00:46:20 +04:00
parent 4657567484
commit 0043454a06
14 changed files with 398 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/test/CollectionTest.kt
+31
View File
@@ -216,6 +216,37 @@ class CollectionTest {
}
}
test fun reduce() {
expect("1234") {
val list = arrayList("1", "2", "3", "4")
list.reduce { a, b -> a + b }
}
expect(-4) {
val array = array(1, 2, 3)
array.reduce { a, b -> a - b }
}
failsWith<UnsupportedOperationException> {
arrayList<Int>().reduce { a, b -> a + b}
}
}
test fun reduceRight() {
expect("1234") {
val list = arrayList("1", "2", "3", "4")
list.reduceRight { a, b -> a + b }
}
expect(2) {
val array = array(1, 2, 3)
array.reduceRight { a, b -> a - b }
}
failsWith<UnsupportedOperationException> {
arrayList<Int>().reduceRight { a, b -> a + b}
}
}
test fun groupBy() {
val words = arrayList("a", "ab", "abc", "def", "abcd")
val byLength = words.groupBy{ it.length }
libraries/stdlib/test/org/jetbrains/kotlin/tools/GenerateStandardLib.kt
+7 -3
View File
@@ -63,7 +63,9 @@ fun main(args: Array<String>) {
// JLangIterables - Generic iterable stuff
generateFile(File(outDir, "ArraysFromJLangIterables.kt"), "package kotlin\n\nimport kotlin.util.*", File(srcDir, "JLangIterables.kt")) {
it.replaceAll("java.lang.Iterable<T", "Array<T").replaceAll("java.lang.Iterable<T", "Array<T")
it.replaceAll("java.lang.Iterable<T", "Array<T").
replaceAll("java.lang.Iterable<T", "Array<T").
replaceAll("iterator.hasNext\\(\\)", "iterator.hasNext")
}
generateFile(File(outDir, "ArraysFromJLangIterablesLazy.kt"), "package kotlin\n\nimport kotlin.util.*", File(srcDir, "JLangIterablesLazy.kt")) {
it.replaceAll("java.lang.Iterable<T", "Array<T").replaceAll("java.lang.Iterable<T", "Array<T")
@@ -73,7 +75,8 @@ fun main(args: Array<String>) {
replaceGenerics(arrayName, it.replaceAll("<T> java.lang.Iterable<T>", "${arrayName}Array").
replaceAll("<T> java.lang.Iterable<T\\?>", "${arrayName}Array").
replaceAll("java.lang.Iterable<T\\?>", "${arrayName}Array").
replaceAll("java.lang.Iterable<T>", "${arrayName}Array"))
replaceAll("java.lang.Iterable<T>", "${arrayName}Array")).
replaceAll("iterator.hasNext\\(\\)", "iterator.hasNext")
}
generateFile(File(outDir, "${arrayName}ArraysFromJLangIterables.kt"), "package kotlin\n\nimport kotlin.util.*", File(srcDir, "JLangIterables.kt")) {
@@ -85,7 +88,8 @@ fun main(args: Array<String>) {
}
generateFile(File(outDir, "StandardFromJLangIterables.kt"), "package kotlin\n\nimport kotlin.util.*", File(srcDir, "JLangIterables.kt")) {
it.replaceAll("java.lang.Iterable<T", "Iterable<T")
it.replaceAll("java.lang.Iterable<T", "Iterable<T").
replaceAll("iterator.hasNext\\(\\)", "iterator.hasNext")
}
generateFile(File(outDir, "StandardFromJLangIterablesLazy.kt"), "package kotlin\n\nimport kotlin.util.*", File(srcDir, "JLangIterablesLazy.kt")) {
it.replaceAll("java.lang.Iterable<T", "Iterable<T")