increment $VERSION after 0.15 release

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

diff --git a/Name.xs b/Name.xs
index 20c9b71..312485f 100644 (file)
--- a/Name.xs
+++ b/Name.xs
@@ -7,6 +7,7 @@
 #include "EXTERN.h"
 #include "perl.h"
 #include "XSUB.h"
+#include "ppport.h"
 
 static MGVTBL subname_vtbl;
 
@@ -18,6 +19,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
 
@@ -59,9 +63,46 @@ subname(name, sub)
        }
        s--;
         if (end) {
-               stash = GvHV(gv_fetchpv(savepvn(name, end - name), TRUE, SVt_PVHV));
+               char *namepv = savepvn(name, end - name);
+               stash = GvHV(gv_fetchpv(namepv, TRUE, SVt_PVHV));
+               Safefree(namepv);
                 name = end;
         }
+
+       /* 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 = strlen(name) + 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, name);
+
+                       SvREFCNT_inc(*old_data);
+                       if (!hv_store(hv, full_name, strlen(full_name), *old_data, 0))
+                               SvREFCNT_dec(*old_data);
+               }
+               Safefree(full_name);
+       }
+
        gv = (GV *) newSV(0);
        gv_init(gv, stash, name, s - name, TRUE);
 
@@ -69,7 +110,7 @@ subname(name, sub)
        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;