perl 5.0 alpha 6

[editor's note: cleaned up from the September '94 InfoMagic CD, just
like the last commit]

1 files changed, 193 insertions, 130 deletions

diff --git a/sv.h b/sv.h
index 5ebb337888..ed8acaa491 100644
--- a/sv.h
+++ b/sv.h
@@ -36,109 +36,106 @@ typedef enum {
 	SVt_PVIV,
 	SVt_PVNV,
 	SVt_PVMG,
+	SVt_PVBM,
 	SVt_PVLV,
 	SVt_PVAV,
 	SVt_PVHV,
 	SVt_PVCV,
 	SVt_PVGV,
-	SVt_PVBM,
 	SVt_PVFM,
+	SVt_PVIO,
 } svtype;
 
-/* Compensate for ANSI C misdesign... */
-#ifdef DEBUGGING
-#define SVTYPE svtype
-#else
-#define SVTYPE U8
-#endif
-
 /* Using C's structural equivalence to help emulate C++ inheritance here... */
 
 struct sv {
     void*	sv_any;		/* pointer to something */
     U32		sv_refcnt;	/* how many references to us */
-    SVTYPE	sv_type;	/* what sort of thing pointer points to */
-    U8		sv_flags;	/* extra flags, some depending on type */
-    U8		sv_storage;	/* storage class */
-    U8		sv_private;	/* extra value, depending on type */
+    U32		sv_flags;	/* what we are */
 };
 
 struct gv {
     XPVGV*	sv_any;		/* pointer to something */
     U32		sv_refcnt;	/* how many references to us */
-    SVTYPE	sv_type;	/* what sort of thing pointer points to */
-    U8		sv_flags;	/* extra flags, some depending on type */
-    U8		sv_storage;	/* storage class */
-    U8		sv_private;	/* extra value, depending on type */
+    U32		sv_flags;	/* what we are */
 };
 
 struct cv {
     XPVGV*	sv_any;		/* pointer to something */
     U32		sv_refcnt;	/* how many references to us */
-    SVTYPE	sv_type;	/* what sort of thing pointer points to */
-    U8		sv_flags;	/* extra flags, some depending on type */
-    U8		sv_storage;	/* storage class */
-    U8		sv_private;	/* extra value, depending on type */
+    U32		sv_flags;	/* what we are */
 };
 
 struct av {
     XPVAV*	sv_any;		/* pointer to something */
     U32		sv_refcnt;	/* how many references to us */
-    SVTYPE	sv_type;	/* what sort of thing pointer points to */
-    U8		sv_flags;	/* extra flags, some depending on type */
-    U8		sv_storage;	/* storage class */
-    U8		sv_private;	/* extra value, depending on type */
+    U32		sv_flags;	/* what we are */
 };
 
 struct hv {
     XPVHV*	sv_any;		/* pointer to something */
     U32		sv_refcnt;	/* how many references to us */
-    SVTYPE	sv_type;	/* what sort of thing pointer points to */
-    U8		sv_flags;	/* extra flags, some depending on type */
-    U8		sv_storage;	/* storage class */
-    U8		sv_private;	/* extra value, depending on type */
+    U32		sv_flags;	/* what we are */
+};
+
+struct io {
+    XPVIO*	sv_any;		/* pointer to something */
+    U32		sv_refcnt;	/* how many references to us */
+    U32		sv_flags;	/* what we are */
 };
 
 #define SvANY(sv)	(sv)->sv_any
-#define SvTYPE(sv)	(sv)->sv_type
-#define SvREFCNT(sv)	(sv)->sv_refcnt
 #define SvFLAGS(sv)	(sv)->sv_flags
