Changeset 18498 in webkit for trunk/JavaScriptCore/pcre/pcre_compile.c

Timestamp:

Dec 31, 2006, 9:07:40 PM (18 years ago)

Author:

ddkilzer

Message:

JavaScriptCore:

Reviewed by Geoff.

Update embedded pcre library from version 6.2 to 6.4. Changes from pcre 6.2 to 6.3
did not include any files in JavaScriptCore/pcre.

All changes include renaming EXPORT to PCRE_EXPORT, renaming of ucp_findchar() to
_pcre_ucp_findchar(), or comment changes. Additional changes noted below.

• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj: Updated source file list.
• JavaScriptCore.xcodeproj/project.pbxproj: Renamed pcre_printint.c to pcre_printint.src and changed it from a source file to a header file.
• JavaScriptCoreSources.bkl: Updated source file list.
• pcre/CMakeLists.txt: Updated source file list.
• pcre/pcre-config.h:
• pcre/pcre.h: Updated version.
• pcre/pcre.pri: Updated source file list.
• pcre/pcre_compile.c: Include pcre_printint.src #if DEBUG. (pcre_compile2):
• pcre/pcre_config.c:
• pcre/pcre_exec.c: (match):
• pcre/pcre_fullinfo.c:
• pcre/pcre_info.c:
• pcre/pcre_internal.h: Added header guard. Removed export of _pcre_printint().
• pcre/pcre_ord2utf8.c:
• pcre/pcre_printint.c: Renamed to pcre_printint.src.
• pcre/pcre_printint.src: Added. Renamed _pcre_printint() to pcre_printint().
• pcre/pcre_refcount.c:
• pcre/pcre_study.c:
• pcre/pcre_tables.c:
• pcre/pcre_try_flipped.c:
• pcre/pcre_ucp_findchar.c: Added contents of ucp_findchar.c.
• pcre/pcre_version.c:
• pcre/pcre_xclass.c: (_pcre_xclass):
• pcre/ucp.h: Removed export of ucp_findchar().
• pcre/ucp_findchar.c: Removed. Contents moved to pcre_ucp_findchar.c.

File:

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

trunk/JavaScriptCore/pcre/pcre_compile.c

@@ -55 +55 @@
 #define DIGITAB(x) digitab[(x)]
 #endif
+
+
+/* When DEBUG is defined, we need the pcre_printint() function, which is also
+used by pcretest. DEBUG is not defined when building a production library. */
+
+#ifdef DEBUG
+#include "pcre_printint.src"
+#endif
+
 
 
@@ -3894 +3903 @@
 */
 
-EXPORT pcre *
+PCRE_EXPORT pcre *
 pcre_compile(const pcre_char *pattern, int options, const char **errorptr,
   int *erroroffset, const unsigned char *tables)
@@ -3902 +3911 @@
 
 
-EXPORT pcre *
+PCRE_EXPORT pcre *
 pcre_compile2(const pcre_char *pattern, int options, int *errorcodeptr,
   const char **errorptr, int *erroroffset, const unsigned char *tables)
@@ -5101 +5110 @@
   }
 
-/* Print out the compiled data for debugging */
+/* Print out the compiled data if debugging is enabled. This is never the
+case when building a production library. */
 
 #ifdef DEBUG
@@ -5139 +5149 @@
   }
 
-_pcre_printint(re, stdout);
+pcre_printint(re, stdout);
 
 /* This check is done here in the debugging case so that the code that