Skip to content

Commit f7797ed

Browse files
Copilotjketema
authored andcommitted
C++: Add coverage for lazy quantifiers and \f/\v escapes
1 parent b1e7fb7 commit f7797ed

4 files changed

Lines changed: 200 additions & 143 deletions

File tree

‎cpp/ql/test/library-tests/regex/locations.expected‎

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,20 @@
4242
| regexp.cpp:93:21:93:25 | [\\cZ] | regexp.cpp | 93 | 21 | 93 | 25 |
4343
| regexp.cpp:96:20:96:21 | \\0 | regexp.cpp | 96 | 20 | 96 | 21 |
4444
| regexp.cpp:97:20:97:23 | [\\0] | regexp.cpp | 97 | 20 | 97 | 23 |
45-
| regexp.cpp:100:25:100:28 | a\\nb | regexp.cpp | 100 | 25 | 100 | 28 |
46-
| regexp.cpp:101:37:101:40 | a\\nc | regexp.cpp | 101 | 37 | 101 | 40 |
47-
| regexp.cpp:102:39:102:42 | a\\nc | regexp.cpp | 102 | 39 | 102 | 42 |
48-
| regexp.cpp:103:38:103:41 | a\\nc | regexp.cpp | 103 | 38 | 103 | 41 |
49-
| regexp.cpp:104:38:104:41 | a\\nc | regexp.cpp | 104 | 38 | 104 | 41 |
50-
| regexp.cpp:105:23:105:26 | a\\nc | regexp.cpp | 105 | 23 | 105 | 26 |
51-
| regexp.cpp:106:40:106:43 | a\\nc | regexp.cpp | 106 | 40 | 106 | 43 |
52-
| regexp.cpp:107:42:107:45 | a\\nc | regexp.cpp | 107 | 42 | 107 | 45 |
53-
| regexp.cpp:108:41:108:44 | a\\nc | regexp.cpp | 108 | 41 | 108 | 44 |
54-
| regexp.cpp:109:41:109:44 | a\\nc | regexp.cpp | 109 | 41 | 109 | 44 |
55-
| regexp.cpp:110:25:110:28 | a\\nc | regexp.cpp | 110 | 25 | 110 | 28 |
56-
| regexp.cpp:111:29:111:32 | a\\nc | regexp.cpp | 111 | 29 | 111 | 32 |
45+
| regexp.cpp:100:21:100:23 | a*? | regexp.cpp | 100 | 21 | 100 | 23 |
46+
| regexp.cpp:101:21:101:23 | b+? | regexp.cpp | 101 | 21 | 101 | 23 |
47+
| regexp.cpp:102:21:102:23 | c?? | regexp.cpp | 102 | 21 | 102 | 23 |
48+
| regexp.cpp:103:21:103:27 | d{2,3}? | regexp.cpp | 103 | 21 | 103 | 27 |
49+
| regexp.cpp:104:18:104:21 | \\f\\v | regexp.cpp | 104 | 18 | 104 | 21 |
50+
| regexp.cpp:107:25:107:28 | a\\nb | regexp.cpp | 107 | 25 | 107 | 28 |
51+
| regexp.cpp:108:37:108:40 | a\\nc | regexp.cpp | 108 | 37 | 108 | 40 |
52+
| regexp.cpp:109:39:109:42 | a\\nc | regexp.cpp | 109 | 39 | 109 | 42 |
53+
| regexp.cpp:110:38:110:41 | a\\nc | regexp.cpp | 110 | 38 | 110 | 41 |
54+
| regexp.cpp:111:38:111:41 | a\\nc | regexp.cpp | 111 | 38 | 111 | 41 |
55+
| regexp.cpp:112:23:112:26 | a\\nc | regexp.cpp | 112 | 23 | 112 | 26 |
56+
| regexp.cpp:113:40:113:43 | a\\nc | regexp.cpp | 113 | 40 | 113 | 43 |
57+
| regexp.cpp:114:42:114:45 | a\\nc | regexp.cpp | 114 | 42 | 114 | 45 |
58+
| regexp.cpp:115:41:115:44 | a\\nc | regexp.cpp | 115 | 41 | 115 | 44 |
59+
| regexp.cpp:116:41:116:44 | a\\nc | regexp.cpp | 116 | 41 | 116 | 44 |
60+
| regexp.cpp:117:25:117:28 | a\\nc | regexp.cpp | 117 | 25 | 117 | 28 |
61+
| regexp.cpp:118:29:118:32 | a\\nc | regexp.cpp | 118 | 29 | 118 | 32 |

