Changeset 38465 in webkit for trunk/JavaScriptCore/runtime

Timestamp:

Nov 16, 2008, 6:33:58 PM (17 years ago)

Author:

[email protected]

Message:

2008-11-16 Geoffrey Garen <​[email protected]>

Reviewed by Sam Weinig.

Renamed WREC => JSC::WREC, removing JSC:: prefix in a lot of places.
Renamed WRECFunction => WREC::CompiledRegExp, and deployed this type
name in place of a few casts.

• runtime/RegExp.cpp: (JSC::RegExp::RegExp): (JSC::RegExp::~RegExp): (JSC::RegExp::match):
• runtime/RegExp.h:
• wrec/CharacterClassConstructor.cpp:
• wrec/CharacterClassConstructor.h:
• wrec/WREC.cpp: (JSC::WREC::compileRegExp):
• wrec/WREC.h: (JSC::WREC::Generator::Generator): (JSC::WREC::Parser::Parser): (JSC::WREC::Parser::parseAlternative):

Location:

trunk/JavaScriptCore/runtime

Files:

• RegExp.cpp (modified) (5 diffs)
• RegExp.h (modified) (2 diffs)

trunk/JavaScriptCore/runtime/RegExp.cpp

@@ -32 +32 @@
 #include <wtf/OwnArrayPtr.h>
 
+namespace JSC {
+
 #if ENABLE(WREC)
 using namespace WREC;
 #endif
-
-namespace JSC {
 
 inline RegExp::RegExp(JSGlobalData* globalData, const UString& pattern)
@@ -46 +46 @@
 {
 #if ENABLE(WREC)
-    m_wrecFunction = WREC::compileRegExp(globalData->interpreter, pattern, &m_numSubpatterns, &m_constructionError);
+    m_wrecFunction = compileRegExp(globalData->interpreter, pattern, &m_numSubpatterns, &m_constructionError);
     if (m_wrecFunction)
         return;
@@ -89 +89 @@
 
 #if ENABLE(WREC)
-    m_wrecFunction = WREC::compileRegExp(globalData->interpreter, pattern, &m_numSubpatterns, &m_constructionError, (m_flagBits & IgnoreCase), (m_flagBits & Multiline));
+    m_wrecFunction = compileRegExp(globalData->interpreter, pattern, &m_numSubpatterns, &m_constructionError, (m_flagBits & IgnoreCase), (m_flagBits & Multiline));
     if (m_wrecFunction)
         return;
@@ -110 +110 @@
 #if ENABLE(WREC)
     if (m_wrecFunction)
-        WTF::fastFreeExecutable(m_wrecFunction);
+        WTF::fastFreeExecutable(reinterpret_cast<void*>(m_wrecFunction));
 #endif
 }
@@ -137 +137 @@
             ovector->set(offsetVector);
 
-        int result = reinterpret_cast<WRECFunction>(m_wrecFunction)(s.data(), i, s.size(), offsetVector);
+        int result = m_wrecFunction(s.data(), i, s.size(), offsetVector);
 
         if (result < 0) {

trunk/JavaScriptCore/runtime/RegExp.h

@@ -23 +23 @@
 
 #include "UString.h"
+#include "WREC.h"
 #include <wtf/Forward.h>
 #include <wtf/RefCounted.h>
@@ -67 +68 @@
 
 #if ENABLE(WREC)
-        // Called as a WRECFunction
-        void* m_wrecFunction;
+        WREC::CompiledRegExp m_wrecFunction;
 #endif
     };