X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=warning.pl;h=e6b435f92d901cde724ce54e92fe21e025499d96;hb=47cadb06ccb7dbe87fdda243544a1ecb06fb104f;hp=497630de2859ea0e1aae4fa7f324cfeabe6084ba;hpb=599cee73f2261c5e09cde7ceba3f9a896989e117;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/warning.pl b/warning.pl
index 497630d..e6b435f 100644
--- a/warning.pl
+++ b/warning.pl
@@ -1,5 +1,8 @@
 #!/usr/bin/perl
 
+BEGIN {
+  push @INC, './lib';
+}
 use strict ;
 
 sub DEFAULT_ON  () { 1 }
@@ -59,8 +62,8 @@ sub walk
     my @list = () ;
     my ($k, $v) ;
 
-    while (($k, $v) = each %$tre) {
-
+    foreach $k (sort keys %$tre) {
+	$v = $tre->{$k};
 	die "duplicate key $k\n" if defined $list{$k} ;
 	$Value{$index} = uc $k ;
         push @{ $list{$k} }, $index ++ ;
@@ -70,7 +73,6 @@ sub walk
     }
 
    return @list ;
-
 }
 
 ###########################################################################
@@ -143,47 +145,47 @@ print WARN <<'EOM' ;
 /* Part of the logic below assumes that WARN_NONE is NULL */
 
 #define ckDEAD(x)							\
-	   (curcop->cop_warnings != WARN_ALL &&				\
-	    curcop->cop_warnings != WARN_NONE &&			\
-	    IsSet(SvPVX(curcop->cop_warnings), 2*x+1))
+	   (PL_curcop->cop_warnings != WARN_ALL &&			\
+	    PL_curcop->cop_warnings != WARN_NONE &&			\
+	    IsSet(SvPVX(PL_curcop->cop_warnings), 2*x+1))
 
 #define ckWARN(x)							\
-	( (curcop->cop_warnings &&					\
-	      (curcop->cop_warnings == WARN_ALL ||			\
-	       IsSet(SvPVX(curcop->cop_warnings), 2*x) ) )		\
+	( (PL_curcop->cop_warnings &&					\
+	      (PL_curcop->cop_warnings == WARN_ALL ||			\
+	       IsSet(SvPVX(PL_curcop->cop_warnings), 2*x) ) )		\
 	  || (PL_dowarn & G_WARN_ON) )
 
 #define ckWARN2(x,y)							\
-	  ( (curcop->cop_warnings &&					\
-	      (curcop->cop_warnings == WARN_ALL ||			\
-	        IsSet(SvPVX(curcop->cop_warnings), 2*x)  ||		\
-	        IsSet(SvPVX(curcop->cop_warnings), 2*y) ) ) 		\
+	  ( (PL_curcop->cop_warnings &&					\
+	      (PL_curcop->cop_warnings == WARN_ALL ||			\
+	        IsSet(SvPVX(PL_curcop->cop_warnings), 2*x)  ||		\
+	        IsSet(SvPVX(PL_curcop->cop_warnings), 2*y) ) ) 		\
 	    ||	(PL_dowarn & G_WARN_ON) )
 
 #else
 
-#define ckDEAD(x)						\
-	   (curcop->cop_warnings != WARN_ALL &&			\
-	    curcop->cop_warnings != WARN_NONE &&		\
-	    SvPVX(curcop->cop_warnings)[Off(2*x+1)] & Bit(2*x+1) )
+#define ckDEAD(x)							\
+	   (PL_curcop->cop_warnings != WARN_ALL &&			\
+	    PL_curcop->cop_warnings != WARN_NONE &&			\
+	    SvPVX(PL_curcop->cop_warnings)[Off(2*x+1)] & Bit(2*x+1) )
 
-#define ckWARN(x)						\
+#define ckWARN(x)							\
 	( (PL_dowarn & G_WARN_ON) || ( (PL_dowarn & G_WARN_DISABLE) && 	\
-	  curcop->cop_warnings &&				\
-	  ( curcop->cop_warnings == WARN_ALL ||			\
-	    SvPVX(curcop->cop_warnings)[Off(2*x)] & Bit(2*x)  ) ) )
+	  PL_curcop->cop_warnings &&					\
+	  ( PL_curcop->cop_warnings == WARN_ALL ||			\
+	    SvPVX(PL_curcop->cop_warnings)[Off(2*x)] & Bit(2*x)  ) ) )
 
-#define ckWARN2(x,y)						\
+#define ckWARN2(x,y)							\
 	( (PL_dowarn & G_WARN_ON) || ( (PL_dowarn & G_WARN_DISABLE) && 	\
-	  curcop->cop_warnings &&				\
-	  ( curcop->cop_warnings == WARN_ALL ||			\
-	    SvPVX(curcop->cop_warnings)[Off(2*x)] & Bit(2*x) || 	\
-	    SvPVX(curcop->cop_warnings)[Off(2*y)] & Bit(2*y) ) ) ) 
+	  PL_curcop->cop_warnings &&					\
+	  ( PL_curcop->cop_warnings == WARN_ALL ||			\
+	    SvPVX(PL_curcop->cop_warnings)[Off(2*x)] & Bit(2*x) || 	\
+	    SvPVX(PL_curcop->cop_warnings)[Off(2*y)] & Bit(2*y) ) ) ) 
 
 #endif
 
 #define WARN_NONE		NULL
-#define WARN_ALL		(&sv_yes)
+#define WARN_ALL		(&PL_sv_yes)
 
 EOM
 
@@ -262,7 +264,7 @@ package warning;
 
 =head1 NAME
 
-warning - Perl pragma to control 
+warning - Perl pragma to control optional warnings
 
 =head1 SYNOPSIS