X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=gitmo%2FMouse.git;a=blobdiff_plain;f=xs-src%2FMouseAccessor.xs;h=909e59507cab1463f067193a82b16959222e0106;hp=234e39507a4e7c3a133c59a9ec108e8fe57d4c8b;hb=ca8e67d622c1a14bee4933ad64b1e465c5d63766;hpb=76770976c9e76df52aeac5b171a0e9b62d127b38 diff --git a/xs-src/MouseAccessor.xs b/xs-src/MouseAccessor.xs index 234e395..909e595 100644 --- a/xs-src/MouseAccessor.xs +++ b/xs-src/MouseAccessor.xs @@ -6,54 +6,15 @@ } \ } STMT_END -/* Moose XS Attribute object */ -enum mouse_xa_ix_t{ - MOUSE_XA_ATTRIBUTE, - MOUSE_XA_TC, - MOUSE_XA_TC_CODE, - - MOUSE_XA_last -}; - -#define MOUSE_xa_attribute(m) MOUSE_av_at(m, MOUSE_XA_ATTRIBUTE) -#define MOUSE_xa_tc(m) MOUSE_av_at(m, MOUSE_XA_TC) -#define MOUSE_xa_tc_code(m) MOUSE_av_at(m, MOUSE_XA_TC_CODE) #define MOUSE_mg_attribute(mg) MOUSE_xa_attribute(MOUSE_mg_xa(mg)) -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_TRIGGER = 0x0010, - - MOUSEf_ATTR_IS_LAZY = 0x0020, - MOUSEf_ATTR_IS_WEAK_REF = 0x0040, - MOUSEf_ATTR_IS_REQUIRED = 0x0080, - - MOUSEf_ATTR_SHOULD_COERCE = 0x0100, - - MOUSEf_ATTR_SHOULD_AUTO_DEREF - = 0x0200, - MOUSEf_TC_IS_ARRAYREF = 0x0400, - MOUSEf_TC_IS_HASHREF = 0x0800, - - MOUSEf_OTHER1 = 0x1000, - MOUSEf_OTHER2 = 0x2000, - MOUSEf_OTHER3 = 0x4000, - MOUSEf_OTHER4 = 0x8000, - - MOUSEf_MOUSE_MASK = 0xFFFF /* not used */ -}; - static MGVTBL mouse_accessor_vtbl; /* MAGIC identity */ +#define dMOUSE_self SV* const self = mouse_accessor_get_self(aTHX_ ax, items, cv) -SV* +static inline SV* mouse_accessor_get_self(pTHX_ I32 const ax, I32 const items, CV* const cv) { - SV* self; - if(items < 1){ croak("Too few arguments for %s", GvNAME(CvGV(cv))); } @@ -67,130 +28,26 @@ mouse_accessor_get_self(pTHX_ I32 const ax, I32 const items, CV* const cv) { CV* -mouse_instantiate_xs_accessor(pTHX_ SV* const attr, XSUBADDR_t const accessor_impl){ - SV* const slot = mcall0(attr, mouse_name); - AV* const xa = newAV(); +mouse_accessor_generate(pTHX_ SV* const attr, XSUBADDR_t const accessor_impl){ + AV* const xa = mouse_get_xa(aTHX_ attr); CV* xsub; MAGIC* mg; - U16 flags = 0; - - sv_2mortal((SV*)xa); xsub = newXS(NULL, accessor_impl, __FILE__); sv_2mortal((SV*)xsub); - mg = sv_magicext((SV*)xsub, slot, 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) */ CvXSUBANY(xsub).any_ptr = (void*)mg; - av_extend(xa, MOUSE_XA_last - 1); - - av_store(xa, MOUSE_XA_ATTRIBUTE, newSVsv(attr)); - - /* prepare attribute status */ - /* XXX: making it lazy is a good way? */ - - if(SvTRUEx(mcall0s(attr, "has_type_constraint"))){ - SV* tc; - flags |= MOUSEf_ATTR_HAS_TC; - - ENTER; - SAVETMPS; - - tc = mcall0s(attr, "type_constraint"); - av_store(xa, MOUSE_XA_TC, newSVsv(tc)); - - if(SvTRUEx(mcall0s(attr, "should_auto_deref"))){ - flags |= MOUSEf_ATTR_SHOULD_AUTO_DEREF; - if( SvTRUEx(mcall1s(tc, "is_a_type_of", newSVpvs_flags("ArrayRef", SVs_TEMP))) ){ - flags |= MOUSEf_TC_IS_ARRAYREF; - } - else if( SvTRUEx(mcall1s(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(SvTRUEx(mcall0s(attr, "should_coerce"))){ - flags |= MOUSEf_ATTR_SHOULD_COERCE; - } - - FREETMPS; - LEAVE; - } - - if(SvTRUEx(mcall0s(attr, "has_trigger"))){ - flags |= MOUSEf_ATTR_HAS_TRIGGER; - } - - if(SvTRUEx(mcall0s(attr, "is_lazy"))){ - flags |= MOUSEf_ATTR_IS_LAZY; - - if(SvTRUEx(mcall0s(attr, "has_builder"))){ - flags |= MOUSEf_ATTR_HAS_BUILDER; - } - else if(SvTRUEx(mcall0s(attr, "has_default"))){ - flags |= MOUSEf_ATTR_HAS_DEFAULT; - } - } - - if(SvTRUEx(mcall0s(attr, "is_weak_ref"))){ - flags |= MOUSEf_ATTR_IS_WEAK_REF; - } - - if(SvTRUEx(mcall0s(attr, "is_required"))){ - flags |= MOUSEf_ATTR_IS_REQUIRED; - } - - MOUSE_mg_flags(mg) = flags; - return xsub; } -static SV* -mouse_apply_type_constraint(pTHX_ AV* const xa, SV* value, U16 const flags){ - SV* const tc = MOUSE_xa_tc(xa); - SV* tc_code; - - if(flags & MOUSEf_ATTR_SHOULD_COERCE){ - value = mcall1s(tc, "coerce", value); - } - - if(!SvOK(MOUSE_xa_tc_code(xa))){ - XS(XS_Mouse__Util__TypeConstraints_Item); /* prototype defined in Mouse.xs */ - - tc_code = mcall0s(tc, "_compiled_type_constraint"); - - if(SvROK(tc_code) && SvTYPE(SvRV(tc_code)) - && CvXSUB((CV*)SvRV(tc_code)) == XS_Mouse__Util__TypeConstraints_Item){ - /* built-in type constraints */ - mouse_tc const id = CvXSUBANY((CV*)SvRV(tc_code)).any_i32; - av_store(xa, MOUSE_XA_TC_CODE, newSViv(id)); - } - else{ - av_store(xa, MOUSE_XA_TC_CODE, newSVsv(tc_code)); - } - } - else{ - tc_code = MOUSE_xa_tc_code(xa); - } - - if(!mouse_tc_check(aTHX_ tc_code, value)){ - mouse_throw_error(MOUSE_xa_attribute(xa), value, - "Attribute (%"SVf") does not pass the type constraint because: %"SVf, - mcall0(MOUSE_xa_attribute(xa), mouse_name), - mcall1s(tc, "get_message", value)); - } - - return value; -} #define PUSH_VALUE(value, flags) STMT_START { \ if((flags) & MOUSEf_ATTR_SHOULD_AUTO_DEREF && GIMME_V == G_ARRAY){ \ @@ -215,14 +72,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++){ @@ -231,13 +89,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); @@ -252,40 +111,13 @@ mouse_push_values(pTHX_ SV* const value, U16 const flags){ static void mouse_attr_get(pTHX_ SV* const self, MAGIC* const mg){ U16 const flags = MOUSE_mg_flags(mg); - SV* const slot = MOUSE_mg_slot(mg); SV* value; - value = mouse_instance_get_slot(aTHX_ self, slot); + value = get_slot(self, MOUSE_mg_slot(mg)); /* check_lazy */ if( !value && flags & MOUSEf_ATTR_IS_LAZY ){ - 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){ - SV* const builder = mcall0s(attr, "builder"); - value = mcall0(self, builder); - } - - if(!value){ - value = sv_newmortal(); - } - - /* apply coerce and type constraint */ - if(flags & MOUSEf_ATTR_HAS_TC){ - value = mouse_apply_type_constraint(aTHX_ xa, value, flags); - } - - /* store value to slot */ - value = mouse_instance_set_slot(aTHX_ self, slot, value); + value = mouse_xa_set_default(aTHX_ MOUSE_mg_xa(mg), self); } PUSH_VALUE(value, flags); @@ -297,13 +129,13 @@ mouse_attr_set(pTHX_ SV* const self, MAGIC* const mg, SV* value){ SV* const slot = MOUSE_mg_slot(mg); if(flags & MOUSEf_ATTR_HAS_TC){ - value = mouse_apply_type_constraint(aTHX_ MOUSE_mg_xa(mg), value, flags); + value = mouse_xa_apply_type_constraint(aTHX_ MOUSE_mg_xa(mg), value, flags); } - mouse_instance_set_slot(aTHX_ self, slot, value); + value = set_slot(self, slot, value); if(flags & MOUSEf_ATTR_IS_WEAK_REF){ - mouse_instance_weaken_slot(aTHX_ self, slot); + weaken_slot(self, slot); } if(flags & MOUSEf_ATTR_HAS_TRIGGER){ @@ -323,7 +155,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; @@ -345,7 +177,7 @@ XS(mouse_xs_accessor) } -XS(mouse_xs_reader) +XS(XS_Mouse_reader) { dVAR; dXSARGS; dMOUSE_self; @@ -362,7 +194,7 @@ XS(mouse_xs_reader) mouse_attr_get(aTHX_ self, mg); } -XS(mouse_xs_writer) +XS(XS_Mouse_writer) { dVAR; dXSARGS; dMOUSE_self; @@ -389,7 +221,7 @@ mouse_accessor_get_mg(pTHX_ CV* const xsub){ */ CV* -mouse_install_simple_accessor(pTHX_ const char* const fq_name, const char* const key, I32 const keylen, XSUBADDR_t const accessor_impl){ +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; @@ -399,8 +231,11 @@ mouse_install_simple_accessor(pTHX_ const char* const fq_name, const char* const sv_2mortal((SV*)xsub); } - mg = sv_magicext((SV*)xsub, slot, PERL_MAGIC_ext, &mouse_accessor_vtbl, NULL, 0); + 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) @@ -410,24 +245,35 @@ 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; - SV* const slot = MOUSE_mg_slot((MAGIC*)XSANY.any_ptr); + MAGIC* const mg = (MAGIC*)XSANY.any_ptr; SV* value; if (items != 1) { - croak("Expected exactly one argument for a reader for '%"SVf"'", slot); + croak("Expected exactly one argument for a reader for '%"SVf"'", MOUSE_mg_slot(mg)); } - value = mouse_instance_get_slot(aTHX_ self, slot); - ST(0) = value ? value : &PL_sv_undef; + value = get_slot(self, MOUSE_mg_slot(mg)); + if(!value) { + if(MOUSE_mg_ptr(mg)){ + /* the default value must be a SV */ + assert(MOUSE_mg_len(mg) == HEf_SVKEY); + value = (SV*)MOUSE_mg_ptr(mg); + } + else{ + value = &PL_sv_undef; + } + } + + ST(0) = value; XSRETURN(1); } -XS(mouse_xs_simple_writer) +XS(XS_Mouse_simple_writer) { dVAR; dXSARGS; dMOUSE_self; @@ -437,11 +283,11 @@ XS(mouse_xs_simple_writer) croak("Expected exactly two argument for a writer for '%"SVf"'", slot); } - ST(0) = mouse_instance_set_slot(aTHX_ self, slot, ST(1)); + ST(0) = set_slot(self, slot, ST(1)); XSRETURN(1); } -XS(mouse_xs_simple_clearer) +XS(XS_Mouse_simple_clearer) { dVAR; dXSARGS; dMOUSE_self; @@ -452,12 +298,12 @@ XS(mouse_xs_simple_clearer) croak("Expected exactly one argument for a clearer for '%"SVf"'", slot); } - value = mouse_instance_delete_slot(aTHX_ self, slot); + value = delete_slot(self, slot); ST(0) = value ? value : &PL_sv_undef; XSRETURN(1); } -XS(mouse_xs_simple_predicate) +XS(XS_Mouse_simple_predicate) { dVAR; dXSARGS; dMOUSE_self; @@ -467,7 +313,7 @@ XS(mouse_xs_simple_predicate) croak("Expected exactly one argument for a predicate for '%"SVf"'", slot); } - ST(0) = boolSV( mouse_instance_has_slot(aTHX_ self, slot) ); + ST(0) = boolSV( has_slot(self, slot) ); XSRETURN(1); } @@ -476,6 +322,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 ); } @@ -517,7 +364,8 @@ mouse_instance_set_slot(pTHX_ SV* const instance, SV* const slot, SV* const valu CHECK_INSTANCE(instance); he = hv_fetch_ent((HV*)SvRV(instance), slot, TRUE, 0U); sv = HeVAL(he); - sv_setsv_mg(sv, value); + sv_setsv(sv, value); + SvSETMAGIC(sv); return sv; } @@ -540,7 +388,7 @@ mouse_instance_weaken_slot(pTHX_ SV* const instance, SV* const slot) { sv_rvweaken(HeVAL(he)); } } - + MODULE = Mouse::Meta::Method::Accessor::XS PACKAGE = Mouse::Meta::Method::Accessor::XS PROTOTYPES: DISABLE @@ -550,7 +398,7 @@ CV* _generate_accessor(klass, SV* attr, metaclass) CODE: { - RETVAL = mouse_instantiate_xs_accessor(aTHX_ attr, mouse_xs_accessor); + RETVAL = mouse_accessor_generate(aTHX_ attr, XS_Mouse_accessor); } OUTPUT: RETVAL @@ -559,7 +407,7 @@ CV* _generate_reader(klass, SV* attr, metaclass) CODE: { - RETVAL = mouse_instantiate_xs_accessor(aTHX_ attr, mouse_xs_reader); + RETVAL = mouse_accessor_generate(aTHX_ attr, XS_Mouse_reader); } OUTPUT: RETVAL @@ -568,7 +416,7 @@ CV* _generate_writer(klass, SV* attr, metaclass) CODE: { - RETVAL = mouse_instantiate_xs_accessor(aTHX_ attr, mouse_xs_writer); + RETVAL = mouse_accessor_generate(aTHX_ attr, XS_Mouse_writer); } OUTPUT: RETVAL @@ -580,7 +428,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_simple_accessor_generate(aTHX_ NULL, pv, len, XS_Mouse_simple_clearer, NULL, 0); } OUTPUT: RETVAL @@ -592,7 +440,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_simple_accessor_generate(aTHX_ NULL, pv, len, XS_Mouse_simple_predicate, NULL, 0); } OUTPUT: RETVAL