This is my patch patch.1n for perl5.001.

[p5sagit/p5-mst-13.2.git] / gv.h

diff --git a/gv.h b/gv.h
index a3e1cef..3dd0ec8 100644 (file)
--- a/gv.h
+++ b/gv.h
@@ -1,27 +1,10 @@
-/* $RCSfile: gv.h,v $$Revision: 4.1 $$Date: 92/08/07 18:26:42 $
+/*    gv.h
  *
- *    Copyright (c) 1991, Larry Wall
+ *    Copyright (c) 1991-1994, 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.
  *
- * $Log:       gv.h,v $
- * Revision 4.1  92/08/07  18:26:42  lwall
- * 
- * Revision 4.0.1.3  92/06/08  15:33:44  lwall
- * patch20: fixed confusion between a *var's real name and its effective name
- * patch20: ($<,$>) = ... didn't work on some architectures
- * 
- * Revision 4.0.1.2  91/11/05  18:36:15  lwall
- * patch11: length($x) was sometimes wrong for numeric $x
- * 
- * Revision 4.0.1.1  91/06/07  11:56:35  lwall
- * patch4: new copyright notice
- * patch4: length($`), length($&), length($') now optimized to avoid string copy
- * 
- * Revision 4.0  91/03/20  01:39:49  lwall
- * 4.0 baseline.
- * 
  */
 
 struct gp {
@@ -33,8 +16,10 @@ struct gp {
     HV *       gp_hv;          /* associative array 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() */
     line_t     gp_line;        /* line first declared at (for -w) */
+    GV *       gp_filegv;      /* file first declared in (for -w) */
     char       gp_flags;
 };
 
@@ -44,13 +29,11 @@ struct gp {
 
 #define GvXPVGV(gv)    ((XPVGV*)SvANY(gv))
 
-#define GvMAGIC(gv)    (GvGP(gv)->gp_magic)
 #define GvSV(gv)       (GvGP(gv)->gp_sv)
 #define GvREFCNT(gv)   (GvGP(gv)->gp_refcnt)
-#define GvIO(gv)       (GvGP(gv)->gp_io)
-#define GvIOn(gv)      (GvIO(gv) ?                     \
-                        GvIO(gv) :                     \
-                        (GvIO(gv) = newIO()))
+#define GvIO(gv)       ((gv) && SvTYPE((SV*)gv) == SVt_PVGV ? GvIOp(gv) : 0)
+#define GvIOp(gv)      (GvGP(gv)->gp_io)
+#define GvIOn(gv)      (GvIO(gv) ? GvIOp(gv) : GvIOp(gv_IOadd(gv)))
 
 #define GvFORM(gv)     (GvGP(gv)->gp_form)
 #define GvAV(gv)       (GvGP(gv)->gp_av)
@@ -73,10 +56,12 @@ HV *GvHVn();
 #endif                 /* Microport 2.4 hack */
 
 #define GvCV(gv)       (GvGP(gv)->gp_cv)
+#define GvCVGEN(gv)    (GvGP(gv)->gp_cvgen)
 
 #define GvLASTEXPR(gv) (GvGP(gv)->gp_lastexpr)
 
 #define GvLINE(gv)     (GvGP(gv)->gp_line)
+#define GvFILEGV(gv)   (GvGP(gv)->gp_filegv)
 
 #define GvFLAGS(gv)    (GvGP(gv)->gp_flags)
 
@@ -85,33 +70,10 @@ HV *GvHVn();
 #define GvGP(gv)       (GvXPVGV(gv)->xgv_gp)
 #define GvNAME(gv)     (GvXPVGV(gv)->xgv_name)
 #define GvNAMELEN(gv)  (GvXPVGV(gv)->xgv_namelen)
-#define GvENAME(gv)    GvNAME(GvEGV(gv))
+#define GvENAME(gv)    GvNAME(GvEGV(gv) ? GvEGV(gv) : gv)
 
 #define GvSTASH(gv)    (GvXPVGV(gv)->xgv_stash)
-#define GvESTASH(gv)   GvSTASH(GvEGV(gv))
-
-struct io {
-    FILE *     ifp;            /* ifp and ofp are normally the same */
-    FILE *     ofp;            /* but sockets need separate streams */
-#ifdef HAS_READDIR
-    DIR *      dirp;           /* for opendir, readdir, etc */
-#endif
-    long       lines;          /* $. */
-    long       page;           /* $% */
-    long       page_len;       /* $= */
-    long       lines_left;     /* $- */
-    char *     top_name;       /* $^ */
-    GV *       top_gv;         /* $^ */
-    char *     fmt_name;       /* $~ */
-    GV *       fmt_gv;         /* $~ */
-    short      subprocess;     /* -| or |- */
-    char       type;
-    char       flags;
-};
-
-#define IOf_ARGV 1     /* this fp iterates over ARGV */
-#define IOf_START 2    /* check for null ARGV and substitute '-' */
-#define IOf_FLUSH 4    /* this fp wants a flush after write op */
+#define GvESTASH(gv)   GvSTASH(GvEGV(gv) ? GvEGV(gv) : gv)
 
 #define Nullgv Null(GV*)
 
@@ -123,3 +85,9 @@ struct io {
 #define DM_EGID   0x020
 #define DM_DELAY 0x100
 
+#define GVf_INTRO      0x01
+#define GVf_IMPORTED   0x02
+
+#define GV_ADD         0x01
+#define GV_ADDMULTI    0x02
+#define GV_ADDWARN     0x04