X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=Plugin.xs;h=cc90e2b16d5c559aa9e4accf95c1c9c3a84ee019;hb=ba92a5781ed7ee39a62fb0490e291a52b97e69a9;hp=cc839c73d04757161b4187e1c1c50ff960749464;hpb=55b1c44b39286c06a4d352826ac81345b1e0f5cd;p=perl%2Fmodules%2Fre-engine-Plugin.git

diff --git a/Plugin.xs b/Plugin.xs
index cc839c7..cc90e2b 100644
--- a/Plugin.xs
+++ b/Plugin.xs
@@ -1,75 +1,236 @@
+/* This file is part of the re::engine::Plugin Perl module.
+ * See http://search.cpan.org/dist/re-engine-Plugin/ */
+
+#define PERL_NO_GET_CONTEXT
 #include "EXTERN.h"
 #include "perl.h"
 #include "XSUB.h"
-#include "Plugin.h"
 
-SV*
-get_H_callback(const char* key)
-{
-    dVAR;
-    dSP;
+/* --- Helpers ------------------------------------------------------------- */
 
-    SV * callback;
+#define XSH_PACKAGE "re::engine::Plugin"
 
-    ENTER;
-    SAVETMPS;
-   
-    PUSHMARK(SP);
-    XPUSHs(sv_2mortal(newSVpv(key, 0)));
-    PUTBACK;
+#include "xsh/caps.h"
+#include "xsh/util.h"
 
-    call_pv("re::engine::Plugin::_get_callback", G_SCALAR);
+/* ... Lexical hints ....................................................... */
 
-    SPAGAIN;
+typedef struct {
+ SV *comp;
+ SV *exec;
+} xsh_hints_user_t;
 
-    callback = POPs;
-    SvREFCNT_inc(callback); /* refcount++ or FREETMPS below will collect us */
+static SV *rep_validate_callback(SV *code) {
+ if (!SvROK(code))
+  return NULL;
 
-    /* If we don't get a valid CODE value return a NULL callback, in
-     * that case the hooks won't call back into Perl space */
-    if (!SvROK(callback) || SvTYPE(SvRV(callback)) != SVt_PVCV) {
-        callback = NULL;
-    }
+ code = SvRV(code);
+ if (SvTYPE(code) < SVt_PVCV)
+  return NULL;
 
-    PUTBACK;
-    FREETMPS;
-    LEAVE;
+ return SvREFCNT_inc_simple_NN(code);
+}
 
-    return callback;
+static void xsh_hints_user_init(pTHX_ xsh_hints_user_t *hv, xsh_hints_user_t *v) {
+ hv->comp = rep_validate_callback(v->comp);
+ hv->exec = rep_validate_callback(v->exec);
+
+ return;
+}
+
+#if XSH_THREADSAFE
+
+static void xsh_hints_user_clone(pTHX_ xsh_hints_user_t *nv, xsh_hints_user_t *ov, CLONE_PARAMS *params) {
+ nv->comp = xsh_dup_inc(ov->comp, params);
+ nv->exec = xsh_dup_inc(ov->exec, params);
+
+ return;
 }
 
+#endif /* XSH_THREADSAFE */
+
+static void xsh_hints_user_deinit(pTHX_ xsh_hints_user_t *hv) {
+ SvREFCNT_dec(hv->comp);
+ SvREFCNT_dec(hv->exec);
+
+ return;
+}
+
+#define rep_hint() xsh_hints_detag(xsh_hints_fetch())
+
+#define XSH_HINTS_TYPE_USER         1
+#define XSH_HINTS_ONLY_COMPILE_TIME 0
+
+#include "xsh/hints.h"
+
+/* ... Thread-local storage ................................................ */
+
+#define XSH_THREADS_USER_CONTEXT            0
+#define XSH_THREADS_USER_LOCAL_SETUP        0
+#define XSH_THREADS_USER_LOCAL_TEARDOWN     0
+#define XSH_THREADS_USER_GLOBAL_TEARDOWN    0
+#define XSH_THREADS_COMPILE_TIME_PROTECTION 0
+
+#include "xsh/threads.h"
+
+/* --- Custom regexp engine ------------------------------------------------ */
+
+#define GET_SELF_FROM_PPRIVATE(pprivate)        \
+    re__engine__Plugin self;                    \
+    SELF_FROM_PPRIVATE(self,pprivate);
+
+/* re__engine__Plugin self; SELF_FROM_PPRIVATE(self,rx->pprivate) */
+#define SELF_FROM_PPRIVATE(self, pprivate)                   \
+    if (sv_isobject(pprivate)) {                             \
+        SV * ref = SvRV((SV*)pprivate);                      \
+        IV tmp = SvIV((SV*)ref);                             \
+        self = INT2PTR(re__engine__Plugin,tmp);              \
+    } else {                                                 \
+        Perl_croak(aTHX_ "Not an object");                   \
+    }
+
+#if XSH_HAS_PERL(5, 19, 4)
+# define REP_ENG_EXEC_MINEND_TYPE SSize_t
+#else
+# define REP_ENG_EXEC_MINEND_TYPE I32
+#endif
+
+START_EXTERN_C
+EXTERN_C const regexp_engine engine_plugin;
+#if XSH_HAS_PERL(5, 11, 0)
+EXTERN_C REGEXP * Plugin_comp(pTHX_ SV * const, U32);
+#else
+EXTERN_C REGEXP * Plugin_comp(pTHX_ const SV * const, const U32);
+#endif
+EXTERN_C I32      Plugin_exec(pTHX_ REGEXP * const, char *, char *,
+                              char *, REP_ENG_EXEC_MINEND_TYPE, SV *, void *, U32);
+#if XSH_HAS_PERL(5, 19, 1)
+EXTERN_C char *   Plugin_intuit(pTHX_ REGEXP * const, SV *, const char * const,
+                                char *, char *, U32, re_scream_pos_data *);
+#else
+EXTERN_C char *   Plugin_intuit(pTHX_ REGEXP * const, SV *, char *,
+                                char *, U32, re_scream_pos_data *);
+#endif
+EXTERN_C SV *     Plugin_checkstr(pTHX_ REGEXP * const);
+EXTERN_C void     Plugin_free(pTHX_ REGEXP * const);
+EXTERN_C void *   Plugin_dupe(pTHX_ REGEXP * const, CLONE_PARAMS *);
+EXTERN_C void     Plugin_numbered_buff_FETCH(pTHX_ REGEXP * const,
+                                             const I32, SV * const);
+EXTERN_C void     Plugin_numbered_buff_STORE(pTHX_ REGEXP * const,
+                                             const I32, SV const * const);
+EXTERN_C I32      Plugin_numbered_buff_LENGTH(pTHX_ REGEXP * const,
+                                              const SV * const, const I32);
+EXTERN_C SV *     Plugin_named_buff (pTHX_ REGEXP * const, SV * const,
+                                     SV * const, const U32);
+EXTERN_C SV *     Plugin_named_buff_iter (pTHX_ REGEXP * const, const SV * const,
+                                          const U32);
+EXTERN_C SV *     Plugin_package(pTHX_ REGEXP * const);
+#ifdef USE_ITHREADS
+EXTERN_C void *   Plugin_dupe(pTHX_ REGEXP * const, CLONE_PARAMS *);
+#endif
+
+EXTERN_C const regexp_engine engine_plugin;
+END_EXTERN_C
+
+#define RE_ENGINE_PLUGIN (&engine_plugin)
+const regexp_engine engine_plugin = {
+    Plugin_comp,
+    Plugin_exec,
+    Plugin_intuit,
+    Plugin_checkstr,
+    Plugin_free,
+    Plugin_numbered_buff_FETCH,
+    Plugin_numbered_buff_STORE,
+    Plugin_numbered_buff_LENGTH,
+    Plugin_named_buff,
+    Plugin_named_buff_iter,
+    Plugin_package
+#if defined(USE_ITHREADS)
+    , Plugin_dupe
+#endif
+#if XSH_HAS_PERL(5, 17, 0)
+    , 0
+#endif
+};
+
+typedef struct replug {
+    /* Pointer back to the containing regexp struct so that accessors
+     * can modify nparens, gofs etc. */
+    struct regexp * rx;
+
+    /* A copy of the pattern given to comp, for ->pattern */
+    SV * pattern;
+
+    /* A copy of the string being matched against, for ->str */
+    SV * str;
+
+    /* The ->stash */
+    SV * stash;
+
+    /* Callbacks */
+    SV * cb_exec;
+    SV * cb_free;
+
+    /* ->num_captures */
+    SV * cb_num_capture_buff_FETCH;
+    SV * cb_num_capture_buff_STORE;
+    SV * cb_num_capture_buff_LENGTH;
+} *re__engine__Plugin;
+
+#if XSH_HAS_PERL(5, 11, 0)
+# define rxREGEXP(RX)  (SvANY(RX))
+# define newREGEXP(RX) ((RX) = ((REGEXP*) newSV_type(SVt_REGEXP)))
+#else
+# define rxREGEXP(RX)  (RX)
+# define newREGEXP(RX) (Newxz((RX), 1, struct regexp))
+#endif
+
 REGEXP *
+#if XSH_HAS_PERL(5, 11, 0)
+Plugin_comp(pTHX_ SV * const pattern, U32 flags)
+#else
 Plugin_comp(pTHX_ const SV * const pattern, const U32 flags)
+#endif
 {
     dSP;
-    REGEXP * rx;
+    struct regexp * rx;
+    REGEXP *RX;
+
     re__engine__Plugin re;
-    I32 count;
-    I32 buffers;
+    const xsh_hints_user_t *h;
 
-    /* exp/xend version of the pattern & length */
     STRLEN plen;
-    char*  exp = SvPV((SV*)pattern, plen);
-    char* xend = exp + 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);
 
-    /* The REGEXP structure to return to perl */
-    Newxz(rx, 1, REGEXP);
+    /* exp/xend version of the pattern & length */
+    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);
 
