Skip to content

Commit 7732801

Browse files
committed
C++: Add another POSIX collating symbol test case
1 parent 957d1fc commit 7732801

5 files changed

Lines changed: 199 additions & 190 deletions

File tree

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

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -36,29 +36,30 @@
3636
| regexp.cpp:78:22:78:38 | [A-F[:digit:]a-f] | regexp.cpp | 78 | 22 | 78 | 38 |
3737
| regexp.cpp:81:27:81:33 | [[.a.]] | regexp.cpp | 81 | 27 | 81 | 33 |
3838
| regexp.cpp:82:27:82:39 | [A-F[.b.]a-f] | regexp.cpp | 82 | 27 | 82 | 39 |
39-
| regexp.cpp:85:28:85:34 | [[=a=]] | regexp.cpp | 85 | 28 | 85 | 34 |
40-
| regexp.cpp:86:28:86:40 | [A-F[=b=]a-f] | regexp.cpp | 86 | 28 | 86 | 40 |
41-
| regexp.cpp:89:22:89:30 | [:digit:] | regexp.cpp | 89 | 22 | 89 | 30 |
42-
| regexp.cpp:92:19:92:24 | \\u0061 | regexp.cpp | 92 | 19 | 92 | 24 |
43-
| regexp.cpp:95:19:95:22 | \\x61 | regexp.cpp | 95 | 19 | 95 | 22 |
44-
| regexp.cpp:98:21:98:23 | \\cA | regexp.cpp | 98 | 21 | 98 | 23 |
45-
| regexp.cpp:99:21:99:25 | [\\cz] | regexp.cpp | 99 | 21 | 99 | 25 |
46-
| regexp.cpp:102:20:102:21 | \\0 | regexp.cpp | 102 | 20 | 102 | 21 |
47-
| regexp.cpp:103:20:103:23 | [\\0] | regexp.cpp | 103 | 20 | 103 | 23 |
48-
| regexp.cpp:106:21:106:23 | a*? | regexp.cpp | 106 | 21 | 106 | 23 |
49-
| regexp.cpp:107:21:107:23 | b+? | regexp.cpp | 107 | 21 | 107 | 23 |
50-
| regexp.cpp:108:21:108:23 | c?? | regexp.cpp | 108 | 21 | 108 | 23 |
51-
| regexp.cpp:109:21:109:27 | d{2,3}? | regexp.cpp | 109 | 21 | 109 | 27 |
52-
| regexp.cpp:110:18:110:21 | \\f\\v | regexp.cpp | 110 | 18 | 110 | 21 |
53-
| regexp.cpp:113:25:113:28 | a\\nb | regexp.cpp | 113 | 25 | 113 | 28 |
54-
| regexp.cpp:114:37:114:40 | a\\nc | regexp.cpp | 114 | 37 | 114 | 40 |
55-
| regexp.cpp:115:39:115:42 | a\\nc | regexp.cpp | 115 | 39 | 115 | 42 |
56-
| regexp.cpp:116:38:116:41 | a\\nc | regexp.cpp | 116 | 38 | 116 | 41 |
39+
| regexp.cpp:83:27:83:34 | [[.ch.]] | regexp.cpp | 83 | 27 | 83 | 34 |
40+
| regexp.cpp:86:28:86:34 | [[=a=]] | regexp.cpp | 86 | 28 | 86 | 34 |
41+
| regexp.cpp:87:28:87:40 | [A-F[=b=]a-f] | regexp.cpp | 87 | 28 | 87 | 40 |
42+
| regexp.cpp:90:22:90:30 | [:digit:] | regexp.cpp | 90 | 22 | 90 | 30 |
43+
| regexp.cpp:93:19:93:24 | \\u0061 | regexp.cpp | 93 | 19 | 93 | 24 |
44+
| regexp.cpp:96:19:96:22 | \\x61 | regexp.cpp | 96 | 19 | 96 | 22 |
45+
| regexp.cpp:99:21:99:23 | \\cA | regexp.cpp | 99 | 21 | 99 | 23 |
46+
| regexp.cpp:100:21:100:25 | [\\cz] | regexp.cpp | 100 | 21 | 100 | 25 |
47+
| regexp.cpp:103:20:103:21 | \\0 | regexp.cpp | 103 | 20 | 103 | 21 |
48+
| regexp.cpp:104:20:104:23 | [\\0] | regexp.cpp | 104 | 20 | 104 | 23 |
49+
| regexp.cpp:107:21:107:23 | a*? | regexp.cpp | 107 | 21 | 107 | 23 |
50+
| regexp.cpp:108:21:108:23 | b+? | regexp.cpp | 108 | 21 | 108 | 23 |
51+
| regexp.cpp:109:21:109:23 | c?? | regexp.cpp | 109 | 21 | 109 | 23 |
52+
| regexp.cpp:110:21:110:27 | d{2,3}? | regexp.cpp | 110 | 21 | 110 | 27 |
53+
| regexp.cpp:111:18:111:21 | \\f\\v | regexp.cpp | 111 | 18 | 111 | 21 |
54+
| regexp.cpp:114:25:114:28 | a\\nb | regexp.cpp | 114 | 25 | 114 | 28 |
55+
| regexp.cpp:115:37:115:40 | a\\nc | regexp.cpp | 115 | 37 | 115 | 40 |
56+
| regexp.cpp:116:39:116:42 | a\\nc | regexp.cpp | 116 | 39 | 116 | 42 |
5757
| regexp.cpp:117:38:117:41 | a\\nc | regexp.cpp | 117 | 38 | 117 | 41 |
58-
| regexp.cpp:118:23:118:26 | a\\nc | regexp.cpp | 118 | 23 | 118 | 26 |
59-
| regexp.cpp:119:26:119:29 | a\\nc | regexp.cpp | 119 | 26 | 119 | 29 |
60-
| regexp.cpp:120:42:120:45 | a\\nc | regexp.cpp | 120 | 42 | 120 | 45 |
61-
| regexp.cpp:121:41:121:44 | a\\nc | regexp.cpp | 121 | 41 | 121 | 44 |
58+
| regexp.cpp:118:38:118:41 | a\\nc | regexp.cpp | 118 | 38 | 118 | 41 |
59+
| regexp.cpp:119:23:119:26 | a\\nc | regexp.cpp | 119 | 23 | 119 | 26 |
60+
| regexp.cpp:120:26:120:29 | a\\nc | regexp.cpp | 120 | 26 | 120 | 29 |
61+
| regexp.cpp:121:42:121:45 | a\\nc | regexp.cpp | 121 | 42 | 121 | 45 |
6262
| regexp.cpp:122:41:122:44 | a\\nc | regexp.cpp | 122 | 41 | 122 | 44 |
63-
| regexp.cpp:123:25:123:28 | a\\nc | regexp.cpp | 123 | 25 | 123 | 28 |
64-
| regexp.cpp:124:29:124:32 | a\\nc | regexp.cpp | 124 | 29 | 124 | 32 |
63+
| regexp.cpp:123:41:123:44 | a\\nc | regexp.cpp | 123 | 41 | 123 | 44 |
64+
| regexp.cpp:124:25:124:28 | a\\nc | regexp.cpp | 124 | 25 | 124 | 28 |
65+
| regexp.cpp:125:29:125:32 | a\\nc | regexp.cpp | 125 | 29 | 125 | 32 |

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

