Make \x{...} consistently produce UTF-8.

[perl5.git] / utf8.h

diff --git a/utf8.h b/utf8.h
index 7407335..dc93e95 100644 (file)
--- a/utf8.h
+++ b/utf8.h
@@ -29,14 +29,25 @@ END_EXTERN_C
 
 #define UTF8_MAXLEN 13 /* how wide can a single UTF8 encoded character become */
 
-/*#define IN_UTF8 (PL_curcop->op_private & HINT_UTF8)*/
+/* #define IN_UTF8 (PL_curcop->op_private & HINT_UTF8) */
 #define IN_BYTE (PL_curcop->op_private & HINT_BYTE)
 #define DO_UTF8(sv) (SvUTF8(sv) && !IN_BYTE)
 
+#define UTF8_ALLOW_CONTINUATION                0x0001
+#define UTF8_ALLOW_NON_CONTINUATION    0x0002
+#define UTF8_ALLOW_FE_FF               0x0004
+#define UTF8_ALLOW_SHORT               0x0008
+#define UTF8_ALLOW_SURROGATE           0x0010
+#define UTF8_ALLOW_BOM                 0x0020
+#define UTF8_ALLOW_FFFF                        0x0040
+#define UTF8_ALLOW_LONG                        0x0080
+#define UTF8_ALLOW_ANY                 0x00ff
+#define UTF8_CHECK_ONLY                        0x0100
+
 #define UTF8SKIP(s) PL_utf8skip[*(U8*)s]
 
 #ifdef HAS_QUAD
-#define UTF8LEN(uv) ( (uv) < 0x80           ? 1 : \
+#define UNISKIP(uv) ( (uv) < 0x80           ? 1 : \
                      (uv) < 0x800          ? 2 : \
                      (uv) < 0x10000        ? 3 : \
                      (uv) < 0x200000       ? 4 : \
@@ -45,7 +56,7 @@ END_EXTERN_C
                       (uv) < 0x1000000000LL ? 7 : 13 ) 
 #else
 /* No, I'm not even going to *TRY* putting #ifdef inside a #define */
-#define UTF8LEN(uv) ( (uv) < 0x80           ? 1 : \
+#define UNISKIP(uv) ( (uv) < 0x80           ? 1 : \
                      (uv) < 0x800          ? 2 : \
                      (uv) < 0x10000        ? 3 : \
                      (uv) < 0x200000       ? 4 : \
@@ -53,6 +64,8 @@ END_EXTERN_C
                      (uv) < 0x80000000     ? 6 : 7 )
 #endif
 
+#define UNICODE_REPLACEMENT_CHARACTER  0xfffd
+
 /*
  * Note: we try to be careful never to call the isXXX_utf8() functions
  * unless we're pretty sure we've seen the beginning of a UTF-8 character