+    newREGEXP(RX);
+    rx = rxREGEXP(RX);
+
     re->rx = rx;                   /* Make the rx accessible from self->rx */
-    rx->refcnt = 1;                /* Refcount so we won' be destroyed */
     rx->intflags = flags;          /* Flags for internal use */
     rx->extflags = flags;          /* Flags for perl to use */
     rx->engine = RE_ENGINE_PLUGIN; /* Compile to use this engine */
 
+#if !XSH_HAS_PERL(5, 11, 0)
+    rx->refcnt = 1;                /* Refcount so we won't be destroyed */
+
     /* 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.
@@ -77,30 +238,39 @@ Plugin_comp(pTHX_ const SV * const pattern, const U32 flags)
     rx->wraplen = rx->prelen;
     Newx(rx->wrapped, rx->wraplen, char);
     Copy(rx->precomp, rx->wrapped, rx->wraplen, char);
+#endif
 
     /* Store our private object */
     rx->pprivate = obj;
 
     /* 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
+     * in between */
+    if (h->exec) {
+        re->cb_exec = h->exec;
+        SvREFCNT_inc_simple_void_NN(h->exec);
+    }
 
-    /*
-     * Call our callback function if one was defined, if not we've
-     * already set up all the stuff we're going to to need for
-     * subsequent exec and other calls
-     */
-    SV * callback = get_H_callback("comp");
+    re->cb_num_capture_buff_FETCH  = NULL;
+    re->cb_num_capture_buff_STORE  = NULL;
+    re->cb_num_capture_buff_LENGTH = NULL;
 
