X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=xs-src%2FMouseAccessor.xs;h=cf40488d8dda8b5a4d237f3737d0fb7c7511b97d;hb=bce7d15517f1e232f5f1c2fe23d72aa13b7d1770;hp=a16b2ae4ee41a8db68d5fadabefdea7a253d865e;hpb=8ab2c6ab8d7a229539e3464298c59a8823a18cec;p=gitmo%2FMouse.git

diff --git a/xs-src/MouseAccessor.xs b/xs-src/MouseAccessor.xs
index a16b2ae..cf40488 100644
--- a/xs-src/MouseAccessor.xs
+++ b/xs-src/MouseAccessor.xs
@@ -1,8 +1,9 @@
 #include "mouse.h"
 
 #define CHECK_INSTANCE(instance) STMT_START{                           \
+        assert(instance);                                              \
         if(!(SvROK(instance) && SvTYPE(SvRV(instance)) == SVt_PVHV)){  \
-            croak("Invalid object instance");                          \
+            croak("Invalid object instance: '%"SVf"'", instance);      \
         }                                                              \
     } STMT_END
 
@@ -13,16 +14,14 @@ static MGVTBL mouse_accessor_vtbl; /* MAGIC identity */
 
 #define dMOUSE_self  SV* const self = mouse_accessor_get_self(aTHX_ ax, items, cv)
 
-static inline SV*
+STATIC_INLINE SV*
 mouse_accessor_get_self(pTHX_ I32 const ax, I32 const items, CV* const cv) {
     if(items < 1){
         croak("Too few arguments for %s", GvNAME(CvGV(cv)));
     }
-
     /* NOTE: If self has GETMAGIC, $self->accessor will invoke GETMAGIC
-     *       before calling methods, so SvGETMAGIC(self) is not necessarily needed here.
+     *       before calling methods, so SvGETMAGIC(self) is not required here.
      */
-
     return ST(0);
 }
 
@@ -36,12 +35,14 @@ mouse_accessor_generate(pTHX_ SV* const attr, XSUBADDR_t const accessor_impl){
     xsub = newXS(NULL, accessor_impl, __FILE__);
     sv_2mortal((SV*)xsub);
 
-    mg = sv_magicext((SV*)xsub, MOUSE_xa_slot(xa), PERL_MAGIC_ext, &mouse_accessor_vtbl, (char*)xa, HEf_SVKEY);
+    mg = sv_magicext((SV*)xsub, MOUSE_xa_slot(xa),
+        PERL_MAGIC_ext, &mouse_accessor_vtbl, (char*)xa, HEf_SVKEY);
 
     MOUSE_mg_flags(mg) = (U16)MOUSE_xa_flags(xa);
 
     /* NOTE:
-     * although we use MAGIC for gc, we also store mg to CvXSUBANY for efficiency (gfx)
+     * although we use MAGIC for gc, we also store mg to
+     * CvXSUBANY for efficiency (gfx)
      */
     CvXSUBANY(xsub).any_ptr = (void*)mg;
 
@@ -49,17 +50,6 @@ mouse_accessor_generate(pTHX_ SV* const attr, XSUBADDR_t const accessor_impl){
 }
 
 
-#define PUSH_VALUE(value, flags) STMT_START { \
-        if((flags) & MOUSEf_ATTR_SHOULD_AUTO_DEREF && GIMME_V == G_ARRAY){ \
-            mouse_push_values(aTHX_ value, (flags));                       \
-        }                                                                  \
-        else{                                                              \
-            dSP;                                                           \
-            XPUSHs(value ? value : &PL_sv_undef);                          \
-            PUTBACK;                                                       \
-        }                                                                  \
-    } STMT_END                                                             \
-
 /* pushes return values, does auto-deref if needed */
 static void
 mouse_push_values(pTHX_ SV* const value, U16 const flags){
@@ -110,6 +100,18 @@ mouse_push_values(pTHX_ SV* const value, U16 const flags){
     PUTBACK;
 }
 
+STATIC_INLINE void
+mouse_push_value(pTHX_ SV* const value, U16 const flags) {
+    if(flags & MOUSEf_ATTR_SHOULD_AUTO_DEREF && GIMME_V == G_ARRAY){
+        mouse_push_values(aTHX_ value, flags);
+    }
+    else{
+        dSP;
+        XPUSHs(value ? value : &PL_sv_undef);
+        PUTBACK;
+    }
+}
+
 static void
 mouse_attr_get(pTHX_ SV* const self, MAGIC* const mg){
     U16 const flags = MOUSE_mg_flags(mg);
@@ -122,7 +124,7 @@ mouse_attr_get(pTHX_ SV* const self, MAGIC* const mg){
         value = mouse_xa_set_default(aTHX_ MOUSE_mg_xa(mg), self);
     }
 
-    PUSH_VALUE(value, flags);
+    mouse_push_value(aTHX_ value, flags);
 }
 
 static void
@@ -156,13 +158,13 @@ mouse_attr_set(pTHX_ SV* const self, MAGIC* const mg, SV* value){
         PUSHs(value);
 
         PUTBACK;
-        call_sv(trigger, G_VOID | G_DISCARD);
+        call_sv_safe(trigger, G_VOID | G_DISCARD);
         /* need not SPAGAIN */
 
         assert(SvTYPE(value) != SVTYPEMASK);
     }
 
-    PUSH_VALUE(value, flags);
+    mouse_push_value(aTHX_ value, flags);
 }
 
 XS(XS_Mouse_accessor)
