xcv_start and xcv_xsubany can be merged into a union, as they are never

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

diff --git a/cv.h b/cv.h
index ba8364b..d082146 100644 (file)
--- a/cv.h
+++ b/cv.h
@@ -1,38 +1,34 @@
 /*    cv.h
  *
  *    Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1999,
- *    2000, 2001, 2002, 2003, 2004, 2005, by Larry Wall and others
+ *    2000, 2001, 2002, 2003, 2004, 2005, 2006, by Larry Wall and others
  *
  *    You may distribute under the terms of either the GNU General Public
  *    License or the Artistic License, as specified in the README file.
  *
  */
 
-/* This structure must match XPVCV in B/C.pm and the beginning of XPVFM
- * in sv.h  */
+/* This structure must the beginning of XPVFM in sv.h  */
 
 struct xpvcv {
-    IV         awaiting_redevelopment; /* integer value */
+    NV         xnv_nv;         /* numeric value, if any */
     STRLEN     xpv_cur;        /* length of xp_pv as a C string */
     STRLEN     xpv_len;        /* allocated size */
     union {
-       struct {
-           void *xnv_p1;
-           union {
-               void *xnv_p2;
-               IV xnv_i2;
-           }   xnv_u2;
-       }       xnv_s;
-       NV      xnvu_nv;        /* numeric value, if any */
-    }          xnv_u;
+       IV      xivu_iv;        /* integer value or pv offset */
+       UV      xivu_uv;
+       void *  xivu_p1;
+    }          xiv_u;
     MAGIC*     xmg_magic;      /* magic for scalar array */
     HV*                xmg_stash;      /* class package */
 
     HV *       xcv_stash;
-    OP *       xcv_start;
+    union {
+       OP *    xcv_start;
+       ANY     xcv_xsubany;
+    }          xcv_start_u;
     OP *       xcv_root;
     void       (*xcv_xsub) (pTHX_ CV*);
-    ANY                xcv_xsubany;
     GV *       xcv_gv;
     char *     xcv_file;
     long       xcv_depth;      /* >= 2 indicates recursive call */
@@ -61,10 +57,10 @@ Returns the stash of the CV.
 #define Nullcv Null(CV*)
 
 #define CvSTASH(sv)    ((XPVCV*)SvANY(sv))->xcv_stash
-#define CvSTART(sv)    ((XPVCV*)SvANY(sv))->xcv_start
+#define CvSTART(sv)    ((XPVCV*)SvANY(sv))->xcv_start_u.xcv_start
 #define CvROOT(sv)     ((XPVCV*)SvANY(sv))->xcv_root
 #define CvXSUB(sv)     ((XPVCV*)SvANY(sv))->xcv_xsub
-#define CvXSUBANY(sv)  ((XPVCV*)SvANY(sv))->xcv_xsubany
+#define CvXSUBANY(sv)  ((XPVCV*)SvANY(sv))->xcv_start_u.xcv_xsubany
 #define CvGV(sv)       ((XPVCV*)SvANY(sv))->xcv_gv
 #define CvFILE(sv)     ((XPVCV*)SvANY(sv))->xcv_file
 #ifdef USE_ITHREADS
@@ -79,22 +75,23 @@ Returns the stash of the CV.
 #define CvFLAGS(sv)    ((XPVCV*)SvANY(sv))->xcv_flags
 #define CvOUTSIDE_SEQ(sv) ((XPVCV*)SvANY(sv))->xcv_outside_seq
 
-#define CVf_CLONE      0x0001  /* anon CV uses external lexicals */
-#define CVf_CLONED     0x0002  /* a clone of one of those */
-#define CVf_ANON       0x0004  /* CvGV() can't be trusted */
-#define CVf_OLDSTYLE   0x0008
-#define CVf_UNIQUE     0x0010  /* sub is only called once (eg PL_main_cv,
+#define CVf_METHOD     0x0001  /* CV is explicitly marked as a method */
+#define CVf_LOCKED     0x0002  /* CV locks itself or first arg on entry */
+#define CVf_LVALUE     0x0004  /* CV return value can be used as lvalue */
+#define CVf_ASSERTION   0x0008  /* CV called only when asserting */
+
+#define CVf_WEAKOUTSIDE        0x0010  /* CvOUTSIDE isn't ref counted */
+#define CVf_CLONE      0x0020  /* anon CV uses external lexicals */
+#define CVf_CLONED     0x0040  /* a clone of one of those */
+#define CVf_ANON       0x0080  /* CvGV() can't be trusted */
+#define CVf_UNIQUE     0x0100  /* sub is only called once (eg PL_main_cv,
                                 * require, eval). Not to be confused
                                 * with the GVf_UNIQUE flag associated
                                 * with the :unique attribute */
-#define CVf_NODEBUG    0x0020  /* no DB::sub indirection for this CV
+#define CVf_NODEBUG    0x0200  /* no DB::sub indirection for this CV
                                   (esp. useful for special XSUBs) */
-#define CVf_METHOD     0x0040  /* CV is explicitly marked as a method */
-#define CVf_LOCKED     0x0080  /* CV locks itself or first arg on entry */
-#define CVf_LVALUE     0x0100  /* CV return value can be used as lvalue */
-#define CVf_CONST      0x0200  /* inlinable sub */
-#define CVf_WEAKOUTSIDE        0x0400  /* CvOUTSIDE isn't ref counted */
-#define CVf_ASSERTION   0x0800  /* CV called only when asserting */
+#define CVf_CONST      0x0400  /* inlinable sub */
+#define CVf_OLDSTYLE   0x0800
 
 /* This symbol for optimised communication between toke.c and op.c: */
 #define CVf_BUILTIN_ATTRS      (CVf_METHOD|CVf_LOCKED|CVf_LVALUE|CVf_ASSERTION)
@@ -158,7 +155,7 @@ Returns the stash of the CV.
 #define CvWEAKOUTSIDE_on(cv)   (CvFLAGS(cv) |= CVf_WEAKOUTSIDE)
 #define CvWEAKOUTSIDE_off(cv)  (CvFLAGS(cv) &= ~CVf_WEAKOUTSIDE)
 
-
+#define CvISXSUB(cv)           (CvXSUB(cv) ? TRUE : FALSE)
 /*
 =head1 CV reference counts and CvOUTSIDE
 
@@ -175,7 +172,7 @@ C<CvWEAKOUTSIDE> flag in the child. This allows us to determine under what
 circumstances we should decrement the refcount of the parent when freeing
 the child.
 
-There is a further complication with non-closure anonymous subs (ie those
+There is a further complication with non-closure anonymous subs (i.e. those
 that do not refer to any lexicals outside that sub). In this case, the
 anonymous prototype is shared rather than being cloned. This has the
 consequence that the parent may be freed while there are still active