sed: optimize regex processing of lone ^ or $
Optimize /^/ and /$/ patterns and avoid invoking the regular expression engine if possible. See https://bugs.gnu.org/24615 . * sed/regex.c (compile_regex_1): Mark the patterns which consist of ^ or $. (match_regex): Handle the patterns which consist of ^ or $ manually. * sed/sed.h (struct regex): New members 'begline' and 'endline'. * testsuite/newline-anchor.good, testsuite/newline-anchor.sed, testsuite/newline-anchor.sed: New test. * testsuite/Makefile.tests: Add the test. * testsuite/local.mk: Add the test.
This commit is contained in:
1 parent
10549b7e6d
commit
6dea75e708
7 files changed
+96
-2
No files matched your search
@@ -147,6 +147,18 @@ compile_regex_1 (struct regex *new_regex, int needed_sub)
|
||||
new_regex->dfa = dfaalloc ();
|
||||
dfasyntax (new_regex->dfa, &localeinfo, syntax, dfaopts);
|
||||
dfacomp (new_regex->re, new_regex->sz, new_regex->dfa, 1);
|
||||
|
||||
/* The patterns which consist of only ^ or $ often appear in
|
||||
substitution, but regex and dfa are not good at them, as regex does
|
||||
not build fastmap, and as all in buffer must be scanned for $. So
|
||||
we mark them to handle manually. */
|
||||
if (new_regex->sz == 1)
|
||||
{
|
||||
if (new_regex->re[0] == '^')
|
||||
new_regex->begline = true;
|
||||
if (new_regex->re[0] == '$')
|
||||
new_regex->endline = true;
|
||||
}
|
||||
}
|
||||
|
||||
struct regex *
|
||||
@@ -257,6 +269,70 @@ match_regex(struct regex *regex, char *buf, size_t buflen,
|
||||
|
||||
regex->pattern.regs_allocated = REGS_REALLOCATE;
|
||||
|
||||
/* Optimized handling for '^' and '$' patterns */
|
||||
if (regex->begline || regex->endline)
|
||||
{
|
||||
size_t offset;
|
||||
|
||||
if (regex->endline)
|
||||
{
|
||||
const char *p = NULL;
|
||||
|
||||
if (regex->flags & REG_NEWLINE)
|
||||
p = memchr (buf + buf_start_offset, buffer_delimiter, buflen);
|
||||
|
||||
offset = p ? p - buf : buflen;
|
||||
}
|
||||
else if (buf_start_offset == 0)
|
||||
/* begline anchor, starting at beginning of the buffer. */
|
||||
offset = 0;
|
||||
else if (!(regex->flags & REG_NEWLINE))
|
||||
/* begline anchor, starting in the middle of the text buffer,
|
||||
and multiline regex is not specified - will never match.
|
||||
Example: seq 2 | sed 'N;s/^/X/g' */
|
||||
return 0;
|
||||
else if (buf[buf_start_offset - 1] == buffer_delimiter)
|
||||
/* begline anchor, starting in the middle of the text buffer,
|
||||
with multiline match, and the current character
|
||||
is the line delimiter - start here.
|
||||
Example: seq 2 | sed 'N;s/^/X/mg' */
|
||||
offset = buf_start_offset;
|
||||
else
|
||||
{
|
||||
/* begline anchor, starting in the middle of the search buffer,
|
||||
all previous optimizions didn't work: search
|
||||
for the next line delimiter character in the buffer,
|
||||
and start from there if found. */
|
||||
const char *p = memchr (buf + buf_start_offset, buffer_delimiter,
|
||||
buflen - buf_start_offset);
|
||||
|
||||
if (p == NULL)
|
||||
return 0;
|
||||
|
||||
offset = p - buf + 1;
|
||||
}
|
||||
|
||||
if (regsize)
|
||||
{
|
||||
size_t i;
|
||||
|
||||
if (!regarray->start)
|
||||
{
|
||||
regarray->start = MALLOC (1, regoff_t);
|
||||
regarray->end = MALLOC (1, regoff_t);
|
||||
regarray->num_regs = 1;
|
||||
}
|
||||
|
||||
regarray->start[0] = offset;
|
||||
regarray->end[0] = offset;
|
||||
|
||||
for (i = 1 ; i < regarray->num_regs; ++i)
|
||||
regarray->start[i] = regarray->end[i] = -1;
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (buf_start_offset == 0)
|
||||
{
|
||||
struct dfa *superset = dfasuperset (regex->dfa);
|
||||
|
||||
@@ -53,6 +53,8 @@ struct regex {
|
||||
int flags;
|
||||
size_t sz;
|
||||
struct dfa *dfa;
|
||||
bool begline;
|
||||
bool endline;
|
||||
char re[1];
|
||||
};
|
||||
|
||||
|
||||
@@ -21,7 +21,7 @@ SKIP = :>$@.skip; exit 77
|
||||
enable sep inclib 8bit 8to7 newjis xabcx dollar noeol bkslashes \
|
||||
numsub head madding mac-mf empty xbxcx xbxcx3 recall recall2 xemacs \
|
||||
appquit fasts uniq manis linecnt khadafy allsub flipcase space modulo \
|
||||
y-bracket y-newline y-zero insert brackets amp-escape::
|
||||
y-bracket y-newline y-zero insert brackets amp-escape newline-anchor::
|
||||
$(SEDENV) $(SED) -f $(srcdir)/$@.sed \
|
||||
< $(srcdir)/$@.inp | $(TR) -d \\r > $@.out
|
||||
$(CMP) $(srcdir)/$@.good $@.out
|
||||
|
||||
+5
-1
@@ -108,7 +108,8 @@ SEDTESTS += testsuite/appquit testsuite/enable testsuite/sep \
|
||||
testsuite/badenc testsuite/inplace-hold testsuite/brackets \
|
||||
testsuite/amp-escape testsuite/help testsuite/file \
|
||||
testsuite/quiet testsuite/factor testsuite/binary3 \
|
||||
testsuite/binary2 testsuite/binary testsuite/dc
|
||||
testsuite/binary2 testsuite/binary testsuite/dc \
|
||||
testsuite/newline-anchor
|
||||
|
||||
# Note that the first lines are statements. They ensure that environment
|
||||
# variables that can perturb tests are unset or set to expected values.
|
||||
@@ -274,6 +275,9 @@ EXTRA_DIST += \
|
||||
testsuite/newjis.good \
|
||||
testsuite/newjis.inp \
|
||||
testsuite/newjis.sed \
|
||||
testsuite/newline-anchor.good \
|
||||
testsuite/newline-anchor.inp \
|
||||
testsuite/newline-anchor.sed \
|
||||
testsuite/noeol.good \
|
||||
testsuite/noeol.inp \
|
||||
testsuite/noeol.sed \
|
||||
|
||||
@@ -0,0 +1,3 @@
|
||||
XXaY
|
||||
XbY
|
||||
XcYY
|
||||
@@ -0,0 +1,3 @@
|
||||
a
|
||||
b
|
||||
c
|
||||
@@ -0,0 +1,6 @@
|
||||
N
|
||||
N
|
||||
s/^/X/g
|
||||
s/^/X/mg
|
||||
s/$/Y/g
|
||||
s/$/Y/mg
|
||||
Reference in new issue
Block a user