X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=av.h;h=83a93cf1e1a01f8ab4ce37426bdf8f0df88af7c3;hb=b91ed0194cb2707fc4bb2619e1294e4287626407;hp=186ec35905e065c613165377fda6fd5ba050f7ab;hpb=7b2c381cf37e4e4611c4a864b5d6f7134344e3e6;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/av.h b/av.h
index 186ec35..83a93cf 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, by Larry Wall and others
+ *    2000, 2001, 2002, 2005, 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,17 +9,37 @@
  */
 
 struct xpvav {
+    NV		xnv_nv;		/* numeric value, if any */
     SSize_t	xav_fill;       /* Index of last element present */
     SSize_t	xav_max;        /* max index for which array has space */
-    IV		xof_off;	/* ptr is incremented by offset */
-    NV		xnv_nv;		/* numeric value, if any */
+    union {
+	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 */
-
-    SV**	xav_alloc;	/* pointer to beginning of C array of SVs */
-    SV*		xav_arylen;
 };
 
+#if 0
+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 {
+	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 */
+} xpvav_allocated;
+#endif
+
+/* SV**	xav_alloc; */
+#define xav_alloc xiv_u.xivu_p1
+/* SV*	xav_arylen; */
 
 /* AVf_REAL is set for all AVs whose xav_array contents are refcounted.
  * Some things like "@_" and the scratchpad list do not set this, to
@@ -55,11 +75,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 AvALLOC(av)	((XPVAV*)  SvANY(av))->xav_alloc
+#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)	((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)
@@ -76,3 +96,13 @@ Same as C<av_len()>.  Deprecated, use C<av_len()> instead.
 			  ? mg_size((SV *) av) : AvFILLp(av))
 
 #define NEGATIVE_INDICES_VAR "NEGATIVE_INDICES"
+
+/*
+ * Local variables:
+ * c-indentation-style: bsd
+ * c-basic-offset: 4
+ * indent-tabs-mode: t
+ * End:
+ *
+ * ex: set ts=8 sts=4 sw=4 noet:
+ */