kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

grep: use grep_or_expr() in compile_pattern_or() 

Move the definition of grep_or_expr() up and use this function in
compile_pattern_or() to reduce code duplication.

Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
René Scharfe 2022-01-06 10:51:00 +01:00 committed by Junio C Hamano
parent e83ba647f7
commit 9dbf00ba78
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
grep.c
View File

@ -595,6 +595,15 @@ static void compile_regexp(struct grep_pat *p, struct grep_opt *opt)
} }
} }


static struct grep_expr *grep_or_expr(struct grep_expr *left, struct grep_expr *right)
{
struct grep_expr *z = xcalloc(1, sizeof(*z));
z->node = GREP_NODE_OR;
z->u.binary.left = left;
z->u.binary.right = right;
return z;
}

static struct grep_expr *compile_pattern_or(struct grep_pat **); static struct grep_expr *compile_pattern_or(struct grep_pat **);
static struct grep_expr *compile_pattern_atom(struct grep_pat **list) static struct grep_expr *compile_pattern_atom(struct grep_pat **list)
{ {
@ -677,7 +686,7 @@ static struct grep_expr *compile_pattern_and(struct grep_pat **list)
static struct grep_expr *compile_pattern_or(struct grep_pat **list) static struct grep_expr *compile_pattern_or(struct grep_pat **list)
{ {
struct grep_pat *p; struct grep_pat *p;
struct grep_expr *x, *y, *z; struct grep_expr *x, *y;


x = compile_pattern_and(list); x = compile_pattern_and(list);
p = *list; p = *list;
@ -685,11 +694,7 @@ static struct grep_expr *compile_pattern_or(struct grep_pat **list)
y = compile_pattern_or(list); y = compile_pattern_or(list);
if (!y) if (!y)
die("not a pattern expression %s", p->pattern); die("not a pattern expression %s", p->pattern);
CALLOC_ARRAY(z, 1); return grep_or_expr(x, y);
z->node = GREP_NODE_OR;
z->u.binary.left = x;
z->u.binary.right = y;
return z;
} }
return x; return x;
} }
@ -714,15 +719,6 @@ static struct grep_expr *grep_true_expr(void)
return z; return z;
} }


static struct grep_expr *grep_or_expr(struct grep_expr *left, struct grep_expr *right)
{
struct grep_expr *z = xcalloc(1, sizeof(*z));
z->node = GREP_NODE_OR;
z->u.binary.left = left;
z->u.binary.right = right;
return z;
}

static struct grep_expr *prep_header_patterns(struct grep_opt *opt) static struct grep_expr *prep_header_patterns(struct grep_opt *opt)
{ {
struct grep_pat *p; struct grep_pat *p;