diff --git a/ReadMe.md b/ReadMe.md index 8d9430409b7..efca934ff3a 100644 --- a/ReadMe.md +++ b/ReadMe.md @@ -79,7 +79,7 @@ Currently only committers can assign issues to themselves so just add a comment A nice gentle way to contribute would be to review the [API docs](http://jetbrains.github.com/kotlin/versions/snapshot/apidocs/index.html) and find classes or functions which are not documented very well and submit a patch. -In particular it'd be great if all functions included a nice example of how to use it such as for the filter() function on Collection. This is implemented using the @includeFunctionBody macro to include code from a test function. This serves as a double win; the API gets better documented with nice examples to help new users and the code gets more test coverage. +In particular it'd be great if all functions included a nice example of how to use it such as for the filter() function on Collection. This is implemented using the @includeFunctionBody macro to include code from a test function. This serves as a double win; the API gets better documented with nice examples to help new users and the code gets more test coverage. Also the [JavaScript translation](https://github.com/JetBrains/kotlin/blob/master/js/ReadMe.md) could really use your help. See the [JavaScript contribution section](https://github.com/JetBrains/kotlin/blob/master/js/ReadMe.md) for more details. diff --git a/js/js.translator/src/org/jetbrains/k2js/config/Config.java b/js/js.translator/src/org/jetbrains/k2js/config/Config.java index 63308692a92..f70bf1af2b5 100644 --- a/js/js.translator/src/org/jetbrains/k2js/config/Config.java +++ b/js/js.translator/src/org/jetbrains/k2js/config/Config.java @@ -118,15 +118,15 @@ public abstract class Config { "/kotlin/Preconditions.kt", "/kotlin/Iterators.kt", "/kotlin/JUtil.kt", - "/kotlin/JUtilCollections.kt", - "/kotlin/JUtilMaps.kt", - "/kotlin/JLangIterables.kt", - "/kotlin/JLangIterablesLazy.kt", - "/kotlin/JLangIterablesSpecial.kt", - "/generated/ArraysFromJLangIterables.kt", - "/generated/ArraysFromJLangIterablesLazy.kt", - "/generated/ArraysFromJUtilCollections.kt", - "/generated/JUtilIteratorsFromJLangIterables.kt", + "/kotlin/Collections.kt", + "/kotlin/Maps.kt", + "/kotlin/Iterables.kt", + "/kotlin/IterablesLazy.kt", + "/kotlin/IterablesSpecial.kt", + "/generated/ArraysFromIterables.kt", + "/generated/ArraysFromIterablesLazy.kt", + "/generated/ArraysFromCollections.kt", + "/generated/IteratorsFromIterables.kt", "/kotlin/support/AbstractIterator.kt", "/kotlin/Standard.kt", "/kotlin/Strings.kt", diff --git a/libraries/stdlib/src/generated/ArraysFromJUtilCollections.kt b/libraries/stdlib/src/generated/ArraysFromCollections.kt similarity index 93% rename from libraries/stdlib/src/generated/ArraysFromJUtilCollections.kt rename to libraries/stdlib/src/generated/ArraysFromCollections.kt index ce5419a2870..bcef4169b07 100644 --- a/libraries/stdlib/src/generated/ArraysFromJUtilCollections.kt +++ b/libraries/stdlib/src/generated/ArraysFromCollections.kt @@ -4,7 +4,7 @@ package kotlin // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib // -// Generated from input file: JUtilCollections.kt +// Generated from input file: src/kotlin/Collections.kt // diff --git a/libraries/stdlib/src/generated/ArraysFromJUtilCollectionsJVM.kt b/libraries/stdlib/src/generated/ArraysFromCollectionsJVM.kt similarity index 92% rename from libraries/stdlib/src/generated/ArraysFromJUtilCollectionsJVM.kt rename to libraries/stdlib/src/generated/ArraysFromCollectionsJVM.kt index f7bd6a7d32d..a66038b92b7 100644 --- a/libraries/stdlib/src/generated/ArraysFromJUtilCollectionsJVM.kt +++ b/libraries/stdlib/src/generated/ArraysFromCollectionsJVM.kt @@ -4,7 +4,7 @@ package kotlin // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib // -// Generated from input file: JUtilCollectionsJVM.kt +// Generated from input file: src/kotlin/CollectionsJVM.kt // diff --git a/libraries/stdlib/src/generated/ArraysFromJLangIterables.kt b/libraries/stdlib/src/generated/ArraysFromIterables.kt similarity index 99% rename from libraries/stdlib/src/generated/ArraysFromJLangIterables.kt rename to libraries/stdlib/src/generated/ArraysFromIterables.kt index 98530fe3979..1e62db468ae 100644 --- a/libraries/stdlib/src/generated/ArraysFromJLangIterables.kt +++ b/libraries/stdlib/src/generated/ArraysFromIterables.kt @@ -5,7 +5,7 @@ package kotlin // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib // -// Generated from input file: JLangIterables.kt +// Generated from input file: src/kotlin/Iterables.kt // diff --git a/libraries/stdlib/src/generated/ArraysFromJLangIterablesJVM.kt b/libraries/stdlib/src/generated/ArraysFromIterablesJVM.kt similarity index 85% rename from libraries/stdlib/src/generated/ArraysFromJLangIterablesJVM.kt rename to libraries/stdlib/src/generated/ArraysFromIterablesJVM.kt index b77fca7de56..2375ef4de1c 100644 --- a/libraries/stdlib/src/generated/ArraysFromJLangIterablesJVM.kt +++ b/libraries/stdlib/src/generated/ArraysFromIterablesJVM.kt @@ -5,7 +5,7 @@ package kotlin // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib // -// Generated from input file: JLangIterablesJVM.kt +// Generated from input file: src/kotlin/IterablesJVM.kt // diff --git a/libraries/stdlib/src/generated/ArraysFromJLangIterablesLazy.kt b/libraries/stdlib/src/generated/ArraysFromIterablesLazy.kt similarity index 98% rename from libraries/stdlib/src/generated/ArraysFromJLangIterablesLazy.kt rename to libraries/stdlib/src/generated/ArraysFromIterablesLazy.kt index 8a56a6e79f2..8e366a995fc 100644 --- a/libraries/stdlib/src/generated/ArraysFromJLangIterablesLazy.kt +++ b/libraries/stdlib/src/generated/ArraysFromIterablesLazy.kt @@ -5,7 +5,7 @@ package kotlin // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib // -// Generated from input file: JLangIterablesLazy.kt +// Generated from input file: src/kotlin/IterablesLazy.kt // diff --git a/libraries/stdlib/src/generated/BooleanArraysFromJUtilCollections.kt b/libraries/stdlib/src/generated/BooleanArraysFromCollections.kt similarity index 93% rename from libraries/stdlib/src/generated/BooleanArraysFromJUtilCollections.kt rename to libraries/stdlib/src/generated/BooleanArraysFromCollections.kt index f6a940d8251..9f309ebb2da 100644 --- a/libraries/stdlib/src/generated/BooleanArraysFromJUtilCollections.kt +++ b/libraries/stdlib/src/generated/BooleanArraysFromCollections.kt @@ -4,7 +4,7 @@ package kotlin // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib // -// Generated from input file: JUtilCollections.kt +// Generated from input file: src/kotlin/Collections.kt // diff --git a/libraries/stdlib/src/generated/BooleanArraysFromJUtilCollectionsJVM.kt b/libraries/stdlib/src/generated/BooleanArraysFromCollectionsJVM.kt similarity index 92% rename from libraries/stdlib/src/generated/BooleanArraysFromJUtilCollectionsJVM.kt rename to libraries/stdlib/src/generated/BooleanArraysFromCollectionsJVM.kt index 426f8417b04..e3b6f785ec6 100644 --- a/libraries/stdlib/src/generated/BooleanArraysFromJUtilCollectionsJVM.kt +++ b/libraries/stdlib/src/generated/BooleanArraysFromCollectionsJVM.kt @@ -4,7 +4,7 @@ package kotlin // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib // -// Generated from input file: JUtilCollectionsJVM.kt +// Generated from input file: src/kotlin/CollectionsJVM.kt // diff --git a/libraries/stdlib/src/generated/BooleanArraysFromJLangIterables.kt b/libraries/stdlib/src/generated/BooleanArraysFromIterables.kt similarity index 99% rename from libraries/stdlib/src/generated/BooleanArraysFromJLangIterables.kt rename to libraries/stdlib/src/generated/BooleanArraysFromIterables.kt index 42940e7121d..c05eecec537 100644 --- a/libraries/stdlib/src/generated/BooleanArraysFromJLangIterables.kt +++ b/libraries/stdlib/src/generated/BooleanArraysFromIterables.kt @@ -5,7 +5,7 @@ package kotlin // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib // -// Generated from input file: JLangIterables.kt +// Generated from input file: src/kotlin/Iterables.kt // diff --git a/libraries/stdlib/src/generated/BooleanArraysFromJLangIterablesJVM.kt b/libraries/stdlib/src/generated/BooleanArraysFromIterablesJVM.kt similarity index 85% rename from libraries/stdlib/src/generated/BooleanArraysFromJLangIterablesJVM.kt rename to libraries/stdlib/src/generated/BooleanArraysFromIterablesJVM.kt index 72bc5398263..a663980710b 100644 --- a/libraries/stdlib/src/generated/BooleanArraysFromJLangIterablesJVM.kt +++ b/libraries/stdlib/src/generated/BooleanArraysFromIterablesJVM.kt @@ -5,7 +5,7 @@ package kotlin // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib // -// Generated from input file: JLangIterablesJVM.kt +// Generated from input file: src/kotlin/IterablesJVM.kt // diff --git a/libraries/stdlib/src/generated/BooleanArraysFromJLangIterablesLazy.kt b/libraries/stdlib/src/generated/BooleanArraysFromIterablesLazy.kt similarity index 98% rename from libraries/stdlib/src/generated/BooleanArraysFromJLangIterablesLazy.kt rename to libraries/stdlib/src/generated/BooleanArraysFromIterablesLazy.kt index 7ef7f6a4656..4bc8baede93 100644 --- a/libraries/stdlib/src/generated/BooleanArraysFromJLangIterablesLazy.kt +++ b/libraries/stdlib/src/generated/BooleanArraysFromIterablesLazy.kt @@ -5,7 +5,7 @@ package kotlin // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib // -// Generated from input file: JLangIterablesLazy.kt +// Generated from input file: src/kotlin/IterablesLazy.kt // diff --git a/libraries/stdlib/src/generated/ByteArraysFromJUtilCollections.kt b/libraries/stdlib/src/generated/ByteArraysFromCollections.kt similarity index 93% rename from libraries/stdlib/src/generated/ByteArraysFromJUtilCollections.kt rename to libraries/stdlib/src/generated/ByteArraysFromCollections.kt index cdd0f301373..72759b1d8c4 100644 --- a/libraries/stdlib/src/generated/ByteArraysFromJUtilCollections.kt +++ b/libraries/stdlib/src/generated/ByteArraysFromCollections.kt @@ -4,7 +4,7 @@ package kotlin // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib // -// Generated from input file: JUtilCollections.kt +// Generated from input file: src/kotlin/Collections.kt // diff --git a/libraries/stdlib/src/generated/ByteArraysFromJUtilCollectionsJVM.kt b/libraries/stdlib/src/generated/ByteArraysFromCollectionsJVM.kt similarity index 92% rename from libraries/stdlib/src/generated/ByteArraysFromJUtilCollectionsJVM.kt rename to libraries/stdlib/src/generated/ByteArraysFromCollectionsJVM.kt index f3c16749fc1..9355d5b7a5a 100644 --- a/libraries/stdlib/src/generated/ByteArraysFromJUtilCollectionsJVM.kt +++ b/libraries/stdlib/src/generated/ByteArraysFromCollectionsJVM.kt @@ -4,7 +4,7 @@ package kotlin // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib // -// Generated from input file: JUtilCollectionsJVM.kt +// Generated from input file: src/kotlin/CollectionsJVM.kt // diff --git a/libraries/stdlib/src/generated/ByteArraysFromJLangIterables.kt b/libraries/stdlib/src/generated/ByteArraysFromIterables.kt similarity index 99% rename from libraries/stdlib/src/generated/ByteArraysFromJLangIterables.kt rename to libraries/stdlib/src/generated/ByteArraysFromIterables.kt index 0f5c3e94767..5d6452ce1a0 100644 --- a/libraries/stdlib/src/generated/ByteArraysFromJLangIterables.kt +++ b/libraries/stdlib/src/generated/ByteArraysFromIterables.kt @@ -5,7 +5,7 @@ package kotlin // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib // -// Generated from input file: JLangIterables.kt +// Generated from input file: src/kotlin/Iterables.kt // diff --git a/libraries/stdlib/src/generated/ByteArraysFromJLangIterablesJVM.kt b/libraries/stdlib/src/generated/ByteArraysFromIterablesJVM.kt similarity index 85% rename from libraries/stdlib/src/generated/ByteArraysFromJLangIterablesJVM.kt rename to libraries/stdlib/src/generated/ByteArraysFromIterablesJVM.kt index 9aedbe3118a..14507d8f39d 100644 --- a/libraries/stdlib/src/generated/ByteArraysFromJLangIterablesJVM.kt +++ b/libraries/stdlib/src/generated/ByteArraysFromIterablesJVM.kt @@ -5,7 +5,7 @@ package kotlin // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib // -// Generated from input file: JLangIterablesJVM.kt +// Generated from input file: src/kotlin/IterablesJVM.kt // diff --git a/libraries/stdlib/src/generated/ByteArraysFromJLangIterablesLazy.kt b/libraries/stdlib/src/generated/ByteArraysFromIterablesLazy.kt similarity index 98% rename from libraries/stdlib/src/generated/ByteArraysFromJLangIterablesLazy.kt rename to libraries/stdlib/src/generated/ByteArraysFromIterablesLazy.kt index ae01dfc0ba5..c4fec37f7d6 100644 --- a/libraries/stdlib/src/generated/ByteArraysFromJLangIterablesLazy.kt +++ b/libraries/stdlib/src/generated/ByteArraysFromIterablesLazy.kt @@ -5,7 +5,7 @@ package kotlin // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib // -// Generated from input file: JLangIterablesLazy.kt +// Generated from input file: src/kotlin/IterablesLazy.kt // diff --git a/libraries/stdlib/src/generated/CharArraysFromJUtilCollections.kt b/libraries/stdlib/src/generated/CharArraysFromCollections.kt similarity index 93% rename from libraries/stdlib/src/generated/CharArraysFromJUtilCollections.kt rename to libraries/stdlib/src/generated/CharArraysFromCollections.kt index e91ceceb4ea..aa564b95d26 100644 --- a/libraries/stdlib/src/generated/CharArraysFromJUtilCollections.kt +++ b/libraries/stdlib/src/generated/CharArraysFromCollections.kt @@ -4,7 +4,7 @@ package kotlin // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib // -// Generated from input file: JUtilCollections.kt +// Generated from input file: src/kotlin/Collections.kt // diff --git a/libraries/stdlib/src/generated/CharArraysFromJUtilCollectionsJVM.kt b/libraries/stdlib/src/generated/CharArraysFromCollectionsJVM.kt similarity index 92% rename from libraries/stdlib/src/generated/CharArraysFromJUtilCollectionsJVM.kt rename to libraries/stdlib/src/generated/CharArraysFromCollectionsJVM.kt index a05f3de8020..d1c415d221c 100644 --- a/libraries/stdlib/src/generated/CharArraysFromJUtilCollectionsJVM.kt +++ b/libraries/stdlib/src/generated/CharArraysFromCollectionsJVM.kt @@ -4,7 +4,7 @@ package kotlin // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib // -// Generated from input file: JUtilCollectionsJVM.kt +// Generated from input file: src/kotlin/CollectionsJVM.kt // diff --git a/libraries/stdlib/src/generated/CharArraysFromJLangIterables.kt b/libraries/stdlib/src/generated/CharArraysFromIterables.kt similarity index 99% rename from libraries/stdlib/src/generated/CharArraysFromJLangIterables.kt rename to libraries/stdlib/src/generated/CharArraysFromIterables.kt index 52cbf787bfc..0cbdc30025b 100644 --- a/libraries/stdlib/src/generated/CharArraysFromJLangIterables.kt +++ b/libraries/stdlib/src/generated/CharArraysFromIterables.kt @@ -5,7 +5,7 @@ package kotlin // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib // -// Generated from input file: JLangIterables.kt +// Generated from input file: src/kotlin/Iterables.kt // diff --git a/libraries/stdlib/src/generated/CharArraysFromJLangIterablesJVM.kt b/libraries/stdlib/src/generated/CharArraysFromIterablesJVM.kt similarity index 85% rename from libraries/stdlib/src/generated/CharArraysFromJLangIterablesJVM.kt rename to libraries/stdlib/src/generated/CharArraysFromIterablesJVM.kt index 43b6b8a5b2f..b9d62135175 100644 --- a/libraries/stdlib/src/generated/CharArraysFromJLangIterablesJVM.kt +++ b/libraries/stdlib/src/generated/CharArraysFromIterablesJVM.kt @@ -5,7 +5,7 @@ package kotlin // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib // -// Generated from input file: JLangIterablesJVM.kt +// Generated from input file: src/kotlin/IterablesJVM.kt // diff --git a/libraries/stdlib/src/generated/CharArraysFromJLangIterablesLazy.kt b/libraries/stdlib/src/generated/CharArraysFromIterablesLazy.kt similarity index 98% rename from libraries/stdlib/src/generated/CharArraysFromJLangIterablesLazy.kt rename to libraries/stdlib/src/generated/CharArraysFromIterablesLazy.kt index 26cd5ffd3b2..2225ee0fffa 100644 --- a/libraries/stdlib/src/generated/CharArraysFromJLangIterablesLazy.kt +++ b/libraries/stdlib/src/generated/CharArraysFromIterablesLazy.kt @@ -5,7 +5,7 @@ package kotlin // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib // -// Generated from input file: JLangIterablesLazy.kt +// Generated from input file: src/kotlin/IterablesLazy.kt // diff --git a/libraries/stdlib/src/generated/DoubleArraysFromJUtilCollections.kt b/libraries/stdlib/src/generated/DoubleArraysFromCollections.kt similarity index 93% rename from libraries/stdlib/src/generated/DoubleArraysFromJUtilCollections.kt rename to libraries/stdlib/src/generated/DoubleArraysFromCollections.kt index 1335f6e1022..0ed5a11806a 100644 --- a/libraries/stdlib/src/generated/DoubleArraysFromJUtilCollections.kt +++ b/libraries/stdlib/src/generated/DoubleArraysFromCollections.kt @@ -4,7 +4,7 @@ package kotlin // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib // -// Generated from input file: JUtilCollections.kt +// Generated from input file: src/kotlin/Collections.kt // diff --git a/libraries/stdlib/src/generated/DoubleArraysFromJUtilCollectionsJVM.kt b/libraries/stdlib/src/generated/DoubleArraysFromCollectionsJVM.kt similarity index 92% rename from libraries/stdlib/src/generated/DoubleArraysFromJUtilCollectionsJVM.kt rename to libraries/stdlib/src/generated/DoubleArraysFromCollectionsJVM.kt index 4388fdfb039..dbba91b15f3 100644 --- a/libraries/stdlib/src/generated/DoubleArraysFromJUtilCollectionsJVM.kt +++ b/libraries/stdlib/src/generated/DoubleArraysFromCollectionsJVM.kt @@ -4,7 +4,7 @@ package kotlin // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib // -// Generated from input file: JUtilCollectionsJVM.kt +// Generated from input file: src/kotlin/CollectionsJVM.kt // diff --git a/libraries/stdlib/src/generated/DoubleArraysFromJLangIterables.kt b/libraries/stdlib/src/generated/DoubleArraysFromIterables.kt similarity index 99% rename from libraries/stdlib/src/generated/DoubleArraysFromJLangIterables.kt rename to libraries/stdlib/src/generated/DoubleArraysFromIterables.kt index 7a4a7ef7ad9..6f425180dce 100644 --- a/libraries/stdlib/src/generated/DoubleArraysFromJLangIterables.kt +++ b/libraries/stdlib/src/generated/DoubleArraysFromIterables.kt @@ -5,7 +5,7 @@ package kotlin // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib // -// Generated from input file: JLangIterables.kt +// Generated from input file: src/kotlin/Iterables.kt // diff --git a/libraries/stdlib/src/generated/DoubleArraysFromJLangIterablesJVM.kt b/libraries/stdlib/src/generated/DoubleArraysFromIterablesJVM.kt similarity index 85% rename from libraries/stdlib/src/generated/DoubleArraysFromJLangIterablesJVM.kt rename to libraries/stdlib/src/generated/DoubleArraysFromIterablesJVM.kt index 346b220387b..accecd0d205 100644 --- a/libraries/stdlib/src/generated/DoubleArraysFromJLangIterablesJVM.kt +++ b/libraries/stdlib/src/generated/DoubleArraysFromIterablesJVM.kt @@ -5,7 +5,7 @@ package kotlin // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib // -// Generated from input file: JLangIterablesJVM.kt +// Generated from input file: src/kotlin/IterablesJVM.kt // diff --git a/libraries/stdlib/src/generated/DoubleArraysFromJLangIterablesLazy.kt b/libraries/stdlib/src/generated/DoubleArraysFromIterablesLazy.kt similarity index 98% rename from libraries/stdlib/src/generated/DoubleArraysFromJLangIterablesLazy.kt rename to libraries/stdlib/src/generated/DoubleArraysFromIterablesLazy.kt index da0e6f18da6..05b27c643a0 100644 --- a/libraries/stdlib/src/generated/DoubleArraysFromJLangIterablesLazy.kt +++ b/libraries/stdlib/src/generated/DoubleArraysFromIterablesLazy.kt @@ -5,7 +5,7 @@ package kotlin // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib // -// Generated from input file: JLangIterablesLazy.kt +// Generated from input file: src/kotlin/IterablesLazy.kt // diff --git a/libraries/stdlib/src/generated/FloatArraysFromJUtilCollections.kt b/libraries/stdlib/src/generated/FloatArraysFromCollections.kt similarity index 93% rename from libraries/stdlib/src/generated/FloatArraysFromJUtilCollections.kt rename to libraries/stdlib/src/generated/FloatArraysFromCollections.kt index 1d8feeb82d2..0c83627030c 100644 --- a/libraries/stdlib/src/generated/FloatArraysFromJUtilCollections.kt +++ b/libraries/stdlib/src/generated/FloatArraysFromCollections.kt @@ -4,7 +4,7 @@ package kotlin // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib // -// Generated from input file: JUtilCollections.kt +// Generated from input file: src/kotlin/Collections.kt // diff --git a/libraries/stdlib/src/generated/FloatArraysFromJUtilCollectionsJVM.kt b/libraries/stdlib/src/generated/FloatArraysFromCollectionsJVM.kt similarity index 92% rename from libraries/stdlib/src/generated/FloatArraysFromJUtilCollectionsJVM.kt rename to libraries/stdlib/src/generated/FloatArraysFromCollectionsJVM.kt index 104614fd31c..978d100824f 100644 --- a/libraries/stdlib/src/generated/FloatArraysFromJUtilCollectionsJVM.kt +++ b/libraries/stdlib/src/generated/FloatArraysFromCollectionsJVM.kt @@ -4,7 +4,7 @@ package kotlin // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib // -// Generated from input file: JUtilCollectionsJVM.kt +// Generated from input file: src/kotlin/CollectionsJVM.kt // diff --git a/libraries/stdlib/src/generated/FloatArraysFromJLangIterables.kt b/libraries/stdlib/src/generated/FloatArraysFromIterables.kt similarity index 99% rename from libraries/stdlib/src/generated/FloatArraysFromJLangIterables.kt rename to libraries/stdlib/src/generated/FloatArraysFromIterables.kt index b0ab53517ae..92df196b3b6 100644 --- a/libraries/stdlib/src/generated/FloatArraysFromJLangIterables.kt +++ b/libraries/stdlib/src/generated/FloatArraysFromIterables.kt @@ -5,7 +5,7 @@ package kotlin // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib // -// Generated from input file: JLangIterables.kt +// Generated from input file: src/kotlin/Iterables.kt // diff --git a/libraries/stdlib/src/generated/FloatArraysFromJLangIterablesJVM.kt b/libraries/stdlib/src/generated/FloatArraysFromIterablesJVM.kt similarity index 85% rename from libraries/stdlib/src/generated/FloatArraysFromJLangIterablesJVM.kt rename to libraries/stdlib/src/generated/FloatArraysFromIterablesJVM.kt index 3bb750f9b9b..721ddb39518 100644 --- a/libraries/stdlib/src/generated/FloatArraysFromJLangIterablesJVM.kt +++ b/libraries/stdlib/src/generated/FloatArraysFromIterablesJVM.kt @@ -5,7 +5,7 @@ package kotlin // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib // -// Generated from input file: JLangIterablesJVM.kt +// Generated from input file: src/kotlin/IterablesJVM.kt // diff --git a/libraries/stdlib/src/generated/FloatArraysFromJLangIterablesLazy.kt b/libraries/stdlib/src/generated/FloatArraysFromIterablesLazy.kt similarity index 98% rename from libraries/stdlib/src/generated/FloatArraysFromJLangIterablesLazy.kt rename to libraries/stdlib/src/generated/FloatArraysFromIterablesLazy.kt index f73719da3a3..b3baff78c96 100644 --- a/libraries/stdlib/src/generated/FloatArraysFromJLangIterablesLazy.kt +++ b/libraries/stdlib/src/generated/FloatArraysFromIterablesLazy.kt @@ -5,7 +5,7 @@ package kotlin // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib // -// Generated from input file: JLangIterablesLazy.kt +// Generated from input file: src/kotlin/IterablesLazy.kt // diff --git a/libraries/stdlib/src/generated/IntArraysFromJUtilCollections.kt b/libraries/stdlib/src/generated/IntArraysFromCollections.kt similarity index 92% rename from libraries/stdlib/src/generated/IntArraysFromJUtilCollections.kt rename to libraries/stdlib/src/generated/IntArraysFromCollections.kt index 66249d82b0c..7e6c41d5795 100644 --- a/libraries/stdlib/src/generated/IntArraysFromJUtilCollections.kt +++ b/libraries/stdlib/src/generated/IntArraysFromCollections.kt @@ -4,7 +4,7 @@ package kotlin // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib // -// Generated from input file: JUtilCollections.kt +// Generated from input file: src/kotlin/Collections.kt // diff --git a/libraries/stdlib/src/generated/IntArraysFromJUtilCollectionsJVM.kt b/libraries/stdlib/src/generated/IntArraysFromCollectionsJVM.kt similarity index 92% rename from libraries/stdlib/src/generated/IntArraysFromJUtilCollectionsJVM.kt rename to libraries/stdlib/src/generated/IntArraysFromCollectionsJVM.kt index 82bb4cad9fb..a7a89c69d50 100644 --- a/libraries/stdlib/src/generated/IntArraysFromJUtilCollectionsJVM.kt +++ b/libraries/stdlib/src/generated/IntArraysFromCollectionsJVM.kt @@ -4,7 +4,7 @@ package kotlin // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib // -// Generated from input file: JUtilCollectionsJVM.kt +// Generated from input file: src/kotlin/CollectionsJVM.kt // diff --git a/libraries/stdlib/src/generated/IntArraysFromJLangIterables.kt b/libraries/stdlib/src/generated/IntArraysFromIterables.kt similarity index 99% rename from libraries/stdlib/src/generated/IntArraysFromJLangIterables.kt rename to libraries/stdlib/src/generated/IntArraysFromIterables.kt index d134f8da827..1c4c6e187b3 100644 --- a/libraries/stdlib/src/generated/IntArraysFromJLangIterables.kt +++ b/libraries/stdlib/src/generated/IntArraysFromIterables.kt @@ -5,7 +5,7 @@ package kotlin // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib // -// Generated from input file: JLangIterables.kt +// Generated from input file: src/kotlin/Iterables.kt // diff --git a/libraries/stdlib/src/generated/IntArraysFromJLangIterablesJVM.kt b/libraries/stdlib/src/generated/IntArraysFromIterablesJVM.kt similarity index 85% rename from libraries/stdlib/src/generated/IntArraysFromJLangIterablesJVM.kt rename to libraries/stdlib/src/generated/IntArraysFromIterablesJVM.kt index d1276a3bdf3..7ca6a7acb81 100644 --- a/libraries/stdlib/src/generated/IntArraysFromJLangIterablesJVM.kt +++ b/libraries/stdlib/src/generated/IntArraysFromIterablesJVM.kt @@ -5,7 +5,7 @@ package kotlin // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib // -// Generated from input file: JLangIterablesJVM.kt +// Generated from input file: src/kotlin/IterablesJVM.kt // diff --git a/libraries/stdlib/src/generated/IntArraysFromJLangIterablesLazy.kt b/libraries/stdlib/src/generated/IntArraysFromIterablesLazy.kt similarity index 98% rename from libraries/stdlib/src/generated/IntArraysFromJLangIterablesLazy.kt rename to libraries/stdlib/src/generated/IntArraysFromIterablesLazy.kt index 459ce7c5922..84e7c2a42fe 100644 --- a/libraries/stdlib/src/generated/IntArraysFromJLangIterablesLazy.kt +++ b/libraries/stdlib/src/generated/IntArraysFromIterablesLazy.kt @@ -5,7 +5,7 @@ package kotlin // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib // -// Generated from input file: JLangIterablesLazy.kt +// Generated from input file: src/kotlin/IterablesLazy.kt // diff --git a/libraries/stdlib/src/generated/JUtilIteratorsFromJLangIterables.kt b/libraries/stdlib/src/generated/IteratorsFromIterables.kt similarity index 99% rename from libraries/stdlib/src/generated/JUtilIteratorsFromJLangIterables.kt rename to libraries/stdlib/src/generated/IteratorsFromIterables.kt index 11d89a55c87..f80e55a0f11 100644 --- a/libraries/stdlib/src/generated/JUtilIteratorsFromJLangIterables.kt +++ b/libraries/stdlib/src/generated/IteratorsFromIterables.kt @@ -4,7 +4,7 @@ package kotlin // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib // -// Generated from input file: JLangIterables.kt +// Generated from input file: src/kotlin/Iterables.kt // diff --git a/libraries/stdlib/src/generated/JUtilIteratorsFromJLangIterablesJVM.kt b/libraries/stdlib/src/generated/IteratorsFromIterablesJVM.kt similarity index 85% rename from libraries/stdlib/src/generated/JUtilIteratorsFromJLangIterablesJVM.kt rename to libraries/stdlib/src/generated/IteratorsFromIterablesJVM.kt index 101ab31ef38..0440442a909 100644 --- a/libraries/stdlib/src/generated/JUtilIteratorsFromJLangIterablesJVM.kt +++ b/libraries/stdlib/src/generated/IteratorsFromIterablesJVM.kt @@ -4,7 +4,7 @@ package kotlin // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib // -// Generated from input file: JLangIterablesJVM.kt +// Generated from input file: src/kotlin/IterablesJVM.kt // diff --git a/libraries/stdlib/src/generated/LongArraysFromJUtilCollections.kt b/libraries/stdlib/src/generated/LongArraysFromCollections.kt similarity index 93% rename from libraries/stdlib/src/generated/LongArraysFromJUtilCollections.kt rename to libraries/stdlib/src/generated/LongArraysFromCollections.kt index 09b08f2d843..fbbd5245956 100644 --- a/libraries/stdlib/src/generated/LongArraysFromJUtilCollections.kt +++ b/libraries/stdlib/src/generated/LongArraysFromCollections.kt @@ -4,7 +4,7 @@ package kotlin // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib // -// Generated from input file: JUtilCollections.kt +// Generated from input file: src/kotlin/Collections.kt // diff --git a/libraries/stdlib/src/generated/LongArraysFromJUtilCollectionsJVM.kt b/libraries/stdlib/src/generated/LongArraysFromCollectionsJVM.kt similarity index 92% rename from libraries/stdlib/src/generated/LongArraysFromJUtilCollectionsJVM.kt rename to libraries/stdlib/src/generated/LongArraysFromCollectionsJVM.kt index 43464a2fcb3..cf28a55ec08 100644 --- a/libraries/stdlib/src/generated/LongArraysFromJUtilCollectionsJVM.kt +++ b/libraries/stdlib/src/generated/LongArraysFromCollectionsJVM.kt @@ -4,7 +4,7 @@ package kotlin // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib // -// Generated from input file: JUtilCollectionsJVM.kt +// Generated from input file: src/kotlin/CollectionsJVM.kt // diff --git a/libraries/stdlib/src/generated/LongArraysFromJLangIterables.kt b/libraries/stdlib/src/generated/LongArraysFromIterables.kt similarity index 99% rename from libraries/stdlib/src/generated/LongArraysFromJLangIterables.kt rename to libraries/stdlib/src/generated/LongArraysFromIterables.kt index ef081a443b9..40067e7e15d 100644 --- a/libraries/stdlib/src/generated/LongArraysFromJLangIterables.kt +++ b/libraries/stdlib/src/generated/LongArraysFromIterables.kt @@ -5,7 +5,7 @@ package kotlin // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib // -// Generated from input file: JLangIterables.kt +// Generated from input file: src/kotlin/Iterables.kt // diff --git a/libraries/stdlib/src/generated/LongArraysFromJLangIterablesJVM.kt b/libraries/stdlib/src/generated/LongArraysFromIterablesJVM.kt similarity index 85% rename from libraries/stdlib/src/generated/LongArraysFromJLangIterablesJVM.kt rename to libraries/stdlib/src/generated/LongArraysFromIterablesJVM.kt index 6b9ff88fd56..b6c3664547d 100644 --- a/libraries/stdlib/src/generated/LongArraysFromJLangIterablesJVM.kt +++ b/libraries/stdlib/src/generated/LongArraysFromIterablesJVM.kt @@ -5,7 +5,7 @@ package kotlin // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib // -// Generated from input file: JLangIterablesJVM.kt +// Generated from input file: src/kotlin/IterablesJVM.kt // diff --git a/libraries/stdlib/src/generated/LongArraysFromJLangIterablesLazy.kt b/libraries/stdlib/src/generated/LongArraysFromIterablesLazy.kt similarity index 98% rename from libraries/stdlib/src/generated/LongArraysFromJLangIterablesLazy.kt rename to libraries/stdlib/src/generated/LongArraysFromIterablesLazy.kt index 89ec02312c0..5fb3b7910c5 100644 --- a/libraries/stdlib/src/generated/LongArraysFromJLangIterablesLazy.kt +++ b/libraries/stdlib/src/generated/LongArraysFromIterablesLazy.kt @@ -5,7 +5,7 @@ package kotlin // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib // -// Generated from input file: JLangIterablesLazy.kt +// Generated from input file: src/kotlin/IterablesLazy.kt // diff --git a/libraries/stdlib/src/generated/ShortArraysFromJUtilCollections.kt b/libraries/stdlib/src/generated/ShortArraysFromCollections.kt similarity index 93% rename from libraries/stdlib/src/generated/ShortArraysFromJUtilCollections.kt rename to libraries/stdlib/src/generated/ShortArraysFromCollections.kt index 133cebaee30..92f709c4344 100644 --- a/libraries/stdlib/src/generated/ShortArraysFromJUtilCollections.kt +++ b/libraries/stdlib/src/generated/ShortArraysFromCollections.kt @@ -4,7 +4,7 @@ package kotlin // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib // -// Generated from input file: JUtilCollections.kt +// Generated from input file: src/kotlin/Collections.kt // diff --git a/libraries/stdlib/src/generated/ShortArraysFromJUtilCollectionsJVM.kt b/libraries/stdlib/src/generated/ShortArraysFromCollectionsJVM.kt similarity index 92% rename from libraries/stdlib/src/generated/ShortArraysFromJUtilCollectionsJVM.kt rename to libraries/stdlib/src/generated/ShortArraysFromCollectionsJVM.kt index b414b47fa94..c25d31f8216 100644 --- a/libraries/stdlib/src/generated/ShortArraysFromJUtilCollectionsJVM.kt +++ b/libraries/stdlib/src/generated/ShortArraysFromCollectionsJVM.kt @@ -4,7 +4,7 @@ package kotlin // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib // -// Generated from input file: JUtilCollectionsJVM.kt +// Generated from input file: src/kotlin/CollectionsJVM.kt // diff --git a/libraries/stdlib/src/generated/ShortArraysFromJLangIterables.kt b/libraries/stdlib/src/generated/ShortArraysFromIterables.kt similarity index 99% rename from libraries/stdlib/src/generated/ShortArraysFromJLangIterables.kt rename to libraries/stdlib/src/generated/ShortArraysFromIterables.kt index 94f78798805..60badffa36e 100644 --- a/libraries/stdlib/src/generated/ShortArraysFromJLangIterables.kt +++ b/libraries/stdlib/src/generated/ShortArraysFromIterables.kt @@ -5,7 +5,7 @@ package kotlin // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib // -// Generated from input file: JLangIterables.kt +// Generated from input file: src/kotlin/Iterables.kt // diff --git a/libraries/stdlib/src/generated/ShortArraysFromJLangIterablesJVM.kt b/libraries/stdlib/src/generated/ShortArraysFromIterablesJVM.kt similarity index 85% rename from libraries/stdlib/src/generated/ShortArraysFromJLangIterablesJVM.kt rename to libraries/stdlib/src/generated/ShortArraysFromIterablesJVM.kt index 31ce6255791..10ad4594d72 100644 --- a/libraries/stdlib/src/generated/ShortArraysFromJLangIterablesJVM.kt +++ b/libraries/stdlib/src/generated/ShortArraysFromIterablesJVM.kt @@ -5,7 +5,7 @@ package kotlin // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib // -// Generated from input file: JLangIterablesJVM.kt +// Generated from input file: src/kotlin/IterablesJVM.kt // diff --git a/libraries/stdlib/src/generated/ShortArraysFromJLangIterablesLazy.kt b/libraries/stdlib/src/generated/ShortArraysFromIterablesLazy.kt similarity index 98% rename from libraries/stdlib/src/generated/ShortArraysFromJLangIterablesLazy.kt rename to libraries/stdlib/src/generated/ShortArraysFromIterablesLazy.kt index 413a9cacf89..793f512eaf2 100644 --- a/libraries/stdlib/src/generated/ShortArraysFromJLangIterablesLazy.kt +++ b/libraries/stdlib/src/generated/ShortArraysFromIterablesLazy.kt @@ -5,7 +5,7 @@ package kotlin // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib // -// Generated from input file: JLangIterablesLazy.kt +// Generated from input file: src/kotlin/IterablesLazy.kt // diff --git a/libraries/stdlib/src/generated/StandardFromJUtilCollections.kt b/libraries/stdlib/src/generated/StandardFromCollections.kt similarity index 93% rename from libraries/stdlib/src/generated/StandardFromJUtilCollections.kt rename to libraries/stdlib/src/generated/StandardFromCollections.kt index 1c17fda6161..8d309ec3b9a 100644 --- a/libraries/stdlib/src/generated/StandardFromJUtilCollections.kt +++ b/libraries/stdlib/src/generated/StandardFromCollections.kt @@ -4,7 +4,7 @@ package kotlin // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib // -// Generated from input file: JUtilCollections.kt +// Generated from input file: src/kotlin/Collections.kt // diff --git a/libraries/stdlib/src/generated/StandardFromJUtilCollectionsJVM.kt b/libraries/stdlib/src/generated/StandardFromCollectionsJVM.kt similarity index 92% rename from libraries/stdlib/src/generated/StandardFromJUtilCollectionsJVM.kt rename to libraries/stdlib/src/generated/StandardFromCollectionsJVM.kt index d6a90f7b92b..b2559c88ee1 100644 --- a/libraries/stdlib/src/generated/StandardFromJUtilCollectionsJVM.kt +++ b/libraries/stdlib/src/generated/StandardFromCollectionsJVM.kt @@ -4,7 +4,7 @@ package kotlin // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib // -// Generated from input file: JUtilCollectionsJVM.kt +// Generated from input file: src/kotlin/CollectionsJVM.kt // diff --git a/libraries/stdlib/src/kotlin/JUtilCollections.kt b/libraries/stdlib/src/kotlin/Collections.kt similarity index 100% rename from libraries/stdlib/src/kotlin/JUtilCollections.kt rename to libraries/stdlib/src/kotlin/Collections.kt diff --git a/libraries/stdlib/src/kotlin/JUtilCollectionsJVM.kt b/libraries/stdlib/src/kotlin/CollectionsJVM.kt similarity index 100% rename from libraries/stdlib/src/kotlin/JUtilCollectionsJVM.kt rename to libraries/stdlib/src/kotlin/CollectionsJVM.kt diff --git a/libraries/stdlib/src/kotlin/JLangIterables.kt b/libraries/stdlib/src/kotlin/Iterables.kt similarity index 100% rename from libraries/stdlib/src/kotlin/JLangIterables.kt rename to libraries/stdlib/src/kotlin/Iterables.kt diff --git a/libraries/stdlib/src/kotlin/JLangIterablesJVM.kt b/libraries/stdlib/src/kotlin/IterablesJVM.kt similarity index 100% rename from libraries/stdlib/src/kotlin/JLangIterablesJVM.kt rename to libraries/stdlib/src/kotlin/IterablesJVM.kt diff --git a/libraries/stdlib/src/kotlin/JLangIterablesLazy.kt b/libraries/stdlib/src/kotlin/IterablesLazy.kt similarity index 100% rename from libraries/stdlib/src/kotlin/JLangIterablesLazy.kt rename to libraries/stdlib/src/kotlin/IterablesLazy.kt diff --git a/libraries/stdlib/src/kotlin/JLangIterablesSpecial.kt b/libraries/stdlib/src/kotlin/IterablesSpecial.kt similarity index 100% rename from libraries/stdlib/src/kotlin/JLangIterablesSpecial.kt rename to libraries/stdlib/src/kotlin/IterablesSpecial.kt diff --git a/libraries/stdlib/src/kotlin/JLangIterablesSpecialJVM.kt b/libraries/stdlib/src/kotlin/IterablesSpecialJVM.kt similarity index 100% rename from libraries/stdlib/src/kotlin/JLangIterablesSpecialJVM.kt rename to libraries/stdlib/src/kotlin/IterablesSpecialJVM.kt diff --git a/libraries/stdlib/src/kotlin/JUtilMaps.kt b/libraries/stdlib/src/kotlin/Maps.kt similarity index 100% rename from libraries/stdlib/src/kotlin/JUtilMaps.kt rename to libraries/stdlib/src/kotlin/Maps.kt diff --git a/libraries/stdlib/src/kotlin/JUtilMapsJVM.kt b/libraries/stdlib/src/kotlin/MapsJVM.kt similarity index 100% rename from libraries/stdlib/src/kotlin/JUtilMapsJVM.kt rename to libraries/stdlib/src/kotlin/MapsJVM.kt diff --git a/libraries/stdlib/test/org/jetbrains/kotlin/tools/GenerateStandardLib.kt b/libraries/stdlib/test/org/jetbrains/kotlin/tools/GenerateStandardLib.kt index 6d947bef92a..069febdcda0 100644 --- a/libraries/stdlib/test/org/jetbrains/kotlin/tools/GenerateStandardLib.kt +++ b/libraries/stdlib/test/org/jetbrains/kotlin/tools/GenerateStandardLib.kt @@ -74,16 +74,16 @@ fun main(args: Array) { val otherArrayNames = arrayList("Boolean", "Byte", "Char", "Short", "Int", "Long", "Float", "Double") - // JLangIterables - Generic iterable stuff - generateFile(File(outDir, "ArraysFromJLangIterables.kt"), "package kotlin\n", File(srcDir, "JLangIterables.kt")) { + // Iterables - Generic iterable stuff + generateFile(File(outDir, "ArraysFromIterables.kt"), "package kotlin\n", File(srcDir, "Iterables.kt")) { it.replaceAll("Iterable) { replaceAll("Iterable", "${arrayName}Array")) } - generateFile(File(outDir, "${arrayName}ArraysFromJLangIterables.kt"), "package kotlin\n", File(srcDir, "JLangIterables.kt")) { + generateFile(File(outDir, "${arrayName}ArraysFromIterables.kt"), "package kotlin\n", File(srcDir, "Iterables.kt")) { replace(it) } - generateFile(File(outDir, "${arrayName}ArraysFromJLangIterablesJVM.kt"), "package kotlin\n", File(srcDir, "JLangIterablesJVM.kt")) { + generateFile(File(outDir, "${arrayName}ArraysFromIterablesJVM.kt"), "package kotlin\n", File(srcDir, "IterablesJVM.kt")) { replace(it) } - generateFile(File(outDir, "${arrayName}ArraysFromJLangIterablesLazy.kt"), "package kotlin\n", File(srcDir, "JLangIterablesLazy.kt")) { + generateFile(File(outDir, "${arrayName}ArraysFromIterablesLazy.kt"), "package kotlin\n", File(srcDir, "IterablesLazy.kt")) { replace(it) } } - generateFile(File(outDir, "JUtilIteratorsFromJLangIterables.kt"), "package kotlin", File(srcDir, "JLangIterables.kt")) { + generateFile(File(outDir, "IteratorsFromIterables.kt"), "package kotlin", File(srcDir, "Iterables.kt")) { it.replaceAll("Iterable Collection", "${arrayName}Array"). replaceAll("Collection", "${arrayName}Array")) } - generateFile(File(outDir, "${arrayName}ArraysFromJUtilCollectionsJVM.kt"), "package kotlin", File(srcDir, "JUtilCollectionsJVM.kt")) { + generateFile(File(outDir, "${arrayName}ArraysFromCollectionsJVM.kt"), "package kotlin", File(srcDir, "CollectionsJVM.kt")) { replaceGenerics(arrayName, it.replaceAll(" Collection", "${arrayName}Array"). replaceAll("Collection", "${arrayName}Array")) } } - generateFile(File(outDir, "StandardFromJUtilCollections.kt"), "package kotlin", File(srcDir, "JUtilCollections.kt")) { + generateFile(File(outDir, "StandardFromCollections.kt"), "package kotlin", File(srcDir, "Collections.kt")) { it.replaceAll("Collection - - - - - + + + + + @@ -74,8 +74,8 @@