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

Timestamp:

Nov 14, 2007, 6:00:15 PM (18 years ago)

Author:

[email protected]

Message:

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

Reviewed by Geoff.

Another round of PCRE cleanups: inlines

SunSpider claims that this, combined with my previous PCRE cleanup were a 0.7% speedup, go figure.

• pcre/pcre_compile.cpp: (jsRegExpCompile):
• pcre/pcre_exec.cpp: (match): (jsRegExpExecute):
• pcre/pcre_internal.h: (PUT): (GET): (PUT2): (GET2): (isNewline):

File:

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

trunk/JavaScriptCore/pcre/pcre_exec.cpp

@@ -686 +686 @@
 
     BEGIN_OPCODE(CIRC):
-    if (frame->eptr != md->start_subject && (!md->multiline || !IS_NEWLINE(frame->eptr[-1])))
+    if (frame->eptr != md->start_subject && (!md->multiline || !isNewline(frame->eptr[-1])))
       RRETURN_NO_MATCH;
     frame->ecode++;
@@ -694 +694 @@
 
     BEGIN_OPCODE(DOLL):
-    if (frame->eptr < md->end_subject && (!md->multiline || !IS_NEWLINE(*frame->eptr)))
+    if (frame->eptr < md->end_subject && (!md->multiline || !isNewline(*frame->eptr)))
       RRETURN_NO_MATCH;
     frame->ecode++;
@@ -730 +730 @@
 
     BEGIN_OPCODE(ANY):
-    if (frame->eptr < md->end_subject && IS_NEWLINE(*frame->eptr))
+    if (frame->eptr < md->end_subject && isNewline(*frame->eptr))
       RRETURN_NO_MATCH;
     if (frame->eptr++ >= md->end_subject) RRETURN_NO_MATCH;
@@ -1572 +1572 @@
         for (i = 1; i <= min; i++)
           {
-          if (frame->eptr >= md->end_subject || IS_NEWLINE(*frame->eptr))
+          if (frame->eptr >= md->end_subject || isNewline(*frame->eptr))
             RRETURN_NO_MATCH;
           ++frame->eptr;
@@ -1665 +1665 @@
             {
             case OP_ANY:
-            if (IS_NEWLINE(c)) RRETURN;
+            if (isNewline(c)) RRETURN;
             break;
 
@@ -1727 +1727 @@
               for (i = min; i < frame->max; i++)
                 {
-                if (frame->eptr >= md->end_subject || IS_NEWLINE(*frame->eptr)) break;
+                if (frame->eptr >= md->end_subject || isNewline(*frame->eptr)) break;
                 frame->eptr++;
                 while (frame->eptr < md->end_subject && (*frame->eptr & 0xc0) == 0x80) frame->eptr++;
@@ -1741 +1741 @@
               for (i = min; i < frame->max; i++)
                 {
-                if (frame->eptr >= md->end_subject || IS_NEWLINE(*frame->eptr)) break;
+                if (frame->eptr >= md->end_subject || isNewline(*frame->eptr)) break;
                 frame->eptr++;
                 }
@@ -2160 +2160 @@
     if (start_match > match_block.start_subject + start_offset)
       {
-      while (start_match < end_subject && !IS_NEWLINE(start_match[-1]))
+      while (start_match < end_subject && !isNewline(start_match[-1]))
         start_match++;
       }