nd/icase updates
Get series with b4
b4 am [email protected]Versions newest first · linked by author and title
- v2 Latest12 patches 10 repliesIn review
- v111 patches 4 repliesSuperseded
Patches in v2 No applies recorded yet
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/12 | grep: break down an "if" stmt in preparation for next changesgrep.c | +3 | 0 replies | |
| 2/12 | test-regex: isolate the bug test codet/ test-regex.c | +11 | 0 replies | |
| 3/12 | test-regex: expose full regcomp() to the command linetest-regex.c | +49 | 0 replies | |
| 4/12 | grep/icase: avoid kwsset on literal non-ascii stringsgrep.c t/ | +29 | 0 replies | |
| 5/12 | grep/icase: avoid kwsset when -F is specifiedgrep.c quote.c quote.h +1 more | +87 | 0 replies | |
| 6/12 | grep: rewrite an if/else condition to avoid duplicate expressiongrep.c | +1 | 0 replies | |
| 7/12 | grep/pcre: prepare locale-dependent tables for icase matchinggrep.c grep.h t/ | +26 | 0 replies | |
| 8/12 | gettext: add is_utf8_locale()gettext.c gettext.h | +23 | 0 replies | |
| 9/12 | grep/pcre: support utf-8grep.c t/ | +17 | 0 replies | |
| 10/12 | diffcore-pickaxe: Add regcomp_or_die()diffcore-pickaxe.c | +13 | 0 replies | |
| 11/12 | diffcore-pickaxe: support case insensitive match on non-asciidiffcore-pickaxe.c t/ | +18 | 0 replies | |
| 12/12 | grep.c: reuse "icase" variablegrep.c | +1 | 0 replies |
Reviews trailers per patch
None of the 12 patches has a Reviewed-by or Acked-by.
| Patch | Plamen Totev | René Scharfe | Eric Sunshine | Junio C Hamano | Jeff King | Ævar Arnfjörð Bjarmason | Ramsay Jones |
|---|---|---|---|---|---|---|---|
| 1/12 | |||||||
| 2/12 | Helped-by | Helped-by | |||||
| 3/12 | |||||||
| 4/12 | Noticed-by | Helped-by | Helped-by | ||||
| 5/12 | Noticed-by | Helped-by | Helped-by | ||||
| 6/12 | Helped-by | ||||||
| 7/12 | |||||||
| 8/12 | Helped-by | ||||||
| 9/12 | Noticed-by Helped-by | ||||||
| 10/12 | Helped-by | ||||||
| 11/12 | Noticed-by | ||||||
| 12/12 |
Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 7 reviewers.
Cover letter [PATCH v2 00/12] nd/icase updates
v2 fixes Junio's and Jeff's comments (both good). The sharing "!icase || ascii_only" is made a separate commit (6/12) because I think it takes some seconds to realize that the conversion is correct and it's technically not needed in 5/12 (and it's sort of the opposite of 1/12)
Interdiff
diffcore-pickaxe.c +14 -10
@@ -200,19 +200,30 @@ static void pickaxe(struct diff_queue_struct *q, struct diff_options *o, *q = outq; } +static void regcomp_or_die (regex_t *regex,const char *needle,int cflags) +{ +int err =regcomp (regex, needle, cflags); +if (err) { +/* The POSIX.2 people are surely sick */ +char errbuf[1024 ]; +regerror (err, regex, errbuf,1024 ); +regfree (regex); +die ("invalid regex: %s" , errbuf); + } +} +void diffcore_pickaxe (struct diff_options *o) {const char *needle = o->pickaxe;int opts = o->pickaxe_opts;regex_t regex, *regexp =NULL ;kwset_t kws =NULL ; -int err =0 ;if (opts & (DIFF_PICKAXE_REGEX |DIFF_PICKAXE_KIND_G )) {int cflags =REG_EXTENDED |REG_NEWLINE ;if (DIFF_OPT_TST (o,PICKAXE_IGNORE_CASE )) cflags |=REG_ICASE ; - err =regcomp (®ex, needle, cflags); +regcomp_or_die (®ex, needle, cflags); regexp = ®ex; }else if (DIFF_OPT_TST (o,PICKAXE_IGNORE_CASE ) &&has_non_ascii (needle)) {
@@ -220,7 +231,7 @@ void diffcore_pickaxe(struct diff_options *o)int cflags =REG_NEWLINE |REG_ICASE ;basic_regex_quote_buf (&sb, needle); - err =regcomp (®ex, sb.buf, cflags); +regcomp_or_die (®ex, sb.buf, cflags);strbuf_release (&sb); regexp = ®ex; }else {
@@ -229,13 +240,6 @@ void diffcore_pickaxe(struct diff_options *o)kwsincr (kws, needle,strlen (needle));kwsprep (kws); } -if (err) { -/* The POSIX.2 people are surely sick */ -char errbuf[1024 ]; -regerror (err, ®ex, errbuf,1024 ); -regfree (®ex); -die ("invalid regex: %s" , errbuf); - }/* Might want to warn when both S and G are on; I don't care... */ pickaxe(&diff_queued_diff, o, regexp, kws,
grep.c +4 -8
@@ -432,15 +432,8 @@ static void compile_regexp(struct grep_pat *p, struct grep_opt *opt) icase = opt->regflags ®_ICASE || p->ignore_case; ascii_only = !has_non_ascii (p->pattern); -if (opt->fixed) { +if (opt->fixed ||is_fixed (p->pattern, p->patternlen)) p->fixed = !icase || ascii_only; -if (!p->fixed) { -compile_fixed_regexp (p, opt); -return ; - } - }else if ((!icase || ascii_only) && -is_fixed (p->pattern, p->patternlen)) - p->fixed =1 ;else p->fixed =0 ;
@@ -449,6 +442,9 @@ static void compile_regexp(struct grep_pat *p, struct grep_opt *opt)kwsincr (p->kws, p->pattern, p->patternlen);kwsprep (p->kws);return ; + }else if (opt->fixed) { +compile_fixed_regexp (p, opt); +return ; }if (opt->pcre) {
Nguyễn Thái Ngọc Duy (12):
grep: break down an "if" stmt in preparation for next changes
test-regex: isolate the bug test code
test-regex: expose full regcomp() to the command line grep/icase: avoid kwsset on literal non-ascii strings grep/icase: avoid kwsset when -F is specified
grep: rewrite an if/else condition to avoid duplicate expression grep/pcre: prepare locale-dependent tables for icase matching
gettext: add is_utf8_locale()
grep/pcre: support utf-8
diffcore-pickaxe: Add regcomp_or_die()
diffcore-pickaxe: support case insensitive match on non-ascii grep.c: reuse "icase" variable
diffcore-pickaxe.c | 33 +++++++++++---- gettext.c | 24 ++++++++++- gettext.h | 1 + grep.c | 43 +++++++++++++++---- grep.h | 1 + quote.c | 37 +++++++++++++++++ quote.h | 1 + t/t0070-fundamental.sh | 2 +- t/t7812-grep-icase-non-ascii.sh (new +x) | 71 ++++++++++++++++++++++++++++++++ t/t7813-grep-icase-iso.sh (new +x) | 19 +++++++++ test-regex.c | 59 +++++++++++++++++++++++++- 11 files changed, 270 insertions(+), 21 deletions(-) create mode 100755 t/t7812-grep-icase-non-ascii.sh create mode 100755 t/t7813-grep-icase-iso.sh
Signature · 1 line
2.8.2.526.g02eed6d