@@ -182,7 +184,8 @@ XS(XS_Mouse_accessor)
     }
     else{
         mouse_throw_error(MOUSE_mg_attribute(mg), NULL,
-            "Expected exactly one or two argument for an accessor");
+            "Expected exactly one or two argument for an accessor of %"SVf,
+            MOUSE_mg_slot(mg));
     }
 }
 
@@ -195,7 +198,8 @@ XS(XS_Mouse_reader)
 
     if (items != 1) {
         mouse_throw_error(MOUSE_mg_attribute(mg), NULL,
-            "Cannot assign a value to a read-only accessor");
+            "Cannot assign a value to a read-only accessor of %"SVf,
+            MOUSE_mg_slot(mg));
     }
 
     SP -= items; /* PPCODE */
@@ -212,7 +216,8 @@ XS(XS_Mouse_writer)
 
     if (items != 2) {
         mouse_throw_error(MOUSE_mg_attribute(mg), NULL,
-            "Too few arguments for a write-only accessor");
+            "Too few arguments for a write-only accessor of %"SVf,
+            MOUSE_mg_slot(mg));
     }
 
     SP -= items; /* PPCODE */
@@ -231,24 +236,29 @@ mouse_accessor_get_mg(pTHX_ CV* const xsub){
 */
 
 CV*
-mouse_simple_accessor_generate(pTHX_ const char* const fq_name, const char* const key, I32 const keylen, XSUBADDR_t const accessor_impl, void* const dptr, I32 const dlen){
+mouse_simple_accessor_generate(pTHX_
+    const char* const fq_name, const char* const key, I32 const keylen,
+    XSUBADDR_t const accessor_impl, void* const dptr, I32 const dlen) {
     CV* const xsub = newXS((char*)fq_name, accessor_impl, __FILE__);
     SV* const slot = newSVpvn_share(key, keylen, 0U);
     MAGIC* mg;
 
     if(!fq_name){
-        /* anonymous xsubs need sv_2mortal */
+        /* anonymous xsubs need sv_2mortal() */
         sv_2mortal((SV*)xsub);
     }
 
-    mg = sv_magicext((SV*)xsub, slot, PERL_MAGIC_ext, &mouse_accessor_vtbl, (char*)dptr, dlen);
+    mg = sv_magicext((SV*)xsub, slot,
+        PERL_MAGIC_ext, &mouse_accessor_vtbl, (char*)dptr, dlen);
+
     SvREFCNT_dec(slot); /* sv_magicext() increases refcnt in mg_obj */
     if(dlen == HEf_SVKEY){
         SvREFCNT_dec(dptr);
     }
 
     /* NOTE:
-     * although we use MAGIC for gc, we also store mg to CvXSUBANY for efficiency (gfx)
+     * although we use MAGIC for gc, we also store mg to CvXSUBANY
+     * for efficiency (gfx)
      */
     CvXSUBANY(xsub).any_ptr = (void*)mg;
 
@@ -263,7 +273,8 @@ XS(XS_Mouse_simple_reader)
     SV* value;
 
     if (items != 1) {
-        croak("Expected exactly one argument for a reader for '%"SVf"'", MOUSE_mg_slot(mg));
+        croak("Expected exactly one argument for a reader of %"SVf,
+            MOUSE_mg_slot(mg));
     }
 
     value = get_slot(self, MOUSE_mg_slot(mg));
@@ -290,7 +301,8 @@ XS(XS_Mouse_simple_writer)
     SV* const slot = MOUSE_mg_slot((MAGIC*)XSANY.any_ptr);
 
     if (items != 2) {
-        croak("Expected exactly two argument for a writer for '%"SVf"'", slot);
+        croak("Expected exactly two argument for a writer of %"SVf,
+            slot);
     }
 
     ST(0) = set_slot(self, slot, ST(1));
@@ -305,7 +317,8 @@ XS(XS_Mouse_simple_clearer)
     SV* value;
 
     if (items != 1) {
-        croak("Expected exactly one argument for a clearer for '%"SVf"'", slot);
+        croak("Expected exactly one argument for a clearer of %"SVf,
+            slot);
     }
 
     value = delete_slot(self, slot);
@@ -320,35 +333,90 @@ XS(XS_Mouse_simple_predicate)
     SV* const slot = MOUSE_mg_slot((MAGIC*)XSANY.any_ptr);
 
     if (items != 1) {
-        croak("Expected exactly one argument for a predicate for '%"SVf"'", slot);
+        croak("Expected exactly one argument for a predicate of %"SVf, slot);
     }
 
     ST(0) = boolSV( has_slot(self, slot) );
     XSRETURN(1);
 }
 
+/* Class::Data::Inheritable-like class accessor */
+XS(XS_Mouse_inheritable_class_accessor) {
+    dVAR; dXSARGS;
+    dMOUSE_self;
+    SV* const slot = MOUSE_mg_slot((MAGIC*)XSANY.any_ptr);
+    SV* value;
+    HV* stash;
+
+    if(items == 1){ /* reader */
+        value = NULL;
+    }
+    else if (items == 2){ /* writer */
+        value = ST(1);
+    }
+    else{
+        croak("Expected exactly one or two argument for a class data accessor"
+            "of %"SVf, slot);
+        value = NULL; /* -Wuninitialized */
+    }
+
+    stash = mouse_get_namespace(aTHX_ self);
+
+    if(!value) { /* reader */
+        value = get_slot(self, slot);
+        if(!value) {
+            AV* const isa   = mro_get_linear_isa(stash);
+            I32 const len   = av_len(isa) + 1;
+            I32 i;
+            for(i = 1; i < len; i++) {
+                SV* const klass = MOUSE_av_at(isa, i);
+                SV* const meta  = get_metaclass(klass);
+                if(!SvOK(meta)){
+                    continue; /* skip non-Mouse classes */
+                }
+                value = get_slot(meta, slot);
+                if(value) {
+                    break;
+                }
+            }
+            if(!value) {
+                value = &PL_sv_undef;
+            }
+        }
+    }
+    else { /* writer */
+        set_slot(self, slot, value);
+        mro_method_changed_in(stash);
+    }
+
+    ST(0) = value;
+    XSRETURN(1);
+}
+
 /* simple instance slot accessor (or Mouse::Meta::Instance) */
 
 SV*
 mouse_instance_create(pTHX_ HV* const stash) {
+    SV* instance;
     assert(stash);
     assert(SvTYPE(stash) == SVt_PVHV);
-    return sv_bless( newRV_noinc((SV*)newHV()), stash );
+    instance = sv_bless( newRV_noinc((SV*)newHV()), stash );
+    return sv_2mortal(instance);
 }
 
 SV*
 mouse_instance_clone(pTHX_ SV* const instance) {
-    HV* proto;
-    assert(instance);
-
+    SV* proto;
     CHECK_INSTANCE(instance);
-    proto = newHVhv((HV*)SvRV(instance));
-    return sv_bless( newRV_noinc((SV*)proto), SvSTASH(SvRV(instance)) );
+    assert(SvOBJECT(SvRV(instance)));
+
+    proto = newRV_noinc((SV*)newHVhv((HV*)SvRV(instance)));
+    sv_bless(proto, SvSTASH(SvRV(instance)));
+    return sv_2mortal(proto);
 }
 
 bool
 mouse_instance_has_slot(pTHX_ SV* const instance, SV* const slot) {
-    assert(instance);
     assert(slot);
     CHECK_INSTANCE(instance);
     return hv_exists_ent((HV*)SvRV(instance), slot, 0U);
@@ -357,7 +425,6 @@ mouse_instance_has_slot(pTHX_ SV* const instance, SV* const slot) {
 SV*
 mouse_instance_get_slot(pTHX_ SV* const instance, SV* const slot) {
     HE* he;
-    assert(instance);
     assert(slot);
     CHECK_INSTANCE(instance);
     he = hv_fetch_ent((HV*)SvRV(instance), slot, FALSE, 0U);
@@ -368,7 +435,6 @@ SV*
 mouse_instance_set_slot(pTHX_ SV* const instance, SV* const slot, SV* const value) {
     HE* he;
     SV* sv;
-    assert(instance);
     assert(slot);
     assert(value);
     CHECK_INSTANCE(instance);
@@ -390,7 +456,6 @@ mouse_instance_delete_slot(pTHX_ SV* const instance, SV* const slot) {
 void
 mouse_instance_weaken_slot(pTHX_ SV* const instance, SV* const slot) {
     HE* he;
-    assert(instance);
     assert(slot);
     CHECK_INSTANCE(instance);
     he = hv_fetch_ent((HV*)SvRV(instance), slot, FALSE, 0U);