/* doop.c
*
- * Copyright (c) 1991-1994, Larry Wall
+ * Copyright (c) 1991-2001, Larry Wall
*
* You may distribute under the terms of either the GNU General Public
* License or the Artistic License, as specified in the README file.
*/
#include "EXTERN.h"
+#define PERL_IN_DOOP_C
#include "perl.h"
+#ifndef PERL_MICRO
#if !defined(NSIG) || defined(M_UNIX) || defined(M_XENIX)
#include <signal.h>
#endif
+#endif
-#ifdef BUGGY_MSC
- #pragma function(memcmp)
-#endif /* BUGGY_MSC */
+STATIC I32
+S_do_trans_simple(pTHX_ SV *sv)
+{
+ U8 *s;
+ U8 *d;
+ U8 *send;
+ U8 *dstart;
+ I32 matches = 0;
+ I32 grows = PL_op->op_private & OPpTRANS_GROWS;
+ STRLEN len;
+ short *tbl;
+ I32 ch;
-#ifdef BUGGY_MSC
- #pragma intrinsic(memcmp)
-#endif /* BUGGY_MSC */
+ tbl = (short*)cPVOP->op_pv;
+ if (!tbl)
+ Perl_croak(aTHX_ "panic: do_trans_simple line %d",__LINE__);
-I32
-do_trans(sv,arg)
-SV *sv;
-OP *arg;
+ s = (U8*)SvPV(sv, len);
+ send = s + len;
+
+ /* First, take care of non-UTF8 input strings, because they're easy */
+ if (!SvUTF8(sv)) {
+ while (s < send) {
+ if ((ch = tbl[*s]) >= 0) {
+ matches++;
+ *s++ = ch;
+ }
+ else
+ s++;
+ }
+ SvSETMAGIC(sv);
+ return matches;
+ }
+
+ /* Allow for expansion: $_="a".chr(400); tr/a/\xFE/, FE needs encoding */
+ if (grows)
+ New(0, d, len*2+1, U8);
+ else
+ d = s;
+ dstart = d;
+ while (s < send) {
+ STRLEN ulen;
+ UV c;
+
+ /* Need to check this, otherwise 128..255 won't match */
+ c = utf8n_to_uvchr(s, send - s, &ulen, 0);
+ if (c < 0x100 && (ch = tbl[c]) >= 0) {
+ matches++;
+ d = uvchr_to_utf8(d, ch);
+ s += ulen;
+ }
+ else { /* No match -> copy */
+ Copy(s, d, ulen, U8);
+ d += ulen;
+ s += ulen;
+ }
+ }
+ if (grows) {
+ sv_setpvn(sv, (char*)dstart, d - dstart);
+ Safefree(dstart);
+ }
+ else {
+ *d = '\0';
+ SvCUR_set(sv, d - dstart);
+ }
+ SvUTF8_on(sv);
+ SvSETMAGIC(sv);
+ return matches;
+}
+
+STATIC I32
+S_do_trans_count(pTHX_ SV *sv)
{
- register short *tbl;
- register U8 *s;
- register U8 *send;
- register U8 *d;
- register I32 ch;
- register I32 matches = 0;
- register I32 squash = op->op_private & OPpTRANS_SQUASH;
+ U8 *s;
+ U8 *send;
+ I32 matches = 0;
STRLEN len;
+ short *tbl;
+ I32 complement = PL_op->op_private & OPpTRANS_COMPLEMENT;
- if (SvREADONLY(sv))
- croak(no_modify);
tbl = (short*)cPVOP->op_pv;
+ if (!tbl)
+ Perl_croak(aTHX_ "panic: do_trans_count line %d",__LINE__);
+
s = (U8*)SvPV(sv, len);
- if (!len)
- return 0;
- if (!SvPOKp(sv))
- s = (U8*)SvPV_force(sv, len);
- (void)SvPOK_only(sv);
send = s + len;
- if (!tbl || !s)
- croak("panic: do_trans");
- DEBUG_t( deb("2.TBL\n"));
- if (!op->op_private) {
+
+ if (!SvUTF8(sv))
while (s < send) {
- if ((ch = tbl[*s]) >= 0) {
+ if (tbl[*s++] >= 0)
+ matches++;
+ }
+ else
+ while (s < send) {
+ UV c;
+ STRLEN ulen;
+ c = utf8n_to_uvchr(s, send - s, &ulen, 0);
+ if (c < 0x100) {
+ if (tbl[c] >= 0)
+ matches++;
+ } else if (complement)
matches++;
- *s = ch;
+ s += ulen;
+ }
+
+ return matches;
+}
+
+STATIC I32
+S_do_trans_complex(pTHX_ SV *sv)
+{
+ U8 *s;
+ U8 *send;
+ U8 *d;
+ U8 *dstart;
+ I32 isutf8;
+ I32 matches = 0;
+ I32 grows = PL_op->op_private & OPpTRANS_GROWS;
+ I32 complement = PL_op->op_private & OPpTRANS_COMPLEMENT;
+ I32 del = PL_op->op_private & OPpTRANS_DELETE;
+ STRLEN len, rlen = 0;
+ short *tbl;
+ I32 ch;
+
+ tbl = (short*)cPVOP->op_pv;
+ if (!tbl)
+ Perl_croak(aTHX_ "panic: do_trans_complex line %d",__LINE__);
+
+ s = (U8*)SvPV(sv, len);
+ isutf8 = SvUTF8(sv);
+ send = s + len;
+
+ if (!isutf8) {
+ dstart = d = s;
+ if (PL_op->op_private & OPpTRANS_SQUASH) {
+ U8* p = send;
+ while (s < send) {
+ if ((ch = tbl[*s]) >= 0) {
+ *d = ch;
+ matches++;
+ if (p != d - 1 || *p != *d)
+ p = d++;
+ }
+ else if (ch == -1) /* -1 is unmapped character */
+ *d++ = *s;
+ else if (ch == -2) /* -2 is delete character */
+ matches++;
+ s++;
+ }
+ }
+ else {
+ while (s < send) {
+ if ((ch = tbl[*s]) >= 0) {
+ matches++;
+ *d++ = ch;
+ }
+ else if (ch == -1) /* -1 is unmapped character */
+ *d++ = *s;
+ else if (ch == -2) /* -2 is delete character */
+ matches++;
+ s++;
+ }
+ }
+ *d = '\0';
+ SvCUR_set(sv, d - dstart);
+ }
+ else { /* isutf8 */
+ if (grows)
+ New(0, d, len*2+1, U8);
+ else
+ d = s;
+ dstart = d;
+ if (complement && !del)
+ rlen = tbl[0x100];
+
+#ifdef MACOS_TRADITIONAL
+#define comp CoMP /* "comp" is a keyword in some compilers ... */
+#endif
+
+ if (PL_op->op_private & OPpTRANS_SQUASH) {
+ UV pch = 0xfeedface;
+ while (s < send) {
+ STRLEN len;
+ UV comp = utf8_to_uvchr(s, &len);
+
+ if (comp > 0xff) {
+ if (!complement) {
+ Copy(s, d, len, U8);
+ d += len;
+ }
+ else {
+ matches++;
+ if (!del) {
+ ch = (rlen == 0) ? comp :
+ (comp - 0x100 < rlen) ?
+ tbl[comp+1] : tbl[0x100+rlen];
+ if (ch != pch) {
+ d = uvchr_to_utf8(d, ch);
+ pch = ch;
+ }
+ s += len;
+ continue;
+ }
+ }
+ }
+ else if ((ch = tbl[comp]) >= 0) {
+ matches++;
+ if (ch != pch) {
+ d = uvchr_to_utf8(d, ch);
+ pch = ch;
+ }
+ s += len;
+ continue;
+ }
+ else if (ch == -1) { /* -1 is unmapped character */
+ Copy(s, d, len, U8);
+ d += len;
+ }
+ else if (ch == -2) /* -2 is delete character */
+ matches++;
+ s += len;
+ pch = 0xfeedface;
+ }
+ }
+ else {
+ while (s < send) {
+ STRLEN len;
+ UV comp = utf8_to_uvchr(s, &len);
+ if (comp > 0xff) {
+ if (!complement) {
+ Copy(s, d, len, U8);
+ d += len;
+ }
+ else {
+ matches++;
+ if (!del) {
+ if (comp - 0x100 < rlen)
+ d = uvchr_to_utf8(d, tbl[comp+1]);
+ else
+ d = uvchr_to_utf8(d, tbl[0x100+rlen]);
+ }
+ }
+ }
+ else if ((ch = tbl[comp]) >= 0) {
+ d = uvchr_to_utf8(d, ch);
+ matches++;
+ }
+ else if (ch == -1) { /* -1 is unmapped character */
+ Copy(s, d, len, U8);
+ d += len;
+ }
+ else if (ch == -2) /* -2 is delete character */
+ matches++;
+ s += len;
}
- s++;
}
+ if (grows) {
+ sv_setpvn(sv, (char*)dstart, d - dstart);
+ Safefree(dstart);
+ }
+ else {
+ *d = '\0';
+ SvCUR_set(sv, d - dstart);
+ }
+ SvUTF8_on(sv);
+ }
+ SvSETMAGIC(sv);
+ return matches;
+}
+
+STATIC I32
+S_do_trans_simple_utf8(pTHX_ SV *sv)
+{
+ U8 *s;
+ U8 *send;
+ U8 *d;
+ U8 *start;
+ U8 *dstart, *dend;
+ I32 matches = 0;
+ I32 grows = PL_op->op_private & OPpTRANS_GROWS;
+ STRLEN len;
+
+ SV* rv = (SV*)cSVOP->op_sv;
+ HV* hv = (HV*)SvRV(rv);
+ SV** svp = hv_fetch(hv, "NONE", 4, FALSE);
+ UV none = svp ? SvUV(*svp) : 0x7fffffff;
+ UV extra = none + 1;
+ UV final = 0;
+ UV uv;
+ I32 isutf8;
+ U8 hibit = 0;
+
+ s = (U8*)SvPV(sv, len);
+ isutf8 = SvUTF8(sv);
+ if (!isutf8) {
+ U8 *t = s, *e = s + len;
+ while (t < e) {
+ U8 ch = *t++;
+ if ((hibit = !NATIVE_IS_INVARIANT(ch)))
+ break;
+ }
+ if (hibit)
+ s = bytes_to_utf8(s, &len);
+ }
+ send = s + len;
+ start = s;
+
+ svp = hv_fetch(hv, "FINAL", 5, FALSE);
+ if (svp)
+ final = SvUV(*svp);
+
+ if (grows) {
+ /* d needs to be bigger than s, in case e.g. upgrading is required */
+ New(0, d, len*3+UTF8_MAXLEN, U8);
+ dend = d + len * 3;
+ dstart = d;
}
else {
- d = s;
+ dstart = d = s;
+ dend = d + len;
+ }
+
+ while (s < send) {
+ if ((uv = swash_fetch(rv, s, TRUE)) < none) {
+ s += UTF8SKIP(s);
+ matches++;
+ d = uvuni_to_utf8(d, uv);
+ }
+ else if (uv == none) {
+ int i = UTF8SKIP(s);
+ Copy(s, d, i, U8);
+ d += i;
+ s += i;
+ }
+ else if (uv == extra) {
+ int i = UTF8SKIP(s);
+ s += i;
+ matches++;
+ d = uvuni_to_utf8(d, final);
+ }
+ else
+ s += UTF8SKIP(s);
+
+ if (d > dend) {
+ STRLEN clen = d - dstart;
+ STRLEN nlen = dend - dstart + len + UTF8_MAXLEN;
+ if (!grows)
+ Perl_croak(aTHX_ "panic: do_trans_simple_utf8 line %d",__LINE__);
+ Renew(dstart, nlen+UTF8_MAXLEN, U8);
+ d = dstart + clen;
+ dend = dstart + nlen;
+ }
+ }
+ if (grows || hibit) {
+ sv_setpvn(sv, (char*)dstart, d - dstart);
+ Safefree(dstart);
+ if (grows && hibit)
+ Safefree(start);
+ }
+ else {
+ *d = '\0';
+ SvCUR_set(sv, d - dstart);
+ }
+ SvSETMAGIC(sv);
+ SvUTF8_on(sv);
+
+ return matches;
+}
+
+STATIC I32
+S_do_trans_count_utf8(pTHX_ SV *sv)
+{
+ U8 *s;
+ U8 *start = 0, *send;
+ I32 matches = 0;
+ STRLEN len;
+
+ SV* rv = (SV*)cSVOP->op_sv;
+ HV* hv = (HV*)SvRV(rv);
+ SV** svp = hv_fetch(hv, "NONE", 4, FALSE);
+ UV none = svp ? SvUV(*svp) : 0x7fffffff;
+ UV extra = none + 1;
+ UV uv;
+ U8 hibit = 0;
+
+ s = (U8*)SvPV(sv, len);
+ if (!SvUTF8(sv)) {
+ U8 *t = s, *e = s + len;
+ while (t < e) {
+ U8 ch = *t++;
+ if ((hibit = !NATIVE_IS_INVARIANT(ch)))
+ break;
+ }
+ if (hibit)
+ start = s = bytes_to_utf8(s, &len);
+ }
+ send = s + len;
+
+ while (s < send) {
+ if ((uv = swash_fetch(rv, s, TRUE)) < none || uv == extra)
+ matches++;
+ s += UTF8SKIP(s);
+ }
+ if (hibit)
+ Safefree(start);
+
+ return matches;
+}
+
+STATIC I32
+S_do_trans_complex_utf8(pTHX_ SV *sv)
+{
+ U8 *s;
+ U8 *start, *send;
+ U8 *d;
+ I32 matches = 0;
+ I32 squash = PL_op->op_private & OPpTRANS_SQUASH;
+ I32 del = PL_op->op_private & OPpTRANS_DELETE;
+ I32 grows = PL_op->op_private & OPpTRANS_GROWS;
+ SV* rv = (SV*)cSVOP->op_sv;
+ HV* hv = (HV*)SvRV(rv);
+ SV** svp = hv_fetch(hv, "NONE", 4, FALSE);
+ UV none = svp ? SvUV(*svp) : 0x7fffffff;
+ UV extra = none + 1;
+ UV final = 0;
+ bool havefinal = FALSE;
+ UV uv;
+ STRLEN len;
+ U8 *dstart, *dend;
+ I32 isutf8;
+ U8 hibit = 0;
+
+ s = (U8*)SvPV(sv, len);
+ isutf8 = SvUTF8(sv);
+ if (!isutf8) {
+ U8 *t = s, *e = s + len;
+ while (t < e) {
+ U8 ch = *t++;
+ if ((hibit = !NATIVE_IS_INVARIANT(ch)))
+ break;
+ }
+ if (hibit)
+ s = bytes_to_utf8(s, &len);
+ }
+ send = s + len;
+ start = s;
+
+ svp = hv_fetch(hv, "FINAL", 5, FALSE);
+ if (svp) {
+ final = SvUV(*svp);
+ havefinal = TRUE;
+ }
+
+ if (grows) {
+ /* d needs to be bigger than s, in case e.g. upgrading is required */
+ New(0, d, len*3+UTF8_MAXLEN, U8);
+ dend = d + len * 3;
+ dstart = d;
+ }
+ else {
+ dstart = d = s;
+ dend = d + len;
+ }
+
+ if (squash) {
+ UV puv = 0xfeedface;
while (s < send) {
- if ((ch = tbl[*s]) >= 0) {
- *d = ch;
- if (matches++ && squash) {
- if (d[-1] == *d)
- matches--;
- else
- d++;
+ uv = swash_fetch(rv, s, TRUE);
+
+ if (d > dend) {
+ STRLEN clen = d - dstart;
+ STRLEN nlen = dend - dstart + len + UTF8_MAXLEN;
+ if (!grows)
+ Perl_croak(aTHX_ "panic: do_trans_complex_utf8 line %d",__LINE__);
+ Renew(dstart, nlen+UTF8_MAXLEN, U8);
+ d = dstart + clen;
+ dend = dstart + nlen;
+ }
+ if (uv < none) {
+ matches++;
+ s += UTF8SKIP(s);
+ if (uv != puv) {
+ d = uvuni_to_utf8(d, uv);
+ puv = uv;
}
- else
- d++;
+ continue;
+ }
+ else if (uv == none) { /* "none" is unmapped character */
+ int i = UTF8SKIP(s);
+ Copy(s, d, i, U8);
+ d += i;
+ s += i;
+ puv = 0xfeedface;
+ continue;
}
- else if (ch == -1) /* -1 is unmapped character */
- *d++ = *s; /* -2 is delete character */
- s++;
+ else if (uv == extra && !del) {
+ matches++;
+ if (havefinal) {
+ s += UTF8SKIP(s);
+ if (puv != final) {
+ d = uvuni_to_utf8(d, final);
+ puv = final;
+ }
+ }
+ else {
+ STRLEN len;
+ uv = utf8_to_uvuni(s, &len);
+ if (uv != puv) {
+ Copy(s, d, len, U8);
+ d += len;
+ puv = uv;
+ }
+ s += len;
+ }
+ continue;
+ }
+ matches++; /* "none+1" is delete character */
+ s += UTF8SKIP(s);
}
- matches += send - d; /* account for disappeared chars */
+ }
+ else {
+ while (s < send) {
+ uv = swash_fetch(rv, s, TRUE);
+ if (d > dend) {
+ STRLEN clen = d - dstart;
+ STRLEN nlen = dend - dstart + len + UTF8_MAXLEN;
+ if (!grows)
+ Perl_croak(aTHX_ "panic: do_trans_complex_utf8 line %d",__LINE__);
+ Renew(dstart, nlen+UTF8_MAXLEN, U8);
+ d = dstart + clen;
+ dend = dstart + nlen;
+ }
+ if (uv < none) {
+ matches++;
+ s += UTF8SKIP(s);
+ d = uvuni_to_utf8(d, uv);
+ continue;
+ }
+ else if (uv == none) { /* "none" is unmapped character */
+ int i = UTF8SKIP(s);
+ Copy(s, d, i, U8);
+ d += i;
+ s += i;
+ continue;
+ }
+ else if (uv == extra && !del) {
+ matches++;
+ s += UTF8SKIP(s);
+ d = uvuni_to_utf8(d, final);
+ continue;
+ }
+ matches++; /* "none+1" is delete character */
+ s += UTF8SKIP(s);
+ }
+ }
+ if (grows || hibit) {
+ sv_setpvn(sv, (char*)dstart, d - dstart);
+ Safefree(dstart);
+ if (grows && hibit)
+ Safefree(start);
+ }
+ else {
*d = '\0';
- SvCUR_set(sv, d - (U8*)SvPVX(sv));
+ SvCUR_set(sv, d - dstart);
}
+ SvUTF8_on(sv);
SvSETMAGIC(sv);
+
return matches;
}
+I32
+Perl_do_trans(pTHX_ SV *sv)
+{
+ STRLEN len;
+ I32 hasutf = (PL_op->op_private &
+ (OPpTRANS_FROM_UTF|OPpTRANS_TO_UTF));
+
+ if (SvREADONLY(sv) && !(PL_op->op_private & OPpTRANS_IDENTICAL))
+ Perl_croak(aTHX_ PL_no_modify);
+
+ (void)SvPV(sv, len);
+ if (!len)
+ return 0;
+ if (!SvPOKp(sv))
+ (void)SvPV_force(sv, len);
+ if (!(PL_op->op_private & OPpTRANS_IDENTICAL))
+ (void)SvPOK_only_UTF8(sv);
+
+ DEBUG_t( Perl_deb(aTHX_ "2.TBL\n"));
+
+ switch (PL_op->op_private & ~hasutf & 63) {
+ 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);
+ }
+}
+
void
-do_join(sv,del,mark,sp)
-register SV *sv;
-SV *del;
-register SV **mark;
-register SV **sp;
+Perl_do_join(pTHX_ register SV *sv, SV *del, register SV **mark, register SV **sp)
{
SV **oldmark = mark;
register I32 items = sp - mark;
register STRLEN len;
STRLEN delimlen;
- register char *delim = SvPV(del, delimlen);
STRLEN tmplen;
+ (void) SvPV(del, 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);
- if (SvTYPE(sv) < SVt_PV)
- sv_upgrade(sv, SVt_PV);
+ (void)SvUPGRADE(sv, SVt_PV);
if (SvLEN(sv) < len + items) { /* current length is way too short */
while (items-- > 0) {
- if (*mark) {
+ if (*mark && !SvGAMAGIC(*mark) && SvOK(*mark)) {
SvPV(*mark, tmplen);
len += tmplen;
}
SvGROW(sv, len + 1); /* so try to pre-extend */
mark = oldmark;
- items = sp - mark;;
+ items = sp - mark;
++mark;
}
- if (items-- > 0) {
- char *s;
+ sv_setpv(sv, "");
+ if (PL_tainting && SvMAGICAL(sv))
+ SvTAINTED_off(sv);
- if (*mark) {
- s = SvPV(*mark, tmplen);
- sv_setpvn(sv, s, tmplen);
- }
- else
- sv_setpv(sv, "");
+ if (items-- > 0) {
+ if (*mark)
+ sv_catsv(sv, *mark);
mark++;
}
- else
- sv_setpv(sv,"");
- len = delimlen;
- if (len) {
+
+ if (delimlen) {
for (; items > 0; items--,mark++) {
- sv_catpvn(sv,delim,len);
+ sv_catsv(sv,del);
sv_catsv(sv,*mark);
}
}
}
void
-do_sprintf(sv,len,sarg)
-register SV *sv;
-register I32 len;
-register SV **sarg;
+Perl_do_sprintf(pTHX_ SV *sv, I32 len, SV **sarg)
{
- register char *s;
- register char *t;
- register char *f;
- bool dolong;
-#ifdef HAS_QUAD
- bool doquad;
-#endif /* HAS_QUAD */
- char ch;
- register char *send;
- register SV *arg;
- char *xs;
- I32 xlen;
- I32 pre;
- I32 post;
- double value;
- STRLEN arglen;
-
- sv_setpv(sv,"");
- len--; /* don't count pattern string */
- t = s = SvPV(*sarg, arglen); /* XXX Don't know t is writeable */
- send = s + arglen;
- sarg++;
- for ( ; ; len--) {
-
- /*SUPPRESS 560*/
- if (len <= 0 || !(arg = *sarg++))
- arg = &sv_no;
-
- /*SUPPRESS 530*/
- for ( ; t < send && *t != '%'; t++) ;
- if (t >= send)
- break; /* end of run_format string, ignore extra args */
- f = t;
- *buf = '\0';
- xs = buf;
-#ifdef HAS_QUAD
- doquad =
-#endif /* HAS_QUAD */
- dolong = FALSE;
- pre = post = 0;
- for (t++; t < send; t++) {
- switch (*t) {
- default:
- ch = *(++t);
- *t = '\0';
- (void)sprintf(xs,f);
- len++, sarg--;
- xlen = strlen(xs);
- break;
- case 'n': case '*':
- croak("Use of %c in printf format not supported", *t);
+ STRLEN patlen;
+ char *pat = SvPV(*sarg, patlen);
+ bool do_taint = FALSE;
- case '0': case '1': case '2': case '3': case '4':
- case '5': case '6': case '7': case '8': case '9':
- case '.': case '#': case '-': case '+': case ' ':
- continue;
- case 'l':
-#ifdef HAS_QUAD
- if (dolong) {
- dolong = FALSE;
- doquad = TRUE;
- } else
-#endif
- dolong = TRUE;
- continue;
- case 'c':
- ch = *(++t);
- *t = '\0';
- xlen = SvIV(arg);
- if (strEQ(f,"%c")) { /* some printfs fail on null chars */
- *xs = xlen;
- xs[1] = '\0';
- xlen = 1;
- }
- else {
- (void)sprintf(xs,f,xlen);
- xlen = strlen(xs);
- }
- break;
- case 'D':
- dolong = TRUE;
- /* FALL THROUGH */
- case 'd':
- ch = *(++t);
- *t = '\0';
-#ifdef HAS_QUAD
- if (doquad)
- (void)sprintf(buf,s,(Quad_t)SvNV(arg));
- else
-#endif
- if (dolong)
- (void)sprintf(xs,f,(long)SvNV(arg));
- else
- (void)sprintf(xs,f,SvIV(arg));
- xlen = strlen(xs);
- break;
- case 'X': case 'O':
- dolong = TRUE;
- /* FALL THROUGH */
- case 'x': case 'o': case 'u':
- ch = *(++t);
- *t = '\0';
- value = SvNV(arg);
-#ifdef HAS_QUAD
- if (doquad)
- (void)sprintf(buf,s,(unsigned Quad_t)value);
- else
-#endif
- if (dolong)
- (void)sprintf(xs,f,U_L(value));
- else
- (void)sprintf(xs,f,U_I(value));
- xlen = strlen(xs);
- break;
- case 'E': case 'e': case 'f': case 'G': case 'g':
- ch = *(++t);
- *t = '\0';
- (void)sprintf(xs,f,SvNV(arg));
- xlen = strlen(xs);
- break;
- case 's':
- ch = *(++t);
- *t = '\0';
- xs = SvPV(arg, arglen);
- xlen = (I32)arglen;
- if (strEQ(f,"%s")) { /* some printfs fail on >128 chars */
- break; /* so handle simple cases */
- }
- else if (f[1] == '-') {
- char *mp = strchr(f, '.');
- I32 min = atoi(f+2);
+ sv_vsetpvfn(sv, pat, patlen, Null(va_list*), sarg + 1, len - 1, &do_taint);
+ SvSETMAGIC(sv);
+ if (do_taint)
+ SvTAINTED_on(sv);
+}
- if (mp) {
- I32 max = atoi(mp+1);
+/* currently converts input to bytes if possible, but doesn't sweat failure */
+UV
+Perl_do_vecget(pTHX_ SV *sv, I32 offset, I32 size)
+{
+ STRLEN srclen, len;
+ unsigned char *s = (unsigned char *) SvPV(sv, srclen);
+ UV retnum = 0;
- if (xlen > max)
- xlen = max;
- }
- if (xlen < min)
- post = min - xlen;
- break;
- }
- else if (isDIGIT(f[1])) {
- char *mp = strchr(f, '.');
- I32 min = atoi(f+1);
+ if (offset < 0)
+ return retnum;
+ if (size < 1 || (size & (size-1))) /* size < 1 or not a power of two */
+ Perl_croak(aTHX_ "Illegal number of bits in vec");
- if (mp) {
- I32 max = atoi(mp+1);
+ if (SvUTF8(sv))
+ (void) Perl_sv_utf8_downgrade(aTHX_ sv, TRUE);
- if (xlen > max)
- xlen = max;
- }
- if (xlen < min)
- pre = min - xlen;
- break;
- }
- strcpy(tokenbuf+64,f); /* sprintf($s,...$s...) */
- *t = ch;
- (void)sprintf(buf,tokenbuf+64,xs);
- xs = buf;
- xlen = strlen(xs);
- break;
- }
- /* end of switch, copy results */
- *t = ch;
- if (xs == buf && xlen >= sizeof(buf)) { /* Ooops! */
- fputs("panic: sprintf overflow - memory corrupted!\n",stderr);
- my_exit(1);
+ offset *= size; /* turn into bit offset */
+ len = (offset + size + 7) / 8; /* required number of bytes */
+ if (len > srclen) {
+ if (size <= 8)
+ retnum = 0;
+ else {
+ offset >>= 3; /* turn into byte offset */
+ if (size == 16) {
+ if (offset >= srclen)
+ retnum = 0;
+ else
+ retnum = (UV) s[offset] << 8;
}
- SvGROW(sv, SvCUR(sv) + (f - s) + xlen + 1 + pre + post);
- sv_catpvn(sv, s, f - s);
- if (pre) {
- repeatcpy(SvPVX(sv) + SvCUR(sv), " ", 1, pre);
- SvCUR(sv) += pre;
+ else if (size == 32) {
+ if (offset >= srclen)
+ retnum = 0;
+ else if (offset + 1 >= srclen)
+ retnum =
+ ((UV) s[offset ] << 24);
+ else if (offset + 2 >= srclen)
+ retnum =
+ ((UV) s[offset ] << 24) +
+ ((UV) s[offset + 1] << 16);
+ else
+ retnum =
+ ((UV) s[offset ] << 24) +
+ ((UV) s[offset + 1] << 16) +
+ ( s[offset + 2] << 8);
}
- sv_catpvn(sv, xs, xlen);
- if (post) {
- repeatcpy(SvPVX(sv) + SvCUR(sv), " ", 1, post);
- SvCUR(sv) += post;
+#ifdef UV_IS_QUAD
+ else if (size == 64) {
+ if (ckWARN(WARN_PORTABLE))
+ Perl_warner(aTHX_ WARN_PORTABLE,
+ "Bit vector size > 32 non-portable");
+ if (offset >= srclen)
+ retnum = 0;
+ else if (offset + 1 >= srclen)
+ retnum =
+ (UV) s[offset ] << 56;
+ else if (offset + 2 >= srclen)
+ retnum =
+ ((UV) s[offset ] << 56) +
+ ((UV) s[offset + 1] << 48);
+ else if (offset + 3 >= srclen)
+ retnum =
+ ((UV) s[offset ] << 56) +
+ ((UV) s[offset + 1] << 48) +
+ ((UV) s[offset + 2] << 40);
+ else if (offset + 4 >= srclen)
+ retnum =
+ ((UV) s[offset ] << 56) +
+ ((UV) s[offset + 1] << 48) +
+ ((UV) s[offset + 2] << 40) +
+ ((UV) s[offset + 3] << 32);
+ else if (offset + 5 >= srclen)
+ retnum =
+ ((UV) s[offset ] << 56) +
+ ((UV) s[offset + 1] << 48) +
+ ((UV) s[offset + 2] << 40) +
+ ((UV) s[offset + 3] << 32) +
+ ( s[offset + 4] << 24);
+ else if (offset + 6 >= srclen)
+ retnum =
+ ((UV) s[offset ] << 56) +
+ ((UV) s[offset + 1] << 48) +
+ ((UV) s[offset + 2] << 40) +
+ ((UV) s[offset + 3] << 32) +
+ ((UV) s[offset + 4] << 24) +
+ ((UV) s[offset + 5] << 16);
+ else
+ retnum =
+ ((UV) s[offset ] << 56) +
+ ((UV) s[offset + 1] << 48) +
+ ((UV) s[offset + 2] << 40) +
+ ((UV) s[offset + 3] << 32) +
+ ((UV) s[offset + 4] << 24) +
+ ((UV) s[offset + 5] << 16) +
+ ( s[offset + 6] << 8);
}
- s = t;
- break; /* break from for loop */
+#endif
}
}
- sv_catpvn(sv, s, t - s);
- SvSETMAGIC(sv);
+ else if (size < 8)
+ retnum = (s[offset >> 3] >> (offset & 7)) & ((1 << size) - 1);
+ else {
+ offset >>= 3; /* turn into byte offset */
+ if (size == 8)
+ retnum = s[offset];
+ else if (size == 16)
+ retnum =
+ ((UV) s[offset] << 8) +
+ s[offset + 1];
+ else if (size == 32)
+ retnum =
+ ((UV) s[offset ] << 24) +
+ ((UV) s[offset + 1] << 16) +
+ ( s[offset + 2] << 8) +
+ s[offset + 3];
+#ifdef UV_IS_QUAD
+ else if (size == 64) {
+ if (ckWARN(WARN_PORTABLE))
+ Perl_warner(aTHX_ WARN_PORTABLE,
+ "Bit vector size > 32 non-portable");
+ retnum =
+ ((UV) s[offset ] << 56) +
+ ((UV) s[offset + 1] << 48) +
+ ((UV) s[offset + 2] << 40) +
+ ((UV) s[offset + 3] << 32) +
+ ((UV) s[offset + 4] << 24) +
+ ((UV) s[offset + 5] << 16) +
+ ( s[offset + 6] << 8) +
+ s[offset + 7];
+ }
+#endif
+ }
+
+ return retnum;
}
+/* currently converts input to bytes if possible but doesn't sweat failures,
+ * although it does ensure that the string it clobbers is not marked as
+ * utf8-valid any more
+ */
void
-do_vecset(sv)
-SV *sv;
+Perl_do_vecset(pTHX_ SV *sv)
{
SV *targ = LvTARG(sv);
register I32 offset;
register I32 size;
register unsigned char *s;
- register unsigned long lval;
+ register UV lval;
I32 mask;
STRLEN targlen;
STRLEN len;
if (!targ)
return;
s = (unsigned char*)SvPV_force(targ, targlen);
- lval = U_L(SvNV(sv));
+ if (SvUTF8(targ)) {
+ /* This is handled by the SvPOK_only below...
+ if (!Perl_sv_utf8_downgrade(aTHX_ targ, TRUE))
+ SvUTF8_off(targ);
+ */
+ (void) Perl_sv_utf8_downgrade(aTHX_ targ, TRUE);
+ }
+
+ (void)SvPOK_only(targ);
+ lval = SvUV(sv);
offset = LvTARGOFF(sv);
+ if (offset < 0)
+ Perl_croak(aTHX_ "Assigning to negative offset in vec");
size = LvTARGLEN(sv);
-
- len = (offset + size + 7) / 8;
+ if (size < 1 || (size & (size-1))) /* size < 1 or not a power of two */
+ Perl_croak(aTHX_ "Illegal number of bits in vec");
+
+ offset *= size; /* turn into bit offset */
+ len = (offset + size + 7) / 8; /* required number of bytes */
if (len > targlen) {
s = (unsigned char*)SvGROW(targ, len + 1);
- (void)memzero(s + targlen, len - targlen + 1);
+ (void)memzero((char *)(s + targlen), len - targlen + 1);
SvCUR_set(targ, len);
}
-
+
if (size < 8) {
mask = (1 << size) - 1;
size = offset & 7;
lval &= mask;
- offset >>= 3;
+ offset >>= 3; /* turn into byte offset */
s[offset] &= ~(mask << size);
s[offset] |= lval << size;
}
else {
- offset >>= 3;
+ offset >>= 3; /* turn into byte offset */
if (size == 8)
- s[offset] = lval & 255;
+ s[offset ] = lval & 0xff;
else if (size == 16) {
- s[offset] = (lval >> 8) & 255;
- s[offset+1] = lval & 255;
+ s[offset ] = (lval >> 8) & 0xff;
+ s[offset+1] = lval & 0xff;
}
else if (size == 32) {
- s[offset] = (lval >> 24) & 255;
- s[offset+1] = (lval >> 16) & 255;
- s[offset+2] = (lval >> 8) & 255;
- s[offset+3] = lval & 255;
+ s[offset ] = (lval >> 24) & 0xff;
+ s[offset+1] = (lval >> 16) & 0xff;
+ s[offset+2] = (lval >> 8) & 0xff;
+ s[offset+3] = lval & 0xff;
}
+#ifdef UV_IS_QUAD
+ else if (size == 64) {
+ if (ckWARN(WARN_PORTABLE))
+ Perl_warner(aTHX_ WARN_PORTABLE,
+ "Bit vector size > 32 non-portable");
+ s[offset ] = (lval >> 56) & 0xff;
+ s[offset+1] = (lval >> 48) & 0xff;
+ s[offset+2] = (lval >> 40) & 0xff;
+ s[offset+3] = (lval >> 32) & 0xff;
+ s[offset+4] = (lval >> 24) & 0xff;
+ s[offset+5] = (lval >> 16) & 0xff;
+ s[offset+6] = (lval >> 8) & 0xff;
+ s[offset+7] = lval & 0xff;
+ }
+#endif
}
+ SvSETMAGIC(targ);
}
void
-do_chop(astr,sv)
-register SV *astr;
-register SV *sv;
+Perl_do_chop(pTHX_ register SV *astr, register SV *sv)
{
STRLEN len;
char *s;
-
+
if (SvTYPE(sv) == SVt_PVAV) {
register I32 i;
I32 max;
max = AvFILL(av);
for (i = 0; i <= max; i++) {
sv = (SV*)av_fetch(av, i, FALSE);
- if (sv && ((sv = *(SV**)sv), sv != &sv_undef))
+ if (sv && ((sv = *(SV**)sv), sv != &PL_sv_undef))
do_chop(astr, sv);
}
return;
}
- if (SvTYPE(sv) == SVt_PVHV) {
+ else if (SvTYPE(sv) == SVt_PVHV) {
HV* hv = (HV*)sv;
HE* entry;
(void)hv_iterinit(hv);
/*SUPPRESS 560*/
- while (entry = hv_iternext(hv))
+ while ((entry = hv_iternext(hv)))
do_chop(astr,hv_iterval(hv,entry));
return;
}
+ else if (SvREADONLY(sv))
+ Perl_croak(aTHX_ PL_no_modify);
s = SvPV(sv, len);
if (len && !SvPOK(sv))
s = SvPV_force(sv, len);
- if (s && len) {
+ if (DO_UTF8(sv)) {
+ if (s && len) {
+ char *send = s + len;
+ char *start = s;
+ s = send - 1;
+ while (s > start && UTF8_IS_CONTINUATION(*s))
+ s--;
+ if (utf8_to_uvchr((U8*)s, 0)) {
+ sv_setpvn(astr, s, send - s);
+ *s = '\0';
+ SvCUR_set(sv, s - start);
+ SvNIOK_off(sv);
+ SvUTF8_on(astr);
+ }
+ }
+ else
+ sv_setpvn(astr, "", 0);
+ }
+ else if (s && len) {
s += --len;
sv_setpvn(astr, s, 1);
*s = '\0';
SvCUR_set(sv, len);
+ SvUTF8_off(sv);
SvNIOK_off(sv);
}
else
sv_setpvn(astr, "", 0);
SvSETMAGIC(sv);
-}
+}
I32
-do_chomp(sv)
-register SV *sv;
+Perl_do_chomp(pTHX_ register SV *sv)
{
register I32 count;
STRLEN len;
+ STRLEN n_a;
char *s;
- if (RsSNARF(rs))
+ if (RsSNARF(PL_rs))
return 0;
+ if (RsRECORD(PL_rs))
+ return 0;
count = 0;
if (SvTYPE(sv) == SVt_PVAV) {
register I32 i;
max = AvFILL(av);
for (i = 0; i <= max; i++) {
sv = (SV*)av_fetch(av, i, FALSE);
- if (sv && ((sv = *(SV**)sv), sv != &sv_undef))
+ if (sv && ((sv = *(SV**)sv), sv != &PL_sv_undef))
count += do_chomp(sv);
}
return count;
}
- if (SvTYPE(sv) == SVt_PVHV) {
+ else if (SvTYPE(sv) == SVt_PVHV) {
HV* hv = (HV*)sv;
HE* entry;
(void)hv_iterinit(hv);
/*SUPPRESS 560*/
- while (entry = hv_iternext(hv))
+ while ((entry = hv_iternext(hv)))
count += do_chomp(hv_iterval(hv,entry));
return count;
}
+ else if (SvREADONLY(sv))
+ Perl_croak(aTHX_ PL_no_modify);
s = SvPV(sv, len);
- if (len && !SvPOKp(sv))
- s = SvPV_force(sv, len);
if (s && len) {
s += --len;
- if (RsPARA(rs)) {
+ if (RsPARA(PL_rs)) {
if (*s != '\n')
goto nope;
++count;
}
else {
STRLEN rslen;
- char *rsptr = SvPV(rs, rslen);
+ char *rsptr = SvPV(PL_rs, rslen);
if (rslen == 1) {
if (*s != *rsptr)
goto nope;
++count;
}
else {
- if (len < rslen)
+ if (len < rslen - 1)
goto nope;
len -= rslen - 1;
s -= rslen - 1;
- if (bcmp(s, rsptr, rslen))
+ if (memNE(s, rsptr, rslen))
goto nope;
count += rslen;
}
}
- *s = '\0';
+ s = SvPV_force(sv, n_a);
SvCUR_set(sv, len);
+ *SvEND(sv) = '\0';
SvNIOK_off(sv);
+ SvSETMAGIC(sv);
}
nope:
- SvSETMAGIC(sv);
return count;
-}
+}
void
-do_vop(optype,sv,left,right)
-I32 optype;
-SV *sv;
-SV *left;
-SV *right;
+Perl_do_vop(pTHX_ I32 optype, SV *sv, SV *left, SV *right)
{
#ifdef LIBERAL
register long *dl;
register char *dc;
STRLEN leftlen;
STRLEN rightlen;
- register char *lc = SvPV(left, leftlen);
- register char *rc = SvPV(right, rightlen);
+ register char *lc;
+ register char *rc;
register I32 len;
I32 lensave;
+ char *lsave;
+ char *rsave;
+ bool left_utf = DO_UTF8(left);
+ bool right_utf = DO_UTF8(right);
+ I32 needlen = 0;
+
+ if (left_utf && !right_utf)
+ sv_utf8_upgrade(right);
+ else if (!left_utf && right_utf)
+ sv_utf8_upgrade(left);
- dc = SvPV_force(sv,na);
+ if (sv != left || (optype != OP_BIT_AND && !SvOK(sv) && !SvGMAGICAL(sv)))
+ sv_setpvn(sv, "", 0); /* avoid undef warning on |= and ^= */
+ lsave = lc = SvPV(left, leftlen);
+ rsave = rc = SvPV(right, rightlen);
len = leftlen < rightlen ? leftlen : rightlen;
lensave = len;
- if (SvCUR(sv) < len) {
- dc = SvGROW(sv,len + 1);
- (void)memzero(dc + SvCUR(sv), len - SvCUR(sv) + 1);
+ if ((left_utf || right_utf) && (sv == left || sv == right)) {
+ needlen = optype == OP_BIT_AND ? len : leftlen + rightlen;
+ Newz(801, dc, needlen + 1, char);
+ }
+ else if (SvOK(sv) || SvTYPE(sv) > SVt_PVMG) {
+ STRLEN n_a;
+ dc = SvPV_force(sv, n_a);
+ if (SvCUR(sv) < len) {
+ dc = SvGROW(sv, len + 1);
+ (void)memzero(dc + SvCUR(sv), len - SvCUR(sv) + 1);
+ }
+ if (optype != OP_BIT_AND && (left_utf || right_utf))
+ dc = SvGROW(sv, leftlen + rightlen + 1);
+ }
+ else {
+ needlen = ((optype == OP_BIT_AND)
+ ? len : (leftlen > rightlen ? leftlen : rightlen));
+ Newz(801, dc, needlen + 1, char);
+ (void)sv_usepvn(sv, dc, needlen);
+ dc = SvPVX(sv); /* sv_usepvn() calls Renew() */
}
SvCUR_set(sv, len);
(void)SvPOK_only(sv);
+ if (left_utf || right_utf) {
+ UV duc, luc, ruc;
+ char *dcsave = dc;
+ STRLEN lulen = leftlen;
+ STRLEN rulen = rightlen;
+ STRLEN ulen;
+
+ switch (optype) {
+ case OP_BIT_AND:
+ while (lulen && rulen) {
+ luc = utf8n_to_uvchr((U8*)lc, lulen, &ulen, UTF8_ALLOW_ANYUV);
+ lc += ulen;
+ lulen -= ulen;
+ ruc = utf8n_to_uvchr((U8*)rc, rulen, &ulen, UTF8_ALLOW_ANYUV);
+ rc += ulen;
+ rulen -= ulen;
+ duc = luc & ruc;
+ dc = (char*)uvchr_to_utf8((U8*)dc, duc);
+ }
+ if (sv == left || sv == right)
+ (void)sv_usepvn(sv, dcsave, needlen);
+ SvCUR_set(sv, dc - dcsave);
+ break;
+ case OP_BIT_XOR:
+ while (lulen && rulen) {
+ luc = utf8n_to_uvchr((U8*)lc, lulen, &ulen, UTF8_ALLOW_ANYUV);
+ lc += ulen;
+ lulen -= ulen;
+ ruc = utf8n_to_uvchr((U8*)rc, rulen, &ulen, UTF8_ALLOW_ANYUV);
+ rc += ulen;
+ rulen -= ulen;
+ duc = luc ^ ruc;
+ dc = (char*)uvchr_to_utf8((U8*)dc, duc);
+ }
+ goto mop_up_utf;
+ case OP_BIT_OR:
+ while (lulen && rulen) {
+ luc = utf8n_to_uvchr((U8*)lc, lulen, &ulen, UTF8_ALLOW_ANYUV);
+ lc += ulen;
+ lulen -= ulen;
+ ruc = utf8n_to_uvchr((U8*)rc, rulen, &ulen, UTF8_ALLOW_ANYUV);
+ rc += ulen;
+ rulen -= ulen;
+ duc = luc | ruc;
+ dc = (char*)uvchr_to_utf8((U8*)dc, duc);
+ }
+ mop_up_utf:
+ if (sv == left || sv == right)
+ (void)sv_usepvn(sv, dcsave, needlen);
+ SvCUR_set(sv, dc - dcsave);
+ if (rulen)
+ sv_catpvn(sv, rc, rulen);
+ else if (lulen)
+ sv_catpvn(sv, lc, lulen);
+ else
+ *SvEND(sv) = '\0';
+ break;
+ }
+ SvUTF8_on(sv);
+ goto finish;
+ }
+ else
#ifdef LIBERAL
if (len >= sizeof(long)*4 &&
!((long)dc % sizeof(long)) &&
}
#endif
{
- char *lsave = lc;
- char *rsave = rc;
-
switch (optype) {
case OP_BIT_AND:
while (len--)
break;
}
}
+finish:
+ SvTAINT(sv);
}
OP *
-do_kv(ARGS)
-dARGS
+Perl_do_kv(pTHX)
{
dSP;
HV *hv = (HV*)POPs;
- I32 i;
+ HV *keys;
register HE *entry;
- char *tmps;
SV *tmpstr;
- I32 dokeys = (op->op_type == OP_KEYS);
- I32 dovalues = (op->op_type == OP_VALUES);
+ I32 gimme = GIMME_V;
+ I32 dokeys = (PL_op->op_type == OP_KEYS);
+ I32 dovalues = (PL_op->op_type == OP_VALUES);
I32 realhv = (SvTYPE(hv) == SVt_PVHV);
-
- if (op->op_type == OP_RV2HV || op->op_type == OP_PADHV)
+
+ if (PL_op->op_type == OP_RV2HV || PL_op->op_type == OP_PADHV)
dokeys = dovalues = TRUE;
- if (!hv)
+ if (!hv) {
+ if (PL_op->op_flags & OPf_MOD || LVRET) { /* lvalue */
+ dTARGET; /* make sure to clear its target here */
+ if (SvTYPE(TARG) == SVt_PVLV)
+ LvTARG(TARG) = Nullsv;
+ PUSHs(TARG);
+ }
RETURN;
+ }
- if (realhv)
- (void)hv_iterinit(hv); /* always reset iterator regardless */
- else
- (void)avhv_iterinit((AV*)hv);
-
- if (GIMME != G_ARRAY) {
+ keys = realhv ? hv : avhv_keys((AV*)hv);
+ (void)hv_iterinit(keys); /* always reset iterator regardless */
+
+ if (gimme == G_VOID)
+ RETURN;
+
+ if (gimme == G_SCALAR) {
+ IV i;
dTARGET;
- if (!SvRMAGICAL(hv) || !mg_find((SV*)hv,'P'))
- i = HvKEYS(hv);
+ if (PL_op->op_flags & OPf_MOD || LVRET) { /* lvalue */
+ if (SvTYPE(TARG) < SVt_PVLV) {
+ sv_upgrade(TARG, SVt_PVLV);
+ sv_magic(TARG, Nullsv, PERL_MAGIC_nkeys, Nullch, 0);
+ }
+ LvTYPE(TARG) = 'k';
+ if (LvTARG(TARG) != (SV*)keys) {
+ if (LvTARG(TARG))
+ SvREFCNT_dec(LvTARG(TARG));
+ LvTARG(TARG) = SvREFCNT_inc(keys);
+ }
+ PUSHs(TARG);
+ RETURN;
+ }
+
+ if (! SvTIED_mg((SV*)keys, PERL_MAGIC_tied))
+ i = HvKEYS(keys);
else {
i = 0;
/*SUPPRESS 560*/
- while (entry = realhv ? hv_iternext(hv) : avhv_iternext((AV*)hv)) {
- i++;
- }
+ while (hv_iternext(keys)) i++;
}
PUSHi( i );
RETURN;
}
- /* Guess how much room we need. hv_max may be a few too many. Oh well. */
- EXTEND(sp, HvMAX(hv) * (dokeys + dovalues));
+ EXTEND(SP, HvKEYS(keys) * (dokeys + dovalues));
PUTBACK; /* hv_iternext and hv_iterval might clobber stack_sp */
- while (entry = realhv ? hv_iternext(hv) : avhv_iternext((AV*)hv)) {
+ while ((entry = hv_iternext(keys))) {
SPAGAIN;
- if (dokeys) {
- tmps = hv_iterkey(entry,&i); /* won't clobber stack_sp */
- if (!i)
- tmps = "";
- XPUSHs(sv_2mortal(newSVpv(tmps,i)));
- }
+ if (dokeys)
+ XPUSHs(hv_iterkeysv(entry)); /* won't clobber stack_sp */
if (dovalues) {
- tmpstr = NEWSV(45,0);
PUTBACK;
- sv_setsv(tmpstr,realhv ?
- hv_iterval(hv,entry) : avhv_iterval((AV*)hv,entry));
+ tmpstr = realhv ?
+ hv_iterval(hv,entry) : avhv_iterval((AV*)hv,entry);
+ DEBUG_H(Perl_sv_setpvf(aTHX_ tmpstr, "%lu%%%d=%lu",
+ (unsigned long)HeHASH(entry),
+ HvMAX(keys)+1,
+ (unsigned long)(HeHASH(entry) & HvMAX(keys))));
SPAGAIN;
- DEBUG_H( {
- sprintf(buf,"%d%%%d=%d\n",entry->hent_hash,
- HvMAX(hv)+1,entry->hent_hash & HvMAX(hv));
- sv_setpv(tmpstr,buf);
- } )
- XPUSHs(sv_2mortal(tmpstr));
+ XPUSHs(tmpstr);
}
PUTBACK;
}
return NORMAL;
}
+