AV* isa;
const char* stashname;
STRLEN stashname_len;
+ I32 made_mortal_cache = 0;
assert(stash);
assert(HvAUX(stash));
if(!cache) {
cache = (HV*)sv_2mortal((SV*)newHV());
+ made_mortal_cache = 1;
}
else {
SV** cache_entry = hv_fetch(cache, stashname, stashname_len, 0);
/* not in cache, make a new one */
- retval = (AV*)sv_2mortal((SV*)newAV());
- av_push(retval, newSVpvn(stashname, stashname_len)); /* us first */
-
gvp = (GV**)hv_fetch(stash, "ISA", 3, FALSE);
isa = (gvp && (gv = *gvp) && gv != (GV*)&PL_sv_undef) ? GvAV(gv) : NULL;
if(isa && AvFILLp(isa) >= 0) {
SV** seqs_ptr;
I32 seqs_items;
- HV* tails = (HV*)sv_2mortal((SV*)newHV());
- AV* seqs = (AV*)sv_2mortal((SV*)newAV());
+ HV* const tails = (HV*)sv_2mortal((SV*)newHV());
+ AV* const seqs = (AV*)sv_2mortal((SV*)newAV());
+ I32* heads;
+
I32 items = AvFILLp(isa) + 1;
SV** isa_ptr = AvARRAY(isa);
while(items--) {
- AV* isa_lin;
- SV* isa_item = *isa_ptr++;
- HV* isa_item_stash = gv_stashsv(isa_item, 0);
+ SV* const isa_item = *isa_ptr++;
+ HV* const isa_item_stash = gv_stashsv(isa_item, 0);
if(!isa_item_stash) {
- isa_lin = newAV();
+ AV* const isa_lin = newAV();
av_push(isa_lin, newSVsv(isa_item));
+ av_push(seqs, (SV*)isa_lin);
}
else {
- isa_lin = (AV*)sv_2mortal((SV*)__mro_linear_isa_c3(aTHX_ isa_item_stash, cache, level + 1)); /* recursion */
+ AV* const isa_lin = __mro_linear_isa_c3(aTHX_ isa_item_stash, cache, level + 1); /* recursion */
+ av_push(seqs, (SV*)isa_lin);
}
- av_push(seqs, (SV*)av_make(AvFILLp(isa_lin)+1, AvARRAY(isa_lin)));
}
- av_push(seqs, (SV*)av_make(AvFILLp(isa)+1, AvARRAY(isa)));
+ av_push(seqs, SvREFCNT_inc((SV*)isa));
+
+ /* This builds "heads", which as an array of integer array
+ indices, one per seq, which point at the virtual "head"
+ of the seq (initially zero) */
+
+ Newz(0xdead, heads, AvFILLp(seqs)+1, I32);
+ /* This builds %tails, which has one key for every class
+ mentioned in the tail of any sequence in @seqs (tail meaning
+ everything after the first class, the "head"). The value
+ is how many times this key appears in the tails of @seqs.
+ */
seqs_ptr = AvARRAY(seqs);
seqs_items = AvFILLp(seqs) + 1;
while(seqs_items--) {
- AV* seq = (AV*)*seqs_ptr++;
+ AV* const seq = (AV*)*seqs_ptr++;
I32 seq_items = AvFILLp(seq);
if(seq_items > 0) {
SV** seq_ptr = AvARRAY(seq) + 1;
while(seq_items--) {
- SV* seqitem = *seq_ptr++;
- HE* he = hv_fetch_ent(tails, seqitem, 0, 0);
+ SV* const seqitem = *seq_ptr++;
+ HE* const he = hv_fetch_ent(tails, seqitem, 0, 0);
if(!he) {
hv_store_ent(tails, seqitem, newSViv(1), 0);
}
else {
- SV* val = HeVAL(he);
+ SV* const val = HeVAL(he);
sv_inc(val);
}
}
}
}
+ /* Initialize retval to build the return value in */
+ retval = newAV();
+ av_push(retval, newSVpvn(stashname, stashname_len)); /* us first */
+
while(1) {
- SV* seqhead = NULL;
SV* cand = NULL;
SV* winner = NULL;
- SV* val;
- HE* tail_entry;
- AV* seq;
- SV** avptr = AvARRAY(seqs);
- items = AvFILLp(seqs)+1;
- while(items--) {
+ int s;
+
+ SV** const avptr = AvARRAY(seqs);
+ for(s = 0; s <= AvFILLp(seqs); s++) {
SV** svp;
- seq = (AV*)*avptr++;
- if(AvFILLp(seq) < 0) continue;
- svp = av_fetch(seq, 0, 0);
+ AV * const seq = (AV*)(avptr[s]);
+ SV* seqhead;
+ if(!seq) continue;
+ svp = av_fetch(seq, heads[s], 0);
seqhead = *svp;
if(!winner) {
+ HE* tail_entry;
+ SV* val;
cand = seqhead;
if((tail_entry = hv_fetch_ent(tails, cand, 0, 0))
&& (val = HeVAL(tail_entry))
av_push(retval, winner);
}
if(!sv_cmp(seqhead, winner)) {
- sv_2mortal(av_shift(seq));
- if(AvFILLp(seq) < 0) continue;
- svp = av_fetch(seq, 0, 0);
- seqhead = *svp;
- tail_entry = hv_fetch_ent(tails, seqhead, 0, 0);
- val = HeVAL(tail_entry);
- sv_dec(val);
+ const int new_head = ++heads[s];
+ if(new_head > AvFILLp(seq)) {
+ SvREFCNT_dec(avptr[s]);
+ avptr[s] = NULL;
+ }
+ else {
+ HE* tail_entry;
+ SV* val;
+ /* Because we know this new seqhead used to be
+ a tail, we can assume it is in tails and has
+ a positive value, which we need to dec */
+ svp = av_fetch(seq, new_head, 0);
+ seqhead = *svp;
+ tail_entry = hv_fetch_ent(tails, seqhead, 0, 0);
+ val = HeVAL(tail_entry);
+ sv_dec(val);
+ }
}
}
- if(!cand) break;
- if(!winner)
+ if(!cand) {
+ Safefree(heads);
+ break;
+ }
+ if(!winner) {
+ SvREFCNT_dec(retval);
+ Safefree(heads);
Perl_croak(aTHX_ "Inconsistent hierarchy during C3 merge of class '%s': "
"merging failed on parent '%s'", stashname, SvPV_nolen(cand));
+ }
}
}
+ else { /* @ISA does not exist, or was empty */
+ retval = newAV();
+ av_push(retval, newSVpvn(stashname, stashname_len)); /* us first */
+ }
SvREADONLY_on(retval);
- SvREFCNT_inc(retval); /* for cache storage */
- SvREFCNT_inc(retval); /* for return */
- hv_store(cache, stashname, stashname_len, (SV*)retval, 0);
+
+ if(!made_mortal_cache) {
+ SvREFCNT_inc(retval);
+ hv_store(cache, stashname, stashname_len, (SV*)retval, 0);
+ }
+
return retval;
}
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* 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_plsubgen);
+XS(XS_Class_C3_XS_plsubgen)
+{
+ #ifdef dVAR
+ dVAR; dXSARGS;
+ #else
+ dXSARGS;
+ #endif
+
+ SP -= items;
+ XPUSHs(sv_2mortal(newSViv(PL_sub_generation)));
+ 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 = NULL;
+ HV* methods;
+ I32 mroitems;
+
+ /* temps */
+ HV* hv;
+ HE* he;
+ 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_noinc((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;
+ HE* ourent;
+ HV* meth_hash;
+ SV* orig;
+
+ mskey = hv_iterkeysv(he);
+ if(hv_exists_ent(methods, mskey, 0)) continue;
+
+ msval = hv_iterval(mro_stash, he);
+ if(SvTYPE(msval) != SVt_PVGV || !(code = GvCVu(msval)))
+ continue;
+
+ if((ourent = hv_fetch_ent(class_stash, mskey, 0, 0))) {
+ SV* val = HeVAL(ourent);
+ if(val && SvTYPE(val) == SVt_PVGV && GvCVu(val))
+ continue;
+ }
+
+ meth_hash = newHV();
+ 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);
+ if(has_ovf) hv_store(our_c3mro, "has_overload_fallback", 21, SvREFCNT_inc(has_ovf), 0);
+ XSRETURN_EMPTY;
+}
+
XS(XS_next_can);
XS(XS_next_can)
{
BOOT:
newXS("Class::C3::XS::calculateMRO", XS_Class_C3_XS_calculateMRO, __FILE__);
+ newXS("Class::C3::XS::_plsubgen", XS_Class_C3_XS_plsubgen, __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