diff --git a/libraries/stdlib/src/JavaUtil.kt b/libraries/stdlib/src/JavaUtil.kt index 3ae59cbf6ad..b683b334b93 100644 --- a/libraries/stdlib/src/JavaUtil.kt +++ b/libraries/stdlib/src/JavaUtil.kt @@ -104,15 +104,3 @@ inline fun java.util.Collection.notEmpty() : Boolean = !this.isEmpty() inline fun java.util.Collection?.orEmpty() : Collection = if (this != null) this else Collections.EMPTY_LIST as Collection -/** Converts the string into a regular expression [[Pattern]] so that strings can be split or matched on */ -inline fun String.toRegex(): Pattern { - return Pattern.compile(this).sure() -} - -/** - * Converts the string into a regular expression [[Pattern]] with the given flags from [[Pattern]] or'd together - * so that strings can be split or matched on - */ -inline fun String.toRegex(flags: Int): Pattern { - return Pattern.compile(this, flags).sure() -} \ No newline at end of file diff --git a/libraries/stdlib/src/String.kt b/libraries/stdlib/src/String.kt index 8605201a610..a9ff87cdeb5 100644 --- a/libraries/stdlib/src/String.kt +++ b/libraries/stdlib/src/String.kt @@ -113,6 +113,15 @@ inline fun String.toLong() = java.lang.Long.parseLong(this).sure() inline fun String.toFloat() = java.lang.Float.parseFloat(this).sure() inline fun String.toDouble() = java.lang.Double.parseDouble(this).sure() +/** + * Converts the string into a regular expression [[Pattern]] optionally + * with the specified flags from [[Pattern]] or'd together + * so that strings can be split or matched on. + */ +inline fun String.toRegex(flags: Int=0): java.util.regex.Pattern { + return java.util.regex.Pattern.compile(this, flags).sure() +} + /** Iterator for characters of given CharSequence */ diff --git a/libraries/testlib/test/StringTest.kt b/libraries/testlib/test/StringTest.kt index f6c381b4158..cf11b34702a 100644 --- a/libraries/testlib/test/StringTest.kt +++ b/libraries/testlib/test/StringTest.kt @@ -33,4 +33,17 @@ class StringTest() : TestCase() { assertEquals("hey", s.orEmpty()) assertEquals("", ns.orEmpty()) } + + fun testToShort() { + assertEquals(77.toShort(), "77".toShort()) + } + + fun testToInt() { + assertEquals(77, "77".toInt()) + } + + fun testToLong() { + assertEquals(77.toLong(), "77".toLong()) + } + }