Changeset 28141 in webkit for trunk/JavaScriptCore/pcre/pcre_exec.cpp

Timestamp:

Nov 29, 2007, 3:06:57 AM (18 years ago)

Author:

[email protected]

Message:

2007-11-24 Eric Seidel <​[email protected]>

Reviewed by Sam.

Get rid of PCRE custom char types

• pcre/pcre_compile.cpp: (check_escape): (complete_callout): (compile_branch): (compile_regex): (calculateCompiledPatternLengthAndFlags): (jsRegExpCompile):
• pcre/pcre_exec.cpp: (match_ref): (match): (jsRegExpExecute):
• pcre/pcre_internal.h:

File:

• trunk/JavaScriptCore/pcre/pcre_exec.cpp (modified) (13 diffs)

trunk/JavaScriptCore/pcre/pcre_exec.cpp

@@ -66 +66 @@
 are on the heap, not on the stack. */
 
-typedef struct eptrblock {
-  struct eptrblock *epb_prev;
-  USPTR epb_saved_eptr;
-} eptrblock;
+struct eptrblock {
+  struct eptrblock* epb_prev;
+  UChar* epb_saved_eptr;
+};
 
 /* Structure for remembering the local variables in a private frame */
@@ -88 +88 @@
   /* Function arguments that may change */
 
-  const pcre_uchar* eptr;
+  UChar* eptr;
   const uschar* ecode;
   int offset_top;
@@ -97 +97 @@
   const uschar* data;
   const uschar* next;
-  const pcre_uchar* pp;
+  const UChar* pp;
   const uschar* prev;
-  const pcre_uchar* saved_eptr;
+  const UChar* saved_eptr;
 
   int repeat_othercase;
@@ -126 +126 @@
   const uschar *ctypes;         /* Points to table of type maps */
   BOOL   offset_overflow;       /* Set if too many extractions */
-  USPTR  start_subject;         /* Start of the subject string */
-  USPTR  end_subject;           /* End of the subject string */
-  USPTR  end_match_ptr;         /* Subject position at end match */
+  UChar*  start_subject;         /* Start of the subject string */
+  UChar*  end_subject;           /* End of the subject string */
+  UChar*  end_match_ptr;         /* Subject position at end match */
   int    end_offset_top;        /* Highwater mark at end of match */
   BOOL   multiline;
@@ -167 +167 @@
 
 static void
-pchars(const pcre_uchar *p, int length, BOOL is_subject, match_data *md)
+pchars(const UChar* p, int length, BOOL is_subject, match_data *md)
 {
 int c;
@@ -197 +197 @@
 
 static BOOL
-match_ref(int offset, USPTR eptr, int length, match_data *md)
+match_ref(int offset, UChar* eptr, int length, match_data *md)
 {
-USPTR p = md->start_subject + md->offset_vector[offset];
+UChar* p = md->start_subject + md->offset_vector[offset];
 
 #ifdef DEBUG
@@ -224 +224 @@
   while (length-- > 0)
     {
-    pcre_uchar c = *p++;
+    UChar c = *p++;
     int othercase = _pcre_ucp_othercase(c);
-    pcre_uchar d = *eptr++;
+    UChar d = *eptr++;
     if (c != d && othercase != d) return false;
     }
@@ -404 +404 @@
 }
 
-static int match(USPTR eptr, const uschar* ecode, int offset_top, match_data* md)
+static int match(UChar* eptr, const uschar* ecode, int offset_top, match_data* md)
 {
     int is_match = false;
@@ -776 +776 @@
                     prev_is_word = false;
                 else {
-                    const pcre_uchar *lastptr = stack.currentFrame->eptr - 1;
+                    const UChar* lastptr = stack.currentFrame->eptr - 1;
                     while(isTrailingSurrogate(*lastptr))
                         lastptr--;
@@ -2069 +2069 @@
     
     match_data match_block;
-    match_block.start_subject = (USPTR)subject;
+    match_block.start_subject = (UChar*)subject;
     match_block.end_subject = match_block.start_subject + length;
-    USPTR end_subject = match_block.end_subject;
+    UChar* end_subject = match_block.end_subject;
     
     match_block.lcc = _pcre_default_tables + lcc_offset;
@@ -2148 +2148 @@
      the loop runs just once. */
     
-    USPTR start_match = (USPTR)subject + start_offset;
-    USPTR req_byte_ptr = start_match - 1;
+    UChar* start_match = (UChar*)subject + start_offset;
+    UChar* req_byte_ptr = start_match - 1;
     bool startline = re->options & PCRE_STARTLINE;
     
     do {
-        USPTR save_end_subject = end_subject;
+        UChar* save_end_subject = end_subject;
         
         /* Reset the maximum number of extractions we might see. */
@@ -2173 +2173 @@
         
         if (first_byte >= 0) {
-            pcre_uchar first_char = first_byte;
+            UChar first_char = first_byte;
             if (first_byte_caseless)
                 while (start_match < end_subject) {
@@ -2224 +2224 @@
         
         if (req_byte >= 0 && end_subject - start_match < REQ_BYTE_MAX) {
-            USPTR p = start_match + ((first_byte >= 0)? 1 : 0);
+            UChar* p = start_match + ((first_byte >= 0)? 1 : 0);
             
             /* We don't need to repeat the search if we haven't yet reached the