Skip to content

Commit 03625be

Browse files
Copilotjketema
authored andcommitted
C++: Add POSIX collating-symbol tests (pre-fix)
1 parent 81783e6 commit 03625be

4 files changed

Lines changed: 239 additions & 155 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
@@ -32,20 +32,22 @@
3232
| regexp.cpp:69:22:69:43 | [[:alpha:]][[:digit:]] | regexp.cpp | 69 | 22 | 69 | 43 |
3333
| regexp.cpp:72:22:72:41 | [[:alpha:][:digit:]] | regexp.cpp | 72 | 22 | 72 | 41 |
3434
| regexp.cpp:75:22:75:38 | [A-F[:digit:]a-f] | regexp.cpp | 75 | 22 | 75 | 38 |
35-
| regexp.cpp:78:22:78:30 | [:digit:] | regexp.cpp | 78 | 22 | 78 | 30 |
36-
| regexp.cpp:84:21:84:23 | \\cA | regexp.cpp | 84 | 21 | 84 | 23 |
37-
| regexp.cpp:85:21:85:25 | [\\cZ] | regexp.cpp | 85 | 21 | 85 | 25 |
38-
| regexp.cpp:88:20:88:21 | \\0 | regexp.cpp | 88 | 20 | 88 | 21 |
39-
| regexp.cpp:89:20:89:23 | [\\0] | regexp.cpp | 89 | 20 | 89 | 23 |
40-
| regexp.cpp:92:25:92:28 | a\\nb | regexp.cpp | 92 | 25 | 92 | 28 |
41-
| regexp.cpp:93:37:93:40 | a\\nc | regexp.cpp | 93 | 37 | 93 | 40 |
42-
| regexp.cpp:94:39:94:42 | a\\nc | regexp.cpp | 94 | 39 | 94 | 42 |
43-
| regexp.cpp:95:38:95:41 | a\\nc | regexp.cpp | 95 | 38 | 95 | 41 |
44-
| regexp.cpp:96:38:96:41 | a\\nc | regexp.cpp | 96 | 38 | 96 | 41 |
45-
| regexp.cpp:97:23:97:26 | a\\nc | regexp.cpp | 97 | 23 | 97 | 26 |
46-
| regexp.cpp:98:40:98:43 | a\\nc | regexp.cpp | 98 | 40 | 98 | 43 |
47-
| regexp.cpp:99:42:99:45 | a\\nc | regexp.cpp | 99 | 42 | 99 | 45 |
48-
| regexp.cpp:100:41:100:44 | a\\nc | regexp.cpp | 100 | 41 | 100 | 44 |
49-
| regexp.cpp:101:41:101:44 | a\\nc | regexp.cpp | 101 | 41 | 101 | 44 |
50-
| regexp.cpp:102:25:102:28 | a\\nc | regexp.cpp | 102 | 25 | 102 | 28 |
51-
| regexp.cpp:103:29:103:32 | a\\nc | regexp.cpp | 103 | 29 | 103 | 32 |
35+
| regexp.cpp:78:27:78:33 | [[.a.]] | regexp.cpp | 78 | 27 | 78 | 33 |
36+
| 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 |

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

Lines changed: 90 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -397,78 +397,83 @@ regexp.cpp:
397397

398398
# 75| [RegExpConstant, RegExpNormalChar] f
399399

400-
# 78| [RegExpNamedCharacterProperty] [:digit:]
400+
# 78| [RegExpCharacterClass] [[.a.]
401+
#-----| 0 -> [RegExpConstant, RegExpNormalChar] [
402+
#-----| 1 -> [RegExpConstant, RegExpNormalChar] .
403+
#-----| 2 -> [RegExpConstant, RegExpNormalChar] a
404+
#-----| 3 -> [RegExpConstant, RegExpNormalChar] .
401405

402-
# 81| [RegExpConstant, RegExpEscape] \u{987
406+
# 78| [RegExpSequence] [[.a.]]
407+
#-----| 0 -> [RegExpCharacterClass] [[.a.]
408+
#-----| 1 -> [RegExpConstant, RegExpNormalChar] ]
403409

404-
# 84| [RegExpConstant, RegExpEscape] \cA
410+
# 78| [RegExpConstant, RegExpNormalChar] [
405411

406-
# 85| [RegExpCharacterClass] [\cZ]
407-
#-----| 0 -> [RegExpConstant, RegExpEscape] \cZ
412+
# 78| [RegExpConstant, RegExpNormalChar] .
408413

