final touches for lexical warnings (from Paul Marquess)

p4raw-id: //depot/perl@5702

1 files changed, 68 insertions, 67 deletions

diff --git a/warnings.h b/warnings.h
index 31942e1e66..a2bcaeb43e 100644
--- a/warnings.h
+++ b/warnings.h
@@ -16,97 +16,98 @@
 #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 specialWARN(x)		((x) == pWARN_STD || (x) == pWARN_ALL ||	\
+				 (x) == pWARN_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 ||			\
+	( (PL_curcop->cop_warnings != pWARN_STD &&			\
+	   PL_curcop->cop_warnings != pWARN_NONE &&			\
+	      (PL_curcop->cop_warnings == pWARN_ALL ||			\
 	       IsSet(SvPVX(PL_curcop->cop_warnings), 2*x) ) )		\
-	  || (PL_curcop->cop_warnings == WARN_STD && PL_dowarn & G_WARN_ON) )
+	  || (PL_curcop->cop_warnings == pWARN_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 ||			\
+	  ( (PL_curcop->cop_warnings != pWARN_STD  &&			\
+	     PL_curcop->cop_warnings != pWARN_NONE &&			\
+	      (PL_curcop->cop_warnings == pWARN_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) )
+	    ||	(PL_curcop->cop_warnings == pWARN_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 &&			\
+	  (PL_curcop->cop_warnings == pWARN_STD ||			\
+	   PL_curcop->cop_warnings == pWARN_ALL ||			\
+	     (PL_curcop->cop_warnings != pWARN_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 &&			\
+	  (PL_curcop->cop_warnings == pWARN_STD ||			\
+	   PL_curcop->cop_warnings == pWARN_ALL ||			\
+	     (PL_curcop->cop_warnings != pWARN_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 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 WARN_CHMOD		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_DIGIT		30
-#define WARN_PARENTHESIS	31
-#define WARN_PRECEDENCE		32
-#define WARN_PRINTF		33
-#define WARN_PROTOTYPE		34
-#define WARN_QW			35
-#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_ALL		0
+#define WARN_CHMOD		1
+#define WARN_CLOSURE		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_DEPRECATED		30
+#define WARN_DIGIT		31
+#define WARN_PARENTHESIS	32
+#define WARN_PRECEDENCE		33
+#define WARN_PRINTF		34
+#define WARN_PROTOTYPE		35
+#define WARN_QW			36
+#define WARN_RESERVED		37
+#define WARN_SEMICOLON		38
+#define WARN_TAINT		39
+#define WARN_UMASK		40
+#define WARN_UNINITIALIZED	41
+#define WARN_UNPACK		42
+#define WARN_UNTIE		43
+#define WARN_UTF8		44
+#define WARN_VOID		45
+#define WARN_Y2K		46
 
 #define WARNsize		12
 #define WARN_ALLstring		"\125\125\125\125\125\125\125\125\125\125\125\125"