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

Timestamp:

Nov 29, 2007, 3:05:07 AM (18 years ago)

Author:

[email protected]

Message:

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

Reviewed by Maciej.

Remove register keyword and more cleanup

• pcre/pcre_compile.cpp: (find_fixedlength): (compile_branch): (is_anchored): (is_startline): (find_firstassertedchar): (calculateCompiledPatternLengthAndFlags): (jsRegExpCompile):
• pcre/pcre_exec.cpp: (MatchStack::canUseStackBufferForNextFrame): (MatchStack::allocateNextFrame): (MatchStack::pushNewFrame): (MatchStack::frameIsStackAllocated): (MatchStack::popCurrentFrame): (MatchStack::unrollAnyHeapAllocatedFrames): (getUTF8CharAndIncrementLength): (match): (jsRegExpExecute):
• pcre/pcre_internal.h: (PUT2INC): (isLeadingSurrogate): (isTrailingSurrogate): (decodeSurrogatePair): (getChar):
• pcre/pcre_ord2utf8.cpp: (_pcre_ord2utf8):
• pcre/pcre_xclass.cpp: (getUTF8CharAndAdvancePointer): (_pcre_xclass):

File:

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

trunk/JavaScriptCore/pcre/pcre_compile.cpp

@@ -469 +469 @@
 int length = -1;
 
-register int branchlength = 0;
-register uschar *cc = code + 1 + LINK_SIZE;
+int branchlength = 0;
+uschar *cc = code + 1 + LINK_SIZE;
 
 /* Scan along the opcodes for this branch. If we get to the end of the
@@ -478 +478 @@
   {
   int d;
-  register int op = *cc;
+  int op = *cc;
   if (op >= OP_BRA) op = OP_BRA;
 
@@ -630 +630 @@
 could_be_empty_branch(const uschar *code, const uschar *endcode)
 {
-register int c;
+int c;
 for (code = first_significant_code(code + 1 + LINK_SIZE, true);
      code < endcode;
@@ -848 +848 @@
 int req_caseopt, reqvary, tempreqvary;
 int after_manual_callout = 0;
-register int c;
-register uschar *code = *codeptr;
+int c;
+uschar *code = *codeptr;
 uschar *tempcode;
 BOOL groupsetfirstbyte = false;
@@ -1033 +1033 @@
         if (c < 0)
           {
-          register const uschar *cbits = cd->cbits;
+          const uschar *cbits = cd->cbits;
           class_charcount += 2;     /* Greater than 1 is what matters */
           switch (-c)
@@ -1116 +1116 @@
         the pre-pass. Optimize one-character ranges */
 
-        if (d == c) goto LONE_SINGLE_CHARACTER;  /* A few lines below */
+        if (d == c)
+            goto LONE_SINGLE_CHARACTER;  /* A few lines below */
 
         /* In UTF-8 mode, if the upper limit is > 255, or > 127 for caseless
@@ -1613 +1614 @@
     else if (*previous >= OP_BRA || *previous == OP_ONCE)
       {
-      register int i;
+      int i;
       int ketoffset = 0;
       int len = code - previous;
@@ -1626 +1627 @@
       if (repeat_max == -1)
         {
-        register uschar *ket = previous;
+        uschar *ket = previous;
         do ket += GET(ket, 1); while (*ket != OP_KET);
         ketoffset = code - ket;
@@ -1834 +1835 @@
 
     /* Process nested bracketed re. Assertions may not be repeated, but other
-    kinds can be. We copy code into a non-register variable in order to be able
+    kinds can be. We copy code into a non-variable in order to be able
     to pass its address because some compilers complain otherwise. Pass in a
     new setting for the ims options if they have changed. */
@@ -2239 +2240 @@
 
 static BOOL
