regcomp.c: Fix comment typos

[perl5.git] / doop.c

diff --git a/doop.c b/doop.c
index 6a136d9..3ed63f6 100644 (file)
--- a/doop.c
+++ b/doop.c
@@ -669,12 +669,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 +706,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);
 }
@@ -1215,6 +1223,9 @@ finish:
     SvTAINT(sv);
 }
 
+
+/* used for: pp_keys(), pp_values() */
+
 OP *
 Perl_do_kv(pTHX)
 {
@@ -1258,27 +1269,22 @@ 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);
            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;
 }
 
 /*