X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=pp_hot.c;h=288bf5c6e64c5aa5e83578ddae214458fd992602;hb=c9fcc6c44229e7c36dee08e5d883d12284a44f17;hp=aae168fc583e417577dd58e985f8e3e95cf65404;hpb=684bef36d5078e84d816e42ce6a73ae4452da2d7;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/pp_hot.c b/pp_hot.c
index aae168f..288bf5c 100644
--- a/pp_hot.c
+++ b/pp_hot.c
@@ -1,6 +1,6 @@
 /*    pp_hot.c
  *
- *    Copyright (c) 1991-1999, Larry Wall
+ *    Copyright (c) 1991-2000, 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.
@@ -22,13 +22,6 @@
 #ifdef I_UNISTD
 #include <unistd.h>
 #endif
-#ifdef I_FCNTL
-#include <fcntl.h>
-#endif
-#ifdef I_SYS_FILE
-#include <sys/file.h>
-#endif
-
 
 /* Hot code. */
 
@@ -87,6 +80,8 @@ PP(pp_stringify)
     char *s;
     s = SvPV(TOPs,len);
     sv_setpvn(TARG,s,len);
+    if (SvUTF8(TOPs) && !IN_BYTE)
+	SvUTF8_on(TARG);
     SETTARG;
     RETURN;
 }
@@ -152,8 +147,14 @@ PP(pp_concat)
     dPOPTOPssrl;
     STRLEN len;
     char *s;
+
     if (TARG != left) {
 	s = SvPV(left,len);
+	if (TARG == right) {
+	    sv_insert(TARG, 0, 0, s, len);
+	    SETs(TARG);
+	    RETURN;
+	}
 	sv_setpvn(TARG,s,len);
     }
     else if (SvGMAGICAL(TARG))
@@ -176,7 +177,16 @@ PP(pp_concat)
 	    }
 	}
 #endif
+	if (DO_UTF8(right))
+	    sv_utf8_upgrade(TARG);
 	sv_catpvn(TARG,s,len);
+	if (!IN_BYTE) {
+	    if (SvUTF8(right))
+		SvUTF8_on(TARG);
+	}
+	else if (!SvUTF8(right)) {
+	    SvUTF8_off(TARG);
+	}
     }
     else
 	sv_setpvn(TARG,s,len);	/* suppress warning */
@@ -359,15 +369,15 @@ PP(pp_print)
     }
     else if (!(fp = IoOFP(io))) {
 	if (ckWARN2(WARN_CLOSED, WARN_IO))  {
-	    SV* sv = sv_newmortal();
-	    gv_efullname3(sv, gv, Nullch);
-	    if (IoIFP(io))
+	    if (IoIFP(io)) {
+		SV* sv = sv_newmortal();
+		gv_efullname3(sv, gv, Nullch);
 		Perl_warner(aTHX_ WARN_IO,
 			    "Filehandle %s opened only for input",
 			    SvPV(sv,n_a));
+	    }
 	    else if (ckWARN(WARN_CLOSED))
-		Perl_warner(aTHX_ WARN_CLOSED,
-			    "print() on closed filehandle %s", SvPV(sv,n_a));
+		report_closed_fh(gv, io, "print", "filehandle");
 	}
 	SETERRNO(EBADF,IoIFP(io)?RMS$_FAC:RMS$_IFI);
 	goto just_say_no;
@@ -1035,6 +1045,7 @@ yup:					/* Confirmed by INTUIT */
 	rx->startp[0] = s - truebase;
 	rx->endp[0] = s - truebase + rx->minlen;
     }
+    rx->nparens = rx->lastparen = 0;	/* used by @- and @+ */
     LEAVE_SCOPE(oldsave);
     RETPUSHYES;
 
@@ -1250,13 +1261,8 @@ Perl_do_readline(pTHX)
 		Perl_warner(aTHX_ WARN_CLOSED,
 			    "glob failed (can't start child: %s)",
 			    Strerror(errno));
-	    else {
-		SV* sv = sv_newmortal();
-		gv_efullname3(sv, PL_last_in_gv, Nullch);
-		Perl_warner(aTHX_ WARN_CLOSED,
-			    "readline() on closed filehandle %s",
-			    SvPV_nolen(sv));
-	    }
+	    else
+		report_closed_fh(PL_last_in_gv, io, "readline", "filehandle");
 	}
 	if (gimme == G_SCALAR) {
 	    (void)SvOK_off(TARG);
@@ -1304,7 +1310,7 @@ Perl_do_readline(pTHX)
 		if (!do_close(PL_last_in_gv, FALSE) && ckWARN(WARN_CLOSED)) {
 		    Perl_warner(aTHX_ WARN_CLOSED,
 			   "glob failed (child exited with status %d%s)",
-			   STATUS_CURRENT >> 8,
+			   (int)(STATUS_CURRENT >> 8),
 			   (STATUS_CURRENT & 0x80) ? ", core dumped" : "");
 		}
 	    }
@@ -2736,7 +2742,7 @@ S_method_common(pTHX_ SV* meth, U32* hashp)
 	    !(ob=(SV*)GvIO(iogv)))
 	{
 	    if (!packname || 
-		((*(U8*)packname >= 0xc0 && IN_UTF8)
+		((*(U8*)packname >= 0xc0 && DO_UTF8(sv))
 		    ? !isIDFIRST_utf8((U8*)packname)
 		    : !isIDFIRST(*packname)
 		))