Changeset 27689 in webkit

Timestamp:

Nov 11, 2007 11:24:37 AM (16 years ago)

Author:

Darin Adler

Message:

• try another way of fixing dftables builds -- refactor pcre_internal.h a bit

• pcre/pcre_internal.h: Make most of this header do nothing when DFTABLES is set. Later we can break it into two files.

• JavaScriptCore.vcproj/dftables/dftables.vcproj: Take out now-unneeded include paths.
• pcre/dftables.cpp: Set DFTABLES. Use delete instead of free.
• pcre/dftables.pro: Take out now-unneeded include paths.
• pcre/pcre_maketables.cpp: Use new instead of malloc.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• JavaScriptCore.vcproj/dftables/dftables.vcproj (modified) (1 diff)
• pcre/dftables.cpp (modified) (2 diffs)
• pcre/dftables.pro (modified) (1 diff)
• pcre/pcre_internal.h (modified) (3 diffs)
• pcre/pcre_maketables.cpp (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2007-11-11  Darin Adler  <darin@apple.com>
+
+        - try another way of fixing dftables builds -- refactor pcre_internal.h a bit
+
+        * pcre/pcre_internal.h: Make most of this header do nothing when DFTABLES is set.
+        Later we can break it into two files.
+
+        * JavaScriptCore.vcproj/dftables/dftables.vcproj: Take out now-unneeded include paths.
+        * pcre/dftables.cpp: Set DFTABLES. Use delete instead of free.
+        * pcre/dftables.pro: Take out now-unneeded include paths.
+        * pcre/pcre_maketables.cpp: Use new instead of malloc.
+
 2007-11-11  Darin Adler  <darin@apple.com>
 

trunk/JavaScriptCore/JavaScriptCore.vcproj/dftables/dftables.vcproj

@@ -42 +42 @@
                                 Name="VCCLCompilerTool"
                                 Optimization="0"
-                                AdditionalIncludeDirectories="../../wtf;../..;"$(WebKitLibrariesDir)\include\""
                                 PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE"
                                 MinimalRebuild="true"

trunk/JavaScriptCore/pcre/dftables.cpp

@@ -40 +40 @@
 
 /* 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. */
+character tables. The tables are built according to the default C
+locale. */
+
+#define DFTABLES
 
 #include <ctype.h>
@@ -160 +161 @@
 
 fclose(f);
-free((void *)base_of_tables);
+delete []base_of_tables;
 return 0;
 }

trunk/JavaScriptCore/pcre/dftables.pro

@@ -6 +6 @@
 DESTDIR = tmp
 
-INCLUDEPATH += $$PWD/.. $$PWD/../wtf
-
 gtk-port {
   DEFINES += BUILDING_GTK__ BUILDING_CAIRO__

trunk/JavaScriptCore/pcre/pcre_internal.h

@@ -44 +44 @@
 #ifndef PCRE_INTERNAL_H
 #define PCRE_INTERNAL_H
+
+#ifndef DFTABLES
 
 #include "Assertions.h"
@@ -538 +540 @@
 } compile_data;
 
+/* Layout of the UCP type table that translates property names into types and
+codes. */
+
+typedef struct {
+  const char *name;
+  pcre_uint16 type;
+  pcre_uint16 value;
+} ucp_type_table;
+
+
+/* Internal shared data tables. These are tables that are used by more than one
+of the exported public functions. They have to be "external" in the C sense,
+but are not part of the PCRE public API. The data for these tables is in the
+pcre_tables.c module. */
+
+extern const int    _pcre_utf8_table1[];
+extern const int    _pcre_utf8_table2[];
+extern const int    _pcre_utf8_table3[];
+extern const uschar _pcre_utf8_table4[];
+
+extern const int    _pcre_utf8_table1_size;
+
+extern const uschar _pcre_default_tables[];
+
+
+/* Internal shared functions. These are functions that are used by more than
+one of the exported public functions. They have to be "external" in the C
+sense, but are not part of the PCRE public API. */
+
+extern int         _pcre_ord2utf8(int, uschar *);
+extern int         _pcre_ucp_othercase(const int);
+extern BOOL        _pcre_xclass(int, const uschar *);
+
+#define IS_NEWLINE(nl) ((nl) == 0xA || (nl) == 0xD || (nl) == 0x2028 || (nl) == 0x2029)
+
+#endif
+
 /* Bit definitions for entries in the pcre_ctypes table. */
 
@@ -561 +600 @@
 #define tables_length (ctypes_offset + 128)
 
-/* Layout of the UCP type table that translates property names into types and
-codes. */
-
-typedef struct {
-  const char *name;
-  pcre_uint16 type;
-  pcre_uint16 value;
-} ucp_type_table;
-
-
-/* Internal shared data tables. These are tables that are used by more than one
-of the exported public functions. They have to be "external" in the C sense,
-but are not part of the PCRE public API. The data for these tables is in the
-pcre_tables.c module. */
-
-extern const int    _pcre_utf8_table1[];
-extern const int    _pcre_utf8_table2[];
-extern const int    _pcre_utf8_table3[];
-extern const uschar _pcre_utf8_table4[];
-
-extern const int    _pcre_utf8_table1_size;
-
-extern const uschar _pcre_default_tables[];
-
-
-/* Internal shared functions. These are functions that are used by more than
-one of the exported public functions. They have to be "external" in the C
-sense, but are not part of the PCRE public API. */
-
-extern int         _pcre_ord2utf8(int, uschar *);
-extern int         _pcre_ucp_othercase(const int);
-extern BOOL        _pcre_xclass(int, const uschar *);
-
-#define IS_NEWLINE(nl) ((nl) == 0xA || (nl) == 0xD || (nl) == 0x2028 || (nl) == 0x2029)
-
 #endif
 

trunk/JavaScriptCore/pcre/pcre_maketables.cpp

@@ -59 +59 @@
 int i;
 
-yield = (unsigned char*)malloc(tables_length);
+yield = new unsigned char[tables_length];
 
 if (yield == NULL) return NULL;