X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=sv.c;h=341792412b0e0ca51efc553005ef7ddb5d56f04c;hb=9aa983d27b0af31badfcbbb76567f6e557076b41;hp=0ece5a7e64ba5201882222012cc0c42148014cbd;hpb=d460ef459c7692518f607c250b9843bea7e01dd6;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/sv.c b/sv.c
index 0ece5a7..3417924 100644
--- a/sv.c
+++ b/sv.c
@@ -1567,7 +1567,7 @@ STATIC int
 S_sv_2inuv_non_preserve (pTHX_ register SV *sv, I32 numtype) {
     NV nv = SvNVX(sv);		/* Code simpler and had compiler problems if */
     UV nv_as_uv = U_V(nv);	/*  these are not in simple variables.   */
-    DEBUG_c(PerlIO_printf(Perl_debug_log,"sv_2inuv_non '%s', IV=0x%"UVxf" NV=%g inttype=%X\n", SvPVX(sv), SvIVX(sv), nv, numtype));
+    DEBUG_c(PerlIO_printf(Perl_debug_log,"sv_2inuv_non '%s', IV=0x%"UVxf" NV=%g inttype=%"UVXf"\n", SvPVX(sv), SvIVX(sv), nv, (UV)numtype));
     if (nv_as_uv <= (UV)IV_MAX) {
 	(void)SvIOKp_on(sv);
 	(void)SvNOKp_on(sv);
@@ -1625,7 +1625,7 @@ S_sv_2inuv_non_preserve (pTHX_ register SV *sv, I32 numtype) {
 #else
     /* We've just lost integer precision, nothing we could do. */
     SvUVX(sv) = nv_as_uv;
-    DEBUG_c(PerlIO_printf(Perl_debug_log,"sv_2niuv_non UV? '%s', UV=0x%"UVxf" NV=%g U_V(NV)=0x%"UVxf" inttype=%X\n", SvPVX(sv), SvIVX(sv), nv, nv_as_uv, numtype));
+    DEBUG_c(PerlIO_printf(Perl_debug_log,"sv_2niuv_non UV? '%s', UV=0x%"UVxf" NV=%g U_V(NV)=0x%"UVxf" inttype=%"UVXf"\n", SvPVX(sv), SvIVX(sv), nv, nv_as_uv, (UV)numtype));
     /* UV and NV slots equally valid only if we have casting symmetry. */
     if (numtype & IS_NUMBER_NOT_INT) {
 	SvIsUV_on(sv);
@@ -1648,7 +1648,7 @@ S_sv_2inuv_non_preserve (pTHX_ register SV *sv, I32 numtype) {
 STATIC int
 S_sv_2iuv_non_preserve (pTHX_ register SV *sv, I32 numtype)
 {
-    DEBUG_c(PerlIO_printf(Perl_debug_log,"sv_2iuv_non '%s', IV=0x%"UVxf" NV=%g inttype=%X\n", SvPVX(sv), SvIVX(sv), SvNVX(sv), numtype));
+    DEBUG_c(PerlIO_printf(Perl_debug_log,"sv_2iuv_non '%s', IV=0x%"UVxf" NV=%g inttype=%"UVXf"\n", SvPVX(sv), SvIVX(sv), SvNVX(sv), (UV)numtype));
     if (SvNVX(sv) < (NV)IV_MIN) {
 	(void)SvIOKp_on(sv);
 	(void)SvNOK_on(sv);
@@ -3378,14 +3378,19 @@ Perl_sv_setsv(pTHX_ SV *dstr, register SV *sstr)
 	SvRV(dstr) = SvREFCNT_inc(SvRV(sstr));
 	SvROK_on(dstr);
 	if (sflags & SVp_NOK) {
-	    SvNOK_on(dstr);
+	    SvNOKp_on(dstr);
+	    /* Only set the public OK flag if the source has public OK.  */
+	    if (sflags & SVf_NOK)
+		SvFLAGS(dstr) |= SVf_NOK;
 	    SvNVX(dstr) = SvNVX(sstr);
 	}
 	if (sflags & SVp_IOK) {
-	    (void)SvIOK_on(dstr);
-	    SvIVX(dstr) = SvIVX(sstr);
+	    (void)SvIOKp_on(dstr);
+	    if (sflags & SVf_IOK)
+		SvFLAGS(dstr) |= SVf_IOK;
 	    if (sflags & SVf_IVisUV)
 		SvIsUV_on(dstr);
+	    SvIVX(dstr) = SvIVX(sstr);
 	}
 	if (SvAMAGIC(sstr)) {
 	    SvAMAGIC_on(dstr);
@@ -3435,36 +3440,51 @@ Perl_sv_setsv(pTHX_ SV *dstr, register SV *sstr)
 	    *SvEND(dstr) = '\0';
 	    (void)SvPOK_only(dstr);
 	}
-	if ((sflags & SVf_UTF8) && !IN_BYTE)
+	if (sflags & SVf_UTF8)
 	    SvUTF8_on(dstr);
 	/*SUPPRESS 560*/
 	if (sflags & SVp_NOK) {
-	    SvNOK_on(dstr);
+	    SvNOKp_on(dstr);
+	    if (sflags & SVf_NOK)
+		SvFLAGS(dstr) |= SVf_NOK;
 	    SvNVX(dstr) = SvNVX(sstr);
 	}
 	if (sflags & SVp_IOK) {
-	    (void)SvIOK_on(dstr);
-	    SvIVX(dstr) = SvIVX(sstr);
+	    (void)SvIOKp_on(dstr);
+	    if (sflags & SVf_IOK)
+		SvFLAGS(dstr) |= SVf_IOK;
 	    if (sflags & SVf_IVisUV)
 		SvIsUV_on(dstr);
-	}
-    }
-    else if (sflags & SVp_NOK) {
-	SvNVX(dstr) = SvNVX(sstr);
-	(void)SvNOK_only(dstr);
-	if (sflags & SVf_IOK) {
-	    (void)SvIOK_on(dstr);
 	    SvIVX(dstr) = SvIVX(sstr);
-	    /* XXXX Do we want to set IsUV for IV(ROK)?  Be extra safe... */
-	    if (sflags & SVf_IVisUV)
-		SvIsUV_on(dstr);
 	}
     }
     else if (sflags & SVp_IOK) {
-	(void)SvIOK_only(dstr);
-	SvIVX(dstr) = SvIVX(sstr);
+	if (sflags & SVf_IOK)
+	    (void)SvIOK_only(dstr);
+	else {
+	    SvOK_off(dstr);
+	    SvIOKp_on(dstr);
+	}
+	/* XXXX Do we want to set IsUV for IV(ROK)?  Be extra safe... */
 	if (sflags & SVf_IVisUV)
 	    SvIsUV_on(dstr);
+	SvIVX(dstr) = SvIVX(sstr);
+	if (sflags & SVp_NOK) {
+	    if (sflags & SVf_NOK)
+		(void)SvNOK_on(dstr);
+	    else
+		(void)SvNOKp_on(dstr);
+	    SvNVX(dstr) = SvNVX(sstr);
+	}
+    }
+    else if (sflags & SVp_NOK) {
+	if (sflags & SVf_NOK)
+	    (void)SvNOK_only(dstr);
+	else {
+	    SvOK_off(dstr);
+	    SvNOKp_on(dstr);
+	}
+	SvNVX(dstr) = SvNVX(sstr);
     }
     else {
 	if (dtype == SVt_PVGV) {