X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Name.xs;h=d7fd127edf51206d57dbe6de3ef968a26dd419ec;hb=e9e382ec3cdd5eab8ec1ebac7e235e8efee23938;hp=5d36d141e178fc95a2346c991db0a05edee91d19;hpb=85cf5faea36fd3017da852c57a42e804be210419;p=p5sagit%2FSub-Name.git

diff --git a/Name.xs b/Name.xs
index 5d36d14..d7fd127 100644
--- a/Name.xs
+++ b/Name.xs
@@ -18,6 +18,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
 
@@ -64,6 +67,40 @@ subname(name, sub)
 		Safefree(namepv);
                 name = end;
         }
+
+	/* under debugger, provide information about sub location */
+	if (PL_DBsub && CvGV(cv)) {
+		HV *hv = GvHV(PL_DBsub);
+
+		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);
+
+		SV** 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);
 
@@ -71,7 +108,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;