From 8e1e6572feabd291cbd5048459c0a58c6460ff91 Mon Sep 17 00:00:00 2001 From: Bruce Hill Date: Thu, 23 Sep 2021 15:15:48 -0700 Subject: Moved type defs into their own files instead of types.h --- match.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'match.c') diff --git a/match.c b/match.c index 6089a2d..9e8e388 100644 --- a/match.c +++ b/match.c @@ -12,7 +12,6 @@ #include "definitions.h" #include "match.h" #include "pattern.h" -#include "types.h" #include "utils.h" #include "utf8.h" @@ -518,19 +517,13 @@ static match_t *match(def_t *defs, cache_t *cache, file_t *f, const char *str, p if (m1->pat->type == BP_CAPTURE && m1->pat->args.capture.name) { // Temporarily add a rule that the backref name matches the // exact string of the original match (no replacements) - pat_t *backref = bp_backref(f, m1); + pat_t *backref = bp_raw_literal(f, m1->start, (size_t)(m1->end - m1->start)); def_t *defs2 = with_def(defs, m1->pat->args.capture.namelen, m1->pat->args.capture.name, backref); ++m1->refcount; { m2 = match(defs2, cache, f, m1->end, pat->args.multiple.second, ignorecase); if (!m2) { // No need to keep the backref in memory if it didn't match - for (pat_t **rem = &f->pats; *rem; rem = &(*rem)->next) { - if ((*rem) == backref) { - pat_t *tmp = *rem; - *rem = (*rem)->next; - free(tmp); - break; - } - } + free_pat(backref); + backref = NULL; } defs = free_defs(defs2, defs); } --m1->refcount; -- cgit v1.2.3