X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=gitmo%2FMoose.git;a=blobdiff_plain;f=mop.c;h=23ca98a9431a7abe6c57596b3cc7b118fd42e983;hp=6f58b48137d22b165ff8eabb38c98bf5bed9872a;hb=366abb63a74af7c8a6eb6390f30d60a6bdfca414;hpb=2683d371fec5a97c460fee1a8d03339e30c8667d

diff --git a/mop.c b/mop.c
index 6f58b48..23ca98a 100644
--- a/mop.c
+++ b/mop.c
@@ -95,12 +95,14 @@ mop_get_code_info (SV *coderef, char **pkg, char **name)
     */
 
     if ( isGV_with_GP(CvGV(coderef)) ) {
-        GV *gv   = CvGV(coderef);
-        *pkg     = HvNAME( GvSTASH(gv) ? GvSTASH(gv) : CvSTASH(coderef) );
-        *name    = GvNAME( CvGV(coderef) );
+        GV *gv    = CvGV(coderef);
+        HV *stash = GvSTASH(gv) ? GvSTASH(gv) : CvSTASH(coderef);
+
+        *pkg  = stash ? HvNAME(stash) : "__UNKNOWN__";
+        *name = GvNAME( CvGV(coderef) );
     } else {
-        *pkg     = "__UNKNOWN__";
-        *name    = "__ANON__";
+        *pkg  = "__UNKNOWN__";
+        *name = "__ANON__";
     }
 
     return 1;
@@ -221,7 +223,7 @@ static struct {
     DECLARE_KEY(writer),
     DECLARE_KEY_WITH_VALUE(package_cache_flag, "_package_cache_flag"),
     DECLARE_KEY_WITH_VALUE(_version, "-version"),
-    DECLARE_KEY(op)
+    DECLARE_KEY(operator)
 };
 
 SV *