X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=pp_hot.c;h=bc7a1b99416fb618df947d683ea4e346232b6bfb;hb=416d06d270f6b6bb435c8831d23039954e4b6015;hp=51229bb351b7e1011606c4af672ddcf13fc59073;hpb=39644a267dae6dfa935b1c1d39151eb399850949;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/pp_hot.c b/pp_hot.c
index 51229bb..bc7a1b9 100644
--- a/pp_hot.c
+++ b/pp_hot.c
@@ -230,12 +230,18 @@ PP(pp_readline)
 PP(pp_eq)
 {
     dSP; tryAMAGICbinSET(eq,0);
+#ifndef NV_PRESERVES_UV
+    if (SvROK(TOPs) && SvROK(TOPm1s)) {
+	SETs(boolSV(SvRV(TOPs) == SvRV(TOPm1s)));
+	RETURN;
+    }
+#endif
 #ifdef PERL_PRESERVE_IVUV
     SvIV_please(TOPs);
     if (SvIOK(TOPs)) {
-	/* Unless the left argument is integer in range we are going to have to
-	   use NV maths. Hence only attempt to coerce the right argument if
-	   we know the left is integer.  */
+	/* Unless the left argument is integer in range we are going
+	   to have to use NV maths. Hence only attempt to coerce the
+	   right argument if we know the left is integer.  */
       SvIV_please(TOPm1s);
 	if (SvIOK(TOPm1s)) {
 	    bool auvok = SvUOK(TOPm1s);
@@ -346,7 +352,7 @@ PP(pp_add)
        A side effect is that this also aggressively prefers integer maths over
        fp maths for integer values.
 
-       How to detect overflow? 
+       How to detect overflow?
 
        C 99 section 6.2.6.1 says
 
@@ -417,7 +423,7 @@ PP(pp_add)
 	    UV result;
 	    register UV buv;
 	    bool buvok = SvUOK(TOPs);
-	    
+	
 	    if (buvok)
 		buv = SvUVX(TOPs);
 	    else {
@@ -1249,7 +1255,7 @@ PP(pp_match)
 	    }
 	}
     }
-    if ((gimme != G_ARRAY && !global && rx->nparens)
+    if ((!global && rx->nparens)
 	    || SvTEMP(TARG) || PL_sawampersand)
 	r_flags |= REXEC_COPY_STR;
     if (SvSCREAM(TARG))
@@ -1270,6 +1276,7 @@ play_it_again:
     }
     if (rx->reganch & RE_USE_INTUIT &&
 	DO_UTF8(TARG) == ((rx->reganch & ROPT_UTF8) != 0)) {
+	PL_bostr = truebase;
 	s = CALLREG_INTUIT_START(aTHX_ rx, TARG, s, strend, r_flags, NULL);
 
 	if (!s)
@@ -1459,10 +1466,9 @@ Perl_do_readline(pTHX)
 	}
 	else if (type == OP_GLOB)
 	    SP--;
-	else if (ckWARN(WARN_IO)	/* stdout/stderr or other write fh */
-		 && (IoTYPE(io) == IoTYPE_WRONLY || fp == PerlIO_stdout()
-		     || fp == PerlIO_stderr()))
+	else if (ckWARN(WARN_IO) && IoTYPE(io) == IoTYPE_WRONLY) {
 	    report_evil_fh(PL_last_in_gv, io, OP_phoney_OUTPUT_ONLY);
+	}
     }
     if (!fp) {
 	if (ckWARN2(WARN_GLOB, WARN_CLOSED)
@@ -1512,6 +1518,7 @@ Perl_do_readline(pTHX)
      || (IoFLAGS(io) & IOf_NOLINE) || !RsSNARF(rs))
 
     for (;;) {
+	PUTBACK;
 	if (!sv_gets(sv, fp, offset)
 	    && (type == OP_GLOB || SNARF_EOF(gimme, PL_rs, io, sv)))
 	{
@@ -1532,6 +1539,7 @@ Perl_do_readline(pTHX)
 	    }
 	    if (gimme == G_SCALAR) {
 		(void)SvOK_off(TARG);
+		SPAGAIN;
 		PUSHTARG;
 	    }
 	    MAYBE_TAINT_LINE(io, sv);
@@ -1541,6 +1549,7 @@ Perl_do_readline(pTHX)
 	IoLINES(io)++;
 	IoFLAGS(io) |= IOf_NOLINE;
 	SvSETMAGIC(sv);
+	SPAGAIN;
 	XPUSHs(sv);
 	if (type == OP_GLOB) {
 	    char *tmps;
@@ -1809,7 +1818,7 @@ PP(pp_iter)
 	SvTEMP_off(sv);
     else
 	sv = &PL_sv_undef;
-    if (av != PL_curstack && SvIMMORTAL(sv)) {
+    if (av != PL_curstack && sv == &PL_sv_undef) {
 	SV *lv = cx->blk_loop.iterlval;
 	if (lv && SvREFCNT(lv) > 1) {
 	    SvREFCNT_dec(lv);
@@ -1910,6 +1919,7 @@ PP(pp_subst)
     }
     orig = m = s;
     if (rx->reganch & RE_USE_INTUIT) {
+	PL_bostr = orig;
 	s = CALLREG_INTUIT_START(aTHX_ rx, TARG, s, strend, r_flags, NULL);
 
 	if (!s)