diff options
| author | Jim Meyering <meyering@fb.com> | 2023-03-18 23:25:03 -0700 |
|---|---|---|
| committer | Jim Meyering <meyering@meta.com> | 2023-03-19 13:36:23 -0700 |
| commit | 98ee05b4ddfee5c1db2248bdb060a2cd64bf75fa (patch) | |
| tree | 3f698eb54e1cd35347d16ad14270261e3c0a95d3 /src | |
| parent | 99330c2b1dc8b619dff8a5a6a35f524d382508c8 (diff) | |
| download | grep-98ee05b4ddfee5c1db2248bdb060a2cd64bf75fa.tar.gz | |
grep: -P (--perl-regexp) \D once again works like [^0-9]
* NEWS: Mention \D, too.
* doc/grep.texi: Likewise
* src/pcresearch.c (pcre_pattern_expand_backslash_d): Handle \D.
Also, ifdef-out this new function and its call site when not needed.
* tests/pcre-ascii-digits: Test \D, too.
Tighten one test by using returns_ 1.
Add comments and tests that work only with 10.43 and newer.
Paul Eggert raised the issue of \D in https://bugs.gnu.org/62267#8
Diffstat (limited to 'src')
| -rw-r--r-- | src/pcresearch.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/pcresearch.c b/src/pcresearch.c index d3701816..34b2aeb9 100644 --- a/src/pcresearch.c +++ b/src/pcresearch.c @@ -133,10 +133,13 @@ bad_utf8_from_pcre2 (int e) #endif } +#if ! PCRE2_EXTRA_ASCII_BSD /* Replace each \d in *KEYS_P with [0-9], to ensure that \d matches only ASCII digits. Now that we enable PCRE2_UCP for pcre regexps, \d would otherwise match non-ASCII digits in some locales. Use \p{Nd} if you require to match - those. */ + those. Similarly, replace each \D with [^0-9]. + FIXME: remove in 2025, or whenever we no longer accommodate pcre2-10.42 + and prior. */ static void pcre_pattern_expand_backslash_d (char **keys_p, idx_t *len_p) { @@ -182,6 +185,9 @@ pcre_pattern_expand_backslash_d (char **keys_p, idx_t *len_p) case 'd': p = mempcpy (p, "[0-9]", 5); break; + case 'D': + p = mempcpy (p, "[^0-9]", 6); + break; default: *p++ = '\\'; *p++ = *keys; @@ -206,6 +212,7 @@ pcre_pattern_expand_backslash_d (char **keys_p, idx_t *len_p) *keys_p = new_keys; *len_p = p - new_keys; } +#endif /* Compile the -P style PATTERN, containing SIZE bytes that are followed by '\n'. Return a description of the compiled pattern. */ @@ -213,8 +220,9 @@ pcre_pattern_expand_backslash_d (char **keys_p, idx_t *len_p) void * Pcompile (char *pattern, idx_t size, reg_syntax_t ignored, bool exact) { - if (! PCRE2_EXTRA_ASCII_BSD) - pcre_pattern_expand_backslash_d (&pattern, &size); +#if ! PCRE2_EXTRA_ASCII_BSD + pcre_pattern_expand_backslash_d (&pattern, &size); +#endif PCRE2_SIZE e; int ec; |