add missing file from change#1943

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

diff --git a/gv.c b/gv.c
index a01956f..a7e2b80 100644 (file)
--- a/gv.c
+++ b/gv.c
@@ -19,8 +19,6 @@
 #include "EXTERN.h"
 #include "perl.h"
 
-EXT char rcsid[];
-
 GV *
 gv_AVadd(register GV *gv)
 {
@@ -223,8 +221,9 @@ gv_fetchmeth(HV *stash, char *name, STRLEN len, I32 level)
            SV* sv = *svp++;
            HV* basestash = gv_stashsv(sv, FALSE);
            if (!basestash) {
-               if (PL_dowarn)
-                   warn("Can't locate package %s for @%s::ISA",
+               dTHR;           /* just for ckWARN */
+               if (ckWARN(WARN_MISC))
+                   warner(WARN_MISC, "Can't locate package %s for @%s::ISA",
                        SvPVX(sv), HvNAME(stash));
                continue;
            }
@@ -341,6 +340,7 @@ gv_fetchmethod_autoload(HV *stash, char *name, I32 autoload)
 GV*
 gv_autoload4(HV *stash, char *name, STRLEN len, I32 method)
 {
+    dTHR;
     static char autoload[] = "AUTOLOAD";
     static STRLEN autolen = 8;
     GV* gv;
@@ -358,8 +358,9 @@ gv_autoload4(HV *stash, char *name, STRLEN len, I32 method)
     /*
      * Inheriting AUTOLOAD for non-methods works ... for now.
      */
-    if (PL_dowarn && !method && (GvCVGEN(gv) || GvSTASH(gv) != stash))
-       warn(
+    if (ckWARN(WARN_DEPRECATED) && !method && 
+       (GvCVGEN(gv) || GvSTASH(gv) != stash))
+       warner(WARN_DEPRECATED,
          "Use of inherited AUTOLOAD for non-method %s::%.*s() is deprecated",
             HvNAME(stash), (int)len, name);
 
@@ -502,25 +503,19 @@ gv_fetchpv(char *nambeg, I32 add, I32 sv_type)
            bool global = FALSE;
 
            if (isUPPER(*name)) {
-               if (*name > 'I') {
-                   if (*name == 'S' && (
-                     strEQ(name, "SIG") ||
-                     strEQ(name, "STDIN") ||
-                     strEQ(name, "STDOUT") ||
-                     strEQ(name, "STDERR") ))
-                       global = TRUE;
-               }
-               else if (*name > 'E') {
-                   if (*name == 'I' && strEQ(name, "INC"))
-                       global = TRUE;
-               }
-               else if (*name > 'A') {
-                   if (*name == 'E' && strEQ(name, "ENV"))
-                       global = TRUE;
-               }
+               if (*name == 'S' && (
+                   strEQ(name, "SIG") ||
+                   strEQ(name, "STDIN") ||
+                   strEQ(name, "STDOUT") ||
+                   strEQ(name, "STDERR")))
+                   global = TRUE;
+               else if (*name == 'I' && strEQ(name, "INC"))
+                   global = TRUE;
+               else if (*name == 'E' && strEQ(name, "ENV"))
+                   global = TRUE;
                else if (*name == 'A' && (
                  strEQ(name, "ARGV") ||
-                 strEQ(name, "ARGVOUT") ))
+                 strEQ(name, "ARGVOUT")))
                    global = TRUE;
            }
            else if (*name == '_' && !name[1])
@@ -734,16 +729,23 @@ gv_fetchpv(char *nambeg, I32 add, I32 sv_type)
            }
        }
        goto magicalize;
+    case '-':
+       if (len > 1)
+           break;
+       else {
+            AV* av = GvAVn(gv);
+            sv_magic((SV*)av, Nullsv, 'D', Nullch, 0);
+        }
+       goto magicalize;
     case '#':
     case '*':
-       if (PL_dowarn && len == 1 && sv_type == SVt_PV)
-           warn("Use of $%s is deprecated", name);
+       if (ckWARN(WARN_DEPRECATED) && len == 1 && sv_type == SVt_PV)
+           warner(WARN_DEPRECATED, "Use of $%s is deprecated", name);
        /* FALL THROUGH */
     case '[':
     case '^':
     case '~':
     case '=':
-    case '-':
     case '%':
     case '.':
     case '(':
@@ -755,20 +757,32 @@ gv_fetchpv(char *nambeg, I32 add, I32 sv_type)
     case '/':
     case '|':
     case '\001':
+    case '\002':
     case '\004':
     case '\005':
     case '\006':
     case '\010':
+    case '\011':       /* NOT \t in EBCDIC */
     case '\017':
-    case '\t':
     case '\020':
     case '\024':
     case '\027':
        if (len > 1)
            break;
        goto magicalize;
+    case '\023':
+       if (len > 1)
+           break;
+       goto ro_magicalize;
 
     case '+':
+       if (len > 1)
+           break;
+       else {
+            AV* av = GvAVn(gv);
+            sv_magic((SV*)av, (SV*)av, 'D', Nullch, 0);
+        }
+       /* FALL THROUGH */
     case '1':
     case '2':
     case '3':
@@ -778,7 +792,6 @@ gv_fetchpv(char *nambeg, I32 add, I32 sv_type)
     case '7':
     case '8':
     case '9':
-    case '\023':
       ro_magicalize:
        SvREADONLY_on(GvSV(gv));
       magicalize:
@@ -893,7 +906,8 @@ gv_check(HV *stash)
                PL_curcop->cop_filegv = filegv;
                if (filegv && GvMULTI(filegv))  /* Filename began with slash */
                    continue;
-               warn("Name \"%s::%s\" used only once: possible typo",
+               warner(WARN_ONCE,
+                       "Name \"%s::%s\" used only once: possible typo",
                        HvNAME(stash), GvNAME(gv));
            }
        }