X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=doop.c;h=f4f012f78cd37cfa46b7d4be4e324dcce4601656;hb=6874a2de0b9fdd8dc928c94c0f22e6f2b45cb330;hp=9550b3e3904133cdc4918d55bf493092db3f8d6a;hpb=9b33ce3b1592d0c13aec55cf7c63e0b9253b6b22;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/doop.c b/doop.c
index 9550b3e..f4f012f 100644
--- a/doop.c
+++ b/doop.c
@@ -1,6 +1,6 @@
 /*    doop.c
  *
- *    Copyright (c) 1991-2001, Larry Wall
+ *    Copyright (c) 1991-2002, Larry Wall
  *
  *    You may distribute under the terms of either the GNU General Public
  *    License or the Artistic License, as specified in the README file.
@@ -46,7 +46,7 @@ S_do_trans_simple(pTHX_ SV *sv)
 	while (s < send) {
 	    if ((ch = tbl[*s]) >= 0) {
 		matches++;
-		*s++ = ch;
+		*s++ = (U8)ch;
 	    }
 	    else
 		s++;
@@ -92,7 +92,7 @@ S_do_trans_simple(pTHX_ SV *sv)
 }
 
 STATIC I32
-S_do_trans_count(pTHX_ SV *sv)/* SPC - OK */
+S_do_trans_count(pTHX_ SV *sv)
 {
     U8 *s;
     U8 *send;
@@ -130,7 +130,7 @@ S_do_trans_count(pTHX_ SV *sv)/* SPC - OK */
 }
 
 STATIC I32
