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

not to generate extensions

Browse Source 
to java Iterable/Iterator
This commit is contained in:
Svetlana Isakova
2012-08-14 15:44:28 +04:00
parent 2c0ec86603
commit 77ef3d34ab
1 changed files with 12 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/test/org/jetbrains/kotlin/tools/GenerateStandardLib.kt
+12 -34
View File
@@ -34,7 +34,7 @@ $COMMON_AUTOGENERATED_WARNING
try {
// TODO ideally we'd use a filterNot() here :)
val iter = reader.lineIterator()
while (iter.hasNext) {
while (iter.hasNext()) {
val line = iter.next()
if (line.startsWith("package")) continue
@@ -77,25 +77,22 @@ fun main(args: Array<String>) {
// JLangIterables - Generic iterable stuff
generateFile(File(outDir, "ArraysFromJLangIterables.kt"), "package kotlin\n", File(srcDir, "JLangIterables.kt")) {
it.replaceAll("java.lang.Iterable<T", "Array<T").
replaceAll("java.lang.Iterable<T", "Array<T").
replaceAll("iterator.hasNext\\(\\)", "iterator.hasNext")
it.replaceAll("Iterable<T", "Array<T").
replaceAll("Iterable<T", "Array<T")
}
generateFile(File(outDir, "ArraysFromJLangIterablesJVM.kt"), "package kotlin\n", File(srcDir, "JLangIterablesJVM.kt")) {
it.replaceAll("java.lang.Iterable<T", "Array<T").
replaceAll("java.lang.Iterable<T", "Array<T").
replaceAll("iterator.hasNext\\(\\)", "iterator.hasNext")
it.replaceAll("Iterable<T", "Array<T").
replaceAll("Iterable<T", "Array<T")
}
generateFile(File(outDir, "ArraysFromJLangIterablesLazy.kt"), "package kotlin\n", File(srcDir, "JLangIterablesLazy.kt")) {
it.replaceAll("java.lang.Iterable<T", "Array<T").replaceAll("java.lang.Iterable<T", "Array<T")
it.replaceAll("Iterable<T", "Array<T")
}
for (arrayName in otherArrayNames) {
fun replace(it: String): 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("iterator.hasNext\\(\\)", "iterator.hasNext")
replaceGenerics(arrayName, it.replaceAll("<T> Iterable<T>", "${arrayName}Array").
replaceAll("<T> Iterable<T\\?>", "${arrayName}Array").
replaceAll("Iterable<T\\?>", "${arrayName}Array").
replaceAll("Iterable<T>", "${arrayName}Array"))
}
generateFile(File(outDir, "${arrayName}ArraysFromJLangIterables.kt"), "package kotlin\n", File(srcDir, "JLangIterables.kt")) {
@@ -109,23 +106,11 @@ fun main(args: Array<String>) {
}
}
generateFile(File(outDir, "StandardFromJLangIterables.kt"), "package kotlin\n", File(srcDir, "JLangIterables.kt")) {
it.replaceAll("java.lang.Iterable<T", "Iterable<T").
replaceAll("iterator.hasNext\\(\\)", "iterator.hasNext")
}
generateFile(File(outDir, "StandardFromJLangIterablesJVM.kt"), "package kotlin\n", File(srcDir, "JLangIterablesJVM.kt")) {
it.replaceAll("java.lang.Iterable<T", "Iterable<T").
replaceAll("iterator.hasNext\\(\\)", "iterator.hasNext")
}
generateFile(File(outDir, "StandardFromJLangIterablesLazy.kt"), "package kotlin\n", File(srcDir, "JLangIterablesLazy.kt")) {
it.replaceAll("java.lang.Iterable<T", "Iterable<T")
}
generateFile(File(outDir, "JUtilIteratorsFromJLangIterables.kt"), "package kotlin", File(srcDir, "JLangIterables.kt")) {
it.replaceAll("java.lang.Iterable<T", "java.util.Iterator<T")
it.replaceAll("Iterable<T", "Iterator<T")
}
generateFile(File(outDir, "JUtilIteratorsFromJLangIterablesJVM.kt"), "package kotlin", File(srcDir, "JLangIterablesJVM.kt")) {
it.replaceAll("java.lang.Iterable<T", "java.util.Iterator<T")
it.replaceAll("Iterable<T", "Iterator<T")
}
@@ -147,13 +132,6 @@ fun main(args: Array<String>) {
}
}
generateFile(File(outDir, "JUtilIterablesFromJUtilCollections.kt"), "package kotlin", File(srcDir, "JUtilCollections.kt")) {
it.replaceAll("java.util.Collection<T", "java.lang.Iterable<T").replaceAll("(this.size)", "")
}
generateFile(File(outDir, "JUtilIterablesFromJUtilCollectionsJVM.kt"), "package kotlin", File(srcDir, "JUtilCollectionsJVM.kt")) {
it.replaceAll("java.util.Collection<T", "java.lang.Iterable<T").replaceAll("(this.size)", "")
}
generateFile(File(outDir, "StandardFromJUtilCollections.kt"), "package kotlin", File(srcDir, "JUtilCollections.kt")) {
it.replaceAll("java.util.Collection<T", "Iterable<T").replaceAll("(this.size)", "")
}