@@ -210,12 +210,9 @@ extension RegexTests {
210
210
parseTest ( #"\08"# , concat ( scalar ( " \u{0} " ) , " 8 " ) )
211
211
parseTest ( #"\0707"# , concat ( scalar ( " \u{38} " ) , " 7 " ) )
212
212
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} " ) ) )
219
216
220
217
parseTest ( #"[\07A]"# , charClass ( scalar_m ( " \u{7} " ) , " A " ) )
221
218
parseTest ( #"[\08]"# , charClass ( scalar_m ( " \u{0} " ) , " 8 " ) )
@@ -597,7 +594,7 @@ extension RegexTests {
597
594
parseTest ( " \\ \( i) " , backreference ( . absolute( i) ) )
598
595
parseTest (
599
596
" ()()()()()()()()() \\ \( i) " ,
600
- concat ( ( 0 ..< 9 ) . map { _ in capture ( empty ( ) ) }
597
+ concat ( Array ( repeating : capture ( empty ( ) ) , count : 9 )
601
598
+ [ backreference ( . absolute( i) ) ] ) ,
602
599
captures: . tuple( Array ( repeating: . atom( ) , count: 9 ) )
603
600
)
@@ -612,13 +609,13 @@ extension RegexTests {
612
609
613
610
parseTest (
614
611
#"()()()()()()()()()()\10"# ,
615
- concat ( ( 0 ..< 10 ) . map { _ in capture ( empty ( ) ) }
612
+ concat ( Array ( repeating : capture ( empty ( ) ) , count : 10 )
616
613
+ [ backreference ( . absolute( 10 ) ) ] ) ,
617
614
captures: . tuple( Array ( repeating: . atom( ) , count: 10 ) )
618
615
)
619
616
parseTest (
620
617
#"()()()()()()()()()\10()"# ,
621
- concat ( ( 0 ..< 9 ) . map { _ in capture ( empty ( ) ) }
618
+ concat ( Array ( repeating : capture ( empty ( ) ) , count : 9 )
622
619
+ [ scalar ( " \u{8} " ) , capture ( empty ( ) ) ] ) ,
623
620
captures: . tuple( Array ( repeating: . atom( ) , count: 10 ) )
624
621
)
@@ -655,13 +652,13 @@ extension RegexTests {
655
652
parseTest ( #"\040"# , scalar ( " " ) )
656
653
parseTest (
657
654
String ( repeating: " () " , count: 40 ) + #"\040"# ,
658
- concat ( ( 0 ..< 40 ) . map { _ in capture ( empty ( ) ) } + [ scalar ( " " ) ] ) ,
655
+ concat ( Array ( repeating : capture ( empty ( ) ) , count : 40 ) + [ scalar ( " " ) ] ) ,
659
656
captures: . tuple( Array ( repeating: . atom( ) , count: 40 ) )
660
657
)
661
658
parseTest ( #"\40"# , scalar ( " " ) )
662
659
parseTest (
663
660
String ( repeating: " () " , count: 40 ) + #"\40"# ,
664
- concat ( ( 0 ..< 40 ) . map { _ in capture ( empty ( ) ) }
661
+ concat ( Array ( repeating : capture ( empty ( ) ) , count : 40 )
665
662
+ [ backreference ( . absolute( 40 ) ) ] ) ,
666
663
captures: . tuple( Array ( repeating: . atom( ) , count: 40 ) )
667
664
)
@@ -671,14 +668,14 @@ extension RegexTests {
671
668
parseTest ( #"\11"# , scalar ( " \u{9} " ) )
672
669
parseTest (
673
670
String ( repeating: " () " , count: 11 ) + #"\11"# ,
674
- concat ( ( 0 ..< 11 ) . map { _ in capture ( empty ( ) ) }
671
+ concat ( Array ( repeating : capture ( empty ( ) ) , count : 11 )
675
672
+ [ backreference ( . absolute( 11 ) ) ] ) ,
676
673
captures: . tuple( Array ( repeating: . atom( ) , count: 11 ) )
677
674
)
678
675
parseTest ( #"\011"# , scalar ( " \u{9} " ) )
679
676
parseTest (
680
677
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} " ) ] ) ,
682
679
captures: . tuple( Array ( repeating: . atom( ) , count: 11 ) )
683
680
)
684
681
0 commit comments