X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=gitmo%2FMouse.git;a=blobdiff_plain;f=xs-src%2FMouseAttribute.xs;h=2b3e6212862ce65dd661964d930a00e06695e53d;hp=a11471fedc4c3e574b3b3cb9c721faf5c5a2a233;hb=c6b8ac471ee3137b7ad72ad46efca0099acde204;hpb=ba1f50a24cf3b5c5a96ded5f68b030797bf17dd5

diff --git a/xs-src/MouseAttribute.xs b/xs-src/MouseAttribute.xs
index a11471f..2b3e621 100644
--- a/xs-src/MouseAttribute.xs
+++ b/xs-src/MouseAttribute.xs
@@ -1,102 +1,111 @@
 #include "mouse.h"
 
+static MGVTBL mouse_xa_vtbl; /* identity */
 
-AV*
-mouse_get_xa(pTHX_ SV* const attr) {
-    static MGVTBL mouse_xa_vtbl; /* identity */
-
-    AV* xa;
+static AV*
+mouse_build_xa(pTHX_ SV* const attr) {
+    AV*    xa;
     MAGIC* mg;
 
-    if(!IsObject(attr)){
-        croak("Not a Mouse meta attribute");
-    }
-
-    mg = mouse_mg_find(aTHX_ SvRV(attr), &mouse_xa_vtbl, 0x00);
-    if(!mg){
-        SV* slot;
-        STRLEN len;
-        const char* pv;
-        U16 flags = 0x00;
+    SV* slot;
+    STRLEN len;
+    const char* pv;
+    U16 flags = 0x00;
 
-        ENTER;
-        SAVETMPS;
+    ENTER;
+    SAVETMPS;
 
-        xa    = newAV();
+    xa    = newAV();
 
-        mg = sv_magicext(SvRV(attr), (SV*)xa, PERL_MAGIC_ext, &mouse_xa_vtbl,NULL, 0);
-        SvREFCNT_dec(xa); /* refcnt++ in sv_magicext */
+    mg = sv_magicext(SvRV(attr), (SV*)xa, PERL_MAGIC_ext, &mouse_xa_vtbl, NULL, 0);
+    SvREFCNT_dec(xa); /* refcnt++ in sv_magicext */
 
-        av_extend(xa, MOUSE_XA_last - 1);
+    av_extend(xa, MOUSE_XA_last - 1);
 
-        slot = mcall0(attr, mouse_name);
-        pv = SvPV_const(slot, len);
-        av_store(xa, MOUSE_XA_SLOT, newSVpvn_share(pv, len, 0U));
+    slot = mcall0(attr, mouse_name);
+    pv = SvPV_const(slot, len);
+    av_store(xa, MOUSE_XA_SLOT, newSVpvn_share(pv, len, 0U));
 
-        av_store(xa, MOUSE_XA_ATTRIBUTE, newSVsv(attr));
+    av_store(xa, MOUSE_XA_ATTRIBUTE, newSVsv(attr));
 
-        av_store(xa, MOUSE_XA_INIT_ARG, newSVsv(mcall0s(attr, "init_arg")));
+    av_store(xa, MOUSE_XA_INIT_ARG, newSVsv(mcall0s(attr, "init_arg")));
 
-        if(predicate_calls(attr, "has_type_constraint")){
-            SV* tc;
-            flags |= MOUSEf_ATTR_HAS_TC;
+    if(predicate_calls(attr, "has_type_constraint")){
+        SV* tc;
+        flags |= MOUSEf_ATTR_HAS_TC;
 
-            tc = mcall0s(attr, "type_constraint");
-            av_store(xa, MOUSE_XA_TC, newSVsv(tc));
+        tc = mcall0s(attr, "type_constraint");
+        av_store(xa, MOUSE_XA_TC, newSVsv(tc));
 
-            if(predicate_calls(attr, "should_auto_deref")){
-                SV* const is_a_type_of = sv_2mortal(newSVpvs_share("is_a_type_of"));
+        if(predicate_calls(attr, "should_auto_deref")){
+            SV* const is_a_type_of = sv_2mortal(newSVpvs_share("is_a_type_of"));
 
-                flags |= MOUSEf_ATTR_SHOULD_AUTO_DEREF;
-                if( SvTRUEx(mcall1(tc, is_a_type_of, newSVpvs_flags("ArrayRef", SVs_TEMP))) ){
-                    flags |= MOUSEf_TC_IS_ARRAYREF;
-                }
-                else if( SvTRUEx(mcall1(tc, is_a_type_of, newSVpvs_flags("HashRef", SVs_TEMP))) ){
-                    flags |= MOUSEf_TC_IS_HASHREF;
-                }
-                else{
-                    mouse_throw_error(attr, tc,
-                        "Can not auto de-reference the type constraint '%"SVf"'",
-                            mcall0(tc, mouse_name));
-                }
+            flags |= MOUSEf_ATTR_SHOULD_AUTO_DEREF;
+            if( sv_true(mcall1(tc, is_a_type_of, newSVpvs_flags("ArrayRef", SVs_TEMP))) ){
+                flags |= MOUSEf_TC_IS_ARRAYREF;
             }
-
-            if(predicate_calls(attr, "should_coerce")){
-                flags |= MOUSEf_ATTR_SHOULD_COERCE;
+            else if( sv_true(mcall1(tc, is_a_type_of, newSVpvs_flags("HashRef", SVs_TEMP))) ){
+                flags |= MOUSEf_TC_IS_HASHREF;
+            }
+            else{
+                mouse_throw_error(attr, tc,
+                    "Can not auto de-reference the type constraint '%"SVf"'",
+                        mcall0(tc, mouse_name));
             }
-
         }
 
-        if(predicate_calls(attr, "has_trigger")){
-            flags |= MOUSEf_ATTR_HAS_TRIGGER;
+        if(predicate_calls(attr, "should_coerce")){
+            flags |= MOUSEf_ATTR_SHOULD_COERCE;
         }
 
-        if(predicate_calls(attr, "is_lazy")){
-            flags |= MOUSEf_ATTR_IS_LAZY;
-        }
-        if(predicate_calls(attr, "has_builder")){
-            flags |= MOUSEf_ATTR_HAS_BUILDER;
-        }
-        else if(predicate_calls(attr, "has_default")){
-            flags |= MOUSEf_ATTR_HAS_DEFAULT;
-        }
+    }
 
-        if(predicate_calls(attr, "is_weak_ref")){
-            flags |= MOUSEf_ATTR_IS_WEAK_REF;
-        }
+    if(predicate_calls(attr, "has_trigger")){
+        flags |= MOUSEf_ATTR_HAS_TRIGGER;
+    }
 
-        if(predicate_calls(attr, "is_required")){
-            flags |= MOUSEf_ATTR_IS_REQUIRED;
-        }
+    if(predicate_calls(attr, "is_lazy")){
+        flags |= MOUSEf_ATTR_IS_LAZY;
+    }
+    if(predicate_calls(attr, "has_builder")){
+        flags |= MOUSEf_ATTR_HAS_BUILDER;
+    }
+    else if(predicate_calls(attr, "has_default")){
+        flags |= MOUSEf_ATTR_HAS_DEFAULT;
+    }
 
-        av_store(xa, MOUSE_XA_FLAGS, newSVuv(flags));
-        MOUSE_mg_flags(mg) = flags;
+    if(predicate_calls(attr, "is_weak_ref")){
+        flags |= MOUSEf_ATTR_IS_WEAK_REF;
+    }
 
-        FREETMPS;
-        LEAVE;
+    if(predicate_calls(attr, "is_required")){
+        flags |= MOUSEf_ATTR_IS_REQUIRED;
+    }
+
+    av_store(xa, MOUSE_XA_FLAGS, newSVuv(flags));
+    MOUSE_mg_flags(mg) = flags;
+
+    FREETMPS;
+    LEAVE;
+
+    return xa;
+}
+
+AV*
+mouse_get_xa(pTHX_ SV* const attr) {
+    AV*    xa;
+    MAGIC* mg;
+
+    if(!IsObject(attr)){
+        croak("Not a Mouse meta attribute");
+    }
+
+    mg = mouse_mg_find(aTHX_ SvRV(attr), &mouse_xa_vtbl, 0x00);
+    if(!mg){
+        xa = mouse_build_xa(aTHX_ attr);
     }
     else{
-        xa    = (AV*)MOUSE_mg_obj(mg);
+        xa = (AV*)MOUSE_mg_obj(mg);
 
         assert(xa);
         assert(SvTYPE(xa) == SVt_PVAV);
@@ -111,7 +120,7 @@ mouse_xa_apply_type_constraint(pTHX_ AV* const xa, SV* value, U16 const flags){
     SV* tc_code;
 
     if(flags & MOUSEf_ATTR_SHOULD_COERCE){
-          value = mcall1s(tc, "coerce", value);
+          value = mcall1(tc, mouse_coerce, value);
     }
 
     if(!SvOK(MOUSE_xa_tc_code(xa))){
@@ -324,7 +333,7 @@ CODE:
         XPUSHs(*svp);
         PUTBACK;
 
-        call_pv("Mouse::Util::TypeConstraints::find_or_create_isa_type_constraint",
+        call_pv("Mouse::Util::TypeConstraints::find_or_create_does_type_constraint",
             G_SCALAR);
         SPAGAIN;
         tc = newSVsv(POPs);