Skip to content

Commit 957d1fc

Browse files
committed
C++: Add [^[:digit:]] test
1 parent bd1fc19 commit 957d1fc

5 files changed

Lines changed: 264 additions & 255 deletions

File tree

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

Lines changed: 30 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -30,34 +30,35 @@
3030
| regexp.cpp:66:21:66:32 | [[:digit:]]+ | regexp.cpp | 66 | 21 | 66 | 32 |
3131
| regexp.cpp:67:21:67:36 | [[:alnum:]]{2,3} | regexp.cpp | 67 | 21 | 67 | 36 |
3232
| regexp.cpp:68:21:68:35 | [a-f[:digit:]]+ | regexp.cpp | 68 | 21 | 68 | 35 |
33-
| regexp.cpp:71:22:71:43 | [[:alpha:]][[:digit:]] | regexp.cpp | 71 | 22 | 71 | 43 |
34-
| regexp.cpp:74:22:74:41 | [[:alpha:][:digit:]] | regexp.cpp | 74 | 22 | 74 | 41 |
35-
| regexp.cpp:77:22:77:38 | [A-F[:digit:]a-f] | regexp.cpp | 77 | 22 | 77 | 38 |
36-
| regexp.cpp:80:27:80:33 | [[.a.]] | regexp.cpp | 80 | 27 | 80 | 33 |
37-
| regexp.cpp:81:27:81:39 | [A-F[.b.]a-f] | regexp.cpp | 81 | 27 | 81 | 39 |
38-
| regexp.cpp:84:28:84:34 | [[=a=]] | regexp.cpp | 84 | 28 | 84 | 34 |
39-
| regexp.cpp:85:28:85:40 | [A-F[=b=]a-f] | regexp.cpp | 85 | 28 | 85 | 40 |
40-
| regexp.cpp:88:22:88:30 | [:digit:] | regexp.cpp | 88 | 22 | 88 | 30 |
41-
| regexp.cpp:91:19:91:24 | \\u0061 | regexp.cpp | 91 | 19 | 91 | 24 |
42-
| regexp.cpp:94:19:94:22 | \\x61 | regexp.cpp | 94 | 19 | 94 | 22 |
43-
| regexp.cpp:97:21:97:23 | \\cA | regexp.cpp | 97 | 21 | 97 | 23 |
44-
| regexp.cpp:98:21:98:25 | [\\cz] | regexp.cpp | 98 | 21 | 98 | 25 |
45-
| regexp.cpp:101:20:101:21 | \\0 | regexp.cpp | 101 | 20 | 101 | 21 |
46-
| regexp.cpp:102:20:102:23 | [\\0] | regexp.cpp | 102 | 20 | 102 | 23 |
47-
| regexp.cpp:105:21:105:23 | a*? | regexp.cpp | 105 | 21 | 105 | 23 |
48-
| regexp.cpp:106:21:106:23 | b+? | regexp.cpp | 106 | 21 | 106 | 23 |
49-
| regexp.cpp:107:21:107:23 | c?? | regexp.cpp | 107 | 21 | 107 | 23 |
50-
| regexp.cpp:108:21:108:27 | d{2,3}? | regexp.cpp | 108 | 21 | 108 | 27 |
51-
| regexp.cpp:109:18:109:21 | \\f\\v | regexp.cpp | 109 | 18 | 109 | 21 |
52-
| regexp.cpp:112:25:112:28 | a\\nb | regexp.cpp | 112 | 25 | 112 | 28 |
53-
| regexp.cpp:113:37:113:40 | a\\nc | regexp.cpp | 113 | 37 | 113 | 40 |
54-
| regexp.cpp:114:39:114:42 | a\\nc | regexp.cpp | 114 | 39 | 114 | 42 |
55-
| regexp.cpp:115:38:115:41 | a\\nc | regexp.cpp | 115 | 38 | 115 | 41 |
33+
| regexp.cpp:69:21:69:32 | [^[:digit:]] | regexp.cpp | 69 | 21 | 69 | 32 |
34+
| regexp.cpp:72:22:72:43 | [[:alpha:]][[:digit:]] | regexp.cpp | 72 | 22 | 72 | 43 |
35+
| regexp.cpp:75:22:75:41 | [[:alpha:][:digit:]] | regexp.cpp | 75 | 22 | 75 | 41 |
36+
| regexp.cpp:78:22:78:38 | [A-F[:digit:]a-f] | regexp.cpp | 78 | 22 | 78 | 38 |
37+
| regexp.cpp:81:27:81:33 | [[.a.]] | regexp.cpp | 81 | 27 | 81 | 33 |
38+
| 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 |
5656
| regexp.cpp:116:38:116:41 | a\\nc | regexp.cpp | 116 | 38 | 116 | 41 |
57-
| regexp.cpp:117:23:117:26 | a\\nc | regexp.cpp | 117 | 23 | 117 | 26 |
58-
| regexp.cpp:118:26:118:29 | a\\nc | regexp.cpp | 118 | 26 | 118 | 29 |
59-
| regexp.cpp:119:42:119:45 | a\\nc | regexp.cpp | 119 | 42 | 119 | 45 |
60-
| regexp.cpp:120:41:120:44 | a\\nc | regexp.cpp | 120 | 41 | 120 | 44 |
57+
| 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 |
6161
| regexp.cpp:121:41:121:44 | a\\nc | regexp.cpp | 121 | 41 | 121 | 44 |
62-
| regexp.cpp:122:25:122:28 | a\\nc | regexp.cpp | 122 | 25 | 122 | 28 |
63-
| regexp.cpp:123:29:123:32 | a\\nc | regexp.cpp | 123 | 29 | 123 | 32 |
62+
| 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 |

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

