Skip to content

Commit 96c9214

Browse files
Copilotjketema
authored andcommitted
C++: Add POSIX equivalence-class tests (pre-fix)
1 parent 57f5d03 commit 96c9214

4 files changed

Lines changed: 201 additions & 162 deletions

File tree

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

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -34,20 +34,22 @@
3434
| regexp.cpp:75:22:75:38 | [A-F[:digit:]a-f] | regexp.cpp | 75 | 22 | 75 | 38 |
3535
| regexp.cpp:78:27:78:33 | [[.a.]] | regexp.cpp | 78 | 27 | 78 | 33 |
3636
| regexp.cpp:79:27:79:39 | [A-F[.b.]a-f] | regexp.cpp | 79 | 27 | 79 | 39 |
37-
| regexp.cpp:82:22:82:30 | [:digit:] | regexp.cpp | 82 | 22 | 82 | 30 |
38-
| regexp.cpp:88:21:88:23 | \\cA | regexp.cpp | 88 | 21 | 88 | 23 |
39-
| regexp.cpp:89:21:89:25 | [\\cZ] | regexp.cpp | 89 | 21 | 89 | 25 |
40-
| regexp.cpp:92:20:92:21 | \\0 | regexp.cpp | 92 | 20 | 92 | 21 |
41-
| regexp.cpp:93:20:93:23 | [\\0] | regexp.cpp | 93 | 20 | 93 | 23 |
42-
| regexp.cpp:96:25:96:28 | a\\nb | regexp.cpp | 96 | 25 | 96 | 28 |
43-
| regexp.cpp:97:37:97:40 | a\\nc | regexp.cpp | 97 | 37 | 97 | 40 |
44-
| regexp.cpp:98:39:98:42 | a\\nc | regexp.cpp | 98 | 39 | 98 | 42 |
45-
| regexp.cpp:99:38:99:41 | a\\nc | regexp.cpp | 99 | 38 | 99 | 41 |
46-
| regexp.cpp:100:38:100:41 | a\\nc | regexp.cpp | 100 | 38 | 100 | 41 |
47-
| regexp.cpp:101:23:101:26 | a\\nc | regexp.cpp | 101 | 23 | 101 | 26 |
48-
| regexp.cpp:102:40:102:43 | a\\nc | regexp.cpp | 102 | 40 | 102 | 43 |
49-
| regexp.cpp:103:42:103:45 | a\\nc | regexp.cpp | 103 | 42 | 103 | 45 |
50-
| regexp.cpp:104:41:104:44 | a\\nc | regexp.cpp | 104 | 41 | 104 | 44 |
51-
| regexp.cpp:105:41:105:44 | a\\nc | regexp.cpp | 105 | 41 | 105 | 44 |
52-
| regexp.cpp:106:25:106:28 | a\\nc | regexp.cpp | 106 | 25 | 106 | 28 |
53-
| regexp.cpp:107:29:107:32 | a\\nc | regexp.cpp | 107 | 29 | 107 | 32 |
37+
| regexp.cpp:82:28:82:34 | [[=a=]] | regexp.cpp | 82 | 28 | 82 | 34 |
38+
| regexp.cpp:83:28:83:40 | [A-F[=b=]a-f] | regexp.cpp | 83 | 28 | 83 | 40 |
39+
| regexp.cpp:86:22:86:30 | [:digit:] | regexp.cpp | 86 | 22 | 86 | 30 |
40+
| regexp.cpp:92:21:92:23 | \\cA | regexp.cpp | 92 | 21 | 92 | 23 |
41+
| regexp.cpp:93:21:93:25 | [\\cZ] | regexp.cpp | 93 | 21 | 93 | 25 |
42+
| regexp.cpp:96:20:96:21 | \\0 | regexp.cpp | 96 | 20 | 96 | 21 |
43+
| regexp.cpp:97:20:97:23 | [\\0] | regexp.cpp | 97 | 20 | 97 | 23 |
44+
| regexp.cpp:100:25:100:28 | a\\nb | regexp.cpp | 100 | 25 | 100 | 28 |
45+
| regexp.cpp:101:37:101:40 | a\\nc | regexp.cpp | 101 | 37 | 101 | 40 |
46+
| regexp.cpp:102:39:102:42 | a\\nc | regexp.cpp | 102 | 39 | 102 | 42 |
47+
| regexp.cpp:103:38:103:41 | a\\nc | regexp.cpp | 103 | 38 | 103 | 41 |
48+
| regexp.cpp:104:38:104:41 | a\\nc | regexp.cpp | 104 | 38 | 104 | 41 |
49+
| regexp.cpp:105:23:105:26 | a\\nc | regexp.cpp | 105 | 23 | 105 | 26 |
50+
| regexp.cpp:106:40:106:43 | a\\nc | regexp.cpp | 106 | 40 | 106 | 43 |
51+
| regexp.cpp:107:42:107:45 | a\\nc | regexp.cpp | 107 | 42 | 107 | 45 |
52+
| regexp.cpp:108:41:108:44 | a\\nc | regexp.cpp | 108 | 41 | 108 | 44 |
53+
| regexp.cpp:109:41:109:44 | a\\nc | regexp.cpp | 109 | 41 | 109 | 44 |
54+
| regexp.cpp:110:25:110:28 | a\\nc | regexp.cpp | 110 | 25 | 110 | 28 |
55+
| regexp.cpp:111:29:111:32 | a\\nc | regexp.cpp | 111 | 29 | 111 | 32 |

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

