X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=doop.c;h=be3e67410960586587586d1415560e8235464f32;hb=377729033bd4c3e2f6c0ac6b0d2bde9a83c5da6d;hp=93b618ce5b1733d910453968a8ec7f70c3f9cf22;hpb=af702f0e61214b54e323d12ffeaff4e64bee707c;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/doop.c b/doop.c
index 93b618c..be3e674 100644
--- a/doop.c
+++ b/doop.c
@@ -31,7 +31,7 @@ do_trans(SV *sv, OP *arg)
     register I32 squash = op->op_private & OPpTRANS_SQUASH;
     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);
@@ -52,6 +52,14 @@ do_trans(SV *sv, OP *arg)
 	    }
 	    s++;
 	}
+	SvSETMAGIC(sv);
+    }
+    else if (op->op_private & OPpTRANS_COUNTONLY) {
+	while (s < send) {
+	    if (tbl[*s] >= 0)
+		matches++;
+	    s++;
+	}
     }
     else {
 	d = s;
@@ -74,8 +82,8 @@ do_trans(SV *sv, OP *arg)
 	matches += send - d;	/* account for disappeared chars */
 	*d = '\0';
 	SvCUR_set(sv, d - (U8*)SvPVX(sv));
+	SvSETMAGIC(sv);
     }
-    SvSETMAGIC(sv);
     return matches;
 }
 
@@ -432,7 +440,7 @@ do_vop(I32 optype, SV *sv, SV *left, SV *right)
 OP *
 do_kv(ARGSproto)
 {
-    dSP;
+    djSP;
     HV *hv = (HV*)POPs;
     register HE *entry;
     SV *tmpstr;
@@ -514,3 +522,4 @@ do_kv(ARGSproto)
     }
     return NORMAL;
 }
+