internals.
*/
-/* This is %next::METHOD_CACHE */
-STATIC HV* nmcache;
-
AV*
__mro_linear_isa_c3(pTHX_ HV* stash, HV* cache, I32 level)
{
STRLEN stashname_len;
assert(stash);
- assert(HvAUX(stash));
stashname = HvNAME(stash);
stashname_len = strlen(stashname);
/* not in cache, make a new one */
- retval = (AV*)sv_2mortal((SV*)newAV());
+ retval = newAV();
av_push(retval, newSVpvn(stashname, stashname_len)); /* us first */
gvp = (GV**)hv_fetch(stash, "ISA", 3, FALSE);
}
}
if(!cand) break;
- if(!winner)
+ if(!winner) {
+ SvREFCNT_dec(retval);
Perl_croak(aTHX_ "Inconsistent hierarchy during C3 merge of class '%s': "
"merging failed on parent '%s'", stashname, SvPV_nolen(cand));
+ }
}
}
SvREADONLY_on(retval);
- SvREFCNT_inc(retval); /* for cache storage */
- SvREFCNT_inc(retval); /* for return */
hv_store(cache, stashname, stashname_len, (SV*)retval, 0);
- return retval;
+ return (AV*)SvREFCNT_inc(retval);
}
STATIC I32
CV* cand_cv = NULL;
const char *hvname;
I32 items;
+ HV* nmcache;
HE* cache_entry;
SV* cachekey;
hvname = HvNAME(selfstash);
if (!hvname)
- croak("Can't use anonymous symbol table for method lookup");
+ Perl_croak(aTHX_ "Can't use anonymous symbol table for method lookup");
cxix = __dopoptosub_at(cxstack, cxstack_ix);
/* we may be in a higher stacklevel, so dig down deeper */
while (cxix < 0) {
if(top_si->si_type == PERLSI_MAIN)
- croak("next::method/next::can/maybe::next::method must be used in method context");
+ Perl_croak(aTHX_ "next::method/next::can/maybe::next::method must be used in method context");
top_si = top_si->si_prev;
ccstack = top_si->si_cxstack;
cxix = __dopoptosub_at(ccstack, top_si->si_cxix);
subname = strrchr(fq_subname, ':');
if(!subname)
- croak("next::method/next::can/maybe::next::method cannot find enclosing method");
+ Perl_croak(aTHX_ "next::method/next::can/maybe::next::method cannot find enclosing method");
subname++;
subname_len = fq_subname_len - (subname - fq_subname);
sv_catpvn(cachekey, "|", 1);
sv_catsv(cachekey, sv);
+ nmcache = get_hv("next::METHOD_CACHE", 1);
if((cache_entry = hv_fetch_ent(nmcache, cachekey, 0, 0))) {
SV* val = HeVAL(cache_entry);
if(val == &PL_sv_undef) {
if(throw_nomethod)
- croak("No next::method '%s' found for %s", subname, hvname);
+ Perl_croak(aTHX_ "No next::method '%s' found for %s", subname, hvname);
return &PL_sv_undef;
}
return SvREFCNT_inc(val);
stashname_len = subname - fq_subname - 2;
stashname = sv_2mortal(newSVpvn(fq_subname, stashname_len));
- linear_av = (AV*)sv_2mortal((SV*)__mro_linear_isa_c3(aTHX_ selfstash, NULL, 0));
+ linear_av = __mro_linear_isa_c3(aTHX_ selfstash, NULL, 0);
linear_svp = AvARRAY(linear_av);
items = AvFILLp(linear_av) + 1;
if(cc3_mro) {
HE* he_cc3_mro_class = hv_fetch_ent(cc3_mro, linear_sv, 0, 0);
if(he_cc3_mro_class) {
- HV* cc3_mro_class = (HV*)SvRV(HeVAL(he_cc3_mro_class));
- SV** svp_cc3_mro_class_methods = hv_fetch(cc3_mro_class, "methods", 7, 0);
- if(svp_cc3_mro_class_methods) {
- HV* cc3_mro_class_methods = (HV*)SvRV(*svp_cc3_mro_class_methods);
- if(hv_exists_ent(cc3_mro_class_methods, sub_sv, 0))
- continue;
+ SV* cc3_mro_class_sv = HeVAL(he_cc3_mro_class);
+ if(SvROK(cc3_mro_class_sv)) {
+ HV* cc3_mro_class = (HV*)SvRV(cc3_mro_class_sv);
+ SV** svp_cc3_mro_class_methods = hv_fetch(cc3_mro_class, "methods", 7, 0);
+ if(svp_cc3_mro_class_methods) {
+ SV* cc3_mro_class_methods_sv = *svp_cc3_mro_class_methods;
+ if(SvROK(cc3_mro_class_methods_sv)) {
+ HV* cc3_mro_class_methods = (HV*)SvRV(cc3_mro_class_methods_sv);
+ if(hv_exists_ent(cc3_mro_class_methods, sub_sv, 0))
+ continue;
+ }
+ }
}
}
}
if (SvTYPE(candidate) != SVt_PVGV)
gv_init(candidate, cstash, subname, subname_len, TRUE);
if (SvTYPE(candidate) == SVt_PVGV && (cand_cv = GvCV(candidate)) && !GvCVGEN(candidate)) {
+ SvREFCNT_dec(linear_av);
SvREFCNT_inc((SV*)cand_cv);
hv_store_ent(nmcache, newSVsv(cachekey), (SV*)cand_cv, 0);
return (SV*)cand_cv;
}
}
+ SvREFCNT_dec(linear_av);
hv_store_ent(nmcache, newSVsv(cachekey), &PL_sv_undef, 0);
if(throw_nomethod)
- croak("No next::method '%s' found for %s", subname, hvname);
+ Perl_croak(aTHX_ "No next::method '%s' found for %s", subname, hvname);
return &PL_sv_undef;
}
if(items == 2) cache = (HV*)SvRV(ST(1));
class_stash = gv_stashsv(classname, 0);
- if(!class_stash) croak("No such class: '%s'!", SvPV_nolen(classname));
+ if(!class_stash)
+ Perl_croak(aTHX_ "No such class: '%s'!", SvPV_nolen(classname));
- res = (AV*)sv_2mortal((SV*)__mro_linear_isa_c3(aTHX_ class_stash, cache, 0));
+ res = __mro_linear_isa_c3(aTHX_ class_stash, cache, 0);
res_items = ret_items = AvFILLp(res) + 1;
res_ptr = AvARRAY(res);
while(res_items--) {
SV* res_item = *res_ptr++;
- XPUSHs(res_item);
+ XPUSHs(sv_2mortal(newSVsv(res_item)));
}
+ SvREFCNT_dec(res);
PUTBACK;
return;
}
+XS(XS_Class_C3_XS_calc_mdt);
+XS(XS_Class_C3_XS_calc_mdt)
+{
+#ifdef dVAR
+ dVAR; dXSARGS;
+#else
+ dXSARGS;
+#endif
+
+ SV* classname;
+ HV* cache;
+ HV* class_stash;
+ AV* class_mro;
+ HV* our_c3mro; /* $Class::C3::MRO{classname} */
+ SV* has_ovf;
+ HV* methods;
+ I32 mroitems;
+
+ /* temps */
+ HV* hv;
+ HE* he;
+ SV* rv;
+ SV** svp;
+
+ if(items < 1 || items > 2)
+ croak("Usage: calculate_method_dispatch_table(classname[, cache])");
+
+ classname = ST(0);
+ class_stash = gv_stashsv(classname, 0);
+ if(!class_stash)
+ Perl_croak(aTHX_ "No such class: '%s'!", SvPV_nolen(classname));
+
+ if(items == 2) cache = (HV*)SvRV(ST(1));
+
+ class_mro = __mro_linear_isa_c3(aTHX_ class_stash, cache, 0);
+
+ our_c3mro = newHV();
+ hv_store(our_c3mro, "MRO", 3, (SV*)newRV_inc((SV*)class_mro), 0);
+
+ hv = get_hv("Class::C3::MRO", 1);
+ hv_store_ent(hv, classname, (SV*)newRV_noinc((SV*)our_c3mro), 0);
+
+ methods = newHV();
+
+ /* skip first entry */
+ mroitems = AvFILLp(class_mro);
+ svp = AvARRAY(class_mro) + 1;
+ while(mroitems--) {
+ SV* mro_class = *svp++;
+ HV* mro_stash = gv_stashsv(mro_class, 0);
+
+ if(!mro_stash) continue;
+
+ /*if(!has_ovf) {
+ SV** ovfp = hv_fetch(mro_stash, "()", 2, 0);
+ if(ovfp) has_ovf = *ovfp;
+ }*/
+
+ hv_iterinit(mro_stash);
+ while(he = hv_iternext(mro_stash)) {
+ CV* code;
+ SV* mskey;
+ SV* msval = hv_iterval(mro_stash, he);
+ if(SvTYPE(msval) != SVt_PVGV || !(code = GvCVu(msval)))
+ continue;
+
+ mskey = hv_iterkeysv(he);
+ if(hv_exists_ent(methods, mskey, 0)) continue;
+ if((he = hv_fetch_ent(class_stash, mskey, 0, 0))) {
+ SV* val = HeVAL(he);
+ if(val && SvTYPE(val) == SVt_PVGV && GvCVu(msval))
+ continue;
+ }
+
+ {
+ HV* meth_hash = newHV();
+ SV* orig = newSVsv(mro_class);
+ sv_catpvn(orig, "::", 2);
+ sv_catsv(orig, mskey);
+ hv_store(meth_hash, "orig", 4, orig, 0);
+ hv_store(meth_hash, "code", 4, newRV_inc((SV*)code), 0);
+ hv_store_ent(methods, mskey, newRV_noinc((SV*)meth_hash), 0);
+ }
+ }
+ }
+
+ hv_store(our_c3mro, "methods", 7, newRV_noinc((SV*)methods), 0);
+ hv_store(our_c3mro, "has_overload_fallback", 21, has_ovf ? SvREFCNT_inc(has_ovf) : &PL_sv_undef, 0);
+ XSRETURN_EMPTY;
+}
+
XS(XS_next_can);
XS(XS_next_can)
{
MODULE = Class::C3::XS PACKAGE = Class::C3::XS
BOOT:
- nmcache = get_hv("next::METHOD_CACHE", 1);
newXS("Class::C3::XS::calculateMRO", XS_Class_C3_XS_calculateMRO, __FILE__);
+ newXS("Class::C3::XS::_calculate_method_dispatch_table", XS_Class_C3_XS_calc_mdt, __FILE__);
newXS("next::can", XS_next_can, __FILE__);
newXS("next::method", XS_next_method, __FILE__);
newXS("maybe::next::method", XS_maybe_next_method, __FILE__);
+
projects / gitmo/Class-C3-XS.git / blobdiff