d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libc: regex: factor out ISBOW/ISEOW macros

Browse Source 
These will be reused for \b (word boundary, which matches both sides).

No functional change.
This commit is contained in:
Kyle Evans 2020-12-05 02:23:11 +00:00
parent 7c2f310f6d
commit 7518fb346f
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=368356
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/libc/regex/engine.c
View File

@ -589,6 +589,17 @@ dissect(struct match *m,
return(sp);
}
#define ISBOW(m, sp) \
(sp < m->endp && ISWORD(*sp) && \
((sp == m->beginp && !(m->eflags&REG_NOTBOL)) || \
(sp > m->offp && !ISWORD(*(sp-1)))))
#define ISEOW(m, sp) \
(((sp == m->endp && !(m->eflags&REG_NOTEOL)) || \
(sp < m->endp && *sp == '\n' && \
(m->g->cflags&REG_NEWLINE)) || \
(sp < m->endp && !ISWORD(*sp)) ) && \
(sp > m->beginp && ISWORD(*(sp-1)))) \
/*
- backref - figure out what matched what, figuring in back references
== static const char *backref(struct match *m, const char *start, \
@ -663,19 +674,13 @@ backref(struct match *m,
return(NULL);
break;
case OBOW:
if (sp < m->endp && ISWORD(*sp) &&
((sp == m->beginp && !(m->eflags&REG_NOTBOL)) ||
(sp > m->offp && !ISWORD(*(sp-1)))))
if (ISBOW(m, sp))
{ /* yes */ }
else
return(NULL);
break;
case OEOW:
if (( (sp == m->endp && !(m->eflags&REG_NOTEOL)) ||
(sp < m->endp && *sp == '\n' &&
(m->g->cflags&REG_NEWLINE)) ||
(sp < m->endp && !ISWORD(*sp)) ) &&
(sp > m->beginp && ISWORD(*(sp-1))) )
if (ISEOW(m, sp))
{ /* yes */ }
else
return(NULL);