X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=xs-src%2FMouseAttribute.xs;h=7a453fd2f7d0ac1ccb68a7ccebdebd218569f2b1;hb=31aa6299ca20515174f1b145e5b3d4dbd9e09a08;hp=97b282e8a7b5e8c993c3e87067ce224d98e9c493;hpb=6ad77996af3989f512a308404b2593c369d18e14;p=gitmo%2FMouse.git

diff --git a/xs-src/MouseAttribute.xs b/xs-src/MouseAttribute.xs
index 97b282e..7a453fd 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( sv_true(mcall1(tc, is_a_type_of, newSVpvs_flags("ArrayRef", SVs_TEMP))) ){
-                    flags |= MOUSEf_TC_IS_ARRAYREF;
-                }
-                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));
-                }
+            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") && predicate_calls(tc, "has_coercion")){
+            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;
+    }
+
+    if(predicate_calls(attr, "is_weak_ref")){
+        flags |= MOUSEf_ATTR_IS_WEAK_REF;
+    }
+
+    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;
 
-        av_store(xa, MOUSE_XA_FLAGS, newSVuv(flags));
-        MOUSE_mg_flags(mg) = flags;
+    if(!IsObject(attr)){
+        croak("Not a Mouse meta attribute");
+    }
 
-        FREETMPS;
-        LEAVE;
+    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))){
@@ -175,6 +184,44 @@ mouse_xa_set_default(pTHX_ AV* const xa, SV* const object) {
     return value;
 }
 
+/* checks $isa->does($does) */
+static void
+mouse_check_isa_does_does(pTHX_ SV* const klass, SV* const name, SV* const isa, SV* const does){
+    STRLEN len;
+    const char* const pv = SvPV_const(isa, len); /* need strigify */
+    bool does_ok;
+    dSP;
+
+    ENTER;
+    SAVETMPS;
+
+    SAVESPTR(ERRSV);
+    ERRSV = sv_newmortal();
+
+    PUSHMARK(SP);
+    EXTEND(SP, 2);
+    mPUSHp(pv, len);
+    PUSHs(does);
+    PUTBACK;
+
+    call_method("does", G_EVAL | G_SCALAR);
+
+    SPAGAIN;
+    does_ok = sv_true(POPs);
+    PUTBACK;
+
+    FREETMPS;
+    LEAVE;
+
+    if(!does_ok){
+        mouse_throw_error(klass, NULL,
+            "Cannot have both an isa option and a does option"
+            "because '%"SVf"' does not do '%"SVf"' on attribute (%"SVf")",
+            isa, does, name
+        );
+    }
+}
+
 MODULE = Mouse::Meta::Attribute  PACKAGE = Mouse::Meta::Attribute
 
 PROTOTYPES: DISABLE
@@ -203,6 +250,7 @@ BOOT:
     INSTALL_SIMPLE_READER_WITH_KEY(Attribute, should_auto_deref, auto_deref);
     INSTALL_SIMPLE_READER_WITH_KEY(Attribute, should_coerce, coerce);
     INSTALL_SIMPLE_READER(Attribute, documentation);
+    INSTALL_SIMPLE_READER(Attribute, insertion_order);
 
     /* predicates */
     INSTALL_SIMPLE_PREDICATE_WITH_KEY(Attribute, has_accessor, accessor);
@@ -224,6 +272,7 @@ void
 _process_options(SV* klass, SV* name, HV* args)
 CODE:
 {
+    /* TODO: initialize 'xa' here */
     SV** svp;
     SV* tc = NULL;
 
@@ -234,10 +283,7 @@ CODE:
 
     /* taken from Class::MOP::Attribute::new */
 
-    if(!SvOK(name)){
-        mouse_throw_error(klass, NULL,
-            "You must provide a name for the attribute");
-    }
+    must_defined(name, "an attribute name");
 
     svp = hv_fetchs(args, "init_arg", FALSE);
     if(!svp){
@@ -251,7 +297,7 @@ CODE:
     svp = hv_fetchs(args, "builder", FALSE);
     if(svp){
         if(!SvOK(*svp)){
-            mouse_throw_error(klass, NULL,
+            mouse_throw_error(klass, *svp,
                 "builder must be a defined scalar value which is a method name");
         }
         can_be_required = TRUE;
@@ -259,7 +305,7 @@ CODE:
     }
     else if((svp = hv_fetchs(args, "default", FALSE))){
         if(SvROK(*svp) && SvTYPE(SvRV(*svp)) != SVt_PVCV) {
-            mouse_throw_error(klass, NULL,
+            mouse_throw_error(klass, *svp,
                "References are not allowed as default values, you must "
                 "wrap the default of '%"SVf"' in a CODE reference "
                 "(ex: sub { [] } and not [])", name);
@@ -275,7 +321,7 @@ CODE:
             "without a default, builder, or an init_arg", name);
     }
 
-     /* taken from Mouse::Meta::Attribute->new and ->_process_args */
+    /* taken from Mouse::Meta::Attribute->new and ->_process_args */
 
     svp = hv_fetchs(args, "is", FALSE);
     if(svp){
@@ -293,10 +339,12 @@ CODE:
             else{
                 svp = hv_fetchs(args, "accessor", TRUE);
             }
-            sv_setsv(*svp, name);
+            if(!SvOK(*svp)) {
+                sv_setsv(*svp, name);
+            }
         }
         else if(strEQ(is, "bare")){
-            /* do nothing, but don't complain (later) about missing methods */
+            /* do nothing, but might complain later about missing methods */
         }
         else{
             mouse_throw_error(klass, NULL,
@@ -318,17 +366,25 @@ CODE:
         tc = newSVsv(POPs);
         PUTBACK;
     }
-    else if((svp = hv_fetchs(args, "does", FALSE))){
-        SPAGAIN;
-        PUSHMARK(SP);
-        XPUSHs(*svp);
-        PUTBACK;
 
-        call_pv("Mouse::Util::TypeConstraints::find_or_create_isa_type_constraint",
-            G_SCALAR);
-        SPAGAIN;
-        tc = newSVsv(POPs);
-        PUTBACK;
+    if((svp = hv_fetchs(args, "does", FALSE))){
+        /* check 'isa' does 'does' */
+        if(tc){
+            mouse_check_isa_does_does(aTHX_ klass, name, tc, *svp);
+            /* nothing to do */
+        }
+        else{
+            SPAGAIN;
+            PUSHMARK(SP);
+            XPUSHs(*svp);
+            PUTBACK;
+
+            call_pv("Mouse::Util::TypeConstraints::find_or_create_does_type_constraint",
+                G_SCALAR);
+            SPAGAIN;
+            tc = newSVsv(POPs);
+            PUTBACK;
+        }
     }
     if(tc){
         (void)hv_stores(args, "type_constraint", tc);
@@ -420,7 +476,7 @@ CODE:
     if(svp && sv_true(*svp)){
         if(!(has_default || has_builder)){
             mouse_throw_error(klass, NULL,
-                "You cannot have lazy attribute (%"SVf") without specifying "
+                "You cannot have a lazy attribute (%"SVf") without specifying "
                 "a default value for it", name);
         }
     }