X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=gv.h;h=73814a82ec0534f52a99eec1109504d2484ebf18;hb=d41c018a580ac2dafca04b156c937ada656fd14b;hp=87370edcf3a52b58a3dfd38ca647739ed8ca8997;hpb=40e48b409b553fc7aff31fc8b93d589e4197ef3a;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/gv.h b/gv.h
index 87370ed..73814a8 100644
--- a/gv.h
+++ b/gv.h
@@ -24,7 +24,14 @@ struct gp {
 
 #define GvXPVGV(gv)	((XPVGV*)SvANY(gv))
 
-#define GvGP(gv)	(GvXPVGV(gv)->xgv_gp)
+#ifdef DEBUGGING
+#  define GvGP(gv)	(*(assert(SvTYPE(gv) == SVt_PVGV || \
+				  SvTYPE(gv) == SVt_PVLV), \
+			   &(GvXPVGV(gv)->xgv_gp)))
+#else
+#  define GvGP(gv)	(GvXPVGV(gv)->xgv_gp)
+#endif
+
 #define GvNAME(gv)	(GvXPVGV(gv)->xgv_name)
 #define GvNAMELEN(gv)	(GvXPVGV(gv)->xgv_namelen)
 #define GvSTASH(gv)	(GvXPVGV(gv)->xgv_stash)
@@ -155,8 +162,14 @@ Return the SV from the GV.
 #define GV_ADDWARN	0x04	/* add, but warn if symbol wasn't already there */
 #define GV_ADDINEVAL	0x08	/* add, as though we're doing so within an eval */
 #define GV_NOINIT	0x10	/* add, but don't init symbol, if type != PVGV */
+/* This is used by toke.c to avoid turing placeholder constants in the symbol
+   table into full PVGVs with attached constant subroutines.  */
+#define GV_NOADD_NOINIT	0x20	/* Don't add the symbol if it's not there.
+				   Don't init it if it is there but ! PVGV */
+
 /*      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.
 */
 #define gv_fullname3(sv,gv,prefix) gv_fullname4(sv,gv,prefix,TRUE)
 #define gv_efullname3(sv,gv,prefix) gv_efullname4(sv,gv,prefix,TRUE)
+#define gv_fetchmethod(stash, name) gv_fetchmethod_autoload(stash, name, TRUE)