X-Git-Url: http://git.vpit.fr/?p=perl%2Fmodules%2Findirect.git;a=blobdiff_plain;f=indirect.xs;h=2c1f089cb7b2802bcf56ff8a9a82b56386379455;hp=c90f3b67e0d63d539aeeb2358c9bef232bc38c05;hb=a21a68b2f726d4002d20fb64677a52f72c520964;hpb=ce423bd1197ded1fbdc099c09d02af26de3977ae diff --git a/indirect.xs b/indirect.xs index c90f3b6..2c1f089 100644 --- a/indirect.xs +++ b/indirect.xs @@ -84,18 +84,26 @@ STATIC IV indirect_hint(pTHX) { /* ... op -> source position ............................................... */ -STATIC HV *indirect_map = NULL; -STATIC const char *indirect_linestr = NULL; +#define PTABLE_NAME ptable_map +#define PTABLE_VAL_FREE(V) SvREFCNT_dec(V) + +#define pPTBL pTHX +#define pPTBL_ pTHX_ +#define aPTBL aTHX +#define aPTBL_ aTHX_ + +#include "ptable.h" + +#define ptable_map_store(T, K, V) ptable_map_store(aTHX_ (T), (K), (V)) +#define ptable_map_clear(T) ptable_map_clear(aTHX_ (T)) +#define ptable_map_free(T) ptable_map_free(aTHX_ (T)) -/* We need (CHAR_BIT * sizeof(UV)) / 4 + 1 chars, but it's just better to take - * a power of two */ -#define OP2STR_BUF char buf[(CHAR_BIT * sizeof(UV)) / 2] -#define OP2STR(O) (sprintf(buf, "%"UVxf, PTR2UV(O))) +STATIC ptable *indirect_map = NULL; + +STATIC const char *indirect_linestr = NULL; STATIC void indirect_map_store(pTHX_ const OP *o, const char *src, SV *sv) { #define indirect_map_store(O, S, N) indirect_map_store(aTHX_ (O), (S), (N)) - OP2STR_BUF; - const char *pl_linestr; SV *val; /* When lex_inwhat is set, we're in a quotelike environment (qq, qr, but not q) @@ -103,9 +111,9 @@ STATIC void indirect_map_store(pTHX_ const OP *o, const char *src, SV *sv) { * still be alive somewhere. */ if (!PL_lex_inwhat) { - pl_linestr = SvPVX_const(PL_linestr); + const char *pl_linestr = SvPVX_const(PL_linestr); if (indirect_linestr != pl_linestr) { - hv_clear(indirect_map); + ptable_map_clear(indirect_map); indirect_linestr = pl_linestr; } } @@ -115,49 +123,25 @@ STATIC void indirect_map_store(pTHX_ const OP *o, const char *src, SV *sv) { SvUVX(val) = PTR2UV(src); SvIOK_on(val); SvIsUV_on(val); - if (!hv_store(indirect_map, buf, OP2STR(o), val, 0)) SvREFCNT_dec(val); + + ptable_map_store(indirect_map, o, val); } STATIC const char *indirect_map_fetch(pTHX_ const OP *o, SV ** const name) { #define indirect_map_fetch(O, S) indirect_map_fetch(aTHX_ (O), (S)) - OP2STR_BUF; - SV **val; + SV *val; if (indirect_linestr != SvPVX_const(PL_linestr)) return NULL; - val = hv_fetch(indirect_map, buf, OP2STR(o), 0); + val = ptable_fetch(indirect_map, o); if (!val) { *name = NULL; return NULL; } - *name = *val; - return INT2PTR(const char *, SvUVX(*val)); -} - -STATIC void indirect_map_delete(pTHX_ const OP *o) { -#define indirect_map_delete(O) indirect_map_delete(aTHX_ (O)) - OP2STR_BUF; - - hv_delete(indirect_map, buf, OP2STR(o), G_DISCARD); -} - -STATIC void indirect_map_clean_kids(pTHX_ const OP *o) { -#define indirect_map_clean_kids(O) indirect_map_clean_kids(aTHX_ (O)) - if (o->op_flags & OPf_KIDS) { - const OP *kid = cUNOPo->op_first; - for (; kid; kid = kid->op_sibling) { - indirect_map_clean_kids(kid); - indirect_map_delete(kid); - } - } -} - -STATIC void indirect_map_clean(pTHX_ const OP *o) { -#define indirect_map_clean(O) indirect_map_clean(aTHX_ (O)) - indirect_map_clean_kids(o); - indirect_map_delete(o); + *name = val; + return INT2PTR(const char *, SvUVX(val)); } STATIC const char *indirect_find(pTHX_ SV *sv, const char *s) { @@ -210,7 +194,7 @@ STATIC OP *indirect_ck_rv2sv(pTHX_ OP *o) { SV *sv; const char *name = NULL, *s; STRLEN len; - OPCODE type = op->op_type; + OPCODE type = (OPCODE) op->op_type; switch (type) { case OP_GV: @@ -222,9 +206,9 @@ STATIC OP *indirect_ck_rv2sv(pTHX_ OP *o) { } default: if ((PL_opargs[type] & OA_CLASS_MASK) == OA_SVOP) { - SV *sv = cSVOPx_sv(op); - if (SvPOK(sv) && (SvTYPE(sv) >= SVt_PV)) - name = SvPV_const(sv, len); + SV *nsv = cSVOPx_sv(op); + if (SvPOK(nsv) && (SvTYPE(nsv) >= SVt_PV)) + name = SvPV_const(nsv, len); } } if (!name) @@ -321,41 +305,50 @@ STATIC const char indirect_msg[] = "Indirect call of method \"%s\" on object \"% STATIC OP *(*indirect_old_ck_entersub)(pTHX_ OP *) = 0; STATIC OP *indirect_ck_entersub(pTHX_ OP *o) { - LISTOP *op; - OP *om, *oo; IV hint = indirect_hint(); o = CALL_FPTR(indirect_old_ck_entersub)(aTHX_ o); if (hint) { - const char *pm, *po; - SV *svm, *svo; - oo = o; + const char *mpos, *opos; + SV *mnamesv, *onamesv; + OP *mop, *oop; + LISTOP *lop; + + oop = o; do { - op = (LISTOP *) oo; - if (!op->op_flags & OPf_KIDS) + lop = (LISTOP *) oop; + if (!(lop->op_flags & OPf_KIDS)) goto done; - oo = op->op_first; - } while (oo->op_type != OP_PUSHMARK); - oo = oo->op_sibling; - om = op->op_last; - if (om->op_type == OP_METHOD) - om = cUNOPx(om)->op_first; - else if (om->op_type != OP_METHOD_NAMED) + oop = lop->op_first; + } while (oop->op_type != OP_PUSHMARK); + oop = oop->op_sibling; + mop = lop->op_last; + + if (mop->op_type == OP_METHOD) + mop = cUNOPx(mop)->op_first; + else if (mop->op_type != OP_METHOD_NAMED) + goto done; + + mpos = indirect_map_fetch(mop, &mnamesv); + if (!mpos) + goto done; + + opos = indirect_map_fetch(oop, &onamesv); + if (!opos) goto done; - pm = indirect_map_fetch(om, &svm); - po = indirect_map_fetch(oo, &svo); - if (pm && po && pm < po) { - const char *psvm = SvPV_nolen_const(svm), *psvo = SvPV_nolen_const(svo); + + if (mpos < opos) { + const char *mname = SvPV_nolen_const(mnamesv); + const char *oname = SvPV_nolen_const(onamesv); if (hint == 2) - croak(indirect_msg, psvm, psvo); + croak(indirect_msg, mname, oname); else - warn(indirect_msg, psvm, psvo); + warn(indirect_msg, mname, oname); } -done: - indirect_map_clean(o); } +done: return o; } @@ -371,7 +364,7 @@ BOOT: { if (!indirect_initialized++) { PERL_HASH(indirect_hash, "indirect", 8); - indirect_map = newHV(); + indirect_map = ptable_new(); indirect_old_ck_const = PL_check[OP_CONST]; PL_check[OP_CONST] = MEMBER_TO_FPTR(indirect_ck_const); indirect_old_ck_rv2sv = PL_check[OP_RV2SV];