extend change#2299 to C<use> (fixes scoping problems in

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

diff --git a/mg.c b/mg.c
index aa5dadd..f72d287 100644 (file)
--- a/mg.c
+++ b/mg.c
@@ -27,12 +27,6 @@
 #  endif
 #endif
 
-#ifdef PERL_OBJECT
-#  define VTBL            this->*vtbl
-#else
-#  define VTBL                 *vtbl
-#endif
-
 static void restore_magic(pTHXo_ void *p);
 static void unwind_handler_stack(pTHXo_ void *p);
 
@@ -99,7 +93,7 @@ Perl_mg_get(pTHX_ SV *sv)
     while ((mg = *mgp) != 0) {
        MGVTBL* vtbl = mg->mg_virtual;
        if (!(mg->mg_flags & MGf_GSKIP) && vtbl && (vtbl->svt_get != NULL)) {
-           (VTBL->svt_get)(aTHX_ sv, mg);
+           CALL_FPTR(vtbl->svt_get)(aTHX_ sv, mg);
            /* Ignore this magic if it's been deleted */
            if ((mg == (mgp_valid ? *mgp : SvMAGIC(sv))) &&
                  (mg->mg_flags & MGf_GSKIP))
@@ -137,7 +131,7 @@ Perl_mg_set(pTHX_ SV *sv)
            (SSPTR(mgs_ix, MGS*))->mgs_flags = 0;
        }
        if (vtbl && (vtbl->svt_set != NULL))
-           (VTBL->svt_set)(aTHX_ sv, mg);
+           CALL_FPTR(vtbl->svt_set)(aTHX_ sv, mg);
     }
 
     restore_magic(aTHXo_ (void*)mgs_ix);
@@ -159,7 +153,7 @@ Perl_mg_length(pTHX_ SV *sv)
            mgs_ix = SSNEW(sizeof(MGS));
            save_magic(mgs_ix, sv);
            /* omit MGf_GSKIP -- not changed here */
-           len = (VTBL->svt_len)(aTHX_ sv, mg);
+           len = CALL_FPTR(vtbl->svt_len)(aTHX_ sv, mg);
            restore_magic(aTHXo_ (void*)mgs_ix);
            return len;
        }
@@ -183,7 +177,7 @@ Perl_mg_size(pTHX_ SV *sv)
            mgs_ix = SSNEW(sizeof(MGS));
            save_magic(mgs_ix, sv);
            /* omit MGf_GSKIP -- not changed here */
-           len = (VTBL->svt_len)(aTHX_ sv, mg);
+           len = CALL_FPTR(vtbl->svt_len)(aTHX_ sv, mg);
            restore_magic(aTHXo_ (void*)mgs_ix);
            return len;
        }
@@ -216,7 +210,7 @@ Perl_mg_clear(pTHX_ SV *sv)
        /* omit GSKIP -- never set here */
        
        if (vtbl && (vtbl->svt_clear != NULL))
-           (VTBL->svt_clear)(aTHX_ sv, mg);
+           CALL_FPTR(vtbl->svt_clear)(aTHX_ sv, mg);
     }
 
     restore_magic(aTHXo_ (void*)mgs_ix);
@@ -259,7 +253,7 @@ Perl_mg_free(pTHX_ SV *sv)
        MGVTBL* vtbl = mg->mg_virtual;
        moremagic = mg->mg_moremagic;
        if (vtbl && (vtbl->svt_free != NULL))
-           (VTBL->svt_free)(aTHX_ sv, mg);
+           CALL_FPTR(vtbl->svt_free)(aTHX_ sv, mg);
        if (mg->mg_ptr && mg->mg_type != 'g')
            if (mg->mg_len >= 0)
                Safefree(mg->mg_ptr);
@@ -406,19 +400,6 @@ Perl_magic_get(pTHX_ SV *sv, MAGIC *mg)
     case '\001':               /* ^A */
        sv_setsv(sv, PL_bodytarget);
        break;
-    case '\002':               /* ^B */
-       if (PL_curcop->cop_warnings == WARN_NONE ||
-           PL_curcop->cop_warnings == WARN_STD)
-       {
-           sv_setpvn(sv, WARN_NONEstring, WARNsize) ;
-        }
-        else if (PL_curcop->cop_warnings == WARN_ALL) {
-           sv_setpvn(sv, WARN_ALLstring, WARNsize) ;
-       }    
-        else {
-           sv_setsv(sv, PL_curcop->cop_warnings);
-       }    
-       break;
     case '\003':               /* ^C */
        sv_setiv(sv, (IV)PL_minus_c);
        break;
@@ -510,8 +491,22 @@ Perl_magic_get(pTHX_ SV *sv, MAGIC *mg)
        sv_setiv(sv, (IV)PL_basetime);
 #endif
        break;
-    case '\027':               /* ^W */
-       sv_setiv(sv, (IV)((PL_dowarn & G_WARN_ON) ? TRUE : FALSE));
+    case '\027':               /* ^W  & $^Warnings*/
+       if (*(mg->mg_ptr+1) == '\0')
+           sv_setiv(sv, (IV)((PL_dowarn & G_WARN_ON) ? TRUE : FALSE));
+       else if (strEQ(mg->mg_ptr, "\027arnings")) {
+           if (PL_compiling.cop_warnings == WARN_NONE ||
+               PL_compiling.cop_warnings == WARN_STD)
+           {
+               sv_setpvn(sv, WARN_NONEstring, WARNsize) ;
+            }
+            else if (PL_compiling.cop_warnings == WARN_ALL) {
+               sv_setpvn(sv, WARN_ALLstring, WARNsize) ;
+           }    
+            else {
+               sv_setsv(sv, PL_compiling.cop_warnings);
+           }    
+       }
        break;
     case '1': case '2': case '3': case '4':
     case '5': case '6': case '7': case '8': case '9': case '&':
