INSTALL =~ s/5.006/5.6/; delay loading Errno until needed

[perl5.git] / utf8.c

diff --git a/utf8.c b/utf8.c
index 0e52f21..a470376 100644 (file)
--- a/utf8.c
+++ b/utf8.c
@@ -107,7 +107,9 @@ Perl_utf8_to_uv(pTHX_ U8* s, I32* retlen)
        return *s;
     }
     if (!(uv & 0x40)) {
-       Perl_warn(aTHX_ "Malformed UTF-8 character");
+        dTHR;
+       if (ckWARN_d(WARN_UTF8))     
+           Perl_warner(aTHX_ WARN_UTF8, "Malformed UTF-8 character");
        if (retlen)
            *retlen = 1;
        return *s;
@@ -127,7 +129,9 @@ Perl_utf8_to_uv(pTHX_ U8* s, I32* retlen)
     s++;
     while (len--) {
        if ((*s & 0xc0) != 0x80) {
-           Perl_warn(aTHX_ "Malformed UTF-8 character");
+            dTHR;
+           if (ckWARN_d(WARN_UTF8))     
+               Perl_warner(aTHX_ WARN_UTF8, "Malformed UTF-8 character");
            if (retlen)
                *retlen -= len + 1;
            return 0xfffd;
@@ -203,9 +207,11 @@ Perl_utf16_to_utf8(pTHX_ U16* p, U8* d, I32 bytelen)
            continue;
        }
        if (uv >= 0xd800 && uv < 0xdbff) {      /* surrogates */
+            dTHR;
            int low = *p++;
            if (low < 0xdc00 || low >= 0xdfff) {
-               Perl_warn(aTHX_ "Malformed UTF-16 surrogate");
+               if (ckWARN_d(WARN_UTF8))     
+                   Perl_warner(aTHX_ WARN_UTF8, "Malformed UTF-16 surrogate");
                p--;
                uv = 0xfffd;
            }
@@ -279,6 +285,14 @@ Perl_is_uni_alpha(pTHX_ U32 c)
 }
 
 bool
+Perl_is_uni_ascii(pTHX_ U32 c)
+{
+    U8 tmpbuf[10];
+    uv_to_utf8(tmpbuf, (UV)c);
+    return is_utf8_ascii(tmpbuf);
+}
+
+bool
 Perl_is_uni_space(pTHX_ U32 c)
 {
     U8 tmpbuf[10];
@@ -335,13 +349,21 @@ Perl_is_uni_print(pTHX_ U32 c)
 }
 
 bool
-is_uni_punct(U32 c)
+Perl_is_uni_punct(pTHX_ U32 c)
 {
     U8 tmpbuf[10];
     uv_to_utf8(tmpbuf, (UV)c);
     return is_utf8_punct(tmpbuf);
 }
 
+bool
+Perl_is_uni_xdigit(pTHX_ U32 c)
+{
+    U8 tmpbuf[10];
+    uv_to_utf8(tmpbuf, (UV)c);
+    return is_utf8_xdigit(tmpbuf);
+}
+
 U32
 Perl_to_uni_upper(pTHX_ U32 c)
 {
@@ -393,6 +415,12 @@ Perl_is_uni_alpha_lc(pTHX_ U32 c)
 }
 
 bool
+Perl_is_uni_ascii_lc(pTHX_ U32 c)
+{
+    return is_uni_ascii(c);    /* XXX no locale support yet */
+}
+
+bool
 Perl_is_uni_space_lc(pTHX_ U32 c)
 {
     return is_uni_space(c);    /* XXX no locale support yet */
@@ -440,6 +468,12 @@ Perl_is_uni_punct_lc(pTHX_ U32 c)
     return is_uni_punct(c);    /* XXX no locale support yet */
 }
 
+bool
+Perl_is_uni_xdigit_lc(pTHX_ U32 c)
+{
+    return is_uni_xdigit(c);   /* XXX no locale support yet */
+}
+
 U32
 Perl_to_uni_upper_lc(pTHX_ U32 c)
 {