409-
# 85| [RegExpConstant, RegExpEscape] \cZ
414+
# 78| [RegExpConstant, RegExpNormalChar] a
410415

411-
# 88| [RegExpConstant, RegExpEscape] \0
416+
# 78| [RegExpConstant, RegExpNormalChar] .
412417

413-
# 89| [RegExpCharacterClass] [\0]
414-
#-----| 0 -> [RegExpConstant, RegExpEscape] \0
418+
# 78| [RegExpConstant, RegExpNormalChar] ]
415419

416-
# 89| [RegExpConstant, RegExpEscape] \0
420+
# 79| [RegExpCharacterClass] [A-F[.b.]
421+
#-----| 0 -> [RegExpCharacterRange] A-F
422+
#-----| 1 -> [RegExpConstant, RegExpNormalChar] [
423+
#-----| 2 -> [RegExpConstant, RegExpNormalChar] .
424+
#-----| 3 -> [RegExpConstant, RegExpNormalChar] b
425+
#-----| 4 -> [RegExpConstant, RegExpNormalChar] .
417426

418-
# 92| [RegExpConstant, RegExpNormalChar] a
427+
# 79| [RegExpSequence] [A-F[.b.]a-f]
428+
#-----| 0 -> [RegExpCharacterClass] [A-F[.b.]
429+
#-----| 1 -> [RegExpConstant, RegExpNormalChar] a-f]
419430

420-
# 92| [RegExpSequence] a\nb
421-
#-----| 0 -> [RegExpConstant, RegExpNormalChar] a
422-
#-----| 1 -> [RegExpConstant, RegExpEscape] \n
423-
#-----| 2 -> [RegExpConstant, RegExpNormalChar] b
431+
# 79| [RegExpConstant, RegExpNormalChar] A
424432

425-
# 92| [RegExpConstant, RegExpEscape] \n
433+
# 79| [RegExpCharacterRange] A-F
434+
#-----| 0 -> [RegExpConstant, RegExpNormalChar] A
435+
#-----| 1 -> [RegExpConstant, RegExpNormalChar] F
426436

427-
# 92| [RegExpConstant, RegExpNormalChar] b
437+
# 79| [RegExpConstant, RegExpNormalChar] F
428438

429-
# 93| [RegExpConstant, RegExpNormalChar] a
439+
# 79| [RegExpConstant, RegExpNormalChar] [
430440

431-
# 93| [RegExpSequence] a\nc
432-
#-----| 0 -> [RegExpConstant, RegExpNormalChar] a
433-
#-----| 1 -> [RegExpConstant, RegExpEscape] \n
434-
#-----| 2 -> [RegExpConstant, RegExpNormalChar] c
441+
# 79| [RegExpConstant, RegExpNormalChar] .
435442

436-
# 93| [RegExpConstant, RegExpEscape] \n
443+
# 79| [RegExpConstant, RegExpNormalChar] b
437444

438-
# 93| [RegExpConstant, RegExpNormalChar] c
445+
# 79| [RegExpConstant, RegExpNormalChar] .
439446

440-
# 94| [RegExpConstant, RegExpNormalChar] a
447+
# 79| [RegExpConstant, RegExpNormalChar] a-f]
441448

442-
# 94| [RegExpSequence] a\nc
443-
#-----| 0 -> [RegExpConstant, RegExpNormalChar] a
444-
#-----| 1 -> [RegExpConstant, RegExpEscape] \n
445-
#-----| 2 -> [RegExpConstant, RegExpNormalChar] c
449+
# 82| [RegExpNamedCharacterProperty] [:digit:]
446450

447-
# 94| [RegExpConstant, RegExpEscape] \n
451+
# 85| [RegExpConstant, RegExpEscape] \u{987
448452

449-
# 94| [RegExpConstant, RegExpNormalChar] c
453+
# 88| [RegExpConstant, RegExpEscape] \cA
450454

451-
# 95| [RegExpConstant, RegExpNormalChar] a
455+
# 89| [RegExpCharacterClass] [\cZ]
456+
#-----| 0 -> [RegExpConstant, RegExpEscape] \cZ
452457