Lines changed: 75 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -357,176 +357,170 @@ regexp.cpp:
357357

358358
# 68| [RegExpNamedCharacterProperty] [:digit:]
359359

360-
# 71| [RegExpCharacterClass] [[:alpha:]]
360+
# 69| [RegExpCharacterClass] [^[:digit:]]
361+
#-----| 0 -> [RegExpNamedCharacterProperty] [:digit:]
362+
363+
# 69| [RegExpNamedCharacterProperty] [:digit:]
364+
365+
# 72| [RegExpCharacterClass] [[:alpha:]]
361366
#-----| 0 -> [RegExpNamedCharacterProperty] [:alpha:]
362367

363-
# 71| [RegExpSequence] [[:alpha:]][[:digit:]]
368+
# 72| [RegExpSequence] [[:alpha:]][[:digit:]]
364369
#-----| 0 -> [RegExpCharacterClass] [[:alpha:]]
365370
#-----| 1 -> [RegExpCharacterClass] [[:digit:]]
366371

367-
# 71| [RegExpNamedCharacterProperty] [:alpha:]
372+
# 72| [RegExpNamedCharacterProperty] [:alpha:]
368373

369-
# 71| [RegExpCharacterClass] [[:digit:]]
374+
# 72| [RegExpCharacterClass] [[:digit:]]
370375
#-----| 0 -> [RegExpNamedCharacterProperty] [:digit:]
371376

372-
# 71| [RegExpNamedCharacterProperty] [:digit:]
377+
# 72| [RegExpNamedCharacterProperty] [:digit:]
373378

374-
# 74| [RegExpCharacterClass] [[:alpha:][:digit:]]
379+
# 75| [RegExpCharacterClass] [[:alpha:][:digit:]]
375380
#-----| 0 -> [RegExpNamedCharacterProperty] [:alpha:]
376381
#-----| 1 -> [RegExpNamedCharacterProperty] [:digit:]
377382

378-
# 74| [RegExpNamedCharacterProperty] [:alpha:]
383+
# 75| [RegExpNamedCharacterProperty] [:alpha:]
379384