-#define SvSTORAGE(sv)	(sv)->sv_storage
-#define SvPRIVATE(sv)	(sv)->sv_private
+
+#define SvREFCNT(sv)	(sv)->sv_refcnt
+#ifdef CRIPPLED_CC
+#define SvREFCNT_inc(sv)	sv_newref(sv)
+#define SvREFCNT_dec(sv)	sv_free(sv)
+#else
+#define SvREFCNT_inc(sv)	((Sv = (SV*)(sv)), \
+				    (Sv && ++SvREFCNT(Sv)), (SV*)Sv)
+#define SvREFCNT_dec(sv)	sv_free(sv)
+#endif
+
+#define SVTYPEMASK	0xff
+#define SvTYPE(sv)	((sv)->sv_flags & SVTYPEMASK)
 
 #define SvUPGRADE(sv, mt) (SvTYPE(sv) >= mt || sv_upgrade(sv, mt))
 
-#define SVf_IOK		1		/* has valid integer value */
-#define SVf_NOK		2		/* has valid numeric value */
-#define SVf_POK		4		/* has valid pointer value */
-#define SVf_OOK		8		/* has valid offset value */
-#define SVf_ROK		16		/* has a valid reference pointer */
-#define SVf_OK		32		/* has defined value */
-#define SVf_MAGICAL	64		/* has special methods */
-#define SVf_THINKFIRST	128		/* may not be changed without thought */
-
-#define SVs_PADBUSY	1		/* reserved for tmp or my already */
-#define SVs_PADTMP	2		/* in use as tmp */
-#define SVs_PADMY	4		/* in use a "my" variable */
-#define SVs_8		8
-#define SVs_16		16
-#define SVs_TEMP	32		/* string is stealable? */
-#define SVs_OBJECT	64		/* is "blessed" */
-#define SVs_READONLY	128		/* may not be modified */
-
-#define SVp_IOK		1		/* has valid non-public integer value */
-#define SVp_NOK		2		/* has valid non-public numeric value */
-#define SVp_POK		4		/* has valid non-public pointer value */
-#define SVp_SCREAM	8		/* has been studied? */
-#define SVp_TAINTEDDIR	16		/* PATH component is a security risk */
-
-#define SVpfm_COMPILED	128
-
-#define SVpbm_VALID	128
-#define SVpbm_CASEFOLD	64
-#define SVpbm_TAIL	32
-
-#define SVpgv_MULTI	128
+#define SVs_PADBUSY	0x00000100	/* reserved for tmp or my already */
+#define SVs_PADTMP	0x00000200	/* in use as tmp */
+#define SVs_PADMY	0x00000400	/* in use a "my" variable */
+#define SVs_TEMP	0x00000800	/* string is stealable? */
+#define SVs_OBJECT	0x00001000	/* is "blessed" */
+#define SVs_GMG		0x00002000	/* has magical get method */
+#define SVs_SMG		0x00004000	/* has magical set method */
+#define SVs_RMG		0x00008000	/* has random magical methods */
+
+#define SVf_IOK		0x00010000	/* has valid public integer value */
+#define SVf_NOK		0x00020000	/* has valid public numeric value */
+#define SVf_POK		0x00040000	/* has valid public pointer value */
+#define SVf_ROK		0x00080000	/* has a valid reference pointer */
+#define SVf_OK		0x00100000	/* has defined value */
+#define SVf_OOK		0x00200000	/* has valid offset value */
+#define SVf_BREAK	0x00400000	/* refcnt is artificially low */
+#define SVf_READONLY	0x00800000	/* may not be modified */
+
+#define SVp_IOK		0x01000000	/* has valid non-public integer value */
+#define SVp_NOK		0x02000000	/* has valid non-public numeric value */
+#define SVp_POK		0x04000000	/* has valid non-public pointer value */
+#define SVp_SCREAM	0x08000000	/* has been studied? */
+
+#define PRIVSHIFT 8
+
+/* Some private flags. */
+
+#define SVpfm_COMPILED	0x80000000
+
+#define SVpbm_VALID	0x80000000
+#define SVpbm_CASEFOLD	0x40000000
+#define SVpbm_TAIL	0x20000000
+
+#define SVpgv_MULTI	0x80000000
 
 struct xrv {
     SV *	xrv_rv;		/* pointer to another SV */
@@ -183,6 +180,7 @@ struct xpvlv {
     double	xnv_nv;		/* numeric value, if any */
     MAGIC*	xmg_magic;	/* linked list of magicalness */
     HV*		xmg_stash;	/* class package */
+
     STRLEN	xlv_targoff;
     STRLEN	xlv_targlen;
     SV*		xlv_targ;
@@ -197,6 +195,7 @@ struct xpvgv {
     double	xnv_nv;		/* numeric value, if any */
     MAGIC*	xmg_magic;	/* linked list of magicalness */
     HV*		xmg_stash;	/* class package */
+
     GP*		xgv_gp;
     char*	xgv_name;
     STRLEN	xgv_namelen;
@@ -211,6 +210,7 @@ struct xpvbm {
     double	xnv_nv;		/* numeric value, if any */
     MAGIC*	xmg_magic;	/* linked list of magicalness */
     HV*		xmg_stash;	/* class package */
+
     I32		xbm_useful;	/* is this constant pattern being useful? */
     U16		xbm_previous;	/* how many characters in string before rare? */
     U8		xbm_rare;	/* rarest character in string */
@@ -224,6 +224,7 @@ struct xpvfm {
     double	xnv_nv;		/* numeric value, if any */
     MAGIC*	xmg_magic;	/* linked list of magicalness */
     HV*		xmg_stash;	/* class package */
+
     HV *	xcv_stash;
     OP *	xcv_start;
     OP *	xcv_root;
@@ -236,6 +237,37 @@ struct xpvfm {
     I32		xfm_lines;
 };
 
+struct xpvio {
+    char *	xpv_pv;		/* pointer to malloced string */
+    STRLEN	xpv_cur;	/* length of xpv_pv as a C string */
+    STRLEN	xpv_len;	/* allocated size */
+    I32		xiv_iv;		/* integer value or pv offset */
+    double	xnv_nv;		/* numeric value, if any */
+    MAGIC*	xmg_magic;	/* linked list of magicalness */
+    HV*		xmg_stash;	/* class package */
+
+    FILE *	xio_ifp;	/* ifp and ofp are normally the same */
+    FILE *	xio_ofp;	/* but sockets need separate streams */
+    DIR *	xio_dirp;	/* for opendir, readdir, etc */
+    long	xio_lines;	/* $. */
+    long	xio_page;	/* $% */
+    long	xio_page_len;	/* $= */
+    long	xio_lines_left;	/* $- */
+    char *	xio_top_name;	/* $^ */
+    GV *	xio_top_gv;	/* $^ */
+    char *	xio_fmt_name;	/* $~ */
+    GV *	xio_fmt_gv;	/* $~ */
+    char *	xio_bottom_name;/* $^B */
+    GV *	xio_bottom_gv;	/* $^B */
+    short	xio_subprocess;	/* -| or |- */
+    char	xio_type;
+    char	xio_flags;
+};
+
+#define IOf_ARGV 1	/* this fp iterates over ARGV */
+#define IOf_START 2	/* check for null ARGV and substitute '-' */
+#define IOf_FLUSH 4	/* this fp wants a flush after write op */
+
 /* The following macros define implementation-independent predicates on SVs. */
 
 #define SvNIOK(sv)		(SvFLAGS(sv) & (SVf_IOK|SVf_NOK))
@@ -243,93 +275,107 @@ struct xpvfm {
 #define SvOK(sv)		(SvFLAGS(sv) & SVf_OK)
 #define SvOK_on(sv)		(SvFLAGS(sv) |= SVf_OK)
 #define SvOK_off(sv)		(SvFLAGS(sv) &=				   \
-					~(SVf_IOK|SVf_NOK|SVf_POK|SVf_OK), \
+					~(SVf_IOK|SVf_NOK|SVf_POK|SVf_OK|  \
+					  SVp_IOK|SVp_NOK|SVp_POK|SVf_ROK),\
 					SvOOK_off(sv))
 
-#define SvOKp(sv)		(SvPRIVATE(sv) & (SVp_IOK|SVp_NOK|SVp_POK))
-#define SvIOKp(sv)		(SvPRIVATE(sv) & SVp_IOK)
-#define SvIOKp_on(sv)		(SvOOK_off(sv), SvPRIVATE(sv) |= SVp_IOK)
-#define SvNOKp(sv)		(SvPRIVATE(sv) & SVp_NOK)
-#define SvNOKp_on(sv)		(SvPRIVATE(sv) |= SVp_NOK)
-#define SvPOKp(sv)		(SvPRIVATE(sv) & SVp_POK)
-#define SvPOKp_on(sv)		(SvPRIVATE(sv) |= SVp_POK)
+#define SvOKp(sv)		(SvFLAGS(sv) & (SVp_IOK|SVp_NOK|SVp_POK))
+#define SvIOKp(sv)		(SvFLAGS(sv) & SVp_IOK)
+#define SvIOKp_on(sv)		(SvOOK_off(sv), SvFLAGS(sv) |= SVp_IOK)
+#define SvNOKp(sv)		(SvFLAGS(sv) & SVp_NOK)
+#define SvNOKp_on(sv)		(SvFLAGS(sv) |= SVp_NOK)
+#define SvPOKp(sv)		(SvFLAGS(sv) & SVp_POK)
+#define SvPOKp_on(sv)		(SvFLAGS(sv) |= SVp_POK)
 
 #define SvIOK(sv)		(SvFLAGS(sv) & SVf_IOK)
-#define SvIOK_on(sv)		(SvOOK_off(sv), SvFLAGS(sv) |= (SVf_IOK|SVf_OK))
-#define SvIOK_off(sv)		(SvFLAGS(sv) &= ~SVf_IOK)
-#define SvIOK_only(sv)		(SvOK_off(sv), SvFLAGS(sv) |= (SVf_IOK|SVf_OK))
+#define SvIOK_on(sv)		(SvOOK_off(sv), \
+				    SvFLAGS(sv) |= (SVf_IOK|SVp_IOK|SVf_OK))
+#define SvIOK_off(sv)		(SvFLAGS(sv) &= ~(SVf_IOK|SVp_IOK))
+#define SvIOK_only(sv)		(SvOK_off(sv), \
+				    SvFLAGS(sv) |= (SVf_IOK|SVp_IOK|SVf_OK))
 
 #define SvNOK(sv)		(SvFLAGS(sv) & SVf_NOK)
-#define SvNOK_on(sv)		(SvFLAGS(sv) |= (SVf_NOK|SVf_OK))
-#define SvNOK_off(sv)		(SvFLAGS(sv) &= ~SVf_NOK)
-#define SvNOK_only(sv)		(SvOK_off(sv), SvFLAGS(sv) |= (SVf_NOK|SVf_OK))
+#define SvNOK_on(sv)		(SvFLAGS(sv) |= (SVf_NOK|SVp_NOK|SVf_OK))
+#define SvNOK_off(sv)		(SvFLAGS(sv) &= ~(SVf_NOK|SVp_NOK))
+#define SvNOK_only(sv)		(SvOK_off(sv), \
+				    SvFLAGS(sv) |= (SVf_NOK|SVp_NOK|SVf_OK))
 
 #define SvPOK(sv)		(SvFLAGS(sv) & SVf_POK)
-#define SvPOK_on(sv)		(SvFLAGS(sv) |= (SVf_POK|SVf_OK))
-#define SvPOK_off(sv)		(SvFLAGS(sv) &= ~SVf_POK)
-#define SvPOK_only(sv)		(SvOK_off(sv), SvFLAGS(sv) |= (SVf_POK|SVf_OK))
+#define SvPOK_on(sv)		(SvFLAGS(sv) |= (SVf_POK|SVp_POK|SVf_OK))
+#define SvPOK_off(sv)		(SvFLAGS(sv) &= ~(SVf_POK|SVp_POK))
+#define SvPOK_only(sv)		(SvOK_off(sv), \
+				    SvFLAGS(sv) |= (SVf_POK|SVp_POK|SVf_OK))
 
 #define SvOOK(sv)		(SvFLAGS(sv) & SVf_OOK)
 #define SvOOK_on(sv)		(SvIOK_off(sv), SvFLAGS(sv) |= SVf_OOK)
 #define SvOOK_off(sv)		(SvOOK(sv) && sv_backoff(sv))
 
 #define SvROK(sv)		(SvFLAGS(sv) & SVf_ROK)
-#define SvROK_on(sv)		(SvFLAGS(sv) |= SVf_ROK|SVf_THINKFIRST|SVf_OK)
+#define SvROK_on(sv)		(SvFLAGS(sv) |= SVf_ROK|SVf_OK)
 #define SvROK_off(sv)		(SvFLAGS(sv) &= ~SVf_ROK)
 
-#define SvMAGICAL(sv)		(SvFLAGS(sv) & SVf_MAGICAL)
-#define SvMAGICAL_on(sv)	(SvFLAGS(sv) |= SVf_MAGICAL)
-#define SvMAGICAL_off(sv)	(SvFLAGS(sv) &= ~SVf_MAGICAL)
+#define SvMAGICAL(sv)		(SvFLAGS(sv) & (SVs_GMG|SVs_SMG|SVs_RMG))
+#define SvMAGICAL_on(sv)	(SvFLAGS(sv) |= (SVs_GMG|SVs_SMG|SVs_RMG))
+#define SvMAGICAL_off(sv)	(SvFLAGS(sv) &= ~(SVs_GMG|SVs_SMG|SVs_RMG))
 
-#define SvTHINKFIRST(sv)	(SvFLAGS(sv) & SVf_THINKFIRST)
-#define SvTHINKFIRST_on(sv)	(SvFLAGS(sv) |= SVf_THINKFIRST)
-#define SvTHINKFIRST_off(sv)	(SvFLAGS(sv) &= ~SVf_THINKFIRST)
+#define SvGMAGICAL(sv)		(SvFLAGS(sv) & SVs_GMG)
+#define SvGMAGICAL_on(sv)	(SvFLAGS(sv) |= SVs_GMG)
+#define SvGMAGICAL_off(sv)	(SvFLAGS(sv) &= ~SVs_GMG)
 
-#define SvPADBUSY(sv)		(SvSTORAGE(sv) & SVs_PADBUSY)
+#define SvSMAGICAL(sv)		(SvFLAGS(sv) & SVs_SMG)
+#define SvSMAGICAL_on(sv)	(SvFLAGS(sv) |= SVs_SMG)
+#define SvSMAGICAL_off(sv)	(SvFLAGS(sv) &= ~SVs_SMG)
 
-#define SvPADTMP(sv)		(SvSTORAGE(sv) & SVs_PADTMP)
-#define SvPADTMP_on(sv)		(SvSTORAGE(sv) |= SVs_PADTMP|SVs_PADBUSY)
-#define SvPADTMP_off(sv)	(SvSTORAGE(sv) &= ~SVs_PADTMP)
+#define SvRMAGICAL(sv)		(SvFLAGS(sv) & SVs_RMG)
+#define SvRMAGICAL_on(sv)	(SvFLAGS(sv) |= SVs_RMG)
+#define SvRMAGICAL_off(sv)	(SvFLAGS(sv) &= ~SVs_RMG)
 
-#define SvPADMY(sv)		(SvSTORAGE(sv) & SVs_PADMY)
-#define SvPADMY_on(sv)		(SvSTORAGE(sv) |= SVs_PADMY|SVs_PADBUSY)
+#define SvTHINKFIRST(sv)	(SvFLAGS(sv) & (SVf_ROK|SVf_READONLY))
 
-#define SvTEMP(sv)		(SvSTORAGE(sv) & SVs_TEMP)
-#define SvTEMP_on(sv)		(SvSTORAGE(sv) |= SVs_TEMP)
-#define SvTEMP_off(sv)		(SvSTORAGE(sv) &= ~SVs_TEMP)
+#define SvPADBUSY(sv)		(SvFLAGS(sv) & SVs_PADBUSY)
 
-#define SvOBJECT(sv)		(SvSTORAGE(sv) & SVs_OBJECT)
-#define SvOBJECT_on(sv)		(SvSTORAGE(sv) |= SVs_OBJECT)
-#define SvOBJECT_off(sv)	(SvSTORAGE(sv) &= ~SVs_OBJECT)
+#define SvPADTMP(sv)		(SvFLAGS(sv) & SVs_PADTMP)
+#define SvPADTMP_on(sv)		(SvFLAGS(sv) |= SVs_PADTMP|SVs_PADBUSY)
+#define SvPADTMP_off(sv)	(SvFLAGS(sv) &= ~SVs_PADTMP)
 
-#define SvREADONLY(sv)		(SvSTORAGE(sv) & SVs_READONLY)
-#define SvREADONLY_on(sv)	(SvSTORAGE(sv) |= SVs_READONLY, \
-					SvTHINKFIRST_on(sv))
-#define SvREADONLY_off(sv)	(SvSTORAGE(sv) &= ~SVs_READONLY)
+#define SvPADMY(sv)		(SvFLAGS(sv) & SVs_PADMY)
+#define SvPADMY_on(sv)		(SvFLAGS(sv) |= SVs_PADMY|SVs_PADBUSY)
 
