X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=gitmo%2FMouse.git;a=blobdiff_plain;f=xs-src%2FMouse.xs;h=d7cdb78dd6b740e0621b18eeeb3b02b67b67dd2c;hp=84d49f21e12b10d77f32276680150922d4cf2701;hb=f8beb873dc6db9067aacdada68d0158366570f28;hpb=ae34e0779f972bfb489cb174f2f2dbafcbb34ba3 diff --git a/xs-src/Mouse.xs b/xs-src/Mouse.xs index 84d49f2..d7cdb78 100644 --- a/xs-src/Mouse.xs +++ b/xs-src/Mouse.xs @@ -306,7 +306,7 @@ mouse_class_initialize_object(pTHX_ SV* const meta, SV* const object, HV* const } if(MOUSE_xc_flags(xc) & MOUSEf_XC_IS_ANON){ - set_slot(object, newSVpvs_flags("__ANON__", SVs_TEMP), meta); + set_slot(object, newSVpvs_flags("__METACLASS__", SVs_TEMP), meta); } FREETMPS; @@ -335,122 +335,6 @@ mouse_initialize_metaclass(pTHX_ SV* const klass) { return meta; } - -/* copied from Class-MOP/topic/symbol-manipluator */ -static GV* -mouse_get_gv(pTHX_ SV* const self, svtype const type, const char* const var_name, I32 const var_name_len, I32 const flags){ - SV* package_name; - STRLEN len; - const char* pv; - - if(!flags){ - SV* const ns = mcall0(self, mouse_namespace); - GV** gvp; - if(!(SvROK(ns) && SvTYPE(SvRV(ns)) == SVt_PVHV)){ - croak("namespace() did not return a hash reference"); - } - gvp = (GV**)hv_fetch((HV*)SvRV(ns), var_name, var_name_len, FALSE); - if(gvp && isGV_with_GP(*gvp)){ - return *gvp; - } - } - - package_name = get_slot(self, mouse_package); - - if(!(package_name && SvOK(package_name))){ - croak("No package name defined"); - } - - pv = SvPV_const(package_name, len); - - return gv_fetchpvn_flags(Perl_form(aTHX_ "%s::%s", pv, var_name), (len + var_name_len + 2), flags, type); -} - -/* copied from Class-MOP/topic/symbol-manipluator */ -static SV* -mouse_gv_elem(pTHX_ GV* const gv, svtype const type, I32 const add){ - SV* sv; - - if(!gv){ - return NULL; - } - - assert(isGV_with_GP(gv)); - - switch(type){ - case SVt_PVAV: - sv = (SV*)(add ? GvAVn(gv) : GvAV(gv)); - break; - case SVt_PVHV: - sv = (SV*)(add ? GvHVn(gv) : GvHV(gv)); - break; - case SVt_PVCV: - sv = (SV*)GvCV(gv); - break; - case SVt_PVIO: - sv = (SV*)(add ? GvIOn(gv) : GvIO(gv)); - break; - case SVt_PVGV: - sv = (SV*)gv; - break; - default: /* SCALAR */ - sv = add ? GvSVn(gv) : GvSV(gv); - break; - } - - return sv; -} - -/* copied from Class-MOP/topic/symbol-manipluator */ -static void -mouse_deconstruct_variable_name(pTHX_ SV* const variable, - const char** const var_name, STRLEN* const var_name_len, - svtype* const type, - const char** const type_name) { - - STRLEN len; - const char* pv; - - /* e.g. variable = '$foo' */ - - if(!SvOK(variable)) { - croak("You must pass a variable name"); - } - pv = SvPV_const(variable, len); - if(len < 2){ - croak("You must pass a variable name including a sigil"); - } - - *var_name = pv + 1; - *var_name_len = len - 1; - - switch(pv[0]){ - case '$': - *type = SVt_PV; /* for all the types of scalars */ - *type_name = "SCALAR"; - break; - case '@': - *type = SVt_PVAV; - *type_name = "ARRAY"; - break; - case '%': - *type = SVt_PVHV; - *type_name = "HASH"; - break; - case '&': - *type = SVt_PVCV; - *type_name = "CODE"; - break; - case '*': - *type = SVt_PVGV; - *type_name = "GLOB"; - break; - default: - croak("I do not recognize that sigil '%c'", pv[0]); - } -} - - MODULE = Mouse PACKAGE = Mouse PROTOTYPES: DISABLE @@ -547,51 +431,16 @@ CODE: } } -bool -has_package_symbol(SV* self, SV* variable) -PREINIT: - svtype type; - const char* type_name; - const char* var_name; - STRLEN var_name_len; - GV* gv; -CODE: - mouse_deconstruct_variable_name(aTHX_ variable, &var_name, &var_name_len, &type, &type_name); - gv = mouse_get_gv(aTHX_ self, type, var_name, var_name_len, 0); - RETVAL = mouse_gv_elem(aTHX_ gv, type, FALSE) ? TRUE : FALSE; -OUTPUT: - RETVAL - -SV* -get_package_symbol(SV* self, SV* variable) -PREINIT: - svtype type; - const char* type_name; - const char* var_name; - STRLEN var_name_len; - I32 flags = 0; - GV* gv; - SV* sv; -CODE: - mouse_deconstruct_variable_name(aTHX_ variable, &var_name, &var_name_len, &type, &type_name); - gv = mouse_get_gv(aTHX_ self, type, var_name, var_name_len, flags); - sv = mouse_gv_elem(aTHX_ gv, type, FALSE); - - RETVAL = sv ? newRV_inc(sv) : &PL_sv_undef; -OUTPUT: - RETVAL - - MODULE = Mouse PACKAGE = Mouse::Meta::Class BOOT: INSTALL_SIMPLE_READER(Class, roles); INSTALL_SIMPLE_PREDICATE_WITH_KEY(Class, is_anon_class, anon_serial_id); - INSTALL_SIMPLE_READER_WITH_DEFAULTS(Class, method_metaclass, "Mouse::Meta::Method"); - INSTALL_SIMPLE_READER_WITH_DEFAULTS(Class, attribute_metaclass, "Mouse::Meta::Attribute"); - INSTALL_SIMPLE_READER_WITH_DEFAULTS(Class, constructor_class, "Mouse::Meta::Method::Constructor::XS"); - INSTALL_SIMPLE_READER_WITH_DEFAULTS(Class, destructor_class, "Mouse::Meta::Method::Destructor::XS"); + INSTALL_CLASS_HOLDER(Class, method_metaclass, "Mouse::Meta::Method"); + INSTALL_CLASS_HOLDER(Class, attribute_metaclass, "Mouse::Meta::Attribute"); + INSTALL_CLASS_HOLDER(Class, constructor_class, "Mouse::Meta::Method::Constructor::XS"); + INSTALL_CLASS_HOLDER(Class, destructor_class, "Mouse::Meta::Method::Destructor::XS"); newCONSTSUB(gv_stashpvs("Mouse::Meta::Method::Constructor::XS", TRUE), "_generate_constructor", newRV_inc((SV*)get_cvs("Mouse::Object::new", TRUE))); @@ -659,7 +508,7 @@ BOOT: INSTALL_SIMPLE_READER_WITH_KEY(Role, get_roles, roles); INSTALL_SIMPLE_PREDICATE_WITH_KEY(Role, is_anon_role, anon_serial_id); - INSTALL_SIMPLE_READER_WITH_DEFAULTS(Role, method_metaclass, "Mouse::Meta::Role::Method"); + INSTALL_CLASS_HOLDER(Role, method_metaclass, "Mouse::Meta::Role::Method"); MODULE = Mouse PACKAGE = Mouse::Object @@ -761,10 +610,10 @@ CODE: SAVESPTR(GvSV(statusvalue)); /* local $? */ SAVESPTR(ERRSV); /* local $@ */ - GvSV(statusvalue) = sv_2mortal(newSViv(0)); - ERRSV = sv_2mortal(newSVpvs("")); + GvSV(statusvalue) = sv_newmortal(); + ERRSV = newSVpvs_flags("", SVs_TEMP); for(i = 0; i < len; i++){ - dSP; + SPAGAIN; PUSHMARK(SP); XPUSHs(object);