453-
# 95| [RegExpSequence] a\nc
454-
#-----| 0 -> [RegExpConstant, RegExpNormalChar] a
455-
#-----| 1 -> [RegExpConstant, RegExpEscape] \n
456-
#-----| 2 -> [RegExpConstant, RegExpNormalChar] c
458+
# 89| [RegExpConstant, RegExpEscape] \cZ
457459

458-
# 95| [RegExpConstant, RegExpEscape] \n
460+
# 92| [RegExpConstant, RegExpEscape] \0
459461

460-
# 95| [RegExpConstant, RegExpNormalChar] c
462+
# 93| [RegExpCharacterClass] [\0]
463+
#-----| 0 -> [RegExpConstant, RegExpEscape] \0
464+
465+
# 93| [RegExpConstant, RegExpEscape] \0
461466

462467
# 96| [RegExpConstant, RegExpNormalChar] a
463468

464-
# 96| [RegExpSequence] a\nc
469+
# 96| [RegExpSequence] a\nb
465470
#-----| 0 -> [RegExpConstant, RegExpNormalChar] a
466471
#-----| 1 -> [RegExpConstant, RegExpEscape] \n
467-
#-----| 2 -> [RegExpConstant, RegExpNormalChar] c
472+
#-----| 2 -> [RegExpConstant, RegExpNormalChar] b
468473

469474
# 96| [RegExpConstant, RegExpEscape] \n
470475

471-
# 96| [RegExpConstant, RegExpNormalChar] c
476+
# 96| [RegExpConstant, RegExpNormalChar] b
472477

473478
# 97| [RegExpConstant, RegExpNormalChar] a
474479

@@ -546,3 +551,47 @@ regexp.cpp:
546551
# 103| [RegExpConstant, RegExpEscape] \n
547552

548553
# 103| [RegExpConstant, RegExpNormalChar] c
554+
555+
# 104| [RegExpConstant, RegExpNormalChar] a
556+
557+
# 104| [RegExpSequence] a\nc
558+
#-----| 0 -> [RegExpConstant, RegExpNormalChar] a
559+
#-----| 1 -> [RegExpConstant, RegExpEscape] \n
560+
#-----| 2 -> [RegExpConstant, RegExpNormalChar] c
561+
562+
# 104| [RegExpConstant, RegExpEscape] \n
563+
564+
# 104| [RegExpConstant, RegExpNormalChar] c
565+
566+
# 105| [RegExpConstant, RegExpNormalChar] a
567+
568+
# 105| [RegExpSequence] a\nc
569+
#-----| 0 -> [RegExpConstant, RegExpNormalChar] a
570+
#-----| 1 -> [RegExpConstant, RegExpEscape] \n
571+
#-----| 2 -> [RegExpConstant, RegExpNormalChar] c
572+
573+
# 105| [RegExpConstant, RegExpEscape] \n
574+
575+
# 105| [RegExpConstant, RegExpNormalChar] c
576+
577+
# 106| [RegExpConstant, RegExpNormalChar] a
578+
579+
# 106| [RegExpSequence] a\nc
580+
#-----| 0 -> [RegExpConstant, RegExpNormalChar] a
581+
#-----| 1 -> [RegExpConstant, RegExpEscape] \n
582+
#-----| 2 -> [RegExpConstant, RegExpNormalChar] c
583+
584+
# 106| [RegExpConstant, RegExpEscape] \n
585+
586+
# 106| [RegExpConstant, RegExpNormalChar] c
587+
588+
# 107| [RegExpConstant, RegExpNormalChar] a
589+
590+
# 107| [RegExpSequence] a\nc
591+
#-----| 0 -> [RegExpConstant, RegExpNormalChar] a
592+
#-----| 1 -> [RegExpConstant, RegExpEscape] \n
593+
#-----| 2 -> [RegExpConstant, RegExpNormalChar] c
594+
595+
# 107| [RegExpConstant, RegExpEscape] \n
596+
597+
# 107| [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
@@ -74,6 +74,10 @@ std::regex r_posix2("[[:alpha:][:digit:]]");
7474
// A single character class containing two ranges and one POSIX bracket expression
7575
std::regex r_posix3("[A-F[:digit:]a-f]");
7676

77+
// POSIX collating symbols
78+
std::regex r_posix_coll1("[[.a.]]");
79+
std::regex r_posix_coll2("[A-F[.b.]a-f]");
80+
7781
// *Not* a POSIX bracket expression; just a regular character class.
7882
std::regex r_posix4("[:digit:]");
7983

0 commit comments

Comments
 (0)