‎cpp/ql/test/library-tests/regex/parse.expected‎

Lines changed: 75 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -473,132 +473,160 @@ regexp.cpp:
473473

474474
# 100| [RegExpConstant, RegExpNormalChar] a
475475

476-
# 100| [RegExpSequence] a\nb
476+
# 100| [RegExpStar] a*?
477+
#-----| 0 -> [RegExpConstant, RegExpNormalChar] a
478+
479+
# 101| [RegExpConstant, RegExpNormalChar] b
480+
481+
# 101| [RegExpPlus] b+?
482+
#-----| 0 -> [RegExpConstant, RegExpNormalChar] b
483+
484+
# 102| [RegExpConstant, RegExpNormalChar] c
485+
486+
# 102| [RegExpOpt] c??
487+
#-----| 0 -> [RegExpConstant, RegExpNormalChar] c
488+
489+
# 103| [RegExpConstant, RegExpNormalChar] d
490+
491+
# 103| [RegExpQuantifier] d{2,3}?
492+
#-----| 0 -> [RegExpConstant, RegExpNormalChar] d
493+
494+
# 104| [RegExpConstant, RegExpEscape] \f
495+
496+
# 104| [RegExpSequence] \f\v
497+
#-----| 0 -> [RegExpConstant, RegExpEscape] \f
498+
#-----| 1 -> [RegExpConstant, RegExpEscape] \v
499+
500+
# 104| [RegExpConstant, RegExpEscape] \v
501+
502+
# 107| [RegExpConstant, RegExpNormalChar] a
503+
504+
# 107| [RegExpSequence] a\nb
477505
#-----| 0 -> [RegExpConstant, RegExpNormalChar] a
478506
#-----| 1 -> [RegExpConstant, RegExpEscape] \n
479507
#-----| 2 -> [RegExpConstant, RegExpNormalChar] b
480508

481-
# 100| [RegExpConstant, RegExpEscape] \n
509+
# 107| [RegExpConstant, RegExpEscape] \n
482510

483-
# 100| [RegExpConstant, RegExpNormalChar] b
511+
# 107| [RegExpConstant, RegExpNormalChar] b
484512

485-
# 101| [RegExpConstant, RegExpNormalChar] a
513+
# 108| [RegExpConstant, RegExpNormalChar] a
486514

487-
# 101| [RegExpSequence] a\nc
515+
# 108| [RegExpSequence] a\nc
488516
#-----| 0 -> [RegExpConstant, RegExpNormalChar] a
489517
#-----| 1 -> [RegExpConstant, RegExpEscape] \n
490518
#-----| 2 -> [RegExpConstant, RegExpNormalChar] c
491519

492-
# 101| [RegExpConstant, RegExpEscape] \n
520+
# 108| [RegExpConstant, RegExpEscape] \n
493521

494-
# 101| [RegExpConstant, RegExpNormalChar] c
522+
# 108| [RegExpConstant, RegExpNormalChar] c
495523

496-
# 102| [RegExpConstant, RegExpNormalChar] a
524+
# 109| [RegExpConstant, RegExpNormalChar] a
497525

498-
# 102| [RegExpSequence] a\nc
526+
# 109| [RegExpSequence] a\nc
499527
#-----| 0 -> [RegExpConstant, RegExpNormalChar] a
500528
#-----| 1 -> [RegExpConstant, RegExpEscape] \n
501529
#-----| 2 -> [RegExpConstant, RegExpNormalChar] c
502530

503-
# 102| [RegExpConstant, RegExpEscape] \n
531+
# 109| [RegExpConstant, RegExpEscape] \n
504532

