X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=pp.c;h=d55c4a8eb62e92f7d08e14131770090ed6c8d620;hb=f3a2811a943652950bfdb6408b09c32b4bf531d0;hp=3df0209e87bbff035336e75af185256fa23cccfa;hpb=befad5d1180ef6841306dc0157ceec55281184c9;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/pp.c b/pp.c
index 3df0209..d55c4a8 100644
--- a/pp.c
+++ b/pp.c
@@ -416,7 +416,7 @@ PP(pp_prototype)
 		char str[ MAX_ARGS_OP * 2 + 2 ]; /* One ';', one '\0' */
 
 		if (code == -KEY_chop || code == -KEY_chomp
-			|| code == -KEY_exec || code == -KEY_system || code == -KEY_err)
+			|| code == -KEY_exec || code == -KEY_system)
 		    goto set;
 		if (code == -KEY_mkdir) {
 		    ret = sv_2mortal(newSVpvs("_;$"));
@@ -828,6 +828,15 @@ PP(pp_undef)
 	    SvSetMagicSV(sv, &PL_sv_undef);
 	else {
 	    GP *gp;
+            HV *stash;
+
+            /* undef *Foo:: */
+            if((stash = GvHV((GV*)sv)) && HvNAME_get(stash))
+                mro_isa_changed_in(stash);
+            /* undef *Pkg::meth_name ... */
+            else if(GvCVu((GV*)sv) && (stash = GvSTASH((GV*)sv)) && HvNAME_get(stash))
+                mro_method_changed_in(stash);
+
 	    gp_free((GV*)sv);
 	    Newxz(gp, 1, GP);
 	    GvGP(sv) = gp_ref(gp);
@@ -1306,7 +1315,11 @@ PP(pp_divide)
 #endif /* PERL_TRY_UV_DIVIDE */
     {
 	dPOPPOPnnrl;
+#if defined(NAN_COMPARE_BROKEN) && defined(Perl_isnan)
+	if (! Perl_isnan(right) && right == 0.0)
+#else
 	if (right == 0.0)
+#endif
 	    DIE(aTHX_ "Illegal division by zero");
 	PUSHn( left / right );
 	RETURN;
@@ -1471,7 +1484,7 @@ PP(pp_repeat)
 	      count = (IV)nv;
     }
     else
-	 count = SvIVx(sv);
+	 count = SvIV(sv);
     if (GIMME == G_ARRAY && PL_op->op_private & OPpREPEAT_DOLIST) {
 	dMARK;
 	static const char oom_list_extend[] = "Out of memory during list extend";
@@ -3357,7 +3370,7 @@ PP(pp_ord)
 
     XPUSHu(DO_UTF8(argsv) ?
 	   utf8n_to_uvchr(s, UTF8_MAXBYTES, 0, UTF8_ALLOW_ANYUV) :
-	   (*s & 0xff));
+	   (UV)(*s & 0xff));
 
     RETURN;
 }
@@ -3509,7 +3522,7 @@ PP(pp_ucfirst)
 	need = slen + 1;
     }
 
