X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=av.h;h=06ecc7a656027f1ffb90a53081c5ae49ffd9734d;hb=a662d730755bd4763502de042ac949ef3a7a71ae;hp=488e098544de855d93b34780182d647e96c6358a;hpb=209b62a30de35b357c434b3ec3b38cb713369ba5;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/av.h b/av.h
index 488e098..06ecc7a 100644
--- a/av.h
+++ b/av.h
@@ -1,7 +1,7 @@
 /*    av.h
  *
  *    Copyright (C) 1991, 1992, 1993, 1995, 1996, 1997, 1998, 1999,
- *    2000, 2001, 2002, 2005, by Larry Wall and others
+ *    2000, 2001, 2002, 2005, 2006, 2007, 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.
@@ -9,55 +9,62 @@
  */
 
 struct xpvav {
-    IV		this_space;
-    SSize_t	xav_fill;       /* Index of last element present */
-    SSize_t	xav_max;        /* max index for which array has space */
     union {
+	NV	xnv_nv;		/* numeric value, if any */
+	HV *	xgv_stash;
+	struct {
+	    U32	xlow;
+	    U32	xhigh;
+	}	xpad_cop_seq;	/* used by pad.c for cop_sequence */
 	struct {
-	    void *xnv_p1;	/* pointer to beginning of C array of SVs */
-	    union {
-		void *xnv_p2;
-		IV xnv_i2;
-	    }	xnv_u2;
-	}	xnv_s;
-	NV	xnvu_nv;
+	    U32 xbm_previous;	/* how many characters in string before rare? */
+	    U8	xbm_flags;
+	    U8	xbm_rare;	/* rarest character in string */
+	}	xbm_s;		/* fields from PVBM */
     }		xnv_u;
-    MAGIC*	xmg_magic;	/* magic for scalar array */
+    SSize_t	xav_fill;       /* Index of last element present */
+    SSize_t	xav_max;        /* max index for which array has space */
+    union {
+	IV	xivu_iv;	/* integer value or pv offset */
+	UV	xivu_uv;
+	void *	xivu_p1;
+	I32	xivu_i32;
+	HEK *	xivu_namehek;
+    }		xiv_u;
+    union {
+	MAGIC*	xmg_magic;	/* linked list of magicalness */
+	HV*	xmg_ourstash;	/* Stash for our (when SvPAD_OUR is true) */
+    } xmg_u;
     HV*		xmg_stash;	/* class package */
 };
 
-#if !defined(PERL_EXPERIMENTAL_LAYOUT)
-typedef struct xpvav xpvav_allocated;
-#else
 typedef struct {
     SSize_t	xav_fill;       /* Index of last element present */
     SSize_t	xav_max;        /* max index for which array has space */
     union {
-	NV	xnvu_nv;
-	struct {
-	    void *xnv_p1;	/* pointer to beginning of C array of SVs */
-	    union {
-		void *xnv_p2;
-		IV xnv_i2;
-	    }	xnv_u2;
-	}	xnv_s;
-    }		xnv_u;
-    MAGIC*	xmg_magic;	/* magic for scalar array */
+	IV	xivu_iv;	/* integer value or pv offset */
+	UV	xivu_uv;
+	void *	xivu_p1;
+	I32	xivu_i32;
+	HEK *	xivu_namehek;
+    }		xiv_u;
+    union {
+	MAGIC*	xmg_magic;	/* linked list of magicalness */
+	HV*	xmg_ourstash;	/* Stash for our (when SvPAD_OUR is true) */
+    } xmg_u;
     HV*		xmg_stash;	/* class package */
 } xpvav_allocated;
-#endif
 
 /* SV**	xav_alloc; */
-#define xav_alloc xnv_u.xnv_s.xnv_p1
+#define xav_alloc xiv_u.xivu_p1
 /* SV*	xav_arylen; */
-#define xav_arylen xnv_u.xnv_s.xnv_u2.xnv_p2
 
-/* AVf_REAL is set for all AVs whose xav_array contents are refcounted.
+/* SVpav_REAL is set for all AVs whose xav_array contents are refcounted.
  * Some things like "@_" and the scratchpad list do not set this, to
  * indicate that they are cheating (for efficiency) by not refcounting
  * the AV's contents.
  * 
- * AVf_REIFY is only meaningful on such "fake" AVs (i.e. where AVf_REAL
+ * SVpav_REIFY is only meaningful on such "fake" AVs (i.e. where SVpav_REAL
  * is not set).  It indicates that the fake AV is capable of becoming
  * real if the array needs to be modified in some way.  Functions that
  * modify fake AVs check both flags to call av_reify() as appropriate.
@@ -86,11 +93,11 @@ Same as C<av_len()>.  Deprecated, use C<av_len()> instead.
 
 #define Nullav Null(AV*)
 
-#define AvARRAY(av)	((av)->sv_u.sv_array)
+#define AvARRAY(av)	((av)->sv_u.svu_array)
 #define AvALLOC(av)	(*((SV***)&((XPVAV*)  SvANY(av))->xav_alloc))
 #define AvMAX(av)	((XPVAV*)  SvANY(av))->xav_max
 #define AvFILLp(av)	((XPVAV*)  SvANY(av))->xav_fill
-#define AvARYLEN(av)	(*((SV**)&((XPVAV*)  SvANY(av))->xav_arylen))
+#define AvARYLEN(av)	(*Perl_av_arylen_p(aTHX_ (AV*)av))
 
 #define AvREAL(av)	(SvFLAGS(av) & SVpav_REAL)
 #define AvREAL_on(av)	(SvFLAGS(av) |= SVpav_REAL)