-is_anchored(register const uschar *code, int options, unsigned int bracket_map,
+is_anchored(const uschar *code, int options, unsigned int bracket_map,
   unsigned int backref_map)
 {
@@ -2245 +2246 @@
    const uschar *scode =
      first_significant_code(code + 1+LINK_SIZE, false);
-   register int op = *scode;
+   int op = *scode;
 
    /* Capturing brackets */
@@ -2304 +2305 @@
 do {
    const uschar *scode = first_significant_code(code + 1+LINK_SIZE, false);
-   register int op = *scode;
+   int op = *scode;
 
    /* Capturing brackets */
@@ -2367 +2368 @@
 find_firstassertedchar(const uschar *code, int options, BOOL inassert)
 {
-register int c = -1;
+int c = -1;
 do {
    int d;
    const uschar *scode =
      first_significant_code(code + 1+LINK_SIZE, true);
-   register int op = *scode;
+   int op = *scode;
 
    if (op >= OP_BRA) op = OP_BRA;
@@ -2679 +2680 @@
                                  another byte in the UTF-8 representation. */
                                 
-                                if (ignoreCase)
-                                {
+                                if (ignoreCase) {
                                     int occ, ocd;
                                     int cc = c;
                                     int origd = d;
-                                    while (get_othercase_range(&cc, origd, &occ, &ocd))
-                                    {
+                                    while (get_othercase_range(&cc, origd, &occ, &ocd)) {
                                         if (occ >= c && ocd <= d) continue;   /* Skip embedded */
                                         
@@ -2718 +2717 @@
                          support. */
                         
-                        else
-                        {
-                            if ((c > 255 || (ignoreCase && c > 127)))
-                            {
+                        else {
+                            if ((c > 255 || (ignoreCase && c > 127))) {
                                 uschar buffer[6];
                                 class_optcount = 10;     /* Ensure > 1 */
@@ -2745 +2742 @@
                  code. Here, we handle repeats for the class opcodes. */
                 
-                if (class_optcount == 1) length += 3; else
-                {
+                if (class_optcount == 1)
+                    length += 3;
+                else {
                     length += 33;
                     
@@ -2752 +2750 @@
                      we also need extra for wrapping the whole thing in a sub-pattern. */
                     
-                    if (ptr + 1 < patternEnd && ptr[1] == '{' && is_counted_repeat(ptr+2, patternEnd))
-                    {
+                    if (ptr + 1 < patternEnd && ptr[1] == '{' && is_counted_repeat(ptr+2, patternEnd)) {
                         ptr = read_repeat_counts(ptr+2, &min, &max, &errorcode);
                         if (errorcode != 0) return -1;;
@@ -2759 +2756 @@
                             (min == 1 && max == -1))
                             length++;
-                        else length += 5;
-                        if (ptr + 1 < patternEnd && ptr[1] == '+')
-                        {
+                        else
+                            length += 5;
+                        if (ptr + 1 < patternEnd && ptr[1] == '+') {
                             ptr++;
                             length += 2 + 2*LINK_SIZE;
-                        }
-                        else if (ptr + 1 < patternEnd && ptr[1] == '?') ptr++;
+                        } else if (ptr + 1 < patternEnd && ptr[1] == '?')
+                            ptr++;
                     }
                 }
@@ -2779 +2776 @@
                 /* Handle special forms of bracket, which all start (? */
                 
-                if (ptr + 1 < patternEnd && ptr[1] == '?')
-                {
-                    switch (c = (ptr + 2 < patternEnd ? ptr[2] : 0))
-                    {
+                if (ptr + 1 < patternEnd && ptr[1] == '?') {
+                    switch (c = (ptr + 2 < patternEnd ? ptr[2] : 0)) {
                             /* Non-referencing groups and lookaheads just move the pointer on, and
                              then behave like a non-special bracket, except that they don't increment
@@ -2843 +2838 @@
                 case ')':
                 length += 1 + LINK_SIZE;
-                if (brastackptr > 0)
-                {
+                if (brastackptr > 0) {
                     duplength = length - brastack[--brastackptr];
                     branch_extra = bralenstack[brastackptr];
                 }
-                else duplength = 0;
+                else
+                    duplength = 0;
                 
                 /* Leave ptr at the final char; for read_repeat_counts this happens
                  automatically; for the others we need an increment. */
                 
-                if (ptr + 1 < patternEnd && (c = ptr[1]) == '{' && is_counted_repeat(ptr+2, patternEnd))
-                {
+                if (ptr + 1 < patternEnd && (c = ptr[1]) == '{' && is_counted_repeat(ptr+2, patternEnd)) {
                     ptr = read_repeat_counts(ptr+2, &min, &max, &errorcode);
                     if (errorcode != 0) return -1;;
@@ -2868 +2862 @@
                  bracket set. */
                 
-                if (min == 0)
-                {
+                if (min == 0) {
                     length++;
                     if (max > 0) length += (max - 1) * (duplength + 3 + 2*LINK_SIZE);
@@ -2880 +2873 @@
                  but one of the optional copies. */
                 
-                else
-                {
+                else {
                     length += (min - 1) * duplength;
                     if (max > min)   /* Need this test as max=-1 means no limit */
@@ -2890 +2882 @@
                 /* Allow space for once brackets for "possessive quantifier" */
                 
-                if (ptr + 1 < patternEnd && ptr[1] == '+')
-                {
+                if (ptr + 1 < patternEnd && ptr[1] == '+') {
                     ptr++;
                     length += 2 + 2*LINK_SIZE;
@@ -2909 +2900 @@
                 /* In UTF-8 mode, check for additional bytes. */
                 
-                if (c > 127)
-                {
-                    if (IS_LEADING_SURROGATE(c))
-                    {
-                        c = DECODE_SURROGATE_PAIR(c, ptr < patternEnd ? *ptr : 0);
+                if (c > 127) {
+                    if (isLeadingSurrogate(c)) {
+                        c = decodeSurrogatePair(c, ptr < patternEnd ? *ptr : 0);
                         ++ptr;
                     }
@@ -3139 +3128 @@
     if (numSubpatterns)
         *numSubpatterns = re->top_bracket;
-    return static_cast<JSRegExp*>(re);
+    return re;
 }