From 8e1323bb437b32dd43d6218441266b1ca5129931 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Fri, 14 Sep 2012 17:13:36 +0400 Subject: [PATCH] Replaced sure() invocations with '!!' operator in libraries written on Kotlin. --- .../jetbrains/kotlin/site/SiteGenerator.kt | 2 +- .../main/kotlin/kotlin/jdbc/Connections.kt | 2 +- .../src/main/kotlin/kotlin/jdbc/ResultSets.kt | 2 +- .../src/main/kotlin/kotlin/swing/Frames.kt | 8 +- .../extensionTraits/src/kotlin2/Iterators.kt | 4 +- .../src/kotlin2/Traversable.kt | 2 +- .../sandbox/templatelib/src/TemplateHtml.kt | 2 +- .../sandbox/templatelib/src/TemplateJavaIo.kt | 2 +- .../src/generated/ArraysFromIterables.kt | 4 +- .../generated/BooleanArraysFromIterables.kt | 4 +- .../src/generated/ByteArraysFromIterables.kt | 4 +- .../src/generated/CharArraysFromIterables.kt | 4 +- .../generated/DoubleArraysFromIterables.kt | 4 +- .../src/generated/FloatArraysFromIterables.kt | 4 +- .../src/generated/IntArraysFromIterables.kt | 4 +- .../src/generated/IteratorsFromIterables.kt | 4 +- .../src/generated/LongArraysFromIterables.kt | 4 +- .../src/generated/ShortArraysFromIterables.kt | 4 +- libraries/stdlib/src/kotlin/ArraysJVM.kt | 32 +++---- libraries/stdlib/src/kotlin/Iterables.kt | 4 +- .../stdlib/src/kotlin/IterablesSpecial.kt | 4 +- libraries/stdlib/src/kotlin/Maps.kt | 8 +- libraries/stdlib/src/kotlin/Standard.kt | 2 +- libraries/stdlib/src/kotlin/StringsJVM.kt | 92 +++++++++---------- .../stdlib/src/kotlin/concurrent/Locks.kt | 6 +- .../stdlib/src/kotlin/concurrent/Thread.kt | 6 +- libraries/stdlib/src/kotlin/dom/Dom.kt | 8 +- libraries/stdlib/src/kotlin/dom/DomJVM.kt | 8 +- libraries/stdlib/src/kotlin/io/Files.kt | 2 +- libraries/stdlib/src/kotlin/io/JIO.kt | 10 +- libraries/stdlib/src/kotlin/math/JMath.kt | 22 ++--- .../src/kotlin/modules/ModuleBuilder.kt | 2 +- .../stdlib/src/kotlin/nullable/Nullables.kt | 2 +- .../src/kotlin/properties/Properties.kt | 2 +- .../src/kotlin/support/AbstractIterator.kt | 4 +- .../stdlib/src/kotlin/template/Templates.kt | 6 +- libraries/stdlib/src/kotlin/test/TestJVM.kt | 2 +- libraries/stdlib/test/CollectionTest.kt | 4 +- libraries/stdlib/test/Test.kt | 2 +- .../stdlib/test/concurrent/ThreadTest.kt | 4 +- .../stdlib/test/iterators/IteratorsJVMTest.kt | 2 +- libraries/stdlib/test/regressions/kt1202.kt | 2 +- .../test/template/LocaleTemplateTest.kt | 4 +- .../jetbrains/kotlin/doc/model/KotlinModel.kt | 18 ++-- .../doc/templates/PackageTemplateSupport.kt | 2 +- .../jetbrains/kotlin/template/TemplateCore.kt | 2 +- .../test/kotlin/template/PegdownTest.kt | 2 +- 47 files changed, 164 insertions(+), 164 deletions(-) diff --git a/libraries/docs/website/src/main/kotlin/org/jetbrains/kotlin/site/SiteGenerator.kt b/libraries/docs/website/src/main/kotlin/org/jetbrains/kotlin/site/SiteGenerator.kt index 0b9bc52b829..b73b3cd51c5 100644 --- a/libraries/docs/website/src/main/kotlin/org/jetbrains/kotlin/site/SiteGenerator.kt +++ b/libraries/docs/website/src/main/kotlin/org/jetbrains/kotlin/site/SiteGenerator.kt @@ -29,7 +29,7 @@ class SiteGenerator(val sourceDir: File, val outputDir: File) : Runnable { val outFile = File(outputDir, relativePath) outFile.directory.mkdirs() if (output != null) { - val text = layout(relativePath, it, output.sure()) + val text = layout(relativePath, it, output!!) outFile.writeText(text) } else { it.copyTo(outFile) diff --git a/libraries/kotlin-jdbc/src/main/kotlin/kotlin/jdbc/Connections.kt b/libraries/kotlin-jdbc/src/main/kotlin/kotlin/jdbc/Connections.kt index 6f3afc5e18f..641e528e2fd 100644 --- a/libraries/kotlin-jdbc/src/main/kotlin/kotlin/jdbc/Connections.kt +++ b/libraries/kotlin-jdbc/src/main/kotlin/kotlin/jdbc/Connections.kt @@ -8,7 +8,7 @@ import java.util.Properties /** * create connection for the specified jdbc url with no credentials */ -fun getConnection(url : String) : Connection = DriverManager.getConnection(url).sure() +fun getConnection(url : String) : Connection = DriverManager.getConnection(url)!! /** * create connection for the specified jdbc url and properties diff --git a/libraries/kotlin-jdbc/src/main/kotlin/kotlin/jdbc/ResultSets.kt b/libraries/kotlin-jdbc/src/main/kotlin/kotlin/jdbc/ResultSets.kt index 55689978d74..877d5b341a7 100644 --- a/libraries/kotlin-jdbc/src/main/kotlin/kotlin/jdbc/ResultSets.kt +++ b/libraries/kotlin-jdbc/src/main/kotlin/kotlin/jdbc/ResultSets.kt @@ -47,7 +47,7 @@ fun ResultSet.map(fn : (ResultSet) -> T) : jet.Iterable { * Returns array with column names */ fun ResultSet.getColumnNames() : jet.Array { - val meta = getMetaData().sure() + val meta = getMetaData()!! return jet.Array(meta.getColumnCount(), {meta.getColumnName(it + 1) ?: it.toString()}) } diff --git a/libraries/kotlin-swing/src/main/kotlin/kotlin/swing/Frames.kt b/libraries/kotlin-swing/src/main/kotlin/kotlin/swing/Frames.kt index 32fe1b5b3e8..828cce9d2d5 100644 --- a/libraries/kotlin-swing/src/main/kotlin/kotlin/swing/Frames.kt +++ b/libraries/kotlin-swing/src/main/kotlin/kotlin/swing/Frames.kt @@ -25,25 +25,25 @@ var JFrame.contentPane: Container? } var JFrame.title: String - get() = getTitle().sure() + get() = getTitle()!! set(t) { setTitle(t) } var JFrame.size: Pair - get() = Pair(getSize().sure().getWidth().toInt(), getSize().sure().getHeight().toInt()) + get() = Pair(getSize()!!.getWidth().toInt(), getSize()!!.getHeight().toInt()) set(dim) { setSize(Dimension(dim.first, dim.second)) } var JFrame.height: Int - get() = getSize().sure().getHeight().toInt() + get() = getSize()!!.getHeight().toInt() set(h) { setSize(width, h) } var JFrame.width: Int - get() = getSize().sure().getWidth().toInt() + get() = getSize()!!.getWidth().toInt() set(w) { setSize(height, w) } diff --git a/libraries/sandbox/extensionTraits/src/kotlin2/Iterators.kt b/libraries/sandbox/extensionTraits/src/kotlin2/Iterators.kt index bda69c9d7bb..50b7c304425 100644 --- a/libraries/sandbox/extensionTraits/src/kotlin2/Iterators.kt +++ b/libraries/sandbox/extensionTraits/src/kotlin2/Iterators.kt @@ -102,14 +102,14 @@ public abstract class AbstractIterator: Iterator { override fun next(): T { if (!hasNext) throw NoSuchElementException() state = State.NotReady - return next.sure() + return next!! } /** Returns the next element in the iteration without advancing the iteration */ fun peek(): T { if (!hasNext) throw NoSuchElementException() - return next.sure(); + return next!!; } private fun tryToComputeNext(): Boolean { diff --git a/libraries/sandbox/extensionTraits/src/kotlin2/Traversable.kt b/libraries/sandbox/extensionTraits/src/kotlin2/Traversable.kt index 902e86c03f3..881eb244175 100644 --- a/libraries/sandbox/extensionTraits/src/kotlin2/Traversable.kt +++ b/libraries/sandbox/extensionTraits/src/kotlin2/Traversable.kt @@ -201,7 +201,7 @@ public trait Traversable: Iterable { public inline fun makeString(separator: String = ", ", prefix: String = "", postfix: String = "", limit: Int = -1, truncated: String = "..."): String { val buffer = StringBuilder() appendString(buffer, separator, prefix, postfix, limit, truncated) - return buffer.toString().sure() + return buffer.toString()!! } /** Returns a list containing the everything but the first elements that satisfy the given *predicate* */ diff --git a/libraries/sandbox/templatelib/src/TemplateHtml.kt b/libraries/sandbox/templatelib/src/TemplateHtml.kt index 5d34c5cdf14..6a0f23a1e67 100644 --- a/libraries/sandbox/templatelib/src/TemplateHtml.kt +++ b/libraries/sandbox/templatelib/src/TemplateHtml.kt @@ -65,7 +65,7 @@ abstract class Tag(val name : String) : Element() { fun toString(): String { val builder = StringBuilder() appendTo(builder) - return builder.toString().sure() + return builder.toString()!! } } diff --git a/libraries/sandbox/templatelib/src/TemplateJavaIo.kt b/libraries/sandbox/templatelib/src/TemplateJavaIo.kt index 7941dd93c0d..2c45150e986 100644 --- a/libraries/sandbox/templatelib/src/TemplateJavaIo.kt +++ b/libraries/sandbox/templatelib/src/TemplateJavaIo.kt @@ -23,7 +23,7 @@ class WriterPrinter(val writer: Writer) : Printer { fun Template.renderToText(): String { val buffer = StringWriter() renderTo(buffer) - return buffer.toString().sure() + return buffer.toString()!! } fun Template.renderTo(writer: Writer): Unit { diff --git a/libraries/stdlib/src/generated/ArraysFromIterables.kt b/libraries/stdlib/src/generated/ArraysFromIterables.kt index f3b4db871ee..71a736dae05 100644 --- a/libraries/stdlib/src/generated/ArraysFromIterables.kt +++ b/libraries/stdlib/src/generated/ArraysFromIterables.kt @@ -172,7 +172,7 @@ public inline fun Array.foldRight(initial: T, operation: (T, T) -> T): T * @includeFunctionBody ../../test/CollectionTest.kt reduce */ public inline fun Array.reduce(operation: (T, T) -> T): T { - val iterator = this.iterator().sure() + val iterator = this.iterator()!! if (!iterator.hasNext()) { throw UnsupportedOperationException("Empty iterable can't be reduced") } @@ -226,7 +226,7 @@ public inline fun Array.groupByTo(result: MutableMap public inline fun Array.makeString(separator: String = ", ", prefix: String = "", postfix: String = "", limit: Int = -1, truncated: String = "..."): String { val buffer = StringBuilder() appendString(buffer, separator, prefix, postfix, limit, truncated) - return buffer.toString().sure() + return buffer.toString()!! } /** Returns a list containing the everything but the first elements that satisfy the given *predicate* */ diff --git a/libraries/stdlib/src/generated/BooleanArraysFromIterables.kt b/libraries/stdlib/src/generated/BooleanArraysFromIterables.kt index 70609b187d6..f75ce70c6f8 100644 --- a/libraries/stdlib/src/generated/BooleanArraysFromIterables.kt +++ b/libraries/stdlib/src/generated/BooleanArraysFromIterables.kt @@ -172,7 +172,7 @@ public inline fun BooleanArray.foldRight(initial: Boolean, operation: (Boolean, * @includeFunctionBody ../../test/CollectionTest.kt reduce */ public inline fun BooleanArray.reduce(operation: (Boolean, Boolean) -> Boolean): Boolean { - val iterator = this.iterator().sure() + val iterator = this.iterator()!! if (!iterator.hasNext()) { throw UnsupportedOperationException("Empty iterable can't be reduced") } @@ -226,7 +226,7 @@ public inline fun BooleanArray.groupByTo(result: MutableMap * @includeFunctionBody ../../test/CollectionTest.kt reduce */ public inline fun ByteArray.reduce(operation: (Byte, Byte) -> Byte): Byte { - val iterator = this.iterator().sure() + val iterator = this.iterator()!! if (!iterator.hasNext()) { throw UnsupportedOperationException("Empty iterable can't be reduced") } @@ -226,7 +226,7 @@ public inline fun ByteArray.groupByTo(result: MutableMap * @includeFunctionBody ../../test/CollectionTest.kt reduce */ public inline fun CharArray.reduce(operation: (Char, Char) -> Char): Char { - val iterator = this.iterator().sure() + val iterator = this.iterator()!! if (!iterator.hasNext()) { throw UnsupportedOperationException("Empty iterable can't be reduced") } @@ -226,7 +226,7 @@ public inline fun CharArray.groupByTo(result: MutableMap Double): Double { - val iterator = this.iterator().sure() + val iterator = this.iterator()!! if (!iterator.hasNext()) { throw UnsupportedOperationException("Empty iterable can't be reduced") } @@ -226,7 +226,7 @@ public inline fun DoubleArray.groupByTo(result: MutableMap Float): Float { - val iterator = this.iterator().sure() + val iterator = this.iterator()!! if (!iterator.hasNext()) { throw UnsupportedOperationException("Empty iterable can't be reduced") } @@ -226,7 +226,7 @@ public inline fun FloatArray.groupByTo(result: MutableMap Int) * @includeFunctionBody ../../test/CollectionTest.kt reduce */ public inline fun IntArray.reduce(operation: (Int, Int) -> Int): Int { - val iterator = this.iterator().sure() + val iterator = this.iterator()!! if (!iterator.hasNext()) { throw UnsupportedOperationException("Empty iterable can't be reduced") } @@ -226,7 +226,7 @@ public inline fun IntArray.groupByTo(result: MutableMap> public inline fun IntArray.makeString(separator: String = ", ", prefix: String = "", postfix: String = "", limit: Int = -1, truncated: String = "..."): String { val buffer = StringBuilder() appendString(buffer, separator, prefix, postfix, limit, truncated) - return buffer.toString().sure() + return buffer.toString()!! } /** Returns a list containing the everything but the first elements that satisfy the given *predicate* */ diff --git a/libraries/stdlib/src/generated/IteratorsFromIterables.kt b/libraries/stdlib/src/generated/IteratorsFromIterables.kt index 7add95fb920..0cdb895c2bd 100644 --- a/libraries/stdlib/src/generated/IteratorsFromIterables.kt +++ b/libraries/stdlib/src/generated/IteratorsFromIterables.kt @@ -171,7 +171,7 @@ public inline fun Iterator.foldRight(initial: T, operation: (T, T) -> T): * @includeFunctionBody ../../test/CollectionTest.kt reduce */ public inline fun Iterator.reduce(operation: (T, T) -> T): T { - val iterator = this.iterator().sure() + val iterator = this.iterator()!! if (!iterator.hasNext()) { throw UnsupportedOperationException("Empty iterable can't be reduced") } @@ -225,7 +225,7 @@ public inline fun Iterator.groupByTo(result: MutableMap Iterator.makeString(separator: String = ", ", prefix: String = "", postfix: String = "", limit: Int = -1, truncated: String = "..."): String { val buffer = StringBuilder() appendString(buffer, separator, prefix, postfix, limit, truncated) - return buffer.toString().sure() + return buffer.toString()!! } /** Returns a list containing the everything but the first elements that satisfy the given *predicate* */ diff --git a/libraries/stdlib/src/generated/LongArraysFromIterables.kt b/libraries/stdlib/src/generated/LongArraysFromIterables.kt index 8928763bff3..496c35357e4 100644 --- a/libraries/stdlib/src/generated/LongArraysFromIterables.kt +++ b/libraries/stdlib/src/generated/LongArraysFromIterables.kt @@ -172,7 +172,7 @@ public inline fun LongArray.foldRight(initial: Long, operation: (Long, Long) -> * @includeFunctionBody ../../test/CollectionTest.kt reduce */ public inline fun LongArray.reduce(operation: (Long, Long) -> Long): Long { - val iterator = this.iterator().sure() + val iterator = this.iterator()!! if (!iterator.hasNext()) { throw UnsupportedOperationException("Empty iterable can't be reduced") } @@ -226,7 +226,7 @@ public inline fun LongArray.groupByTo(result: MutableMap Short): Short { - val iterator = this.iterator().sure() + val iterator = this.iterator()!! if (!iterator.hasNext()) { throw UnsupportedOperationException("Empty iterable can't be reduced") } @@ -226,7 +226,7 @@ public inline fun ShortArray.groupByTo(result: MutableMap Array.copyOf(newLength: Int = this.size) : Array = Arrays.copyOf(this as Array, newLength) as Array -public inline fun BooleanArray.copyOfRange(from: Int, to: Int) : BooleanArray = Arrays.copyOfRange(this, from, to).sure() -public inline fun ByteArray.copyOfRange(from: Int, to: Int) : ByteArray = Arrays.copyOfRange(this, from, to).sure() -public inline fun ShortArray.copyOfRange(from: Int, to: Int) : ShortArray = Arrays.copyOfRange(this, from, to).sure() -public inline fun IntArray.copyOfRange(from: Int, to: Int) : IntArray = Arrays.copyOfRange(this, from, to).sure() -public inline fun LongArray.copyOfRange(from: Int, to: Int) : LongArray = Arrays.copyOfRange(this, from, to).sure() -public inline fun FloatArray.copyOfRange(from: Int, to: Int) : FloatArray = Arrays.copyOfRange(this, from, to).sure() -public inline fun DoubleArray.copyOfRange(from: Int, to: Int) : DoubleArray = Arrays.copyOfRange(this, from, to).sure() -public inline fun CharArray.copyOfRange(from: Int, to: Int) : CharArray = Arrays.copyOfRange(this, from, to).sure() +public inline fun BooleanArray.copyOfRange(from: Int, to: Int) : BooleanArray = Arrays.copyOfRange(this, from, to)!! +public inline fun ByteArray.copyOfRange(from: Int, to: Int) : ByteArray = Arrays.copyOfRange(this, from, to)!! +public inline fun ShortArray.copyOfRange(from: Int, to: Int) : ShortArray = Arrays.copyOfRange(this, from, to)!! +public inline fun IntArray.copyOfRange(from: Int, to: Int) : IntArray = Arrays.copyOfRange(this, from, to)!! +public inline fun LongArray.copyOfRange(from: Int, to: Int) : LongArray = Arrays.copyOfRange(this, from, to)!! +public inline fun FloatArray.copyOfRange(from: Int, to: Int) : FloatArray = Arrays.copyOfRange(this, from, to)!! +public inline fun DoubleArray.copyOfRange(from: Int, to: Int) : DoubleArray = Arrays.copyOfRange(this, from, to)!! +public inline fun CharArray.copyOfRange(from: Int, to: Int) : CharArray = Arrays.copyOfRange(this, from, to)!! // TODO: resuling array may contain nulls even if T is non-nullable public inline fun Array.copyOfRange(from: Int, to: Int) : Array = Arrays.copyOfRange(this as Array, from, to) as Array diff --git a/libraries/stdlib/src/kotlin/Iterables.kt b/libraries/stdlib/src/kotlin/Iterables.kt index 1bb064c181d..af32fc11812 100644 --- a/libraries/stdlib/src/kotlin/Iterables.kt +++ b/libraries/stdlib/src/kotlin/Iterables.kt @@ -163,7 +163,7 @@ public inline fun Iterable.foldRight(initial: T, operation: (T, T) -> T): * @includeFunctionBody ../../test/CollectionTest.kt reduce */ public inline fun Iterable.reduce(operation: (T, T) -> T): T { - val iterator = this.iterator().sure() + val iterator = this.iterator()!! if (!iterator.hasNext()) { throw UnsupportedOperationException("Empty iterable can't be reduced") } @@ -217,7 +217,7 @@ public inline fun Iterable.groupByTo(result: MutableMap Iterable.makeString(separator: String = ", ", prefix: String = "", postfix: String = "", limit: Int = -1, truncated: String = "..."): String { val buffer = StringBuilder() appendString(buffer, separator, prefix, postfix, limit, truncated) - return buffer.toString().sure() + return buffer.toString()!! } /** Returns a list containing the everything but the first elements that satisfy the given *predicate* */ diff --git a/libraries/stdlib/src/kotlin/IterablesSpecial.kt b/libraries/stdlib/src/kotlin/IterablesSpecial.kt index 5b36aa4143c..162086445ae 100644 --- a/libraries/stdlib/src/kotlin/IterablesSpecial.kt +++ b/libraries/stdlib/src/kotlin/IterablesSpecial.kt @@ -40,7 +40,7 @@ public inline fun Iterable.first() : T { return this.get(0) } - return this.iterator().sure().next() + return this.iterator()!!.next() } /** @@ -60,7 +60,7 @@ public fun Iterable.last() : T { return this.get(this.size() - 1) } - val iterator = this.iterator().sure() + val iterator = this.iterator()!! var last : T = iterator.next() while (iterator.hasNext()) { diff --git a/libraries/stdlib/src/kotlin/Maps.kt b/libraries/stdlib/src/kotlin/Maps.kt index acc6f594b82..3632653de1b 100644 --- a/libraries/stdlib/src/kotlin/Maps.kt +++ b/libraries/stdlib/src/kotlin/Maps.kt @@ -23,20 +23,20 @@ public inline fun Map?.orEmpty() : Map /** Returns the key of the entry */ val Map.Entry.key : K - get() = getKey().sure() + get() = getKey()!! /** Returns the value of the entry */ val Map.Entry.value : V - get() = getValue().sure() + get() = getValue()!! /** Returns the key of the entry */ fun Map.Entry.component1() : K { - return getKey().sure() + return getKey()!! } /** Returns the value of the entry */ fun Map.Entry.component2() : V { - return getValue().sure() + return getValue()!! } /** diff --git a/libraries/stdlib/src/kotlin/Standard.kt b/libraries/stdlib/src/kotlin/Standard.kt index be62277c299..2c2fb2e0523 100644 --- a/libraries/stdlib/src/kotlin/Standard.kt +++ b/libraries/stdlib/src/kotlin/Standard.kt @@ -10,7 +10,7 @@ Helper to make java.util.Enumeration usable in for public fun java.util.Enumeration.iterator(): Iterator = object: Iterator { override fun hasNext(): Boolean = hasMoreElements() - public override fun next() : T = nextElement().sure() + public override fun next() : T = nextElement()!! } /* diff --git a/libraries/stdlib/src/kotlin/StringsJVM.kt b/libraries/stdlib/src/kotlin/StringsJVM.kt index ae0a0183451..c538fbc58b4 100644 --- a/libraries/stdlib/src/kotlin/StringsJVM.kt +++ b/libraries/stdlib/src/kotlin/StringsJVM.kt @@ -14,33 +14,33 @@ public inline fun String.indexOf(str : String) : Int = (this as java.lang.String public inline fun String.indexOf(str : String, fromIndex : Int) : Int = (this as java.lang.String).indexOf(str, fromIndex) -public inline fun String.replace(oldChar: Char, newChar : Char) : String = (this as java.lang.String).replace(oldChar, newChar).sure() +public inline fun String.replace(oldChar: Char, newChar : Char) : String = (this as java.lang.String).replace(oldChar, newChar)!! -public inline fun String.replaceAll(regex: String, replacement : String) : String = (this as java.lang.String).replaceAll(regex, replacement).sure() +public inline fun String.replaceAll(regex: String, replacement : String) : String = (this as java.lang.String).replaceAll(regex, replacement)!! -public inline fun String.trim() : String = (this as java.lang.String).trim().sure() +public inline fun String.trim() : String = (this as java.lang.String).trim()!! -public inline fun String.toUpperCase() : String = (this as java.lang.String).toUpperCase().sure() +public inline fun String.toUpperCase() : String = (this as java.lang.String).toUpperCase()!! -public inline fun String.toLowerCase() : String = (this as java.lang.String).toLowerCase().sure() +public inline fun String.toLowerCase() : String = (this as java.lang.String).toLowerCase()!! public inline fun String.length() : Int = (this as java.lang.String).length() -public inline fun String.getBytes() : ByteArray = (this as java.lang.String).getBytes().sure() +public inline fun String.getBytes() : ByteArray = (this as java.lang.String).getBytes()!! -public inline fun String.toCharArray() : CharArray = (this as java.lang.String).toCharArray().sure() +public inline fun String.toCharArray() : CharArray = (this as java.lang.String).toCharArray()!! public inline fun String.toCharList(): List = toCharArray().toList() -public inline fun String.format(format : String, vararg args : Any?) : String = java.lang.String.format(format, args).sure() +public inline fun String.format(format : String, vararg args : Any?) : String = java.lang.String.format(format, args)!! public inline fun String.split(regex : String) : Array = (this as java.lang.String).split(regex) as Array public inline fun String.split(ch : Char) : Array = (this as java.lang.String).split(java.util.regex.Pattern.quote(ch.toString())) as Array -public inline fun String.substring(beginIndex : Int) : String = (this as java.lang.String).substring(beginIndex).sure() +public inline fun String.substring(beginIndex : Int) : String = (this as java.lang.String).substring(beginIndex)!! -public inline fun String.substring(beginIndex : Int, endIndex : Int) : String = (this as java.lang.String).substring(beginIndex, endIndex).sure() +public inline fun String.substring(beginIndex : Int, endIndex : Int) : String = (this as java.lang.String).substring(beginIndex, endIndex)!! public inline fun String.startsWith(prefix: String) : Boolean = (this as java.lang.String).startsWith(prefix) @@ -74,59 +74,59 @@ public inline fun String(stringBuffer : java.lang.StringBuffer) : String = java. public inline fun String(stringBuilder : java.lang.StringBuilder) : String = java.lang.String(stringBuilder) as String -public inline fun String.replaceFirst(regex : String, replacement : String) : String = (this as java.lang.String).replaceFirst(regex, replacement).sure() +public inline fun String.replaceFirst(regex : String, replacement : String) : String = (this as java.lang.String).replaceFirst(regex, replacement)!! -public inline fun String.charAt(index : Int) : Char = (this as java.lang.String).charAt(index).sure() +public inline fun String.charAt(index : Int) : Char = (this as java.lang.String).charAt(index)!! -public inline fun String.split(regex : String, limit : Int) : Array = (this as java.lang.String).split(regex, limit).sure() +public inline fun String.split(regex : String, limit : Int) : Array = (this as java.lang.String).split(regex, limit)!! -public inline fun String.codePointAt(index : Int) : Int = (this as java.lang.String).codePointAt(index).sure() +public inline fun String.codePointAt(index : Int) : Int = (this as java.lang.String).codePointAt(index)!! -public inline fun String.codePointBefore(index : Int) : Int = (this as java.lang.String).codePointBefore(index).sure() +public inline fun String.codePointBefore(index : Int) : Int = (this as java.lang.String).codePointBefore(index)!! public inline fun String.codePointCount(beginIndex : Int, endIndex : Int) : Int = (this as java.lang.String).codePointCount(beginIndex, endIndex) -public inline fun String.compareToIgnoreCase(str : String) : Int = (this as java.lang.String).compareToIgnoreCase(str).sure() +public inline fun String.compareToIgnoreCase(str : String) : Int = (this as java.lang.String).compareToIgnoreCase(str)!! -public inline fun String.concat(str : String) : String = (this as java.lang.String).concat(str).sure() +public inline fun String.concat(str : String) : String = (this as java.lang.String).concat(str)!! -public inline fun String.contentEquals(cs : CharSequence) : Boolean = (this as java.lang.String).contentEquals(cs).sure() +public inline fun String.contentEquals(cs : CharSequence) : Boolean = (this as java.lang.String).contentEquals(cs)!! -public inline fun String.contentEquals(sb : StringBuffer) : Boolean = (this as java.lang.String).contentEquals(sb).sure() +public inline fun String.contentEquals(sb : StringBuffer) : Boolean = (this as java.lang.String).contentEquals(sb)!! -public inline fun String.getBytes(charset : java.nio.charset.Charset) : ByteArray = (this as java.lang.String).getBytes(charset).sure() +public inline fun String.getBytes(charset : java.nio.charset.Charset) : ByteArray = (this as java.lang.String).getBytes(charset)!! -public inline fun String.getBytes(charsetName : String) : ByteArray = (this as java.lang.String).getBytes(charsetName).sure() +public inline fun String.getBytes(charsetName : String) : ByteArray = (this as java.lang.String).getBytes(charsetName)!! -public inline fun String.getChars(srcBegin : Int, srcEnd : Int, dst : CharArray, dstBegin : Int) : Tuple0 = (this as java.lang.String).getChars(srcBegin, srcEnd, dst, dstBegin).sure() +public inline fun String.getChars(srcBegin : Int, srcEnd : Int, dst : CharArray, dstBegin : Int) : Tuple0 = (this as java.lang.String).getChars(srcBegin, srcEnd, dst, dstBegin)!! -public inline fun String.indexOf(ch : Char) : Int = (this as java.lang.String).indexOf(ch.toString()).sure() +public inline fun String.indexOf(ch : Char) : Int = (this as java.lang.String).indexOf(ch.toString())!! -public inline fun String.indexOf(ch : Char, fromIndex : Int) : Int = (this as java.lang.String).indexOf(ch.toString(), fromIndex).sure() +public inline fun String.indexOf(ch : Char, fromIndex : Int) : Int = (this as java.lang.String).indexOf(ch.toString(), fromIndex)!! -public inline fun String.intern() : String = (this as java.lang.String).intern().sure() +public inline fun String.intern() : String = (this as java.lang.String).intern()!! -public inline fun String.isEmpty() : Boolean = (this as java.lang.String).isEmpty().sure() +public inline fun String.isEmpty() : Boolean = (this as java.lang.String).isEmpty()!! -public inline fun String.lastIndexOf(ch : Char, fromIndex : Int) : Int = (this as java.lang.String).lastIndexOf(ch.toString(), fromIndex).sure() +public inline fun String.lastIndexOf(ch : Char, fromIndex : Int) : Int = (this as java.lang.String).lastIndexOf(ch.toString(), fromIndex)!! -public inline fun String.lastIndexOf(str : String, fromIndex : Int) : Int = (this as java.lang.String).lastIndexOf(str, fromIndex).sure() +public inline fun String.lastIndexOf(str : String, fromIndex : Int) : Int = (this as java.lang.String).lastIndexOf(str, fromIndex)!! -public inline fun String.matches(regex : String) : Boolean = (this as java.lang.String).matches(regex).sure() +public inline fun String.matches(regex : String) : Boolean = (this as java.lang.String).matches(regex)!! -public inline fun String.offsetByCodePoints(index : Int, codePointOffset : Int) : Int = (this as java.lang.String).offsetByCodePoints(index, codePointOffset).sure() +public inline fun String.offsetByCodePoints(index : Int, codePointOffset : Int) : Int = (this as java.lang.String).offsetByCodePoints(index, codePointOffset)!! -public inline fun String.regionMatches(ignoreCase : Boolean, toffset : Int, other : String, ooffset : Int, len : Int) : Boolean = (this as java.lang.String).regionMatches(ignoreCase, toffset, other, ooffset, len).sure() +public inline fun String.regionMatches(ignoreCase : Boolean, toffset : Int, other : String, ooffset : Int, len : Int) : Boolean = (this as java.lang.String).regionMatches(ignoreCase, toffset, other, ooffset, len)!! -public inline fun String.regionMatches(toffset : Int, other : String, ooffset : Int, len : Int) : Boolean = (this as java.lang.String).regionMatches(toffset, other, ooffset, len).sure() +public inline fun String.regionMatches(toffset : Int, other : String, ooffset : Int, len : Int) : Boolean = (this as java.lang.String).regionMatches(toffset, other, ooffset, len)!! -public inline fun String.replace(target : CharSequence, replacement : CharSequence) : String = (this as java.lang.String).replace(target, replacement).sure() +public inline fun String.replace(target : CharSequence, replacement : CharSequence) : String = (this as java.lang.String).replace(target, replacement)!! -public inline fun String.subSequence(beginIndex : Int, endIndex : Int) : CharSequence = (this as java.lang.String).subSequence(beginIndex, endIndex).sure() +public inline fun String.subSequence(beginIndex : Int, endIndex : Int) : CharSequence = (this as java.lang.String).subSequence(beginIndex, endIndex)!! -public inline fun String.toLowerCase(locale : java.util.Locale) : String = (this as java.lang.String).toLowerCase(locale).sure() +public inline fun String.toLowerCase(locale : java.util.Locale) : String = (this as java.lang.String).toLowerCase(locale)!! -public inline fun String.toUpperCase(locale : java.util.Locale) : String = (this as java.lang.String).toUpperCase(locale).sure() +public inline fun String.toUpperCase(locale : java.util.Locale) : String = (this as java.lang.String).toUpperCase(locale)!! public inline fun CharSequence.charAt(index : Int) : Char = (this as java.lang.CharSequence).charAt(index) @@ -144,19 +144,19 @@ public inline fun CharSequence.length() : Int = (this as java.lang.CharSequence) public inline fun String.toByteArray(encoding: String?=null):ByteArray { if(encoding==null) { - return (this as java.lang.String).getBytes().sure() + return (this as java.lang.String).getBytes()!! } else { - return (this as java.lang.String).getBytes(encoding).sure() + return (this as java.lang.String).getBytes(encoding)!! } } -public inline fun String.toByteArray(encoding: java.nio.charset.Charset):ByteArray = (this as java.lang.String).getBytes(encoding).sure() +public inline fun String.toByteArray(encoding: java.nio.charset.Charset):ByteArray = (this as java.lang.String).getBytes(encoding)!! -public inline fun String.toBoolean() : Boolean = java.lang.Boolean.parseBoolean(this).sure() -public inline fun String.toShort() : Short = java.lang.Short.parseShort(this).sure() -public inline fun String.toInt() : Int = java.lang.Integer.parseInt(this).sure() -public inline fun String.toLong() : Long = java.lang.Long.parseLong(this).sure() -public inline fun String.toFloat() : Float = java.lang.Float.parseFloat(this).sure() -public inline fun String.toDouble() : Double = java.lang.Double.parseDouble(this).sure() +public inline fun String.toBoolean() : Boolean = java.lang.Boolean.parseBoolean(this)!! +public inline fun String.toShort() : Short = java.lang.Short.parseShort(this)!! +public inline fun String.toInt() : Int = java.lang.Integer.parseInt(this)!! +public inline fun String.toLong() : Long = java.lang.Long.parseLong(this)!! +public inline fun String.toFloat() : Float = java.lang.Float.parseFloat(this)!! +public inline fun String.toDouble() : Double = java.lang.Double.parseDouble(this)!! /** * Converts the string into a regular expression [[Pattern]] optionally @@ -164,7 +164,7 @@ public inline fun String.toDouble() : Double = java.lang.Double.parseDouble(this * so that strings can be split or matched on. */ public inline fun String.toRegex(flags: Int=0): java.util.regex.Pattern { - return java.util.regex.Pattern.compile(this, flags).sure() + return java.util.regex.Pattern.compile(this, flags)!! } inline val String.reader : StringReader diff --git a/libraries/stdlib/src/kotlin/concurrent/Locks.kt b/libraries/stdlib/src/kotlin/concurrent/Locks.kt index 4f57d3ec09d..cf029a7e637 100644 --- a/libraries/stdlib/src/kotlin/concurrent/Locks.kt +++ b/libraries/stdlib/src/kotlin/concurrent/Locks.kt @@ -24,7 +24,7 @@ Executes given calculation under read lock Returns result of the calculation */ public inline fun ReentrantReadWriteLock.read(action: ()->T) : T { - val rl = readLock().sure() + val rl = readLock()!! rl.lock() try { return action() @@ -41,12 +41,12 @@ If such write has been initiated by checking some condition, the condition must Returns result of the calculation */ public inline fun ReentrantReadWriteLock.write(action: ()->T) : T { - val rl = readLock().sure() + val rl = readLock()!! val readCount = if (getWriteHoldCount() == 0) getReadHoldCount() else 0 readCount times { rl.unlock() } - val wl = writeLock().sure() + val wl = writeLock()!! wl.lock() try { return action() diff --git a/libraries/stdlib/src/kotlin/concurrent/Thread.kt b/libraries/stdlib/src/kotlin/concurrent/Thread.kt index 0c12a2dfc1a..6d2bcb95103 100644 --- a/libraries/stdlib/src/kotlin/concurrent/Thread.kt +++ b/libraries/stdlib/src/kotlin/concurrent/Thread.kt @@ -6,10 +6,10 @@ import java.util.concurrent.Future import java.util.concurrent.Callable inline val currentThread : Thread - get() = Thread.currentThread().sure() + get() = Thread.currentThread()!! inline var Thread.name : String - get() = getName().sure() + get() = getName()!! set(name: String) { setName(name) } inline var Thread.daemon : Boolean @@ -66,7 +66,7 @@ public inline fun Executor.invoke(action: ()->Unit) { */ public inline fun ExecutorService.submit(action: ()->T):Future { val c:Callable = callable(action) - return submit(c).sure(); + return submit(c)!!; } /** diff --git a/libraries/stdlib/src/kotlin/dom/Dom.kt b/libraries/stdlib/src/kotlin/dom/Dom.kt index 783688646af..4b46e897811 100644 --- a/libraries/stdlib/src/kotlin/dom/Dom.kt +++ b/libraries/stdlib/src/kotlin/dom/Dom.kt @@ -39,7 +39,7 @@ var Element.childrenText: String i++ } } - return buffer.toString().sure() + return buffer.toString()!! } set(value) { val element = this as Element @@ -336,7 +336,7 @@ public fun nodesToXmlString(nodes: Iterable, xmlDeclaration: Boolean = fal for (n in nodes) { builder.append(n.toXmlString(xmlDeclaration)) } - return builder.toString().sure() + return builder.toString()!! } // Syntax sugar @@ -359,7 +359,7 @@ inline fun Element.plusAssign(text: String?): Element = this.addText(text) * Creates a new element which can be configured via a function */ fun Document.createElement(name: String, init: Element.()-> Unit): Element { - val elem = this.createElement(name).sure() + val elem = this.createElement(name)!! elem.init() return elem } @@ -368,7 +368,7 @@ fun Document.createElement(name: String, init: Element.()-> Unit): Element { * Creates a new element to an element which has an owner Document which can be configured via a function */ fun Element.createElement(name: String, doc: Document? = null, init: Element.()-> Unit): Element { - val elem = ownerDocument(doc).createElement(name).sure() + val elem = ownerDocument(doc).createElement(name)!! elem.init() return elem } diff --git a/libraries/stdlib/src/kotlin/dom/DomJVM.kt b/libraries/stdlib/src/kotlin/dom/DomJVM.kt index 17d64a9b217..f26a42c4530 100644 --- a/libraries/stdlib/src/kotlin/dom/DomJVM.kt +++ b/libraries/stdlib/src/kotlin/dom/DomJVM.kt @@ -157,7 +157,7 @@ fun Element.removeClass(cssClass: String): Boolean { /** Creates a new document with the given document builder*/ public fun createDocument(builder: DocumentBuilder): Document { - return builder.newDocument().sure() + return builder.newDocument()!! } /** Creates a new document with an optional DocumentBuilderFactory */ @@ -209,13 +209,13 @@ public fun parseXml(inputSource: InputSource, builder: DocumentBuilder = default /** Creates a new TrAX transformer */ -public fun createTransformer(source: Source? = null, factory: TransformerFactory = TransformerFactory.newInstance().sure()): Transformer { +public fun createTransformer(source: Source? = null, factory: TransformerFactory = TransformerFactory.newInstance()!!): Transformer { val transformer = if (source != null) { factory.newTransformer(source) } else { factory.newTransformer() } - return transformer.sure() + return transformer!! } /** Converts the node to an XML String */ @@ -225,7 +225,7 @@ public fun Node.toXmlString(): String = toXmlString(false) public fun Node.toXmlString(xmlDeclaration: Boolean): String { val writer = StringWriter() writeXmlString(writer, xmlDeclaration) - return writer.toString().sure() + return writer.toString()!! } /** Converts the node to an XML String and writes it to the given [[Writer]] */ diff --git a/libraries/stdlib/src/kotlin/io/Files.kt b/libraries/stdlib/src/kotlin/io/Files.kt index ad7437c4f15..46d1d2d7419 100644 --- a/libraries/stdlib/src/kotlin/io/Files.kt +++ b/libraries/stdlib/src/kotlin/io/Files.kt @@ -25,7 +25,7 @@ public fun File.recurse(block: (File) -> Unit): Unit { * Returns this if the file is a directory or the parent if its a file inside a directory */ inline val File.directory: File -get() = if (this.isDirectory()) this else this.getParentFile().sure() +get() = if (this.isDirectory()) this else this.getParentFile()!! /** * Returns the canoncial path of the file diff --git a/libraries/stdlib/src/kotlin/io/JIO.kt b/libraries/stdlib/src/kotlin/io/JIO.kt index bf13b0f0454..8f3205f98fd 100644 --- a/libraries/stdlib/src/kotlin/io/JIO.kt +++ b/libraries/stdlib/src/kotlin/io/JIO.kt @@ -13,7 +13,7 @@ public val defaultBufferSize: Int = 64 * 1024 /** * Returns the default [[Charset]] which defaults to UTF-8 */ -public val defaultCharset: Charset = Charset.forName("UTF-8").sure() +public val defaultCharset: Charset = Charset.forName("UTF-8")!! /** Prints the given message to [[System.out]] */ @@ -251,7 +251,7 @@ class LineIterator(val reader: BufferedReader) : Iterator { } val answer = nextValue nextValue = null - return answer.sure() + return answer!! } } @@ -266,7 +266,7 @@ class LineIterator(val reader: BufferedReader) : Iterator { public fun InputStream.readBytes(estimatedSize: Int = defaultBufferSize): ByteArray { val buffer = ByteArrayOutputStream(estimatedSize) this.copyTo(buffer) - return buffer.toByteArray().sure() + return buffer.toByteArray()!! } /** @@ -277,7 +277,7 @@ public fun InputStream.readBytes(estimatedSize: Int = defaultBufferSize): ByteAr public fun Reader.readText(): String { val buffer = StringWriter() copyTo(buffer) - return buffer.toString().sure() + return buffer.toString()!! } /** @@ -333,5 +333,5 @@ public fun URL.readText(encoding: Charset): String = readBytes().toString(encodi * * This method is not recommended on huge files. */ -public fun URL.readBytes(): ByteArray = this.openStream().sure().use{ it.readBytes() } +public fun URL.readBytes(): ByteArray = this.openStream()!!.use{ it.readBytes() } diff --git a/libraries/stdlib/src/kotlin/math/JMath.kt b/libraries/stdlib/src/kotlin/math/JMath.kt index 5c33928ca90..5a4aa45801b 100644 --- a/libraries/stdlib/src/kotlin/math/JMath.kt +++ b/libraries/stdlib/src/kotlin/math/JMath.kt @@ -3,25 +3,25 @@ package kotlin.math import java.math.BigInteger import java.math.BigDecimal -public fun BigInteger.plus(other: BigInteger) : BigInteger = this.add(other).sure() +public fun BigInteger.plus(other: BigInteger) : BigInteger = this.add(other)!! -public fun BigInteger.minus(other: BigInteger) : BigInteger = this.subtract(other).sure() +public fun BigInteger.minus(other: BigInteger) : BigInteger = this.subtract(other)!! -public fun BigInteger.times(other: BigInteger) : BigInteger = this.multiply(other).sure() +public fun BigInteger.times(other: BigInteger) : BigInteger = this.multiply(other)!! -public fun BigInteger.div(other: BigInteger) : BigInteger = this.divide(other).sure() +public fun BigInteger.div(other: BigInteger) : BigInteger = this.divide(other)!! -public fun BigInteger.minus() : BigInteger = this.negate().sure() +public fun BigInteger.minus() : BigInteger = this.negate()!! -public fun BigDecimal.plus(other: BigDecimal) : BigDecimal = this.add(other).sure() +public fun BigDecimal.plus(other: BigDecimal) : BigDecimal = this.add(other)!! -public fun BigDecimal.minus(other: BigDecimal) : BigDecimal = this.subtract(other).sure() +public fun BigDecimal.minus(other: BigDecimal) : BigDecimal = this.subtract(other)!! -public fun BigDecimal.times(other: BigDecimal) : BigDecimal = this.multiply(other).sure() +public fun BigDecimal.times(other: BigDecimal) : BigDecimal = this.multiply(other)!! -public fun BigDecimal.div(other: BigDecimal) : BigDecimal = this.divide(other).sure() +public fun BigDecimal.div(other: BigDecimal) : BigDecimal = this.divide(other)!! -public fun BigDecimal.mod(other: BigDecimal) : BigDecimal = this.remainder(other).sure() +public fun BigDecimal.mod(other: BigDecimal) : BigDecimal = this.remainder(other)!! -public fun BigDecimal.minus() : BigDecimal = this.negate().sure() \ No newline at end of file +public fun BigDecimal.minus() : BigDecimal = this.negate()!! \ No newline at end of file diff --git a/libraries/stdlib/src/kotlin/modules/ModuleBuilder.kt b/libraries/stdlib/src/kotlin/modules/ModuleBuilder.kt index 3adc8dc405f..95db7d82f78 100644 --- a/libraries/stdlib/src/kotlin/modules/ModuleBuilder.kt +++ b/libraries/stdlib/src/kotlin/modules/ModuleBuilder.kt @@ -6,7 +6,7 @@ import jet.modules.* public fun module(name: String, callback: ModuleBuilder.() -> Unit) { val builder = ModuleBuilder(name) builder.callback() - AllModules.modules.sure().get()?.add(builder) + AllModules.modules!!.get()?.add(builder) } class SourcesBuilder(val parent: ModuleBuilder) { diff --git a/libraries/stdlib/src/kotlin/nullable/Nullables.kt b/libraries/stdlib/src/kotlin/nullable/Nullables.kt index b9d7f655204..ee1a3ba11a0 100644 --- a/libraries/stdlib/src/kotlin/nullable/Nullables.kt +++ b/libraries/stdlib/src/kotlin/nullable/Nullables.kt @@ -129,7 +129,7 @@ public inline fun T?.makeString(separator: String = ", ", prefix: String = " buffer.append(this) } buffer.append(postfix) - return buffer.toString().sure() + return buffer.toString()!! } diff --git a/libraries/stdlib/src/kotlin/properties/Properties.kt b/libraries/stdlib/src/kotlin/properties/Properties.kt index 06beec8ec1b..6c5aa09312f 100644 --- a/libraries/stdlib/src/kotlin/properties/Properties.kt +++ b/libraries/stdlib/src/kotlin/properties/Properties.kt @@ -39,7 +39,7 @@ public abstract class ChangeSupport { var listeners = nameListeners?.get(name) if (listeners == null) { listeners = arrayList() - nameListeners?.put(name, listeners.sure()) + nameListeners?.put(name, listeners!!) } listeners?.add(listener) } diff --git a/libraries/stdlib/src/kotlin/support/AbstractIterator.kt b/libraries/stdlib/src/kotlin/support/AbstractIterator.kt index 72983ef1cd3..4530e41c55a 100644 --- a/libraries/stdlib/src/kotlin/support/AbstractIterator.kt +++ b/libraries/stdlib/src/kotlin/support/AbstractIterator.kt @@ -33,13 +33,13 @@ public abstract class AbstractIterator: Iterator { override fun next(): T { if (!hasNext()) throw NoSuchElementException() state = State.NotReady - return next.sure() + return next!! } /** Returns the next element in the iteration without advancing the iteration */ fun peek(): T { if (!hasNext()) throw NoSuchElementException() - return next.sure(); + return next!!; } private fun tryToComputeNext(): Boolean { diff --git a/libraries/stdlib/src/kotlin/template/Templates.kt b/libraries/stdlib/src/kotlin/template/Templates.kt index d81171176d6..c97e66e9002 100644 --- a/libraries/stdlib/src/kotlin/template/Templates.kt +++ b/libraries/stdlib/src/kotlin/template/Templates.kt @@ -116,7 +116,7 @@ public open class ToStringFormatter : Formatter { } } -public val defaultLocale : Locale = Locale.getDefault().sure() +public val defaultLocale : Locale = Locale.getDefault()!! /** * Formats values using a given [[Locale]] for internationalisation @@ -125,9 +125,9 @@ public open class LocaleFormatter(val locale : Locale = defaultLocale) : ToStrin public override fun toString() : String = "LocaleFormatter{$locale}" - public var numberFormat : NumberFormat = NumberFormat.getInstance(locale).sure() + public var numberFormat : NumberFormat = NumberFormat.getInstance(locale)!! - public var dateFormat : DateFormat = DateFormat.getDateTimeInstance(DateFormat.DEFAULT, DateFormat.DEFAULT, locale).sure() + public var dateFormat : DateFormat = DateFormat.getDateTimeInstance(DateFormat.DEFAULT, DateFormat.DEFAULT, locale)!! public override fun format(out : Appendable, value : Any?) { if (value is Number) { diff --git a/libraries/stdlib/src/kotlin/test/TestJVM.kt b/libraries/stdlib/src/kotlin/test/TestJVM.kt index 23c99e83077..d305028609e 100644 --- a/libraries/stdlib/src/kotlin/test/TestJVM.kt +++ b/libraries/stdlib/src/kotlin/test/TestJVM.kt @@ -28,7 +28,7 @@ public var asserter: Asserter } //debug("using asserter $_asserter") } - return _asserter.sure() + return _asserter!! } set(value) { diff --git a/libraries/stdlib/test/CollectionTest.kt b/libraries/stdlib/test/CollectionTest.kt index 315cf933aef..90f65113a23 100644 --- a/libraries/stdlib/test/CollectionTest.kt +++ b/libraries/stdlib/test/CollectionTest.kt @@ -105,7 +105,7 @@ class CollectionTest { assertNull(x) val f = data.find{it.startsWith("f")} - f.sure() + f!! assertEquals("foo", f) } @@ -390,7 +390,7 @@ class CollectionTest { private val collection = collection override fun iterator(): Iterator { - return collection.iterator().sure() + return collection.iterator()!! } } } diff --git a/libraries/stdlib/test/Test.kt b/libraries/stdlib/test/Test.kt index cb74e35f5d9..da96728df80 100644 --- a/libraries/stdlib/test/Test.kt +++ b/libraries/stdlib/test/Test.kt @@ -14,7 +14,7 @@ class TestBuilt(name: String, val builder: TestBuilder, val test: TestBuil private var myState: T? = null var state : T - get() = myState.sure() + get() = myState!! set(newState: T) { myState = newState } override fun countTestCases(): Int = 1 diff --git a/libraries/stdlib/test/concurrent/ThreadTest.kt b/libraries/stdlib/test/concurrent/ThreadTest.kt index 54bab4576ae..a0530e8f4a4 100644 --- a/libraries/stdlib/test/concurrent/ThreadTest.kt +++ b/libraries/stdlib/test/concurrent/ThreadTest.kt @@ -11,7 +11,7 @@ import java.util.concurrent.TimeUnit.* class ThreadTest { test fun scheduledTask() { - val pool = Executors.newFixedThreadPool(1).sure() + val pool = Executors.newFixedThreadPool(1)!! val countDown = CountDownLatch(1) pool { countDown.countDown() @@ -21,7 +21,7 @@ class ThreadTest { test fun callableInvoke() { - val pool = Executors.newFixedThreadPool(1).sure() + val pool = Executors.newFixedThreadPool(1)!! val future = pool { "Hello" } diff --git a/libraries/stdlib/test/iterators/IteratorsJVMTest.kt b/libraries/stdlib/test/iterators/IteratorsJVMTest.kt index bfd7aba4acb..016dd4edc65 100644 --- a/libraries/stdlib/test/iterators/IteratorsJVMTest.kt +++ b/libraries/stdlib/test/iterators/IteratorsJVMTest.kt @@ -9,7 +9,7 @@ class IteratorsJVMTest { test fun flatMapAndTakeExtractTheTransformedElements() { fun intToBinaryDigits() = { (i: Int) -> - val binary = Integer.toBinaryString(i).sure() + val binary = Integer.toBinaryString(i)!! var index = 0 iterate { if (index < binary.length()) binary.get(index++) else null } } diff --git a/libraries/stdlib/test/regressions/kt1202.kt b/libraries/stdlib/test/regressions/kt1202.kt index 48b3f735e55..e7c1101c872 100644 --- a/libraries/stdlib/test/regressions/kt1202.kt +++ b/libraries/stdlib/test/regressions/kt1202.kt @@ -99,7 +99,7 @@ fun parseAtomic(tokens : Deque) : ParseResult { else Failure("Expecting ')'") } - is Number -> Success(Num(Integer.parseInt((token as Token).text).sure())) + is Number -> Success(Num(Integer.parseInt((token as Token).text)!!)) else -> Failure("Unexpected EOF") } } diff --git a/libraries/stdlib/test/template/LocaleTemplateTest.kt b/libraries/stdlib/test/template/LocaleTemplateTest.kt index b1483ab377e..9761e770575 100644 --- a/libraries/stdlib/test/template/LocaleTemplateTest.kt +++ b/libraries/stdlib/test/template/LocaleTemplateTest.kt @@ -13,11 +13,11 @@ class LocaleTemplateTest : TestCase() { } fun testFrance() : Unit { - format(LocaleFormatter(Locale.FRANCE.sure())) + format(LocaleFormatter(Locale.FRANCE!!)) } fun testGermany() : Unit { - format(LocaleFormatter(Locale.GERMANY.sure())) + format(LocaleFormatter(Locale.GERMANY!!)) } fun format(formatter: LocaleFormatter): Unit { 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 3c461368b9c..a064e98adfa 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 @@ -137,14 +137,14 @@ fun inheritedExtensionProperties(properties: Collection): Map): Map> { val map = TreeMap>() - functions.filter{ it.extensionClass != null }.groupByTo(map){ it.extensionClass.sure() } + functions.filter{ it.extensionClass != null }.groupByTo(map){ it.extensionClass!! } return map } // TODO for some reason the SortedMap causes kotlin to freak out a little :) fun extensionProperties(properties: Collection): Map> { val map = TreeMap>() - properties.filter{ it.extensionClass != null }.groupByTo(map){ it.extensionClass.sure() } + properties.filter{ it.extensionClass != null }.groupByTo(map){ it.extensionClass!! } return map } @@ -176,7 +176,7 @@ class KModel(val context: BindingContext, val config: KDocConfig, val sourceDirs public val packageMap: SortedMap = TreeMap() public val allPackages: Collection - get() = packageMap.values().sure() + get() = packageMap.values()!! /** Returns the local packages */ public val packages: Collection @@ -345,7 +345,7 @@ class KModel(val context: BindingContext, val config: KDocConfig, val sourceDirs } fun wikiConvert(text: String, linkRenderer: LinkRenderer, fileName: String?): String { - return markdownProcessor.markdownToHtml(text, linkRenderer).sure() + return markdownProcessor.markdownToHtml(text, linkRenderer)!! } fun sourceLinkFor(filePath: String, sourceLine: Int, lineLinkText: String = "#L"): String? { @@ -552,8 +552,8 @@ class KModel(val context: BindingContext, val config: KDocConfig, val sourceDirs // source code function if folks adopted a convention of naming the test method after the // method its acting as a demo/test for if (words.size > 1) { - val includeFile = words[0].sure() - val fnName = words[1].sure() + val includeFile = words[0]!! + val fnName = words[1]!! val content = findFunctionInclude(psiElement, includeFile, fnName) if (content != null) { return content @@ -571,7 +571,7 @@ class KModel(val context: BindingContext, val config: KDocConfig, val sourceDirs protected fun findFunctionInclude(psiElement: PsiElement, includeFile: String, functionName: String): String? { var dir = psiElement.getContainingFile()?.getParent() if (dir != null) { - val file = relativeFile(dir.sure(), includeFile) + val file = relativeFile(dir!!, includeFile) if (file != null) { val text = file.getText() if (text != null) { @@ -947,7 +947,7 @@ class KPackage(model: KModel, val descriptor: NamespaceDescriptor, public val classMap: SortedMap = TreeMap() public val classes: Collection - get() = classMap.values().sure().filter{ it.isApi() } + get() = classMap.values()!!.filter{ it.isApi() } public val annotations: Collection = ArrayList() @@ -1046,7 +1046,7 @@ class KPackage(model: KModel, val descriptor: NamespaceDescriptor, } class KType(val jetType: JetType, model: KModel, val klass: KClass?, val arguments: MutableList = ArrayList()) -: KNamed(klass?.name ?: jetType.toString().sure(), model, jetType.getConstructor().getDeclarationDescriptor().sure()) { +: KNamed(klass?.name ?: jetType.toString()!!, model, jetType.getConstructor().getDeclarationDescriptor()!!) { { if (klass != null) { this.wikiDescription = klass.wikiDescription diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageTemplateSupport.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageTemplateSupport.kt index 3a70e92978a..9d52609a46f 100644 --- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageTemplateSupport.kt +++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageTemplateSupport.kt @@ -257,7 +257,7 @@ abstract class PackageTemplateSupport(open val pkg: KPackage) : KDocTemplate() { } val pType = if (p.isVarArg()) { print("vararg ") - p.varArgType().sure() + p.varArgType()!! } else { p.aType } diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/template/TemplateCore.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/template/TemplateCore.kt index ee174667c7c..5faf369be0d 100644 --- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/template/TemplateCore.kt +++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/template/TemplateCore.kt @@ -72,7 +72,7 @@ abstract class TextTemplate() : TemplateSupport(), Printer { fun renderToText(): String { val buffer = StringWriter() renderTo(buffer) - return buffer.toString().sure() + return buffer.toString()!! } fun renderTo(writer: Writer): Unit { diff --git a/libraries/tools/kdoc/src/test/kotlin/test/kotlin/template/PegdownTest.kt b/libraries/tools/kdoc/src/test/kotlin/test/kotlin/template/PegdownTest.kt index 532be0094d6..5e3513bde0e 100644 --- a/libraries/tools/kdoc/src/test/kotlin/test/kotlin/template/PegdownTest.kt +++ b/libraries/tools/kdoc/src/test/kotlin/test/kotlin/template/PegdownTest.kt @@ -19,7 +19,7 @@ class PegdownTest() : TestCase() { "a [Link](somewhere) blah") for (text in markups) { - val answer = markdownProcessor.markdownToHtml(text, linkRenderer).sure() + val answer = markdownProcessor.markdownToHtml(text, linkRenderer)!! println("$text = $answer") } }