test for renaming lexical subs

[p5sagit/Sub-Name.git] / Name.xs

diff --git a/Name.xs b/Name.xs
index 20c9b71..9a4d493 100644 (file)
--- a/Name.xs
+++ b/Name.xs
@@ -7,6 +7,9 @@
 #include "EXTERN.h"
 #include "perl.h"
 #include "XSUB.h"
+#define NEED_sv_2pv_flags
+#define NEED_gv_fetchpvn_flags
+#include "ppport.h"
 
 static MGVTBL subname_vtbl;
 
@@ -18,6 +21,9 @@ static MGVTBL subname_vtbl;
 #define SvMAGIC_set(sv, val) (SvMAGIC(sv) = (val))
 #endif
 
+#ifndef Newxz
+#define Newxz(ptr, num, type)  Newz(0, ptr, num, type)
+#endif
 
 MODULE = Sub::Name  PACKAGE = Sub::Name
 
@@ -25,14 +31,18 @@ PROTOTYPES: DISABLE
 
 void
 subname(name, sub)
-       char *name
+       SV *name
        SV *sub
     PREINIT:
        CV *cv = NULL;
        GV *gv;
        HV *stash = CopSTASH(PL_curcop);
-       char *s, *end = NULL;
+       const char *s, *end = NULL, *begin = NULL;
        MAGIC *mg;
+       STRLEN namelen;
+       const char* nameptr = SvPV(name, namelen);
+       int utf8flag = SvUTF8(name);
+       int seen_quote = 0, need_subst = 0;
     PPCODE:
        if (!SvROK(sub) && SvGMAGICAL(sub))
                mg_get(sub);
@@ -45,31 +55,98 @@ subname(name, sub)
        else if (PL_op->op_private & HINT_STRICT_REFS)
                croak("Can't use string (\"%.32s\") as %s ref while \"strict refs\" in use",
                      SvPV_nolen(sub), "a subroutine");
-       else if ((gv = gv_fetchpv(SvPV_nolen(sub), FALSE, SVt_PVCV)))
+       else if ((gv = gv_fetchsv(sub, FALSE, SVt_PVCV)))
                cv = GvCVu(gv);
        if (!cv)
                croak("Undefined subroutine %s", SvPV_nolen(sub));
        if (SvTYPE(cv) != SVt_PVCV && SvTYPE(cv) != SVt_PVFM)
                croak("Not a subroutine reference");
-       for (s = name; *s++; ) {
-               if (*s == ':' && s[-1] == ':')
-                       end = ++s;
-               else if (*s && s[-1] == '\'')
-                       end = s;
+
+       for (s = nameptr; s <= nameptr + namelen; s++) {
+               if (s > nameptr && *s == ':' && s[-1] == ':') {
+                       end = s - 1;
+                       begin = ++s;
+                       if (seen_quote)
+                               need_subst++;
+               }
+               else if (s > nameptr && *s != '\0' && s[-1] == '\'') {
+                       end = s - 1;
+                       begin = s;
+                       if (seen_quote++)
+                               need_subst++;
+               }
        }
        s--;
-        if (end) {
-               stash = GvHV(gv_fetchpv(savepvn(name, end - name), TRUE, SVt_PVHV));
-                name = end;
-        }
+       if (end) {
+               SV* tmp;
+               if (need_subst) {
+                       STRLEN length = end - nameptr + seen_quote - (*end == '\'' ? 1 : 0);
+                       char* left;
+                       int i, j;
+                       tmp = newSV(length);
+                       left = SvPVX(tmp);
+                       for (i = 0, j = 0; j < end - nameptr; ++i, ++j) {
+                               if (nameptr[j] == '\'') {
+                                       left[i] = ':';
+                                       left[++i] = ':';
+                               }
+                               else {
+                                       left[i] = nameptr[j];
+                               }
+                       }
+                       stash = gv_stashpvn(left, length, GV_ADD | utf8flag);
+                       SvREFCNT_dec(tmp);
+               }
+               else
+                       stash = gv_stashpvn(nameptr, end - nameptr, GV_ADD | utf8flag);
+               nameptr = begin;
+               namelen -= begin - nameptr;
+       }
+
+       #ifdef PERL_VERSION < 10
+       /* under debugger, provide information about sub location */
+       if (PL_DBsub && CvGV(cv)) {
+               HV *hv = GvHV(PL_DBsub);
+               SV** old_data;
+
+               char* new_pkg = HvNAME(stash);
+
+               char* old_name = GvNAME( CvGV(cv) );
+               char* old_pkg = HvNAME( GvSTASH(CvGV(cv)) );
+
+               int old_len = strlen(old_name) + strlen(old_pkg);
+               int new_len = namelen + strlen(new_pkg);
+
+               char* full_name;
+               Newxz(full_name, (old_len > new_len ? old_len : new_len) + 3, char);
+
+               strcat(full_name, old_pkg);
+               strcat(full_name, "::");
+               strcat(full_name, old_name);
+
+               old_data = hv_fetch(hv, full_name, strlen(full_name), 0);
+
+               if (old_data) {
+                       strcpy(full_name, new_pkg);
+                       strcat(full_name, "::");
+                       strcat(full_name, nameptr);
+
+                       SvREFCNT_inc(*old_data);
+                       if (!hv_store(hv, full_name, strlen(full_name), *old_data, 0))
+                               SvREFCNT_dec(*old_data);
+               }
+               Safefree(full_name);
+       }
+       #endif
+
        gv = (GV *) newSV(0);
-       gv_init(gv, stash, name, s - name, TRUE);
+       gv_init_pvn(gv, stash, nameptr, s - nameptr, GV_ADDMULTI | utf8flag);
 
        mg = SvMAGIC(cv);
        while (mg && mg->mg_virtual != &subname_vtbl)
                mg = mg->mg_moremagic;
        if (!mg) {
-               Newz(702, mg, 1, MAGIC);
+               Newxz(mg, 1, MAGIC);
                mg->mg_moremagic = SvMAGIC(cv);
                mg->mg_type = PERL_MAGIC_ext;
                mg->mg_virtual = &subname_vtbl;