Changeset 21772 in webkit

Timestamp:

May 25, 2007 12:34:58 PM (17 years ago)

Author:

yongjzha

Message:

2007-05-23 malaiya,

reviewed by Yongjun
DESC: disabled 'SUPPORT_UTF8'flag support in prce
​http://bugs.webkit.org/show_bug.cgi?id=13847
TSW ID : ELWI-6Z2AAU

• pcre/pcre-config.h:
• pcre/pcre.c: (pcre_compile):

Location:

S60/trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• pcre/pcre-config.h (modified) (1 diff)
• pcre/pcre.c (modified) (7 diffs)

S60/trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2007-05-23  malaiya, 
+        reviewed by Yongjun
+        DESC: disabled 'SUPPORT_UTF8'flag support in prce
+        http://bugs.webkit.org/show_bug.cgi?id=13847
+        TSW ID : ELWI-6Z2AAU
+        
+        * pcre/pcre-config.h:
+        * pcre/pcre.c:
+        (pcre_compile):
+
 2007-05-22  bujtas  <zbujtas@gmail.com>
 

S60/trunk/JavaScriptCore/pcre/pcre-config.h

@@ -3 +3 @@
 #define HAVE_STRERROR 1
 #define NEWLINE 10
-#define SUPPORT_UTF8 0
+//#define SUPPORT_UTF8 0

S60/trunk/JavaScriptCore/pcre/pcre.c

@@ -209 +209 @@
 
 #ifndef SUPPORT_UTF8
-#define GETCHARINC(c, eptr) c = *eptr++;
-#define GETCHARLEN(c, eptr, len) c = *eptr;
-#define BACKCHAR(eptr)
-
-#else   /* SUPPORT_UTF8 */
-
 #if PCRE_UTF16
-
 /* Get the next UTF-16 character, advancing the pointer */
-
 #define LEAD_OFFSET (0xd800 - (0x10000 >> 10))
 #define SURROGATE_OFFSET (0x10000 - (0xd800 << 10) - 0xdc00)
@@ -250 +242 @@
 #define ISMIDCHAR(c) IS_TRAILING_SURROGATE(c)
 
-#else
-
+#else /* PCRE_UTF16 */
+#define GETCHARINC(c, eptr) c = *eptr++;
+#define GETCHARLEN(c, eptr, len) c = *eptr;
+#endif /* PCRE_UTF16 */
+#define BACKCHAR(eptr)
+
+#else   /* SUPPORT_UTF8 */
+
+#if PCRE_UTF16
+/* Get the next UTF-16 character, advancing the pointer */
+#define LEAD_OFFSET (0xd800 - (0x10000 >> 10))
+#define SURROGATE_OFFSET (0x10000 - (0xd800 << 10) - 0xdc00)
+
+#define IS_LEADING_SURROGATE(c) (((c) & ~0x3ff) == 0xd800)
+#define IS_TRAILING_SURROGATE(c) (((c) & ~0x3ff) == 0xdc00)
+
+#define DECODE_SURROGATE_PAIR(l, t) (((l) << 10) + (t) + SURROGATE_OFFSET)
+#define LEADING_SURROGATE(c) (LEAD_OFFSET + ((c) >> 10))
+#define TRAILING_SURROGATE(c) (0xdc00 + ((c) & 0x3FF))
+
+#define GETCHARINC(c, eptr) \
+  c = *eptr++; \
+  if (IS_LEADING_SURROGATE(c)) \
+    c = DECODE_SURROGATE_PAIR(c, *eptr++);
+
+/* Get the next UTF-16 character, not advancing the pointer, setting length */
+
+#define GETCHARLEN(c, eptr, len) \
+  c = *eptr; \
+  if (!IS_LEADING_SURROGATE(c)) \
+    len = 1; \
+  else \
+    { \
+    c = DECODE_SURROGATE_PAIR(c, eptr[1]); \
+    len = 2; \
+    }
+
+/* Return 1 if not the start of a character. */
+
+#define ISMIDCHAR(c) IS_TRAILING_SURROGATE(c)
+
+#else /* PCRE_UTF16 */
 /* Get the next UTF-8 character, advancing the pointer */
-
 #define GETCHARINC(c, eptr) \
   c = *eptr++; \
@@ -291 +322 @@
 #define ISMIDCHAR(c) (((c) & 0xc0) == 0x80)
 
-#endif
-
+#endif /* PCRE_UTF16 */
 /* If the pointer is not at the start of a character, move it back until
 it is. */
-
 #define BACKCHAR(eptr) while(ISMIDCHAR(*eptr)) eptr--;
-
-#endif
+#endif /* SUPPORT_UTF8 */
+
 
 
@@ -318 +347 @@
 #endif
 
-
-
-
-#if !PCRE_UTF16
 #ifdef SUPPORT_UTF8
 /*************************************************
@@ -378 +403 @@
 return i + 1;
 }
-#endif
-#endif
-
+#endif /* SUPPORT_UTF8 */
 
 
@@ -2640 +2663 @@
 #endif
 
+#if !NOKIA_CHANGES
 /* Can't support UTF8 unless PCRE has been compiled to include the code. */
-
 #ifndef SUPPORT_UTF8
-if ((options & PCRE_UTF8) != 0)
+if ((options & PCRE_UTF8) != 0) 
   {
   *errorptr = ERR32;
@@ -2651 +2674 @@
 
 /* Always set the UTF-8 flag if we're compiled for UTF-16; saves on ifdefs. */
-
 #if PCRE_UTF16
 options |= PCRE_UTF8;
 #endif
+#endif //NOKIA_CHANGES
 
 /* We can't pass back an error message if errorptr is NULL; I guess the best we