diff options
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | regex.h | 2 | ||||
| -rw-r--r-- | regexec.c | 6 | ||||
| -rwxr-xr-x | regtest_terex.sh | 2 |
4 files changed, 6 insertions, 6 deletions
@@ -17,7 +17,7 @@ Compared to hsrex, this library has the following changes: * Native UTF-8 support - no need to convert UTF-8 to UTF-32 first. You no longer need to compile a special version of the library. It expects Unicode strings by default unless specifying the `REG_RAW` - compilation and execution flag. + compilation flag. ## TODO @@ -230,7 +230,7 @@ typedef struct { #define REG_DUMP 004000 /* none of your business :-) */ #define REG_FAKE 010000 /* none of your business :-) */ #define REG_PROGRESS 020000 /* none of your business :-) */ -#define REG_RAW 040000 /* pattern and subject are raw ASCII (also an execution flag) */ +#define REG_RAW 040000 /* pattern and subject are raw ASCII */ /* * execution @@ -158,7 +158,7 @@ static struct sset *pickss(struct vars *, struct dfa *, chr *, chr *); static inline chr * nextchr(struct vars *v, chr *s) { - if (v->eflags & REG_RAW) { + if (v->g->cflags & REG_RAW) { return s+1; } @@ -180,7 +180,7 @@ nextchr(struct vars *v, chr *s) static inline chr * prevchr(struct vars *v, chr *s) { - if (v->eflags & REG_RAW) { + if (v->g->cflags & REG_RAW) { return s-1; } @@ -194,7 +194,7 @@ prevchr(struct vars *v, chr *s) static inline pchr getchr(struct vars *v, const chr *s, const chr *end) { - if (v->eflags & REG_RAW) { + if (v->g->cflags & REG_RAW) { return *s; } diff --git a/regtest_terex.sh b/regtest_terex.sh index 29a88c5..75e051b 100755 --- a/regtest_terex.sh +++ b/regtest_terex.sh @@ -124,7 +124,7 @@ cat<<-EOF>$rgsrc nmatch, cre.re_nsub); return 1; } - rc = re_exec(&cre, dat, datlen, NULL, 100, pmatch, cflags & REG_RAW); + rc = re_exec(&cre, dat, datlen, NULL, 100, pmatch, 0); if ( rc != REG_OKAY ) { regerror(rc, &cre, buf, sizeof(buf)); |