diff options
| -rw-r--r-- | doop.c | 14 | ||||
| -rw-r--r-- | op.c | 39 | ||||
| -rw-r--r-- | op.h | 5 |
3 files changed, 36 insertions, 22 deletions
@@ -175,9 +175,9 @@ S_do_trans_complex(pTHX_ SV * const sv, const OPtrans_map * const tbl) if (p != d - 1 || *p != *d) p = d++; } - else if (ch == -1) /* -1 is unmapped character */ + else if (ch == (short) TR_UNMAPPED) *d++ = *s; - else if (ch == -2) /* -2 is delete character */ + else if (ch == (short) TR_DELETE) matches++; s++; } @@ -189,9 +189,9 @@ S_do_trans_complex(pTHX_ SV * const sv, const OPtrans_map * const tbl) matches++; *d++ = (U8)ch; } - else if (ch == -1) /* -1 is unmapped character */ + else if (ch == (short) TR_UNMAPPED) *d++ = *s; - else if (ch == -2) /* -2 is delete character */ + else if (ch == (short) TR_DELETE) matches++; s++; } @@ -233,14 +233,14 @@ S_do_trans_complex(pTHX_ SV * const sv, const OPtrans_map * const tbl) s += len; continue; } - else if (sch == -1) { /* -1 is unmapped character */ + else if (sch == (short) TR_UNMAPPED) { Move(s, d, len, U8); d += len; } - else if (sch == -2) /* -2 is delete character */ + else if (sch == (short) TR_DELETE) matches++; else { - assert(sch == -3); /* -3 is empty replacement */ + assert(sch == (short) TR_R_EMPTY); /* empty replacement */ ch = comp; goto replace; } @@ -7031,8 +7031,8 @@ S_pmtrans(pTHX_ OP *o, OP *expr, OP *repl) } /* Non-utf8 case: set o->op_pv to point to a simple 256+ entry lookup - * table. Entries with the value -1 indicate chars not to be - * translated, while -2 indicates a search char without a + * table. Entries with the value TR_UNMAPPED indicate chars not to be + * translated, while TR_DELETE indicates a search char without a * corresponding replacement char under /d. * * Normally, the table has 256 slots. However, in the presence of @@ -7042,16 +7042,17 @@ S_pmtrans(pTHX_ OP *o, OP *expr, OP *repl) * is allocated. * * In addition, regardless of whether under /c, an extra slot at the - * end is used to store the final repeating char, or -3 under an empty - * replacement list, or -2 under /d; which makes the runtime code - * easier. + * end is used to store the final repeating char, or TR_R_EMPTY under an + * empty replacement list, or TR_DELETE under /d; which makes the + * runtime code easier. * * The toker will have already expanded char ranges in t and r. */ /* Initially allocate 257-slot table: 256 for basic (non /c) usage, - * plus final slot for repeat/-2/-3. Later we realloc if excess > * 0. - * The OPtrans_map struct already contains one slot; hence the -1. + * plus final slot for repeat/TR_DELETE/TR_R_EMPTY. Later we realloc if + * excess > * 0. The OPtrans_map struct already contains one slot; + * hence the -1. */ struct_size = sizeof(OPtrans_map) + (256 - 1 + 1)*sizeof(short); tbl = (OPtrans_map*)PerlMemShared_calloc(struct_size, 1); @@ -7065,13 +7066,13 @@ S_pmtrans(pTHX_ OP *o, OP *expr, OP *repl) * with a search char) replacement chars (so j <= rlen always) */ for (i = 0; i < tlen; i++) - tbl->map[t[i]] = -1; + tbl->map[t[i]] = (short) TR_UNMAPPED; for (i = 0, j = 0; i < 256; i++) { if (!tbl->map[i]) { if (j == rlen) { if (del) - tbl->map[i] = -2; + tbl->map[i] = (short) TR_DELETE; else if (rlen) tbl->map[i] = r[j-1]; else @@ -7111,7 +7112,11 @@ S_pmtrans(pTHX_ OP *o, OP *expr, OP *repl) o->op_private |= OPpTRANS_IDENTICAL; } - tbl->map[tbl->size] = del ? -2 : rlen ? r[rlen - 1] : -3; + tbl->map[tbl->size] = del + ? (short) TR_DELETE + : rlen + ? r[rlen - 1] + : (short) TR_R_EMPTY; } else { if (!rlen && !del) { @@ -7124,24 +7129,28 @@ S_pmtrans(pTHX_ OP *o, OP *expr, OP *repl) } for (i = 0; i < 256; i++) - tbl->map[i] = -1; + tbl->map[i] = (short) TR_UNMAPPED; for (i = 0, j = 0; i < tlen; i++,j++) { if (j >= rlen) { if (del) { - if (tbl->map[t[i]] == -1) - tbl->map[t[i]] = -2; + if (tbl->map[t[i]] == (short) TR_UNMAPPED) + tbl->map[t[i]] = (short) TR_DELETE; continue; } --j; } - if (tbl->map[t[i]] == -1) { + if (tbl->map[t[i]] == (short) TR_UNMAPPED) { if ( UVCHR_IS_INVARIANT(t[i]) && ! UVCHR_IS_INVARIANT(r[j])) grows = TRUE; tbl->map[t[i]] = r[j]; } } - tbl->map[tbl->size] = del ? -1 : rlen ? -1 : -3; + tbl->map[tbl->size] = del + ? (short) TR_UNMAPPED + : rlen + ? (short) TR_UNMAPPED + : (short) TR_R_EMPTY; } /* both non-utf8 and utf8 code paths end up here */ @@ -1109,6 +1109,11 @@ C<sib> is non-null. For a higher-level interface, see C<L</op_sibling_splice>>. "Use of strings with code points over 0xFF as arguments to " \ "%s operator is not allowed" #endif +#if defined(PERL_IN_OP_C) || defined(PERL_IN_DOOP_C) +# define TR_UNMAPPED (UV)-1 +# define TR_DELETE (UV)-2 +# define TR_R_EMPTY (UV)-3 /* rhs (replacement) is empty */ +#endif #if defined(PERL_IN_OP_C) || defined(PERL_IN_TOKE_C) #define RANGE_INDICATOR ILLEGAL_UTF8_BYTE #endif |