X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=gv.h;h=b5fa71b4ef7b12069a4d207ae340fad57f707be4;hb=0642d82a230efbe169e4a441b6943c36ff880a90;hp=16aa058fa54b785c9dda3391859494a95654082f;hpb=3ae1b22641a16d4d08aba688616c0f7cefb7d1f5;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/gv.h b/gv.h
index 16aa058..b5fa71b 100644
--- 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)							\
-	(*({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)); })
@@ -206,6 +206,8 @@ Return the SV from the GV.
 #define GV_NOEXPAND	0x40	/* Don't expand SvOK() entries to PVGV */
 #define GV_NOTQUAL	0x80	/* A plain symbol name, not qualified with a
 				   package (so skip checks for :: and ')  */
+#define GV_AUTOLOAD	0x100	/* gv_fetchmethod_flags() should AUTOLOAD  */
+#define GV_CROAK	0x200	/* gv_fetchmethod_flags() should croak  */
 
 /*      SVf_UTF8 (more accurately the return value from SvUTF8) is also valid
 	as a flag to gv_fetch_pvn_flags, so ensure it lies outside this range.