Changeset 27419 in webkit for trunk/JavaScriptCore/kjs/regexp.cpp

Timestamp:

Nov 3, 2007, 10:22:44 PM (18 years ago)

Author:

Darin Adler

Message:

JavaScriptCore:

Reviewed by Maciej.

• ​http://bugs.webkit.org/show_bug.cgi?id=15821 remove unused PCRE features for speed

A first step toward removing the PCRE features we don't use.
This gives a 0.8% speedup on SunSpider, and a 6.5% speedup on
the SunSpider regular expression test.

Replaced the public interface with one that doesn't use the
name PCRE. Removed code we don't need for JavaScript and various
configurations we don't use. This is in preparation for still
more changes in the future. We'll probably switch to C++ and
make some even more significant changes to the regexp engine
to get some additional speed.

There's probably additional unused stuff that I haven't
deleted yet.

This does mean that our PCRE is now a fork, but I think that's
not really a big deal.

• JavaScriptCore.exp: Remove the 5 old entry points and add the 3 new entry points for WebCore's direct use of the regular expression engine.

• kjs/config.h: Remove the USE(PCRE16) define. I decided to flip its sense and now there's a USE(POSIX_REGEX) instead, which should probably not be set by anyone. Maybe later we'll just get rid of it altogether.

• kjs/regexp.h:
• kjs/regexp.cpp: (KJS::RegExp::RegExp): Switch to new jsRegExp function names and defines. Cut down on the number of functions used. (KJS::RegExp::~RegExp): Ditto. (KJS::RegExp::match): Ditto.

• pcre/dftables.c: (main): Get rid of ctype_letter and ctype_meta, which are unused.

• pcre/pcre-config.h: Get rid of EBCIDIC, PCRE_DATA_SCOPE, const, size_t, HAVE_STRERROR, HAVE_MEMMOVE, HAVE_BCOPY, NEWLINE, POSIX_MALLOC_THRESHOLD, NO_RECURSE, SUPPORT_UCP, SUPPORT_UTF8, and JAVASCRIPT. These are all no longer configurable in our copy of the library.

• pcre/pcre.h: Remove the macro-based kjs prefix hack, the PCRE version macros, PCRE_UTF16, the code to set up PCRE_DATA_SCOPE, the include of <stdlib.h>, and most of the constants and functions defined in this header. Changed the naming scheme to use a JSRegExp prefix rather than a pcre prefix. In the future, we'll probably change this to be a C++ header.

• pcre/pcre_compile.c: Removed all unused code branches, including many whole functions and various byte codes. Kept changes outside of removal to a minimum. (check_escape): (first_significant_code): (find_fixedlength): (find_recurse): (could_be_empty_branch): (compile_branch): (compile_regex): (is_anchored): (is_startline): (find_firstassertedchar): (jsRegExpCompile): Renamed from pcre_compile2 and changed the parameters around a bit. (jsRegExpFree): Added.

• pcre/pcre_exec.c: Removed many unused opcodes and variables. Also started tearing down the NO_RECURSE mechanism since it's now the default. In some cases there were things in the explicit frame that could be turned into plain old local variables and other small like optimizations. (pchars): (match_ref): (match): Changed parameters quite a bit since it's now not used recursively. (jsRegExpExecute): Renamed from pcre_exec.

• pcre/pcre_internal.h: Get rid of PCRE_DEFINITION, PCRE_SPTR, PCRE_IMS, PCRE_ICHANGED, PCRE_NOPARTIAL, PCRE_STUDY_MAPPED, PUBLIC_OPTIONS, PUBLIC_EXEC_OPTIONS, PUBLIC_DFA_EXEC_OPTIONS, PUBLIC_STUDY_OPTIONS, MAGIC_NUMBER, 16 of the opcodes, _pcre_utt, _pcre_utt_size, _pcre_try_flipped, _pcre_ucp_findprop, and _pcre_valid_utf8. Also moved pcre_malloc and pcre_free here.

• pcre/pcre_maketables.c: Changed to only compile in dftables. Also got rid of many of the tables that we don't use.

• pcre/pcre_tables.c: Removed the unused Unicode property tables.

