Integrate:

[ 34029]
Subject: [PATCH] readable assertion names
From: "Reini Urban" <rurban@x-ray.at>
Date: Sun, 8 Jun 2008 14:41:51 +0200
Message-ID: <6910a60806080541n4f7e1939q254797411545ebea@mail.gmail.com>

[ 34030]
Subject: Re: [PATCH] readable assertion names, now the rest
From: "Reini Urban" <rurban@x-ray.at>
Date: Sun, 8 Jun 2008 16:17:32 +0200
Message-ID: <6910a60806080717h1aaaef1fh425a2ef21a62c9ed@mail.gmail.com>

[ 34031]
Subject: Re: [PATCH] readable assertion names, now sv.h
From: "Reini Urban" <rurban@x-ray.at>
Date: Sun, 8 Jun 2008 15:26:41 +0200
Message-ID: <6910a60806080626kfda0dd1ja906513e8fd0aa39@mail.gmail.com>
p4raw-link: @34031 on //depot/perl: e5ae200f29f943d2dad731c89f20babe8c7c8786
p4raw-link: @34030 on //depot/perl: 7948fc082b7916e5f602700f36d83fdcf421314c
p4raw-link: @34029 on //depot/perl: 603aa20df51288786331f1d6680081156c2ce5a9

p4raw-id: //depot/maint-5.10/perl@35005
p4raw-integrated: from //depot/perl@34031 'edit in' sv.h (@33627..)
p4raw-integrated: from //depot/perl@34030 'edit in' regexp.h (@33292..)
	'ignore' op.h (@33679..) 'merge in' pad.h (@32982..) cv.h
	(@33051..)
p4raw-integrated: from //depot/perl@34029 'merge in' gv.h (@33702..)

1 files changed, 89 insertions, 89 deletions

diff --git a/sv.h b/sv.h
index 685de3edd8..e49d0e18f7 100644
--- a/sv.h
+++ b/sv.h
@@ -1140,23 +1140,23 @@ the scalar's value cannot change unless written to.
 #define SvEVALED_off(sv)	(SvFLAGS(sv) &= ~SVrepl_EVAL)
 
 #if defined (DEBUGGING) && defined(__GNUC__) && !defined(PERL_GCC_BRACE_GROUPS_FORBIDDEN)
-#  define SvVALID(sv)		({ SV *const thwacke = (SV *) (sv);	\
-				   if (SvFLAGS(thwacke) & SVpbm_VALID)	\
-				       assert(!isGV_with_GP(thwacke));	\
-				   (SvFLAGS(thwacke) & SVpbm_VALID);	\
+#  define SvVALID(sv)		({ SV *const _svvalid = (SV *) (sv);	\
+				   if (SvFLAGS(_svvalid) & SVpbm_VALID)	\
+				       assert(!isGV_with_GP(_svvalid));	\
+				   (SvFLAGS(_svvalid) & SVpbm_VALID);	\
 				})
-#  define SvVALID_on(sv)	({ SV *const thwacke = (SV *) (sv);	\
-				   assert(!isGV_with_GP(thwacke));	\
-				   (SvFLAGS(thwacke) |= SVpbm_VALID);	\
+#  define SvVALID_on(sv)	({ SV *const _svvalid = (SV *) (sv);	\
+				   assert(!isGV_with_GP(_svvalid));	\
+				   (SvFLAGS(_svvalid) |= SVpbm_VALID);	\
 				})
-#  define SvVALID_off(sv)	({ SV *const thwacke = (SV *) (sv);	\
-				   assert(!isGV_with_GP(thwacke));	\
-				   (SvFLAGS(thwacke) &= ~SVpbm_VALID);	\
+#  define SvVALID_off(sv)	({ SV *const _svvalid = (SV *) (sv);	\
+				   assert(!isGV_with_GP(_svvalid));	\
+				   (SvFLAGS(_svvalid) &= ~SVpbm_VALID);	\
 				})
 
-#  define SvTAIL(sv)	({ SV *const _svi = (SV *) (sv);		\
-			    assert(SvTYPE(_svi) != SVt_PVAV);		\
-			    assert(SvTYPE(_svi) != SVt_PVHV);		\
+#  define SvTAIL(sv)	({ SV *const _svtail = (SV *) (sv);		\
+			    assert(SvTYPE(_svtail) != SVt_PVAV);		\
+			    assert(SvTYPE(_svtail) != SVt_PVHV);		\
 			    (SvFLAGS(sv) & (SVpbm_TAIL|SVpbm_VALID))	\
 				== (SVpbm_TAIL|SVpbm_VALID);		\
 			})