-#define SvSCREAM(sv)		(SvPRIVATE(sv) & SVp_SCREAM)
-#define SvSCREAM_on(sv)		(SvPRIVATE(sv) |= SVp_SCREAM)
-#define SvSCREAM_off(sv)	(SvPRIVATE(sv) &= ~SVp_SCREAM)
+#define SvTEMP(sv)		(SvFLAGS(sv) & SVs_TEMP)
+#define SvTEMP_on(sv)		(SvFLAGS(sv) |= SVs_TEMP)
+#define SvTEMP_off(sv)		(SvFLAGS(sv) &= ~SVs_TEMP)
 
-#define SvCOMPILED(sv)		(SvPRIVATE(sv) & SVpfm_COMPILED)
-#define SvCOMPILED_on(sv)	(SvPRIVATE(sv) |= SVpfm_COMPILED)
-#define SvCOMPILED_off(sv)	(SvPRIVATE(sv) &= ~SVpfm_COMPILED)
+#define SvOBJECT(sv)		(SvFLAGS(sv) & SVs_OBJECT)
+#define SvOBJECT_on(sv)		(SvFLAGS(sv) |= SVs_OBJECT)
+#define SvOBJECT_off(sv)	(SvFLAGS(sv) &= ~SVs_OBJECT)
 
