diff options
| author | Karl Williamson <public@khwilliamson.com> | 2010-07-31 22:18:42 -0600 |
|---|---|---|
| committer | Rafael Garcia-Suarez <rgs@consttype.org> | 2010-08-11 10:23:35 +0200 |
| commit | 1ad4ec548311231461a68d0e66335fc3abf1540f (patch) | |
| tree | 30cece4eeea6678c3f150946574520dbd7a9296f /op.h | |
| parent | 5b126c844328624724495878ae8a120ab1a2e906 (diff) | |
| download | perl-1ad4ec548311231461a68d0e66335fc3abf1540f.tar.gz | |
op.h, regexp.h: renumber shifts.
This patch doesn't change any generated code. It just changes the base
numbering of the shifts from 1 to 0. In regexp.h the RXf_BASE_SHIFT was
changed to make sure the used bits didn't change
Diffstat (limited to 'op.h')
| -rw-r--r-- | op.h | 24 |
1 files changed, 12 insertions, 12 deletions
@@ -360,39 +360,39 @@ struct pmop { #define PM_SETRE(o,r) ((o)->op_pmregexp = (r)) #endif -#define PMf_BASE_SHIFT ((_RXf_PMf_SHIFT_NEXT)-1) +#define PMf_BASE_SHIFT _RXf_PMf_SHIFT_NEXT /* taint $1 etc. if target tainted */ -#define PMf_RETAINT (1<<(PMf_BASE_SHIFT+1)) +#define PMf_RETAINT (1<<(PMf_BASE_SHIFT+0)) /* match successfully only once per reset, with related flag RXf_USED in * re->extflags holding state. This is used only for ?? matches, and only on * OP_MATCH and OP_QR */ -#define PMf_ONCE (1<<(PMf_BASE_SHIFT+2)) +#define PMf_ONCE (1<<(PMf_BASE_SHIFT+1)) /* replacement contains variables */ -#define PMf_MAYBE_CONST (1<<(PMf_BASE_SHIFT+3)) +#define PMf_MAYBE_CONST (1<<(PMf_BASE_SHIFT+2)) /* PMf_ONCE has matched successfully. Not used under threading. */ -#define PMf_USED (1<<(PMf_BASE_SHIFT+4)) +#define PMf_USED (1<<(PMf_BASE_SHIFT+3)) /* subst replacement is constant */ -#define PMf_CONST (1<<(PMf_BASE_SHIFT+5)) +#define PMf_CONST (1<<(PMf_BASE_SHIFT+4)) /* keep 1st runtime pattern forever */ -#define PMf_KEEP (1<<(PMf_BASE_SHIFT+6)) -#define PMf_GLOBAL (1<<(PMf_BASE_SHIFT+7)) /* pattern had a g modifier */ +#define PMf_KEEP (1<<(PMf_BASE_SHIFT+5)) +#define PMf_GLOBAL (1<<(PMf_BASE_SHIFT+6)) /* pattern had a g modifier */ /* don't reset pos() if //g fails */ -#define PMf_CONTINUE (1<<(PMf_BASE_SHIFT+8)) +#define PMf_CONTINUE (1<<(PMf_BASE_SHIFT+7)) /* evaluating replacement as expr */ -#define PMf_EVAL (1<<(PMf_BASE_SHIFT+9)) +#define PMf_EVAL (1<<(PMf_BASE_SHIFT+8)) /* Return substituted string instead of modifying it. */ -#define PMf_NONDESTRUCT (1<<(PMf_BASE_SHIFT+10)) +#define PMf_NONDESTRUCT (1<<(PMf_BASE_SHIFT+9)) -#if PMf_BASE_SHIFT+10 > 31 +#if PMf_BASE_SHIFT+9 > 31 # error Too many PMf_ bits used. See above and regnodes.h for any spare in middle #endif |