X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=gitmo%2FMouse.git;a=blobdiff_plain;f=xs-src%2FMouseUtil.xs;h=8704d89cac03dbbbb7fa85e4afc0b8d86109e4fb;hp=0e2ae3b454ff42dd5da8a3d340cff59c759a1513;hb=0ffc4183de68b15deeec5d662d9cc1d125dabf26;hpb=646c0371bdfda5817f842c54577c4d5605a4c3c0

diff --git a/xs-src/MouseUtil.xs b/xs-src/MouseUtil.xs
index 0e2ae3b..8704d89 100644
--- a/xs-src/MouseUtil.xs
+++ b/xs-src/MouseUtil.xs
@@ -1,71 +1,77 @@
 #include "mouse.h"
 
+#define MY_CXT_KEY "Mouse::Util::_guts" XS_VERSION
+typedef struct {
+    HV* metas;
+} my_cxt_t;
+START_MY_CXT
+
 #define ISA_CACHE "::LINEALIZED_ISA_CACHE::"
 
 #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 +118,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;
@@ -181,9 +162,8 @@ mouse_is_class_loaded(pTHX_ SV * const klass){
 }
 
 
-SV *
-mouse_call0 (pTHX_ SV *const self, SV *const method)
-{
+SV*
+mouse_call0 (pTHX_ SV* const self, SV* const method) {
     dSP;
     SV *ret;
 
@@ -200,9 +180,8 @@ mouse_call0 (pTHX_ SV *const self, SV *const method)
     return ret;
 }
 
-SV *
-mouse_call1 (pTHX_ SV *const self, SV *const method, SV* const arg1)
-{
+SV*
+mouse_call1 (pTHX_ SV* const self, SV* const method, SV* const arg1) {
     dSP;
     SV *ret;
 
@@ -221,6 +200,31 @@ mouse_call1 (pTHX_ SV *const self, SV *const method, SV* const arg1)
     return ret;
 }
 
+int
+mouse_predicate_call(pTHX_ SV* const self, SV* const method) {
+    return sv_true( mcall0(self, method) );
+}
+
+SV*
+mouse_get_metaclass(pTHX_ SV* metaclass_name){
+    dMY_CXT;
+    HE* he;
+
+    assert(metaclass_name);
+    assert(MY_CXT.metas);
+
+    if(IsObject(metaclass_name)){
+        HV* const stash = SvSTASH(SvRV(metaclass_name));
+
+        metaclass_name = newSVpvn_share(HvNAME_get(stash), HvNAMELEN_get(stash), 0U);
+        sv_2mortal(metaclass_name);
+    }
+
+    he = hv_fetch_ent(MY_CXT.metas, metaclass_name, FALSE, 0U);
+
+    return he ? HeVAL(he) : &PL_sv_undef;
+}
+
 MAGIC*
 mouse_mg_find(pTHX_ SV* const sv, const MGVTBL* const vtbl, I32 const flags){
     MAGIC* mg;
@@ -238,11 +242,71 @@ 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
 VERSIONCHECK: DISABLE
 
+BOOT:
+{
+    MY_CXT_INIT;
+    MY_CXT.metas = NULL;
+}
+
+void
+__register_metaclass_storage(HV* metas, bool cloning)
+CODE:
+{
+    if(cloning){
+        MY_CXT_CLONE;
+        MY_CXT.metas = NULL;
+    }
+    {
+        dMY_CXT;
+        if(MY_CXT.metas) croak("Cannot set metaclass storage more than once");
+        MY_CXT.metas = metas;
+        SvREFCNT_inc_simple_void_NN(metas);
+    }
+}
+
+bool
+is_valid_class_name(SV* sv)
+CODE:
+{
+    SvGETMAGIC(sv);
+    if(SvPOKp(sv) && SvCUR(sv) > 0){
+        UV i;
+        RETVAL = TRUE;
+        for(i = 0; i < SvCUR(sv); i++){
+            char const c = SvPVX(sv)[i];
+            if(!(isALNUM(c) || c == ':')){
+                RETVAL = FALSE;
+                break;
+            }
+        }
+    }
+    else{
+        RETVAL = SvNIOKp(sv) ? TRUE : FALSE;
+    }
+}
+OUTPUT:
+    RETVAL
+
 bool
 is_class_loaded(SV* sv)
 
@@ -277,7 +341,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 +356,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;
@@ -312,41 +369,37 @@ OUTPUT:
     RETVAL
 
 void
-generate_isa_predicate_for(SV* klass, const char* predicate_name = NULL)
+generate_isa_predicate_for(SV* arg, SV* predicate_name = NULL)
+ALIAS:
+    generate_isa_predicate_for = 0
+    generate_can_predicate_for = 1
 PPCODE:
 {
-    STRLEN klass_len;
-    const char* klass_pv;
-    HV* stash;
+    const char* name_pv = NULL;
     CV* xsub;
 
-    if(!SvOK(klass)){
-        croak("You must define a class name for generate_for");
-    }
-    klass_pv = SvPV_const(klass, klass_len);
-    klass_pv = mouse_canonicalize_package_name(klass_pv);
-
-    if(strNE(klass_pv, "UNIVERSAL")){
-        static MGVTBL mouse_util_type_constraints_vtbl; /* not used, only for identity */
+    SvGETMAGIC(arg);
 
-        xsub = newXS(predicate_name, XS_isa_check, __FILE__);
+    if(!SvOK(arg)){
+        croak("You must define %s", ix == 0 ? "a class name" : "method names");
+    }
 
-        stash = gv_stashpvn(klass_pv, klass_len, GV_ADD);
+    if(predicate_name){
+        SvGETMAGIC(predicate_name);
+        if(!SvOK(predicate_name)){
+            croak("You must define %s", "a predicate name");
+        }
+        name_pv = SvPV_nolen_const(predicate_name);
+    }
 
-        CvXSUBANY(xsub).any_ptr = sv_magicext(
-            (SV*)xsub,
-            (SV*)stash, /* mg_obj */
-            PERL_MAGIC_ext,
-            &mouse_util_type_constraints_vtbl,
-            klass_pv,   /* mg_ptr */
-            klass_len   /* mg_len */
-        );
+    if(ix == 0){
+        xsub = mouse_generate_isa_predicate_for(aTHX_ arg, name_pv);
     }
     else{
-        xsub = newXS(predicate_name, XS_isa_check_for_universal, __FILE__);
+        xsub = mouse_generate_can_predicate_for(aTHX_ arg, name_pv);
     }
 
     if(predicate_name == NULL){ /* anonymous predicate */
-        XPUSHs( newRV_noinc((SV*)xsub) );
+        mXPUSHs( newRV_inc((SV*)xsub) );
     }
 }