-#define SvTAIL(sv)		(SvPRIVATE(sv) & SVpbm_TAIL)
-#define SvTAIL_on(sv)		(SvPRIVATE(sv) |= SVpbm_TAIL)
-#define SvTAIL_off(sv)		(SvPRIVATE(sv) &= ~SVpbm_TAIL)
+#define SvREADONLY(sv)		(SvFLAGS(sv) & SVf_READONLY)
+#define SvREADONLY_on(sv)	(SvFLAGS(sv) |= SVf_READONLY)
+#define SvREADONLY_off(sv)	(SvFLAGS(sv) &= ~SVf_READONLY)
 
-#define SvCASEFOLD(sv)		(SvPRIVATE(sv) & SVpbm_CASEFOLD)
-#define SvCASEFOLD_on(sv)	(SvPRIVATE(sv) |= SVpbm_CASEFOLD)
-#define SvCASEFOLD_off(sv)	(SvPRIVATE(sv) &= ~SVpbm_CASEFOLD)
+#define SvSCREAM(sv)		(SvFLAGS(sv) & SVp_SCREAM)
+#define SvSCREAM_on(sv)		(SvFLAGS(sv) |= SVp_SCREAM)
+#define SvSCREAM_off(sv)	(SvFLAGS(sv) &= ~SVp_SCREAM)
 
