Changeset 26697 in webkit for trunk/JavaScriptCore/pcre/pcre_maketables.c

Timestamp:

Oct 16, 2007, 10:38:39 PM (18 years ago)

Author:

darin

Message:

Reviewed by Geoff.

• merged PCRE changes between 6.4 and 6.5

• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
• JavaScriptCore.xcodeproj/project.pbxproj: Removed pcre_config.c, pcre_globals.c, pcre_info.c, pcre_maketables.c, pcre_printint.src, pcre_refcount.c, pcre_study.c, pcre_try_flipped.c, pcre_ucp_findchar.c, pcre_version.c, and ucptable.c. Added pcre_ucp_searchfuncs.c.

• pcre/AUTHORS:
• pcre/LICENCE:
• pcre/MERGING:
• pcre/dftables.c:
• pcre/pcre-config.h:
• pcre/pcre.h:
• pcre/pcre.pri:
• pcre/pcre_compile.c:
• pcre/pcre_exec.c:
• pcre/pcre_fullinfo.c:
• pcre/pcre_get.c:
• pcre/pcre_internal.h:
• pcre/pcre_maketables.c:
• pcre/pcre_ord2utf8.c:
• pcre/pcre_tables.c:
• pcre/pcre_ucp_searchfuncs.c: Copied from pcre/pcre_ucp_findchar.c.
• pcre/pcre_xclass.c:
• pcre/ucp.h:
• pcre/ucpinternal.h:
• pcre/ucptable.c: Updated with new versions from the PCRE 6.5 release, merged with changes.

• pcre/pcre_config.c: Removed.
• pcre/pcre_globals.c: Removed.
• pcre/pcre_info.c: Removed.
• pcre/pcre_printint.src: Removed.
• pcre/pcre_refcount.c: Removed.
• pcre/pcre_study.c: Removed.
• pcre/pcre_try_flipped.c: Removed.
• pcre/pcre_ucp_findchar.c: Removed.
• pcre/pcre_version.c: Removed.

File:

• trunk/JavaScriptCore/pcre/pcre_maketables.c (modified) (3 diffs)

trunk/JavaScriptCore/pcre/pcre_maketables.c

@@ -7 +7 @@
 
                        Written by Philip Hazel
-           Copyright (c) 1997-2005 University of Cambridge
+           Copyright (c) 1997-2006 University of Cambridge
 
 -----------------------------------------------------------------------------
@@ -87 +87 @@
 for (i = 0; i < 256; i++) *p++ = islower(i)? toupper(i) : tolower(i);
 
-/* Then the character class tables. Don't try to be clever and save effort
-on exclusive ones - in some locales things may be different. Note that the
-table for "space" includes everything "isspace" gives, including VT in the
-default locale. This makes it work for the POSIX class [:space:]. */
+/* Then the character class tables. Don't try to be clever and save effort on
+exclusive ones - in some locales things may be different. Note that the table
+for "space" includes everything "isspace" gives, including VT in the default
+locale. This makes it work for the POSIX class [:space:]. Note also that it is
+possible for a character to be alnum or alpha without being lower or upper,
+such as "male and female ordinals" (\xAA and \xBA) in the fr_FR locale (at
+least under Debian Linux's locales as of 12/2005). So we must test for alnum
+specially. */
 
 memset(p, 0, cbit_length);
 for (i = 0; i < 256; i++)
   {
-  if (isdigit(i))
-    {
-    p[cbit_digit  + i/8] |= 1 << (i&7);
-    p[cbit_word   + i/8] |= 1 << (i&7);
-    }
-  if (isupper(i))
-    {
-    p[cbit_upper  + i/8] |= 1 << (i&7);
-    p[cbit_word   + i/8] |= 1 << (i&7);
-    }
-  if (islower(i))
-    {
-    p[cbit_lower  + i/8] |= 1 << (i&7);
-    p[cbit_word   + i/8] |= 1 << (i&7);
-    }
+  if (isdigit(i)) p[cbit_digit  + i/8] |= 1 << (i&7);
+  if (isupper(i)) p[cbit_upper  + i/8] |= 1 << (i&7);
+  if (islower(i)) p[cbit_lower  + i/8] |= 1 << (i&7);
+  if (isalnum(i)) p[cbit_word   + i/8] |= 1 << (i&7);
   if (i == '_')   p[cbit_word   + i/8] |= 1 << (i&7);
   if (isspace(i)) p[cbit_space  + i/8] |= 1 << (i&7);
@@ -123 +116 @@
 space chars, because Perl doesn't recognize it as such for \s and for comments
 within regexes. */
-/* But no, in JavaScriptCore we don't, so that's commented out below. */
 
 for (i = 0; i < 256; i++)
   {
   int x = 0;
-  if (/*i != 0x0b && */ isspace(i)) x += ctype_space;
+  if (
+#if !JAVASCRIPT
+      *i != 0x0b &&
+#endif
+        isspace(i)) x += ctype_space;
   if (isalpha(i)) x += ctype_letter;
   if (isdigit(i)) x += ctype_digit;