X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=warnings.h;h=de9355ddfa2bb64f8ee877a5f7c12137be15a22d;hb=b77c74bc90789599ae69b0d39a1984d2768fa05e;hp=31942e1e66203dad4687156377465d42347e29df;hpb=e476b1b5c29f354cf8dad61a9fc6d855bdfb5b7d;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/warnings.h b/warnings.h
index 31942e1..de9355d 100644
--- a/warnings.h
+++ b/warnings.h
@@ -16,52 +16,13 @@
 #define G_WARN_ONCE		8	/* set if 'once' ever enabled */
 #define G_WARN_ALL_MASK		(G_WARN_ALL_ON|G_WARN_ALL_OFF)
 
-#define WARN_STD		Nullsv
-#define WARN_ALL		(Nullsv+1)	/* use warnings 'all' */
-#define WARN_NONE		(Nullsv+2)	/* no  warnings 'all' */
+#define pWARN_STD		Nullsv
+#define pWARN_ALL		(Nullsv+1)	/* use warnings 'all' */
+#define pWARN_NONE		(Nullsv+2)	/* no  warnings 'all' */
 
-#define specialWARN(x)		((x) == WARN_STD || (x) == WARN_ALL ||	\
-				 (x) == WARN_NONE)
-
-#define ckDEAD(x)							\
-	   ( ! specialWARN(PL_curcop->cop_warnings) &&			\
-	    IsSet(SvPVX(PL_curcop->cop_warnings), 2*x+1))
-
-#define ckWARN(x)							\
-	( (PL_curcop->cop_warnings != WARN_STD &&			\
-	   PL_curcop->cop_warnings != WARN_NONE &&			\
-	      (PL_curcop->cop_warnings == WARN_ALL ||			\
-	       IsSet(SvPVX(PL_curcop->cop_warnings), 2*x) ) )		\
-	  || (PL_curcop->cop_warnings == WARN_STD && PL_dowarn & G_WARN_ON) )
-
-#define ckWARN2(x,y)							\
-	  ( (PL_curcop->cop_warnings != WARN_STD  &&			\
-	     PL_curcop->cop_warnings != WARN_NONE &&			\
-	      (PL_curcop->cop_warnings == WARN_ALL ||			\
-	        IsSet(SvPVX(PL_curcop->cop_warnings), 2*x)  ||		\
-	        IsSet(SvPVX(PL_curcop->cop_warnings), 2*y) ) ) 		\
-	    ||	(PL_curcop->cop_warnings == WARN_STD && PL_dowarn & G_WARN_ON) )
-
-#define ckWARN_d(x)							\
-	  (PL_curcop->cop_warnings == WARN_STD ||			\
-	   PL_curcop->cop_warnings == WARN_ALL ||			\
-	     (PL_curcop->cop_warnings != WARN_NONE &&			\
-	      IsSet(SvPVX(PL_curcop->cop_warnings), 2*x) ) )
-
-#define ckWARN2_d(x,y)							\
-	  (PL_curcop->cop_warnings == WARN_STD ||			\
-	   PL_curcop->cop_warnings == WARN_ALL ||			\
-	     (PL_curcop->cop_warnings != WARN_NONE &&			\
-	        (IsSet(SvPVX(PL_curcop->cop_warnings), 2*x)  ||		\
-	         IsSet(SvPVX(PL_curcop->cop_warnings), 2*y) ) ) )
-
-
-#define isLEXWARN_on 	(PL_curcop->cop_warnings != WARN_STD)
-#define isLEXWARN_off	(PL_curcop->cop_warnings == WARN_STD)
-#define isWARN_ONCE	(PL_dowarn & (G_WARN_ON|G_WARN_ONCE))
-#define isWARN_on(c,x)	(IsSet(SvPVX(c), 2*(x)))
-
-#define WARN_CHMOD		0
+#define specialWARN(x)		((x) == pWARN_STD || (x) == pWARN_ALL ||	\
+				 (x) == pWARN_NONE)
+#define WARN_ALL		0
 #define WARN_CLOSURE		1
 #define WARN_EXITING		2
 #define WARN_GLOB		3
@@ -100,17 +61,51 @@
 #define WARN_RESERVED		36
 #define WARN_SEMICOLON		37
 #define WARN_TAINT		38
-#define WARN_UMASK		39
-#define WARN_UNINITIALIZED	40
-#define WARN_UNPACK		41
-#define WARN_UNTIE		42
-#define WARN_UTF8		43
-#define WARN_VOID		44
-#define WARN_Y2K		45
+#define WARN_UNINITIALIZED	39
+#define WARN_UNPACK		40
+#define WARN_UNTIE		41
+#define WARN_UTF8		42
+#define WARN_VOID		43
+#define WARN_Y2K		44
 
 #define WARNsize		12
 #define WARN_ALLstring		"\125\125\125\125\125\125\125\125\125\125\125\125"
 #define WARN_NONEstring		"\0\0\0\0\0\0\0\0\0\0\0\0"
 
+#define isLEXWARN_on 	(PL_curcop->cop_warnings != pWARN_STD)
+#define isLEXWARN_off	(PL_curcop->cop_warnings == pWARN_STD)
+#define isWARN_ONCE	(PL_dowarn & (G_WARN_ON|G_WARN_ONCE))
+#define isWARN_on(c,x)	(IsSet(SvPVX(c), 2*(x)))
+#define isWARNf_on(c,x)	(IsSet(SvPVX(c), 2*(x)+1))
+
+#define ckDEAD(x)							\
+	   ( ! specialWARN(PL_curcop->cop_warnings) &&			\
+	    ( isWARNf_on(PL_curcop->cop_warnings, WARN_ALL) || 		\
+	      isWARNf_on(PL_curcop->cop_warnings, x)))
+
+#define ckWARN(x)							\
+	( (isLEXWARN_on && PL_curcop->cop_warnings != pWARN_NONE &&	\
+	      (PL_curcop->cop_warnings == pWARN_ALL ||			\
+	       isWARN_on(PL_curcop->cop_warnings, x) ) )		\
+	  || (isLEXWARN_off && PL_dowarn & G_WARN_ON) )
+
+#define ckWARN2(x,y)							\
+	  ( (isLEXWARN_on && PL_curcop->cop_warnings != pWARN_NONE &&	\
+	      (PL_curcop->cop_warnings == pWARN_ALL ||			\
+	        isWARN_on(PL_curcop->cop_warnings, x)  ||		\
+	        isWARN_on(PL_curcop->cop_warnings, y) ) ) 		\
+	    ||	(isLEXWARN_off && PL_dowarn & G_WARN_ON) )
+
+#define ckWARN_d(x)							\
+	  (isLEXWARN_off || PL_curcop->cop_warnings == pWARN_ALL ||	\
+	     (PL_curcop->cop_warnings != pWARN_NONE &&			\
+	      isWARN_on(PL_curcop->cop_warnings, x) ) )
+
+#define ckWARN2_d(x,y)							\
+	  (isLEXWARN_off || PL_curcop->cop_warnings == pWARN_ALL ||	\
+	     (PL_curcop->cop_warnings != pWARN_NONE &&			\
+	        (isWARN_on(PL_curcop->cop_warnings, x)  ||		\
+	         isWARN_on(PL_curcop->cop_warnings, y) ) ) )
+
 /* end of file warnings.h */