X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=xs-src%2FMouse.xs;h=c59c15cbe1fb79696e76fa2e1ec6f8dc84067fd7;hb=43e49d9325893d1293ffbc7ba2f1e5b9312716fa;hp=44ccf84cebb9c082b74cfb01617a11b7a3103319;hpb=1d5ecd5f15a0f418bee471c00af2357ba63b99ba;p=gitmo%2FMouse.git

diff --git a/xs-src/Mouse.xs b/xs-src/Mouse.xs
index 44ccf84..c59c15c 100644
--- a/xs-src/Mouse.xs
+++ b/xs-src/Mouse.xs
@@ -2,6 +2,8 @@
 
 SV* mouse_package;
 SV* mouse_namespace;
+SV* mouse_methods;
+SV* mouse_name;
 
 MODULE = Mouse  PACKAGE = Mouse::Util
 
@@ -10,11 +12,14 @@ PROTOTYPES: DISABLE
 BOOT:
     mouse_package   = newSVpvs_share("package");
     mouse_namespace = newSVpvs_share("namespace");
+    mouse_methods   = newSVpvs_share("methods");
+    mouse_name      = newSVpvs_share("name");
+
     MOUSE_CALL_BOOT(Mouse__Util__TypeConstraints);
 
 
 bool
-is_class_loaded(SV* sv = &PL_sv_undef)
+is_class_loaded(SV* sv)
 
 void
 get_code_info(CV* code)
@@ -95,13 +100,68 @@ CODE:
 {
     SV* const package = mouse_instance_get_slot(aTHX_ self, mouse_package);
     if(!(package && SvOK(package))){
-        croak("No package name");
+        croak("No package name defined");
     }
     RETVAL = gv_stashsv(package, GV_ADDMULTI);
 }
 OUTPUT:
     RETVAL
 
+# ignore extra arguments for extensibility
+void
+add_method(SV* self, SV* name, SV* code, ...)
+CODE:
+{
+    SV* const package = mouse_instance_get_slot(aTHX_ self, mouse_package); /* $self->{package} */
+    SV* const methods = mouse_instance_get_slot(aTHX_ self, mouse_methods); /* $self->{methods} */
+    GV* gv;
+    SV* code_ref;
+
+    if(!(package && SvOK(package))){
+        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");
+    }
+
+    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, "Not a CODE reference");
+        }
+        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_instance_set_slot(aTHX_ 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 */ ){
+
+    //    CvGV(code_entity) = gv;
+    //    CvANON_off(code_entity);
+    //}
+}
+
 MODULE = Mouse  PACKAGE = Mouse::Meta::Class
 
 BOOT:
@@ -192,12 +252,6 @@ BOOT:
 
 MODULE = Mouse  PACKAGE = Mouse::Meta::Method::Accessor::XS
 
-BOOT:
-{
-    AV* const isa = get_av("Mouse::Meta::Method::Accessor::XS::ISA", TRUE);
-    av_push(isa, newSVpvs("Mouse::Meta::Method::Accessor"));
-}
-
 CV*
 _generate_accessor(klass, SV* attr, metaclass)
 CODE: