Changeset 27730 in webkit for trunk/JavaScriptCore/pcre/dftables.cpp

Timestamp:

Nov 12, 2007, 3:04:41 PM (18 years ago)

Author:

Darin Adler

Message:

Reviewed by Geoff.

• fix use of prefix and config.h, got rid of a few unneeded things in the PCRE code; no behavior changes

• API/JSBase.cpp: Added include of config.h.
• API/JSCallbackConstructor.cpp: Ditto.
• API/JSCallbackFunction.cpp: Ditto.
• API/JSCallbackObject.cpp: Ditto.
• API/JSClassRef.cpp: Ditto.
• API/JSContextRef.cpp: Ditto.
• API/JSObjectRef.cpp: Ditto.
• API/JSStringRef.cpp: Ditto.
• API/JSValueRef.cpp: Ditto.

• JavaScriptCorePrefix.h: Removed obsolete <ctype.h> workaround. Moved new/delete macros after includes, as they are in WebCore's prefix. Removed "config.h".

• pcre/dftables.cpp: (main): Changed back to not use a separate maketables function. This is needed for PCRE, but not helpful for our use. Also changed the tables to all be 128 entries long instead of 256, since only the first 128 are ever used.

• pcre/pcre_compile.cpp: Added include of config.h. Eliminated digitab, which was only being used to check hex digits. Changed all uses of TRUE and FALSE to use the C++ true and false instead. (check_escape): Just the TRUE/FALSE thing. (is_counted_repeat): Ditto. (could_be_empty_branch): Ditto. (get_othercase_range): Ditto. (compile_branch): Ditto. (compile_regex): Ditto. (is_anchored): Ditto. (is_startline): Ditto. (find_firstassertedchar): Ditto. (jsRegExpCompile): Ditto.

• pcre/pcre_exec.cpp: Added include of config.h. Changed all uses of TRUE and FALSE to use the C++ true and false instead. (match_ref): Just the TRUE/FALSE thing. (match): Ditto. Removed some unneeded braces. (jsRegExpExecute): Just the TRUE/FALSE thing.

• pcre/pcre_internal.h: Moved the constants needed by dftables.cpp to the top of the file instead of the bottom, so they can be used. Also changed the table sizes to 128 instead of 256. Removed macro definitions of FALSE and TRUE. Set array sizes for all the const arrays. Changed _pcre_utf8_table1_size to be a macro instead of a extern int.

• pcre/pcre_maketables.cpp: Removed. It's all in dftables.cpp now.

• pcre/pcre_tables.cpp: Made table sizes explicit.

• pcre/pcre_xclass.cpp: Just the TRUE/FALSE thing.

File:

• trunk/JavaScriptCore/pcre/dftables.cpp (modified) (9 diffs)

trunk/JavaScriptCore/pcre/dftables.cpp

@@ -38 +38 @@
 */
 
-
-/* This is a freestanding support program to generate a file containing default
+/* This is a freestanding support program to generate a file containing
 character tables. The tables are built according to the default C
 locale. */
@@ -47 +46 @@
 #include <ctype.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
 #include "pcre_internal.h"
 
-#include "pcre_maketables.cpp"
-
 int main(int argc, char **argv)
 {
-int i;
-FILE *f;
-const unsigned char *tables = pcre_maketables();
-const unsigned char *base_of_tables = tables;
-
 if (argc != 2)
   {
@@ -66 +59 @@
   }
 
-f = fopen(argv[1], "wb");
+FILE* f = fopen(argv[1], "wb");
 if (f == NULL)
   {
@@ -73 +66 @@
   }
 
-/* There are two fprintf() calls here, because gcc in pedantic mode complains
-about the very long string otherwise. */
+int i;
 
 fprintf(f,
@@ -87 +79 @@
   "128 (ASCII characters). These tables are used when no external tables are\n"
   "passed to PCRE. */\n\n"
-  "const unsigned char _pcre_default_tables[] = {\n\n"
-  "/* This table is a lower casing table. */\n\n");
+  "const unsigned char _pcre_default_tables[%d] = {\n\n"
+  "/* This table is a lower casing table. */\n\n", tables_length);
+
+if (lcc_offset != 0)
+  abort();
 
 fprintf(f, "  ");
-for (i = 0; i < 256; i++)
+for (i = 0; i < 128; i++)
   {
   if ((i & 7) == 0 && i != 0) fprintf(f, "\n  ");
-  fprintf(f, "%3d", *tables++);
-  if (i != 255) fprintf(f, ",");
+  fprintf(f, "0x%02X", tolower(i));
+  if (i != 127) fprintf(f, ", ");
   }
 fprintf(f, ",\n\n");
