MOUSEf_XC_IS_IMMUTABLE = 0x0001,
MOUSEf_XC_IS_ANON = 0x0002,
MOUSEf_XC_HAS_BUILDARGS = 0x0004,
+ MOUSEf_XC_CONSTRUCTOR_IS_STRICT
+ = 0x0008,
MOUSEf_XC_mask = 0xFFFF /* not used */
};
MOUSE_XC_last
};
+enum mouse_modifier_t {
+ MOUSE_M_BEFORE,
+ MOUSE_M_AROUND,
+ MOUSE_M_AFTER,
+};
+
static MGVTBL mouse_xc_vtbl; /* for identity */
static void
}
}
+XS(XS_Mouse__Object_BUILDARGS); /* prototype */
+
static int
mouse_class_has_custom_buildargs(pTHX_ HV* const stash) {
- XS(XS_Mouse__Object_BUILDARGS); /* prototype */
-
GV* const buildargs = gv_fetchmeth_autoload(stash, "BUILDARGS", sizeof("BUILDARGS")-1, 0);
return buildargs && CvXSUB(GvCV(buildargs)) != XS_Mouse__Object_BUILDARGS;
flags |= MOUSEf_XC_HAS_BUILDARGS;
}
+ if(predicate_calls(metaclass, "strict_constructor")){
+ flags |= MOUSEf_XC_CONSTRUCTOR_IS_STRICT;
+ }
+
av_store(xc, MOUSE_XC_FLAGS, newSVuv(flags));
av_store(xc, MOUSE_XC_ATTRALL, (SV*)attrall);
av_store(xc, MOUSE_XC_BUILDALL, (SV*)buildall);
}
static void
-mouse_class_initialize_object(pTHX_ SV* const meta, SV* const object, HV* const args, bool const ignore_triggers) {
+mouse_report_unknown_args(pTHX_ SV* const meta, AV* const attrs, HV* const args) {
+ HV* const attr_map = newHV_mortal();
+ SV* const unknown = newSVpvs_flags("", SVs_TEMP);
+ I32 const len = AvFILLp(attrs) + 1;
+ I32 i;
+ HE* he;
+
+ for(i = 0; i < len; i++){
+ SV* const attr = MOUSE_av_at(attrs, i);
+ AV* const xa = mouse_get_xa(aTHX_ attr);
+ SV* const init_arg = MOUSE_xa_init_arg(xa);
+ if(SvOK(init_arg)){
+ (void)hv_store_ent(attr_map, init_arg, &PL_sv_undef, 0U);
+ }
+ }
+
+ hv_iterinit(args);
+ while((he = hv_iternext(args))){
+ SV* const key = hv_iterkeysv(he);
+ if(!hv_exists_ent(attr_map, key, 0U)){
+ sv_catpvf(unknown, "%"SVf", ", key);
+ }
+ }
+
+ if(SvCUR(unknown) > 0){
+ SvCUR(unknown) -= 2; /* chop "," */
+ }
+ else{
+ sv_setpvs(unknown, "(unknown)");
+ }
+
+ mouse_throw_error(meta, NULL,
+ "Unknown attribute passed to the constructor of %"SVf": %"SVf,
+ mcall0(meta, mouse_name), unknown);
+}
+
+
+
+static void
+mouse_class_initialize_object(pTHX_ SV* const meta, SV* const object, HV* const args, bool const is_cloning) {
AV* const xc = mouse_get_xc(aTHX_ meta);
AV* const attrs = MOUSE_xc_attrall(xc);
- I32 len = AvFILLp(attrs) + 1;
+ I32 const len = AvFILLp(attrs) + 1;
I32 i;
AV* triggers_queue = NULL;
+ U32 used = 0;
assert(meta || object);
assert(args);
croak("You cannot use tied HASH reference as initializing arguments");
}
- if(!ignore_triggers){
- triggers_queue = newAV_mortal();
- }
-
+ /* for each attribute */
for(i = 0; i < len; i++){
SV* const attr = MOUSE_av_at(attrs, i);
AV* const xa = mouse_get_xa(aTHX_ attr);
if(SvROK(value) && flags & MOUSEf_ATTR_IS_WEAK_REF){
weaken_slot(object, slot);
}
- if(flags & MOUSEf_ATTR_HAS_TRIGGER && triggers_queue){
+ if(flags & MOUSEf_ATTR_HAS_TRIGGER){
AV* const pair = newAV();
av_push(pair, newSVsv( mcall0s(attr, "trigger") ));
av_push(pair, newSVsv(value));
+ if(!triggers_queue) {
+ triggers_queue = newAV_mortal();
+ }
av_push(triggers_queue, (SV*)pair);
}
+ used++;
}
else { /* no init arg */
if(flags & (MOUSEf_ATTR_HAS_DEFAULT | MOUSEf_ATTR_HAS_BUILDER)){
- if(!(flags & MOUSEf_ATTR_IS_LAZY)){
+ /* skip if the object has the slot (it occurs on cloning/reblessing) */
+ if(!(flags & MOUSEf_ATTR_IS_LAZY) && !has_slot(object, slot)){
mouse_xa_set_default(aTHX_ xa, object);
}
}
- else if(flags & MOUSEf_ATTR_IS_REQUIRED) {
+ /* don't check while cloning (or reblesseing) */
+ else if(!is_cloning && flags & MOUSEf_ATTR_IS_REQUIRED) {
mouse_throw_error(attr, NULL, "Attribute (%"SVf") is required", slot);
}
}
- } /* for each attributes */
+ } /* for each attribute */
+
+ if(MOUSE_xc_flags(xc) & MOUSEf_XC_CONSTRUCTOR_IS_STRICT && used < HvUSEDKEYS(args)){
+ mouse_report_unknown_args(aTHX_ meta, attrs, args);
+ }
if(triggers_queue){
- len = AvFILLp(triggers_queue) + 1;
+ I32 const len = AvFILLp(triggers_queue) + 1;
for(i = 0; i < len; i++){
AV* const pair = (AV*)AvARRAY(triggers_queue)[i];
SV* const trigger = AvARRAY(pair)[0];
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;
+ meta = mcall1s(newSVpvs_flags("Mouse::Meta::Class", SVs_TEMP), "initialize", klass);
}
return meta;
PUSHs(args);
PUTBACK;
- call_sv(AvARRAY(buildall)[i], G_VOID);
+ call_sv_safe(AvARRAY(buildall)[i], G_VOID);
/* discard a scalar which G_VOID returns */
SPAGAIN;
}
}
+static AV*
+mouse_get_modifier_storage(pTHX_
+ SV* const meta,
+ enum mouse_modifier_t const m, SV* const name) {
+ static const char* const keys[] = {
+ "before",
+ "around",
+ "after",
+ };
+ SV* const key = sv_2mortal(Perl_newSVpvf(aTHX_ "%s_method_modifiers", keys[m]));
+ SV* table;
+ SV* storage_ref;
+
+ must_defined(name, "a method name");
+
+ table = get_slot(meta, key);
+
+ if(!table){
+ /* $meta->{$key} = {} */
+ table = sv_2mortal(newRV_noinc((SV*)newHV()));
+ set_slot(meta, key, table);
+ }
+
+ storage_ref = get_slot(table, name);
+
+ if(!storage_ref){
+ storage_ref = sv_2mortal(newRV_noinc((SV*)newAV()));
+ set_slot(table, name, storage_ref);
+ }
+ else{
+ if(!IsArrayRef(storage_ref)){
+ croak("Modifier strorage for '%s' is not an ARRAY reference", keys[m]);
+ }
+ }
+
+ return (AV*)SvRV(storage_ref);
+}
+
+DECL_BOOT(Mouse__Util);
+DECL_BOOT(Mouse__Util__TypeConstraints);
+DECL_BOOT(Mouse__Meta__Method__Accessor__XS);
+DECL_BOOT(Mouse__Meta__Attribute);
+
MODULE = Mouse PACKAGE = Mouse
PROTOTYPES: DISABLE
mouse_get_attribute = newSVpvs_share("get_attribute");
mouse_get_attribute_list = newSVpvs_share("get_attribute_list");
- MOUSE_CALL_BOOT(Mouse__Util);
- MOUSE_CALL_BOOT(Mouse__Util__TypeConstraints);
- MOUSE_CALL_BOOT(Mouse__Meta__Method__Accessor__XS);
- MOUSE_CALL_BOOT(Mouse__Meta__Attribute);
+ CALL_BOOT(Mouse__Util);
+ CALL_BOOT(Mouse__Util__TypeConstraints);
+ CALL_BOOT(Mouse__Meta__Method__Accessor__XS);
+ CALL_BOOT(Mouse__Meta__Attribute);
MODULE = Mouse PACKAGE = Mouse::Meta::Module
croak("No package name defined");
}
- SvGETMAGIC(name);
- SvGETMAGIC(code);
-
- if(!SvOK(name)){
- mouse_throw_error(self, NULL, "You must define a method name");
- }
- if(!SvROK(code)){
- mouse_throw_error(self, NULL, "You must define a CODE reference");
- }
+ must_defined(name, "a method name");
+ must_ref (code, "a CODE reference", SVt_NULL); /* any reftype is OK */
code_ref = code;
if(SvTYPE(SvRV(code_ref)) != SVt_PVCV){
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, "You must pass a CODE reference to add_method");
- }
+ must_ref(code, "a CODE reference", SVt_PVCV);
code_ref = sv;
}
/* *{$package . '::' . $name} -> *gv */
gv = gv_fetchpv(form("%"SVf"::%"SVf, package, name), GV_ADDMULTI, SVt_PVCV);
- if(GvCVu(gv)){ /* delete *slot{gv} to work around "redefine" warning */
- SvREFCNT_dec(GvCV(gv));
- GvCV(gv) = NULL;
- }
- sv_setsv_mg((SV*)gv, code_ref); /* *gv = $code_ref */
-
+ mouse_install_sub(aTHX_ gv, code_ref);
+ //CvMETHOD_on((CV*)SvRV(code_ref));
(void)set_slot(methods, name, code); /* $self->{methods}{$name} = $code */
-
- /* 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);
- }
- }
}
MODULE = Mouse PACKAGE = Mouse::Meta::Class
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:
}
}
-SV*
+void
new_object(SV* meta, ...)
CODE:
{
AV* const xc = mouse_get_xc(aTHX_ meta);
HV* const args = mouse_buildargs(aTHX_ meta, NULL, ax, items);
+ SV* object;
- RETVAL = mouse_instance_create(aTHX_ MOUSE_xc_stash(xc));
- mouse_class_initialize_object(aTHX_ meta, RETVAL, args, FALSE);
+ object = mouse_instance_create(aTHX_ MOUSE_xc_stash(xc));
+ mouse_class_initialize_object(aTHX_ meta, object, args, FALSE);
+ mouse_buildall(aTHX_ xc, object, sv_2mortal(newRV_inc((SV*)args))); /* BUILDALL */
+ ST(0) = object; /* because object is mortal, we should return it as is */
+ XSRETURN(1);
+}
+
+void
+clone_object(SV* meta, SV* object, ...)
+CODE:
+{
+ AV* const xc = mouse_get_xc(aTHX_ meta);
+ HV* const args = mouse_buildargs(aTHX_ meta, NULL, ax + 1, items - 1);
+ SV* proto;
+
+ if(!mouse_is_an_instance_of(aTHX_ MOUSE_xc_stash(xc), object)) {
+ mouse_throw_error(meta, object,
+ "You must pass an instance of the metaclass (%"SVf"), not (%"SVf")",
+ mcall0(meta, mouse_name), object);
+ }
+
+ proto = mouse_instance_clone(aTHX_ object);
+ mouse_class_initialize_object(aTHX_ meta, proto, args, TRUE);
+ ST(0) = proto; /* because object is mortal, we should return it as is */
+ XSRETURN(1);
}
-OUTPUT:
- RETVAL
void
-_initialize_object(SV* meta, SV* object, HV* args, bool ignore_triggers = FALSE)
+_initialize_object(SV* meta, SV* object, HV* args, bool is_cloning = FALSE)
CODE:
{
- mouse_class_initialize_object(aTHX_ meta, object, args, ignore_triggers);
+ mouse_class_initialize_object(aTHX_ meta, object, args, is_cloning);
+}
+
+void
+strict_constructor(SV* self, SV* value = NULL)
+CODE:
+{
+ SV* const slot = sv_2mortal(newSVpvs_share("strict_constructor"));
+ SV* const stash_ref = mcall0(self, mouse_namespace);
+ HV* stash;
+
+ if(!(SvROK(stash_ref) && SvTYPE(SvRV(stash_ref)) == SVt_PVHV)) {
+ croak("namespace() didn't return a HASH reference");
+ }
+ stash = (HV*)SvRV(stash_ref);
+
+ if(value) { /* setter */
+ set_slot(self, slot, value);
+ mro_method_changed_in(stash);
+ }
+
+ 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;
+ }
+ }
+ }
+ ST(0) = value ? value : &PL_sv_no;
}
MODULE = Mouse PACKAGE = Mouse::Meta::Role
INSTALL_CLASS_HOLDER(Role, method_metaclass, "Mouse::Meta::Role::Method");
+void
+add_before_modifier(SV* self, SV* name, SV* modifier)
+CODE:
+{
+ av_push(mouse_get_modifier_storage(aTHX_ self, (enum mouse_modifier_t)ix, name), newSVsv(modifier));
+}
+ALIAS:
+ add_before_method_modifier = MOUSE_M_BEFORE
+ add_around_method_modifier = MOUSE_M_AROUND
+ add_after_method_modifier = MOUSE_M_AFTER
+
+void
+get_before_modifiers(SV* self, SV* name)
+ALIAS:
+ get_before_method_modifiers = MOUSE_M_BEFORE
+ get_around_method_modifiers = MOUSE_M_AROUND
+ get_after_method_modifiers = MOUSE_M_AFTER
+PPCODE:
+{
+ AV* const storage = mouse_get_modifier_storage(aTHX_ self, (enum mouse_modifier_t)ix, name);
+ I32 const len = av_len(storage) + 1;
+ if(GIMME_V == G_ARRAY) {
+ I32 i;
+ EXTEND(SP, len);
+ for(i = 0; i < len; i++){
+ PUSHs(*av_fetch(storage, i, TRUE));
+ }
+ }
+ else{
+ mPUSHi(len);
+ }
+}
+
MODULE = Mouse PACKAGE = Mouse::Object
-SV*
+void
new(SV* klass, ...)
CODE:
{
AV* const xc = mouse_get_xc(aTHX_ meta);
UV const flags = MOUSE_xc_flags(xc);
SV* args;
+ SV* object;
/* BUILDARGS */
if(flags & MOUSEf_XC_HAS_BUILDARGS){
for(i = 0; i < items; i++){
PUSHs(ST(i));
}
- //SP += items;
+
PUTBACK;
- call_method("BUILDARGS", G_SCALAR);
+ call_method_safes("BUILDARGS", G_SCALAR);
+
SPAGAIN;
args = POPs;
PUTBACK;
}
/* new_object */
- RETVAL = mouse_instance_create(aTHX_ MOUSE_xc_stash(xc));
- mouse_class_initialize_object(aTHX_ meta, RETVAL, (HV*)SvRV(args), FALSE);
-
- mouse_buildall(aTHX_ xc, RETVAL, args);
+ object = mouse_instance_create(aTHX_ MOUSE_xc_stash(xc));
+ mouse_class_initialize_object(aTHX_ meta, object, (HV*)SvRV(args), FALSE);
+ mouse_buildall(aTHX_ xc, object, args); /* BUILDALL */
+ ST(0) = object; /* because object is mortal, we should return it as is */
+ XSRETURN(1);
}
-OUTPUT:
- RETVAL
void
DESTROY(SV* object)
len = AvFILLp(demolishall) + 1;
if(len > 0){
- GV* const statusvalue = gv_fetchpvs("?", 0, SVt_PV);
- SAVESPTR(GvSV(statusvalue)); /* local $? */
+ SV* const in_global_destruction = boolSV(PL_dirty);
+ SAVEI32(PL_statusvalue); /* local $? */
+ PL_statusvalue = 0;
+
SAVESPTR(ERRSV); /* local $@ */
+ ERRSV = sv_newmortal();
+
+ EXTEND(SP, 2);
- GvSV(statusvalue) = sv_newmortal();
- ERRSV = newSVpvs_flags("", SVs_TEMP);
for(i = 0; i < len; i++){
SPAGAIN;
PUSHMARK(SP);
- XPUSHs(object);
+ PUSHs(object);
+ PUSHs(in_global_destruction);
PUTBACK;
call_sv(AvARRAY(demolishall)[i], G_VOID | G_EVAL);
SV* const meta = get_metaclass(self);
AV* const xc = mouse_get_xc(aTHX_ meta);
- if(!IsHashRef(args)){
- croak("You must pass a HASH reference to BUILDALL");
- }
+ must_ref(args, "a HASH reference to BUILDALL", SVt_PVHV);
mouse_buildall(aTHX_ xc, self, args);
}
projects / gitmo/Mouse.git / blobdiff