X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FClass%2FC3%2FXS.xs;h=bdf3fa7a901189359784231f330b905e11731ac5;hb=6bf46d18464d8a54364f5f7d6b83647fb76c0512;hp=8e004cfbe68fd56adb0826938f060978c9f9cf38;hpb=b23e9cb9ccfb3d470c72b95818ce57c9b891381b;p=gitmo%2FClass-C3-XS.git

diff --git a/lib/Class/C3/XS.xs b/lib/Class/C3/XS.xs
index 8e004cf..bdf3fa7 100644
--- a/lib/Class/C3/XS.xs
+++ b/lib/Class/C3/XS.xs
@@ -3,7 +3,7 @@
 #include "perl.h"
 #include "XSUB.h"
 
-/* Most of this code is backported from bleadperl's
+/* Most of this code is backported from the bleadperl patch's
    mro.c, and then modified to work with Class::C3's
    internals.
 */
@@ -32,10 +32,14 @@ __mro_linear_isa_c3(pTHX_ HV* stash, HV* cache, I32 level)
               stashname);
 
     if(!cache) {
-        cache = newHV();
+        cache = sv_2mortal(newHV());
     }
     else {
-        /* XXX return cached entry for stashname if available */
+/*
+        SV** cache_entry = hv_fetch(cache, stashname, stashname_len, 0);
+        if(cache_entry)
+            return (AV*)SvREFCNT_inc(*cache_entry);
+*/
     }
 
     /* not in cache, make a new one */
@@ -139,8 +143,8 @@ __mro_linear_isa_c3(pTHX_ HV* stash, HV* cache, I32 level)
 
     SvREADONLY_on(retval);
     SvREFCNT_inc(retval); /* for cache storage */
-    SvREFCNT_inc(retval); /* for return to caller */
-    /* XXX store in cache storage */
+    SvREFCNT_inc(retval); /* for return */
+    /* hv_store(cache, stashname, stashname_len, (SV*)retval, 0); */
     return retval;
 }
 
@@ -277,8 +281,7 @@ __nextcan(pTHX_ SV* self, I32 throw_nomethod)
     stashname_len = subname - fq_subname - 2;
     stashname = sv_2mortal(newSVpvn(fq_subname, stashname_len));
 
-    linear_av = __mro_linear_isa_c3(selfstash, NULL, 0); /* has ourselves at the top of the list */
-    sv_2mortal((SV*)linear_av);
+    linear_av = (AV*)sv_2mortal((SV*)__mro_linear_isa_c3(selfstash, NULL, 0));
 
     linear_svp = AvARRAY(linear_av);
     items = AvFILLp(linear_av) + 1;
@@ -291,9 +294,26 @@ __nextcan(pTHX_ SV* self, I32 throw_nomethod)
     }
 
     if(items > 0) {
+        SV* sub_sv = sv_2mortal(newSVpv(subname, subname_len));
+        HV* cc3_mro = get_hv("Class::C3::MRO", 0);
+
         while (items--) {
             linear_sv = *linear_svp++;
             assert(linear_sv);
+
+            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;
+                    }
+                }
+            }
+
             cstash = gv_stashsv(linear_sv, FALSE);
 
             if (!cstash) {
@@ -305,8 +325,6 @@ __nextcan(pTHX_ SV* self, I32 throw_nomethod)
 
             assert(cstash);
 
-/* XXX we need to fetch from %Class::C3::MRO, not the real stash table */
-
             gvp = (GV**)hv_fetch(cstash, subname, subname_len, 0);
             if (!gvp) continue;
 
@@ -359,7 +377,6 @@ XS(XS_Class_C3_XS_calculateMRO)
 
     res = (AV*)sv_2mortal((SV*)__mro_linear_isa_c3(class_stash, cache, 0));
 
-
     res_items = ret_items = AvFILLp(res) + 1;
     res_ptr = AvARRAY(res);