Changeset 31454 in webkit for trunk/JavaScriptCore/pcre/pcre_compile.cpp

Timestamp:

Mar 31, 2008, 1:01:09 AM (17 years ago)

Author:

[email protected]

Message:

Reviewed by darin.

Make matching of regexps using ^{much faster
​http://bugs.webkit.org/show_bug.cgi?id=18086}

• pcre/pcre_compile.cpp: (compileBranch): (branchNeedsLineStart):
• pcre/pcre_exec.cpp: (match): (jsRegExpExecute):
• pcre/pcre_internal.h:

File:

• trunk/JavaScriptCore/pcre/pcre_compile.cpp (modified) (2 diffs)

trunk/JavaScriptCore/pcre/pcre_compile.cpp

@@ -637 +637 @@
             /* Handle single-character metacharacters. In multiline mode, ^ disables
              the setting of any following char as a first character. */
-                
+
             case '^':
                 if (options & MatchAcrossMultipleLinesOption) {
                     if (firstbyte == REQ_UNSET)
                         firstbyte = REQ_NONE;
-                }
+                    *code++ = OP_BOL;
+                } else
+                    *code++ = OP_CIRC;
                 previous = NULL;
-                *code++ = OP_CIRC;
                 break;
-                
+
             case '$':
                 previous = NULL;
-                *code++ = OP_DOLL;
+                if (options & MatchAcrossMultipleLinesOption)
+                  *code++ = OP_EOL;
+                else
+                  *code++ = OP_DOLL;
                 break;
-                
+
             /* There can never be a first char if '.' is first, whatever happens about
              repeats. The value of reqbyte doesn't change either. */
-                
+
             case '.':
                 if (firstbyte == REQ_UNSET)
@@ -1905 +1909 @@
 
     /* Explicit ^ */
-    return op == OP_CIRC;
+    return op == OP_CIRC || op == OP_BOL;
 }