[win32] merge change#897 from maintbranch

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

diff --git a/doop.c b/doop.c
index 3f8bd10..11dc837 100644 (file)
--- a/doop.c
+++ b/doop.c
@@ -19,9 +19,7 @@
 #endif
 
 I32
-do_trans(sv,arg)
-SV *sv;
-OP *arg;
+do_trans(SV *sv, OP *arg)
 {
     dTHR;
     register short *tbl;
@@ -31,9 +29,10 @@ OP *arg;
     register I32 ch;
     register I32 matches = 0;
     register I32 squash = op->op_private & OPpTRANS_SQUASH;
+    register U8 *p;
     STRLEN len;
 
-    if (SvREADONLY(sv))
+    if (SvREADONLY(sv) && !(op->op_private & OPpTRANS_COUNTONLY))
        croak(no_modify);
     tbl = (short*)cPVOP->op_pv;
     s = (U8*)SvPV(sv, len);
@@ -54,17 +53,27 @@ OP *arg;
            }
            s++;
        }
+       SvSETMAGIC(sv);
+    }
+    else if (op->op_private & OPpTRANS_COUNTONLY) {
+       while (s < send) {
+           if (tbl[*s] >= 0)
+               matches++;
+           s++;
+       }
     }
     else {
        d = s;
+       p = send;
        while (s < send) {
            if ((ch = tbl[*s]) >= 0) {
                *d = ch;
-               if (matches++ && squash) {
-                   if (d[-1] == *d)
+               matches++;
+               if (squash) {
+                   if (p == d - 1 && *p == *d)
                        matches--;
                    else
-                       d++;
+                       p = d++;
                }
                else
                    d++;
@@ -76,17 +85,13 @@ OP *arg;
        matches += send - d;    /* account for disappeared chars */
        *d = '\0';
        SvCUR_set(sv, d - (U8*)SvPVX(sv));
+       SvSETMAGIC(sv);
     }
-    SvSETMAGIC(sv);
     return matches;
 }
 
 void
-do_join(sv,del,mark,sp)
-register SV *sv;
-SV *del;
-register SV **mark;
-register SV **sp;
+do_join(register SV *sv, SV *del, register SV **mark, register SV **sp)
 {
     SV **oldmark = mark;
     register I32 items = sp - mark;
@@ -142,10 +147,7 @@ register SV **sp;
 }
 
 void
-do_sprintf(sv,len,sarg)
-SV *sv;
-I32 len;
-SV **sarg;
+do_sprintf(SV *sv, I32 len, SV **sarg)
 {
     STRLEN patlen;
     char *pat = SvPV(*sarg, patlen);
@@ -158,8 +160,7 @@ SV **sarg;
 }
 
 void
-do_vecset(sv)
-SV *sv;
+do_vecset(SV *sv)
 {
     SV *targ = LvTARG(sv);
     register I32 offset;
@@ -210,9 +211,7 @@ SV *sv;
 }
 
 void
-do_chop(astr,sv)
-register SV *astr;
-register SV *sv;
+do_chop(register SV *astr, register SV *sv)
 {
     STRLEN len;
     char *s;
@@ -254,9 +253,9 @@ register SV *sv;
 } 
 
 I32
-do_chomp(sv)
-register SV *sv;
+do_chomp(register SV *sv)
 {
+    dTHR;
     register I32 count;
     STRLEN len;
     char *s;
@@ -328,12 +327,9 @@ register SV *sv;
 } 
 
 void
-do_vop(optype,sv,left,right)
-I32 optype;
-SV *sv;
-SV *left;
-SV *right;
+do_vop(I32 optype, SV *sv, SV *left, SV *right)
 {
+    dTHR;      /* just for taint */
 #ifdef LIBERAL
     register long *dl;
     register long *ll;
@@ -445,10 +441,9 @@ SV *right;
 }
 
 OP *
-do_kv(ARGS)
-dARGS
+do_kv(ARGSproto)
 {
-    dSP;
+    djSP;
     HV *hv = (HV*)POPs;
     register HE *entry;
     SV *tmpstr;
@@ -479,7 +474,7 @@ dARGS
        RETURN;
 
     if (gimme == G_SCALAR) {
-       I32 i;
+       IV i;
        dTARGET;
 
        if (op->op_flags & OPf_MOD) {   /* lvalue */
@@ -507,7 +502,7 @@ dARGS
     }
 
     /* Guess how much room we need.  hv_max may be a few too many.  Oh well. */
-    EXTEND(sp, HvMAX(hv) * (dokeys + dovalues));
+    EXTEND(SP, HvMAX(hv) * (dokeys + dovalues));
 
     PUTBACK;   /* hv_iternext and hv_iterval might clobber stack_sp */
     while (entry = realhv ? hv_iternext(hv) : avhv_iternext((AV*)hv)) {
@@ -530,3 +525,4 @@ dARGS
     }
     return NORMAL;
 }
+