aboutsummaryrefslogtreecommitdiff
path: root/pattern.c
diff options
context:
space:
mode:
Diffstat (limited to 'pattern.c')
-rw-r--r--pattern.c176
1 files changed, 99 insertions, 77 deletions
diff --git a/pattern.c b/pattern.c
index bed36dfd57d1..ed453740b141 100644
--- a/pattern.c
+++ b/pattern.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1984-2022 Mark Nudelman
+ * Copyright (C) 1984-2023 Mark Nudelman
*
* You may distribute under the terms of either the GNU General Public
* License or the Less License, as specified in the README file.
@@ -20,12 +20,7 @@ extern int utf_mode;
/*
* Compile a search pattern, for future use by match_pattern.
*/
- static int
-compile_pattern2(pattern, search_type, comp_pattern, show_error)
- char *pattern;
- int search_type;
- PATTERN_TYPE *comp_pattern;
- int show_error;
+static int compile_pattern2(char *pattern, int search_type, PATTERN_TYPE *comp_pattern, int show_error)
{
if (search_type & SRCH_NO_REGEX)
return (0);
@@ -147,17 +142,12 @@ compile_pattern2(pattern, search_type, comp_pattern, show_error)
/*
* Like compile_pattern2, but convert the pattern to lowercase if necessary.
*/
- public int
-compile_pattern(pattern, search_type, show_error, comp_pattern)
- char *pattern;
- int search_type;
- int show_error;
- PATTERN_TYPE *comp_pattern;
+public int compile_pattern(char *pattern, int search_type, int show_error, PATTERN_TYPE *comp_pattern)
{
char *cvt_pattern;
int result;
- if (caseless != OPT_ONPLUS || re_handles_caseless)
+ if (caseless != OPT_ONPLUS || (re_handles_caseless && !(search_type & SRCH_NO_REGEX)))
cvt_pattern = pattern;
else
{
@@ -173,9 +163,7 @@ compile_pattern(pattern, search_type, show_error, comp_pattern)
/*
* Forget that we have a compiled pattern.
*/
- public void
-uncompile_pattern(pattern)
- PATTERN_TYPE *pattern;
+public void uncompile_pattern(PATTERN_TYPE *pattern)
{
#if HAVE_GNU_REGEX
if (*pattern != NULL)
@@ -222,9 +210,7 @@ uncompile_pattern(pattern)
/*
* Can a pattern be successfully compiled?
*/
- public int
-valid_pattern(pattern)
- char *pattern;
+public int valid_pattern(char *pattern)
{
PATTERN_TYPE comp_pattern;
int result;
@@ -241,9 +227,7 @@ valid_pattern(pattern)
/*
* Is a compiled pattern null?
*/
- public int
-is_null_pattern(pattern)
- PATTERN_TYPE pattern;
+public int is_null_pattern(PATTERN_TYPE pattern)
{
#if HAVE_GNU_REGEX
return (pattern == NULL);
@@ -270,18 +254,11 @@ is_null_pattern(pattern)
return (pattern == NULL);
#endif
}
-
/*
* Simple pattern matching function.
* It supports no metacharacters like *, etc.
*/
- static int
-match(pattern, pattern_len, buf, buf_len, pfound, pend)
- char *pattern;
- int pattern_len;
- char *buf;
- int buf_len;
- char **pfound, **pend;
+static int match(char *pattern, int pattern_len, char *buf, int buf_len, char ***sp, char ***ep, int nsubs)
{
char *pp, *lp;
char *pattern_end = pattern + pattern_len;
@@ -302,39 +279,30 @@ match(pattern, pattern_len, buf, buf_len, pfound, pend)
}
if (pp == pattern_end)
{
- if (pfound != NULL)
- *pfound = buf;
- if (pend != NULL)
- *pend = lp;
+ *(*sp)++ = buf;
+ *(*ep)++ = lp;
return (1);
}
}
+ **sp = **ep = NULL;
return (0);
}
/*
* Perform a pattern match with the previously compiled pattern.
- * Set sp and ep to the start and end of the matched string.
+ * Set sp[0] and ep[0] to the start and end of the matched string.
+ * Set sp[i] and ep[i] to the start and end of the i-th matched subpattern.
+ * Subpatterns are defined by parentheses in the regex language.
*/
- public int
-match_pattern(pattern, tpattern, line, line_len, sp, ep, notbol, search_type)
- PATTERN_TYPE pattern;
- char *tpattern;
- char *line;
- int line_len;
- char **sp;
- char **ep;
- int notbol;
- int search_type;
+static int match_pattern1(PATTERN_TYPE pattern, char *tpattern, char *line, int line_len, char **sp, char **ep, int nsp, int notbol, int search_type)
{
int matched;
- *sp = *ep = NULL;
#if NO_REGEX
search_type |= SRCH_NO_REGEX;
#endif
if (search_type & SRCH_NO_REGEX)
- matched = match(tpattern, strlen(tpattern), line, line_len, sp, ep);
+ matched = match(tpattern, strlen(tpattern), line, line_len, &sp, &ep, nsp);
else
{
#if HAVE_GNU_REGEX
@@ -345,57 +313,101 @@ match_pattern(pattern, tpattern, line, line_len, sp, ep, notbol, search_type)
matched = re_search(pattern, line, line_len, 0, line_len, &search_regs) >= 0;
if (matched)
{
- *sp = line + search_regs.start[0];
- *ep = line + search_regs.end[0];
+ *sp++ = line + search_regs.start[0];
+ *ep++ = line + search_regs.end[0];
}
}
#endif
#if HAVE_POSIX_REGCOMP
{
- regmatch_t rm;
+ #define RM_COUNT (NUM_SEARCH_COLORS+2)
+ regmatch_t rm[RM_COUNT];
int flags = (notbol) ? REG_NOTBOL : 0;
#ifdef REG_STARTEND
flags |= REG_STARTEND;
- rm.rm_so = 0;
- rm.rm_eo = line_len;
+ rm[0].rm_so = 0;
+ rm[0].rm_eo = line_len;
#endif
- matched = !regexec(pattern, line, 1, &rm, flags);
+ matched = !regexec(pattern, line, RM_COUNT, rm, flags);
if (matched)
{
+ int i;
+ int ecount;
+ for (ecount = RM_COUNT; ecount > 0; ecount--)
+ if (rm[ecount-1].rm_so >= 0)
+ break;
+ if (ecount >= nsp)
+ ecount = nsp-1;
+ for (i = 0; i < ecount; i++)
+ {
+ if (rm[i].rm_so < 0)
+ {
+ *sp++ = *ep++ = line;
+ } else
+ {
#ifndef __WATCOMC__
- *sp = line + rm.rm_so;
- *ep = line + rm.rm_eo;
+ *sp++ = line + rm[i].rm_so;
+ *ep++ = line + rm[i].rm_eo;
#else
- *sp = rm.rm_sp;
- *ep = rm.rm_ep;
+ *sp++ = rm[i].rm_sp;
+ *ep++ = rm[i].rm_ep;
#endif
+ }
+ }
}
}
#endif
#if HAVE_PCRE
{
+ #define OVECTOR_COUNT ((3*NUM_SEARCH_COLORS)+3)
+ int ovector[OVECTOR_COUNT];
int flags = (notbol) ? PCRE_NOTBOL : 0;
- int ovector[3];
- matched = pcre_exec(pattern, NULL, line, line_len,
- 0, flags, ovector, 3) >= 0;
- if (matched)
+ int i;
+ int ecount;
+ int mcount = pcre_exec(pattern, NULL, line, line_len,
+ 0, flags, ovector, OVECTOR_COUNT);
+ matched = (mcount > 0);
+ ecount = nsp-1;
+ if (ecount > mcount) ecount = mcount;
+ for (i = 0; i < ecount*2; )
{
- *sp = line + ovector[0];
- *ep = line + ovector[1];
+ if (ovector[i] < 0 || ovector[i+1] < 0)
+ {
+ *sp++ = *ep++ = line;
+ i += 2;
+ } else
+ {
+ *sp++ = line + ovector[i++];
+ *ep++ = line + ovector[i++];
+ }
}
}
#endif
#if HAVE_PCRE2
{
int flags = (notbol) ? PCRE2_NOTBOL : 0;
- pcre2_match_data *md = pcre2_match_data_create(3, NULL);
- matched = pcre2_match(pattern, (PCRE2_SPTR)line, line_len,
- 0, flags, md, NULL) >= 0;
+ pcre2_match_data *md = pcre2_match_data_create(nsp-1, NULL);
+ int mcount = pcre2_match(pattern, (PCRE2_SPTR)line, line_len,
+ 0, flags, md, NULL);
+ matched = (mcount > 0);
if (matched)
{
PCRE2_SIZE *ovector = pcre2_get_ovector_pointer(md);
- *sp = line + ovector[0];
- *ep = line + ovector[1];
+ int i;
+ int ecount = nsp-1;
+ if (ecount > mcount) ecount = mcount;
+ for (i = 0; i < ecount*2; )
+ {
+ if (ovector[i] < 0 || ovector[i+1] < 0)
+ {
+ *sp++ = *ep++ = line;
+ i += 2;
+ } else
+ {
+ *sp++ = line + ovector[i++];
+ *ep++ = line + ovector[i++];
+ }
+ }
}
pcre2_match_data_free(md);
}
@@ -405,13 +417,11 @@ match_pattern(pattern, tpattern, line, line_len, sp, ep, notbol, search_type)
/*
* re_exec doesn't seem to provide a way to get the matched string.
*/
- *sp = *ep = NULL;
#endif
#if HAVE_REGCMP
- *ep = regex(pattern, line);
- matched = (*ep != NULL);
+ matched = ((*ep++ = regex(pattern, line)) != NULL);
if (matched)
- *sp = __loc1;
+ *sp++ = __loc1;
#endif
#if HAVE_V8_REGCOMP
#if HAVE_REGEXEC2
@@ -421,21 +431,33 @@ match_pattern(pattern, tpattern, line, line_len, sp, ep, notbol, search_type)
#endif
if (matched)
{
- *sp = pattern->startp[0];
- *ep = pattern->endp[0];
+ *sp++ = pattern->startp[0];
+ *ep++ = pattern->endp[0];
}
#endif
}
+ *sp = *ep = NULL;
matched = (!(search_type & SRCH_NO_MATCH) && matched) ||
((search_type & SRCH_NO_MATCH) && !matched);
return (matched);
}
+public int match_pattern(PATTERN_TYPE pattern, char *tpattern, char *line, int line_len, char **sp, char **ep, int nsp, int notbol, int search_type)
+{
+ int matched = match_pattern1(pattern, tpattern, line, line_len, sp, ep, nsp, notbol, search_type);
+ int i;
+ for (i = 1; i <= NUM_SEARCH_COLORS; i++)
+ {
+ if ((search_type & SRCH_SUBSEARCH(i)) && ep[i] == sp[i])
+ matched = 0;
+ }
+ return matched;
+}
+
/*
* Return the name of the pattern matching library.
*/
- public char *
-pattern_lib_name(VOID_PARAM)
+public char * pattern_lib_name(void)
{
#if HAVE_GNU_REGEX
return ("GNU");
generated by cgit v1.3 (git 2.53.0) at 2026-09-08 07:36:16 +0000