#define REP_HAS_PERL(R, V, S) (PERL_REVISION > (R) || (PERL_REVISION == (R) && (PERL_VERSION > (V) || (PERL_VERSION == (V) && (PERL_SUBVERSION >= (S))))))
-#undef ENTERn
-#if defined(ENTER_with_name) && !REP_HAS_PERL(5, 11, 4)
-# define ENTERn(N) ENTER_with_name(N)
-#else
-# define ENTERn(N) ENTER
-#endif
-
-#undef LEAVEn
-#if defined(LEAVE_with_name) && !REP_HAS_PERL(5, 11, 4)
-# define LEAVEn(N) LEAVE_with_name(N)
-#else
-# define LEAVEn(N) LEAVE
-#endif
-
#ifndef REP_WORKAROUND_REQUIRE_PROPAGATION
# define REP_WORKAROUND_REQUIRE_PROPAGATION !REP_HAS_PERL(5, 10, 1)
#endif
SV *comp;
SV *exec;
#if REP_WORKAROUND_REQUIRE_PROPAGATION
- IV cxreq;
+ IV require_tag;
#endif
} rep_hint_t;
SvREFCNT_dec(stashes);
}
- return SvREFCNT_inc(dupsv);
+ return SvREFCNT_inc_simple(dupsv);
}
STATIC void rep_ptable_clone(pTHX_ ptable_ent *ent, void *ud_) {
if (ud->owner == aTHX)
return;
- h2 = PerlMemShared_malloc(sizeof *h2);
- h2->comp = rep_clone(h1->comp, ud->owner);
- SvREFCNT_inc(h2->comp);
- h2->exec = rep_clone(h1->exec, ud->owner);
- SvREFCNT_inc(h2->exec);
+ h2 = PerlMemShared_malloc(sizeof *h2);
+ h2->comp = rep_clone(h1->comp, ud->owner);
+ SvREFCNT_inc_simple_void(h2->comp);
+ h2->exec = rep_clone(h1->exec, ud->owner);
+ SvREFCNT_inc_simple_void(h2->exec);
#if REP_WORKAROUND_REQUIRE_PROPAGATION
- h2->cxreq = h1->cxreq;
+ h2->require_tag = PTR2IV(rep_clone(INT2PTR(SV *, h1->require_tag), ud->owner));
#endif
ptable_store(ud->tbl, ent->key, h2);
#if REP_WORKAROUND_REQUIRE_PROPAGATION
STATIC IV rep_require_tag(pTHX) {
#define rep_require_tag() rep_require_tag(aTHX)
- const PERL_SI *si;
-
- for (si = PL_curstackinfo; si; si = si->si_prev) {
- I32 cxix;
-
- for (cxix = si->si_cxix; cxix >= 0; --cxix) {
- const PERL_CONTEXT *cx = si->si_cxstack + cxix;
-
- if (CxTYPE(cx) == CXt_EVAL && cx->blk_eval.old_op_type == OP_REQUIRE)
- return PTR2IV(cx);
+ const CV *cv, *outside;
+
+ cv = PL_compcv;
+
+ if (!cv) {
+ /* If for some reason the pragma is operational at run-time, try to discover
+ * the current cv in use. */
+ const PERL_SI *si;
+
+ for (si = PL_curstackinfo; si; si = si->si_prev) {
+ I32 cxix;
+
+ for (cxix = si->si_cxix; cxix >= 0; --cxix) {
+ const PERL_CONTEXT *cx = si->si_cxstack + cxix;
+
+ switch (CxTYPE(cx)) {
+ case CXt_SUB:
+ case CXt_FORMAT:
+ /* The propagation workaround is only needed up to 5.10.0 and at that
+ * time format and sub contexts were still identical. And even later the
+ * cv members offsets should have been kept the same. */
+ cv = cx->blk_sub.cv;
+ goto get_enclosing_cv;
+ case CXt_EVAL:
+ cv = cx->blk_eval.cv;
+ goto get_enclosing_cv;
+ default:
+ break;
+ }
+ }
}
+
+ cv = PL_main_cv;
}
- return PTR2IV(NULL);
+get_enclosing_cv:
+ for (outside = CvOUTSIDE(cv); outside; outside = CvOUTSIDE(cv))
+ cv = outside;
+
+ return PTR2IV(cv);
}
#endif /* REP_WORKAROUND_REQUIRE_PROPAGATION */
rep_hint_t *h;
dMY_CXT;
- h = PerlMemShared_malloc(sizeof *h);
- h->comp = rep_validate_callback(comp);
- h->exec = rep_validate_callback(exec);
+ h = PerlMemShared_malloc(sizeof *h);
+ h->comp = rep_validate_callback(comp);
+ h->exec = rep_validate_callback(exec);
#if REP_WORKAROUND_REQUIRE_PROPAGATION
- h->cxreq = rep_require_tag();
+ h->require_tag = rep_require_tag();
#endif /* REP_WORKAROUND_REQUIRE_PROPAGATION */
#if REP_THREADSAFE
#endif /* REP_THREADSAFE */
#if REP_WORKAROUND_REQUIRE_PROPAGATION
- if (rep_require_tag() != h->cxreq)
+ if (rep_require_tag() != h->require_tag)
return NULL;
#endif /* REP_WORKAROUND_REQUIRE_PROPAGATION */
dSP;
struct regexp * rx;
REGEXP *RX;
- I32 buffers;
+
re__engine__Plugin re;
const rep_hint_t *h;
+ STRLEN plen;
+ char *pbuf;
+
+ SV *obj;
+
h = rep_hint();
if (!h) /* This looks like a pragma leak. Apply the default behaviour */
return re_compile(pattern, flags);
/* exp/xend version of the pattern & length */
- STRLEN plen;
- char* exp = SvPV((SV*)pattern, plen);
+ pbuf = SvPV((SV*)pattern, plen);
/* Our blessed object */
- SV *obj = newSV(0);
- SvREFCNT_inc(obj);
+ obj = newSV(0);
+ SvREFCNT_inc_simple_void_NN(obj);
Newxz(re, 1, struct replug);
sv_setref_pv(obj, "re::engine::Plugin", (void*)re);
/* Precompiled pattern for pp_regcomp to use */
rx->prelen = plen;
- rx->precomp = savepvn(exp, rx->prelen);
+ rx->precomp = savepvn(pbuf, rx->prelen);
/* Set up qr// stringification to be equivalent to the supplied
* pattern, this should be done via overload eventually.
/* Store the pattern for ->pattern */
re->pattern = (SV*)pattern;
- SvREFCNT_inc(re->pattern);
+ SvREFCNT_inc_simple_void(re->pattern);
/* If there's an exec callback, store it into the private object so
* that it will be the one to be called, even if the engine changes
* update the regexp struct with the new info.
*/
- buffers = rx->nparens;
-
- Newxz(rx->offs, buffers + 1, regexp_paren_pair);
+ Newxz(rx->offs, rx->nparens + 1, regexp_paren_pair);
return RX;
}
GET_SELF_FROM_PPRIVATE(rx->pprivate);
if (self->cb_exec) {
+ SV *ret;
+
/* Store the current str for ->str */
- self->str = (SV*)sv;
- SvREFCNT_inc(self->str);
+ SvREFCNT_dec(self->str);
+ self->str = sv;
+ SvREFCNT_inc_simple_void(self->str);
ENTER;
SAVETMPS;
SPAGAIN;
- SV * ret = POPs;
-
+ ret = POPs;
if (SvTRUE(ret))
matched = 1;
else
items = call_sv(callback, G_SCALAR);
if (items == 1) {
- SPAGAIN;
+ SV *ret;
- SV * ret = POPs;
+ SPAGAIN;
+ ret = POPs;
sv_setsv(sv, ret);
} else {
sv_setsv(sv, &PL_sv_undef);
PUSHMARK(SP);
XPUSHs(rx->pprivate);
XPUSHs(sv_2mortal(newSViv(paren)));
- XPUSHs(SvREFCNT_inc((SV *) value));
+ XPUSHs((SV *) value);
PUTBACK;
call_sv(callback, G_DISCARD);
callback = self->cb_num_capture_buff_LENGTH;
if (callback) {
+ IV ret;
+
ENTER;
SAVETMPS;
SPAGAIN;
- IV ret = POPi;
+ ret = POPi;
PUTBACK;
FREETMPS;
PPCODE:
XPUSHs(self->str);
-char*
-mod(re::engine::Plugin self, ...)
+void
+mod(re::engine::Plugin self)
+PREINIT:
+ U32 flags;
+ char mods[5 + 1];
+ int n = 0, i;
PPCODE:
- /* /i */
- if (self->rx->intflags & PMf_FOLD) {
- XPUSHs(sv_2mortal(newSVpvs("i")));
- XPUSHs(&PL_sv_yes);
- }
-
- /* /m */
- if (self->rx->intflags & PMf_MULTILINE) {
- XPUSHs(sv_2mortal(newSVpvs("m")));
- XPUSHs(&PL_sv_yes);
- }
-
- /* /s */
- if (self->rx->intflags & PMf_SINGLELINE) {
- XPUSHs(sv_2mortal(newSVpvs("s")));
- XPUSHs(&PL_sv_yes);
- }
-
- /* /x */
- if (self->rx->intflags & PMf_EXTENDED) {
- XPUSHs(sv_2mortal(newSVpvs("x")));
- XPUSHs(&PL_sv_yes);
- }
-
- /* /p */
- if (self->rx->intflags & RXf_PMf_KEEPCOPY) {
- XPUSHs(sv_2mortal(newSVpvs("p")));
- XPUSHs(&PL_sv_yes);
+ flags = self->rx->intflags;
+ if (flags & PMf_FOLD) /* /i */
+ mods[n++] = 'i';
+ if (flags & PMf_MULTILINE) /* /m */
+ mods[n++] = 'm';
+ if (flags & PMf_SINGLELINE) /* /s */
+ mods[n++] = 's';
+ if (flags & PMf_EXTENDED) /* /x */
+ mods[n++] = 'x';
+ if (flags & RXf_PMf_KEEPCOPY) /* /p */
+ mods[n++] = 'p';
+ mods[n] = '\0';
+ EXTEND(SP, 2 * n);
+ for (i = 0; i < n; ++i) {
+ mPUSHp(mods + i, 1);
+ PUSHs(&PL_sv_yes);
}
+ XSRETURN(2 * n);
void
stash(re::engine::Plugin self, ...)
PPCODE:
if (items > 1) {
+ SvREFCNT_dec(self->stash);
self->stash = ST(1);
- SvREFCNT_inc(self->stash);
+ SvREFCNT_inc_simple_void(self->stash);
XSRETURN_EMPTY;
} else {
XPUSHs(self->stash);
if (items > 1) {
SvREFCNT_dec(self->cb_exec);
self->cb_exec = ST(1);
- SvREFCNT_inc(self->cb_exec);
+ SvREFCNT_inc_simple_void(self->cb_exec);
}
void
if (items > 1) {
SvREFCNT_dec(self->cb_num_capture_buff_FETCH);
self->cb_num_capture_buff_FETCH = ST(1);
- SvREFCNT_inc(self->cb_num_capture_buff_FETCH);
+ SvREFCNT_inc_simple_void(self->cb_num_capture_buff_FETCH);
}
void
if (items > 1) {
SvREFCNT_dec(self->cb_num_capture_buff_STORE);
self->cb_num_capture_buff_STORE = ST(1);
- SvREFCNT_inc(self->cb_num_capture_buff_STORE);
+ SvREFCNT_inc_simple_void(self->cb_num_capture_buff_STORE);
}
void
if (items > 1) {
SvREFCNT_dec(self->cb_num_capture_buff_LENGTH);
self->cb_num_capture_buff_LENGTH = ST(1);
- SvREFCNT_inc(self->cb_num_capture_buff_LENGTH);
+ SvREFCNT_inc_simple_void(self->cb_num_capture_buff_LENGTH);
}
SV *
projects / perl / modules / re-engine-Plugin.git / blobdiff