X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=utf8.c;h=0153fd6cd86858228ce7269f52b10395560cc3ef;hb=1be79c1b33149964355b8298e509bb8974fe3030;hp=0e52f211f637d4b6bc3472f23cddb071638ff4cf;hpb=b8c5462f6edbb2dd616e1733df011beee816eee1;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/utf8.c b/utf8.c
index 0e52f21..0153fd6 100644
--- a/utf8.c
+++ b/utf8.c
@@ -68,8 +68,8 @@ Perl_uv_to_utf8(pTHX_ U8 *d, UV uv)
 	*d++ = (( uv        & 0x3f) | 0x80);
 	return d;
     }
-#ifdef Quad_t
-    if (uv < 0x2000000000)
+#ifdef HAS_QUAD
+    if (uv < 0x1000000000LL)
 #endif
     {
 	*d++ =                        0xfe;	/* Can't match U+FEFF! */
@@ -81,7 +81,7 @@ Perl_uv_to_utf8(pTHX_ U8 *d, UV uv)
 	*d++ = (( uv        & 0x3f) | 0x80);
 	return d;
     }
-#ifdef Quad_t
+#ifdef HAS_QUAD
     {
 	*d++ =                        0xff;	/* Can't match U+FFFE! */
 	*d++ = (((uv >> 36) & 0x3f) | 0x80);
@@ -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)
 {