X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=gv.h;h=99d534eeba79f1829e414e9a66a327cd22e5eac7;hb=d20626d86bf3d55ba658adbc2678de4c519cbc6c;hp=b823fa594740f65081c6cbfe4952437b961d16c0;hpb=a5f75d667838e8e7bb037880391f5c44476d33b4;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/gv.h b/gv.h
index b823fa5..99d534e 100644
--- a/gv.h
+++ b/gv.h
@@ -1,6 +1,6 @@
 /*    gv.h
  *
- *    Copyright (c) 1991-1994, Larry Wall
+ *    Copyright (c) 1991-1999, Larry Wall
  *
  *    You may distribute under the terms of either the GNU General Public
  *    License or the Artistic License, as specified in the README file.
@@ -13,13 +13,13 @@ struct gp {
     struct io *	gp_io;		/* filehandle value */
     CV *	gp_form;	/* format value */
     AV *	gp_av;		/* array value */
-    HV *	gp_hv;		/* associative array value */
+    HV *	gp_hv;		/* hash value */
     GV *	gp_egv;		/* effective gv, if *glob */
     CV *	gp_cv;		/* subroutine value */
     U32		gp_cvgen;	/* generational validity of cached gv_cv */
-    I32		gp_lastexpr;	/* used by nothing_in_common() */
+    U32		gp_flags;	/* XXX unused */
     line_t	gp_line;	/* line first declared at (for -w) */
-    GV *	gp_filegv;	/* file first declared in (for -w) */
+    char *	gp_file;	/* file first declared in (for -w) */
 };
 
 #if defined(CRIPPLED_CC) && (defined(iAPX286) || defined(M_I286) || defined(I80286))
@@ -43,6 +43,9 @@ struct gp {
 #define GvFORM(gv)	(GvGP(gv)->gp_form)
 #define GvAV(gv)	(GvGP(gv)->gp_av)
 
+/* This macro is deprecated.  Do not use! */
+#define GvREFCNT_inc(gv) ((GV*)SvREFCNT_inc(gv))	/* DO NOT USE */
+
 #ifdef	MICROPORT	/* Microport 2.4 hack */
 AV *GvAVn();
 #else
@@ -62,11 +65,13 @@ HV *GvHVn();
 
 #define GvCV(gv)	(GvGP(gv)->gp_cv)
 #define GvCVGEN(gv)	(GvGP(gv)->gp_cvgen)
+#define GvCVu(gv)	(GvGP(gv)->gp_cvgen ? Nullcv : GvGP(gv)->gp_cv)
 
-#define GvLASTEXPR(gv)	(GvGP(gv)->gp_lastexpr)
+#define GvGPFLAGS(gv)	(GvGP(gv)->gp_flags)
 
 #define GvLINE(gv)	(GvGP(gv)->gp_line)
-#define GvFILEGV(gv)	(GvGP(gv)->gp_filegv)
+#define GvFILE(gv)	(GvGP(gv)->gp_file)
+#define GvFILEGV(gv)	(gv_fetchfile(GvGP(gv)->gp_file))
 
 #define GvEGV(gv)	(GvGP(gv)->gp_egv)
 #define GvENAME(gv)	GvNAME(GvEGV(gv) ? GvEGV(gv) : gv)
@@ -123,6 +128,12 @@ HV *GvHVn();
 #define DM_EGID   0x020
 #define DM_DELAY 0x100
 
-#define GV_ADD		0x01
-#define GV_ADDMULTI	0x02
-#define GV_ADDWARN	0x04
+/*
+ * symbol creation flags, for use in gv_fetchpv() and get_*v()
+ */
+#define GV_ADD		0x01	/* add, if symbol not already there */
+#define GV_ADDMULTI	0x02	/* add, pretending it has been added already */
+#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 */
+#define GV_ADDOUR	0x20	/* add "our" variable */