@matheusbsbs / matheus-bagliano / commits / 0d527842b7

grep: improve errors for unmatched ( and )

Imagine you want to grep for (. Easy: $ git grep '(' fatal: unmatched parenthesis uhoh. This is plainly wrong. Unless you know specifically that (a) git grep has expression groups and '(' ... ')' are used for them. (b) you can use -e '(' to explicitly say '(' is what you are looking for, not the beginning of a group. Similarly, $ git grep ')' fatal: incomplete pattern expression: ) is somehow worse. ")" is a complete regular expression pattern. Of course, the error wants to say "group" here. In this case it is also not "incomplete", it is unmatched. Make them say $ ./git grep '(' fatal: unmatched ( for expression group $ ./git grep ')' fatal: incomplete pattern expression group: ) which are clearer in indicating that it is not the expression that is wrong (since no pattern had been parsed at all), but rather that it is been misconstrued as a grouping operator. Link: https://bugs.debian.org/1051205 Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Ahelenia Ziemiańska committed Mar 23, 2024 at 14:18 UTC 0d527842b7633091158450d4dcda3ceb3547a636

1 file changed +2 -2

grep.c

+2 -2

@@ -621,7 +621,7 @@ static struct grep_expr *compile_pattern_atom(struct grep_pat **list)

621 *list = p->next;

622 x = compile_pattern_or(list);

623 if (!*list || (*list)->token != GREP_CLOSE_PAREN)

624 - die("unmatched parenthesis");

624 + die("unmatched ( for expression group");

625 *list = (*list)->next;

626 return x;

627 default:

@@ -792,7 +792,7 @@ void compile_grep_patterns(struct grep_opt *opt)

792 if (p)

793 opt->pattern_expression = compile_pattern_expr(&p);

794 if (p)

795 - die("incomplete pattern expression: %s", p->pattern);

795 + die("incomplete pattern expression group: %s", p->pattern);

796

797 if (opt->no_body_match && opt->pattern_expression)

798 opt->pattern_expression = grep_not_expr(opt->pattern_expression);