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

Timestamp:

Aug 11, 2010, 2:52:13 PM (15 years ago)

Author:

[email protected]

Message:

Windows & !JIT build fix.

• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def:
• JavaScriptCore.xcodeproj/project.pbxproj:
• runtime/RegExp.cpp:

(JSC::RegExp::match):

File:

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

trunk/JavaScriptCore/runtime/RegExp.cpp

@@ -177 +177 @@
     JSRegExpIgnoreCaseOption ignoreCaseOption = ignoreCase() ? JSRegExpIgnoreCase : JSRegExpDoNotIgnoreCase;
     JSRegExpMultilineOption multilineOption = multiline() ? JSRegExpMultiline : JSRegExpSingleLine;
-    m_regExp = jsRegExpCompile(reinterpret_cast<const UChar*>(m_pattern.data()), m_pattern.size(), ignoreCaseOption, multilineOption, &m_numSubpatterns, &m_constructionError);
+    m_regExp = jsRegExpCompile(reinterpret_cast<const UChar*>(m_pattern.characters()), m_pattern.length(), ignoreCaseOption, multilineOption, &m_numSubpatterns, &m_constructionError);
 }
 
@@ -187 +187 @@
         ovector->clear();
 
-    if (static_cast<unsigned>(startOffset) > s.size() || s.isNull())
+    if (static_cast<unsigned>(startOffset) > s.length() || s.isNull())
         return -1;
 
@@ -205 +205 @@
         }
 
-        int numMatches = jsRegExpExecute(m_regExp, reinterpret_cast<const UChar*>(s.data()), s.size(), startOffset, offsetVector, offsetVectorSize);
+        int numMatches = jsRegExpExecute(m_regExp, reinterpret_cast<const UChar*>(s.characters()), s.length(), startOffset, offsetVector, offsetVectorSize);
     
         if (numMatches < 0) {