From 6ab83c9b8cb386b9a13d0eba834221609d5a272f Mon Sep 17 00:00:00 2001 From: Stanislav Erokhin Date: Wed, 1 Apr 2015 03:58:05 +0300 Subject: [PATCH] Added init keyword to builtins, maven projects and stdlib --- core/builtins/src/kotlin/Progressions.kt | 14 +++++++------- .../kotlin/generators/builtins/progressions.kt | 2 +- .../stdlib/src/kotlin/collections/Sequence.kt | 4 ++-- .../kotlin/org/jetbrains/kotlin/doc/KDocConfig.kt | 2 +- .../kotlin/doc/highlighter2/Html2CompilerPlugin.kt | 2 +- .../org/jetbrains/kotlin/doc/model/KotlinModel.kt | 2 +- .../org/jetbrains/kotlin/gradle/tasks/Tasks.kt | 4 ++-- .../kotlin/gradle/internal/KotlinSourceSet.kt | 5 +++-- 8 files changed, 18 insertions(+), 17 deletions(-) diff --git a/core/builtins/src/kotlin/Progressions.kt b/core/builtins/src/kotlin/Progressions.kt index c2bc8b1d9da..a64cee8c46b 100644 --- a/core/builtins/src/kotlin/Progressions.kt +++ b/core/builtins/src/kotlin/Progressions.kt @@ -26,7 +26,7 @@ public class ByteProgression( override val end: Byte, override val increment: Int ) : Progression { - { + init { if (increment == 0) throw IllegalArgumentException("Increment must be non-zero") } @@ -53,7 +53,7 @@ public class CharProgression( override val end: Char, override val increment: Int ) : Progression { - { + init { if (increment == 0) throw IllegalArgumentException("Increment must be non-zero") } @@ -80,7 +80,7 @@ public class ShortProgression( override val end: Short, override val increment: Int ) : Progression { - { + init { if (increment == 0) throw IllegalArgumentException("Increment must be non-zero") } @@ -107,7 +107,7 @@ public class IntProgression( override val end: Int, override val increment: Int ) : Progression { - { + init { if (increment == 0) throw IllegalArgumentException("Increment must be non-zero") } @@ -134,7 +134,7 @@ public class LongProgression( override val end: Long, override val increment: Long ) : Progression { - { + init { if (increment == 0L) throw IllegalArgumentException("Increment must be non-zero") } @@ -161,7 +161,7 @@ public class FloatProgression( override val end: Float, override val increment: Float ) : Progression { - { + init { if (java.lang.Float.isNaN(increment)) throw IllegalArgumentException("Increment must be not NaN") if (increment == 0.0f) throw IllegalArgumentException("Increment must be non-zero") } @@ -189,7 +189,7 @@ public class DoubleProgression( override val end: Double, override val increment: Double ) : Progression { - { + init { if (java.lang.Double.isNaN(increment)) throw IllegalArgumentException("Increment must be not NaN") if (increment == 0.0) throw IllegalArgumentException("Increment must be non-zero") } diff --git a/generators/src/org/jetbrains/kotlin/generators/builtins/progressions.kt b/generators/src/org/jetbrains/kotlin/generators/builtins/progressions.kt index 4d505047799..490bc979152 100644 --- a/generators/src/org/jetbrains/kotlin/generators/builtins/progressions.kt +++ b/generators/src/org/jetbrains/kotlin/generators/builtins/progressions.kt @@ -73,7 +73,7 @@ public class $progression( override val end: $t, override val increment: $incrementType ) : Progression<$t> { - { + init { $constructor } diff --git a/libraries/stdlib/src/kotlin/collections/Sequence.kt b/libraries/stdlib/src/kotlin/collections/Sequence.kt index b924f0dfce8..1057443462c 100644 --- a/libraries/stdlib/src/kotlin/collections/Sequence.kt +++ b/libraries/stdlib/src/kotlin/collections/Sequence.kt @@ -279,7 +279,7 @@ public class TakeStream(stream: Stream, count: Int) public class TakeSequence(private val sequence: Sequence, private val count: Int ) : Sequence { - { + init { if (count < 0) throw IllegalArgumentException("count should be non-negative, but is $count") } @@ -360,7 +360,7 @@ public class DropStream(stream: Stream, count: Int) public class DropSequence(private val sequence: Sequence, private val count: Int ) : Sequence { - { + init { if (count < 0) throw IllegalArgumentException("count should be non-negative, but is $count") } diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/KDocConfig.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/KDocConfig.kt index 1829a080fca..89f7a7ffd3d 100644 --- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/KDocConfig.kt +++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/KDocConfig.kt @@ -66,7 +66,7 @@ class KDocConfig() { */ public var includeProtected: Boolean = true - { + init { // add some common defaults addPackageLink("http://docs.oracle.com/javase/6/docs/api/", "java", "org.w3c.dom", "org.xml.sax", "org.omg", "org.ietf.jgss") addPackageLink("http://kentbeck.github.com/junit/javadoc/latest/", "org.junit", "junit") diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter2/Html2CompilerPlugin.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter2/Html2CompilerPlugin.kt index 5e36062ce21..78d461c9c74 100644 --- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter2/Html2CompilerPlugin.kt +++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter2/Html2CompilerPlugin.kt @@ -15,7 +15,7 @@ import org.jetbrains.kotlin.template.escapeHtml class Html2CompilerPlugin(private val compilerArguments: KDocArguments) : Doclet { private val docOutputRoot: File - { + init { val docOutputDir = compilerArguments.docConfig.docOutputDir if (docOutputDir.isEmpty()) { throw IllegalArgumentException("empty doc output dir") diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KotlinModel.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KotlinModel.kt index 7426d5f2feb..ef514696e95 100644 --- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KotlinModel.kt +++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KotlinModel.kt @@ -992,7 +992,7 @@ class KPackage( class KType(val jetType: JetType, model: KModel, val klass: KClass?, val arguments: MutableList = ArrayList()) : KNamed(klass?.name ?: jetType.toString()!!, model, jetType.getConstructor().getDeclarationDescriptor()!!) { - { + init { if (klass != null) { this.wikiDescription = klass.wikiDescription } diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt b/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt index bca6e3cc579..86ae3cd471b 100644 --- a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt +++ b/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt @@ -209,7 +209,7 @@ public open class Kotlin2JsCompile() : AbstractKotlinCompile