#define MOUSE_xc_stash(a) ( (HV*)MOUSE_av_at((a), MOUSE_XC_STASH) )
#define MOUSE_xc_attrall(a) ( (AV*)MOUSE_av_at((a), MOUSE_XC_ATTRALL) )
#define MOUSE_xc_buildall(a) ( (AV*)MOUSE_av_at((a), MOUSE_XC_BUILDALL) )
-#define MOUSE_xc_demolishall(a) ( (AV*)MOUSE_av_at((a), MOUSE_XC_DEOLISHALL) )
+#define MOUSE_xc_demolishall(a) ( (AV*)MOUSE_av_at((a), MOUSE_XC_DEMOLISHALL) )
enum mouse_xc_flags_t {
MOUSEf_XC_IS_IMMUTABLE = 0x0001,
MOUSE_XC_GEN, /* class generation */
MOUSE_XC_STASH, /* symbol table hash */
- MOUSE_XC_BUILDARGS, /* Custom BUILDARGS */
-
MOUSE_XC_ATTRALL, /* all the attributes */
MOUSE_XC_BUILDALL, /* all the BUILD methods */
MOUSE_XC_DEMOLISHALL, /* all the DEMOLISH methods */
GV* const buildargs = gv_fetchmeth_autoload(stash, "BUILDARGS", sizeof("BUILDARGS")-1, 0);
- return buildargs && CvXSUB(GvCV(buildargs)) == XS_Mouse__Object_BUILDARGS;
+ return buildargs && CvXSUB(GvCV(buildargs)) != XS_Mouse__Object_BUILDARGS;
}
static void
for(i = 0; i < len; i++){
SV* const klass = MOUSE_av_at(linearized_isa, i);
+ HV* const st = gv_stashsv(klass, TRUE);
SV* meta;
GV* gv;
- gv = stash_fetchs(stash, "BUILD", FALSE);
+ gv = stash_fetchs(st, "BUILD", FALSE);
if(gv && GvCVu(gv)){
- av_push(buildall, newRV_inc((SV*)GvCV(gv)));
+ av_unshift(buildall, 1);
+ av_store(buildall, 0, newRV_inc((SV*)GvCV(gv)));
}
- gv = stash_fetchs(stash, "DEMOLISH", FALSE);
+ gv = stash_fetchs(st, "DEMOLISH", FALSE);
if(gv && GvCVu(gv)){
av_push(demolishall, newRV_inc((SV*)GvCV(gv)));
}
sv_setuv(MOUSE_xc_gen(xc), mro_get_pkg_gen(stash));
}
-AV*
+static AV*
mouse_get_xc(pTHX_ SV* const metaclass) {
AV* xc;
SV* gen;
av_extend(xc, MOUSE_XC_last - 1);
- av_store(xc, MOUSE_XC_GEN, newSViv(0));
+ av_store(xc, MOUSE_XC_GEN, newSVuv(0U));
av_store(xc, MOUSE_XC_STASH, (SV*)stash);
SvREFCNT_inc_simple_void_NN(stash);
}
gen = MOUSE_xc_gen(xc);
+
+ if(SvUVX(gen) != 0U && MOUSE_xc_flags(xc) & MOUSEf_XC_IS_IMMUTABLE){
+ return xc;
+ }
+
stash = MOUSE_xc_stash(xc);
- if(SvUV(gen) != mro_get_pkg_gen(stash)){
+ if(SvUVX(gen) != mro_get_pkg_gen(stash)){
mouse_class_update_xc(aTHX_ metaclass, stash, xc);
}
return xc;
}
-HV*
-mouse_build_args(pTHX_ SV* metaclass, SV* const klass, I32 const start, I32 const items, I32 const ax) {
+static HV*
+mouse_buildargs(pTHX_ SV* metaclass, SV* const klass, I32 ax, I32 items) {
HV* args;
- if((items - start) == 1){
- SV* const args_ref = ST(start);
+
+ /* shift @_ */
+ ax++;
+ items--;
+
+ if(items == 1){
+ SV* const args_ref = ST(0);
if(!IsHashRef(args_ref)){
if(!metaclass){ metaclass = get_metaclass(klass); }
mouse_throw_error(metaclass, NULL, "Single parameters to new() must be a HASH ref");
args = newHV_mortal();
- if( ((items - start) % 2) != 0 ){
+ if( (items % 2) != 0 ){
if(!metaclass){ metaclass = get_metaclass(klass); }
mouse_throw_error(metaclass, NULL, "Odd number of parameters to new()");
}
- for(i = start; i < items; i += 2){
+ for(i = 0; i < items; i += 2){
(void)hv_store_ent(args, ST(i), newSVsv(ST(i+1)), 0U);
}
return args;
}
-void
+static void
mouse_class_initialize_object(pTHX_ SV* const meta, SV* const object, HV* const args, bool const ignore_triggers) {
AV* const xc = mouse_get_xc(aTHX_ meta);
AV* const attrs = MOUSE_xc_attrall(xc);
I32 i;
AV* triggers_queue = NULL;
+ assert(meta || object);
+ assert(args);
+ assert(SvTYPE(args) == SVt_PVHV);
+
ENTER;
SAVETMPS;
}
for(i = 0; i < len; i++){
- SV* const attr = AvARRAY(attrs)[i];
- AV* const xa = mouse_get_xa(aTHX_ AvARRAY(attrs)[i]);
+ SV* const attr = MOUSE_av_at(attrs, i);
+ AV* const xa = mouse_get_xa(aTHX_ attr);
SV* const slot = MOUSE_xa_slot(xa);
U16 const flags = (U16)MOUSE_xa_flags(xa);
}
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;
LEAVE;
}
+static SV*
+mouse_initialize_metaclass(pTHX_ SV* const klass) {
+ SV* meta = get_metaclass(klass);
+
+ if(!SvOK(meta)){
+ dSP;
+ PUSHMARK(SP);
+
+ EXTEND(SP, 2);
+ mPUSHp("Mouse::Meta::Class", sizeof("Mouse::Meta::Class")-1);
+ PUSHs(klass);
+ PUTBACK;
+
+ call_method("initialize", G_SCALAR);
+ SPAGAIN;
+ meta = POPs;
+ PUTBACK;
+ }
+
+ return meta;
+}
+
MODULE = Mouse PACKAGE = Mouse
PROTOTYPES: DISABLE
SV* sv = code_ref; /* used in tryAMAGICunDEREF */
SV** sp = &sv; /* used in tryAMAGICunDEREF */
tryAMAGICunDEREF(to_cv); /* try \&{$code} */
- if(SvROK(sv) && SvTYPE(SvRV(sv)) == SVt_PVCV){
- mouse_throw_error(self, NULL, "Not a CODE reference");
+ if(!(SvROK(sv) && SvTYPE(SvRV(sv)) == SVt_PVCV)){
+ mouse_throw_error(self, NULL, "You must pass a CODE reference to add_method");
}
code_ref = sv;
}
set_slot(methods, name, code); /* $self->{methods}{$name} = $code */
- /* TODO: name the CODE ref if it's anonymous */
- //code_entity = (CV*)SvRV(code_ref);
- //if(CvANON(code_entity)
- // && CvGV(code_entity) /* a cv under construction has no gv */ ){
+ /* name the CODE ref if it's anonymous */
+ {
+ CV* const code_entity = (CV*)SvRV(code_ref);
+ if(CvANON(code_entity)
+ && CvGV(code_entity) /* a cv under construction has no gv */ ){
- // CvGV(code_entity) = gv;
- // CvANON_off(code_entity);
- //}
+ CvGV(code_entity) = gv;
+ CvANON_off(code_entity);
+ }
+ }
}
MODULE = Mouse PACKAGE = Mouse::Meta::Class
BOOT:
INSTALL_SIMPLE_READER(Class, roles);
INSTALL_SIMPLE_PREDICATE_WITH_KEY(Class, is_anon_class, anon_serial_id);
- newCONSTSUB(gv_stashpvs("Mouse::Meta::Class", TRUE), "constructor_class",
- newSVpvs("Mouse::Meta::Method::Constructor::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)));
+ newCONSTSUB(gv_stashpvs("Mouse::Meta::Method::Destructor::XS", TRUE), "_generate_destructor",
+ newRV_inc((SV*)get_cvs("Mouse::Object::DESTROY", TRUE)));
+
void
linearized_isa(SV* self)
PPCODE:
{
AV* const xc = mouse_get_xc(aTHX_ self);
- AV* const all_attrs = MOUSE_xc_attrall(xc);
+ AV* const all_attrs = MOUSE_xc_attrall(xc);
I32 const len = AvFILLp(all_attrs) + 1;
I32 i;
}
SV*
-new_object_(SV* meta, ...)
+new_object(SV* meta, ...)
CODE:
{
- HV* const args = mouse_build_args(aTHX_ meta, NULL, 1, items, ax);
AV* const xc = mouse_get_xc(aTHX_ meta);
+ HV* const args = mouse_buildargs(aTHX_ meta, NULL, ax, items);
RETVAL = mouse_instance_create(aTHX_ MOUSE_xc_stash(xc));
mouse_class_initialize_object(aTHX_ meta, RETVAL, args, FALSE);
}
-
+OUTPUT:
+ RETVAL
void
_initialize_object(SV* meta, SV* object, HV* args, bool ignore_triggers = FALSE)
INSTALL_SIMPLE_READER_WITH_KEY(Role, get_roles, roles);
INSTALL_SIMPLE_PREDICATE_WITH_KEY(Role, is_anon_role, anon_serial_id);
+ INSTALL_CLASS_HOLDER(Role, method_metaclass, "Mouse::Meta::Role::Method");
+
MODULE = Mouse PACKAGE = Mouse::Object
-HV*
-BUILDARGS(SV* klass, ...)
+SV*
+new(SV* klass, ...)
CODE:
{
- RETVAL = mouse_build_args(aTHX_ NULL, klass, 1, items, ax);
+ SV* const meta = mouse_initialize_metaclass(aTHX_ klass);
+ AV* const xc = mouse_get_xc(aTHX_ meta);
+ UV const flags = MOUSE_xc_flags(xc);
+ SV* args;
+ AV* buildall;
+ I32 len, i;
+
+ /* BUILDARGS */
+ if(flags & MOUSEf_XC_HAS_BUILDARGS){
+ SPAGAIN;
+
+ PUSHMARK(SP);
+ EXTEND(SP, items);
+ for(i = 0; i < items; i++){
+ PUSHs(ST(i));
+ }
+ //SP += items;
+ PUTBACK;
+ call_method("BUILDARGS", G_SCALAR);
+ SPAGAIN;
+ args = POPs;
+ PUTBACK;
+
+ if(!IsHashRef(args)){
+ croak("BUILDARGS did not return a HASH reference");
+ }
+ }
+ else{
+ args = newRV_inc((SV*)mouse_buildargs(aTHX_ meta, klass, ax, items));
+ sv_2mortal(args);
+ }
+
+ /* new_object */
+ RETVAL = mouse_instance_create(aTHX_ MOUSE_xc_stash(xc));
+ mouse_class_initialize_object(aTHX_ meta, RETVAL, (HV*)SvRV(args), FALSE);
+
+ /* BUILDALL */
+ buildall = MOUSE_xc_buildall(xc);
+ len = AvFILLp(buildall) + 1;
+ for(i = 0; i < len; i++){
+ dSP;
+
+ PUSHMARK(SP);
+ EXTEND(SP, 2);
+ PUSHs(RETVAL); /* self */
+ PUSHs(args);
+ PUTBACK;
+
+ call_sv(AvARRAY(buildall)[i], G_VOID | G_DISCARD);
+ }
}
OUTPUT:
RETVAL
-MODULE = Mouse PACKAGE = Mouse::Meta::Method::Constructor::XS
+void
+DESTROY(SV* object)
+CODE:
+{
+ SV* const meta = get_metaclass(object);
+ AV* demolishall;
+ I32 len, i;
+
+ if(!IsObject(object)){
+ croak("You must not call DESTROY as a class method");
+ }
+
+ if(SvOK(meta)){
+ AV* const xc = mouse_get_xc(aTHX_ meta);
+
+ demolishall = MOUSE_xc_demolishall(xc);
+ }
+ else {
+ AV* const linearized_isa = mro_get_linear_isa(SvSTASH(SvRV(object)));
+
+ len = AvFILLp(linearized_isa) + 1;
+
+ demolishall = newAV_mortal();
+ for(i = 0; i < len; i++){
+ SV* const klass = MOUSE_av_at(linearized_isa, i);
+ HV* const st = gv_stashsv(klass, TRUE);
+ GV* const gv = stash_fetchs(st, "DEMOLISH", FALSE);
+ if(gv && GvCVu(gv)){
+ av_push(demolishall, newRV_inc((SV*)GvCV(gv)));
+ }
+ }
+ }
+
+ /* DEMOLISHALL */
+ len = AvFILLp(demolishall) + 1;
+ if(len > 0){
+ GV* const statusvalue = gv_fetchpvs("?", 0, SVt_PV);
+ SAVESPTR(GvSV(statusvalue)); /* local $? */
+ SAVESPTR(ERRSV); /* local $@ */
+
+ GvSV(statusvalue) = sv_2mortal(newSViv(0));
+ ERRSV = sv_2mortal(newSVpvs(""));
+ for(i = 0; i < len; i++){
+ dSP;
+
+ PUSHMARK(SP);
+ XPUSHs(object);
+ PUTBACK;
-CV*
-_generate_constructor(...)
+ call_sv(AvARRAY(demolishall)[i], G_VOID | G_DISCARD | G_EVAL);
+ if(SvTRUE(ERRSV)){
+ SV* const e = newSVsv(ERRSV);
+
+ FREETMPS;
+ LEAVE;
+
+ sv_setsv(ERRSV, e);
+ SvREFCNT_dec(e);
+ croak(NULL); /* rethrow */
+ }
+ }
+ }
+}
+
+HV*
+BUILDARGS(SV* klass, ...)
CODE:
{
- RETVAL = get_cvs("Mouse::Object::new", TRUE);
- SvREFCNT_inc_simple_void_NN(RETVAL);
+ RETVAL = mouse_buildargs(aTHX_ NULL, klass, ax, items);
}
OUTPUT:
RETVAL
+