• pcre/pcre_ucp_searchfuncs.c: Removed everything except for _pcre_ucp_othercase.

• pcre/pcre_xclass.c: (_pcre_xclass): Removed uneeded support for classes based on Unicode properties.

• wtf/FastMallocPCRE.cpp: Removed unused bits. It would be good to eliminate this completely, but we need the regular expression code to be C++ first.

• pcre/pcre_fullinfo.c:
• pcre/pcre_get.c:
• pcre/ucp.h: Files that are no longer needed. I didn't remove them with this check-in, because I didn't want to modify all the project files.

WebCore:

Reviewed by Maciej.

• WebCore part of ​http://bugs.webkit.org/show_bug.cgi?id=15821 remove unused PCRE features for speed

• page/Frame.cpp: (WebCore::Frame::matchLabelsAgainstElement):
• page/mac/FrameMac.mm: (WebCore::Frame::matchLabelsAgainstElement): Remove use of ":digit:" syntax. This hasn't worked for some time. Use "\d" instead.

• platform/RegularExpression.h: Remove the unused cap function. We can add it back later if we find we need it.
• platform/RegularExpression.cpp: (WebCore::RegularExpression::Private::compile): Update for JavaScriptCore regular expression entry point changes. (WebCore::RegularExpression::Private::~Private): Ditto. (WebCore::RegularExpression::match): Remove the code to set PCRE_NOTBOL. This means that regular expressions with metacharactesr like ^{in them won't work any more with non-whole-string searches, but we don't use any regular expressions like that.}

File:

• trunk/JavaScriptCore/kjs/regexp.cpp (modified) (5 diffs)

trunk/JavaScriptCore/kjs/regexp.cpp

@@ -34 +34 @@
   : m_flags(flags), m_constructionError(0), m_numSubPatterns(0)
 {
-#if USE(PCRE16)
+#if !USE(POSIX_REGEX)
 
-  int options = PCRE_UTF8;
+  int options = 0;
   if (flags & IgnoreCase)
-    options |= PCRE_CASELESS;
+    options |= JS_REGEXP_CASELESS;
   if (flags & Multiline)
-    options |= PCRE_MULTILINE;
+    options |= JS_REGEXP_MULTILINE;
 
   const char* errorMessage;
-  int errorOffset;
-  m_regex = pcre_compile2(reinterpret_cast<const uint16_t*>(p.data()), p.size(),
-                          options, NULL, &errorMessage, &errorOffset, NULL);
+  m_regex = jsRegExpCompile(reinterpret_cast<const JSRegExpChar*>(p.data()), p.size(), options,
+    &m_numSubPatterns, &errorMessage);
   if (!m_regex) {
     m_constructionError = strdup(errorMessage);
@@ -51 +50 @@
   }
 
-  // Get number of subpatterns that will be returned.
-  pcre_fullinfo(m_regex, NULL, PCRE_INFO_CAPTURECOUNT, &m_numSubPatterns);
-
-#else /* USE(PCRE16) */
+#else /* USE(POSIX_REGEX) */
 
   int regflags = 0;
@@ -84 +80 @@
 RegExp::~RegExp()
 {
-#if USE(PCRE16)
-  pcre_free(m_regex);
+#if !USE(POSIX_REGEX)
+  jsRegExpFree(m_regex);
 #else
   /* TODO: is this really okay after an error ? */
@@ -103 +99 @@
     return -1;
 
-#if USE(PCRE16)
+#if !USE(POSIX_REGEX)
 
   if (!m_regex)
@@ -122 +118 @@
   }
 
-  int numMatches = pcre_exec(m_regex, NULL, reinterpret_cast<const uint16_t *>(s.data()), s.size(), i, 0, offsetVector, offsetVectorSize);
+  int numMatches = jsRegExpExecute(m_regex, reinterpret_cast<const JSRegExpChar*>(s.data()), s.size(), i, offsetVector, offsetVectorSize);
 
   if (numMatches < 0) {
 #ifndef NDEBUG
-    if (numMatches != PCRE_ERROR_NOMATCH)
+    if (numMatches != JS_REGEXP_ERROR_NOMATCH)
       fprintf(stderr, "KJS: pcre_exec() failed with result %d\n", numMatches);
 #endif