380-
# 74| [RegExpNamedCharacterProperty] [:digit:]
385+
# 75| [RegExpNamedCharacterProperty] [:digit:]
381386

382-
# 77| [RegExpCharacterClass] [A-F[:digit:]a-f]
387+
# 78| [RegExpCharacterClass] [A-F[:digit:]a-f]
383388
#-----| 0 -> [RegExpCharacterRange] A-F
384389
#-----| 1 -> [RegExpNamedCharacterProperty] [:digit:]
385390
#-----| 2 -> [RegExpCharacterRange] a-f
386391

387-
# 77| [RegExpConstant, RegExpNormalChar] A
392+
# 78| [RegExpConstant, RegExpNormalChar] A
388393

389-
# 77| [RegExpCharacterRange] A-F
394+
# 78| [RegExpCharacterRange] A-F
390395
#-----| 0 -> [RegExpConstant, RegExpNormalChar] A
391396
#-----| 1 -> [RegExpConstant, RegExpNormalChar] F
392397

393-
# 77| [RegExpConstant, RegExpNormalChar] F
398+
# 78| [RegExpConstant, RegExpNormalChar] F
394399

395-
# 77| [RegExpNamedCharacterProperty] [:digit:]
400+
# 78| [RegExpNamedCharacterProperty] [:digit:]
396401

397-
# 77| [RegExpConstant, RegExpNormalChar] a
402+
# 78| [RegExpConstant, RegExpNormalChar] a
398403

399-
# 77| [RegExpCharacterRange] a-f
404+
# 78| [RegExpCharacterRange] a-f
400405
#-----| 0 -> [RegExpConstant, RegExpNormalChar] a
401406
#-----| 1 -> [RegExpConstant, RegExpNormalChar] f
402407

403-
# 77| [RegExpConstant, RegExpNormalChar] f
408+
# 78| [RegExpConstant, RegExpNormalChar] f
404409

405-
# 80| [RegExpCharacterClass] [[.a.]]
410+
# 81| [RegExpCharacterClass] [[.a.]]
406411
#-----| 0 -> [RegExpNamedCharacterProperty] [.a.]
407412

408-
# 80| [RegExpNamedCharacterProperty] [.a.]
413+
# 81| [RegExpNamedCharacterProperty] [.a.]
409414

410-
# 81| [RegExpCharacterClass] [A-F[.b.]a-f]
415+
# 82| [RegExpCharacterClass] [A-F[.b.]a-f]
411416
#-----| 0 -> [RegExpCharacterRange] A-F
412417
#-----| 1 -> [RegExpNamedCharacterProperty] [.b.]
413418
#-----| 2 -> [RegExpCharacterRange] a-f
414419

415-
# 81| [RegExpConstant, RegExpNormalChar] A
420+
# 82| [RegExpConstant, RegExpNormalChar] A
416421

417-
# 81| [RegExpCharacterRange] A-F
422+
# 82| [RegExpCharacterRange] A-F
418423
#-----| 0 -> [RegExpConstant, RegExpNormalChar] A
419424
#-----| 1 -> [RegExpConstant, RegExpNormalChar] F
420425

421-
# 81| [RegExpConstant, RegExpNormalChar] F
426+
# 82| [RegExpConstant, RegExpNormalChar] F
422427

423-
# 81| [RegExpNamedCharacterProperty] [.b.]
428+
# 82| [RegExpNamedCharacterProperty] [.b.]
424429

425-
# 81| [RegExpConstant, RegExpNormalChar] a
430+
# 82| [RegExpConstant, RegExpNormalChar] a
426431

427-
# 81| [RegExpCharacterRange] a-f
432+
# 82| [RegExpCharacterRange] a-f
428433
#-----| 0 -> [RegExpConstant, RegExpNormalChar] a
429434
#-----| 1 -> [RegExpConstant, RegExpNormalChar] f
430435

431-
# 81| [RegExpConstant, RegExpNormalChar] f
436+
# 82| [RegExpConstant, RegExpNormalChar] f
432437

