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

Timestamp:

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

Author:

[email protected]

Message:

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

Reviewed by Sam.

removing more macros

• pcre/pcre_compile.cpp: (could_be_empty_branch): (compile_branch): (calculateCompiledPatternLengthAndFlags):
• pcre/pcre_exec.cpp: (match): (jsRegExpExecute):
• pcre/pcre_internal.h:
• pcre/pcre_xclass.cpp:

File:

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

trunk/JavaScriptCore/pcre/pcre_exec.cpp

@@ -125 +125 @@
   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 */
+  bool   offset_overflow;       /* Set if too many extractions */
   UChar*  start_subject;         /* Start of the subject string */
   UChar*  end_subject;           /* End of the subject string */
   UChar*  end_match_ptr;         /* Subject position at end match */
   int    end_offset_top;        /* Highwater mark at end of match */
-  BOOL   multiline;
-  BOOL   caseless;
+  bool   multiline;
+  bool   caseless;
 } match_data;
 
@@ -167 +167 @@
 
 static void
-pchars(const UChar* p, int length, BOOL is_subject, match_data *md)
+pchars(const UChar* p, int length, bool is_subject, match_data *md)
 {
 int c;
@@ -196 +196 @@
 */
 
-static BOOL
+static bool
 match_ref(int offset, UChar* eptr, int length, match_data *md)
 {
@@ -412 +412 @@
     unsigned rdepth = 0;
     
-    BOOL cur_is_word;
-    BOOL prev_is_word;
-    BOOL is_group_start = true;
+    bool cur_is_word;
+    bool prev_is_word;
+    bool is_group_start = true;
     int min;
-    BOOL minimize = false; /* Initialization not really needed, but some compilers think so. */
+    bool minimize = false; /* Initialization not really needed, but some compilers think so. */
     
     MatchStack stack;
@@ -2086 +2086 @@
     int ocount = offsetcount - (offsetcount % 3);
     
-    BOOL using_temporary_offsets = false;
+    bool using_temporary_offsets = false;
     if (re->top_backref > 0 && re->top_backref >= ocount/3) {
         ocount = re->top_backref * 3 + 3;
@@ -2125 +2125 @@
      studied, there may be a bitmap of possible first characters. */
     
-    BOOL first_byte_caseless = false;
+    bool first_byte_caseless = false;
     int first_byte = -1;
     if (re->options & PCRE_FIRSTSET) {
@@ -2136 +2136 @@
      character" set. */
     
-    BOOL req_byte_caseless = false;
+    bool req_byte_caseless = false;
     int req_byte = -1;
     int req_byte2 = -1;