Change 34029 by [EMAIL PROTECTED] on 2008/06/08 15:24:44
Subject: [PATCH] readable assertion names
From: "Reini Urban" <[EMAIL PROTECTED]>
Date: Sun, 8 Jun 2008 14:41:51 +0200
Message-ID: <[EMAIL PROTECTED]>
Affected files ...
... //depot/perl/gv.h#78 edit
Differences ...
==== //depot/perl/gv.h#78 (text) ====
Index: perl/gv.h
--- perl/gv.h#77~33702~ 2008-04-17 00:58:29.000000000 -0700
+++ perl/gv.h 2008-06-08 08:24:44.000000000 -0700
@@ -27,27 +27,27 @@
#if defined (DEBUGGING) && defined(__GNUC__) &&
!defined(PERL_GCC_BRACE_GROUPS_FORBIDDEN) && !defined(__INTEL_COMPILER)
# define GvGP(gv) \
- (*({GV *const shplep = (GV *) (gv); \
- assert(SvTYPE(shplep) == SVt_PVGV || SvTYPE(shplep) == SVt_PVLV); \
- assert(isGV_with_GP(shplep)); \
- &((shplep)->sv_u.svu_gp);}))
+ (*({GV *const _gvgp = (GV *) (gv); \
+ assert(SvTYPE(_gvgp) == SVt_PVGV || SvTYPE(_gvgp) == SVt_PVLV); \
+ assert(isGV_with_GP(_gvgp)); \
+ &((_gvgp)->sv_u.svu_gp);}))
# define GvFLAGS(gv) \
- (*({GV *const yaah = (GV *) (gv); \
- assert(SvTYPE(yaah) == SVt_PVGV || SvTYPE(yaah) == SVt_PVLV); \
- assert(isGV_with_GP(yaah)); \
- &(GvXPVGV(yaah)->xpv_cur);}))
+ (*({GV *const _gvflags = (GV *) (gv); \
+ assert(SvTYPE(_gvflags) == SVt_PVGV || SvTYPE(_gvflags) ==
SVt_PVLV); \
+ assert(isGV_with_GP(_gvflags)); \
+ &(GvXPVGV(_gvflags)->xpv_cur);}))
# define GvSTASH(gv) \
- (*({ GV * const _gv = (GV *) (gv); \
- assert(isGV_with_GP(_gv)); \
- assert(SvTYPE(_gv) == SVt_PVGV || SvTYPE(_gv) >= SVt_PVLV); \
- &(GvXPVGV(_gv)->xnv_u.xgv_stash); \
+ (*({ GV * const _gvstash = (GV *) (gv); \
+ assert(isGV_with_GP(_gvstash)); \
+ assert(SvTYPE(_gvstash) == SVt_PVGV || SvTYPE(_gvstash) >=
SVt_PVLV); \
+ &(GvXPVGV(_gvstash)->xnv_u.xgv_stash); \
}))
# define GvNAME_HEK(gv) \
- (*({ GV * const zzzz = (GV *) (gv); \
- assert(isGV_with_GP(zzzz)); \
- assert(SvTYPE(zzzz) == SVt_PVGV || SvTYPE(zzzz) >= SVt_PVLV); \
- assert(!SvVALID(zzzz)); \
- &(GvXPVGV(zzzz)->xiv_u.xivu_namehek); \
+ (*({ GV * const _gvname_hek = (GV *) (gv); \
+ assert(isGV_with_GP(_gvname_hek)); \
+ assert(SvTYPE(_gvname_hek) == SVt_PVGV || SvTYPE(_gvname_hek) >=
SVt_PVLV); \
+ assert(!SvVALID(_gvname_hek)); \
+ &(GvXPVGV(_gvname_hek)->xiv_u.xivu_namehek); \
}))
# define GvNAME_get(gv) ({ assert(GvNAME_HEK(gv));
HEK_KEY(GvNAME_HEK(gv)); })
# define GvNAMELEN_get(gv) ({ assert(GvNAME_HEK(gv));
HEK_LEN(GvNAME_HEK(gv)); })
End of Patch.