Lines changed: 69 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -425,78 +425,55 @@ regexp.cpp:
425425

426426
# 79| [RegExpConstant, RegExpNormalChar] f
427427

428-
# 82| [RegExpNamedCharacterProperty] [:digit:]
428+
# 82| [RegExpCharacterClass] [[=a=]]
429429

430-
# 85| [RegExpConstant, RegExpEscape] \u{987
431-
432-
# 88| [RegExpConstant, RegExpEscape] \cA
433-
434-
# 89| [RegExpCharacterClass] [\cZ]
435-
#-----| 0 -> [RegExpConstant, RegExpEscape] \cZ
436-
437-
# 89| [RegExpConstant, RegExpEscape] \cZ
438-
439-
# 92| [RegExpConstant, RegExpEscape] \0
440-
441-
# 93| [RegExpCharacterClass] [\0]
442-
#-----| 0 -> [RegExpConstant, RegExpEscape] \0
443-
444-
# 93| [RegExpConstant, RegExpEscape] \0
430+
# 83| [RegExpCharacterClass] [A-F[=b=]a-f]
431+
#-----| 0 -> [RegExpCharacterRange] A-F
445432

446-
# 96| [RegExpConstant, RegExpNormalChar] a
433+
# 83| [RegExpConstant, RegExpNormalChar] A
447434

448-
# 96| [RegExpSequence] a\nb
449-
#-----| 0 -> [RegExpConstant, RegExpNormalChar] a
450-
#-----| 1 -> [RegExpConstant, RegExpEscape] \n
451-
#-----| 2 -> [RegExpConstant, RegExpNormalChar] b
452-
453-
# 96| [RegExpConstant, RegExpEscape] \n
435+
# 83| [RegExpCharacterRange] A-F
436+
#-----| 0 -> [RegExpConstant, RegExpNormalChar] A
437+
#-----| 1 -> [RegExpConstant, RegExpNormalChar] F
454438

455-
# 96| [RegExpConstant, RegExpNormalChar] b
439+
# 83| [RegExpConstant, RegExpNormalChar] F
456440

457-
# 97| [RegExpConstant, RegExpNormalChar] a
441+
# 83| [RegExpConstant, RegExpNormalChar] a
458442

459-
# 97| [RegExpSequence] a\nc
443+
# 83| [RegExpCharacterRange] a-f
460444
#-----| 0 -> [RegExpConstant, RegExpNormalChar] a
461-
#-----| 1 -> [RegExpConstant, RegExpEscape] \n
462-
#-----| 2 -> [RegExpConstant, RegExpNormalChar] c
463-
464-
# 97| [RegExpConstant, RegExpEscape] \n
445+
#-----| 1 -> [RegExpConstant, RegExpNormalChar] f
465446

466-
# 97| [RegExpConstant, RegExpNormalChar] c
447+
# 83| [RegExpConstant, RegExpNormalChar] f
467448

468-
# 98| [RegExpConstant, RegExpNormalChar] a
449+
# 86| [RegExpNamedCharacterProperty] [:digit:]
469450

470-
# 98| [RegExpSequence] a\nc
471-
#-----| 0 -> [RegExpConstant, RegExpNormalChar] a
472-
#-----| 1 -> [RegExpConstant, RegExpEscape] \n
473-
#-----| 2 -> [RegExpConstant, RegExpNormalChar] c
451+
# 89| [RegExpConstant, RegExpEscape] \u{987
474452

475-
# 98| [RegExpConstant, RegExpEscape] \n
453+
# 92| [RegExpConstant, RegExpEscape] \cA
476454

477-
# 98| [RegExpConstant, RegExpNormalChar] c
455+
# 93| [RegExpCharacterClass] [\cZ]
456+
#-----| 0 -> [RegExpConstant, RegExpEscape] \cZ
478457