@@ -101 +96 @@
 fprintf(f, "/* This table is a case flipping table. */\n\n");
 
+if (fcc_offset != 128)
+  abort();
+
 fprintf(f, "  ");
-for (i = 0; i < 256; i++)
+for (i = 0; i < 128; i++)
   {
   if ((i & 7) == 0 && i != 0) fprintf(f, "\n  ");
-  fprintf(f, "%3d", *tables++);
-  if (i != 255) fprintf(f, ",");
+  fprintf(f, "0x%02X", islower(i) ? toupper(i) : tolower(i));
+  if (i != 127) fprintf(f, ", ");
   }
 fprintf(f, ",\n\n");
@@ -113 +111 @@
   "/* This table contains bit maps for various character classes.\n"
   "Each map is 32 bytes long and the bits run from the least\n"
-  "significant end of each byte. The classes that have their own\n"
-  "maps are: space, xdigit, digit, upper, lower, word, graph\n"
-  "print, punct, and cntrl. Other classes are built from combinations. */\n\n");
+  "significant end of each byte. The classes are: space, digit, word. */\n\n");
+
+if (cbits_offset != fcc_offset + 128)
+  abort();
+
+unsigned char cbit_table[cbit_length];
+memset(cbit_table, 0, cbit_length);
+for (i = '0'; i <= '9'; i++)
+  cbit_table[cbit_digit + i / 8] |= 1 << (i & 7);
+cbit_table[cbit_word + '_' / 8] |= 1 << ('_' & 7);
+for (i = 0; i < 128; i++)
+  {
+  if (isalnum(i)) cbit_table[cbit_word + i/8] |= 1 << (i & 7);
+  if (isspace(i)) cbit_table[cbit_space + i/8] |= 1 << (i & 7);
+  }
 
 fprintf(f, "  ");
@@ -125 +135 @@
     fprintf(f, "\n  ");
     }
-  fprintf(f, "0x%02x", *tables++);
-  if (i != cbit_length - 1) fprintf(f, ",");
+  fprintf(f, "0x%02X", cbit_table[i]);
+  if (i != cbit_length - 1) fprintf(f, ", ");
   }
 fprintf(f, ",\n\n");
@@ -137 +147 @@
   ctype_space, ctype_xdigit, ctype_word);
 
+if (ctypes_offset != cbits_offset + cbit_length)
+    abort();
+
 fprintf(f, "  ");
-for (i = 0; i < 256; i++)
+for (i = 0; i < 128; i++)
   {
-  if ((i & 7) == 0 && i != 0)
+  int x = 0;
+  if (isspace(i)) x += ctype_space;
+  if (isxdigit(i)) x += ctype_xdigit;
+  if (isalnum(i) || i == '_') x += ctype_word;
+  fprintf(f, "0x%02X", x);
+  if (i != 127)
+    fprintf(f, ", ");
+  else
+    fprintf(f, "};");
+  if ((i & 7) == 7)
     {
     fprintf(f, " /* ");
-    if (isprint(i-8)) fprintf(f, " %c -", i-8);
-      else fprintf(f, "%3d-", i-8);
-    if (isprint(i-1)) fprintf(f, " %c ", i-1);
-      else fprintf(f, "%3d", i-1);
-    fprintf(f, " */\n  ");
+    if (isprint(i - 7)) fprintf(f, " %c -", i - 7);
+      else fprintf(f, "%3d-", i - 7);
+    if (isprint(i)) fprintf(f, " %c ", i);
+      else fprintf(f, "%3d", i);
+    fprintf(f, " */\n");
+    if (i != 127)
+      fprintf(f, "  ");
     }
-  fprintf(f, "0x%02x", *tables++);
-  if (i != 255) fprintf(f, ",");
   }
 
-fprintf(f, "};/* ");
-if (isprint(i-8)) fprintf(f, " %c -", i-8);
-  else fprintf(f, "%3d-", i-8);
-if (isprint(i-1)) fprintf(f, " %c ", i-1);
-  else fprintf(f, "%3d", i-1);
-fprintf(f, " */\n\n/* End of chartables.c */\n");
+if (tables_length != ctypes_offset + 128)
+    abort();
+
+fprintf(f, "\n\n/* End of chartables.c */\n");
 
 fclose(f);
-delete []base_of_tables;
 return 0;
 }