-#define SvVALID(sv)		(SvPRIVATE(sv) & SVpbm_VALID)
-#define SvVALID_on(sv)		(SvPRIVATE(sv) |= SVpbm_VALID)
-#define SvVALID_off(sv)		(SvPRIVATE(sv) &= ~SVpbm_VALID)
+#define SvCOMPILED(sv)		(SvFLAGS(sv) & SVpfm_COMPILED)
+#define SvCOMPILED_on(sv)	(SvFLAGS(sv) |= SVpfm_COMPILED)
+#define SvCOMPILED_off(sv)	(SvFLAGS(sv) &= ~SVpfm_COMPILED)
 
-#define SvMULTI(sv)		(SvPRIVATE(sv) & SVpgv_MULTI)
-#define SvMULTI_on(sv)		(SvPRIVATE(sv) |= SVpgv_MULTI)
-#define SvMULTI_off(sv)		(SvPRIVATE(sv) &= ~SVpgv_MULTI)
+#define SvTAIL(sv)		(SvFLAGS(sv) & SVpbm_TAIL)
+#define SvTAIL_on(sv)		(SvFLAGS(sv) |= SVpbm_TAIL)
+#define SvTAIL_off(sv)		(SvFLAGS(sv) &= ~SVpbm_TAIL)
+
+#define SvCASEFOLD(sv)		(SvFLAGS(sv) & SVpbm_CASEFOLD)
+#define SvCASEFOLD_on(sv)	(SvFLAGS(sv) |= SVpbm_CASEFOLD)
+#define SvCASEFOLD_off(sv)	(SvFLAGS(sv) &= ~SVpbm_CASEFOLD)
+
+#define SvVALID(sv)		(SvFLAGS(sv) & SVpbm_VALID)
+#define SvVALID_on(sv)		(SvFLAGS(sv) |= SVpbm_VALID)
+#define SvVALID_off(sv)		(SvFLAGS(sv) &= ~SVpbm_VALID)
+
+#define SvMULTI(sv)		(SvFLAGS(sv) & SVpgv_MULTI)
+#define SvMULTI_on(sv)		(SvFLAGS(sv) |= SVpgv_MULTI)
+#define SvMULTI_off(sv)		(SvFLAGS(sv) &= ~SVpgv_MULTI)
 
 #define SvRV(sv) ((XRV*)  SvANY(sv))->xrv_rv
 #define SvRVx(sv) SvRV(sv)
