X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=mop.c;h=23ca98a9431a7abe6c57596b3cc7b118fd42e983;hb=d6e927d0ca41fc1cf21ab9790c8c2eb6bc42a6a0;hp=abbc6bbf52b12ca812939228acbc8ef8e0622ae4;hpb=213c00cce310530ddd044ca84a087e0c906e5a96;p=gitmo%2FMoose.git diff --git a/mop.c b/mop.c index abbc6bb..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; @@ -210,7 +212,6 @@ static struct { DECLARE_KEY(insertion_order), DECLARE_KEY(instance_metaclass), DECLARE_KEY(is_inline), - DECLARE_KEY(is_stub), DECLARE_KEY(method_metaclass), DECLARE_KEY(methods), DECLARE_KEY(name), @@ -221,7 +222,8 @@ static struct { DECLARE_KEY(wrapped_method_metaclass), DECLARE_KEY(writer), DECLARE_KEY_WITH_VALUE(package_cache_flag, "_package_cache_flag"), - DECLARE_KEY_WITH_VALUE(_version, "-version") + DECLARE_KEY_WITH_VALUE(_version, "-version"), + DECLARE_KEY(operator) }; SV *