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

Timestamp:

Nov 29, 2007, 3:19:42 AM (18 years ago)

Author:

[email protected]

Message:

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

Reviewed by Sam.

split first_significant_code into two simpler functions

• pcre/pcre_compile.cpp: (firstSignificantOpCode): (firstSignificantOpCodeSkippingAssertions): (is_anchored): (canApplyFirstCharOptimization): (find_firstassertedchar):

File:

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

trunk/JavaScriptCore/pcre/pcre_exec.cpp

@@ -123 +123 @@
   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* lowerCaseChars; /* Points to lower casing table */
   const uschar* ctypes;         /* Points to table of type maps */
   bool   offset_overflow;       /* Set if too many extractions */
@@ -131 +131 @@
   int    end_offset_top;        /* Highwater mark at end of match */
   bool   multiline;
-  bool   caseless;
+  bool   ignoreCase;
 };
 
@@ -223 +223 @@
     /* Separate the caselesss case for speed */
     
-    if (md.caseless) {
+    if (md.ignoreCase) {
         while (length-- > 0) {
             UChar c = *p++;
@@ -1308 +1308 @@
                 
                 if (stack.currentFrame->fc <= 0xFFFF) {
-                    int othercase = md.caseless ? _pcre_ucp_othercase(stack.currentFrame->fc) : -1;
+                    int othercase = md.ignoreCase ? _pcre_ucp_othercase(stack.currentFrame->fc) : -1;
                     
                     for (i = 1; i <= min; i++) {
@@ -1409 +1409 @@
                 stack.currentFrame->ecode++;
                 GETCHARINCTEST(c, stack.currentFrame->eptr);
-                if (md.caseless) {
+                if (md.ignoreCase) {
                     if (c < 128)
-                        c = md.lcc[c];
-                    if (md.lcc[*stack.currentFrame->ecode++] == c)
+                        c = md.lowerCaseChars[c];
+                    if (md.lowerCaseChars[*stack.currentFrame->ecode++] == c)
                         RRETURN_NO_MATCH;
                 } else {
@@ -1472 +1472 @@
                 DPRINTF(("negative matching %c{%d,%d}\n", stack.currentFrame->fc, min, stack.currentFrame->max));
                 
-                if (md.caseless) {
+                if (md.ignoreCase) {
                     if (stack.currentFrame->fc < 128)
-                        stack.currentFrame->fc = md.lcc[stack.currentFrame->fc];
+                        stack.currentFrame->fc = md.lowerCaseChars[stack.currentFrame->fc];
                     
                     {
@@ -1481 +1481 @@
                             GETCHARINC(d, stack.currentFrame->eptr);
                             if (d < 128)
-                                d = md.lcc[d];
+                                d = md.lowerCaseChars[d];
                             if (stack.currentFrame->fc == d)
                                 RRETURN_NO_MATCH;
@@ -1498 +1498 @@
                             GETCHARINC(d, stack.currentFrame->eptr);
                             if (d < 128)
-                                d = md.lcc[d];
+                                d = md.lowerCaseChars[d];
                             if (stack.currentFrame->fi >= stack.currentFrame->max || stack.currentFrame->eptr >= md.end_subject || stack.currentFrame->fc == d)
                                 RRETURN;
@@ -1518 +1518 @@
                                 GETCHARLEN(d, stack.currentFrame->eptr, len);
                                 if (d < 128)
-                                    d = md.lcc[d];
+                                    d = md.lowerCaseChars[d];
                                 if (stack.currentFrame->fc == d)
                                     break;
@@ -2077 +2077 @@
     UChar* end_subject = match_block.end_subject;
     
-    match_block.lcc = _pcre_default_tables + lcc_offset;
+    match_block.lowerCaseChars = _pcre_default_tables + lcc_offset;
     match_block.ctypes = _pcre_default_tables + ctypes_offset;
     
     match_block.multiline = (re->options & PCRE_MULTILINE);
-    match_block.caseless = (re->options & PCRE_CASELESS);
+    match_block.ignoreCase = (re->options & OptionIgnoreCase);
     
     /* If the expression has got more back references than the offsets supplied can
@@ -2133 +2133 @@
     if (re->options & PCRE_FIRSTSET) {
         first_byte = re->first_byte & 255;
-        if ((first_byte_caseless = (re->first_byte & REQ_CASELESS)))
-            first_byte = match_block.lcc[first_byte];
+        if ((first_byte_caseless = (re->first_byte & REQ_IGNORE_CASE)))
+            first_byte = match_block.lowerCaseChars[first_byte];
     }
     
@@ -2145 +2145 @@
     if (re->options & PCRE_REQCHSET) {
         req_byte = re->req_byte & 255;
-        req_byte_caseless = (re->req_byte & REQ_CASELESS) != 0;
+        req_byte_caseless = (re->req_byte & REQ_IGNORE_CASE);
         req_byte2 = (_pcre_default_tables + fcc_offset)[req_byte];  /* case flipped */
     }
@@ -2183 +2183 @@
                     if (sm > 127)
                         break;
-                    if (match_block.lcc[sm] == first_char)
+                    if (match_block.lowerCaseChars[sm] == first_char)
                         break;
                     start_match++;