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

Timestamp:

Nov 29, 2007, 3:13:33 AM (18 years ago)

Author:

[email protected]

Message:

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

Reviewed by Sam.

give PCRE_STARTLINE a better name and rename match_data to MatchData

• pcre/pcre_compile.cpp: (compile_branch): (canApplyFirstCharOptimization): (find_firstassertedchar): (printCompiledRegExp): (jsRegExpCompile):
• pcre/pcre_exec.cpp: (pchars): (jsRegExpExecute):
• pcre/pcre_internal.h:

File:

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

trunk/JavaScriptCore/pcre/pcre_exec.cpp

@@ -118 +118 @@
 doing traditional NFA matching, so that they are thread-safe. */
 
-typedef struct match_data {
+struct MatchData {
   unsigned long int match_call_count;      /* As it says */
-  int   *offset_vector;         /* Offset vector */
+  int*   offset_vector;         /* Offset vector */
   int    offset_end;            /* One past the end */
   int    offset_max;            /* The maximum usable for return data */
-  const uschar *lcc;            /* Points to lower casing table */
-  const uschar *ctypes;         /* Points to table of type maps */
+  const uschar* lcc;            /* Points to lower casing table */
+  const uschar* ctypes;         /* Points to table of type maps */
   bool   offset_overflow;       /* Set if too many extractions */
   UChar*  start_subject;         /* Start of the subject string */
@@ -132 +132 @@
   bool   multiline;
   bool   caseless;
-} match_data;
+};
 
 #define match_isgroup      true    /* Set if start of bracketed group */
@@ -166 +166 @@
 */
 
-static void
-pchars(const UChar* p, int length, bool is_subject, match_data *md)
+static void pchars(const UChar* p, int length, bool is_subject, MatchData *md)
 {
-int c;
-if (is_subject && length > md->end_subject - p) length = md->end_subject - p;
-while (length-- > 0)
-  if (isprint(c = *(p++))) printf("%c", c);
-  else if (c < 256) printf("\\x%02x", c);
-  else printf("\\x{%x}", c);
+    if (is_subject && length > md->end_subject - p)
+        length = md->end_subject - p;
+    while (length-- > 0) {
+        int c;
+        if (isprint(c = *(p++)))
+            printf("%c", c);
+        else if (c < 256)
+            printf("\\x%02x", c);
+        else
+            printf("\\x{%x}", c);
+    }
 }
 #endif
@@ -197 +201 @@
 
 static bool
-match_ref(int offset, UChar* eptr, int length, match_data *md)
+match_ref(int offset, UChar* eptr, int length, MatchData *md)
 {
 UChar* p = md->start_subject + md->offset_vector[offset];
@@ -404 +408 @@
 }
 
-static int match(UChar* eptr, const uschar* ecode, int offset_top, match_data* md)
+static int match(UChar* eptr, const uschar* ecode, int offset_top, MatchData* md)
 {
     int is_match = false;
@@ -2068 +2072 @@
     ASSERT(offsets || offsetcount == 0);
     
-    match_data match_block;
+    MatchData match_block;
     match_block.start_subject = (UChar*)subject;
     match_block.end_subject = match_block.start_subject + length;
@@ -2076 +2080 @@
     match_block.ctypes = _pcre_default_tables + ctypes_offset;
     
-    match_block.multiline = (re->options & PCRE_MULTILINE) != 0;
-    match_block.caseless = (re->options & PCRE_CASELESS) != 0;
+    match_block.multiline = (re->options & PCRE_MULTILINE);
+    match_block.caseless = (re->options & PCRE_CASELESS);
     
     /* If the expression has got more back references than the offsets supplied can
@@ -2150 +2154 @@
     UChar* start_match = (UChar*)subject + start_offset;
     UChar* req_byte_ptr = start_match - 1;
-    bool startline = re->options & PCRE_STARTLINE;
+    bool useMultiLineFirstCharOptimization = re->options & OptionUseMultiLineFirstCharOptimization;
     
     do {
@@ -2189 +2193 @@
         
         /* Or to just after \n for a multiline match if possible */
-        
-        else if (startline) {
+        else if (useMultiLineFirstCharOptimization) {
             if (start_match > match_block.start_subject + start_offset) {
                 while (start_match < end_subject && !isNewline(start_match[-1]))