505-
# 102| [RegExpConstant, RegExpNormalChar] c
533+
# 109| [RegExpConstant, RegExpNormalChar] c
506534

507-
# 103| [RegExpConstant, RegExpNormalChar] a
535+
# 110| [RegExpConstant, RegExpNormalChar] a
508536

509-
# 103| [RegExpSequence] a\nc
537+
# 110| [RegExpSequence] a\nc
510538
#-----| 0 -> [RegExpConstant, RegExpNormalChar] a
511539
#-----| 1 -> [RegExpConstant, RegExpEscape] \n
512540
#-----| 2 -> [RegExpConstant, RegExpNormalChar] c
513541

514-
# 103| [RegExpConstant, RegExpEscape] \n
542+
# 110| [RegExpConstant, RegExpEscape] \n
515543

516-
# 103| [RegExpConstant, RegExpNormalChar] c
544+
# 110| [RegExpConstant, RegExpNormalChar] c
517545

518-
# 104| [RegExpConstant, RegExpNormalChar] a
546+
# 111| [RegExpConstant, RegExpNormalChar] a
519547

520-
# 104| [RegExpSequence] a\nc
548+
# 111| [RegExpSequence] a\nc
521549
#-----| 0 -> [RegExpConstant, RegExpNormalChar] a
522550
#-----| 1 -> [RegExpConstant, RegExpEscape] \n
523551
#-----| 2 -> [RegExpConstant, RegExpNormalChar] c
524552

525-
# 104| [RegExpConstant, RegExpEscape] \n
553+
# 111| [RegExpConstant, RegExpEscape] \n
526554

527-
# 104| [RegExpConstant, RegExpNormalChar] c
555+
# 111| [RegExpConstant, RegExpNormalChar] c
528556

529-
# 105| [RegExpConstant, RegExpNormalChar] a
557+
# 112| [RegExpConstant, RegExpNormalChar] a
530558

531-
# 105| [RegExpSequence] a\nc
559+
# 112| [RegExpSequence] a\nc
532560
#-----| 0 -> [RegExpConstant, RegExpNormalChar] a
533561
#-----| 1 -> [RegExpConstant, RegExpEscape] \n
534562
#-----| 2 -> [RegExpConstant, RegExpNormalChar] c
535563

536-
# 105| [RegExpConstant, RegExpEscape] \n
564+
# 112| [RegExpConstant, RegExpEscape] \n
537565

538-
# 105| [RegExpConstant, RegExpNormalChar] c
566+
# 112| [RegExpConstant, RegExpNormalChar] c
539567

540-
# 106| [RegExpConstant, RegExpNormalChar] a
568+
# 113| [RegExpConstant, RegExpNormalChar] a
541569

542-
# 106| [RegExpSequence] a\nc
570+
# 113| [RegExpSequence] a\nc
543571
#-----| 0 -> [RegExpConstant, RegExpNormalChar] a
544572
#-----| 1 -> [RegExpConstant, RegExpEscape] \n
545573
#-----| 2 -> [RegExpConstant, RegExpNormalChar] c
546574

547-
# 106| [RegExpConstant, RegExpEscape] \n
575+
# 113| [RegExpConstant, RegExpEscape] \n
548576

549-
# 106| [RegExpConstant, RegExpNormalChar] c
577+
# 113| [RegExpConstant, RegExpNormalChar] c
550578

551-
# 107| [RegExpConstant, RegExpNormalChar] a
579+
# 114| [RegExpConstant, RegExpNormalChar] a
552580

553-
# 107| [RegExpSequence] a\nc
581+
# 114| [RegExpSequence] a\nc
554582
#-----| 0 -> [RegExpConstant, RegExpNormalChar] a
555583
#-----| 1 -> [RegExpConstant, RegExpEscape] \n
556584
#-----| 2 -> [RegExpConstant, RegExpNormalChar] c
557585

558-
# 107| [RegExpConstant, RegExpEscape] \n
586+
# 114| [RegExpConstant, RegExpEscape] \n
559587

