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

Replace Regex.match and matchAll usages

Browse Source
This commit is contained in:
Ilya Gorbunov
2015-11-07 15:30:44 +03:00
parent f06d521bfe
commit 0579f6c8bf
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/TypeIntrinsics.kt
+1 -1
View File
@@ -171,7 +171,7 @@ public object TypeIntrinsics {
*/ */
private fun getFunctionTypeArity(jetType: KotlinType): Int { private fun getFunctionTypeArity(jetType: KotlinType): Int {
val classFqName = getClassFqName(jetType) ?: return -1 val classFqName = getClassFqName(jetType) ?: return -1
val match = KOTLIN_FUNCTION_INTERFACE_REGEX.match(classFqName) ?: return -1 val match = KOTLIN_FUNCTION_INTERFACE_REGEX.find(classFqName) ?: return -1
return Integer.valueOf(match.groups[1]!!.value) return Integer.valueOf(match.groups[1]!!.value)
} }
compiler/rmi/kotlinr/src/org/jetbrains/kotlin/rmi/kotlinr/KotlinCompilerClient.kt
+2 -2
View File
@@ -254,8 +254,8 @@ public object KotlinCompilerClient {
private fun String.extractPortFromRunFilename(digest: String): Int = private fun String.extractPortFromRunFilename(digest: String): Int =
makeRunFilenameString(timestamp = "[0-9TZ:\\.\\+-]+", digest = digest, port = "(\\d+)", escapeSequence = "\\").toRegex() makeRunFilenameString(timestamp = "[0-9TZ:\\.\\+-]+", digest = digest, port = "(\\d+)", escapeSequence = "\\").toRegex()
.match(this) .find(this)
?.groups?.get(1) ?.groups?.get(1)
?.value?.toInt() ?.value?.toInt()
?: 0 ?: 0
compiler/tests/org/jetbrains/kotlin/daemon/LogCheckUtil.kt
+1 -1
View File
@@ -42,7 +42,7 @@ internal fun Sequence<String>.ifNotContainsSequence(patternsIter: Iterator<LineP
{ acc, line -> { acc, line ->
when { when {
!acc.iter.isValid() -> return@fold acc !acc.iter.isValid() -> return@fold acc
acc.iter.value.regex.match(line)?.let { acc.iter.value.matchCheck(it) } ?: false -> acc.nextLineAndPattern() acc.iter.value.regex.find(line)?.let { acc.iter.value.matchCheck(it) } ?: false -> acc.nextLineAndPattern()
else -> acc.nextLine() else -> acc.nextLine()
} }
} }
js/js.libraries/src/core/regex.kt
+2 -2
View File
@@ -110,7 +110,7 @@ public class Regex(pattern: String, options: Set<RegexOption>) {
* replacement for that match. * replacement for that match.
*/ */
public inline fun replace(input: CharSequence, transform: (MatchResult) -> CharSequence): String { public inline fun replace(input: CharSequence, transform: (MatchResult) -> CharSequence): String {
var match = match(input) var match = find(input)
if (match == null) return input.toString() if (match == null) return input.toString()
var lastStart = 0 var lastStart = 0
@@ -148,7 +148,7 @@ public class Regex(pattern: String, options: Set<RegexOption>) {
*/ */
public fun split(input: CharSequence, limit: Int = 0): List<String> { public fun split(input: CharSequence, limit: Int = 0): List<String> {
require(limit >= 0, { "Limit must be non-negative, but was $limit" } ) require(limit >= 0, { "Limit must be non-negative, but was $limit" } )
val matches = matchAll(input).let { if (limit == 0) it else it.take(limit - 1) } val matches = findAll(input).let { if (limit == 0) it else it.take(limit - 1) }
val result = ArrayList<String>() val result = ArrayList<String>()
var lastStart = 0 var lastStart = 0