perl 5.002gamma: hints/sco.sh

[p5sagit/p5-mst-13.2.git] / gv.c

diff --git a/gv.c b/gv.c
index b3faf16..7836d88 100644 (file)
--- a/gv.c
+++ b/gv.c
@@ -284,6 +284,8 @@ char* name;
                sv_catpvn(tmpstr,"::", 2);
                sv_catpvn(tmpstr, name, nend - name);
                sv_setsv(GvSV(CvGV(cv)), tmpstr);
+               if (tainting)
+                   sv_unmagic(GvSV(CvGV(cv)), 't');
            }
        }
     }
@@ -338,6 +340,9 @@ I32 sv_type;
     bool global = FALSE;
     char *tmpbuf;
 
+    if (*name == '*' && isALPHA(name[1])) /* accidental stringify on a GV? */
+       name++;
+
     for (namend = name; *namend; namend++) {
        if ((*namend == '\'' && namend[1]) ||
            (*namend == ':' && namend[1] == ':'))
@@ -422,7 +427,8 @@ I32 sv_type;
                    sv_type != SVt_PVCV &&
                    sv_type != SVt_PVGV &&
                    sv_type != SVt_PVFM &&
-                   sv_type != SVt_PVIO)
+                   sv_type != SVt_PVIO &&
+                   !(len == 1 && sv_type == SVt_PV && strchr("ab",*name)) )
                {
                    gvp = (GV**)hv_fetch(stash,name,len,0);
                    if (!gvp ||
@@ -432,10 +438,7 @@ I32 sv_type;
                        stash = 0;
                    else if (sv_type == SVt_PVAV && !GvAV(*gvp) ||
                             sv_type == SVt_PVHV && !GvHV(*gvp) ||
-                            sv_type == SVt_PV &&
-                                (!GvSV(*gvp) ||
-                                   (!SvTYPE(GvSV(*gvp)) &&
-                                    SvREFCNT(GvSV(*gvp)) == 1) ))
+                            sv_type == SVt_PV   && !GvSV(*gvp) )
                    {
                        warn("Variable \"%c%s\" is not exported",
                            sv_type == SVt_PVAV ? '@' :
@@ -760,9 +763,8 @@ void
 gp_free(gv)
 GV* gv;
 {
-    IO *io;
-    CV *cv;
     GP* gp;
+    CV* cv;
 
     if (!gv || !(gp = GvGP(gv)))
        return;
@@ -779,10 +781,7 @@ GV* gv;
     SvREFCNT_dec(gp->gp_sv);
     SvREFCNT_dec(gp->gp_av);
     SvREFCNT_dec(gp->gp_hv);
-    if ((io = gp->gp_io) && SvTYPE(io) != SVTYPEMASK) {
-       do_close(gv,FALSE);
-       SvREFCNT_dec(io);
-    }
+    SvREFCNT_dec(gp->gp_io);
     if ((cv = gp->gp_cv) && !GvCVGEN(gv))
        SvREFCNT_dec(cv);
     SvREFCNT_dec(gp->gp_form);
@@ -1074,7 +1073,7 @@ int flags;
       } else {
         if (off==-1) off=method;
        sprintf(buf, "Operation `%s': no method found,\n\tleft argument %s%.256s,\n\tright argument %s%.256s",
-                     ((char**)AMG_names)[method],
+                     ((char**)AMG_names)[method + assignshift],
                      SvAMAGIC(left)? 
                        "in overloaded package ":
                        "has no overloaded magic",
@@ -1113,7 +1112,7 @@ int flags;
      * to dublicate the contents, probably calling user-supplied
      * version of copy operator
      */
-    if ((method+assignshift==off 
+    if ((method + assignshift==off 
         && (assign || method==inc_amg || method==dec_amg))
        || inc_dec_ass) RvDEEPCP(left);
   }
@@ -1138,7 +1137,7 @@ int flags;
     PUSHs(lr>0? left: right);
     PUSHs( assign ? &sv_undef : (lr>0? &sv_yes: &sv_no));
     if (notfound) {
-      PUSHs( sv_2mortal(newSVpv(((char**)AMG_names)[off],0)) );
+      PUSHs( sv_2mortal(newSVpv(((char**)AMG_names)[method + assignshift],0)) );
     }
     PUSHs((SV*)cv);
     PUTBACK;