X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=MOP.xs;h=ae34df5d730bb9b30828c69dfa92c52fc31a067b;hb=b20287a17e10d06650885ca42500f9b63631ef70;hp=bddb8859e6ff5912d524e239b1d9f03108eb1bb7;hpb=66af67fea5574721476430341bb26aacf7ac6d4f;p=gitmo%2FClass-MOP.git

diff --git a/MOP.xs b/MOP.xs
index bddb885..ae34df5 100644
--- a/MOP.xs
+++ b/MOP.xs
@@ -3,6 +3,7 @@
 #include "perl.h"
 #include "XSUB.h"
 
+#define NEED_sv_2pv_flags
 #define NEED_sv_2pv_nolen
 #include "ppport.h"
 
@@ -12,6 +13,9 @@ U32 hash_name;
 SV *key_package;
 U32 hash_package;
 
+SV *key_package_name;
+U32 hash_package_name;
+
 SV *key_body;
 U32 hash_body;
 
@@ -28,10 +32,12 @@ BOOT:
     key_name = newSVpvs("name");
     key_body = newSVpvs("body");
     key_package = newSVpvs("package");
+    key_package_name = newSVpvs("package_name");
 
     PERL_HASH(hash_name, "name", 4);
     PERL_HASH(hash_body, "body", 4);
     PERL_HASH(hash_package, "package", 7);
+    PERL_HASH(hash_package_name, "package_name", 12);
 
 
 PROTOTYPES: ENABLE
@@ -77,7 +83,11 @@ get_all_package_symbols(self, ...)
     PREINIT:
         HV *stash = NULL;
         SV *type_filter = NULL;
+        register HE *he;
     PPCODE:
+        if (! SvROK(self)) {
+            die("Cannot call get_all_package_symbols as a class method");
+        }
 
         switch ( GIMME_V ) {
             case G_VOID: return; break;
@@ -88,32 +98,23 @@ get_all_package_symbols(self, ...)
 
         PUTBACK;
 
-        if ( SvROK(self) ) {
-            SV **val = hv_fetchs((HV *)SvRV(self), "package", 0);
-            if ( val ) {
-                stash = gv_stashsv(*val, 0);
-            }
-        }
+        if (he = hv_fetch_ent((HV *)SvRV(self), key_package, 0, hash_package))
+            stash = gv_stashsv(HeVAL(he),0);
 
         if ( stash ) {
-            register HE *entry;
 
             (void)hv_iterinit(stash);
 
             if ( type_filter && SvPOK(type_filter) ) {
                 const char *const type = SvPV_nolen(type_filter);
 
-
-                while ((entry = hv_iternext(stash))) {
-                    SV *const gv = hv_iterval(stash, entry);
-                    SV *const key = hv_iterkeysv(entry);
+                while ((he = hv_iternext(stash))) {
+                    SV *const gv = HeVAL(he);
                     SV *sv;
-                    char *package = HvNAME(stash);
-                    STRLEN pkglen = strlen(package);
-                    char *fq;
-                    STRLEN fqlen;
-
-                    SPAGAIN;
+                    char *key;
+                    STRLEN keylen;
+                    char *package;
+                    SV *fq;
 
                     switch( SvTYPE(gv) ) {
                         case SVt_PVGV:
@@ -129,16 +130,20 @@ get_all_package_symbols(self, ...)
                             break;
                         case SVt_RV:
                             /* BAH! constants are horrible */
-                            fqlen = pkglen + SvCUR(key) + 3;
-                            fq = (char *)alloca(fqlen);
-                            snprintf(fq, fqlen, "%s::%s", package, SvPV_nolen(key));
-                            sv = (SV*)get_cv(fq, 0);
+
+                            /* we don't really care about the length,
+                               but that's the API */
+                            key = HePV(he, keylen);
+                            package = HvNAME(stash);
+                            fq = newSVpvf("%s::%s", package, key);
+                            sv = sv_2mortal((SV*)get_cv(SvPV_nolen(fq), 0));
                             break;
                         default:
                             continue;
                     }
 
                     if ( sv ) {
+                        SV *key = hv_iterkeysv(he);
                         SPAGAIN;
                         EXTEND(SP, 2);
                         PUSHs(key);
@@ -149,9 +154,9 @@ get_all_package_symbols(self, ...)
             } else {
                 EXTEND(SP, HvKEYS(stash) * 2);
 
-                while ((entry = hv_iternext(stash))) {
-                    SV *key = hv_iterkeysv(entry);
-                    SV *sv = hv_iterval(stash, entry);
+                while ((he = hv_iternext(stash))) {
+                    SV *key = hv_iterkeysv(he);
+                    SV *sv = HeVAL(he);
                     SPAGAIN;
                     PUSHs(key);
                     PUSHs(sv);
@@ -167,12 +172,16 @@ name(self)
     PREINIT:
         register HE *he;
     PPCODE:
-        if (SvROK(self) && (he = hv_fetch_ent((HV *)SvRV(self), key_package, 0, hash_package)))
+        if (! SvROK(self)) {
+            die("Cannot call name as a class method");
+        }
+
+        if (he = hv_fetch_ent((HV *)SvRV(self), key_package, 0, hash_package))
             XPUSHs(HeVAL(he));
         else
             ST(0) = &PL_sv_undef;
 
-MODULE = Class::MOP   PACKAGE = Class::Attribute
+MODULE = Class::MOP   PACKAGE = Class::MOP::Attribute
 
 SV *
 name(self)
@@ -180,12 +189,16 @@ name(self)
     PREINIT:
         register HE *he;
     PPCODE:
-        if (SvROK(self) && (he = hv_fetch_ent((HV *)SvRV(self), key_name, 0, hash_name)))
+        if (! SvROK(self)) {
+            die("Cannot call name as a class method");
+        }
+
+        if (he = hv_fetch_ent((HV *)SvRV(self), key_name, 0, hash_name))
             XPUSHs(HeVAL(he));
         else
             ST(0) = &PL_sv_undef;
 
-MODULE = Class::MOP   PACKAGE = Class::Method
+MODULE = Class::MOP   PACKAGE = Class::MOP::Method
 
 SV *
 name(self)
@@ -193,7 +206,26 @@ name(self)
     PREINIT:
         register HE *he;
     PPCODE:
-        if (SvROK(self) && (he = hv_fetch_ent((HV *)SvRV(self), key_name, 0, hash_name)))
+        if (! SvROK(self)) {
+            die("Cannot call name as a class method");
+        }
+
+        if (he = hv_fetch_ent((HV *)SvRV(self), key_name, 0, hash_name))
+            XPUSHs(HeVAL(he));
+        else
+            ST(0) = &PL_sv_undef;
+
+SV *
+package_name(self)
+    SV *self
+    PREINIT:
+        register HE *he;
+    PPCODE:
+        if (! SvROK(self)) {
+            die("Cannot call package_name as a class method");
+        }
+
+        if (he = hv_fetch_ent((HV *)SvRV(self), key_package_name, 0, hash_package_name))
             XPUSHs(HeVAL(he));
         else
             ST(0) = &PL_sv_undef;
@@ -204,7 +236,11 @@ body(self)
     PREINIT:
         register HE *he;
     PPCODE:
-        if (SvROK(self) && (he = hv_fetch_ent((HV *)SvRV(self), key_body, 0, hash_body)))
+        if (! SvROK(self)) {
+            die("Cannot call body as a class method");
+        }
+
+        if (he = hv_fetch_ent((HV *)SvRV(self), key_body, 0, hash_body))
             XPUSHs(HeVAL(he));
         else
             ST(0) = &PL_sv_undef;