433-
# 84| [RegExpCharacterClass] [[=a=]]
438+
# 85| [RegExpCharacterClass] [[=a=]]
434439
#-----| 0 -> [RegExpNamedCharacterProperty] [=a=]
435440

436-
# 84| [RegExpNamedCharacterProperty] [=a=]
441+
# 85| [RegExpNamedCharacterProperty] [=a=]
437442

438-
# 85| [RegExpCharacterClass] [A-F[=b=]a-f]
443+
# 86| [RegExpCharacterClass] [A-F[=b=]a-f]
439444
#-----| 0 -> [RegExpCharacterRange] A-F
440445
#-----| 1 -> [RegExpNamedCharacterProperty] [=b=]
441446
#-----| 2 -> [RegExpCharacterRange] a-f
442447

443-
# 85| [RegExpConstant, RegExpNormalChar] A
448+
# 86| [RegExpConstant, RegExpNormalChar] A
444449

445-
# 85| [RegExpCharacterRange] A-F
450+
# 86| [RegExpCharacterRange] A-F
446451
#-----| 0 -> [RegExpConstant, RegExpNormalChar] A
447452
#-----| 1 -> [RegExpConstant, RegExpNormalChar] F
448453

449-
# 85| [RegExpConstant, RegExpNormalChar] F
454+
# 86| [RegExpConstant, RegExpNormalChar] F
450455

451-
# 85| [RegExpNamedCharacterProperty] [=b=]
456+
# 86| [RegExpNamedCharacterProperty] [=b=]
452457

453-
# 85| [RegExpConstant, RegExpNormalChar] a
458+
# 86| [RegExpConstant, RegExpNormalChar] a
454459

455-
# 85| [RegExpCharacterRange] a-f
460+
# 86| [RegExpCharacterRange] a-f
456461
#-----| 0 -> [RegExpConstant, RegExpNormalChar] a
457462
#-----| 1 -> [RegExpConstant, RegExpNormalChar] f
458463

459-
# 85| [RegExpConstant, RegExpNormalChar] f
464+
# 86| [RegExpConstant, RegExpNormalChar] f
460465

461-
# 88| [RegExpNamedCharacterProperty] [:digit:]
466+
# 89| [RegExpNamedCharacterProperty] [:digit:]
462467

463-
# 91| [RegExpConstant, RegExpEscape] \u0061
468+
# 92| [RegExpConstant, RegExpEscape] \u0061
464469

465-
# 94| [RegExpConstant, RegExpEscape] \x61
470+
# 95| [RegExpConstant, RegExpEscape] \x61
466471

467-
# 97| [RegExpConstant, RegExpEscape] \cA
472+
# 98| [RegExpConstant, RegExpEscape] \cA
468473

469-
# 98| [RegExpCharacterClass] [\cz]
474+
# 99| [RegExpCharacterClass] [\cz]
470475
#-----| 0 -> [RegExpConstant, RegExpEscape] \cz
471476

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

474-
# 101| [RegExpConstant, RegExpEscape] \0
479+
# 102| [RegExpConstant, RegExpEscape] \0
475480

476-
# 102| [RegExpCharacterClass] [\0]
481+
# 103| [RegExpCharacterClass] [\0]
477482
#-----| 0 -> [RegExpConstant, RegExpEscape] \0
478483

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

481-
# 105| [RegExpConstant, RegExpNormalChar] a
486+
# 106| [RegExpConstant, RegExpNormalChar] a
482487

483-
# 105| [RegExpStar] a*?
488+
# 106| [RegExpStar] a*?
484489
#-----| 0 -> [RegExpConstant, RegExpNormalChar] a
485490

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

488-
# 106| [RegExpPlus] b+?
493+
# 107| [RegExpPlus] b+?
489494
#-----| 0 -> [RegExpConstant, RegExpNormalChar] b
490495

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

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

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

