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

diff --git a/xs-src/Mouse.xs b/xs-src/Mouse.xs
index 5a6c844..137e5a0 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,10 +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)
@@ -41,6 +47,86 @@ CODE:
 OUTPUT:
     RETVAL
 
+CV*
+get_code_ref(SV* package, SV* name)
+CODE:
+{
+    HV* stash;
+    HE* he;
+
+    if(!SvOK(package)){
+        croak("You must define a package name");
+    }
+    if(!SvOK(name)){
+        croak("You must define a subroutine name");
+    }
+
+    stash = gv_stashsv(package, FALSE);
+    if(!stash){
+        XSRETURN_UNDEF;
+    }
+    he = hv_fetch_ent(stash, name, FALSE, 0U);
+    if(he){
+        GV* const gv = (GV*)hv_iterval(stash, he);
+        if(!isGV(gv)){ /* 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);
+    }
+    else{
+        RETVAL = NULL;
+    }
+
+    if(!RETVAL){
+        XSRETURN_UNDEF;
+    }
+}
+OUTPUT:
+    RETVAL
+
+void
+generate_isa_predicate_for(SV* klass, const char* predicate_name = NULL)
+PPCODE:
+{
+    STRLEN klass_len;
+    const char* klass_pv;
+    HV* stash;
+    CV* xsub;
+
+    if(!SvOK(klass)){
+        croak("You must define a class name for generate_for");
+    }
+    klass_pv = SvPV_const(klass, klass_len);
+    klass_pv = mouse_canonicalize_package_name(klass_pv);
+
+    if(strNE(klass_pv, "UNIVERSAL")){
+        static MGVTBL mouse_util_type_constraints_vtbl; /* not used, only for identity */
+
+        xsub = newXS(predicate_name, XS_isa_check, __FILE__);
+
+        stash = gv_stashpvn(klass_pv, klass_len, GV_ADD);
+
+        CvXSUBANY(xsub).any_ptr = sv_magicext(
+            (SV*)xsub,
+            (SV*)stash, /* mg_obj */
+            PERL_MAGIC_ext,
+            &mouse_util_type_constraints_vtbl,
+            klass_pv,   /* mg_ptr */
+            klass_len   /* mg_len */
+        );
+    }
+    else{
+        xsub = newXS(predicate_name, XS_isa_check_for_universal, __FILE__);
+    }
+
+    if(predicate_name == NULL){ /* anonymous predicate */
+        XPUSHs( newRV_noinc((SV*)xsub) );
+    }
+}
+
+
 MODULE = Mouse  PACKAGE = Mouse::Meta::Module
 
 BOOT:
@@ -52,50 +138,69 @@ HV*
 namespace(SV* self)
 CODE:
 {
-    SV* const package = mouse_instance_get_slot(self, mouse_package);
+    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
 
-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 = 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");
     }
-    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 */
+
+    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
 
@@ -169,6 +274,9 @@ BOOT:
     INSTALL_SIMPLE_PREDICATE_WITH_KEY(Attribute, has_builder, builder);
     INSTALL_SIMPLE_PREDICATE_WITH_KEY(Attribute, has_documentation, documentation);
 
+    newCONSTSUB(gv_stashpvs("Mouse::Meta::Attribute", TRUE), "accessor_metaclass",
+        newSVpvs("Mouse::Meta::Method::Accessor::XS"));
+
 MODULE = Mouse  PACKAGE = Mouse::Meta::TypeConstraint
 
 BOOT:
@@ -181,3 +289,57 @@ BOOT:
 
     INSTALL_SIMPLE_PREDICATE_WITH_KEY(TypeConstraint, has_coercion, _compiled_type_coercion);
 
+
+MODULE = Mouse  PACKAGE = Mouse::Meta::Method::Accessor::XS
+
+CV*
+_generate_accessor(klass, SV* attr, metaclass)
+CODE:
+{
+    RETVAL = mouse_instantiate_xs_accessor(aTHX_ attr, mouse_xs_accessor);
+}
+OUTPUT:
+    RETVAL
+
+CV*
+_generate_reader(klass, SV* attr, metaclass)
+CODE:
+{
+    RETVAL = mouse_instantiate_xs_accessor(aTHX_ attr, mouse_xs_reader);
+}
+OUTPUT:
+    RETVAL
+
+CV*
+_generate_writer(klass, SV* attr, metaclass)
+CODE:
+{
+    RETVAL = mouse_instantiate_xs_accessor(aTHX_ attr, mouse_xs_writer);
+}
+OUTPUT:
+    RETVAL
+
+CV*
+_generate_clearer(klass, SV* attr, metaclass)
+CODE:
+{
+    SV* const slot = mcall0s(attr, "name");
+    STRLEN len;
+    const char* const pv = SvPV_const(slot, len);
+    RETVAL = mouse_install_simple_accessor(aTHX_ NULL, pv, len, mouse_xs_simple_clearer);
+}
+OUTPUT:
+    RETVAL
+
+CV*
+_generate_predicate(klass, SV* attr, metaclass)
+CODE:
+{
+    SV* const slot = mcall0s(attr, "name");
+    STRLEN len;
+    const char* const pv = SvPV_const(slot, len);
+    RETVAL = mouse_install_simple_accessor(aTHX_ NULL, pv, len, mouse_xs_simple_predicate);
+}
+OUTPUT:
+    RETVAL
+