refactor a bit

[gitmo/Package-Stash-XS.git] / XS.xs

diff --git a/XS.xs b/XS.xs
index 87802d8..d131115 100644 (file)
--- a/XS.xs
+++ b/XS.xs
@@ -101,7 +101,8 @@
         GvASSUMECV_on(g);               \
     }                                   \
     GvCVGEN(g) = 0;                     \
-    mro_method_changed_in(GvSTASH(g));  \
+    if (HvENAME_get(GvSTASH(g)))        \
+        mro_method_changed_in(GvSTASH(g)); \
 } while (0)
 #define GvSetIO(g,v) do {               \
     SvREFCNT_dec(GvIO(g));              \
@@ -324,6 +325,15 @@ static SV *_get_name(SV *self)
     return ret;
 }
 
+static void _real_gv_init(GV *gv, HV *stash, SV *name)
+{
+    char *name_pv;
+    STRLEN name_len;
+
+    name_pv = SvPV(name, name_len);
+    gv_init(gv, stash, name_pv, name_len, 1);
+}
+
 static void _expand_glob(SV *self, SV *varname)
 {
     HV *namespace;
@@ -338,12 +348,8 @@ static void _expand_glob(SV *self, SV *varname)
             croak("_expand_glob called on stash slot with expanded glob");
         }
         else {
-            char *varname_pv;
-            STRLEN varname_len;
-
-            varname_pv = SvPV(varname, varname_len);
-            gv_init(glob, namespace, varname_pv, varname_len, 1);
             SvREFCNT_inc(glob);
+            _real_gv_init(glob, namespace, varname);
             if (!hv_store_ent(namespace, varname, (SV*)glob, 0)) {
                 croak("hv_store failed");
             }
@@ -583,7 +589,7 @@ add_symbol(self, variable, initial=NULL, ...)
     }
     else {
         glob = (GV*)newSV(0);
-        gv_init(glob, namespace, "ANON", 4, 1);
+        _real_gv_init(glob, namespace, variable.name);
         if (!hv_store_ent(namespace, variable.name, (SV*)glob, 0)) {
             croak("hv_store failed");
         }