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

Timestamp:

Nov 29, 2007, 3:04:06 AM (18 years ago)

Author:

[email protected]

Message:

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

Reviewed by Maciej.

Clean up jsRegExpExecute

• pcre/pcre_compile.cpp: (returnError): (jsRegExpCompile):
• pcre/pcre_exec.cpp: (jsRegExpExecute):
• pcre/pcre_internal.h:

File:

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

trunk/JavaScriptCore/pcre/pcre_compile.cpp

@@ -2935 +2935 @@
 
 #ifdef DEBUG
-static void printCompiledRegExp(real_pcre* re, int length)
+static void printCompiledRegExp(JSRegExp* re, int length)
 {
     printf("Length = %d top_bracket = %d top_backref = %d\n",
@@ -2992 +2992 @@
 */
 
-static pcre* returnError(ErrorCode errorcode, const char** errorptr)
+static JSRegExp* returnError(ErrorCode errorcode, const char** errorptr)
 {
     *errorptr = error_text(errorcode);
@@ -2998 +2998 @@
 }
 
-pcre* jsRegExpCompile(const pcre_char* pattern, int patternLength,
+JSRegExp* jsRegExpCompile(const pcre_char* pattern, int patternLength,
                 JSRegExpIgnoreCaseOption ignoreCase, JSRegExpMultilineOption multiline,
                 unsigned* numSubpatterns, const char** errorptr)
@@ -3018 +3018 @@
         return returnError(ERR16, errorptr);
     
-    size_t size = length + sizeof(real_pcre);
-    real_pcre* re = reinterpret_cast<real_pcre*>(new char[size]);
+    size_t size = length + sizeof(JSRegExp);
+    JSRegExp* re = reinterpret_cast<JSRegExp*>(new char[size]);
     
     if (!re)
@@ -3139 +3139 @@
     if (numSubpatterns)
         *numSubpatterns = re->top_bracket;
-    return (pcre *)re;
+    return static_cast<JSRegExp*>(re);
 }