From: Nicholas Clark Date: Sun, 22 May 2005 22:03:19 +0000 (+0000) Subject: Re-order IVX slot in SV bodies X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=102d3b8a62934b6c124acd38fad140f94f743df1;p=p5sagit%2Fp5-mst-13.2.git Re-order IVX slot in SV bodies p4raw-id: //depot/perl@24542 --- diff --git a/av.h b/av.h index 486bc5c..f9721d9 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,9 +9,9 @@ */ 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 */ - IV this_space; union { NV xnvu_nv; struct { @@ -86,3 +86,13 @@ Same as C. Deprecated, use C 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: + */ diff --git a/cv.h b/cv.h index ac9d861..4f9fb94 100644 --- a/cv.h +++ b/cv.h @@ -1,7 +1,7 @@ /* cv.h * * Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1999, - * 2000, 2001, 2002, 2003, 2004, by Larry Wall and others + * 2000, 2001, 2002, 2003, 2004, 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. @@ -12,9 +12,9 @@ * in sv.h */ struct xpvcv { + IV awaiting_redevelopment; /* integer value */ STRLEN xpv_cur; /* length of xp_pv as a C string */ STRLEN xpv_len; /* allocated size */ - IV xof_off; /* integer value */ union { NV xnvu_nv; /* numeric value, if any */ struct { @@ -213,3 +213,13 @@ should print 123: =cut */ + +/* + * Local variables: + * c-indentation-style: bsd + * c-basic-offset: 4 + * indent-tabs-mode: t + * End: + * + * ex: set ts=8 sts=4 sw=4 noet: + */ diff --git a/hv.h b/hv.h index 60d2eed..e0dd646 100644 --- a/hv.h +++ b/hv.h @@ -42,9 +42,9 @@ struct xpvhv_aux { /* hash structure: */ /* This structure must match the beginning of struct xpvmg in sv.h. */ struct xpvhv { + IV for_rent; STRLEN xhv_fill; /* how full xhv_array currently is */ STRLEN xhv_max; /* subscript of last element of xhv_array */ - IV for_rent; union { NV xnvu_nv; /* numeric value, if any */ struct { diff --git a/sv.h b/sv.h index 5f4a262..518621d 100644 --- a/sv.h +++ b/sv.h @@ -275,26 +275,27 @@ perform the upgrade if necessary. See C. #define SVpav_REIFY 0x80000000 /* can become real */ struct xpv { + IV xpv_dummy; /* This isn't allocated. */ STRLEN xpv_cur; /* length of sv_pv as a C string */ STRLEN xpv_len; /* allocated size */ }; struct xpviv { + IV xiv_iv; /* integer value or pv offset */ STRLEN xpv_cur; /* length of sv_pv as a C string */ STRLEN xpv_len; /* allocated size */ - IV xiv_iv; /* integer value or pv offset */ }; struct xpvuv { + UV xuv_uv; /* unsigned value or pv offset */ STRLEN xpv_cur; /* length of sv_pv as a C string */ STRLEN xpv_len; /* allocated size */ - UV xuv_uv; /* unsigned value or pv offset */ }; struct xpvnv { + IV xiv_iv; /* integer value or pv offset */ STRLEN xpv_cur; /* length of sv_pv as a C string */ STRLEN xpv_len; /* allocated size */ - IV xiv_iv; /* integer value or pv offset */ union { NV xnvu_nv; /* numeric value, if any */ struct { @@ -311,9 +312,9 @@ struct xpvnv { /* These structure must match the beginning of struct xpvhv in hv.h. */ struct xpvmg { + IV xiv_iv; /* integer value or pv offset */ STRLEN xpv_cur; /* length of sv_pv as a C string */ STRLEN xpv_len; /* allocated size */ - IV xiv_iv; /* integer value or pv offset */ union { NV xnvu_nv; /* numeric value, if any */ struct { @@ -329,9 +330,9 @@ struct xpvmg { }; struct xpvlv { + IV xiv_iv; /* integer value or pv offset */ STRLEN xpv_cur; /* length of sv_pv as a C string */ STRLEN xpv_len; /* allocated size */ - IV xiv_iv; /* integer value or pv offset */ union { NV xnvu_nv; /* numeric value, if any */ struct { @@ -360,9 +361,9 @@ struct xpvlv { }; struct xpvgv { + IV xiv_iv; /* integer value or pv offset */ STRLEN xpv_cur; /* length of sv_pv as a C string */ STRLEN xpv_len; /* allocated size */ - IV xiv_iv; /* integer value or pv offset */ union { NV xnvu_nv; /* numeric value, if any */ struct { @@ -384,9 +385,9 @@ struct xpvgv { }; struct xpvbm { + IV xiv_iv; /* integer value or pv offset */ STRLEN xpv_cur; /* length of sv_pv as a C string */ STRLEN xpv_len; /* allocated size */ - IV xiv_iv; /* integer value or pv offset */ union { NV xnvu_nv; /* numeric value, if any */ struct { @@ -410,9 +411,9 @@ struct xpvbm { typedef U16 cv_flags_t; struct xpvfm { + IV xiv_iv; /* integer value or pv offset */ STRLEN xpv_cur; /* length of sv_pv as a C string */ STRLEN xpv_len; /* allocated size */ - IV xiv_iv; /* integer value or pv offset */ union { NV xnvu_nv; /* numeric value, if any */ struct { @@ -444,9 +445,9 @@ struct xpvfm { }; struct xpvio { + IV xiv_iv; /* integer value or pv offset */ STRLEN xpv_cur; /* length of sv_pv as a C string */ STRLEN xpv_len; /* allocated size */ - IV xiv_iv; /* integer value or pv offset */ union { NV xnvu_nv; /* numeric value, if any */ struct { @@ -1487,3 +1488,13 @@ struct clone_params { UV flags; PerlInterpreter *proto_perl; }; + +/* + * Local variables: + * c-indentation-style: bsd + * c-basic-offset: 4 + * indent-tabs-mode: t + * End: + * + * ex: set ts=8 sts=4 sw=4 noet: + */