Abstract the specific use of SvCUR in GVs for detecting variables on

[perl5.git] / gv.h

diff --git a/gv.h b/gv.h
index aab0b31..81a42cf 100644 (file)
--- a/gv.h
+++ b/gv.h
@@ -24,22 +24,49 @@ struct gp {
 
 #define GvXPVGV(gv)    ((XPVGV*)SvANY(gv))
 
-/* MSVC++ 6.0 (_MSC_VER == 1200) can't compile pp_hot.c with DEBUGGING enabled
- * if we include the following assert(). Must be a compiler bug because it
- * works fine with MSVC++ 7.0.  Borland (5.5.1) has the same problem. */
-#if defined(DEBUGGING) && \
-    ((!defined(_MSC_VER) || _MSC_VER > 1200) && !defined(__BORLANDC__))
-#  define GvGP(gv)     (*(assert(SvTYPE(gv) == SVt_PVGV || \
-                                 SvTYPE(gv) == SVt_PVLV), \
-                          &(GvXPVGV(gv)->xgv_gp)))
+
+#if defined (DEBUGGING) && defined(__GNUC__) && !defined(PERL_GCC_BRACE_GROUPS_FORBIDDEN)
+#  define GvGP(gv)                                                     \
+       (*({GV *const shplep = (GV *) gv;                               \
+           assert(SvTYPE(shplep) == SVt_PVGV ||                        \
+           SvTYPE(shplep) == SVt_PVLV);                                \
+           assert(isGV_with_GP(shplep));                               \
+           &((shplep)->sv_u.svu_gp);}))
+#  define GvFLAGS(gv)                                                  \
+       (*({GV *const yaah  = (GV *) gv;                                \
+           assert(SvTYPE(yaah) == SVt_PVGV || SvTYPE(yaah) == SVt_PVLV); \
+           assert(isGV_with_GP(yaah));                                 \
+           &(GvXPVGV(yaah)->xgv_flags);}))
+#  define GvSTASH(gv)                                                  \
+       (*({ GV *_gv = (GV *) gv;                                       \
+           assert(isGV_with_GP(_gv));                                  \
+           assert(SvTYPE(_gv) == SVt_PVGV || SvTYPE(_gv) >= SVt_PVLV); \
+           &(GvXPVGV(_gv)->xnv_u.xgv_stash);                           \
+        }))
+#  define GvNAME(gv)                                                   \
+       (*({ GV *zzzz = (GV *) gv;                                      \
+           assert(isGV_with_GP(zzzz));                                 \
+           assert(SvTYPE(zzzz) == SVt_PVGV || SvTYPE(zzzz) >= SVt_PVLV); \
+           &(GvXPVGV(zzzz)->xgv_name);                                 \
+        }))
+#  define GvNAMELEN(gv)                                                        \
+       (*({ GV *glank = (GV *) gv;                                     \
+           assert(isGV_with_GP(glank));                                \
+           assert(SvTYPE(glank) == SVt_PVGV || SvTYPE(glank) >= SVt_PVLV); \
+           &(GvXPVGV(glank)->xgv_namelen);                             \
+        }))
 #else
-#  define GvGP(gv)     (GvXPVGV(gv)->xgv_gp)
+#  define GvGP(gv)     ((gv)->sv_u.svu_gp)
+#  define GvFLAGS(gv)  (GvXPVGV(gv)->xgv_flags)
+#  define GvSTASH(gv)  (GvXPVGV(gv)->xnv_u.xgv_stash)
+#  define GvNAME(gv)   (GvXPVGV(gv)->xgv_name)
+#  define GvNAMELEN(gv)        (GvXPVGV(gv)->xgv_namelen)
 #endif
 
-#define GvNAME(gv)     (GvXPVGV(gv)->xgv_name)
-#define GvNAMELEN(gv)  (GvXPVGV(gv)->xgv_namelen)
-#define GvSTASH(gv)    (GvXPVGV(gv)->xgv_stash)
-#define GvFLAGS(gv)    (GvXPVGV(gv)->xgv_flags)
+#define        GvASSIGN_GENERATION(gv)         (0 + ((XPV*) SvANY(gv))->xpv_cur)
+#define        GvASSIGN_GENERATION_set(gv,val)                 \
+       STMT_START { assert(SvTYPE(gv) == SVt_PVGV);    \
+               (((XPV*) SvANY(gv))->xpv_cur = (val)); } STMT_END
 
 /*
 =head1 GV Functions
@@ -82,7 +109,7 @@ Return the SV from the GV.
 
 #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 GvCVu(gv)      (GvGP(gv)->gp_cvgen ? NULL : GvGP(gv)->gp_cv)
 
 #define GvLINE(gv)     (GvGP(gv)->gp_line)
 #define GvFILE(gv)     (GvGP(gv)->gp_file)
@@ -171,6 +198,8 @@ Return the SV from the GV.
 #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 */
 #define GV_NOEXPAND    0x40    /* Don't expand SvOK() entries to PVGV */
+#define GV_NOTQUAL     0x80    /* A plain symbol name, not qualified with a
+                                  package (so skip checks for :: and ')  */
 
 /*      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.