Integrate with Sarathy.

[perl5.git] / gv.h

diff --git a/gv.h b/gv.h
index b823fa5..fc9985a 100644 (file)
--- 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,7 +13,7 @@ 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 */
@@ -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,6 +65,7 @@ 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)
 
@@ -123,6 +127,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 */