Lines changed: 49 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -435,103 +435,97 @@ regexp.cpp:
435435

436436
# 82| [RegExpConstant, RegExpNormalChar] f
437437

438-
# 85| [RegExpCharacterClass] [[=a=]]
438+
# 83| [RegExpCharacterClass] [[.ch.]]
439+
#-----| 0 -> [RegExpNamedCharacterProperty] [.ch.]
440+
441+
# 83| [RegExpNamedCharacterProperty] [.ch.]
442+
443+
# 86| [RegExpCharacterClass] [[=a=]]
439444
#-----| 0 -> [RegExpNamedCharacterProperty] [=a=]
440445

441-
# 85| [RegExpNamedCharacterProperty] [=a=]
446+
# 86| [RegExpNamedCharacterProperty] [=a=]
442447

443-
# 86| [RegExpCharacterClass] [A-F[=b=]a-f]
448+
# 87| [RegExpCharacterClass] [A-F[=b=]a-f]
444449
#-----| 0 -> [RegExpCharacterRange] A-F
445450
#-----| 1 -> [RegExpNamedCharacterProperty] [=b=]
446451
#-----| 2 -> [RegExpCharacterRange] a-f
447452

448-
# 86| [RegExpConstant, RegExpNormalChar] A
453+
# 87| [RegExpConstant, RegExpNormalChar] A
449454

