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

don't generate two 'flatMap' methods(*) for Iterator

Browse Source 
* with the same erased signature
 #KT-3373 Fixed
This commit is contained in:
Svetlana Isakova
2013-03-22 20:07:23 +04:00
parent d0e736e5a6
commit 362770c9b1
8 changed files with 23 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-stdlib-gen/src/generators/GenerateStandardLib.kt
+4 -4
View File
@@ -35,7 +35,7 @@ fun main(args: Array<String>) {
buildFor(Iterators, "")
}
val iteratorSignatures = templates.map { it.signature.flat() }.toSet()
val iteratorSignatures = templates.map { it.erasedSignature.flat() }.toSet()
templates.clear()
collections()
@@ -50,15 +50,15 @@ fun main(args: Array<String>) {
}
templates.writeTo(File(outDir, "_Iterables.kt")) {
if (iteratorSignatures contains signature.flat()) "" else buildFor(Iterables, "")
if (iteratorSignatures contains erasedSignature.flat()) "" else buildFor(Iterables, "")
}
templates.writeTo(File(outDir, "_IteratorsCommon.kt")) {
if (iteratorSignatures contains signature.flat()) "" else buildFor(Iterators, "")
if (iteratorSignatures contains erasedSignature.flat()) "" else buildFor(Iterators, "")
}
templates.writeTo(File(outDir, "_Collections.kt")) {
if (iteratorSignatures contains signature.flat()) buildFor(Collections, "") else ""
if (iteratorSignatures contains erasedSignature.flat()) buildFor(Collections, "") else ""
}
generateDownTos(File(outDir, "_DownTo.kt"), "package kotlin")
libraries/tools/kotlin-stdlib-gen/src/templates/Collections.kt
+2 -2
View File
@@ -179,7 +179,7 @@ fun collections() {
}
}
f("flatMap(transform: (T)-> Iterable<R>)") {
f("flatMap(transform: (T)-> Iterable<R>)", "flatMap(Function1)") {
doc = "Returns the result of transforming each element to one or more values which are concatenated together into a single list"
typeParam("R")
returns("List<R>")
@@ -581,4 +581,4 @@ fun collections() {
"""
}
}
}
}
libraries/tools/kotlin-stdlib-gen/src/templates/Engine.kt
+3 -3
View File
@@ -15,7 +15,7 @@ enum class Family {
PrimitiveArrays
}
class GenericFunction(val signature : String) {
class GenericFunction(val signature : String, val erasedSignature: String) {
var doc : String = ""
var toNullableT : Boolean = false
val isInline : Boolean = true;
@@ -151,8 +151,8 @@ fun String.trimTrailingSpaces() : String {
val templates = ArrayList<GenericFunction>()
fun f(signature : String, init : GenericFunction.() -> Unit) {
val gf = GenericFunction(signature)
fun f(signature : String, erasedSignature: String = signature, init : GenericFunction.() -> Unit) {
val gf = GenericFunction(signature, erasedSignature)
gf.init()
templates.add(gf)
}
libraries/tools/kotlin-stdlib-gen/src/templates/Iterators.kt
+1 -1
View File
@@ -40,7 +40,7 @@ fun iterators() {
}
}
f("flatMap(transform: (T) -> Iterator<R>)") {
f("flatMap(transform: (T) -> Iterator<R>)", "flatMap(Function1)") {
doc = "Returns an iterator over the concatenated results of transforming each element to one or more values"
typeParam("R")
returns("Iterator<R>")