Skip to content

Commit 8b9f76b

Browse files
committed
Clean up some test code
1 parent 514c962 commit 8b9f76b

File tree

1 file changed

+10
-13
lines changed

1 file changed

+10
-13
lines changed

Tests/RegexTests/ParseTests.swift

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -210,12 +210,9 @@ extension RegexTests {
210210
parseTest(#"\08"#, concat(scalar("\u{0}"), "8"))
211211
parseTest(#"\0707"#, concat(scalar("\u{38}"), "7"))
212212

213-
// FIXME(Hamish): These now get printed using the unicode
214-
// literal syntax instead of rendered as Character. Adjust
215-
// testing infra to handle that.
216-
// parseTest(#"[\0]"#, charClass("\u{0}"))
217-
// parseTest(#"[\01]"#, charClass("\u{1}"))
218-
// parseTest(#"[\070]"#, charClass("\u{38}"))
213+
parseTest(#"[\0]"#, charClass(scalar_m("\u{0}")))
214+
parseTest(#"[\01]"#, charClass(scalar_m("\u{1}")))
215+
parseTest(#"[\070]"#, charClass(scalar_m("\u{38}")))
219216

220217
parseTest(#"[\07A]"#, charClass(scalar_m("\u{7}"), "A"))
221218
parseTest(#"[\08]"#, charClass(scalar_m("\u{0}"), "8"))
@@ -597,7 +594,7 @@ extension RegexTests {
597594
parseTest("\\\(i)", backreference(.absolute(i)))
598595
parseTest(
599596
"()()()()()()()()()\\\(i)",
600-
concat((0..<9).map { _ in capture(empty()) }
597+
concat(Array(repeating: capture(empty()), count: 9)
601598
+ [backreference(.absolute(i))]),
602599
captures: .tuple(Array(repeating: .atom(), count: 9))
603600
)
@@ -612,13 +609,13 @@ extension RegexTests {
612609

613610
parseTest(
614611
#"()()()()()()()()()()\10"#,
615-
concat((0..<10).map { _ in capture(empty()) }
612+
concat(Array(repeating: capture(empty()), count: 10)
616613
+ [backreference(.absolute(10))]),
617614
captures: .tuple(Array(repeating: .atom(), count: 10))
618615
)
619616
parseTest(
620617
#"()()()()()()()()()\10()"#,
621-
concat((0..<9).map { _ in capture(empty()) }
618+
concat(Array(repeating: capture(empty()), count: 9)
622619
+ [scalar("\u{8}"), capture(empty())]),
623620
captures: .tuple(Array(repeating: .atom(), count: 10))
624621
)
@@ -655,13 +652,13 @@ extension RegexTests {
655652
parseTest(#"\040"#, scalar(" "))
656653
parseTest(
657654
String(repeating: "()", count: 40) + #"\040"#,
658-
concat((0..<40).map { _ in capture(empty()) } + [scalar(" ")]),
655+
concat(Array(repeating: capture(empty()), count: 40) + [scalar(" ")]),
659656
captures: .tuple(Array(repeating: .atom(), count: 40))
660657
)
661658
parseTest(#"\40"#, scalar(" "))
662659
parseTest(
663660
String(repeating: "()", count: 40) + #"\40"#,
664-
concat((0..<40).map { _ in capture(empty()) }
661+
concat(Array(repeating: capture(empty()), count: 40)
665662
+ [backreference(.absolute(40))]),
666663
captures: .tuple(Array(repeating: .atom(), count: 40))
667664
)
@@ -671,14 +668,14 @@ extension RegexTests {
671668
parseTest(#"\11"#, scalar("\u{9}"))
672669
parseTest(
673670
String(repeating: "()", count: 11) + #"\11"#,
674-
concat((0..<11).map { _ in capture(empty()) }
671+
concat(Array(repeating: capture(empty()), count: 11)
675672
+ [backreference(.absolute(11))]),
676673
captures: .tuple(Array(repeating: .atom(), count: 11))
677674
)
678675
parseTest(#"\011"#, scalar("\u{9}"))
679676
parseTest(
680677
String(repeating: "()", count: 11) + #"\011"#,
681-
concat((0..<11).map { _ in capture(empty()) } + [scalar("\u{9}")]),
678+
concat(Array(repeating: capture(empty()), count: 11) + [scalar("\u{9}")]),
682679
captures: .tuple(Array(repeating: .atom(), count: 11))
683680
)
684681

0 commit comments

Comments
 (0)