X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=gitmo%2FMouse.git;a=blobdiff_plain;f=xs-src%2FMouse.xs;h=e4f8a343e89a8d8d09725c73da6ca74673d4df1e;hp=5a6c8446a1caf70720658bdce9dbe4cb0eb67643;hb=a4b901ac53a9eb592740cd6fb20a136e142671db;hpb=cccb83dea141cc50ab03aedefda36c5822a7b98f

diff --git a/xs-src/Mouse.xs b/xs-src/Mouse.xs
index 5a6c844..e4f8a34 100644
--- a/xs-src/Mouse.xs
+++ b/xs-src/Mouse.xs
@@ -2,44 +2,23 @@
 
 SV* mouse_package;
 SV* mouse_namespace;
+SV* mouse_methods;
+SV* mouse_name;
 
-MODULE = Mouse  PACKAGE = Mouse::Util
+MODULE = Mouse  PACKAGE = Mouse
 
 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);
+    MOUSE_CALL_BOOT(Mouse__Util__TypeConstraints);
+    MOUSE_CALL_BOOT(Mouse__Meta__Method__Accessor__XS);
 
-bool
-is_class_loaded(SV* sv = &PL_sv_undef)
-
-void
-get_code_info(CV* code)
-PREINIT:
-    GV* gv;
-    HV* stash;
-PPCODE:
-    if((gv = CvGV(code)) && isGV(gv) && (stash = GvSTASH(gv))){
-        EXTEND(SP, 2);
-        mPUSHs(newSVpvn_share(HvNAME_get(stash), HvNAMELEN_get(stash), 0U));
-        mPUSHs(newSVpvn_share(GvNAME_get(gv), GvNAMELEN_get(gv), 0U));
-    }
-
-SV*
-get_code_package(CV* code)
-PREINIT:
-    HV* stash;
-CODE:
-    if(CvGV(code) && isGV(CvGV(code)) && (stash = GvSTASH(CvGV(code)))){
-        RETVAL = newSVpvn_share(HvNAME_get(stash), HvNAMELEN_get(stash), 0U);
-    }
-    else{
-        RETVAL = &PL_sv_no;
-    }
-OUTPUT:
-    RETVAL
 
 MODULE = Mouse  PACKAGE = Mouse::Meta::Module
 
@@ -52,50 +31,69 @@ HV*
 namespace(SV* self)
 CODE:
 {
-    SV* const package = mouse_instance_get_slot(self, mouse_package);
+    SV* const package = get_slot(self, mouse_package);
     if(!(package && SvOK(package))){
-        croak("No package name");
+        croak("No package name defined");
     }
     RETVAL = gv_stashsv(package, GV_ADDMULTI);
 }
 OUTPUT:
     RETVAL
 
-CV*
-_get_code_ref(SV* self, SV* name)
+# ignore extra arguments for extensibility
+void
+add_method(SV* self, SV* name, SV* code, ...)
 CODE:
 {
-    SV* const stash_ref = mcall0(self, mouse_namespace); /* $self->namespace */
-    HV* stash;
-    HE* he;
-    if(!(SvROK(stash_ref) && SvTYPE(SvRV(stash_ref)) == SVt_PVHV)){
-        croak("namespace() didn't return a HASH reference");
+    SV* const package = get_slot(self, mouse_package); /* $self->{package} */
+    SV* const methods = get_slot(self, mouse_methods); /* $self->{methods} */
+    GV* gv;
+    SV* code_ref;
+
+    if(!(package && SvOK(package))){
+        croak("No package name defined");
     }
-    stash = (HV*)SvRV(stash_ref);
-    he = hv_fetch_ent(stash, name, FALSE, 0U);
-    if(he){
-        GV* const gv = (GV*)hv_iterval(stash, he);
-        if(isGV(gv)){
-            RETVAL = GvCVu(gv);
-        }
-        else{ /* special constant or stub */
-            STRLEN len;
-            const char* const pv = SvPV_const(name, len);
-            gv_init(gv, stash, pv, len, GV_ADDMULTI);
-            RETVAL = GvCVu(gv);
-        }
+
+    SvGETMAGIC(name);
+    SvGETMAGIC(code);
+
+    if(!SvOK(name)){
+        mouse_throw_error(self, NULL, "You must define a method name");
     }
-    else{
-        RETVAL = NULL;
+    if(!SvROK(code)){
+        mouse_throw_error(self, NULL, "You must define a CODE reference");
     }
 
-    if(!RETVAL){
-        XSRETURN_UNDEF;
+    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;
     }
-}
-OUTPUT:
-    RETVAL
 
+    /*  *{$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 */
+
+    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 */ ){
+
+    //    CvGV(code_entity) = gv;
+    //    CvANON_off(code_entity);
+    //}
+}
 
 MODULE = Mouse  PACKAGE = Mouse::Meta::Class
 
@@ -122,6 +120,7 @@ PPCODE:
     }
 }
 
+
 MODULE = Mouse  PACKAGE = Mouse::Meta::Role
 
 BOOT:
@@ -169,15 +168,6 @@ BOOT:
     INSTALL_SIMPLE_PREDICATE_WITH_KEY(Attribute, has_builder, builder);
     INSTALL_SIMPLE_PREDICATE_WITH_KEY(Attribute, has_documentation, documentation);
 
-MODULE = Mouse  PACKAGE = Mouse::Meta::TypeConstraint
-
-BOOT:
-    INSTALL_SIMPLE_READER(TypeConstraint, name);
-    INSTALL_SIMPLE_READER(TypeConstraint, parent);
-    INSTALL_SIMPLE_READER(TypeConstraint, message);
-
-    INSTALL_SIMPLE_READER_WITH_KEY(TypeConstraint, _compiled_type_constraint, compiled_type_constraint);
-    INSTALL_SIMPLE_READER(TypeConstraint, _compiled_type_coercion); /* Mouse specific */
-
-    INSTALL_SIMPLE_PREDICATE_WITH_KEY(TypeConstraint, has_coercion, _compiled_type_coercion);
+    newCONSTSUB(gv_stashpvs("Mouse::Meta::Attribute", TRUE), "accessor_metaclass",
+        newSVpvs("Mouse::Meta::Method::Accessor::XS"));