X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=gitmo%2FMouse.git;a=blobdiff_plain;f=xs-src%2FMouse.xs;h=0a94ec82675926c5f06efd4aaf8f5ddf54d7813a;hp=90a09723f6108962ce292cd134cb220d6719cd39;hb=e83a2ae7aa566943bd49426e77146127511acad3;hpb=7efbc77d922079f81c55e2f1535f222979fe1d96

diff --git a/xs-src/Mouse.xs b/xs-src/Mouse.xs
index 90a0972..0a94ec8 100644
--- a/xs-src/Mouse.xs
+++ b/xs-src/Mouse.xs
@@ -150,7 +150,7 @@ mouse_class_update_xc(pTHX_ SV* const metaclass PERL_UNUSED_DECL, HV* const stas
     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;
@@ -175,7 +175,7 @@ mouse_get_xc(pTHX_ SV* const metaclass) {
 
         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);
@@ -188,16 +188,21 @@ mouse_get_xc(pTHX_ SV* const metaclass) {
     }
 
     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*
+static HV*
 mouse_buildargs(pTHX_ SV* metaclass, SV* const klass, I32 ax, I32 items) {
     HV* args;
 
@@ -232,7 +237,7 @@ mouse_buildargs(pTHX_ SV* metaclass, SV* const klass, I32 ax, I32 items) {
     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);
@@ -252,8 +257,8 @@ mouse_class_initialize_object(pTHX_ SV* const meta, SV* const object, HV* const
     }
 
     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);
@@ -301,13 +306,35 @@ 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;
     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
@@ -376,8 +403,8 @@ CODE:
         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;
     }
@@ -392,14 +419,16 @@ CODE:
 
     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
@@ -407,8 +436,17 @@ 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)
@@ -434,7 +472,7 @@ get_all_attributes(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;
 
@@ -445,7 +483,7 @@ PPCODE:
 }
 
 SV*
-new_object_(SV* meta, ...)
+new_object(SV* meta, ...)
 CODE:
 {
     AV* const xc   = mouse_get_xc(aTHX_ meta);
@@ -454,7 +492,8 @@ CODE:
     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)
@@ -463,33 +502,25 @@ CODE:
     mouse_class_initialize_object(aTHX_ meta, object, args, ignore_triggers);
 }
 
-void
-__xc(SV* meta)
-PPCODE:
-{
-    AV* const xc = mouse_get_xc(aTHX_ meta);
-    mXPUSHu(MOUSE_xc_flags(xc));
-    mXPUSHs(newRV_inc((SV*)MOUSE_xc_buildall(xc)));
-    mXPUSHs(newRV_inc((SV*)MOUSE_xc_demolishall(xc)));
-}
-
 MODULE = Mouse  PACKAGE = Mouse::Meta::Role
 
 BOOT:
     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
 
 SV*
 new(SV* klass, ...)
 CODE:
 {
-    SV* const meta = get_metaclass(klass);
+    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* av;
+    AV* buildall;
     I32 len, i;
 
     /* BUILDARGS */
@@ -522,41 +553,94 @@ CODE:
     mouse_class_initialize_object(aTHX_ meta, RETVAL, (HV*)SvRV(args), FALSE);
 
     /* BUILDALL */
-    av  = MOUSE_xc_buildall(xc);
-    len = AvFILLp(av) + 1;
+    buildall = MOUSE_xc_buildall(xc);
+    len      = AvFILLp(buildall) + 1;
     for(i = 0; i < len; i++){
         dSP;
 
         PUSHMARK(SP);
         EXTEND(SP, 2);
-        PUSHs(RETVAL);
+        PUSHs(RETVAL); /* self */
         PUSHs(args);
         PUTBACK;
 
-        call_sv(AvARRAY(av)[i], G_VOID | G_DISCARD);
+        call_sv(AvARRAY(buildall)[i], G_VOID | G_DISCARD);
     }
 }
 OUTPUT:
     RETVAL
 
-HV*
-BUILDARGS(SV* klass, ...)
+void
+DESTROY(SV* object)
 CODE:
 {
-    RETVAL = mouse_buildargs(aTHX_ NULL, klass, ax, items);
-}
-OUTPUT:
-    RETVAL
+    SV* const meta = get_metaclass(object);
+    AV* demolishall;
+    I32 len, i;
 
-MODULE = Mouse  PACKAGE = Mouse::Meta::Method::Constructor::XS
+    if(!IsObject(object)){
+        croak("You must not call DESTROY as a class method");
+    }
 
-CV*
-_generate_constructor(...)
+    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;
+
+            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
 
+