import Time-HiRes v1.9727_02 from CPAN

[perl5.git] / doop.c

diff --git a/doop.c b/doop.c
index 6a136d9..19fe310 100644 (file)
--- a/doop.c
+++ b/doop.c
@@ -619,18 +619,18 @@ I32
 Perl_do_trans(pTHX_ SV *sv)
 {
     STRLEN len;
-    const I32 hasutf = (PL_op->op_private &
-                    (OPpTRANS_FROM_UTF|OPpTRANS_TO_UTF));
+    const I32 flags = PL_op->op_private;
+    const I32 hasutf = flags & (OPpTRANS_FROM_UTF | OPpTRANS_TO_UTF);
 
     PERL_ARGS_ASSERT_DO_TRANS;
 
-    if (SvREADONLY(sv) && !(PL_op->op_private & OPpTRANS_IDENTICAL)) {
-            Perl_croak_no_modify();
+    if (SvREADONLY(sv) && !(flags & OPpTRANS_IDENTICAL)) {
+        Perl_croak_no_modify();
     }
     (void)SvPV_const(sv, len);
     if (!len)
        return 0;
-    if (!(PL_op->op_private & OPpTRANS_IDENTICAL)) {
+    if (!(flags & OPpTRANS_IDENTICAL)) {
        if (!SvPOKp(sv) || SvTHINKFIRST(sv))
            (void)SvPV_force_nomg(sv, len);
        (void)SvPOK_only_UTF8(sv);
@@ -638,27 +638,15 @@ Perl_do_trans(pTHX_ SV *sv)
 
     DEBUG_t( Perl_deb(aTHX_ "2.TBL\n"));
 
-    switch (PL_op->op_private & ~hasutf & (
-               OPpTRANS_FROM_UTF|OPpTRANS_TO_UTF|OPpTRANS_IDENTICAL|
-               OPpTRANS_SQUASH|OPpTRANS_DELETE|OPpTRANS_COMPLEMENT)) {
-    case 0:
-       if (hasutf)
-           return do_trans_simple_utf8(sv);
-       else
-           return do_trans_simple(sv);
-
-    case OPpTRANS_IDENTICAL:
-    case OPpTRANS_IDENTICAL|OPpTRANS_COMPLEMENT:
-       if (hasutf)
-           return do_trans_count_utf8(sv);
-       else
-           return do_trans_count(sv);
-
-    default:
-       if (hasutf)
-           return do_trans_complex_utf8(sv);
-       else
-           return do_trans_complex(sv);
+    /* If we use only OPpTRANS_IDENTICAL to bypass the READONLY check,
+     * we must also rely on it to choose the readonly strategy.
+     */
+    if (flags & OPpTRANS_IDENTICAL) {
+        return hasutf ? do_trans_count_utf8(sv) : do_trans_count(sv);
+    } else if (flags & (OPpTRANS_SQUASH|OPpTRANS_DELETE|OPpTRANS_COMPLEMENT)) {
+        return hasutf ? do_trans_complex_utf8(sv) : do_trans_complex(sv);
+    } else {
+        return hasutf ? do_trans_simple_utf8(sv) : do_trans_simple(sv);
     }
 }
 
@@ -669,12 +657,10 @@ Perl_do_join(pTHX_ SV *sv, SV *delim, SV **mark, SV **sp)
     I32 items = sp - mark;
     STRLEN len;
     STRLEN delimlen;
+    const char * const delims = SvPV_const(delim, delimlen);
 
     PERL_ARGS_ASSERT_DO_JOIN;
 
-    (void) SvPV_const(delim, delimlen); /* stringify and get the delimlen */
-    /* SvCUR assumes it's SvPOK() and woe betide you if it's not. */
-
     mark++;
     len = (items > 0 ? (delimlen * (items - 1) ) : 0);
     SvUPGRADE(sv, SVt_PV);
@@ -708,14 +694,24 @@ Perl_do_join(pTHX_ SV *sv, SV *delim, SV **mark, SV **sp)
     }
 
     if (delimlen) {
+       const U32 delimflag = DO_UTF8(delim) ? SV_CATUTF8 : SV_CATBYTES;
        for (; items > 0; items--,mark++) {
-           sv_catsv_nomg(sv,delim);
-           sv_catsv(sv,*mark);
+           STRLEN len;
+           const char *s;
+           sv_catpvn_flags(sv,delims,delimlen,delimflag);
+           s = SvPV_const(*mark,len);
+           sv_catpvn_flags(sv,s,len,
+                           DO_UTF8(*mark) ? SV_CATUTF8 : SV_CATBYTES);
        }
     }
     else {
        for (; items > 0; items--,mark++)
-           sv_catsv(sv,*mark);
+       {
+           STRLEN len;
+           const char *s = SvPV_const(*mark,len);
+           sv_catpvn_flags(sv,s,len,
+                           DO_UTF8(*mark) ? SV_CATUTF8 : SV_CATBYTES);
+       }
     }
     SvSETMAGIC(sv);
 }
@@ -1211,10 +1207,13 @@ Perl_do_vop(pTHX_ I32 optype, SV *sv, SV *left, SV *right)
            break;
        }
     }
-finish:
+  finish:
     SvTAINT(sv);
 }
 
+
+/* used for: pp_keys(), pp_values() */
+
 OP *
 Perl_do_kv(pTHX)
 {
@@ -1224,8 +1223,8 @@ Perl_do_kv(pTHX)
     const I32 gimme = GIMME_V;
     const I32 dokv =     (PL_op->op_type == OP_RV2HV || PL_op->op_type == OP_PADHV);
     /* op_type is OP_RKEYS/OP_RVALUES if pp_rkeys delegated to here */
-    const I32 dokeys =   dokv || (PL_op->op_type == OP_KEYS || PL_op->op_type == OP_RKEYS);
-    const I32 dovalues = dokv || (PL_op->op_type == OP_VALUES || PL_op->op_type == OP_RVALUES);
+    const I32 dokeys =   dokv || (PL_op->op_type == OP_KEYS);
+    const I32 dovalues = dokv || (PL_op->op_type == OP_VALUES);
 
     (void)hv_iterinit(keys);   /* always reset iterator regardless */
 
@@ -1258,35 +1257,23 @@ Perl_do_kv(pTHX)
 
     EXTEND(SP, HvUSEDKEYS(keys) * (dokeys + dovalues));
 
-    PUTBACK;   /* hv_iternext and hv_iterval might clobber stack_sp */
     while ((entry = hv_iternext(keys))) {
-       SPAGAIN;
        if (dokeys) {
            SV* const sv = hv_iterkeysv(entry);
-           XPUSHs(sv); /* won't clobber stack_sp */
+           XPUSHs(sv);
        }
        if (dovalues) {
-           SV *tmpstr;
-           PUTBACK;
-           tmpstr = hv_iterval(keys,entry);
+           SV *tmpstr = hv_iterval(keys,entry);
            DEBUG_H(Perl_sv_setpvf(aTHX_ tmpstr, "%lu%%%d=%lu",
                            (unsigned long)HeHASH(entry),
                            (int)HvMAX(keys)+1,
                            (unsigned long)(HeHASH(entry) & HvMAX(keys))));
-           SPAGAIN;
            XPUSHs(tmpstr);
        }
-       PUTBACK;
     }
-    return NORMAL;
+    RETURN;
 }
 
 /*
- * Local variables:
- * c-indentation-style: bsd
- * c-basic-offset: 4
- * indent-tabs-mode: nil
- * End:
- *
  * ex: set ts=8 sts=4 sw=4 et:
  */