Changeset 10495 in webkit for trunk/JavaScriptCore/pcre/dftables.c

Timestamp:

Sep 8, 2005, 5:51:07 PM (20 years ago)

Author:

darin

Message:

Reviewed by Geoff.

• updated to PCRE 6.1

The original PCRE 6.1 sources are checked into the tree with the tag
"pcre-6-1" for reference. What we're checking in right now is the original
plus our changes to make it support UTF-16 and at least one other tweak
(vertical tab considered whitespace). Our work to get our changes was
done on "pcre-6-1-branch", with an anchor at "pcre-6-1-anchor" so you can
see the evolution of the UTF-16 changes.

Note also that there was one small change made here that's not on the branch
in pcre_compile.c.

• Info.plist: Updated the part of the copyright message that's about PCRE.

• JavaScriptCore.xcodeproj/project.pbxproj: Added new PCRE source files, removed obsolete ones.

• pcre/AUTHORS: Updated to PCRE 6.1. Includes credits for Apple's UTF-16 changes, but not the credits for Google's C++ wrapper, since we don't include that.
• pcre/COPYING: Updated to PCRE 6.1.
• pcre/LICENCE: Ditto.
• pcre/dftables.c: Ditto.
• pcre/pcre-config.h: Ditto.
• pcre/pcre.h: Ditto.

• pcre/pcre_compile.c: Added for PCRE 6.1.
• pcre/pcre_config.c: Ditto.
• pcre/pcre_exec.c: Ditto.
• pcre/pcre_fullinfo.c: Ditto.
• pcre/pcre_get.c: Ditto.
• pcre/pcre_globals.c: Ditto.
• pcre/pcre_info.c: Ditto.
• pcre/pcre_internal.h: Ditto.
• pcre/pcre_maketables.c: Ditto.
• pcre/pcre_ord2utf8.c: Ditto.
• pcre/pcre_printint.c: Ditto.
• pcre/pcre_refcount.c: Ditto.
• pcre/pcre_study.c: Ditto.
• pcre/pcre_tables.c: Ditto.
• pcre/pcre_try_flipped.c: Ditto.
• pcre/pcre_ucp_findchar.c: Ditto.
• pcre/pcre_version.c: Ditto.
• pcre/pcre_xclass.c: Ditto.
• pcre/ucp.h: Ditto.
• pcre/ucp_findchar.c: Ditto.
• pcre/ucpinternal.h: Ditto.
• pcre/ucptable.c: Ditto.

• pcre/get.c: Removed.
• pcre/internal.h: Removed.
• pcre/maketables.c: Removed.
• pcre/pcre.c: Removed.
• pcre/study.c: Removed.

File:

• trunk/JavaScriptCore/pcre/dftables.c (modified) (5 diffs)

trunk/JavaScriptCore/pcre/dftables.c

@@ -1 +1 @@
 /*************************************************
 *      Perl-Compatible Regular Expressions       *
-*  extended to UTF-16 for use in JavaScriptCore  *
 *************************************************/
 
-/*
-PCRE is a library of functions to support regular expressions whose syntax
+/* PCRE is a library of functions to support regular expressions whose syntax
 and semantics are as close as possible to those of the Perl 5 language.
 
-Written by: Philip Hazel <[email protected]>
-
-           Copyright (c) 1997-2001 University of Cambridge
-           Copyright (C) 2004 Apple Computer, Inc.
+                       Written by Philip Hazel
+           Copyright (c) 1997-2005 University of Cambridge
 
 -----------------------------------------------------------------------------
-Permission is granted to anyone to use this software for any purpose on any
-computer system, and to redistribute it freely, subject to the following
-restrictions:
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
 
-1. This software is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
 
-2. The origin of this software must not be misrepresented, either by
-   explicit claim or by omission.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
 
-3. Altered versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
+    * Neither the name of the University of Cambridge nor the names of its
+      contributors may be used to endorse or promote products derived from
+      this software without specific prior written permission.
 
-4. If PCRE is embedded in any software that is released under the GNU
-   General Purpose Licence (GPL), then the terms of that licence shall
-   supersede any condition above with which it is incompatible.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
 -----------------------------------------------------------------------------
-
-See the file Tech.Notes for some information on the internals.
 */
 
 
-/* This is a support program to generate the file chartables.c, containing
-character tables of various kinds. They are built according to the default C
-locale and used as the default tables by PCRE. Now that pcre_maketables is
-a function visible to the outside world, we make use of its code from here in
-order to be consistent. */
+/* This is a freestanding support program to generate a file containing default
+character tables for PCRE. The tables are built according to the default C
+locale. Now that pcre_maketables is a function visible to the outside world, we
+make use of its code from here in order to be consistent. */
 
 #include <ctype.h>
@@ -47 +48 @@
 #include <string.h>
 
-#include "internal.h"
+#include "pcre_internal.h"
 