498-
# 108| [RegExpQuantifier] d{2,3}?
503+
# 109| [RegExpQuantifier] d{2,3}?
499504
#-----| 0 -> [RegExpConstant, RegExpNormalChar] d
500505

501-
# 109| [RegExpConstant, RegExpEscape] \f
506+
# 110| [RegExpConstant, RegExpEscape] \f
502507

503-
# 109| [RegExpSequence] \f\v
508+
# 110| [RegExpSequence] \f\v
504509
#-----| 0 -> [RegExpConstant, RegExpEscape] \f
505510
#-----| 1 -> [RegExpConstant, RegExpEscape] \v
506511

507-
# 109| [RegExpConstant, RegExpEscape] \v
508-
509-
# 112| [RegExpConstant, RegExpNormalChar] a
510-
511-
# 112| [RegExpSequence] a\nb
512-
#-----| 0 -> [RegExpConstant, RegExpNormalChar] a
513-
#-----| 1 -> [RegExpConstant, RegExpEscape] \n
514-
#-----| 2 -> [RegExpConstant, RegExpNormalChar] b
515-
516-
# 112| [RegExpConstant, RegExpEscape] \n
517-
518-
# 112| [RegExpConstant, RegExpNormalChar] b
512+
# 110| [RegExpConstant, RegExpEscape] \v
519513

520514
# 113| [RegExpConstant, RegExpNormalChar] a
521515

522-
# 113| [RegExpSequence] a\nc
516+
# 113| [RegExpSequence] a\nb
523517
#-----| 0 -> [RegExpConstant, RegExpNormalChar] a
524518
#-----| 1 -> [RegExpConstant, RegExpEscape] \n
525-
#-----| 2 -> [RegExpConstant, RegExpNormalChar] c
519+
#-----| 2 -> [RegExpConstant, RegExpNormalChar] b
526520

527521
# 113| [RegExpConstant, RegExpEscape] \n
528522

529-
# 113| [RegExpConstant, RegExpNormalChar] c
523+
# 113| [RegExpConstant, RegExpNormalChar] b
530524

531525
# 114| [RegExpConstant, RegExpNormalChar] a
532526

@@ -637,3 +631,14 @@ regexp.cpp:
637631
# 123| [RegExpConstant, RegExpEscape] \n
638632

639633
# 123| [RegExpConstant, RegExpNormalChar] c
634+
635+
# 124| [RegExpConstant, RegExpNormalChar] a
636+
637+
# 124| [RegExpSequence] a\nc
638+
#-----| 0 -> [RegExpConstant, RegExpNormalChar] a
639+
#-----| 1 -> [RegExpConstant, RegExpEscape] \n
640+
#-----| 2 -> [RegExpConstant, RegExpNormalChar] c
641+
642+
# 124| [RegExpConstant, RegExpEscape] \n
643+
644+
# 124| [RegExpConstant, RegExpNormalChar] c
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
| regexp.cpp:117:20:117:28 | a\\nc |
2-
| regexp.cpp:118:22:118:31 | a\\nc |
3-
| regexp.cpp:119:37:119:47 | a\\nc |
4-
| regexp.cpp:120:37:120:46 | a\\nc |
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 |
54
| regexp.cpp:121:37:121:46 | a\\nc |
6-
| regexp.cpp:122:21:122:31 | a\\nc |
7-
| regexp.cpp:123:23:123:37 | a\\nc |
5+
| 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 |

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ std::regex r_prop1("[[:alnum:]]*");
6666
std::regex r_prop2("[[:digit:]]+");
6767
std::regex r_prop3("[[:alnum:]]{2,3}");
6868
std::regex r_prop4("[a-f[:digit:]]+"); // Also valid inside character classes
69+
std::regex r_prop5("[^[:digit:]]");
6970

7071
// Two separate character classes, each containing a single POSIX bracket expression
7172
std::regex r_posix1("[[:alpha:]][[:digit:]]");

0 commit comments

Comments
 (0)