450-
# 86| [RegExpCharacterRange] A-F
455+
# 87| [RegExpCharacterRange] A-F
451456
#-----| 0 -> [RegExpConstant, RegExpNormalChar] A
452457
#-----| 1 -> [RegExpConstant, RegExpNormalChar] F
453458

454-
# 86| [RegExpConstant, RegExpNormalChar] F
459+
# 87| [RegExpConstant, RegExpNormalChar] F
455460

456-
# 86| [RegExpNamedCharacterProperty] [=b=]
461+
# 87| [RegExpNamedCharacterProperty] [=b=]
457462

458-
# 86| [RegExpConstant, RegExpNormalChar] a
463+
# 87| [RegExpConstant, RegExpNormalChar] a
459464

460-
# 86| [RegExpCharacterRange] a-f
465+
# 87| [RegExpCharacterRange] a-f
461466
#-----| 0 -> [RegExpConstant, RegExpNormalChar] a
462467
#-----| 1 -> [RegExpConstant, RegExpNormalChar] f
463468

464-
# 86| [RegExpConstant, RegExpNormalChar] f
469+
# 87| [RegExpConstant, RegExpNormalChar] f
465470

466-
# 89| [RegExpNamedCharacterProperty] [:digit:]
471+
# 90| [RegExpNamedCharacterProperty] [:digit:]
467472

468-
# 92| [RegExpConstant, RegExpEscape] \u0061
473+
# 93| [RegExpConstant, RegExpEscape] \u0061
469474

470-
# 95| [RegExpConstant, RegExpEscape] \x61
475+
# 96| [RegExpConstant, RegExpEscape] \x61
471476

472-
# 98| [RegExpConstant, RegExpEscape] \cA
477+
# 99| [RegExpConstant, RegExpEscape] \cA
473478

474-
# 99| [RegExpCharacterClass] [\cz]
479+
# 100| [RegExpCharacterClass] [\cz]
475480
#-----| 0 -> [RegExpConstant, RegExpEscape] \cz
476481

477-
# 99| [RegExpConstant, RegExpEscape] \cz
482+
# 100| [RegExpConstant, RegExpEscape] \cz
478483

479-
# 102| [RegExpConstant, RegExpEscape] \0
484+
# 103| [RegExpConstant, RegExpEscape] \0
480485

481-
# 103| [RegExpCharacterClass] [\0]
486+
# 104| [RegExpCharacterClass] [\0]
482487
#-----| 0 -> [RegExpConstant, RegExpEscape] \0
483488

484-
# 103| [RegExpConstant, RegExpEscape] \0
489+
# 104| [RegExpConstant, RegExpEscape] \0
485490

486-
# 106| [RegExpConstant, RegExpNormalChar] a
491+
# 107| [RegExpConstant, RegExpNormalChar] a
487492

488-
# 106| [RegExpStar] a*?
493+
# 107| [RegExpStar] a*?
489494
#-----| 0 -> [RegExpConstant, RegExpNormalChar] a
490495

491-
# 107| [RegExpConstant, RegExpNormalChar] b
496+
# 108| [RegExpConstant, RegExpNormalChar] b
492497

493-
# 107| [RegExpPlus] b+?
498+
# 108| [RegExpPlus] b+?
494499
#-----| 0 -> [RegExpConstant, RegExpNormalChar] b
495500

496-
# 108| [RegExpConstant, RegExpNormalChar] c
501+
# 109| [RegExpConstant, RegExpNormalChar] c
497502

498-
# 108| [RegExpOpt] c??
503+
# 109| [RegExpOpt] c??
499504
#-----| 0 -> [RegExpConstant, RegExpNormalChar] c
500505

501-
# 109| [RegExpConstant, RegExpNormalChar] d
506+
# 110| [RegExpConstant, RegExpNormalChar] d
502507