-S_do_trans_complex(pTHX_ SV *sv)/* SPC - NOT OK */
+S_do_trans_complex(pTHX_ SV *sv)
 {
     U8 *s;
     U8 *send;
@@ -141,7 +141,7 @@ S_do_trans_complex(pTHX_ SV *sv)/* SPC - NOT OK */
     I32 grows = PL_op->op_private & OPpTRANS_GROWS;
     I32 complement = PL_op->op_private & OPpTRANS_COMPLEMENT;
     I32 del = PL_op->op_private & OPpTRANS_DELETE;
-    STRLEN len, rlen;
+    STRLEN len, rlen = 0;
     short *tbl;
     I32 ch;
 
@@ -159,7 +159,7 @@ S_do_trans_complex(pTHX_ SV *sv)/* SPC - NOT OK */
 	    U8* p = send;
 	    while (s < send) {
 		if ((ch = tbl[*s]) >= 0) {
-		    *d = ch;
+		    *d = (U8)ch;
 		    matches++;
 		    if (p != d - 1 || *p != *d)
 			p = d++;
@@ -175,7 +175,7 @@ S_do_trans_complex(pTHX_ SV *sv)/* SPC - NOT OK */
 	    while (s < send) {
 	        if ((ch = tbl[*s]) >= 0) {
 		    matches++;
-		    *d++ = ch;
+		    *d++ = (U8)ch;
 		}
 		else if (ch == -1)	/* -1 is unmapped character */
 		    *d++ = *s;
@@ -217,9 +217,9 @@ S_do_trans_complex(pTHX_ SV *sv)/* SPC - NOT OK */
 			    ch = (rlen == 0) ? comp :
 				(comp - 0x100 < rlen) ?
 				tbl[comp+1] : tbl[0x100+rlen];
-			    if (ch != pch) {
+			    if ((UV)ch != pch) {
 				d = uvchr_to_utf8(d, ch);
-				pch = ch;
+				pch = (UV)ch;
 			    }
 			    s += len;
 			    continue;
@@ -228,9 +228,9 @@ S_do_trans_complex(pTHX_ SV *sv)/* SPC - NOT OK */
 		}
 		else if ((ch = tbl[comp]) >= 0) {
 		    matches++;
-		    if (ch != pch) {
+		    if ((UV)ch != pch) {
 		        d = uvchr_to_utf8(d, ch);
-		        pch = ch;
+		        pch = (UV)ch;
 		    }
 		    s += len;
 		    continue;
@@ -292,7 +292,7 @@ S_do_trans_complex(pTHX_ SV *sv)/* SPC - NOT OK */
 }
 
 STATIC I32
-S_do_trans_simple_utf8(pTHX_ SV *sv)/* SPC - OK */
+S_do_trans_simple_utf8(pTHX_ SV *sv)
 {
     U8 *s;
     U8 *send;
@@ -308,7 +308,7 @@ S_do_trans_simple_utf8(pTHX_ SV *sv)/* SPC - OK */
     SV** svp = hv_fetch(hv, "NONE", 4, FALSE);
     UV none = svp ? SvUV(*svp) : 0x7fffffff;
     UV extra = none + 1;
-    UV final;
+    UV final = 0;
     UV uv;
     I32 isutf8;
     U8 hibit = 0;
@@ -386,18 +386,15 @@ S_do_trans_simple_utf8(pTHX_ SV *sv)/* SPC - OK */
     }
     SvSETMAGIC(sv);
     SvUTF8_on(sv);
-    /* Downgrading just 'cos it will is suspect - NI-S */
-    if (!isutf8 && !(PL_hints & HINT_UTF8))
-	sv_utf8_downgrade(sv, TRUE);
 
     return matches;
 }
 
 STATIC I32
-S_do_trans_count_utf8(pTHX_ SV *sv)/* SPC - OK */
+S_do_trans_count_utf8(pTHX_ SV *sv)
 {
     U8 *s;
-    U8 *start, *send;
+    U8 *start = 0, *send;
     I32 matches = 0;
     STRLEN len;
 
@@ -434,7 +431,7 @@ S_do_trans_count_utf8(pTHX_ SV *sv)/* SPC - OK */
 }
 
 STATIC I32
-S_do_trans_complex_utf8(pTHX_ SV *sv) /* SPC - NOT OK */
+S_do_trans_complex_utf8(pTHX_ SV *sv)
 {
     U8 *s;
     U8 *start, *send;
@@ -448,7 +445,7 @@ S_do_trans_complex_utf8(pTHX_ SV *sv) /* SPC - NOT OK */
     SV** svp = hv_fetch(hv, "NONE", 4, FALSE);
     UV none = svp ? SvUV(*svp) : 0x7fffffff;
     UV extra = none + 1;
-    UV final;
+    UV final = 0;
     bool havefinal = FALSE;
     UV uv;
     STRLEN len;
@@ -590,8 +587,6 @@ S_do_trans_complex_utf8(pTHX_ SV *sv) /* SPC - NOT OK */
 	SvCUR_set(sv, d - dstart);
     }
     SvUTF8_on(sv);
-    if (!isutf8 && !(PL_hints & HINT_UTF8))
-	sv_utf8_downgrade(sv, TRUE);
     SvSETMAGIC(sv);
 
     return matches;
@@ -604,9 +599,12 @@ Perl_do_trans(pTHX_ SV *sv)
     I32 hasutf = (PL_op->op_private &
                     (OPpTRANS_FROM_UTF|OPpTRANS_TO_UTF));
 
-    if (SvREADONLY(sv) && !(PL_op->op_private & OPpTRANS_IDENTICAL))
-	Perl_croak(aTHX_ PL_no_modify);
-
+    if (SvREADONLY(sv)) {
+        if (SvFAKE(sv))
+            sv_force_normal(sv);
+        if (SvREADONLY(sv) && !(PL_op->op_private & OPpTRANS_IDENTICAL))
+            Perl_croak(aTHX_ PL_no_modify);
+    }
     (void)SvPV(sv, len);
     if (!len)
 	return 0;
@@ -646,9 +644,11 @@ Perl_do_join(pTHX_ register SV *sv, SV *del, register SV **mark, register SV **s
     register I32 items = sp - mark;
     register STRLEN len;
     STRLEN delimlen;
-    register char *delim = SvPV(del, delimlen);
     STRLEN tmplen;
 
+    (void) SvPV(del, delimlen); /* stringify and get the delimlen */
+    /* SvCUR assumes it's SvPOK() and woe betide you if it's not. */
+
     mark++;
     len = (items > 0 ? (delimlen * (items - 1) ) : 0);
     (void)SvUPGRADE(sv, SVt_PV);
@@ -667,14 +667,16 @@ Perl_do_join(pTHX_ register SV *sv, SV *del, register SV **mark, register SV **s
 	++mark;
     }
 
+    sv_setpv(sv, "");
+    if (PL_tainting && SvMAGICAL(sv))
+	SvTAINTED_off(sv);
+
     if (items-- > 0) {
-	sv_setpv(sv, "");
 	if (*mark)
 	    sv_catsv(sv, *mark);
 	mark++;
     }
-    else
-	sv_setpv(sv,"");
+
     if (delimlen) {
 	for (; items > 0; items--,mark++) {
 	    sv_catsv(sv,del);
@@ -695,6 +697,9 @@ Perl_do_sprintf(pTHX_ SV *sv, I32 len, SV **sarg)
     char *pat = SvPV(*sarg, patlen);
     bool do_taint = FALSE;
 
+    SvUTF8_off(sv);
+    if (DO_UTF8(*sarg))
+        SvUTF8_on(sv);
     sv_vsetpvfn(sv, pat, patlen, Null(va_list*), sarg + 1, len - 1, &do_taint);
     SvSETMAGIC(sv);
     if (do_taint)
@@ -725,18 +730,18 @@ Perl_do_vecget(pTHX_ SV *sv, I32 offset, I32 size)
 	else {
 	    offset >>= 3;	/* turn into byte offset */
 	    if (size == 16) {
-		if (offset >= srclen)
+		if ((STRLEN)offset >= srclen)
 		    retnum = 0;
 		else
 		    retnum = (UV) s[offset] <<  8;
 	    }
 	    else if (size == 32) {
-		if (offset >= srclen)
+		if ((STRLEN)offset >= srclen)
 		    retnum = 0;
-		else if (offset + 1 >= srclen)
+		else if ((STRLEN)(offset + 1) >= srclen)
 		    retnum =
 			((UV) s[offset    ] << 24);
-		else if (offset + 2 >= srclen)
+		else if ((STRLEN)(offset + 2) >= srclen)
 		    retnum =
 			((UV) s[offset    ] << 24) +
 			((UV) s[offset + 1] << 16);
@@ -749,7 +754,7 @@ Perl_do_vecget(pTHX_ SV *sv, I32 offset, I32 size)
 #ifdef UV_IS_QUAD
 	    else if (size == 64) {
 		if (ckWARN(WARN_PORTABLE))
-		    Perl_warner(aTHX_ WARN_PORTABLE,
+		    Perl_warner(aTHX_ packWARN(WARN_PORTABLE),
 				"Bit vector size > 32 non-portable");
 		if (offset >= srclen)
 		    retnum = 0;
@@ -818,7 +823,7 @@ Perl_do_vecget(pTHX_ SV *sv, I32 offset, I32 size)
 #ifdef UV_IS_QUAD
 	else if (size == 64) {
 	    if (ckWARN(WARN_PORTABLE))
-		Perl_warner(aTHX_ WARN_PORTABLE,
+		Perl_warner(aTHX_ packWARN(WARN_PORTABLE),
 			    "Bit vector size > 32 non-portable");
 	    retnum =
 		((UV) s[offset    ] << 56) +
@@ -867,7 +872,7 @@ Perl_do_vecset(pTHX_ SV *sv)
     lval = SvUV(sv);
     offset = LvTARGOFF(sv);
     if (offset < 0)
-	Perl_croak(aTHX_ "Assigning to negative offset in vec");
+	Perl_croak(aTHX_ "Negative offset to vec in lvalue context");
     size = LvTARGLEN(sv);
     if (size < 1 || (size & (size-1))) /* size < 1 or not a power of two */
 	Perl_croak(aTHX_ "Illegal number of bits in vec");
@@ -891,30 +896,30 @@ Perl_do_vecset(pTHX_ SV *sv)
     else {
 	offset >>= 3;			/* turn into byte offset */
 	if (size == 8)
-	    s[offset  ] = lval         & 0xff;
+	    s[offset  ] = (U8)( lval        & 0xff);
 	else if (size == 16) {
-	    s[offset  ] = (lval >>  8) & 0xff;
-	    s[offset+1] = lval         & 0xff;
+	    s[offset  ] = (U8)((lval >>  8) & 0xff);
+	    s[offset+1] = (U8)( lval        & 0xff);
 	}
 	else if (size == 32) {
-	    s[offset  ] = (lval >> 24) & 0xff;
-	    s[offset+1] = (lval >> 16) & 0xff;
-	    s[offset+2] = (lval >>  8) & 0xff;
-	    s[offset+3] =  lval        & 0xff;
+	    s[offset  ] = (U8)((lval >> 24) & 0xff);
+	    s[offset+1] = (U8)((lval >> 16) & 0xff);
+	    s[offset+2] = (U8)((lval >>  8) & 0xff);
+	    s[offset+3] = (U8)( lval        & 0xff);
 	}
 #ifdef UV_IS_QUAD
 	else if (size == 64) {
 	    if (ckWARN(WARN_PORTABLE))
-		Perl_warner(aTHX_ WARN_PORTABLE,
+		Perl_warner(aTHX_ packWARN(WARN_PORTABLE),
 			    "Bit vector size > 32 non-portable");
-	    s[offset  ] = (lval >> 56) & 0xff;
-	    s[offset+1] = (lval >> 48) & 0xff;
-	    s[offset+2] = (lval >> 40) & 0xff;
-	    s[offset+3] = (lval >> 32) & 0xff;
-	    s[offset+4] = (lval >> 24) & 0xff;
-	    s[offset+5] = (lval >> 16) & 0xff;
-	    s[offset+6] = (lval >>  8) & 0xff;
-	    s[offset+7] =  lval        & 0xff;
+	    s[offset  ] = (U8)((lval >> 56) & 0xff);
+	    s[offset+1] = (U8)((lval >> 48) & 0xff);
+	    s[offset+2] = (U8)((lval >> 40) & 0xff);
+	    s[offset+3] = (U8)((lval >> 32) & 0xff);
+	    s[offset+4] = (U8)((lval >> 24) & 0xff);
+	    s[offset+5] = (U8)((lval >> 16) & 0xff);
+	    s[offset+6] = (U8)((lval >>  8) & 0xff);
+	    s[offset+7] = (U8)( lval        & 0xff);
 	}
 #endif
     }
@@ -948,8 +953,14 @@ Perl_do_chop(pTHX_ register SV *astr, register SV *sv)
             do_chop(astr,hv_iterval(hv,entry));
         return;
     }
-    else if (SvREADONLY(sv))
-	Perl_croak(aTHX_ PL_no_modify);
+    else if (SvREADONLY(sv)) {
+        if (SvFAKE(sv)) {
+            /* SV is copy-on-write */
+	    sv_force_normal_flags(sv, 0);
+        }
+        if (SvREADONLY(sv))
+            Perl_croak(aTHX_ PL_no_modify);
+    }
     s = SvPV(sv, len);
     if (len && !SvPOK(sv))
 	s = SvPV_force(sv, len);
@@ -1018,8 +1029,14 @@ Perl_do_chomp(pTHX_ register SV *sv)
             count += do_chomp(hv_iterval(hv,entry));
         return count;
     }
-    else if (SvREADONLY(sv))
-	Perl_croak(aTHX_ PL_no_modify);
+    else if (SvREADONLY(sv)) {
+        if (SvFAKE(sv)) {
+            /* SV is copy-on-write */
+	    sv_force_normal_flags(sv, 0);
+        }
+        if (SvREADONLY(sv))
+            Perl_croak(aTHX_ PL_no_modify);
+    }
     s = SvPV(sv, len);
     if (s && len) {
 	s += --len;
@@ -1080,7 +1097,7 @@ Perl_do_vop(pTHX_ I32 optype, SV *sv, SV *left, SV *right)
     char *rsave;
     bool left_utf = DO_UTF8(left);
     bool right_utf = DO_UTF8(right);
-    I32 needlen;
+    I32 needlen = 0;
 
     if (left_utf && !right_utf)
 	sv_utf8_upgrade(right);
@@ -1100,8 +1117,8 @@ Perl_do_vop(pTHX_ I32 optype, SV *sv, SV *left, SV *right)
     else if (SvOK(sv) || SvTYPE(sv) > SVt_PVMG) {
 	STRLEN n_a;
 	dc = SvPV_force(sv, n_a);
-	if (SvCUR(sv) < len) {
-	    dc = SvGROW(sv, len + 1);
+	if (SvCUR(sv) < (STRLEN)len) {
+	    dc = SvGROW(sv, (STRLEN)(len + 1));
 	    (void)memzero(dc + SvCUR(sv), len - SvCUR(sv) + 1);
 	}
 	if (optype != OP_BIT_AND && (left_utf || right_utf))
@@ -1239,9 +1256,9 @@ Perl_do_vop(pTHX_ I32 optype, SV *sv, SV *left, SV *right)
 		*dc++ = *lc++ | *rc++;
 	  mop_up:
 	    len = lensave;
-	    if (rightlen > len)
+	    if (rightlen > (STRLEN)len)
 		sv_catpvn(sv, rsave + len, rightlen - len);
-	    else if (leftlen > len)
+	    else if (leftlen > (STRLEN)len)
 		sv_catpvn(sv, lsave + len, leftlen - len);
 	    else
 		*SvEND(sv) = '\0';
@@ -1291,7 +1308,7 @@ Perl_do_kv(pTHX)
 	if (PL_op->op_flags & OPf_MOD || LVRET) {	/* lvalue */
 	    if (SvTYPE(TARG) < SVt_PVLV) {
 		sv_upgrade(TARG, SVt_PVLV);
-		sv_magic(TARG, Nullsv, 'k', Nullch, 0);
+		sv_magic(TARG, Nullsv, PERL_MAGIC_nkeys, Nullch, 0);
 	    }
 	    LvTYPE(TARG) = 'k';
 	    if (LvTARG(TARG) != (SV*)keys) {
@@ -1303,7 +1320,7 @@ Perl_do_kv(pTHX)
 	    RETURN;
 	}
 
-	if (! SvTIED_mg((SV*)keys, 'P'))
+	if (! SvTIED_mg((SV*)keys, PERL_MAGIC_tied))
 	    i = HvKEYS(keys);
 	else {
 	    i = 0;
@@ -1319,8 +1336,10 @@ Perl_do_kv(pTHX)
     PUTBACK;	/* hv_iternext and hv_iterval might clobber stack_sp */
     while ((entry = hv_iternext(keys))) {
 	SPAGAIN;
-	if (dokeys)
-	    XPUSHs(hv_iterkeysv(entry));	/* won't clobber stack_sp */
+	if (dokeys) {
+	    SV* sv = hv_iterkeysv(entry);
+	    XPUSHs(sv);	/* won't clobber stack_sp */
+	}
 	if (dovalues) {
 	    PUTBACK;
 	    tmpstr = realhv ?