#define BASEOP \
OP* op_next; \
OP* op_sibling; \
- OP* (CPERLscope(*op_ppaddr))(pTHX); \
+ OP* (*op_ppaddr)(pTHX); \
MADPROP_IN_BASEOP \
PADOFFSET op_targ; \
PERL_BITFIELD16 op_type:9; \
/* On OP_HELEM and OP_HSLICE, localization will be followed
by assignment, so do not wipe the target if it is special
(e.g. a glob or a magic SV) */
+ /* On OP_MATCH, OP_SUBST & OP_TRANS, the
+ operand of a logical or conditional
+ that was optimised away, so it should
+ not be bound via =~ */
/* old names; don't use in new code, but don't break them, either */
#define OPf_LIST OPf_WANT_LIST
#define PM_SETRE(o,r) ((o)->op_pmregexp = (r))
#endif
+/* Leave some space, so future bit allocations can go either in the shared or
+ * unshared area without affecting binary compatibility */
+#define PMf_BASE_SHIFT (_RXf_PMf_SHIFT_NEXT+7)
+
/* taint $1 etc. if target tainted */
-#define PMf_RETAINT (1<<(_RXf_PMf_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<<(_RXf_PMf_SHIFT+2))
+#define PMf_ONCE (1<<(PMf_BASE_SHIFT+1))
/* replacement contains variables */
-#define PMf_MAYBE_CONST (1<<(_RXf_PMf_SHIFT+3))
+#define PMf_MAYBE_CONST (1<<(PMf_BASE_SHIFT+2))
/* PMf_ONCE has matched successfully. Not used under threading. */
-#define PMf_USED (1<<(_RXf_PMf_SHIFT+4))
+#define PMf_USED (1<<(PMf_BASE_SHIFT+3))
/* subst replacement is constant */
-#define PMf_CONST (1<<(_RXf_PMf_SHIFT+5))
+#define PMf_CONST (1<<(PMf_BASE_SHIFT+4))
/* keep 1st runtime pattern forever */
-#define PMf_KEEP (1<<(_RXf_PMf_SHIFT+6))
-#define PMf_GLOBAL (1<<(_RXf_PMf_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<<(_RXf_PMf_SHIFT+8))
+#define PMf_CONTINUE (1<<(PMf_BASE_SHIFT+7))
/* evaluating replacement as expr */
-#define PMf_EVAL (1<<(_RXf_PMf_SHIFT+9))
+#define PMf_EVAL (1<<(PMf_BASE_SHIFT+8))
/* Return substituted string instead of modifying it. */
-#define PMf_NONDESTRUCT (1<<(_RXf_PMf_SHIFT+10))
+#define PMf_NONDESTRUCT (1<<(PMf_BASE_SHIFT+9))
-#if _RXf_PMf_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
-/* mask of bits that need to be transfered to re->extflags */
-#define PMf_COMPILETIME (PMf_MULTILINE|PMf_SINGLELINE|PMf_LOCALE|PMf_FOLD|PMf_EXTENDED|PMf_KEEPCOPY)
-
#ifdef USE_ITHREADS
# define PmopSTASHPV(o) \
#define OA_FOLDCONST 2
#define OA_RETSCALAR 4
#define OA_TARGET 8
-#define OA_RETINTEGER 16
+#define OA_TARGLEX 16
#define OA_OTHERINT 32
#define OA_DANGEROUS 64
#define OA_DEFGV 128
-#define OA_TARGLEX 256
/* The next 4 bits encode op class information */
-#define OCSHIFT 9
+#define OCSHIFT 8
#define OA_CLASS_MASK (15 << OCSHIFT)
#define OA_FILESTATOP (12 << OCSHIFT)
#define OA_LOOPEXOP (13 << OCSHIFT)
-#define OASHIFT 13
+#define OASHIFT 12
/* Remaining nybbles of PL_opargs */
#define OA_SCALAR 1
hk = INT2PTR(BHK *, SvIVX(sv)); \
\
if (BhkENTRY(hk, which)) \
- CALL_FPTR(BhkENTRY(hk, which))(aTHX_ arg); \
+ BhkENTRY(hk, which)(aTHX_ arg); \
} \
} \
} STMT_END