@@ -910,8 +905,6 @@ Perl_magic_setsig(pTHX_ SV *sv, MAGIC *mg)
            svp = &PL_diehook;
        else if (strEQ(s,"__WARN__"))
            svp = &PL_warnhook;
-       else if (strEQ(s,"__PARSE__"))
-           svp = &PL_parsehook;
        else
            Perl_croak(aTHX_ "No such hook: %s", s);
        i = 0;
@@ -1565,25 +1558,6 @@ Perl_magic_set(pTHX_ SV *sv, MAGIC *mg)
     case '\001':       /* ^A */
        sv_setsv(PL_bodytarget, sv);
        break;
-    case '\002':       /* ^B */
-       if ( ! (PL_dowarn & G_WARN_ALL_MASK)) {
-            if (memEQ(SvPVX(sv), WARN_ALLstring, WARNsize)) {
-               PL_compiling.cop_warnings = WARN_ALL;
-               PL_dowarn |= G_WARN_ONCE ;
-           }   
-           else if (memEQ(SvPVX(sv), WARN_NONEstring, WARNsize))
-               PL_compiling.cop_warnings = WARN_NONE;
-            else {
-               if (specialWARN(PL_compiling.cop_warnings))
-                   PL_compiling.cop_warnings = newSVsv(sv) ;
-               else
-                   sv_setsv(PL_compiling.cop_warnings, sv);
-               if (isWARN_on(PL_compiling.cop_warnings, WARN_ONCE))
-                   PL_dowarn |= G_WARN_ONCE ;
-           }
-       }
-       break;
-
     case '\003':       /* ^C */
        PL_minus_c = SvIOK(sv) ? SvIVX(sv) : sv_2iv(sv);
        break;
@@ -1640,12 +1614,32 @@ Perl_magic_set(pTHX_ SV *sv, MAGIC *mg)
        PL_basetime = (Time_t)(SvIOK(sv) ? SvIVX(sv) : sv_2iv(sv));
 #endif
        break;
-    case '\027':       /* ^W */
-       if ( ! (PL_dowarn & G_WARN_ALL_MASK)) {
-           i = SvIOK(sv) ? SvIVX(sv) : sv_2iv(sv);
-           PL_dowarn = (PL_dowarn & ~G_WARN_ON) 
+    case '\027':       /* ^W & $^Warnings */
+       if (*(mg->mg_ptr+1) == '\0') {
+           if ( ! (PL_dowarn & G_WARN_ALL_MASK)) {
+               i = SvIOK(sv) ? SvIVX(sv) : sv_2iv(sv);
+               PL_dowarn = (PL_dowarn & ~G_WARN_ON) 
                                | (i ? G_WARN_ON : G_WARN_OFF) ;
+           }
        }
+       else if (strEQ(mg->mg_ptr, "\027arnings")) {
+           if ( ! (PL_dowarn & G_WARN_ALL_MASK)) {
+                if (memEQ(SvPVX(sv), WARN_ALLstring, WARNsize)) {
+                   PL_compiling.cop_warnings = WARN_ALL;
+                   PL_dowarn |= G_WARN_ONCE ;
+               }       
+               else if (memEQ(SvPVX(sv), WARN_NONEstring, WARNsize))
+                   PL_compiling.cop_warnings = WARN_NONE;
+                else {
+                   if (specialWARN(PL_compiling.cop_warnings))
+                       PL_compiling.cop_warnings = newSVsv(sv) ;
+                   else
+                       sv_setsv(PL_compiling.cop_warnings, sv);
+                   if (isWARN_on(PL_compiling.cop_warnings, WARN_ONCE))
+                       PL_dowarn |= G_WARN_ONCE ;
+               }
+           }
+       }    
        break;
     case '.':
        if (PL_localizing) {
@@ -1788,7 +1782,7 @@ Perl_magic_set(pTHX_ SV *sv, MAGIC *mg)
        if (PL_euid == PL_uid)          /* special case $> = $< */
            PerlProc_setuid(PL_euid);
        else {
-           PL_euid = rlProc_geteuid();
+           PL_euid = PerlProc_geteuid();
            Perl_croak(aTHX_ "seteuid() not implemented");
        }
 #endif
@@ -1947,7 +1941,7 @@ int
 Perl_magic_mutexfree(pTHX_ SV *sv, MAGIC *mg)
 {
     dTHR;
-    DEBUG_S(PerlIO_printf(PerlIO_stderr(), "0x%lx: magic_mutexfree 0x%lx\n",
+    DEBUG_S(PerlIO_printf(Perl_debug_log, "0x%lx: magic_mutexfree 0x%lx\n",
                          (unsigned long)thr, (unsigned long)sv);)
     if (MgOWNER(mg))
        Perl_croak(aTHX_ "panic: magic_mutexfree");