diff options
Diffstat (limited to 'smartmatch.xs')
| -rw-r--r-- | smartmatch.xs | 32 |
1 files changed, 19 insertions, 13 deletions
diff --git a/smartmatch.xs b/smartmatch.xs index 5fa0280..49a13a8 100644 --- a/smartmatch.xs +++ b/smartmatch.xs @@ -38,10 +38,11 @@ STATIC OP* smartmatch_cb(pTHX_ OP *o, void *user_data) { OP *left, *right, *cb_op, *list, *new; - SV **cb; + SV **engine; + SV *cb_name; - cb = hv_fetchs(GvHV(PL_hintgv), "smartmatch_cb", 0); - if (!cb) { + engine = hv_fetchs(GvHV(PL_hintgv), "smartmatch_engine", 0); + if (!engine) { return o; } @@ -91,11 +92,16 @@ smartmatch_cb(pTHX_ OP *o, void *user_data) } #endif - cb_op = newCVREF(0, newSVOP(OP_CONST, 0, newSVsv(*cb))); + cb_name = newSVsv(*engine); + sv_catpv(cb_name, "::match"); + + cb_op = newUNOP(OP_RV2CV, 0, newGVOP(OP_GV, 0, gv_fetchsv(cb_name, 0, SVt_PVCV))); list = newLISTOP(OP_LIST, 0, left, right); new = newUNOP(OP_ENTERSUB, OPf_STACKED, op_append_elem(OP_LIST, list, cb_op)); + SvREFCNT_dec(cb_name); + return new; } @@ -113,20 +119,20 @@ BOOT: hook_op_check_smartmatch(); void -register (cb) - SV *cb; +register (engine) + SV *engine; CODE: - if (!SvROK(cb) || SvTYPE(SvRV(cb)) != SVt_PVCV) { - croak("not a coderef"); + if (SvROK(engine)) { + croak("not an engine name"); } PL_hints |= HINT_LOCALIZE_HH; gv_HVadd(PL_hintgv); - SvREFCNT_inc(cb); - if (!hv_stores(GvHV(PL_hintgv), "smartmatch_cb", cb)) { - SvREFCNT_dec(cb); - croak("couldn't store the callback"); + SvREFCNT_inc(engine); + if (!hv_stores(GvHV(PL_hintgv), "smartmatch_engine", engine)) { + SvREFCNT_dec(engine); + croak("couldn't store the engine"); } void @@ -135,4 +141,4 @@ unregister () PL_hints |= HINT_LOCALIZE_HH; gv_HVadd(PL_hintgv); - hv_delete(GvHV(PL_hintgv), "smartmatch_cb", 13, G_DISCARD); + hv_delete(GvHV(PL_hintgv), "smartmatch_engine", 17, G_DISCARD); |