Changeset 55322 in webkit for trunk/JavaScriptCore/runtime/RegExp.cpp

Timestamp:

Feb 26, 2010, 4:19:13 PM (15 years ago)

Author:

[email protected]

Message:

Rubber Stamped by Geoff Garen.

Remove wrec. All builds should have switched to yarr by now.

• Android.mk:
• GNUmakefile.am:
• JavaScriptCore.gypi:
• JavaScriptCore.pri:
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreCommon.vsprops:
• JavaScriptCore.vcproj/jsc/jscCommon.vsprops:
• JavaScriptCore.xcodeproj/project.pbxproj:
• runtime/RegExp.cpp:

(JSC::RegExp::match):

• runtime/RegExp.h:
• wrec: Removed.
• wrec/CharacterClass.cpp: Removed.
• wrec/CharacterClass.h: Removed.
• wrec/CharacterClassConstructor.cpp: Removed.
• wrec/CharacterClassConstructor.h: Removed.
• wrec/Escapes.h: Removed.
• wrec/Quantifier.h: Removed.
• wrec/WREC.cpp: Removed.
• wrec/WREC.h: Removed.
• wrec/WRECFunctors.cpp: Removed.
• wrec/WRECFunctors.h: Removed.
• wrec/WRECGenerator.cpp: Removed.
• wrec/WRECGenerator.h: Removed.
• wrec/WRECParser.cpp: Removed.
• wrec/WRECParser.h: Removed.
• wscript:

File:

• trunk/JavaScriptCore/runtime/RegExp.cpp (modified) (4 diffs)

trunk/JavaScriptCore/runtime/RegExp.cpp

@@ -41 +41 @@
 #else
 
-#if ENABLE(WREC)
-#include "JIT.h"
-#include "WRECGenerator.h"
-#endif
 #include <pcre/pcre.h>
 
@@ -50 +46 @@
 
 namespace JSC {
-
-#if ENABLE(WREC)
-using namespace WREC;
-#endif
 
 inline RegExp::RegExp(JSGlobalData* globalData, const UString& pattern)
@@ -165 +157 @@
 #else
 
-void RegExp::compile(JSGlobalData* globalData)
+void RegExp::compile(JSGlobalData*)
 {
     m_regExp = 0;
-#if ENABLE(WREC)
-    m_wrecFunction = Generator::compileRegExp(globalData, m_pattern, &m_numSubpatterns, &m_constructionError, m_executablePool, ignoreCase(), multiline());
-    if (m_wrecFunction || m_constructionError)
-        return;
-    // Fall through to non-WREC case.
-#else
-    UNUSED_PARAM(globalData);
-#endif
-
     JSRegExpIgnoreCaseOption ignoreCaseOption = ignoreCase() ? JSRegExpIgnoreCase : JSRegExpDoNotIgnoreCase;
     JSRegExpMultilineOption multilineOption = multiline() ? JSRegExpMultiline : JSRegExpSingleLine;
@@ -192 +175 @@
         return -1;
 
-#if ENABLE(WREC)
-    if (m_wrecFunction) {
-        int offsetVectorSize = (m_numSubpatterns + 1) * 2;
-        int* offsetVector;
-        Vector<int, 32> nonReturnedOvector;
-        if (ovector) {
-            ovector->resize(offsetVectorSize);
-            offsetVector = ovector->data();
-        } else {
-            nonReturnedOvector.resize(offsetVectorSize);
-            offsetVector = nonReturnedOvector.data();
-        }
-        ASSERT(offsetVector);
-        for (int j = 0; j < offsetVectorSize; ++j)
-            offsetVector[j] = -1;
-
-        int result = m_wrecFunction(s.data(), startOffset, s.size(), offsetVector);
-
-        if (result < 0) {
-#ifndef NDEBUG
-            // TODO: define up a symbol, rather than magic -1
-            if (result != -1)
-                fprintf(stderr, "jsRegExpExecute failed with result %d\n", result);
-#endif
-            if (ovector)
-                ovector->clear();
-        }
-        return result;
-    } else
-#endif
     if (m_regExp) {
         // Set up the offset vector for the result.