X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=xs-src%2FMouseAccessor.xs;h=aa87df388c02385a1cccafca24a8ec93f400a152;hb=d4712779eb600de46ed09b09afd193d3def11786;hp=dd89a007157314e2dc5a0d5a57dca0aaf36a3db4;hpb=6fe2272b04003d989c299dae495c4c6f9730dabc;p=gitmo%2FMouse.git diff --git a/xs-src/MouseAccessor.xs b/xs-src/MouseAccessor.xs index dd89a00..aa87df3 100644 --- a/xs-src/MouseAccessor.xs +++ b/xs-src/MouseAccessor.xs @@ -6,8 +6,10 @@ } \ } STMT_END -/* Moose XS Attribute object */ +/* Mouse XS Attribute object */ enum mouse_xa_ix_t{ + MOUSE_XA_SLOT, /* for constructors, sync to mg_obj */ + MOUSE_XA_FLAGS, /* for constructors, sync to mg_private */ MOUSE_XA_ATTRIBUTE, MOUSE_XA_TC, MOUSE_XA_TC_CODE, @@ -25,7 +27,7 @@ enum mouse_xa_flags_t{ MOUSEf_ATTR_HAS_TC = 0x0001, MOUSEf_ATTR_HAS_DEFAULT = 0x0002, MOUSEf_ATTR_HAS_BUILDER = 0x0004, - MOUSEf_ATTR_HAS_INITIALIZER = 0x0008, /* not used in Mouse */ + MOUSEf_ATTR_HAS_INITIALIZER = 0x0008, MOUSEf_ATTR_HAS_TRIGGER = 0x0010, MOUSEf_ATTR_IS_LAZY = 0x0020, @@ -165,7 +167,7 @@ mouse_apply_type_constraint(pTHX_ AV* const xa, SV* value, U16 const flags){ tc_code = mcall0s(tc, "_compiled_type_constraint"); av_store(xa, MOUSE_XA_TC_CODE, newSVsv(tc_code)); - if(!(SvROK(tc_code) && SvTYPE(SvRV(tc_code)) == SVt_PVCV)){ + if(!IsCodeRef(tc_code)){ mouse_throw_error(MOUSE_xa_attribute(xa), tc, "Not a CODE reference"); } } @@ -206,14 +208,15 @@ mouse_push_values(pTHX_ SV* const value, U16 const flags){ } if(flags & MOUSEf_TC_IS_ARRAYREF){ - AV* const av = (AV*)SvRV(value); + AV* av; I32 len; I32 i; - if(SvTYPE(av) != SVt_PVAV){ + if(!IsArrayRef(value)){ croak("Mouse-panic: Not an ARRAY reference"); } + av = (AV*)SvRV(value); len = av_len(av) + 1; EXTEND(SP, len); for(i = 0; i < len; i++){ @@ -222,13 +225,14 @@ mouse_push_values(pTHX_ SV* const value, U16 const flags){ } } else if(flags & MOUSEf_TC_IS_HASHREF){ - HV* const hv = (HV*)SvRV(value); + HV* hv; HE* he; - if(SvTYPE(hv) != SVt_PVHV){ + if(!IsHashRef(value)){ croak("Mouse-panic: Not a HASH reference"); } + hv = (HV*)SvRV(value); hv_iterinit(hv); while((he = hv_iternext(hv))){ EXTEND(SP, 2); @@ -250,24 +254,20 @@ mouse_attr_get(pTHX_ SV* const self, MAGIC* const mg){ /* check_lazy */ if( !value && flags & MOUSEf_ATTR_IS_LAZY ){ - AV* const xa = MOUSE_mg_xa(mg); + AV* const xa = MOUSE_mg_xa(mg); SV* const attr = MOUSE_xa_attribute(xa); - /* get default value by $attr->default or $attr->builder */ - if(flags & MOUSEf_ATTR_HAS_DEFAULT){ - value = mcall0s(attr, "default"); - - if(SvROK(value) && SvTYPE(SvRV(value)) == SVt_PVCV){ - value = mcall0(self, value); - } - } - else if(flags & MOUSEf_ATTR_HAS_BUILDER){ + /* get default value by $attr->builder or $attr->default */ + if(flags & MOUSEf_ATTR_HAS_BUILDER){ SV* const builder = mcall0s(attr, "builder"); value = mcall0(self, builder); } + else { + value = mcall0s(attr, "default"); - if(!value){ - value = sv_newmortal(); + if(IsCodeRef(value)){ + value = mcall0(self, value); + } } /* apply coerce and type constraint */ @@ -314,7 +314,7 @@ mouse_attr_set(pTHX_ SV* const self, MAGIC* const mg, SV* value){ PUSH_VALUE(value, flags); } -XS(mouse_xs_accessor) +XS(XS_Mouse_accessor) { dVAR; dXSARGS; dMOUSE_self; @@ -336,7 +336,7 @@ XS(mouse_xs_accessor) } -XS(mouse_xs_reader) +XS(XS_Mouse_reader) { dVAR; dXSARGS; dMOUSE_self; @@ -353,7 +353,7 @@ XS(mouse_xs_reader) mouse_attr_get(aTHX_ self, mg); } -XS(mouse_xs_writer) +XS(XS_Mouse_writer) { dVAR; dXSARGS; dMOUSE_self; @@ -401,7 +401,7 @@ mouse_install_simple_accessor(pTHX_ const char* const fq_name, const char* const return xsub; } -XS(mouse_xs_simple_reader) +XS(XS_Mouse_simple_reader) { dVAR; dXSARGS; dMOUSE_self; @@ -418,7 +418,7 @@ XS(mouse_xs_simple_reader) } -XS(mouse_xs_simple_writer) +XS(XS_Mouse_simple_writer) { dVAR; dXSARGS; dMOUSE_self; @@ -432,7 +432,7 @@ XS(mouse_xs_simple_writer) XSRETURN(1); } -XS(mouse_xs_simple_clearer) +XS(XS_Mouse_simple_clearer) { dVAR; dXSARGS; dMOUSE_self; @@ -448,7 +448,7 @@ XS(mouse_xs_simple_clearer) XSRETURN(1); } -XS(mouse_xs_simple_predicate) +XS(XS_Mouse_simple_predicate) { dVAR; dXSARGS; dMOUSE_self; @@ -467,6 +467,7 @@ XS(mouse_xs_simple_predicate) SV* mouse_instance_create(pTHX_ HV* const stash) { assert(stash); + assert(SvTYPE(stash) == SVt_PVHV); return sv_bless( newRV_noinc((SV*)newHV()), stash ); } @@ -541,7 +542,7 @@ CV* _generate_accessor(klass, SV* attr, metaclass) CODE: { - RETVAL = mouse_instantiate_xs_accessor(aTHX_ attr, mouse_xs_accessor); + RETVAL = mouse_instantiate_xs_accessor(aTHX_ attr, XS_Mouse_accessor); } OUTPUT: RETVAL @@ -550,7 +551,7 @@ CV* _generate_reader(klass, SV* attr, metaclass) CODE: { - RETVAL = mouse_instantiate_xs_accessor(aTHX_ attr, mouse_xs_reader); + RETVAL = mouse_instantiate_xs_accessor(aTHX_ attr, XS_Mouse_reader); } OUTPUT: RETVAL @@ -559,7 +560,7 @@ CV* _generate_writer(klass, SV* attr, metaclass) CODE: { - RETVAL = mouse_instantiate_xs_accessor(aTHX_ attr, mouse_xs_writer); + RETVAL = mouse_instantiate_xs_accessor(aTHX_ attr, XS_Mouse_writer); } OUTPUT: RETVAL @@ -571,7 +572,7 @@ CODE: SV* const slot = mcall0s(attr, "name"); STRLEN len; const char* const pv = SvPV_const(slot, len); - RETVAL = mouse_install_simple_accessor(aTHX_ NULL, pv, len, mouse_xs_simple_clearer); + RETVAL = mouse_install_simple_accessor(aTHX_ NULL, pv, len, XS_Mouse_simple_clearer); } OUTPUT: RETVAL @@ -583,7 +584,7 @@ CODE: SV* const slot = mcall0s(attr, "name"); STRLEN len; const char* const pv = SvPV_const(slot, len); - RETVAL = mouse_install_simple_accessor(aTHX_ NULL, pv, len, mouse_xs_simple_predicate); + RETVAL = mouse_install_simple_accessor(aTHX_ NULL, pv, len, XS_Mouse_simple_predicate); } OUTPUT: RETVAL