Regex: MatchResult.groupValues do not exclude zeroth group, use the same indices as in groups collection.

Provide destructured property for destructured assignment.
This commit is contained in:
Ilya Gorbunov
2016-01-19 06:06:10 +03:00
parent 3459a24b0a
commit dbcad08a35
4 changed files with 110 additions and 30 deletions
+45 -19
View File
@@ -69,36 +69,62 @@ class RegexTest {
val matches = pattern.findAll(input).toList()
assertTrue(matches.all { it.groups.size == 3 })
val m1 = matches[0]
assertEquals("1a", m1.groups[0]?.value)
assertEquals("1", m1.groups[1]?.value)
assertEquals("a", m1.groups[2]?.value)
assertEquals(listOf("1", "a"), m1.groupValues)
matches[0].let { m ->
assertEquals("1a", m.groups[0]?.value)
assertEquals("1", m.groups[1]?.value)
assertEquals("a", m.groups[2]?.value)
val m2 = matches[1]
assertEquals("2", m2.groups[1]?.value)
assertEquals("b", m2.groups[2]?.value)
assertEquals(listOf("1a", "1", "a"), m.groupValues)
assertEquals(listOf("2", "b"), m2.groupValues)
val (g1, g2) = m.destructured
assertEquals("1", g1)
assertEquals("a", g2)
assertEquals(listOf("1", "a"), m.destructured.toList())
}
matches[1].let { m ->
assertEquals("2b", m.groups[0]?.value)
assertEquals("2", m.groups[1]?.value)
assertEquals("b", m.groups[2]?.value)
assertEquals(listOf("2b", "2", "b"), m.groupValues)
val (g1, g2) = m.destructured
assertEquals("2", g1)
assertEquals("b", g2)
assertEquals(listOf("2", "b"), m.destructured.toList())
}
}
@test fun matchOptionalGroup() {
val pattern = "(hi)|(bye)".toRegex(RegexOption.IGNORE_CASE)
val m1 = pattern.find("Hi!")!!
assertEquals(3, m1.groups.size)
assertEquals("Hi", m1.groups[1]?.value)
assertEquals(null, m1.groups[2])
pattern.find("Hi!")!!.let { m ->
assertEquals(3, m.groups.size)
assertEquals("Hi", m.groups[1]?.value)
assertEquals(null, m.groups[2])
assertEquals(listOf("Hi", ""), m1.groupValues)
assertEquals(listOf("Hi", "Hi", ""), m.groupValues)
val m2 = pattern.find("bye...")!!
assertEquals(3, m2.groups.size)
assertEquals(null, m2.groups[1])
assertEquals("bye", m2.groups[2]?.value)
val (g1, g2) = m.destructured
assertEquals("Hi", g1)
assertEquals("", g2)
assertEquals(listOf("Hi", ""), m.destructured.toList())
}
assertEquals(listOf("", "bye"), m2.groupValues)
pattern.find("bye...")!!.let { m ->
assertEquals(3, m.groups.size)
assertEquals(null, m.groups[1])
assertEquals("bye", m.groups[2]?.value)
assertEquals(listOf("bye", "", "bye"), m.groupValues)
val (g1, g2) = m.destructured
assertEquals("", g1)
assertEquals("bye", g2)
assertEquals(listOf("", "bye"), m.destructured.toList())
}
}
@test fun matchMultiline() {