-    if (SvPADTMP(source) && !SvREADONLY(source) && inplace) {
+    if (SvPADTMP(source) && !SvREADONLY(source) && inplace && SvTEMP(source)) {
 	/* We can convert in place.  */
 
 	dest = source;
@@ -3592,7 +3605,7 @@ PP(pp_uc)
     SvGETMAGIC(source);
 
     if (SvPADTMP(source) && !SvREADONLY(source) && !SvAMAGIC(source)
-	&& !DO_UTF8(source)) {
+	&& SvTEMP(source) && !DO_UTF8(source)) {
 	/* We can convert in place.  */
 
 	dest = source;
@@ -3692,7 +3705,7 @@ PP(pp_lc)
     SvGETMAGIC(source);
 
     if (SvPADTMP(source) && !SvREADONLY(source) && !SvAMAGIC(source)
-	&& !DO_UTF8(source)) {
+	&& SvTEMP(source) && !DO_UTF8(source)) {
 	/* We can convert in place.  */
 
 	dest = source;
@@ -3859,7 +3872,7 @@ PP(pp_aslice)
 	    register SV **svp;
 	    I32 max = -1;
 	    for (svp = MARK + 1; svp <= SP; svp++) {
-		const I32 elem = SvIVx(*svp);
+		const I32 elem = SvIV(*svp);
 		if (elem > max)
 		    max = elem;
 	    }
@@ -3868,7 +3881,7 @@ PP(pp_aslice)
 	}
 	while (++MARK <= SP) {
 	    register SV **svp;
-	    I32 elem = SvIVx(*MARK);
+	    I32 elem = SvIV(*MARK);
 
 	    if (elem > 0)
 		elem -= arybase;
@@ -4053,7 +4066,7 @@ PP(pp_hslice)
         }
 
         he = hv_fetch_ent(hv, keysv, lval, 0);
-        svp = he ? &HeVAL(he) : 0;
+        svp = he ? &HeVAL(he) : NULL;
 
         if (lval) {
             if (!svp || *svp == &PL_sv_undef) {
@@ -4114,7 +4127,7 @@ PP(pp_lslice)
     register SV **lelem;
 
     if (GIMME != G_ARRAY) {
-	I32 ix = SvIVx(*lastlelem);
+	I32 ix = SvIV(*lastlelem);
 	if (ix < 0)
 	    ix += max;
 	else
@@ -4133,7 +4146,7 @@ PP(pp_lslice)
     }
 
     for (lelem = firstlelem; lelem <= lastlelem; lelem++) {
-	I32 ix = SvIVx(*lelem);
+	I32 ix = SvIV(*lelem);
 	if (ix < 0)
 	    ix += max;
 	else
@@ -4212,7 +4225,7 @@ PP(pp_splice)
     SP++;
 
     if (++MARK < SP) {
-	offset = i = SvIVx(*MARK);
+	offset = i = SvIV(*MARK);
 	if (offset < 0)
 	    offset += AvFILLp(ary) + 1;
 	else
@@ -4407,12 +4420,17 @@ PP(pp_push)
 	PUSHi( AvFILL(ary) + 1 );
     }
     else {
+	PL_delaymagic = DM_DELAY;
 	for (++MARK; MARK <= SP; MARK++) {
 	    SV * const sv = newSV(0);
 	    if (*MARK)
 		sv_setsv(sv, *MARK);
 	    av_store(ary, AvFILLp(ary)+1, sv);
 	}
+	if (PL_delaymagic & DM_ARRAY)
+	    mg_set((SV*)ary);
+
+	PL_delaymagic = 0;
 	SP = ORIGMARK;
 	PUSHi( AvFILLp(ary) + 1 );
     }
@@ -4698,6 +4716,53 @@ PP(pp_split)
 	    s = m;
 	}
     }
+    else if (rx->extflags & RXf_NULL && !(s >= strend)) {
+        /*
+          Pre-extend the stack, either the number of bytes or
+          characters in the string or a limited amount, triggered by:
+
+          my ($x, $y) = split //, $str;
+            or
+          split //, $str, $i;
+        */
+        const U32 items = limit - 1; 
+        if (items < slen)
+            EXTEND(SP, items);
+        else
+            EXTEND(SP, slen);
+
+        if (do_utf8) {
+            while (--limit) {
+                /* keep track of how many bytes we skip over */
+                m = s;
+                s += UTF8SKIP(s);
+                dstr = newSVpvn(m, s-m);
+
+                if (make_mortal)
+                    sv_2mortal(dstr);
+
+                (void)SvUTF8_on(dstr);
+                PUSHs(dstr);
+
+                if (s >= strend)
+                    break;
+            }
+        } else {
+            while (--limit) {
+                dstr = newSVpvn(s, 1);
+
+                s++;
+
+                if (make_mortal)
+                    sv_2mortal(dstr);
+
+                PUSHs(dstr);
+
+                if (s >= strend)
+                    break;
+            }
+        }
+    }
     else if (do_utf8 == ((rx->extflags & RXf_UTF8) != 0) &&
 	     (rx->extflags & RXf_USE_INTUIT) && !rx->nparens
 	     && (rx->extflags & RXf_CHECK_ALL)
@@ -4867,6 +4932,19 @@ PP(pp_split)
     RETURN;
 }
 
+PP(pp_once)
+{
+    dSP;
+    SV *const sv = PAD_SVl(PL_op->op_targ);
+
+    if (SvPADSTALE(sv)) {
+	/* First time. */
+	SvPADSTALE_off(sv);
+	RETURNOP(cLOGOP->op_other);
+    }
+    RETURNOP(cLOGOP->op_next);
+}
+
 PP(pp_lock)
 {
     dVAR;