re/pat_advanced.t: EBCDIC fixes

[perl5.git] / gv.h

diff --git a/gv.h b/gv.h
index 2b6941a..1d59154 100644 (file)
--- a/gv.h
+++ b/gv.h
@@ -12,13 +12,14 @@ struct gp {
     SV *       gp_sv;          /* scalar value */
     struct io *        gp_io;          /* filehandle value */
     CV *       gp_cv;          /* subroutine value */
-    U32                gp_cvgen;       /* generational validity of cached gv_cv */
+    U32                gp_cvgen;       /* generational validity of cached gp_cv */
     U32                gp_refcnt;      /* how many globs point to this? */
     HV *       gp_hv;          /* hash value */
     AV *       gp_av;          /* array value */
     CV *       gp_form;        /* format value */
     GV *       gp_egv;         /* effective gv, if *glob */
-    line_t     gp_line;        /* line first declared at (for -w) */
+    PERL_BITFIELD32 gp_line:31;        /* line first declared at (for -w) */
+    PERL_BITFIELD32 gp_flags:1;
     HEK *      gp_file_hek;    /* file first declared in (for -w) */
 };
 
@@ -83,6 +84,18 @@ struct gp {
 
 Return the SV from the GV.
 
+=for apidoc Am|AV*|GvAV|GV* gv
+
+Return the AV from the GV.
+
+=for apidoc Am|HV*|GvHV|GV* gv
+
+Return the HV from the GV.
+
+=for apidoc Am|CV*|GvCV|GV* gv
+
+Return the CV from the GV.
+
 =cut
 */
 
@@ -127,10 +140,13 @@ Return the SV from the GV.
 #define GvCVGEN(gv)    (GvGP(gv)->gp_cvgen)
 #define GvCVu(gv)      (GvGP(gv)->gp_cvgen ? NULL : GvGP(gv)->gp_cv)
 
+#define GvGPFLAGS(gv)  (GvGP(gv)->gp_flags)
+
 #define GvLINE(gv)     (GvGP(gv)->gp_line)
 #define GvFILE_HEK(gv) (GvGP(gv)->gp_file_hek)
-#define GvFILE(gv)     (GvFILE_HEK(gv) ? HEK_KEY(GvFILE_HEK(gv)) : NULL)
-#define GvFILEGV(gv)   (gv_fetchfile(GvFILE(gv)))
+#define GvFILEx(gv)    HEK_KEY(GvFILE_HEK(gv))
+#define GvFILE(gv)     (GvFILE_HEK(gv) ? GvFILEx(gv) : NULL)
+#define GvFILEGV(gv)   (GvFILE_HEK(gv) ? gv_fetchfile(GvFILEx(gv)) : NULL)
 
 #define GvEGV(gv)      (GvGP(gv)->gp_egv)
 #define GvEGVx(gv)     (isGV_with_GP(gv) ? GvEGV(gv) : NULL)
@@ -143,7 +159,7 @@ Return the SV from the GV.
 #define GVf_INTRO      0x01
 #define GVf_MULTI      0x02
 #define GVf_ASSUMECV   0x04
-#define GVf_IN_PAD     0x08
+/*     UNUSED          0x08 */
 #define GVf_IMPORTED   0xF0
 #define GVf_IMPORTED_SV          0x10
 #define GVf_IMPORTED_AV          0x20
@@ -182,11 +198,16 @@ Return the SV from the GV.
 #define GvIMPORTED_CV_on(gv)   (GvFLAGS(gv) |= GVf_IMPORTED_CV)
 #define GvIMPORTED_CV_off(gv)  (GvFLAGS(gv) &= ~GVf_IMPORTED_CV)
 
-#define GvIN_PAD(gv)           (GvFLAGS(gv) & GVf_IN_PAD)
-#define GvIN_PAD_on(gv)                (GvFLAGS(gv) |= GVf_IN_PAD)
-#define GvIN_PAD_off(gv)       (GvFLAGS(gv) &= ~GVf_IN_PAD)
+#define GPf_ALIASED_SV 1
+
+#define GvALIASED_SV(gv)       (GvGPFLAGS(gv) & GPf_ALIASED_SV)
+#define GvALIASED_SV_on(gv)    (GvGPFLAGS(gv) |= GPf_ALIASED_SV)
+#define GvALIASED_SV_off(gv)   (GvGPFLAGS(gv) &= ~GPf_ALIASED_SV)
 
 #ifndef PERL_CORE
+#  define GvIN_PAD(gv)         0
+#  define GvIN_PAD_on(gv)      NOOP
+#  define GvIN_PAD_off(gv)     NOOP
 #  define Nullgv Null(GV*)
 #endif
 
@@ -205,9 +226,10 @@ Return the SV from the GV.
 #define GV_ADD         0x01    /* add, if symbol not already there
                                   For gv_name_set, adding a HEK for the first
                                   time, so don't try to free what's there.  */
-#define GV_ADDMULTI    0x02    /* add, pretending it has been added already */
+#define GV_ADDMULTI    0x02    /* add, pretending it has been added
+                                  already; used also by gv_init_* */
 #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 */
+               /*      0x08       UNUSED */
 #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.  */
@@ -221,12 +243,17 @@ Return the SV from the GV.
 #define GV_ADDMG       0x400   /* add if magical */
 #define GV_NO_SVGMAGIC 0x800   /* Skip get-magic on an SV argument;
                                   used only by gv_fetchsv(_nomg) */
+#define GV_CACHE_ONLY  0x1000  /* return stash only if found in cache;
+                                  used only in flags parameter to gv_stash* family */
+
+/* Flags for gv_fetchmeth_pvn and gv_autoload_pvn*/
+#define GV_SUPER       0x1000  /* SUPER::method */
 
 /* Flags for gv_autoload_*/
 #define GV_AUTOLOAD_ISMETHOD 1 /* autoloading a method? */
 
 /*      SVf_UTF8 (more accurately the return value from SvUTF8) is also valid
-       as a flag to gv_fetchpvn_flags and gv_autoload_*, so ensure it lies
+       as a flag to various gv_* functions, so ensure it lies
        outside this range.
 */
 
@@ -240,12 +267,21 @@ Return the SV from the GV.
 #define gv_efullname3(sv,gv,prefix) gv_efullname4(sv,gv,prefix,TRUE)
 #define gv_fetchmethod(stash, name) gv_fetchmethod_autoload(stash, name, TRUE)
 #define gv_fetchsv_nomg(n,f,t) gv_fetchsv(n,(f)|GV_NO_SVGMAGIC,t)
-#define gv_init(gv,stash,name,len,multi) gv_init_pvn(gv,stash,name,len,multi,0)
+#define gv_init(gv,stash,name,len,multi) \
+       gv_init_pvn(gv,stash,name,len,GV_ADDMULTI*!!(multi))
 #define gv_fetchmeth(stash,name,len,level) gv_fetchmeth_pvn(stash, name, len, level, 0)
 #define gv_fetchmeth_autoload(stash,name,len,level) gv_fetchmeth_pvn_autoload(stash, name, len, level, 0)
 #define gv_fetchmethod_flags(stash,name,flags) gv_fetchmethod_pv_flags(stash, name, flags)
 #define gv_autoload4(stash, name, len, method) \
        gv_autoload_pvn(stash, name, len, !!(method))
+#define newGVgen(pack)  newGVgen_flags(pack, 0)
+#define gv_method_changed(gv)              \
+    (                                       \
+       assert_(isGV_with_GP(gv))             \
+       GvREFCNT(gv) > 1                       \
+           ? (void)++PL_sub_generation         \
+           : mro_method_changed_in(GvSTASH(gv)) \
+    )
 
 #define gv_AVadd(gv) gv_add_by_type((gv), SVt_PVAV)
 #define gv_HVadd(gv) gv_add_by_type((gv), SVt_PVHV)
@@ -256,8 +292,8 @@ Return the SV from the GV.
  * Local variables:
  * c-indentation-style: bsd
  * c-basic-offset: 4
- * indent-tabs-mode: t
+ * indent-tabs-mode: nil
  * End:
  *
- * ex: set ts=8 sts=4 sw=4 noet:
+ * ex: set ts=8 sts=4 sw=4 et:
  */