Add missing syms to global.sym; update magic doc

[p5sagit/p5-mst-13.2.git] / pp.c

diff --git a/pp.c b/pp.c
index ab1816d..d7725b8 100644 (file)
--- a/pp.c
+++ b/pp.c
@@ -29,7 +29,8 @@
 typedef int IBW;
 typedef unsigned UBW;
 
-static void doencodes _((SV *sv, char *s, I32 len));
+static SV* refto _((SV* sv));
+static void doencodes _((SV* sv, char* s, I32 len));
 
 /* variations on pp_null */
 
@@ -247,8 +248,11 @@ PP(pp_rv2cv)
     /* We usually try to add a non-existent subroutine in case of AUTOLOAD. */
     /* (But not in defined().) */
     CV *cv = sv_2cv(TOPs, &stash, &gv, !(op->op_flags & OPf_SPECIAL));
-
-    if (!cv)
+    if (cv) {
+       if (CvCLONE(cv))
+           cv = (CV*)sv_2mortal((SV*)cv_clone(cv));
+    }
+    else
        cv = (CV*)&sv_undef;
     SETs((SV*)cv);
     RETURN;
@@ -283,49 +287,49 @@ PP(pp_anoncode)
 
 PP(pp_srefgen)
 {
-    dSP; dTOPss;
-    SV* rv;
-    rv = sv_newmortal();
-    sv_upgrade(rv, SVt_RV);
-    if (SvPADTMP(sv))
-       sv = newSVsv(sv);
-    else {
-       SvTEMP_off(sv);
-       (void)SvREFCNT_inc(sv);
-    }
-    SvRV(rv) = sv;
-    SvROK_on(rv);
-    SETs(rv);
+    dSP;
+    *SP = refto(*SP);
     RETURN;
 } 
 
 PP(pp_refgen)
 {
     dSP; dMARK;
-    SV* sv;
-    SV* rv;
     if (GIMME != G_ARRAY) {
        MARK[1] = *SP;
        SP = MARK + 1;
     }
     EXTEND_MORTAL(SP - MARK);
-    while (MARK < SP) {
-       sv = *++MARK;
-       rv = sv_newmortal();
-       sv_upgrade(rv, SVt_RV);
-       if (SvPADTMP(sv))
-           sv = newSVsv(sv);
-       else {
-           SvTEMP_off(sv);
-           (void)SvREFCNT_inc(sv);
-       }
-       SvRV(rv) = sv;
-       SvROK_on(rv);
-       *MARK = rv;
-    }
+    while (++MARK <= SP)
+       *MARK = refto(*MARK);
     RETURN;
 }
 
+static SV*
+refto(sv)
+SV* sv;
+{
+    SV* rv;
+
+    if (SvTYPE(sv) == SVt_PVLV && LvTYPE(sv) == 'y') {
+       if (LvTARGLEN(sv))
+           vivify_itervar(sv);
+       if (LvTARG(sv))
+           sv = LvTARG(sv);
+    }
+    else if (SvPADTMP(sv))
+       sv = newSVsv(sv);
+    else {
+       SvTEMP_off(sv);
+       (void)SvREFCNT_inc(sv);
+    }
+    rv = sv_newmortal();
+    sv_upgrade(rv, SVt_RV);
+    SvRV(rv) = sv;
+    SvROK_on(rv);
+    return rv;
+}
+
 PP(pp_ref)
 {
     dSP; dTARGET;
@@ -638,25 +642,24 @@ PP(pp_divide)
 {
     dSP; dATARGET; tryAMAGICbin(div,opASSIGN); 
     {
-      dPOPnv;
-      if (value == 0.0)
+      dPOPPOPnnrl;
+      double value;
+      if (right == 0.0)
        DIE("Illegal division by zero");
 #ifdef SLOPPYDIVIDE
       /* insure that 20./5. == 4. */
       {
-       double x;
-       I32    k;
-       x =  POPn;
-       if ((double)I_32(x)     == x &&
-           (double)I_32(value) == value &&
-           (k = I_32(x)/I_32(value))*I_32(value) == I_32(x)) {
+       IV k;
+       if ((double)I_V(left)  == left &&
+           (double)I_V(right) == right &&
+           (k = I_V(left)/I_V(right))*I_V(right) == I_V(left)) {
            value = k;
        } else {
-           value = x/value;
+           value = left / right;
        }
       }
 #else
-      value = POPn / value;
+      value = left / right;
 #endif
       PUSHn( value );
       RETURN;
@@ -728,14 +731,19 @@ PP(pp_repeat)
            if (SvROK(tmpstr))
                sv_unref(tmpstr);
        }
-       SvSetSV(TARG, tmpstr);
-       SvPV_force(TARG, len);
-       if (count >= 1) {
-           SvGROW(TARG, (count * len) + 1);
-           if (count > 1)
-               repeatcpy(SvPVX(TARG) + len, SvPVX(TARG), len, count - 1);
-           SvCUR(TARG) *= count;
-           *SvEND(TARG) = '\0';
+       if (USE_LEFT(tmpstr) || SvTYPE(tmpstr) > SVt_PVMG) {
+           SvSetSV(TARG, tmpstr);
+           SvPV_force(TARG, len);
+           if (count != 1) {
+               if (count < 1)
+                   SvCUR_set(TARG, 0);
+               else {
+                   SvGROW(TARG, (count * len) + 1);
+                   repeatcpy(SvPVX(TARG) + len, SvPVX(TARG), len, count - 1);
+                   SvCUR(TARG) *= count;
+               }
+               *SvEND(TARG) = '\0';
+           }
            (void)SvPOK_only(TARG);
        }
        else
@@ -750,7 +758,7 @@ PP(pp_subtract)
 {
     dSP; dATARGET; tryAMAGICbin(subtr,opASSIGN); 
     {
-      dPOPTOPnnrl;
+      dPOPTOPnnrl_ul;
       SETn( left - right );
       RETURN;
     }