-    if (callback) {
-        ENTER;    
+    /* Call our callback function if one was defined, if not we've
+     * already set up all the stuff we're going to to need for
+     * subsequent exec and other calls */
+    if (h->comp) {
+        ENTER;
         SAVETMPS;
-   
+
         PUSHMARK(SP);
         XPUSHs(obj);
         PUTBACK;
 
-        call_sv(callback, G_DISCARD);
+        call_sv(h->comp, G_DISCARD);
 
         FREETMPS;
         LEAVE;
@@ -110,41 +280,42 @@ Plugin_comp(pTHX_ const SV * const pattern, const U32 flags)
      * update the regexp struct with the new info.
      */
 
-    buffers = rx->nparens;
-
-    Newxz(rx->offs, buffers, regexp_paren_pair);
+    Newxz(rx->offs, rx->nparens + 1, regexp_paren_pair);
 
-    return rx;
+    return RX;
 }
 
 I32
-Plugin_exec(pTHX_ REGEXP * const rx, char *stringarg, char *strend,
-            char *strbeg, I32 minend, SV *sv, void *data, U32 flags)
+Plugin_exec(pTHX_ REGEXP * const RX, char *stringarg, char *strend,
+            char *strbeg, REP_ENG_EXEC_MINEND_TYPE minend,
+            SV *sv, void *data, U32 flags)
 {
     dSP;
     I32 matched;
-    SV * callback = get_H_callback("exec");
+    struct regexp *rx = rxREGEXP(RX);
     GET_SELF_FROM_PPRIVATE(rx->pprivate);
 
-    if (callback) {
+    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;
-   
+
         PUSHMARK(SP);
         XPUSHs(rx->pprivate);
         XPUSHs(sv);
         PUTBACK;
 
-        call_sv(callback, G_SCALAR);
- 
-        SPAGAIN;
+        call_sv(self->cb_exec, G_SCALAR);
 
-        SV * ret = POPs;
+        SPAGAIN;
 
+        ret = POPs;
         if (SvTRUE(ret))
             matched = 1;
         else
@@ -161,11 +332,19 @@ Plugin_exec(pTHX_ REGEXP * const rx, char *stringarg, char *strend,
 }
 
 char *
-Plugin_intuit(pTHX_ REGEXP * const rx, SV *sv, char *strpos,
-                     char *strend, U32 flags, re_scream_pos_data *data)
+#if XSH_HAS_PERL(5, 19, 1)
+Plugin_intuit(pTHX_ REGEXP * const RX, SV *sv, const char * const strbeg,
+              char *strpos, char *strend, U32 flags, re_scream_pos_data *data)
+#else
+Plugin_intuit(pTHX_ REGEXP * const RX, SV *sv, char *strpos,
+              char *strend, U32 flags, re_scream_pos_data *data)
+#endif
 {
-    PERL_UNUSED_ARG(rx);
+    PERL_UNUSED_ARG(RX);
     PERL_UNUSED_ARG(sv);
+#if XSH_HAS_PERL(5, 19, 1)
+    PERL_UNUSED_ARG(strbeg);
+#endif
     PERL_UNUSED_ARG(strpos);
     PERL_UNUSED_ARG(strend);
     PERL_UNUSED_ARG(flags);
@@ -174,27 +353,46 @@ Plugin_intuit(pTHX_ REGEXP * const rx, SV *sv, char *strpos,
 }
 
 SV *
-Plugin_checkstr(pTHX_ REGEXP * const rx)
+Plugin_checkstr(pTHX_ REGEXP * const RX)
 {
-    PERL_UNUSED_ARG(rx);
+    PERL_UNUSED_ARG(RX);
     return NULL;
 }
 
 void
-Plugin_free(pTHX_ REGEXP * const rx)
+Plugin_free(pTHX_ REGEXP * const RX)
 {
-    PERL_UNUSED_ARG(rx);
+    struct regexp *rx;
+    re__engine__Plugin self;
+
+    if (PL_dirty)
+        return;
+
+    rx = rxREGEXP(RX);
+    SELF_FROM_PPRIVATE(self, rx->pprivate);
+
+    SvREFCNT_dec(self->pattern);
+    SvREFCNT_dec(self->str);
+
+    SvREFCNT_dec(self->cb_exec);
+
+    SvREFCNT_dec(self->cb_num_capture_buff_FETCH);
+    SvREFCNT_dec(self->cb_num_capture_buff_STORE);
+    SvREFCNT_dec(self->cb_num_capture_buff_LENGTH);
+
+    self->rx = NULL;
+    Safefree(self);
+
 /*
     dSP;
     SV * callback;
-    GET_SELF_FROM_PPRIVATE(rx->pprivate);
 
     callback = self->cb_free;
 
     if (callback) {
         ENTER;
         SAVETMPS;
-   
+
         PUSHMARK(SP);
         XPUSHs(rx->pprivate);
         PUTBACK;
@@ -210,20 +408,22 @@ Plugin_free(pTHX_ REGEXP * const rx)
 }
 
 void *
-Plugin_dupe(pTHX_ REGEXP * const rx, CLONE_PARAMS *param)
+Plugin_dupe(pTHX_ REGEXP * const RX, CLONE_PARAMS *param)
 {
+    struct regexp *rx = rxREGEXP(RX);
     Perl_croak(aTHX_ "dupe not supported yet");
     return rx->pprivate;
 }
 
 
 void
-Plugin_numbered_buff_FETCH(pTHX_ REGEXP * const rx, const I32 paren,
+Plugin_numbered_buff_FETCH(pTHX_ REGEXP * const RX, const I32 paren,
                            SV * const sv)
 {
     dSP;
     I32 items;
     SV * callback;
+    struct regexp *rx = rxREGEXP(RX);
     GET_SELF_FROM_PPRIVATE(rx->pprivate);
 
     callback = self->cb_num_capture_buff_FETCH;
@@ -231,18 +431,19 @@ Plugin_numbered_buff_FETCH(pTHX_ REGEXP * const rx, const I32 paren,
     if (callback) {
         ENTER;
         SAVETMPS;
-   
+
         PUSHMARK(SP);
         XPUSHs(rx->pprivate);
         XPUSHs(sv_2mortal(newSViv(paren)));
         PUTBACK;
 
         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);
@@ -257,12 +458,12 @@ Plugin_numbered_buff_FETCH(pTHX_ REGEXP * const rx, const I32 paren,
 }
 
 void
-Plugin_numbered_buff_STORE(pTHX_ REGEXP * const rx, const I32 paren,
+Plugin_numbered_buff_STORE(pTHX_ REGEXP * const RX, const I32 paren,
                            SV const * const value)
 {
     dSP;
-    I32 items;
     SV * callback;
+    struct regexp *rx = rxREGEXP(RX);
     GET_SELF_FROM_PPRIVATE(rx->pprivate);
 
     callback = self->cb_num_capture_buff_STORE;
@@ -270,11 +471,11 @@ Plugin_numbered_buff_STORE(pTHX_ REGEXP * const rx, const I32 paren,
     if (callback) {
         ENTER;
         SAVETMPS;
-   
+
         PUSHMARK(SP);
         XPUSHs(rx->pprivate);
         XPUSHs(sv_2mortal(newSViv(paren)));
-        XPUSHs(SvREFCNT_inc(value));
+        XPUSHs((SV *) value);
         PUTBACK;
 
         call_sv(callback, G_DISCARD);
@@ -286,20 +487,22 @@ Plugin_numbered_buff_STORE(pTHX_ REGEXP * const rx, const I32 paren,
 }
 
 I32
-Plugin_numbered_buff_LENGTH(pTHX_ REGEXP * const rx, const SV * const sv,
+Plugin_numbered_buff_LENGTH(pTHX_ REGEXP * const RX, const SV * const sv,
                               const I32 paren)
 {
     dSP;
-    I32 items;
     SV * callback;
+    struct regexp *rx = rxREGEXP(RX);
     GET_SELF_FROM_PPRIVATE(rx->pprivate);
 
     callback = self->cb_num_capture_buff_LENGTH;
 
     if (callback) {
+        IV ret;
+
         ENTER;
         SAVETMPS;
-   
+
         PUSHMARK(SP);
         XPUSHs(rx->pprivate);
         XPUSHs(sv_2mortal(newSViv(paren)));
@@ -309,7 +512,7 @@ Plugin_numbered_buff_LENGTH(pTHX_ REGEXP * const rx, const SV * const sv,
 
         SPAGAIN;
 
-        IV ret = POPi;
+        ret = POPi;
 
         PUTBACK;
         FREETMPS;
@@ -324,29 +527,57 @@ Plugin_numbered_buff_LENGTH(pTHX_ REGEXP * const rx, const SV * const sv,
 
 
 SV*
-Plugin_named_buff (pTHX_ REGEXP * const rx, SV * const key, SV * const value,
+Plugin_named_buff (pTHX_ REGEXP * const RX, SV * const key, SV * const value,
                    const U32 flags)
 {
     return NULL;
 }
 
 SV*
-Plugin_named_buff_iter (pTHX_ REGEXP * const rx, const SV * const lastkey,
+Plugin_named_buff_iter (pTHX_ REGEXP * const RX, const SV * const lastkey,
                         const U32 flags)
 {
     return NULL;
 }
 
 SV*
-Plugin_package(pTHX_ REGEXP * const rx)
+Plugin_package(pTHX_ REGEXP * const RX)
 {
-    PERL_UNUSED_ARG(rx);
+    PERL_UNUSED_ARG(RX);
     return newSVpvs("re::engine::Plugin");
 }
 
-MODULE = re::engine::Plugin	PACKAGE = re::engine::Plugin
+static void xsh_user_global_setup(pTHX) {
+     HV *stash;
+
+     stash = gv_stashpvn(XSH_PACKAGE, XSH_PACKAGE_LEN, 1);
+     newCONSTSUB(stash, "REP_THREADSAFE", newSVuv(XSH_THREADSAFE));
+     newCONSTSUB(stash, "REP_FORKSAFE",   newSVuv(XSH_FORKSAFE));
+
+    return;
+}
+
+/* --- XS ------------------------------------------------------------------ */
+
+MODULE = re::engine::Plugin       PACKAGE = re::engine::Plugin
+
 PROTOTYPES: DISABLE
 
+BOOT:
+{
+    xsh_setup();
+}
+
+#if XSH_THREADSAFE
+
+void
+CLONE(...)
+PPCODE:
+    xsh_clone();
+    XSRETURN(0);
+
+#endif /* XSH_THREADSAFE */
+
 void
 pattern(re::engine::Plugin self, ...)
 PPCODE:
@@ -357,45 +588,39 @@ str(re::engine::Plugin self, ...)
 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);
@@ -443,30 +668,53 @@ PPCODE:
         }
     }
 
+void
+_exec(re::engine::Plugin self, ...)
+PPCODE:
+    if (items > 1) {
+        SvREFCNT_dec(self->cb_exec);
+        self->cb_exec = ST(1);
+        SvREFCNT_inc_simple_void(self->cb_exec);
+    }
+
 void
 _num_capture_buff_FETCH(re::engine::Plugin self, ...)
 PPCODE:
     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
 _num_capture_buff_STORE(re::engine::Plugin self, ...)
 PPCODE:
     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
 _num_capture_buff_LENGTH(re::engine::Plugin self, ...)
 PPCODE:
     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 *
+_tag(SV *comp, SV *exec)
+PREINIT:
+    xsh_hints_user_t arg;
+CODE:
+    arg.comp = comp;
+    arg.exec = exec;
+    RETVAL = xsh_hints_tag(&arg);
+OUTPUT:
+    RETVAL
+
 void
 ENGINE()
 PPCODE: