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. */
};
#ifdef USE_ITHREADS
-#define PM_GETRE(o) (INT2PTR(REGEXP*,SvIVX(PL_regex_pad[(o)->op_pmoffset])))
+#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 slosh = (r); \
- PM_SETRE_OFFSET((o), PTR2IV(slosh)); \
- } STMT_END
-/* Actually you can assign any IV, not just an offset. And really should it be
- UV? */
-#define PM_SETRE_OFFSET(o,iv) \
- STMT_START { \
- SV* const sv = PL_regex_pad[(o)->op_pmoffset]; \
- sv_setiv(sv, (iv)); \
+ const REGEXP *const whap = (r); \
+ assert(whap); \
+ PL_regex_pad[(o)->op_pmoffset] = (SV*)whap; \
} STMT_END
-
-# ifndef PERL_CORE
-/* No longer used anywhere in the core. Migrate to Devel::PPPort? */
-#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)
-# endif
#else
#define PM_GETRE(o) ((o)->op_pmregexp)
#define PM_SETRE(o,r) ((o)->op_pmregexp = (r))
-# ifndef PERL_CORE
-#define PM_GETRE_SAFE PM_GETRE
-#define PM_SETRE_SAFE PM_SETRE
-# endif
#endif