@@ -1191,19 +1191,19 @@ the scalar's value cannot change unless written to.
 
 #if defined (DEBUGGING) && defined(__GNUC__) && !defined(PERL_GCC_BRACE_GROUPS_FORBIDDEN)
 #  define SvPAD_TYPED_on(sv)	({					\
-	    SV *const whap = (SV *) (sv);				\
-	    assert(SvTYPE(whap) == SVt_PVMG);				\
-	    (SvFLAGS(whap) |= SVpad_NAME|SVpad_TYPED);			\
+	    SV *const _svpad = (SV *) (sv);				\
+	    assert(SvTYPE(_svpad) == SVt_PVMG);				\
+	    (SvFLAGS(_svpad) |= SVpad_NAME|SVpad_TYPED);		\
 	})
 #define SvPAD_OUR_on(sv)	({					\
-	    SV *const whap = (SV *) (sv);				\
-	    assert(SvTYPE(whap) == SVt_PVMG);				\
-	    (SvFLAGS(whap) |= SVpad_NAME|SVpad_OUR);			\
+	    SV *const _svpad = (SV *) (sv);				\
+	    assert(SvTYPE(_svpad) == SVt_PVMG);				\
+	    (SvFLAGS(_svpad) |= SVpad_NAME|SVpad_OUR);			\
 	})
 #define SvPAD_STATE_on(sv)	({					\
-	    SV *const whap = (SV *) (sv);				\
-	    assert(SvTYPE(whap) == SVt_PVNV || SvTYPE(whap) == SVt_PVMG); \
-	    (SvFLAGS(whap) |= SVpad_NAME|SVpad_STATE);			\
+	    SV *const _svpad = (SV *) (sv);				\
+	    assert(SvTYPE(_svpad) == SVt_PVNV || SvTYPE(_svpad) == SVt_PVMG); \
+	    (SvFLAGS(_svpad) |= SVpad_NAME|SVpad_STATE);		\
 	})
 #else
 #  define SvPAD_TYPED_on(sv)	(SvFLAGS(sv) |= SVpad_NAME|SVpad_TYPED)
@@ -1255,70 +1255,70 @@ the scalar's value cannot change unless written to.
 #  if defined (DEBUGGING) && defined(__GNUC__) && !defined(PERL_GCC_BRACE_GROUPS_FORBIDDEN)
 /* These get expanded inside other macros that already use a variable _sv  */
 #    define SvPVX(sv)							\
