X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=utf8.c;h=5a5f56c4222ac26de6dd70a0f7c1ad93b4656c90;hb=1cc8b4c566f7901a54e4b576f09608beb4c81f86;hp=227dcba3f3d2ec654c96b98bb3e77d2c2b2286e3;hpb=db42d1485c38c3442e7b62e63d45f5e5b9b66ee1;p=p5sagit%2Fp5-mst-13.2.git diff --git a/utf8.c b/utf8.c index 227dcba..5a5f56c 100644 --- a/utf8.c +++ b/utf8.c @@ -27,7 +27,7 @@ /* Unicode support */ /* -=for apidoc A|U8*|uvuni_to_utf8|U8 *d|UV uv +=for apidoc A|U8 *|uvuni_to_utf8|U8 *d|UV uv Adds the UTF8 representation of the Unicode codepoint C to the end of the string C; C should be have at least C free @@ -46,10 +46,22 @@ is the recommended Unicode-aware way of saying U8 * Perl_uvuni_to_utf8(pTHX_ U8 *d, UV uv) { - if (uv < 0x80) { - *d++ = uv; + if (UNI_IS_INVARIANT(uv)) { + *d++ = UTF_TO_NATIVE(uv); return d; } +#if defined(EBCDIC) || 1 /* always for testing */ + else { + STRLEN len = UNISKIP(uv); + U8 *p = d+len-1; + while (p > d) { + *p-- = UTF_TO_NATIVE((uv & UTF_CONTINUATION_MASK) | UTF_CONTINUATION_MARK); + uv >>= UTF_ACCUMULATION_SHIFT; + } + *p = UTF_TO_NATIVE((uv & UTF_START_MASK(len)) | UTF_START_MARK(len)); + return d+len; + } +#else /* Non loop style */ if (uv < 0x800) { *d++ = (( uv >> 6) | 0xc0); *d++ = (( uv & 0x3f) | 0x80); @@ -116,43 +128,21 @@ Perl_uvuni_to_utf8(pTHX_ U8 *d, UV uv) return d; } #endif +#endif /* Loop style */ } -/* -=for apidoc A|U8*|uvchr_to_utf8|U8 *d|UV uv - -Adds the UTF8 representation of the Native codepoint C to the end -of the string C; C should be have at least C free -bytes available. The return value is the pointer to the byte after the -end of the new character. In other words, - - d = uvchr_to_utf8(d, uv); - -is the recommended wide native character-aware way of saying - - *(d++) = uv; - -=cut -*/ - -U8 * -Perl_uvchr_to_utf8(pTHX_ U8 *d, UV uv) -{ - if (uv < 0x100) - uv = NATIVE_TO_ASCII(uv); - return Perl_uvuni_to_utf8(aTHX_ d, uv); -} /* =for apidoc A|STRLEN|is_utf8_char|U8 *s Tests if some arbitrary number of bytes begins in a valid UTF-8 -character. Note that an ASCII character is a valid UTF-8 character. +character. Note that an INVARIANT (i.e. ASCII) character is a valid UTF-8 character. The actual number of bytes in the UTF-8 character will be returned if it is valid, otherwise 0. -=cut */ +=cut +*/ STRLEN Perl_is_utf8_char(pTHX_ U8 *s) { @@ -160,7 +150,7 @@ Perl_is_utf8_char(pTHX_ U8 *s) STRLEN slen, len; UV uv, ouv; - if (UTF8_IS_ASCII(u)) + if (UTF8_IS_INVARIANT(u)) return 1; if (!UTF8_IS_START(u)) @@ -173,13 +163,14 @@ Perl_is_utf8_char(pTHX_ U8 *s) slen = len - 1; s++; - uv = u; + u &= UTF_START_MASK(len); + uv = u; ouv = uv; while (slen--) { if (!UTF8_IS_CONTINUATION(*s)) return 0; uv = UTF8_ACCUMULATE(uv, *s); - if (uv < ouv) + if (uv < ouv) return 0; ouv = uv; s++; @@ -246,12 +237,13 @@ the strict UTF-8 encoding (see F). Most code should use utf8_to_uvchr() rather than call this directly. -=cut */ +=cut +*/ UV -Perl_utf8n_to_uvuni(pTHX_ U8* s, STRLEN curlen, STRLEN* retlen, U32 flags) +Perl_utf8n_to_uvuni(pTHX_ U8 *s, STRLEN curlen, STRLEN *retlen, U32 flags) { - UV uv = *s, ouv; + UV uv = *s, ouv = 0; STRLEN len = 1; bool dowarn = ckWARN_d(WARN_UTF8); STRLEN expectlen = 0; @@ -276,10 +268,10 @@ Perl_utf8n_to_uvuni(pTHX_ U8* s, STRLEN curlen, STRLEN* retlen, U32 flags) goto malformed; } - if (UTF8_IS_ASCII(uv)) { + if (UTF8_IS_INVARIANT(uv)) { if (retlen) *retlen = 1; - return (UV) (*s); + return (UV) (NATIVE_TO_UTF(*s)); } if (UTF8_IS_CONTINUATION(uv) && @@ -294,20 +286,29 @@ Perl_utf8n_to_uvuni(pTHX_ U8* s, STRLEN curlen, STRLEN* retlen, U32 flags) goto malformed; } +#ifdef EBCDIC + uv = NATIVE_TO_UTF(uv); +#else if ((uv == 0xfe || uv == 0xff) && !(flags & UTF8_ALLOW_FE_FF)) { warning = UTF8_WARN_FE_FF; goto malformed; } - +#endif + if (!(uv & 0x20)) { len = 2; uv &= 0x1f; } else if (!(uv & 0x10)) { len = 3; uv &= 0x0f; } else if (!(uv & 0x08)) { len = 4; uv &= 0x07; } else if (!(uv & 0x04)) { len = 5; uv &= 0x03; } +#ifdef EBCDIC + else if (!(uv & 0x02)) { len = 6; uv &= 0x01; } + else { len = 7; uv &= 0x01; } +#else else if (!(uv & 0x02)) { len = 6; uv &= 0x01; } else if (!(uv & 0x01)) { len = 7; uv = 0; } - else { len = 13; uv = 0; } /* whoa! */ - + else { len = 13; uv = 0; } /* whoa! */ +#endif + if (retlen) *retlen = len; @@ -427,7 +428,7 @@ malformed: if (PL_op) Perl_warner(aTHX_ WARN_UTF8, - "%s in %s", s, PL_op_desc[PL_op->op_type]); + "%s in %s", s, OP_DESC(PL_op)); else Perl_warner(aTHX_ WARN_UTF8, "%s", s); } @@ -440,28 +441,7 @@ malformed: } /* -=for apidoc A|U8* s|utf8n_to_uvchr|STRLEN curlen, STRLEN *retlen, U32 flags - -Returns the native character value of the first character in the string C -which is assumed to be in UTF8 encoding; C will be set to the -length, in bytes, of that character. - -Allows length and flags to be passed to low level routine. - -=cut -*/ - -UV -Perl_utf8n_to_uvchr(pTHX_ U8* s, STRLEN curlen, STRLEN* retlen, U32 flags) -{ - UV uv = Perl_utf8n_to_uvuni(aTHX_ s, curlen, retlen, flags); - if (uv < 0x100) - return (UV) ASCII_TO_NATIVE(uv); - return uv; -} - -/* -=for apidoc A|U8* s|utf8_to_uvchr|STRLEN *retlen +=for apidoc A|UV|utf8_to_uvchr|U8 *s|STRLEN *retlen Returns the native character value of the first character in the string C which is assumed to be in UTF8 encoding; C will be set to the @@ -474,13 +454,13 @@ returned and retlen is set, if possible, to -1. */ UV -Perl_utf8_to_uvchr(pTHX_ U8* s, STRLEN* retlen) +Perl_utf8_to_uvchr(pTHX_ U8 *s, STRLEN *retlen) { return Perl_utf8n_to_uvchr(aTHX_ s, UTF8_MAXLEN, retlen, 0); } /* -=for apidoc A|U8* s|utf8_to_uvuni|STRLEN *retlen +=for apidoc A|UV|utf8_to_uvuni|U8 *s|STRLEN *retlen Returns the Unicode code point of the first character in the string C which is assumed to be in UTF8 encoding; C will be set to the @@ -496,14 +476,14 @@ returned and retlen is set, if possible, to -1. */ UV -Perl_utf8_to_uvuni(pTHX_ U8* s, STRLEN* retlen) +Perl_utf8_to_uvuni(pTHX_ U8 *s, STRLEN *retlen) { /* Call the low level routine asking for checks */ return Perl_utf8n_to_uvuni(aTHX_ s, UTF8_MAXLEN, retlen, 0); } /* -=for apidoc A|STRLEN|utf8_length|U8* s|U8 *e +=for apidoc A|STRLEN|utf8_length|U8 *s|U8 *e Return the length of the UTF-8 char encoded string C in characters. Stops at C (inclusive). If C s> or if the scan would end @@ -513,7 +493,7 @@ up past C, croaks. */ STRLEN -Perl_utf8_length(pTHX_ U8* s, U8* e) +Perl_utf8_length(pTHX_ U8 *s, U8 *e) { STRLEN len = 0; @@ -544,7 +524,8 @@ and C. WARNING: use only if you *know* that the pointers point inside the same UTF-8 buffer. -=cut */ +=cut +*/ IV Perl_utf8_distance(pTHX_ U8 *a, U8 *b) @@ -580,7 +561,7 @@ Perl_utf8_distance(pTHX_ U8 *a, U8 *b) } /* -=for apidoc A|U8*|utf8_hop|U8 *s|I32 off +=for apidoc A|U8 *|utf8_hop|U8 *s|I32 off Return the UTF-8 pointer C displaced by C characters, either forward or backward. @@ -589,7 +570,8 @@ WARNING: do not use the following unless you *know* C is within the UTF-8 data pointed to by C *and* that on entry C is aligned on the first byte of character or just after the last byte of a character. -=cut */ +=cut +*/ U8 * Perl_utf8_hop(pTHX_ U8 *s, I32 off) @@ -624,7 +606,7 @@ Returns zero on failure, setting C to -1. */ U8 * -Perl_utf8_to_bytes(pTHX_ U8* s, STRLEN *len) +Perl_utf8_to_bytes(pTHX_ U8 *s, STRLEN *len) { U8 *send; U8 *d; @@ -634,9 +616,9 @@ Perl_utf8_to_bytes(pTHX_ U8* s, STRLEN *len) for (send = s + *len; s < send; ) { U8 c = *s++; - if (c >= 0x80 && - ((s >= send) || - ((*s++ & 0xc0) != 0x80) || ((c & 0xfe) != 0xc2))) { + if (!UTF8_IS_INVARIANT(c) && + (!UTF8_IS_DOWNGRADEABLE_START(c) || (s >= send) + || !(c = *s++) || !UTF8_IS_CONTINUATION(c))) { *len = -1; return 0; } @@ -663,10 +645,11 @@ length. Returns the original string if no conversion occurs, C is unchanged. Do nothing if C points to 0. Sets C to 0 if C is converted or contains all 7bit characters. -=cut */ +=cut +*/ U8 * -Perl_bytes_from_utf8(pTHX_ U8* s, STRLEN *len, bool *is_utf8) +Perl_bytes_from_utf8(pTHX_ U8 *s, STRLEN *len, bool *is_utf8) { U8 *d; U8 *start = s; @@ -679,7 +662,7 @@ Perl_bytes_from_utf8(pTHX_ U8* s, STRLEN *len, bool *is_utf8) /* ensure valid UTF8 and chars < 256 before converting string */ for (send = s + *len; s < send;) { U8 c = *s++; - if (!UTF8_IS_ASCII(c)) { + if (!UTF8_IS_INVARIANT(c)) { if (UTF8_IS_DOWNGRADEABLE_START(c) && s < send && (c = *s++) && UTF8_IS_CONTINUATION(c)) count++; @@ -690,19 +673,16 @@ Perl_bytes_from_utf8(pTHX_ U8* s, STRLEN *len, bool *is_utf8) *is_utf8 = 0; -#ifndef EBCDIC - /* Can use as-is if no high chars */ - if (!count) - return start; -#endif - Newz(801, d, (*len) - count + 1, U8); s = start; start = d; while (s < send) { U8 c = *s++; - if (!UTF8_IS_ASCII(c)) - c = UTF8_ACCUMULATE(c, *s++); - *d++ = ASCII_TO_NATIVE(c); + if (!UTF8_IS_INVARIANT(c)) { + /* Then it is two-byte encoded */ + c = UTF8_ACCUMULATE(NATIVE_TO_UTF(c), *s++); + c = ASCII_TO_NATIVE(c); + } + *d++ = c; } *d = '\0'; *len = d - start; @@ -720,7 +700,7 @@ reflect the new length. */ U8* -Perl_bytes_to_utf8(pTHX_ U8* s, STRLEN *len) +Perl_bytes_to_utf8(pTHX_ U8 *s, STRLEN *len) { U8 *send; U8 *d; @@ -732,8 +712,8 @@ Perl_bytes_to_utf8(pTHX_ U8* s, STRLEN *len) while (s < send) { UV uv = NATIVE_TO_ASCII(*s++); - if (UTF8_IS_ASCII(uv)) - *d++ = uv; + if (UNI_IS_INVARIANT(uv)) + *d++ = UTF_TO_NATIVE(uv); else { *d++ = UTF8_EIGHT_BIT_HI(uv); *d++ = UTF8_EIGHT_BIT_LO(uv); @@ -819,7 +799,7 @@ bool Perl_is_uni_alnum(pTHX_ U32 c) { U8 tmpbuf[UTF8_MAXLEN+1]; - uvuni_to_utf8(tmpbuf, (UV)c); + uvchr_to_utf8(tmpbuf, (UV)c); return is_utf8_alnum(tmpbuf); } @@ -827,7 +807,7 @@ bool Perl_is_uni_alnumc(pTHX_ U32 c) { U8 tmpbuf[UTF8_MAXLEN+1]; - uvuni_to_utf8(tmpbuf, (UV)c); + uvchr_to_utf8(tmpbuf, (UV)c); return is_utf8_alnumc(tmpbuf); } @@ -835,7 +815,7 @@ bool Perl_is_uni_idfirst(pTHX_ U32 c) { U8 tmpbuf[UTF8_MAXLEN+1]; - uvuni_to_utf8(tmpbuf, (UV)c); + uvchr_to_utf8(tmpbuf, (UV)c); return is_utf8_idfirst(tmpbuf); } @@ -843,7 +823,7 @@ bool Perl_is_uni_alpha(pTHX_ U32 c) { U8 tmpbuf[UTF8_MAXLEN+1]; - uvuni_to_utf8(tmpbuf, (UV)c); + uvchr_to_utf8(tmpbuf, (UV)c); return is_utf8_alpha(tmpbuf); } @@ -851,7 +831,7 @@ bool Perl_is_uni_ascii(pTHX_ U32 c) { U8 tmpbuf[UTF8_MAXLEN+1]; - uvuni_to_utf8(tmpbuf, (UV)c); + uvchr_to_utf8(tmpbuf, (UV)c); return is_utf8_ascii(tmpbuf); } @@ -859,7 +839,7 @@ bool Perl_is_uni_space(pTHX_ U32 c) { U8 tmpbuf[UTF8_MAXLEN+1]; - uvuni_to_utf8(tmpbuf, (UV)c); + uvchr_to_utf8(tmpbuf, (UV)c); return is_utf8_space(tmpbuf); } @@ -867,7 +847,7 @@ bool Perl_is_uni_digit(pTHX_ U32 c) { U8 tmpbuf[UTF8_MAXLEN+1]; - uvuni_to_utf8(tmpbuf, (UV)c); + uvchr_to_utf8(tmpbuf, (UV)c); return is_utf8_digit(tmpbuf); } @@ -875,7 +855,7 @@ bool Perl_is_uni_upper(pTHX_ U32 c) { U8 tmpbuf[UTF8_MAXLEN+1]; - uvuni_to_utf8(tmpbuf, (UV)c); + uvchr_to_utf8(tmpbuf, (UV)c); return is_utf8_upper(tmpbuf); } @@ -883,7 +863,7 @@ bool Perl_is_uni_lower(pTHX_ U32 c) { U8 tmpbuf[UTF8_MAXLEN+1]; - uvuni_to_utf8(tmpbuf, (UV)c); + uvchr_to_utf8(tmpbuf, (UV)c); return is_utf8_lower(tmpbuf); } @@ -891,7 +871,7 @@ bool Perl_is_uni_cntrl(pTHX_ U32 c) { U8 tmpbuf[UTF8_MAXLEN+1]; - uvuni_to_utf8(tmpbuf, (UV)c); + uvchr_to_utf8(tmpbuf, (UV)c); return is_utf8_cntrl(tmpbuf); } @@ -899,7 +879,7 @@ bool Perl_is_uni_graph(pTHX_ U32 c) { U8 tmpbuf[UTF8_MAXLEN+1]; - uvuni_to_utf8(tmpbuf, (UV)c); + uvchr_to_utf8(tmpbuf, (UV)c); return is_utf8_graph(tmpbuf); } @@ -907,7 +887,7 @@ bool Perl_is_uni_print(pTHX_ U32 c) { U8 tmpbuf[UTF8_MAXLEN+1]; - uvuni_to_utf8(tmpbuf, (UV)c); + uvchr_to_utf8(tmpbuf, (UV)c); return is_utf8_print(tmpbuf); } @@ -915,7 +895,7 @@ bool Perl_is_uni_punct(pTHX_ U32 c) { U8 tmpbuf[UTF8_MAXLEN+1]; - uvuni_to_utf8(tmpbuf, (UV)c); + uvchr_to_utf8(tmpbuf, (UV)c); return is_utf8_punct(tmpbuf); } @@ -923,7 +903,7 @@ bool Perl_is_uni_xdigit(pTHX_ U32 c) { U8 tmpbuf[UTF8_MAXLEN+1]; - uvuni_to_utf8(tmpbuf, (UV)c); + uvchr_to_utf8(tmpbuf, (UV)c); return is_utf8_xdigit(tmpbuf); } @@ -931,7 +911,7 @@ U32 Perl_to_uni_upper(pTHX_ U32 c) { U8 tmpbuf[UTF8_MAXLEN+1]; - uvuni_to_utf8(tmpbuf, (UV)c); + uvchr_to_utf8(tmpbuf, (UV)c); return to_utf8_upper(tmpbuf); } @@ -939,7 +919,7 @@ U32 Perl_to_uni_title(pTHX_ U32 c) { U8 tmpbuf[UTF8_MAXLEN+1]; - uvuni_to_utf8(tmpbuf, (UV)c); + uvchr_to_utf8(tmpbuf, (UV)c); return to_utf8_title(tmpbuf); } @@ -947,7 +927,7 @@ U32 Perl_to_uni_lower(pTHX_ U32 c) { U8 tmpbuf[UTF8_MAXLEN+1]; - uvuni_to_utf8(tmpbuf, (UV)c); + uvchr_to_utf8(tmpbuf, (UV)c); return to_utf8_lower(tmpbuf); } @@ -1065,13 +1045,13 @@ Perl_is_utf8_alnum(pTHX_ U8 *p) * descendant of isalnum(3), in other words, it doesn't * contain the '_'. --jhi */ PL_utf8_alnum = swash_init("utf8", "IsWord", &PL_sv_undef, 0, 0); - return swash_fetch(PL_utf8_alnum, p); + return swash_fetch(PL_utf8_alnum, p, TRUE); /* return *p == '_' || is_utf8_alpha(p) || is_utf8_digit(p); */ #ifdef SURPRISINGLY_SLOWER /* probably because alpha is usually true */ if (!PL_utf8_alnum) PL_utf8_alnum = swash_init("utf8", "", sv_2mortal(newSVpv("+utf8::IsAlpha\n+utf8::IsDigit\n005F\n",0)), 0, 0); - return swash_fetch(PL_utf8_alnum, p); + return swash_fetch(PL_utf8_alnum, p, TRUE); #endif } @@ -1082,13 +1062,13 @@ Perl_is_utf8_alnumc(pTHX_ U8 *p) return FALSE; if (!PL_utf8_alnum) PL_utf8_alnum = swash_init("utf8", "IsAlnumC", &PL_sv_undef, 0, 0); - return swash_fetch(PL_utf8_alnum, p); + return swash_fetch(PL_utf8_alnum, p, TRUE); /* return is_utf8_alpha(p) || is_utf8_digit(p); */ #ifdef SURPRISINGLY_SLOWER /* probably because alpha is usually true */ if (!PL_utf8_alnum) PL_utf8_alnum = swash_init("utf8", "", sv_2mortal(newSVpv("+utf8::IsAlpha\n+utf8::IsDigit\n005F\n",0)), 0, 0); - return swash_fetch(PL_utf8_alnum, p); + return swash_fetch(PL_utf8_alnum, p, TRUE); #endif } @@ -1105,7 +1085,7 @@ Perl_is_utf8_alpha(pTHX_ U8 *p) return FALSE; if (!PL_utf8_alpha) PL_utf8_alpha = swash_init("utf8", "IsAlpha", &PL_sv_undef, 0, 0); - return swash_fetch(PL_utf8_alpha, p); + return swash_fetch(PL_utf8_alpha, p, TRUE); } bool @@ -1115,7 +1095,7 @@ Perl_is_utf8_ascii(pTHX_ U8 *p) return FALSE; if (!PL_utf8_ascii) PL_utf8_ascii = swash_init("utf8", "IsAscii", &PL_sv_undef, 0, 0); - return swash_fetch(PL_utf8_ascii, p); + return swash_fetch(PL_utf8_ascii, p, TRUE); } bool @@ -1125,7 +1105,7 @@ Perl_is_utf8_space(pTHX_ U8 *p) return FALSE; if (!PL_utf8_space) PL_utf8_space = swash_init("utf8", "IsSpacePerl", &PL_sv_undef, 0, 0); - return swash_fetch(PL_utf8_space, p); + return swash_fetch(PL_utf8_space, p, TRUE); } bool @@ -1135,7 +1115,7 @@ Perl_is_utf8_digit(pTHX_ U8 *p) return FALSE; if (!PL_utf8_digit) PL_utf8_digit = swash_init("utf8", "IsDigit", &PL_sv_undef, 0, 0); - return swash_fetch(PL_utf8_digit, p); + return swash_fetch(PL_utf8_digit, p, TRUE); } bool @@ -1145,7 +1125,7 @@ Perl_is_utf8_upper(pTHX_ U8 *p) return FALSE; if (!PL_utf8_upper) PL_utf8_upper = swash_init("utf8", "IsUpper", &PL_sv_undef, 0, 0); - return swash_fetch(PL_utf8_upper, p); + return swash_fetch(PL_utf8_upper, p, TRUE); } bool @@ -1155,7 +1135,7 @@ Perl_is_utf8_lower(pTHX_ U8 *p) return FALSE; if (!PL_utf8_lower) PL_utf8_lower = swash_init("utf8", "IsLower", &PL_sv_undef, 0, 0); - return swash_fetch(PL_utf8_lower, p); + return swash_fetch(PL_utf8_lower, p, TRUE); } bool @@ -1165,7 +1145,7 @@ Perl_is_utf8_cntrl(pTHX_ U8 *p) return FALSE; if (!PL_utf8_cntrl) PL_utf8_cntrl = swash_init("utf8", "IsCntrl", &PL_sv_undef, 0, 0); - return swash_fetch(PL_utf8_cntrl, p); + return swash_fetch(PL_utf8_cntrl, p, TRUE); } bool @@ -1175,7 +1155,7 @@ Perl_is_utf8_graph(pTHX_ U8 *p) return FALSE; if (!PL_utf8_graph) PL_utf8_graph = swash_init("utf8", "IsGraph", &PL_sv_undef, 0, 0); - return swash_fetch(PL_utf8_graph, p); + return swash_fetch(PL_utf8_graph, p, TRUE); } bool @@ -1185,7 +1165,7 @@ Perl_is_utf8_print(pTHX_ U8 *p) return FALSE; if (!PL_utf8_print) PL_utf8_print = swash_init("utf8", "IsPrint", &PL_sv_undef, 0, 0); - return swash_fetch(PL_utf8_print, p); + return swash_fetch(PL_utf8_print, p, TRUE); } bool @@ -1195,7 +1175,7 @@ Perl_is_utf8_punct(pTHX_ U8 *p) return FALSE; if (!PL_utf8_punct) PL_utf8_punct = swash_init("utf8", "IsPunct", &PL_sv_undef, 0, 0); - return swash_fetch(PL_utf8_punct, p); + return swash_fetch(PL_utf8_punct, p, TRUE); } bool @@ -1205,7 +1185,7 @@ Perl_is_utf8_xdigit(pTHX_ U8 *p) return FALSE; if (!PL_utf8_xdigit) PL_utf8_xdigit = swash_init("utf8", "IsXDigit", &PL_sv_undef, 0, 0); - return swash_fetch(PL_utf8_xdigit, p); + return swash_fetch(PL_utf8_xdigit, p, TRUE); } bool @@ -1215,7 +1195,7 @@ Perl_is_utf8_mark(pTHX_ U8 *p) return FALSE; if (!PL_utf8_mark) PL_utf8_mark = swash_init("utf8", "IsM", &PL_sv_undef, 0, 0); - return swash_fetch(PL_utf8_mark, p); + return swash_fetch(PL_utf8_mark, p, TRUE); } UV @@ -1225,7 +1205,7 @@ Perl_to_utf8_upper(pTHX_ U8 *p) if (!PL_utf8_toupper) PL_utf8_toupper = swash_init("utf8", "ToUpper", &PL_sv_undef, 4, 0); - uv = swash_fetch(PL_utf8_toupper, p); + uv = swash_fetch(PL_utf8_toupper, p, TRUE); return uv ? UNI_TO_NATIVE(uv) : utf8_to_uvchr(p,0); } @@ -1236,7 +1216,7 @@ Perl_to_utf8_title(pTHX_ U8 *p) if (!PL_utf8_totitle) PL_utf8_totitle = swash_init("utf8", "ToTitle", &PL_sv_undef, 4, 0); - uv = swash_fetch(PL_utf8_totitle, p); + uv = swash_fetch(PL_utf8_totitle, p, TRUE); return uv ? UNI_TO_NATIVE(uv) : utf8_to_uvchr(p,0); } @@ -1247,7 +1227,7 @@ Perl_to_utf8_lower(pTHX_ U8 *p) if (!PL_utf8_tolower) PL_utf8_tolower = swash_init("utf8", "ToLower", &PL_sv_undef, 4, 0); - uv = swash_fetch(PL_utf8_tolower, p); + uv = swash_fetch(PL_utf8_tolower, p, TRUE); return uv ? UNI_TO_NATIVE(uv) : utf8_to_uvchr(p,0); } @@ -1259,10 +1239,16 @@ Perl_swash_init(pTHX_ char* pkg, char* name, SV *listsv, I32 minbits, I32 none) SV* retval; SV* tokenbufsv = sv_2mortal(NEWSV(0,0)); dSP; + HV *stash = gv_stashpvn(pkg, strlen(pkg), FALSE); + SV* errsv_save; - if (!gv_stashpv(pkg, 0)) { /* demand load utf8 */ + if (!gv_fetchmeth(stash, "SWASHNEW", 8, -1)) { /* demand load utf8 */ ENTER; + errsv_save = newSVsv(ERRSV); Perl_load_module(aTHX_ PERL_LOADMOD_NOIMPORT, newSVpv(pkg,0), Nullsv); + if (!SvTRUE(ERRSV)) + sv_setsv(ERRSV, errsv_save); + SvREFCNT_dec(errsv_save); LEAVE; } SPAGAIN; @@ -1282,10 +1268,14 @@ Perl_swash_init(pTHX_ char* pkg, char* name, SV *listsv, I32 minbits, I32 none) if (PL_curcop == &PL_compiling) /* XXX ought to be handled by lex_start */ sv_setpv(tokenbufsv, PL_tokenbuf); + errsv_save = newSVsv(ERRSV); if (call_method("SWASHNEW", G_SCALAR)) retval = newSVsv(*PL_stack_sp--); else retval = &PL_sv_undef; + if (!SvTRUE(ERRSV)) + sv_setsv(ERRSV, errsv_save); + SvREFCNT_dec(errsv_save); LEAVE; POPSTACK; if (PL_curcop == &PL_compiling) { @@ -1301,16 +1291,46 @@ Perl_swash_init(pTHX_ char* pkg, char* name, SV *listsv, I32 minbits, I32 none) } UV -Perl_swash_fetch(pTHX_ SV *sv, U8 *ptr) +Perl_swash_fetch(pTHX_ SV *sv, U8 *ptr, bool do_utf8) { HV* hv = (HV*)SvRV(sv); - U32 klen = UTF8SKIP(ptr) - 1; - U32 off = ptr[klen] & 127; /* NB: 64 bit always 0 when len > 1 */ + U32 klen; + U32 off; STRLEN slen; - STRLEN needents = (klen ? 64 : 128); + STRLEN needents; U8 *tmps; U32 bit; SV *retval; + U8 tmputf8[2]; + UV c = NATIVE_TO_ASCII(*ptr); + + if (!do_utf8 && !UNI_IS_INVARIANT(c)) { + tmputf8[0] = UTF8_EIGHT_BIT_HI(c); + tmputf8[1] = UTF8_EIGHT_BIT_LO(c); + ptr = tmputf8; + } + /* Given a UTF-X encoded char 0xAA..0xYY,0xZZ + * then the "swatch" is a vec() for al the chars which start + * with 0xAA..0xYY + * So the key in the hash (klen) is length of encoded char -1 + */ + klen = UTF8SKIP(ptr) - 1; + off = ptr[klen]; + + if (klen == 0) + { + /* If char in invariant then swatch is for all the invariant chars + * In both UTF-8 and UTF8-MOD that happens to be UTF_CONTINUATION_MARK + */ + needents = UTF_CONTINUATION_MARK; + off = NATIVE_TO_UTF(ptr[klen]); + } + else + { + /* If char is encoded then swatch is for the prefix */ + needents = (1 << UTF_ACCUMULATION_SHIFT); + off = NATIVE_TO_UTF(ptr[klen]) & UTF_CONTINUATION_MASK; + } /* * This single-entry cache saves about 1/3 of the utf8 overhead in test @@ -1321,9 +1341,9 @@ Perl_swash_fetch(pTHX_ SV *sv, U8 *ptr) * NB: this code assumes that swatches are never modified, once generated! */ - if (hv == PL_last_swash_hv && + if (hv == PL_last_swash_hv && klen == PL_last_swash_klen && - (!klen || memEQ((char *)ptr,(char *)PL_last_swash_key,klen)) ) + (!klen || memEQ((char *)ptr, (char *)PL_last_swash_key, klen)) ) { tmps = PL_last_swash_tmps; slen = PL_last_swash_slen; @@ -1335,6 +1355,11 @@ Perl_swash_fetch(pTHX_ SV *sv, U8 *ptr) /* If not cached, generate it via utf8::SWASHGET */ if (!svp || !SvPOK(*svp) || !(tmps = (U8*)SvPV(*svp, slen))) { dSP; + /* We use utf8n_to_uvuni() as we want an index into + Unicode tables, not a native character number. + */ + UV code_point = utf8n_to_uvuni(ptr, UTF8_MAXLEN, NULL, 0); + SV *errsv_save; ENTER; SAVETMPS; save_re_context(); @@ -1342,16 +1367,19 @@ Perl_swash_fetch(pTHX_ SV *sv, U8 *ptr) PUSHMARK(SP); EXTEND(SP,3); PUSHs((SV*)sv); - /* We call utf8_to_uni as we want and index into Unicode tables, - not a native character number. - */ - PUSHs(sv_2mortal(newSViv(utf8_to_uvuni(ptr, 0) & ~(needents - 1)))); + /* On EBCDIC & ~(0xA0-1) isn't a useful thing to do */ + PUSHs(sv_2mortal(newSViv((klen) ? + (code_point & ~(needents - 1)) : 0))); PUSHs(sv_2mortal(newSViv(needents))); PUTBACK; + errsv_save = newSVsv(ERRSV); if (call_method("SWASHGET", G_SCALAR)) retval = newSVsv(*PL_stack_sp--); else retval = &PL_sv_undef; + if (!SvTRUE(ERRSV)) + sv_setsv(ERRSV, errsv_save); + SvREFCNT_dec(errsv_save); POPSTACK; FREETMPS; LEAVE; @@ -1360,7 +1388,7 @@ Perl_swash_fetch(pTHX_ SV *sv, U8 *ptr) svp = hv_store(hv, (char*)ptr, klen, retval, 0); - if (!svp || !(tmps = (U8*)SvPV(*svp, slen)) || slen < 8) + if (!svp || !(tmps = (U8*)SvPV(*svp, slen)) || (slen << 3) < needents) Perl_croak(aTHX_ "SWASHGET didn't return result of proper length"); } @@ -1389,3 +1417,56 @@ Perl_swash_fetch(pTHX_ SV *sv, U8 *ptr) Perl_croak(aTHX_ "panic: swash_fetch"); return 0; } + + +/* +=for apidoc A|U8 *|uvchr_to_utf8|U8 *d|UV uv + +Adds the UTF8 representation of the Native codepoint C to the end +of the string C; C should be have at least C free +bytes available. The return value is the pointer to the byte after the +end of the new character. In other words, + + d = uvchr_to_utf8(d, uv); + +is the recommended wide native character-aware way of saying + + *(d++) = uv; + +=cut +*/ + +/* On ASCII machines this is normally a macro but we want a + real function in case XS code wants it +*/ +#undef Perl_uvchr_to_utf8 +U8 * +Perl_uvchr_to_utf8(pTHX_ U8 *d, UV uv) +{ + return Perl_uvuni_to_utf8(aTHX_ d, NATIVE_TO_UNI(uv)); +} + + +/* +=for apidoc A|UV|utf8n_to_uvchr|U8 *s|STRLEN curlen|STRLEN *retlen|U32 flags + +Returns the native character value of the first character in the string C +which is assumed to be in UTF8 encoding; C will be set to the +length, in bytes, of that character. + +Allows length and flags to be passed to low level routine. + +=cut +*/ +/* On ASCII machines this is normally a macro but we want a + real function in case XS code wants it +*/ +#undef Perl_utf8n_to_uvchr +UV +Perl_utf8n_to_uvchr(pTHX_ U8 *s, STRLEN curlen, STRLEN *retlen, U32 flags) +{ + UV uv = Perl_utf8n_to_uvuni(aTHX_ s, curlen, retlen, flags); + return UNI_TO_NATIVE(uv); +} + +