X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=sv.c;h=997a3a8b261d1f8d8cabfabbf3eeef7fa0d96714;hb=29bdacb8f1686adf0d6e73a4e2fd7fb9becf6eab;hp=afd2aadf3ba67da8f96b960108e11fddaf93ae26;hpb=121910a497e33cc9235ecb1b0488ff5200159bc4;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/sv.c b/sv.c
index afd2aad..997a3a8 100644
--- a/sv.c
+++ b/sv.c
@@ -2163,7 +2163,7 @@ Perl_sv_2iv(pTHX_ register SV *sv)
 		    SvIVX(sv) = -(IV)value;
 		} else {
 		    /* Too negative for an IV.  This is a double upgrade, but
-		       I'm assuming it will be be rare.  */
+		       I'm assuming it will be rare.  */
 		    if (SvTYPE(sv) < SVt_PVNV)
 			sv_upgrade(sv, SVt_PVNV);
 		    SvNOK_on(sv);
@@ -2454,7 +2454,7 @@ Perl_sv_2uv(pTHX_ register SV *sv)
 		    SvIVX(sv) = -(IV)value;
 		} else {
 		    /* Too negative for an IV.  This is a double upgrade, but
-		       I'm assuming it will be be rare.  */
+		       I'm assuming it will be rare.  */
 		    if (SvTYPE(sv) < SVt_PVNV)
 			sv_upgrade(sv, SVt_PVNV);
 		    SvNOK_on(sv);
@@ -3004,8 +3004,15 @@ Perl_sv_2pv_flags(pTHX_ register SV *sv, STRLEN *lp, I32 flags)
 		default:	s = "UNKNOWN";			break;
 		}
 		tsv = NEWSV(0,0);
-		if (SvOBJECT(sv))
-		    Perl_sv_setpvf(aTHX_ tsv, "%s=%s", HvNAME(SvSTASH(sv)), s);
+		if (SvOBJECT(sv)) {
+                    HV *svs = SvSTASH(sv);
+		    Perl_sv_setpvf(
+                        aTHX_ tsv, "%s=%s",
+                        /* [20011101.072] This bandaid for C<package;>
+                           should eventually be removed. AMS 20011103 */
+                        (svs ? HvNAME(svs) : "<none>"), s
+                    );
+                }
 		else
 		    sv_setpv(tsv, s);
 		Perl_sv_catpvf(aTHX_ tsv, "(0x%"UVxf")", PTR2UV(sv));
@@ -5861,7 +5868,7 @@ Perl_sv_inc(pTHX_ register SV *sv)
 #endif
 	if (SvIsUV(sv)) {
 	    if (SvUVX(sv) == UV_MAX)
-		sv_setnv(sv, (NV)UV_MAX + 1.0);
+		sv_setnv(sv, UV_MAX_P1);
 	    else
 		(void)SvIOK_only_UV(sv);
 		++SvUVX(sv);
@@ -5893,7 +5900,7 @@ Perl_sv_inc(pTHX_ register SV *sv)
     while (isDIGIT(*d)) d++;
     if (*d) {
 #ifdef PERL_PRESERVE_IVUV
-	/* Got to punt this an an integer if needs be, but we don't issue
+	/* Got to punt this as an integer if needs be, but we don't issue
 	   warnings. Probably ought to make the sv_iv_please() that does
 	   the conversion if possible, and silently.  */
 	int numtype = grok_number(SvPVX(sv), SvCUR(sv), NULL);
@@ -6942,8 +6949,12 @@ Returns a string describing what the SV is a reference to.
 char *
 Perl_sv_reftype(pTHX_ SV *sv, int ob)
 {
-    if (ob && SvOBJECT(sv))
-	return HvNAME(SvSTASH(sv));
+    if (ob && SvOBJECT(sv)) {
+        HV *svs = SvSTASH(sv);
+        /* [20011101.072] This bandaid for C<package;> should eventually
+           be removed. AMS 20011103 */
+        return (svs ? HvNAME(svs) : "<none>");
+    }
     else {
 	switch (SvTYPE(sv)) {
 	case SVt_NULL:
@@ -10096,6 +10107,7 @@ perl_clone_using(PerlInterpreter *proto_perl, UV flags,
     PL_utf8_toupper	= sv_dup_inc(proto_perl->Iutf8_toupper, param);
     PL_utf8_totitle	= sv_dup_inc(proto_perl->Iutf8_totitle, param);
     PL_utf8_tolower	= sv_dup_inc(proto_perl->Iutf8_tolower, param);
+    PL_utf8_tofold	= sv_dup_inc(proto_perl->Iutf8_tofold, param);
 
     /* swatch cache */
     PL_last_swash_hv	= Nullhv;	/* reinits on demand */
@@ -10395,7 +10407,7 @@ Perl_sv_recode_to_utf8(pTHX_ SV *sv, SV *encoding)
 	  SPAGAIN;
 	  uni = POPs;
 	  PUTBACK;
-	  s = SvPVutf8(uni, len);
+	  s = SvPV(uni, len);
 	  if (s != SvPVX(sv)) {
 	       SvGROW(sv, len);
 	       Move(s, SvPVX(sv), len, char);