readable assertion names

From: "Reini Urban" <rurban@x-ray.at>
Message-ID: <6910a60806080541n4f7e1939q254797411545ebea@mail.gmail.com>

p4raw-id: //depot/perl@34029

diff --git a/gv.h b/gv.h
index 091a568..b5fa71b 100644 (file)
--- a/gv.h
+++ b/gv.h
@@ -27,27 +27,27 @@ struct gp {
 
 #if defined (DEBUGGING) && defined(__GNUC__) && !defined(PERL_GCC_BRACE_GROUPS_FORBIDDEN) && !defined(__INTEL_COMPILER)
 #  define GvGP(gv)                                                     \
 
 #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)                                                  \
 #  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)                                                  \
 #  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)                                               \
         }))
 #  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)); })
         }))
 #  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)); })