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

Timestamp:

Aug 9, 2002, 9:31:50 PM (23 years ago)

Author:

darin

Message:

JavaScriptCore:

Some string speedups. Makes sony.com cached 11% faster.

• kjs/ustring.h: Made it possible for UChar objects to be uninitialized, which gives a speed boost. Inlined CString's +=, UString's destructor, +=, and +.
• kjs/ustring.cpp: (UString::UString): Optimize const char * version, which showed up heavily in performance analysis. Added new two-UString version, which makes the + operator fast. (UString::ascii): Remove thread safety changes. Change static buffer to remember its size, and to always be at least 4096 bytes long; that way we never have to reallocate unless it's for a long string. Also make code to extract the characters significantly faster by getting rid of two pointer dereferences per character. (UString::is8Bit): Avoid one pointer dereference per character. (UString::toDouble): Use ascii() instead of cstring() to avoid copying the string.

• kjs/collector.cpp: Remove unneeded APPLE_CHANGES.
• kjs/regexp.cpp: Remove ifdefs around some APPLE_CHANGES that we want to keep, because they just fix warnings.
• kjs/value.h: Remove obsolete APPLE_CHANGES comment.

• JavaScriptCore.pbproj/project.pbxproj: Project Builder decided to move a line around in the file.

WebCore:

• force-clean-timestamp: JavaScriptCore headers changed that require a full build here.

File:

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

trunk/JavaScriptCore/kjs/regexp.cpp

@@ -115 +115 @@
     return UString::null; // don't rely on the return value if you pass ovector==0
 #else
-#ifdef APPLE_CHANGES
   const uint maxMatch = 10;
-#else
-  const int maxMatch = 10;
-#endif
   regmatch_t rmatch[maxMatch];
 
@@ -136 +132 @@
   // map rmatch array to ovector used in PCRE case
   nrSubPatterns = 0;
-#ifdef APPLE_CHANGES
   for(uint j = 1; j < maxMatch && rmatch[j].rm_so >= 0 ; j++)
-#else
-  for(int j = 1; j < maxMatch && rmatch[j].rm_so >= 0 ; j++)
-#endif
       nrSubPatterns++;
   int ovecsize = (nrSubPatterns+1)*3; // see above
   *ovector = new int[ovecsize];
-#ifdef APPLE_CHANGES
   for (uint j = 0; j < nrSubPatterns + 1; j++) {
-#else
-  for (int j = 0; j < nrSubPatterns + 1; j++) {
-#endif
     if (j>maxMatch)
       break;
     (*ovector)[2*j] = rmatch[j].rm_so + i;
     (*ovector)[2*j+1] = rmatch[j].rm_eo + i;
-#ifdef APPLE_CHANGES
-  } // balance extra { so we don't confuse prepare-ChangeLog
-#else
   }
-#endif
 #endif