X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=sv.h;h=47a9fd39d8f5d4776f17a33284085304523c18a8;hb=d83e3bda142ab17f4cd2633e1fb9f48644dabcbf;hp=0bf897c59e75bdf6d2a9fab56f0f3780e25051e7;hpb=748a93069b3d16374a9859d1456065dd3ae11394;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/sv.h b/sv.h
index 0bf897c..47a9fd3 100644
--- a/sv.h
+++ b/sv.h
@@ -45,7 +45,7 @@ struct gv {
 };
 
 struct cv {
-    XPVGV*	sv_any;		/* pointer to something */
+    XPVCV*	sv_any;		/* pointer to something */
     U32		sv_refcnt;	/* how many references to us */
     U32		sv_flags;	/* what we are */
 };
@@ -129,11 +129,8 @@ struct io {
 #define SVpbm_CASEFOLD	0x40000000
 #define SVpbm_TAIL	0x20000000
 
-#define SVpgv_MULTI	0x80000000
-
-#define SVpcv_CLONE	0x80000000	/* anon CV uses external lexicals */
-#define SVpcv_CLONED	0x40000000	/* a clone of one of those */
-#define SVpcv_ANON	0x20000000	/* CvGV() can't be trusted */
+#define SVphv_SHAREKEYS 0x20000000	/* keys live on shared string table */
+#define SVphv_LAZYDEL	0x40000000	/* entry in xhv_eiter must be deleted */
 
 #ifdef OVERLOAD
 #define SVpgv_AM        0x40000000
@@ -203,6 +200,7 @@ struct xpvgv {
     char*	xgv_name;
     STRLEN	xgv_namelen;
     HV*		xgv_stash;
+    U8		xgv_flags;
 };
 
 struct xpvbm {
@@ -250,8 +248,8 @@ struct xpvio {
     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 */
+    PerlIO *	xio_ifp;	/* ifp and ofp are normally the same */
+    PerlIO *	xio_ofp;	/* but sockets need separate streams */
     DIR *	xio_dirp;	/* for opendir, readdir, etc */
     long	xio_lines;	/* $. */
     long	xio_page;	/* $% */
@@ -272,6 +270,7 @@ struct xpvio {
 #define IOf_START 2	/* check for null ARGV and substitute '-' */
 #define IOf_FLUSH 4	/* this fp wants a flush after write op */
 #define IOf_DIDTOP 8	/* just did top of form */
+#define IOf_UNTAINT 16  /* consider this fp (and it's data) "safe" */
 
 /* The following macros define implementation-independent predicates on SVs. */
 
@@ -301,7 +300,7 @@ struct xpvio {
 #define SvIOK_on(sv)		(SvOOK_off(sv), \
 				    SvFLAGS(sv) |= (SVf_IOK|SVp_IOK))
 #define SvIOK_off(sv)		(SvFLAGS(sv) &= ~(SVf_IOK|SVp_IOK))
-#define SvIOK_only(sv)		(SvOK_off(sv), \
+#define SvIOK_only(sv)		(SvOOK_off(sv), SvOK_off(sv), \
 				    SvFLAGS(sv) |= (SVf_IOK|SVp_IOK))
 
 #define SvNOK(sv)		(SvFLAGS(sv) & SVf_NOK)
@@ -313,8 +312,14 @@ struct xpvio {
 #define SvPOK(sv)		(SvFLAGS(sv) & SVf_POK)
 #define SvPOK_on(sv)		(SvFLAGS(sv) |= (SVf_POK|SVp_POK))
 #define SvPOK_off(sv)		(SvFLAGS(sv) &= ~(SVf_POK|SVp_POK))
-#define SvPOK_only(sv)		(SvOK_off(sv), \
+
+#ifdef OVERLOAD
+#define SvPOK_only(sv)            (SvFLAGS(sv) &= ~(SVf_OK|SVf_AMAGIC),   \
 				    SvFLAGS(sv) |= (SVf_POK|SVp_POK))
+#else
+#define SvPOK_only(sv)            (SvFLAGS(sv) &= ~SVf_OK, \
+				    SvFLAGS(sv) |= (SVf_POK|SVp_POK))
+#endif /* OVERLOAD */
 
 #define SvOOK(sv)		(SvFLAGS(sv) & SVf_OOK)
 #define SvOOK_on(sv)		(SvIOK_off(sv), SvFLAGS(sv) |= SVf_OOK)
@@ -405,10 +410,6 @@ struct xpvio {
 #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)
 
@@ -427,23 +428,23 @@ struct xpvio {
 #define SvSTASH(sv)	((XPVMG*)  SvANY(sv))->xmg_stash
 
 #define SvIV_set(sv, val) \
-	do { assert(SvTYPE(sv) == SVt_IV || SvTYPE(sv) >= SVt_PVIV); \
-		(((XPVIV*)  SvANY(sv))->xiv_iv = val); } while (0)
+	STMT_START { assert(SvTYPE(sv) == SVt_IV || SvTYPE(sv) >= SVt_PVIV); \
+		(((XPVIV*)  SvANY(sv))->xiv_iv = val); } STMT_END
 #define SvNV_set(sv, val) \
-	do { assert(SvTYPE(sv) == SVt_NV || SvTYPE(sv) >= SVt_PVNV); \
-		(((XPVNV*)  SvANY(sv))->xnv_nv = val); } while (0)
+	STMT_START { assert(SvTYPE(sv) == SVt_NV || SvTYPE(sv) >= SVt_PVNV); \
+		(((XPVNV*)  SvANY(sv))->xnv_nv = val); } STMT_END
 #define SvPV_set(sv, val) \
-	do { assert(SvTYPE(sv) >= SVt_PV); \
-		(((XPV*)  SvANY(sv))->xpv_pv = val); } while (0)
+	STMT_START { assert(SvTYPE(sv) >= SVt_PV); \
+		(((XPV*)  SvANY(sv))->xpv_pv = val); } STMT_END
 #define SvCUR_set(sv, val) \
-	do { assert(SvTYPE(sv) >= SVt_PV); \
-		(((XPV*)  SvANY(sv))->xpv_cur = val); } while (0)
+	STMT_START { assert(SvTYPE(sv) >= SVt_PV); \
+		(((XPV*)  SvANY(sv))->xpv_cur = val); } STMT_END
 #define SvLEN_set(sv, val) \
-	do { assert(SvTYPE(sv) >= SVt_PV); \
-		(((XPV*)  SvANY(sv))->xpv_len = val); } while (0)
+	STMT_START { assert(SvTYPE(sv) >= SVt_PV); \
+		(((XPV*)  SvANY(sv))->xpv_len = val); } STMT_END
 #define SvEND_set(sv, val) \
-	do { assert(SvTYPE(sv) >= SVt_PV); \
-		(((XPV*)  SvANY(sv))->xpv_cur = val - SvPVX(sv)); } while (0)
+	STMT_START { assert(SvTYPE(sv) >= SVt_PV); \
+		(((XPV*)  SvANY(sv))->xpv_cur = val - SvPVX(sv)); } STMT_END
 
 #define BmRARE(sv)	((XPVBM*)  SvANY(sv))->xbm_rare
 #define BmUSEFUL(sv)	((XPVBM*)  SvANY(sv))->xbm_useful