-#define DFTABLES          /* maketables.c notices this */
-#include "maketables.c"
+#define DFTABLES          /* pcre_maketables.c notices this */
+#include "pcre_maketables.c"
 
 
-int main(void)
+int main(int argc, char **argv)
 {
 int i;
+FILE *f;
 const unsigned char *tables = pcre_maketables();
+const unsigned char *base_of_tables = tables;
 
-printf(
+if (argc != 2)
+  {
+  fprintf(stderr, "dftables: one filename argument is required\n");
+  return 1;
+  }
+
+f = fopen(argv[1], "w");
+if (f == NULL)
+  {
+  fprintf(stderr, "dftables: failed to open %s for writing\n", argv[1]);
+  return 1;
+  }
+
+/* There are two fprintf() calls here, because gcc in pedantic mode complains
+about the very long string otherwise. */
+
+fprintf(f,
   "/*************************************************\n"
   "*      Perl-Compatible Regular Expressions       *\n"
@@ -64 +83 @@
   "/* This file is automatically written by the dftables auxiliary \n"
   "program. If you edit it by hand, you might like to edit the Makefile to \n"
-  "prevent its ever being regenerated.\n\n"
-  "This file is #included in the compilation of pcre.c to build the default\n"
-  "character tables which are used when no tables are passed to the compile\n"
-  "function. */\n\n"
-  "static const unsigned char pcre_default_tables[] = {\n\n"
+  "prevent its ever being regenerated.\n\n");
+fprintf(f,
+  "This file contains the default tables for characters with codes less than\n"
+  "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");
 
-printf("  ");
-for (i = 0; i < (int)ICHAR_MAP_SIZE; i++)
+fprintf(f, "  ");
+for (i = 0; i < 256; i++)
   {
-  if ((i & 7) == 0 && i != 0) printf("\n  ");
-  printf("%3d", *tables++);
-  if (i != ICHAR_MAP_SIZE - 1) printf(",");
+  if ((i & 7) == 0 && i != 0) fprintf(f, "\n  ");
+  fprintf(f, "%3d", *tables++);
+  if (i != 255) fprintf(f, ",");
   }
-printf(",\n\n");
+fprintf(f, ",\n\n");
 
-printf("/* This table is a case flipping table. */\n\n");
+fprintf(f, "/* This table is a case flipping table. */\n\n");
 
-printf("  ");
-for (i = 0; i < (int)ICHAR_MAP_SIZE; i++)
+fprintf(f, "  ");
+for (i = 0; i < 256; i++)
   {
-  if ((i & 7) == 0 && i != 0) printf("\n  ");
-  printf("%3d", *tables++);
-  if (i != ICHAR_MAP_SIZE - 1) printf(",");
+  if ((i & 7) == 0 && i != 0) fprintf(f, "\n  ");
+  fprintf(f, "%3d", *tables++);
+  if (i != 255) fprintf(f, ",");
   }
-printf(",\n\n");
+fprintf(f, ",\n\n");
 
-printf(
+fprintf(f,
   "/* This table contains bit maps for various character classes.\n"
   "Each map is 32 bytes long and the bits run from the least\n"
@@ -98 +118 @@
   "print, punct, and cntrl. Other classes are built from combinations. */\n\n");
 
-printf("  ");
+fprintf(f, "  ");
 for (i = 0; i < cbit_length; i++)
   {
   if ((i & 7) == 0 && i != 0)
     {
-    if ((i & 31) == 0) printf("\n");
-    printf("\n  ");
+    if ((i & 31) == 0) fprintf(f, "\n");
+    fprintf(f, "\n  ");
     }
-  printf("0x%02x", *tables++);
-  if (i != cbit_length - 1) printf(",");
+  fprintf(f, "0x%02x", *tables++);
+  if (i != cbit_length - 1) fprintf(f, ",");
   }
-printf(",\n\n");
+fprintf(f, ",\n\n");
 
-printf(
+fprintf(f,
   "/* This table identifies various classes of character by individual bits:\n"
   "  0x%02x   white space character\n"
@@ -122 +142 @@
   ctype_meta);
 
-printf("  ");
-for (i = 0; i < ICHAR_COUNT; i++)
+fprintf(f, "  ");
+for (i = 0; i < 256; i++)
   {
   if ((i & 7) == 0 && i != 0)
     {
-    printf(" /* ");
-    if (isprint(i-8)) printf(" %c -", i-8);
-      else printf("%3d-", i-8);
-    if (isprint(i-1)) printf(" %c ", i-1);
-      else printf("%3d", i-1);
-    printf(" */\n  ");
+    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  ");
     }
-  printf("0x%02x", *tables++);
-  if (i != ICHAR_COUNT - 1) printf(",");
+  fprintf(f, "0x%02x", *tables++);
+  if (i != 255) fprintf(f, ",");
   }
 
-printf("};/* ");
-if (isprint(i-8)) printf(" %c -", i-8);
-  else printf("%3d-", i-8);
-if (isprint(i-1)) printf(" %c ", i-1);
-  else printf("%3d", i-1);
-printf(" */\n\n/* End of chartables.c */\n");
+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");
 
+fclose(f);
+free((void *)base_of_tables);
 return 0;
 }