-	(*({ SV *const _svi = (SV *) (sv);				\
-	    assert(SvTYPE(_svi) >= SVt_PV);				\
-	    assert(SvTYPE(_svi) != SVt_PVAV);				\
-	    assert(SvTYPE(_svi) != SVt_PVHV);				\
-	    assert(!isGV_with_GP(_svi));				\
-	    &((_svi)->sv_u.svu_pv);					\
+	(*({ SV *const _svpvx = (SV *) (sv);				\
+	    assert(SvTYPE(_svpvx) >= SVt_PV);				\
+	    assert(SvTYPE(_svpvx) != SVt_PVAV);				\
+	    assert(SvTYPE(_svpvx) != SVt_PVHV);				\
+	    assert(!isGV_with_GP(_svpvx));				\
+	    &((_svpvx)->sv_u.svu_pv);					\
 	 }))
 #    define SvCUR(sv)							\
-	(*({ SV *const _svi = (SV *) (sv);				\
-	    assert(SvTYPE(_svi) >= SVt_PV);				\
-	    assert(SvTYPE(_svi) != SVt_PVAV);				\
-	    assert(SvTYPE(_svi) != SVt_PVHV);				\
-	    assert(!isGV_with_GP(_svi));				\
-	    &(((XPV*) SvANY(_svi))->xpv_cur);				\
+	(*({ SV *const _svcur = (SV *) (sv);				\
+	    assert(SvTYPE(_svcur) >= SVt_PV);				\
+	    assert(SvTYPE(_svcur) != SVt_PVAV);				\
+	    assert(SvTYPE(_svcur) != SVt_PVHV);				\
+	    assert(!isGV_with_GP(_svcur));				\
+	    &(((XPV*) SvANY(_svcur))->xpv_cur);				\
 	 }))
 #    define SvIVX(sv)							\
-	(*({ SV *const _svi = (SV *) (sv);				\
-	    assert(SvTYPE(_svi) == SVt_IV || SvTYPE(_svi) >= SVt_PVIV);	\
-	    assert(SvTYPE(_svi) != SVt_PVAV);				\
-	    assert(SvTYPE(_svi) != SVt_PVHV);				\
-	    assert(SvTYPE(_svi) != SVt_PVCV);				\
-	    assert(!isGV_with_GP(_svi));				\
-	    &(((XPVIV*) SvANY(_svi))->xiv_iv);				\
+	(*({ SV *const _svivx = (SV *) (sv);				\
+	    assert(SvTYPE(_svivx) == SVt_IV || SvTYPE(_svivx) >= SVt_PVIV); \
+	    assert(SvTYPE(_svivx) != SVt_PVAV);				\
+	    assert(SvTYPE(_svivx) != SVt_PVHV);				\
+	    assert(SvTYPE(_svivx) != SVt_PVCV);				\
+	    assert(!isGV_with_GP(_svivx));				\
+	    &(((XPVIV*) SvANY(_svivx))->xiv_iv);			\
 	 }))
 #    define SvUVX(sv)							\
-	(*({ SV *const _svi = (SV *) (sv);				\
-	    assert(SvTYPE(_svi) == SVt_IV || SvTYPE(_svi) >= SVt_PVIV);	\
-	    assert(SvTYPE(_svi) != SVt_PVAV);				\
-	    assert(SvTYPE(_svi) != SVt_PVHV);				\
-	    assert(SvTYPE(_svi) != SVt_PVCV);				\
-	    assert(!isGV_with_GP(_svi));				\
-	    &(((XPVUV*) SvANY(_svi))->xuv_uv);				\
+	(*({ SV *const _svuvx = (SV *) (sv);				\
+	    assert(SvTYPE(_svuvx) == SVt_IV || SvTYPE(_svuvx) >= SVt_PVIV); \
+	    assert(SvTYPE(_svuvx) != SVt_PVAV);				\
+	    assert(SvTYPE(_svuvx) != SVt_PVHV);				\
+	    assert(SvTYPE(_svuvx) != SVt_PVCV);				\
+	    assert(!isGV_with_GP(_svuvx));				\
+	    &(((XPVUV*) SvANY(_svuvx))->xuv_uv);			\
 	 }))
 #    define SvNVX(sv)							\
-	(*({ SV *const _svi = (SV *) (sv);				\
-	    assert(SvTYPE(_svi) == SVt_NV || SvTYPE(_svi) >= SVt_PVNV);	\
-	    assert(SvTYPE(_svi) != SVt_PVAV);				\
-	    assert(SvTYPE(_svi) != SVt_PVHV);				\
-	    assert(SvTYPE(_svi) != SVt_PVCV);				\
-	    assert(SvTYPE(_svi) != SVt_PVFM);				\
-	    assert(!isGV_with_GP(_svi));				\
-	   &(((XPVNV*) SvANY(_svi))->xnv_u.xnv_nv);			\
+	(*({ SV *const _svnvx = (SV *) (sv);				\
+	    assert(SvTYPE(_svnvx) == SVt_NV || SvTYPE(_svnvx) >= SVt_PVNV);	\
+	    assert(SvTYPE(_svnvx) != SVt_PVAV);				\
+	    assert(SvTYPE(_svnvx) != SVt_PVHV);				\
+	    assert(SvTYPE(_svnvx) != SVt_PVCV);				\
+	    assert(SvTYPE(_svnvx) != SVt_PVFM);				\
+	    assert(!isGV_with_GP(_svnvx));				\
+	   &(((XPVNV*) SvANY(_svnvx))->xnv_u.xnv_nv);			\
 	 }))
 #    define SvRV(sv)							\
-	(*({ SV *const _svi = (SV *) (sv);				\
-	    assert(SvTYPE(_svi) >= SVt_RV);				\
-	    assert(SvTYPE(_svi) != SVt_PVAV);				\
-	    assert(SvTYPE(_svi) != SVt_PVHV);				\
-	    assert(SvTYPE(_svi) != SVt_PVCV);				\
-	    assert(SvTYPE(_svi) != SVt_PVFM);				\
-	    assert(!isGV_with_GP(_svi));				\
-	    &((_svi)->sv_u.svu_rv);					\
+	(*({ SV *const _svrv = (SV *) (sv);				\
+	    assert(SvTYPE(_svrv) >= SVt_RV);				\
+	    assert(SvTYPE(_svrv) != SVt_PVAV);				\
+	    assert(SvTYPE(_svrv) != SVt_PVHV);				\
+	    assert(SvTYPE(_svrv) != SVt_PVCV);				\
+	    assert(SvTYPE(_svrv) != SVt_PVFM);				\
+	    assert(!isGV_with_GP(_svrv));				\
+	    &((_svrv)->sv_u.svu_rv);					\
 	 }))
 #    define SvMAGIC(sv)							\
-	(*({ SV *const _svi = (SV *) (sv);				\
-	    assert(SvTYPE(_svi) >= SVt_PVMG);				\
-	    if(SvTYPE(_svi) == SVt_PVMG)				\
-		assert(!SvPAD_OUR(_svi));				\
-	    &(((XPVMG*) SvANY(_svi))->xmg_u.xmg_magic);			\
+	(*({ SV *const _svmagic = (SV *) (sv);				\
+	    assert(SvTYPE(_svmagic) >= SVt_PVMG);			\
+	    if(SvTYPE(_svmagic) == SVt_PVMG)				\
+		assert(!SvPAD_OUR(_svmagic));				\
+	    &(((XPVMG*) SvANY(_svmagic))->xmg_u.xmg_magic);		\
 	  }))
 #    define SvSTASH(sv)							\
-	(*({ SV *const _svi = (SV *) (sv);				\
-	    assert(SvTYPE(_svi) >= SVt_PVMG);				\
-	    &(((XPVMG*) SvANY(_svi))->xmg_stash);			\
+	(*({ SV *const _svstash = (SV *) (sv);				\
+	    assert(SvTYPE(_svstash) >= SVt_PVMG);			\
+	    &(((XPVMG*) SvANY(_svstash))->xmg_stash);			\
 	  }))
 #  else
 #    define SvPVX(sv) ((sv)->sv_u.svu_pv)
@@ -1446,29 +1446,29 @@ the scalar's value cannot change unless written to.
 */
 #if defined (DEBUGGING) && defined(__GNUC__) && !defined(PERL_GCC_BRACE_GROUPS_FORBIDDEN)
 #  define BmFLAGS(sv)							\
-	(*({ SV *const uggh = (SV *) (sv);				\
-		assert(SvTYPE(uggh) == SVt_PVGV);			\
-		assert(SvVALID(uggh));					\
-	    &(((XPVGV*) SvANY(uggh))->xnv_u.xbm_s.xbm_flags);		\
+	(*({ SV *const _bmflags = (SV *) (sv);				\
+		assert(SvTYPE(_bmflags) == SVt_PVGV);			\
+		assert(SvVALID(_bmflags));				\
+	    &(((XPVGV*) SvANY(_bmflags))->xnv_u.xbm_s.xbm_flags);	\
 	 }))
 #  define BmRARE(sv)							\
-	(*({ SV *const uggh = (SV *) (sv);				\
-		assert(SvTYPE(uggh) == SVt_PVGV);			\
-		assert(SvVALID(uggh));					\
-	    &(((XPVGV*) SvANY(uggh))->xnv_u.xbm_s.xbm_rare);		\
+	(*({ SV *const _bmrare = (SV *) (sv);				\
+		assert(SvTYPE(_bmrare) == SVt_PVGV);			\
+		assert(SvVALID(_bmrare));				\
+	    &(((XPVGV*) SvANY(_bmrare))->xnv_u.xbm_s.xbm_rare);		\
 	 }))
 #  define BmUSEFUL(sv)							\
-	(*({ SV *const uggh = (SV *) (sv);				\
-	    assert(SvTYPE(uggh) == SVt_PVGV);				\
-	    assert(SvVALID(uggh));					\
-	    assert(!SvIOK(uggh));					\
-	    &(((XPVGV*) SvANY(uggh))->xiv_u.xivu_i32);			\
+	(*({ SV *const _bmuseful = (SV *) (sv);				\
+	    assert(SvTYPE(_bmuseful) == SVt_PVGV);			\
+	    assert(SvVALID(_bmuseful));					\
+	    assert(!SvIOK(_bmuseful));					\
+	    &(((XPVGV*) SvANY(_bmuseful))->xiv_u.xivu_i32);		\
 	 }))
 #  define BmPREVIOUS(sv)						\
-	(*({ SV *const uggh = (SV *) (sv);				\
-		assert(SvTYPE(uggh) == SVt_PVGV);			\
-		assert(SvVALID(uggh));					\
-	    &(((XPVGV*) SvANY(uggh))->xnv_u.xbm_s.xbm_previous);	\
+    (*({ SV *const _bmprevious = (SV *) (sv);				\
+		assert(SvTYPE(_bmprevious) == SVt_PVGV);		\
+		assert(SvVALID(_bmprevious));				\
+	    &(((XPVGV*) SvANY(_bmprevious))->xnv_u.xbm_s.xbm_previous);	\
 	 }))
 #else
 #  define BmFLAGS(sv)		((XPVGV*) SvANY(sv))->xnv_u.xbm_s.xbm_flags