U8 op_private;
#endif
+/* If op_type:9 is changed to :10, also change PUSHEVAL in cop.h */
+
#define OP_GIMME(op,dfl) \
(((op)->op_flags & OPf_WANT) == OPf_WANT_VOID ? G_VOID : \
((op)->op_flags & OPf_WANT) == OPf_WANT_SCALAR ? G_SCALAR : \
((op)->op_flags & OPf_WANT) == OPf_WANT_LIST ? G_ARRAY : \
dfl)
+#define OP_GIMME_REVERSE(flags) ((flags) & G_WANT)
+
/*
=head1 "Gimme" Values
#define OPpENTERSUB_DB 16 /* Debug subroutine. */
#define OPpENTERSUB_HASTARG 32 /* Called from OP tree. */
#define OPpENTERSUB_NOMOD 64 /* Immune to mod() for :attrlist. */
- /* OP_RV2CV only */
+ /* OP_ENTERSUB and OP_RV2CV only */
#define OPpENTERSUB_AMPER 8 /* Used & form to call. */
#define OPpENTERSUB_NOPAREN 128 /* bare sub call (without parens) */
#define OPpENTERSUB_INARGS 4 /* Lval used as arg to a sub. */
#define OPpSORT_QSORT 32 /* Use quicksort (not mergesort) */
#define OPpSORT_STABLE 64 /* Use a stable algorithm */
-/* Private for OP_THREADSV */
-#define OPpDONE_SVREF 64 /* Been through newSVREF once */
-
/* Private for OP_OPEN and OP_BACKTICK */
#define OPpOPEN_IN_RAW 16 /* binmode(F,":raw") on input fh */
#define OPpOPEN_IN_CRLF 32 /* binmode(F,":crlf") on input fh */
};
#ifdef USE_ITHREADS
-#define PM_GETRE(o) (INT2PTR(REGEXP*,SvIVX(PL_regex_pad[(o)->op_pmoffset])))
-#define PM_SETRE(o,r) STMT_START { \
- SV* const sv = PL_regex_pad[(o)->op_pmoffset]; \
- sv_setiv(sv, PTR2IV(r)); \
+#define PM_GETRE(o) (SvTYPE(PL_regex_pad[(o)->op_pmoffset]) == SVt_REGEXP \
+ ? (REGEXP*)(PL_regex_pad[(o)->op_pmoffset]) : NULL)
+/* The assignment is just to enforce type safety (or at least get a warning).
+ */
+/* With first class regexps not via a reference one needs to assign
+ &PL_sv_undef under ithreads. (This would probably work unthreaded, but NULL
+ is cheaper. I guess we could allow NULL, but the check above would get
+ more complex, and we'd have an AV with (SV*)NULL in it, which feels bad */
+/* BEWARE - something that calls this macro passes (r) which has a side
+ effect. */
+#define PM_SETRE(o,r) STMT_START { \
+ const REGEXP *const whap = (r); \
+ assert(whap); \
+ PL_regex_pad[(o)->op_pmoffset] = (SV*)whap; \
} STMT_END
-#define PM_GETRE_SAFE(o) (PL_regex_pad ? PM_GETRE(o) : (REGEXP*)0)
-#define PM_SETRE_SAFE(o,r) if (PL_regex_pad) PM_SETRE(o,r)
#else
#define PM_GETRE(o) ((o)->op_pmregexp)
#define PM_SETRE(o,r) ((o)->op_pmregexp = (r))
-#define PM_GETRE_SAFE PM_GETRE
-#define PM_SETRE_SAFE PM_SETRE
#endif
-#define PMf_RETAINT 0x0001 /* taint $1 etc. if target tainted */
-#define PMf_ONCE 0x0002 /* match successfully only once per
+#define PMf_RETAINT 0x00000040 /* taint $1 etc. if target tainted */
+#define PMf_ONCE 0x00000080 /* 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_UNUSED 0x0004 /* free for use */
-#define PMf_MAYBE_CONST 0x0008 /* replacement contains variables */
+#define PMf_UNUSED 0x00000100 /* free for use */
+#define PMf_MAYBE_CONST 0x00000200 /* replacement contains variables */
-#define PMf_USED 0x0010 /* PMf_ONCE has matched successfully.
+#define PMf_USED 0x00000400 /* PMf_ONCE has matched successfully.
Not used under threading. */
-#define PMf_CONST 0x0040 /* subst replacement is constant */
-#define PMf_KEEP 0x0080 /* keep 1st runtime pattern forever */
-#define PMf_GLOBAL 0x0100 /* pattern had a g modifier */
-#define PMf_CONTINUE 0x0200 /* don't reset pos() if //g fails */
-#define PMf_EVAL 0x0400 /* evaluating replacement as expr */
+#define PMf_CONST 0x00000800 /* subst replacement is constant */
+#define PMf_KEEP 0x00001000 /* keep 1st runtime pattern forever */
+#define PMf_GLOBAL 0x00002000 /* pattern had a g modifier */
+#define PMf_CONTINUE 0x00004000 /* don't reset pos() if //g fails */
+#define PMf_EVAL 0x00008000 /* evaluating replacement as expr */
/* The following flags have exact equivalents in regcomp.h with the prefix RXf_
- * which are stored in the regexp->extflags member.
+ * which are stored in the regexp->extflags member. If you change them here,
+ * you have to change them there, and vice versa.
*/
-#define PMf_LOCALE 0x00800 /* use locale for character types */
-#define PMf_MULTILINE 0x01000 /* assume multiple lines */
-#define PMf_SINGLELINE 0x02000 /* assume single line */
-#define PMf_FOLD 0x04000 /* case insensitivity */
-#define PMf_EXTENDED 0x08000 /* chuck embedded whitespace */
-#define PMf_KEEPCOPY 0x10000 /* copy the string when matching */
+#define PMf_MULTILINE 0x00000001 /* assume multiple lines */
+#define PMf_SINGLELINE 0x00000002 /* assume single line */
+#define PMf_FOLD 0x00000004 /* case insensitivity */
+#define PMf_EXTENDED 0x00000008 /* chuck embedded whitespace */
+#define PMf_KEEPCOPY 0x00000010 /* copy the string when matching */
+#define PMf_LOCALE 0x00000020 /* use locale for character types */
/* 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)
projects / p5sagit/p5-mst-13.2.git / blobdiff