X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=gitmo%2FMouse.git;a=blobdiff_plain;f=xs-src%2FMouseUtil.xs;h=c1d4d91cba7df1fdf66c17d63b2c45be0283d14a;hp=6af7e03981034db056c77591dd820ee412dfb118;hb=d4712779eb600de46ed09b09afd193d3def11786;hpb=6582d0e35a9937aa8869d868f10172935f48e1ce

diff --git a/xs-src/MouseUtil.xs b/xs-src/MouseUtil.xs
index 6af7e03..c1d4d91 100644
--- a/xs-src/MouseUtil.xs
+++ b/xs-src/MouseUtil.xs
@@ -21,8 +21,8 @@ mouse_mro_get_linear_isa(pTHX_ HV* const stash){
         return isa; /* returns the cache if available */
     }
     else{
-        SvREADONLY_off(isa);
-        av_clear(isa);
+        SvREFCNT_dec(isa);
+        GvAV(cachegv) = isa = newAV();
     }
 
     get_linear_isa = get_cv("Mouse::Util::get_linear_isa", TRUE);
@@ -44,7 +44,7 @@ mouse_mro_get_linear_isa(pTHX_ HV* const stash){
         avref = POPs;
         PUTBACK;
 
-        if(SvROK(avref) && SvTYPE(SvRV(avref)) == SVt_PVAV){
+        if(IsArrayRef(avref)){
             AV* const av  = (AV*)SvRV(avref);
             I32 const len = AvFILLp(av) + 1;
             I32 i;
@@ -65,7 +65,7 @@ mouse_mro_get_linear_isa(pTHX_ HV* const stash){
     }
 
     sv_setiv(gen, (IV)mro_get_pkg_gen(stash));
-    return GvAV(cachegv);
+    return isa;
 }
 #endif /* !no_mor_get_linear_isa */
 
@@ -196,6 +196,33 @@ mouse_call1 (pTHX_ SV *const self, SV *const method, SV* const arg1)
     return ret;
 }
 
+SV*
+mouse_get_metaclass(pTHX_ SV* metaclass_name){
+    CV* const get_metaclass  = get_cvs("Mouse::Util::get_metaclass_by_name", TRUE);
+    SV* metaclass;
+    dSP;
+
+    assert(metaclass_name);
+    if(IsObject(metaclass_name)){
+        HV* const stash = SvSTASH(metaclass_name);
+
+        metaclass_name = newSVpvn_share(HvNAME_get(stash), HvNAMELEN_get(stash), 0U);
+        sv_2mortal(metaclass_name);
+    }
+
+    PUSHMARK(SP);
+    XPUSHs(metaclass_name);
+    PUTBACK;
+
+    call_sv((SV*)get_metaclass, G_SCALAR);
+
+    SPAGAIN;
+    metaclass = POPs;
+    PUTBACK;
+
+    return metaclass;
+}
+
 MAGIC*
 mouse_mg_find(pTHX_ SV* const sv, const MGVTBL* const vtbl, I32 const flags){
     MAGIC* mg;
@@ -213,6 +240,21 @@ mouse_mg_find(pTHX_ SV* const sv, const MGVTBL* const vtbl, I32 const flags){
     return NULL;
 }
 
+GV*
+mouse_stash_fetch(pTHX_ HV* const stash, const char* const name, I32 const namelen, I32 const create) {
+    GV** const gvp = (GV**)hv_fetch(stash, name, namelen, create);
+
+    if(gvp){
+        if(!isGV(*gvp)){
+            gv_init(*gvp, stash, name, namelen, GV_ADDMULTI);
+        }
+        return *gvp;
+    }
+    else{
+        return NULL;
+    }
+}
+
 MODULE = Mouse::Util  PACKAGE = Mouse::Util
 
 PROTOTYPES:   DISABLE
@@ -252,7 +294,9 @@ get_code_ref(SV* package, SV* name)
 CODE:
 {
     HV* stash;
-    HE* he;
+    STRLEN name_len;
+    const char* name_pv;
+    GV* gv;
 
     if(!SvOK(package)){
         croak("You must define a package name");
@@ -265,19 +309,10 @@ CODE:
     if(!stash){
         XSRETURN_UNDEF;
     }
-    he = hv_fetch_ent(stash, name, FALSE, 0U);
-    if(he){
-        GV* const gv = (GV*)hv_iterval(stash, he);
-        if(!isGV(gv)){ /* special constant or stub */
-            STRLEN len;
-            const char* const pv = SvPV_const(name, len);
-            gv_init(gv, stash, pv, len, GV_ADDMULTI);
-        }
-        RETVAL = GvCVu(gv);
-    }
-    else{
-        RETVAL = NULL;
-    }
+
+    name_pv = SvPV_const(name, name_len);
+    gv = stash_fetch(stash, name_pv, name_len, FALSE);
+    RETVAL = gv ? GvCVu(gv) : NULL;
 
     if(!RETVAL){
         XSRETURN_UNDEF;