503-
# 109| [RegExpQuantifier] d{2,3}?
508+
# 110| [RegExpQuantifier] d{2,3}?
504509
#-----| 0 -> [RegExpConstant, RegExpNormalChar] d
505510

506-
# 110| [RegExpConstant, RegExpEscape] \f
511+
# 111| [RegExpConstant, RegExpEscape] \f
507512

508-
# 110| [RegExpSequence] \f\v
513+
# 111| [RegExpSequence] \f\v
509514
#-----| 0 -> [RegExpConstant, RegExpEscape] \f
510515
#-----| 1 -> [RegExpConstant, RegExpEscape] \v
511516

512-
# 110| [RegExpConstant, RegExpEscape] \v
513-
514-
# 113| [RegExpConstant, RegExpNormalChar] a
515-
516-
# 113| [RegExpSequence] a\nb
517-
#-----| 0 -> [RegExpConstant, RegExpNormalChar] a
518-
#-----| 1 -> [RegExpConstant, RegExpEscape] \n
519-
#-----| 2 -> [RegExpConstant, RegExpNormalChar] b
520-
521-
# 113| [RegExpConstant, RegExpEscape] \n
522-
523-
# 113| [RegExpConstant, RegExpNormalChar] b
517+
# 111| [RegExpConstant, RegExpEscape] \v
524518

525519
# 114| [RegExpConstant, RegExpNormalChar] a
526520

527-
# 114| [RegExpSequence] a\nc
521+
# 114| [RegExpSequence] a\nb
528522
#-----| 0 -> [RegExpConstant, RegExpNormalChar] a
529523
#-----| 1 -> [RegExpConstant, RegExpEscape] \n
530-
#-----| 2 -> [RegExpConstant, RegExpNormalChar] c
524+
#-----| 2 -> [RegExpConstant, RegExpNormalChar] b
531525

532526
# 114| [RegExpConstant, RegExpEscape] \n
533527

534-
# 114| [RegExpConstant, RegExpNormalChar] c
528+
# 114| [RegExpConstant, RegExpNormalChar] b
535529

536530
# 115| [RegExpConstant, RegExpNormalChar] a
537531

@@ -642,3 +636,14 @@ regexp.cpp:
642636
# 124| [RegExpConstant, RegExpEscape] \n
643637

644638
# 124| [RegExpConstant, RegExpNormalChar] c
639+
640+
# 125| [RegExpConstant, RegExpNormalChar] a
641+
642+
# 125| [RegExpSequence] a\nc
643+
#-----| 0 -> [RegExpConstant, RegExpNormalChar] a
644+
#-----| 1 -> [RegExpConstant, RegExpEscape] \n
645+
#-----| 2 -> [RegExpConstant, RegExpNormalChar] c
646+
647+
# 125| [RegExpConstant, RegExpEscape] \n
648+
649+
# 125| [RegExpConstant, RegExpNormalChar] c
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
| regexp.cpp:118:20:118:28 | a\\nc |
2-
| regexp.cpp:119:22:119:31 | a\\nc |
3-
| regexp.cpp:120:37:120:47 | a\\nc |
4-
| regexp.cpp:121:37:121:46 | a\\nc |
1+
| regexp.cpp:119:20:119:28 | a\\nc |
2+
| regexp.cpp:120:22:120:31 | a\\nc |
3+
| regexp.cpp:121:37:121:47 | a\\nc |
54
| regexp.cpp:122:37:122:46 | a\\nc |
6-
| regexp.cpp:123:21:123:31 | a\\nc |
7-
| regexp.cpp:124:23:124:37 | a\\nc |
5+
| regexp.cpp:123:37:123:46 | a\\nc |
6+
| regexp.cpp:124:21:124:31 | a\\nc |
7+
| regexp.cpp:125:23:125:37 | a\\nc |

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ std::regex r_posix3("[A-F[:digit:]a-f]");
8080
// POSIX collating symbols
8181
std::regex r_posix_coll1("[[.a.]]");
8282
std::regex r_posix_coll2("[A-F[.b.]a-f]");
83+
std::regex r_posix_coll3("[[.ch.]]");
8384

8485
// POSIX equivalence classes
8586
std::regex r_posix_equiv1("[[=a=]]");

0 commit comments

Comments
 (0)