Add BUILDARGS tests

[gitmo/Mouse.git] / xs-src / MouseUtil.xs

diff --git a/xs-src/MouseUtil.xs b/xs-src/MouseUtil.xs
index b1b4f05..2e7f50b 100644 (file)
--- a/xs-src/MouseUtil.xs
+++ b/xs-src/MouseUtil.xs
@@ -5,67 +5,67 @@
 #ifdef no_mro_get_linear_isa
 AV*
 mouse_mro_get_linear_isa(pTHX_ HV* const stash){
-       GV* const cachegv = *(GV**)hv_fetchs(stash, ISA_CACHE, TRUE);
-       AV* isa;
-       SV* gen;
-       CV* get_linear_isa;
-
-       if(!isGV(cachegv))
-               gv_init(cachegv, stash, ISA_CACHE, sizeof(ISA_CACHE)-1, TRUE);
-
-       isa = GvAVn(cachegv);
-       gen = GvSVn(cachegv);
-
-
-       if(SvIOK(gen) && SvIVX(gen) == (IV)mro_get_pkg_gen(stash)){
-               return isa; /* returns the cache if available */
-       }
-       else{
-               SvREADONLY_off(isa);
-               av_clear(isa);
-       }
-
-       get_linear_isa = get_cv("Mouse::Util::get_linear_isa", TRUE);
-
-       {
-               SV* avref;
-               dSP;
-
-               ENTER;
-               SAVETMPS;
-
-               PUSHMARK(SP);
-               mXPUSHp(HvNAME_get(stash), HvNAMELEN_get(stash));
-               PUTBACK;
-
-               call_sv((SV*)get_linear_isa, G_SCALAR);
-
-               SPAGAIN;
-               avref = POPs;
-               PUTBACK;
-
-               if(SvROK(avref) && SvTYPE(SvRV(avref)) == SVt_PVAV){
-                       AV* const av  = (AV*)SvRV(avref);
-                       I32 const len = AvFILLp(av) + 1;
-                       I32 i;
-
-                       for(i = 0; i < len; i++){
-                               HV* const stash = gv_stashsv(AvARRAY(av)[i], FALSE);
-                               if(stash)
-                                       av_push(isa, newSVpv(HvNAME(stash), 0));
-                       }
-                       SvREADONLY_on(isa);
-               }
-               else{
-                       Perl_croak(aTHX_ "Mouse:Util::get_linear_isa() didn't return an ARRAY reference");
-               }
-
-               FREETMPS;
-               LEAVE;
-       }
-
-       sv_setiv(gen, (IV)mro_get_pkg_gen(stash));
-       return GvAV(cachegv);
+    GV* const cachegv = *(GV**)hv_fetchs(stash, ISA_CACHE, TRUE);
+    AV* isa;
+    SV* gen;
+    CV* get_linear_isa;
+
+    if(!isGV(cachegv))
+        gv_init(cachegv, stash, ISA_CACHE, sizeof(ISA_CACHE)-1, TRUE);
+
+    isa = GvAVn(cachegv);
+    gen = GvSVn(cachegv);
+
+
+    if(SvIOK(gen) && SvIVX(gen) == (IV)mro_get_pkg_gen(stash)){
+        return isa; /* returns the cache if available */
+    }
+    else{
+        SvREFCNT_dec(isa);
+        GvAV(cachegv) = isa = newAV();
+    }
+
+    get_linear_isa = get_cv("Mouse::Util::get_linear_isa", TRUE);
+
+    {
+        SV* avref;
+        dSP;
+
+        ENTER;
+        SAVETMPS;
+
+        PUSHMARK(SP);
+        mXPUSHp(HvNAME_get(stash), HvNAMELEN_get(stash));
+        PUTBACK;
+
+        call_sv((SV*)get_linear_isa, G_SCALAR);
+
+        SPAGAIN;
+        avref = POPs;
+        PUTBACK;
+
+        if(IsArrayRef(avref)){
+            AV* const av  = (AV*)SvRV(avref);
+            I32 const len = AvFILLp(av) + 1;
+            I32 i;
+
+            for(i = 0; i < len; i++){
+                HV* const stash = gv_stashsv(AvARRAY(av)[i], FALSE);
+                if(stash)
+                    av_push(isa, newSVpv(HvNAME(stash), 0));
+            }
+            SvREADONLY_on(isa);
+        }
+        else{
+            Perl_croak(aTHX_ "Mouse:Util::get_linear_isa() didn't return an ARRAY reference");
+        }
+
+        FREETMPS;
+        LEAVE;
+    }
+
+    sv_setiv(gen, (IV)mro_get_pkg_gen(stash));
+    return isa;
 }
 #endif /* !no_mor_get_linear_isa */
 
@@ -112,31 +112,6 @@ mouse_throw_error(SV* const metaobject, SV* const data /* not used */, const cha
     }
 }
 
-
-/* equivalent to "blessed($x) && $x->isa($klass)" */
-bool
-mouse_is_instance_of(pTHX_ SV* const sv, SV* const klass){
-    assert(sv);
-    assert(klass);
-
-    if(IsObject(sv) && SvOK(klass)){
-        bool ok;
-
-        ENTER;
-        SAVETMPS;
-
-        ok = SvTRUEx(mcall1s(sv, "isa", klass));
-
-        FREETMPS;
-        LEAVE;
-
-        return ok;
-    }
-
-    return FALSE;
-}
-
-
 bool
 mouse_is_class_loaded(pTHX_ SV * const klass){
     HV *stash;
@@ -221,6 +196,25 @@ mouse_call1 (pTHX_ SV *const self, SV *const method, SV* const arg1)
     return ret;
 }
 
+SV*
+mouse_get_metaclass_by_name(pTHX_ SV* const metaclass_name){
+    CV* const get_metaclass  = get_cvs("Mouse::Util::get_metaclass_by_name", TRUE);
+    SV* metaclass;
+    dSP;
+
+    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;
@@ -238,6 +232,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
@@ -277,7 +286,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");
@@ -290,19 +301,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;
@@ -332,7 +334,7 @@ PPCODE:
         name_pv = SvPV_nolen_const(predicate_name);
     }
 
-    xsub = generate_isa_predicate_for(aTHX_ klass, name_pv);
+    xsub = mouse_generate_isa_predicate_for(aTHX_ klass, name_pv);
 
     if(predicate_name == NULL){ /* anonymous predicate */
         XPUSHs( newRV_noinc((SV*)xsub) );