[PATCH v2 2/2] grep: use grep_and_expr() in compile_pattern_and()
- From
Taylor Blau <me@ttaylorr.com>
- Date
- Jan 6, 2022, 22:42 UTC
- Message-ID
- <f637e024222a98b6a064fd49b6b810c0b09527d8.1641508884.git.me@ttaylorr.com>
- In-Reply-To
- <cover.1641508884.git.me@ttaylorr.com>
In a similar spirit as a previous commit, use the new `grep_and_expr()` to construct the AND node in `compile_pattern_and()`.
Unlike the aforementioned previous commit, this is not about code duplication, since this is the only spot in grep.c where an AND node is constructed. Rather, this is about visual consistency with the other `compile_pattern_xyz()` functions.
Signed-off-by: Taylor Blau <me@ttaylorr.com> --- grep.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/grep.c b/grep.c index d772fe6cc5..7a1c52c60a 100644 --- a/grep.c +++ b/grep.c @@ -619,6 +619,11 @@ static struct grep_expr *grep_or_expr(struct grep_expr *left, struct grep_expr * return grep_binexp(GREP_NODE_OR, left, right); } +static struct grep_expr *grep_and_expr(struct grep_expr *left, struct grep_expr *right) +{ + return grep_binexp(GREP_NODE_AND, left, right); +} + static struct grep_expr *compile_pattern_or(struct grep_pat **); static struct grep_expr *compile_pattern_atom(struct grep_pat **list) { @@ -674,7 +679,7 @@ static struct grep_expr *compile_pattern_not(struct grep_pat **list) static struct grep_expr *compile_pattern_and(struct grep_pat **list) { struct grep_pat *p; - struct grep_expr *x, *y, *z; + struct grep_expr *x, *y; x = compile_pattern_not(list); p = *list; @@ -687,11 +692,7 @@ static struct grep_expr *compile_pattern_and(struct grep_pat **list) y = compile_pattern_and(list); if (!y) die("--and not followed by pattern expression"); - CALLOC_ARRAY(z, 1); - z->node = GREP_NODE_AND; - z->u.binary.left = x; - z->u.binary.right = y; - return z; + return grep_and_expr(x, y); } return x; }
-- 2.34.1.455.gd6eb6fd089