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

Promote Regex.matchAt and matchesAt to Stable #KT-51470

Browse Source
This commit is contained in:
Ilya Gorbunov
2022-04-08 07:48:19 +03:00
committed by Space
parent d62b01ef41
commit 4598552e46
6 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/api/js-v1/kotlin.text.kt
+4 -4
View File
@@ -1415,16 +1415,16 @@ public final class Regex {
public final fun findAll(input: kotlin.CharSequence, startIndex: kotlin.Int = ...): kotlin.sequences.Sequence<kotlin.text.MatchResult> public final fun findAll(input: kotlin.CharSequence, startIndex: kotlin.Int = ...): kotlin.sequences.Sequence<kotlin.text.MatchResult>
@kotlin.SinceKotlin(version = "1.5") @kotlin.SinceKotlin(version = "1.7")
@kotlin.ExperimentalStdlibApi @kotlin.WasExperimental(markerClass = {kotlin.ExperimentalStdlibApi::class})
public final fun matchAt(input: kotlin.CharSequence, index: kotlin.Int): kotlin.text.MatchResult? public final fun matchAt(input: kotlin.CharSequence, index: kotlin.Int): kotlin.text.MatchResult?
public final fun matchEntire(input: kotlin.CharSequence): kotlin.text.MatchResult? public final fun matchEntire(input: kotlin.CharSequence): kotlin.text.MatchResult?
public final infix fun matches(input: kotlin.CharSequence): kotlin.Boolean public final infix fun matches(input: kotlin.CharSequence): kotlin.Boolean
@kotlin.SinceKotlin(version = "1.5") @kotlin.SinceKotlin(version = "1.7")
@kotlin.ExperimentalStdlibApi @kotlin.WasExperimental(markerClass = {kotlin.ExperimentalStdlibApi::class})
public final fun matchesAt(input: kotlin.CharSequence, index: kotlin.Int): kotlin.Boolean public final fun matchesAt(input: kotlin.CharSequence, index: kotlin.Int): kotlin.Boolean
public final fun replace(input: kotlin.CharSequence, transform: (kotlin.text.MatchResult) -> kotlin.CharSequence): kotlin.String public final fun replace(input: kotlin.CharSequence, transform: (kotlin.text.MatchResult) -> kotlin.CharSequence): kotlin.String
libraries/stdlib/api/js/kotlin.text.kt
+4 -4
View File
@@ -1415,16 +1415,16 @@ public final class Regex {
public final fun findAll(input: kotlin.CharSequence, startIndex: kotlin.Int = ...): kotlin.sequences.Sequence<kotlin.text.MatchResult> public final fun findAll(input: kotlin.CharSequence, startIndex: kotlin.Int = ...): kotlin.sequences.Sequence<kotlin.text.MatchResult>
@kotlin.SinceKotlin(version = "1.5") @kotlin.SinceKotlin(version = "1.7")
@kotlin.ExperimentalStdlibApi @kotlin.WasExperimental(markerClass = {kotlin.ExperimentalStdlibApi::class})
public final fun matchAt(input: kotlin.CharSequence, index: kotlin.Int): kotlin.text.MatchResult? public final fun matchAt(input: kotlin.CharSequence, index: kotlin.Int): kotlin.text.MatchResult?
public final fun matchEntire(input: kotlin.CharSequence): kotlin.text.MatchResult? public final fun matchEntire(input: kotlin.CharSequence): kotlin.text.MatchResult?
public final infix fun matches(input: kotlin.CharSequence): kotlin.Boolean public final infix fun matches(input: kotlin.CharSequence): kotlin.Boolean
@kotlin.SinceKotlin(version = "1.5") @kotlin.SinceKotlin(version = "1.7")
@kotlin.ExperimentalStdlibApi @kotlin.WasExperimental(markerClass = {kotlin.ExperimentalStdlibApi::class})
public final fun matchesAt(input: kotlin.CharSequence, index: kotlin.Int): kotlin.Boolean public final fun matchesAt(input: kotlin.CharSequence, index: kotlin.Int): kotlin.Boolean
public final fun replace(input: kotlin.CharSequence, transform: (kotlin.text.MatchResult) -> kotlin.CharSequence): kotlin.String public final fun replace(input: kotlin.CharSequence, transform: (kotlin.text.MatchResult) -> kotlin.CharSequence): kotlin.String
libraries/stdlib/common/src/kotlin/TextH.kt
+4 -4
View File
@@ -25,8 +25,8 @@ expect class Regex {
* @throws IndexOutOfBoundsException if [index] is less than zero or greater than the length of the [input] char sequence. * @throws IndexOutOfBoundsException if [index] is less than zero or greater than the length of the [input] char sequence.
* @sample samples.text.Regexps.matchAt * @sample samples.text.Regexps.matchAt
*/ */
@SinceKotlin("1.5") @SinceKotlin("1.7")
@ExperimentalStdlibApi @WasExperimental(ExperimentalStdlibApi::class)
fun matchAt(input: CharSequence, index: Int): MatchResult? fun matchAt(input: CharSequence, index: Int): MatchResult?
/** /**
@@ -38,8 +38,8 @@ expect class Regex {
* @throws IndexOutOfBoundsException if [index] is less than zero or greater than the length of the [input] char sequence. * @throws IndexOutOfBoundsException if [index] is less than zero or greater than the length of the [input] char sequence.
* @sample samples.text.Regexps.matchesAt * @sample samples.text.Regexps.matchesAt
*/ */
@SinceKotlin("1.5") @SinceKotlin("1.7")
@ExperimentalStdlibApi @WasExperimental(ExperimentalStdlibApi::class)
fun matchesAt(input: CharSequence, index: Int): Boolean fun matchesAt(input: CharSequence, index: Int): Boolean
fun containsMatchIn(input: CharSequence): Boolean fun containsMatchIn(input: CharSequence): Boolean
libraries/stdlib/js/src/kotlin/text/regex.kt
+4 -4
View File
@@ -102,8 +102,8 @@ public actual class Regex actual constructor(pattern: String, options: Set<Regex
return nativePattern.test(input.toString()) return nativePattern.test(input.toString())
} }
@SinceKotlin("1.5") @SinceKotlin("1.7")
@ExperimentalStdlibApi @WasExperimental(ExperimentalStdlibApi::class)
public actual fun matchesAt(input: CharSequence, index: Int): Boolean { public actual fun matchesAt(input: CharSequence, index: Int): Boolean {
if (index < 0 || index > input.length) { if (index < 0 || index > input.length) {
throw IndexOutOfBoundsException("index out of bounds: $index, input length: ${input.length}") throw IndexOutOfBoundsException("index out of bounds: $index, input length: ${input.length}")
@@ -152,8 +152,8 @@ public actual class Regex actual constructor(pattern: String, options: Set<Regex
public actual fun matchEntire(input: CharSequence): MatchResult? = public actual fun matchEntire(input: CharSequence): MatchResult? =
initMatchesEntirePattern().findNext(input.toString(), 0, nativePattern) initMatchesEntirePattern().findNext(input.toString(), 0, nativePattern)
@SinceKotlin("1.5") @SinceKotlin("1.7")
@ExperimentalStdlibApi @WasExperimental(ExperimentalStdlibApi::class)
public actual fun matchAt(input: CharSequence, index: Int): MatchResult? { public actual fun matchAt(input: CharSequence, index: Int): MatchResult? {
if (index < 0 || index > input.length) { if (index < 0 || index > input.length) {
throw IndexOutOfBoundsException("index out of bounds: $index, input length: ${input.length}") throw IndexOutOfBoundsException("index out of bounds: $index, input length: ${input.length}")
libraries/stdlib/jvm/src/kotlin/text/regex/Regex.kt
+4 -4
View File
@@ -143,15 +143,15 @@ internal constructor(private val nativePattern: Pattern) : Serializable {
*/ */
public actual fun matchEntire(input: CharSequence): MatchResult? = nativePattern.matcher(input).matchEntire(input) public actual fun matchEntire(input: CharSequence): MatchResult? = nativePattern.matcher(input).matchEntire(input)
@SinceKotlin("1.5") @SinceKotlin("1.7")
@ExperimentalStdlibApi @WasExperimental(ExperimentalStdlibApi::class)
public actual fun matchAt(input: CharSequence, index: Int): MatchResult? = public actual fun matchAt(input: CharSequence, index: Int): MatchResult? =
nativePattern.matcher(input).useAnchoringBounds(false).useTransparentBounds(true).region(index, input.length).run { nativePattern.matcher(input).useAnchoringBounds(false).useTransparentBounds(true).region(index, input.length).run {
if (lookingAt()) MatcherMatchResult(this, input) else null if (lookingAt()) MatcherMatchResult(this, input) else null
} }
@SinceKotlin("1.5") @SinceKotlin("1.7")
@ExperimentalStdlibApi @WasExperimental(ExperimentalStdlibApi::class)
public actual fun matchesAt(input: CharSequence, index: Int): Boolean = public actual fun matchesAt(input: CharSequence, index: Int): Boolean =
nativePattern.matcher(input).useAnchoringBounds(false).useTransparentBounds(true).region(index, input.length).lookingAt() nativePattern.matcher(input).useAnchoringBounds(false).useTransparentBounds(true).region(index, input.length).lookingAt()
libraries/stdlib/native-wasm/src/kotlin/text/Regex.kt
+4 -4
View File
@@ -168,8 +168,8 @@ public actual class Regex internal constructor(internal val nativePattern: Patte
/** Indicates whether the regular expression can find at least one match in the specified [input]. */ /** Indicates whether the regular expression can find at least one match in the specified [input]. */
actual fun containsMatchIn(input: CharSequence): Boolean = find(input) != null actual fun containsMatchIn(input: CharSequence): Boolean = find(input) != null
@SinceKotlin("1.5") @SinceKotlin("1.7")
@ExperimentalStdlibApi @WasExperimental(ExperimentalStdlibApi::class)
public actual fun matchesAt(input: CharSequence, index: Int): Boolean = public actual fun matchesAt(input: CharSequence, index: Int): Boolean =
// TODO: expand and simplify // TODO: expand and simplify
matchAt(input, index) != null matchAt(input, index) != null
@@ -221,8 +221,8 @@ public actual class Regex internal constructor(internal val nativePattern: Patte
*/ */
actual fun matchEntire(input: CharSequence): MatchResult?= doMatch(input, Mode.MATCH) actual fun matchEntire(input: CharSequence): MatchResult?= doMatch(input, Mode.MATCH)
@SinceKotlin("1.5") @SinceKotlin("1.7")
@ExperimentalStdlibApi @WasExperimental(ExperimentalStdlibApi::class)
public actual fun matchAt(input: CharSequence, index: Int): MatchResult? { public actual fun matchAt(input: CharSequence, index: Int): MatchResult? {
if (index < 0 || index > input.length) { if (index < 0 || index > input.length) {
throw IndexOutOfBoundsException("index is out of bounds: $index, input length: ${input.length}") throw IndexOutOfBoundsException("index is out of bounds: $index, input length: ${input.length}")