taint + deprecated warnings

From: "Paul Marquess" <paul_marquess@yahoo.co.uk>
Message-ID: <AIEAJICLCBDNAAOLLOKLCEKGDOAA.paul_marquess@yahoo.co.uk>

p4raw-id: //depot/perl@15003

1 files changed, 78 insertions, 33 deletions

diff --git a/warnings.h b/warnings.h
index d173b8d208..0649c7ed53 100644
--- a/warnings.h
+++ b/warnings.h
@@ -24,34 +24,34 @@
 				 (x) == pWARN_NONE)
 #define WARN_ALL		0
 #define WARN_CLOSURE		1
-#define WARN_EXITING		2
-#define WARN_GLOB		3
-#define WARN_IO			4
-#define WARN_CLOSED		5
-#define WARN_EXEC		6
-#define WARN_NEWLINE		7
-#define WARN_PIPE		8
-#define WARN_UNOPENED		9
-#define WARN_MISC		10
-#define WARN_NUMERIC		11
-#define WARN_ONCE		12
-#define WARN_OVERFLOW		13
-#define WARN_PACK		14
-#define WARN_PORTABLE		15
-#define WARN_RECURSION		16
-#define WARN_REDEFINE		17
-#define WARN_REGEXP		18
-#define WARN_SEVERE		19
-#define WARN_DEBUGGING		20
-#define WARN_INPLACE		21
-#define WARN_INTERNAL		22
-#define WARN_MALLOC		23
-#define WARN_SIGNAL		24
-#define WARN_SUBSTR		25
-#define WARN_SYNTAX		26
-#define WARN_AMBIGUOUS		27
-#define WARN_BAREWORD		28
-#define WARN_DEPRECATED		29
+#define WARN_DEPRECATED		2
+#define WARN_EXITING		3
+#define WARN_GLOB		4
+#define WARN_IO			5
+#define WARN_CLOSED		6
+#define WARN_EXEC		7
+#define WARN_NEWLINE		8
+#define WARN_PIPE		9
+#define WARN_UNOPENED		10
+#define WARN_MISC		11
+#define WARN_NUMERIC		12
+#define WARN_ONCE		13
+#define WARN_OVERFLOW		14
+#define WARN_PACK		15
+#define WARN_PORTABLE		16
+#define WARN_RECURSION		17
+#define WARN_REDEFINE		18
+#define WARN_REGEXP		19
+#define WARN_SEVERE		20
+#define WARN_DEBUGGING		21
+#define WARN_INPLACE		22
+#define WARN_INTERNAL		23
+#define WARN_MALLOC		24
+#define WARN_SIGNAL		25
+#define WARN_SUBSTR		26
+#define WARN_SYNTAX		27
+#define WARN_AMBIGUOUS		28
+#define WARN_BAREWORD		29
 #define WARN_DIGIT		30
 #define WARN_PARENTHESIS	31
 #define WARN_PRECEDENCE		32
@@ -79,11 +79,6 @@
 #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 ||			\
@@ -97,6 +92,23 @@
 	        isWARN_on(PL_curcop->cop_warnings, y) ) ) 		\
 	    ||	(isLEXWARN_off && PL_dowarn & G_WARN_ON) )
 
+#define ckWARN3(x,y,z)							\
+	  ( (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)  ||		\
+	        isWARN_on(PL_curcop->cop_warnings, z) ) ) 		\
+	    ||	(isLEXWARN_off && PL_dowarn & G_WARN_ON) )
+
+#define ckWARN4(x,y,z,t)						\
+	  ( (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)  ||		\
+	        isWARN_on(PL_curcop->cop_warnings, z)  ||		\
+	        isWARN_on(PL_curcop->cop_warnings, t) ) ) 		\
+	    ||	(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 &&			\
@@ -108,5 +120,38 @@
 	        (isWARN_on(PL_curcop->cop_warnings, x)  ||		\
 	         isWARN_on(PL_curcop->cop_warnings, y) ) ) )
 
+#define ckWARN3_d(x,y,z)						\
+	  (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)  ||		\
+	         isWARN_on(PL_curcop->cop_warnings, z) ) ) )
+
+#define ckWARN4_d(x,y,z,t)						\
+	  (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)  ||		\
+	         isWARN_on(PL_curcop->cop_warnings, z)  ||		\
+	         isWARN_on(PL_curcop->cop_warnings, t) ) ) )
+
+#define packWARN(a)		(a                                 )
+#define packWARN2(a,b)		((a) | (b)<<8                      )
+#define packWARN3(a,b,c)	((a) | (b)<<8 | (c) <<16           )
+#define packWARN4(a,b,c,d)	((a) | (b)<<8 | (c) <<16 | (d) <<24)
+
+#define unpackWARN1(x)		((x)        & 0xFF)
+#define unpackWARN2(x)		(((x) >>8)  & 0xFF)
+#define unpackWARN3(x)		(((x) >>16) & 0xFF)
+#define unpackWARN4(x)		(((x) >>24) & 0xFF)
+
+#define ckDEAD(x)							\
+	   ( ! specialWARN(PL_curcop->cop_warnings) &&			\
+	    ( isWARNf_on(PL_curcop->cop_warnings, WARN_ALL) || 		\
+	      isWARNf_on(PL_curcop->cop_warnings, unpackWARN1(x)) ||	\
+	      isWARNf_on(PL_curcop->cop_warnings, unpackWARN2(x)) ||	\
+	      isWARNf_on(PL_curcop->cop_warnings, unpackWARN3(x)) ||	\
+	      isWARNf_on(PL_curcop->cop_warnings, unpackWARN4(x))))
+
 /* end of file warnings.h */