479-
# 99| [RegExpConstant, RegExpNormalChar] a
458+
# 93| [RegExpConstant, RegExpEscape] \cZ
480459

481-
# 99| [RegExpSequence] a\nc
482-
#-----| 0 -> [RegExpConstant, RegExpNormalChar] a
483-
#-----| 1 -> [RegExpConstant, RegExpEscape] \n
484-
#-----| 2 -> [RegExpConstant, RegExpNormalChar] c
460+
# 96| [RegExpConstant, RegExpEscape] \0
485461

486-
# 99| [RegExpConstant, RegExpEscape] \n
462+
# 97| [RegExpCharacterClass] [\0]
463+
#-----| 0 -> [RegExpConstant, RegExpEscape] \0
487464

488-
# 99| [RegExpConstant, RegExpNormalChar] c
465+
# 97| [RegExpConstant, RegExpEscape] \0
489466

490467
# 100| [RegExpConstant, RegExpNormalChar] a
491468

492-
# 100| [RegExpSequence] a\nc
469+
# 100| [RegExpSequence] a\nb
493470
#-----| 0 -> [RegExpConstant, RegExpNormalChar] a
494471
#-----| 1 -> [RegExpConstant, RegExpEscape] \n
495-
#-----| 2 -> [RegExpConstant, RegExpNormalChar] c
472+
#-----| 2 -> [RegExpConstant, RegExpNormalChar] b
496473

497474
# 100| [RegExpConstant, RegExpEscape] \n
498475

499-
# 100| [RegExpConstant, RegExpNormalChar] c
476+
# 100| [RegExpConstant, RegExpNormalChar] b
500477

501478
# 101| [RegExpConstant, RegExpNormalChar] a
502479

@@ -574,3 +551,47 @@ regexp.cpp:
574551
# 107| [RegExpConstant, RegExpEscape] \n
575552

576553
# 107| [RegExpConstant, RegExpNormalChar] c
554+
555+
# 108| [RegExpConstant, RegExpNormalChar] a
556+
557+
# 108| [RegExpSequence] a\nc
558+
#-----| 0 -> [RegExpConstant, RegExpNormalChar] a
559+
#-----| 1 -> [RegExpConstant, RegExpEscape] \n
560+
#-----| 2 -> [RegExpConstant, RegExpNormalChar] c
561+
562+
# 108| [RegExpConstant, RegExpEscape] \n
563+
564+
# 108| [RegExpConstant, RegExpNormalChar] c
565+
566+
# 109| [RegExpConstant, RegExpNormalChar] a
567+
568+
# 109| [RegExpSequence] a\nc
569+
#-----| 0 -> [RegExpConstant, RegExpNormalChar] a
570+
#-----| 1 -> [RegExpConstant, RegExpEscape] \n
571+
#-----| 2 -> [RegExpConstant, RegExpNormalChar] c
572+
573+
# 109| [RegExpConstant, RegExpEscape] \n
574+
575+
# 109| [RegExpConstant, RegExpNormalChar] c
576+
577+
# 110| [RegExpConstant, RegExpNormalChar] a
578+
579+
# 110| [RegExpSequence] a\nc
580+
#-----| 0 -> [RegExpConstant, RegExpNormalChar] a
581+
#-----| 1 -> [RegExpConstant, RegExpEscape] \n
582+
#-----| 2 -> [RegExpConstant, RegExpNormalChar] c
583+
584+
# 110| [RegExpConstant, RegExpEscape] \n
585+
586+
# 110| [RegExpConstant, RegExpNormalChar] c
587+
588+
# 111| [RegExpConstant, RegExpNormalChar] a
589+
590+
# 111| [RegExpSequence] a\nc
591+
#-----| 0 -> [RegExpConstant, RegExpNormalChar] a
592+
#-----| 1 -> [RegExpConstant, RegExpEscape] \n
593+
#-----| 2 -> [RegExpConstant, RegExpNormalChar] c
594+
595+
# 111| [RegExpConstant, RegExpEscape] \n
596+
597+
# 111| [RegExpConstant, RegExpNormalChar] c

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,10 @@ std::regex r_posix3("[A-F[:digit:]a-f]");
7878
std::regex r_posix_coll1("[[.a.]]");
7979
std::regex r_posix_coll2("[A-F[.b.]a-f]");
8080

81+
// POSIX equivalence classes
82+
std::regex r_posix_equiv1("[[=a=]]");
83+
std::regex r_posix_equiv2("[A-F[=b=]a-f]");
84+
8185
// *Not* a POSIX bracket expression; just a regular character class.
8286
std::regex r_posix4("[:digit:]");
8387

0 commit comments

Comments
 (0)