@@ -344,7 +390,7 @@ struct xpvfm {
 #define SvLEN(sv) ((XPV*)  SvANY(sv))->xpv_len
 #define SvLENx(sv) SvLEN(sv)
 #define SvEND(sv)(((XPV*)  SvANY(sv))->xpv_pv + ((XPV*)SvANY(sv))->xpv_cur)
-#define SvENDx(sv) ((Sv = sv), SvEND(Sv))
+#define SvENDx(sv) ((Sv = (sv)), SvEND(Sv))
 #define SvMAGIC(sv)	((XPVMG*)  SvANY(sv))->xmg_magic
 #define SvSTASH(sv)	((XPVMG*)  SvANY(sv))->xmg_stash
 
@@ -380,6 +426,23 @@ struct xpvfm {
 #define LvTARGOFF(sv)	((XPVLV*)  SvANY(sv))->xlv_targoff
 #define LvTARGLEN(sv)	((XPVLV*)  SvANY(sv))->xlv_targlen
 
+#define IoIFP(sv)	((XPVIO*)  SvANY(sv))->xio_ifp
+#define IoOFP(sv)	((XPVIO*)  SvANY(sv))->xio_ofp
+#define IoDIRP(sv)	((XPVIO*)  SvANY(sv))->xio_dirp
+#define IoLINES(sv)	((XPVIO*)  SvANY(sv))->xio_lines
+#define IoPAGE(sv)	((XPVIO*)  SvANY(sv))->xio_page
+#define IoPAGE_LEN(sv)	((XPVIO*)  SvANY(sv))->xio_page_len
+#define IoLINES_LEFT(sv)((XPVIO*)  SvANY(sv))->xio_lines_left
+#define IoTOP_NAME(sv)	((XPVIO*)  SvANY(sv))->xio_top_name
+#define IoTOP_GV(sv)	((XPVIO*)  SvANY(sv))->xio_top_gv
+#define IoFMT_NAME(sv)	((XPVIO*)  SvANY(sv))->xio_fmt_name
+#define IoFMT_GV(sv)	((XPVIO*)  SvANY(sv))->xio_fmt_gv
+#define IoBOTTOM_NAME(sv)((XPVIO*) SvANY(sv))->xio_bottom_name
+#define IoBOTTOM_GV(sv)	((XPVIO*)  SvANY(sv))->xio_bottom_gv
+#define IoSUBPROCESS(sv)((XPVIO*)  SvANY(sv))->xio_subprocess
+#define IoTYPE(sv)	((XPVIO*)  SvANY(sv))->xio_type
+#define IoFLAGS(sv)	((XPVIO*)  SvANY(sv))->xio_flags
+
 #define SvTAINT(sv) if (tainting && tainted) sv_magic(sv, 0, 't', 0, 0)
 
 #ifdef CRIPPLED_CC
@@ -404,7 +467,9 @@ I32 SvTRUE();
 #define SvPV(sv, lp) (SvPOK(sv) ? ((lp = SvCUR(sv)), SvPVX(sv)) : sv_2pv(sv, &lp))
 
 #define SvTRUE(sv) (						\
-	SvPOK(sv)						\
+    !sv								\
+    ? 0								\
+    :    SvPOK(sv)						\
 	?   ((Xpv = (XPV*)SvANY(sv)) &&				\
 	     (*Xpv->xpv_pv > '0' ||				\
 	      Xpv->xpv_cur > 1 ||				\
@@ -418,16 +483,16 @@ I32 SvTRUE();
 		? SvNVX(sv) != 0.0				\
 		: sv_2bool(sv) )
 
-#define SvIVx(sv) ((Sv = sv), SvIV(Sv))
-#define SvNVx(sv) ((Sv = sv), SvNV(Sv))
-#define SvPVx(sv, lp) ((Sv = sv), SvPV(Sv, lp))
-#define SvTRUEx(sv) ((Sv = sv), SvTRUE(Sv))
+#define SvIVx(sv) ((Sv = (sv)), SvIV(Sv))
+#define SvNVx(sv) ((Sv = (sv)), SvNV(Sv))
+#define SvPVx(sv, lp) ((Sv = (sv)), SvPV(Sv, lp))
+#define SvTRUEx(sv) ((Sv = (sv)), SvTRUE(Sv))
 
 #endif /* CRIPPLED_CC */
 
 /* the following macro updates any magic values this sv is associated with */
 
-#define SvSETMAGIC(x) if (SvMAGICAL(x)) mg_set(x)
+#define SvSETMAGIC(x) if (SvSMAGICAL(x)) mg_set(x)
 
 #define SvSetSV(dst,src) if (dst != src) sv_setsv(dst,src)
 
@@ -435,8 +500,6 @@ I32 SvTRUE();
 
 #define isGV(sv) (SvTYPE(sv) == SVt_PVGV)
 
-#define GROWSTR(pp,lp,len) if (*(lp) < (len)) pv_grow(pp, lp, (len) * 3 / 2)
-
 #ifndef DOSISH
 #  define SvGROW(sv,len) if (SvLEN(sv) < (len)) sv_grow(sv,len)
 #  define Sv_Grow sv_grow