560-
# 107| [RegExpConstant, RegExpNormalChar] c
588+
# 114| [RegExpConstant, RegExpNormalChar] c
561589

562-
# 108| [RegExpConstant, RegExpNormalChar] a
590+
# 115| [RegExpConstant, RegExpNormalChar] a
563591

564-
# 108| [RegExpSequence] a\nc
592+
# 115| [RegExpSequence] a\nc
565593
#-----| 0 -> [RegExpConstant, RegExpNormalChar] a
566594
#-----| 1 -> [RegExpConstant, RegExpEscape] \n
567595
#-----| 2 -> [RegExpConstant, RegExpNormalChar] c
568596

569-
# 108| [RegExpConstant, RegExpEscape] \n
597+
# 115| [RegExpConstant, RegExpEscape] \n
570598

571-
# 108| [RegExpConstant, RegExpNormalChar] c
599+
# 115| [RegExpConstant, RegExpNormalChar] c
572600

573-
# 109| [RegExpConstant, RegExpNormalChar] a
601+
# 116| [RegExpConstant, RegExpNormalChar] a
574602

575-
# 109| [RegExpSequence] a\nc
603+
# 116| [RegExpSequence] a\nc
576604
#-----| 0 -> [RegExpConstant, RegExpNormalChar] a
577605
#-----| 1 -> [RegExpConstant, RegExpEscape] \n
578606
#-----| 2 -> [RegExpConstant, RegExpNormalChar] c
579607

580-
# 109| [RegExpConstant, RegExpEscape] \n
608+
# 116| [RegExpConstant, RegExpEscape] \n
581609

582-
# 109| [RegExpConstant, RegExpNormalChar] c
610+
# 116| [RegExpConstant, RegExpNormalChar] c
583611

584-
# 110| [RegExpConstant, RegExpNormalChar] a
612+
# 117| [RegExpConstant, RegExpNormalChar] a
585613

586-
# 110| [RegExpSequence] a\nc
614+
# 117| [RegExpSequence] a\nc
587615
#-----| 0 -> [RegExpConstant, RegExpNormalChar] a
588616
#-----| 1 -> [RegExpConstant, RegExpEscape] \n
589617
#-----| 2 -> [RegExpConstant, RegExpNormalChar] c
590618

591-
# 110| [RegExpConstant, RegExpEscape] \n
619+
# 117| [RegExpConstant, RegExpEscape] \n
592620

593-
# 110| [RegExpConstant, RegExpNormalChar] c
621+
# 117| [RegExpConstant, RegExpNormalChar] c
594622

595-
# 111| [RegExpConstant, RegExpNormalChar] a
623+
# 118| [RegExpConstant, RegExpNormalChar] a
596624

597-
# 111| [RegExpSequence] a\nc
625+
# 118| [RegExpSequence] a\nc
598626
#-----| 0 -> [RegExpConstant, RegExpNormalChar] a
599627
#-----| 1 -> [RegExpConstant, RegExpEscape] \n
600628
#-----| 2 -> [RegExpConstant, RegExpNormalChar] c
601629

602-
# 111| [RegExpConstant, RegExpEscape] \n
630+
# 118| [RegExpConstant, RegExpEscape] \n
603631

604-
# 111| [RegExpConstant, RegExpNormalChar] c
632+
# 118| [RegExpConstant, RegExpNormalChar] c

‎cpp/ql/test/library-tests/regex/regexp.cpp‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,13 @@ std::regex r_ctrl2("[\\cZ]");
9696
std::regex r_nul1("\\0");
9797
std::regex r_nul2("[\\0]");
9898

99+
// Lazy quantifiers and additional supported escapes
100+
std::regex r_lazy1("a*?");
101+
std::regex r_lazy2("b+?");
102+
std::regex r_lazy3("c??");
103+
std::regex r_lazy4("d{2,3}?");
104+
std::regex r_fv("\\f\\v");
105+
99106
// String literal spellings for location tests
100107
std::regex r_loc_plain("a\\nb");
101108
std::basic_regex<wchar_t> r_loc_L(L"a\\nc");

0 commit comments

Comments
 (0)