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

Timestamp:

Jun 25, 2010, 3:16:55 AM (15 years ago)

Author:

[email protected]

Message:

2010-06-25 Sheriff Bot <​[email protected]>

Unreviewed, rolling out r61833.
​http://trac.webkit.org/changeset/61833
​https://bugs.webkit.org/show_bug.cgi?id=41205

It broke Leopard and GTK (Requested by Ossy_ on #webkit).

• runtime/RegExp.cpp: (JSC::RegExp::RegExp): (JSC::RegExp::create):
• runtime/RegExp.h:
• runtime/RegExpCache.cpp: (JSC::RegExpCache::lookupOrCreate): (JSC::RegExpCache::create):
• runtime/RegExpCache.h:

File:

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

trunk/JavaScriptCore/runtime/RegExp.cpp

@@ -47 +47 @@
 namespace JSC {
 
+inline RegExp::RegExp(JSGlobalData* globalData, const UString& pattern)
+    : m_pattern(pattern)
+    , m_flagBits(0)
+    , m_constructionError(0)
+    , m_numSubpatterns(0)
+{
+    compile(globalData);
+}
+
 inline RegExp::RegExp(JSGlobalData* globalData, const UString& pattern, const UString& flags)
     : m_pattern(pattern)
@@ -55 +64 @@
     // NOTE: The global flag is handled on a case-by-case basis by functions like
     // String::match and RegExpObject::match.
-    if (!flags.isNull()) {
-        if (flags.find('g') != UString::NotFound)
-            m_flagBits |= Global;
-        if (flags.find('i') != UString::NotFound)
-            m_flagBits |= IgnoreCase;
-        if (flags.find('m') != UString::NotFound)
-            m_flagBits |= Multiline;
-    }
+    if (flags.find('g') != UString::NotFound)
+        m_flagBits |= Global;
+    if (flags.find('i') != UString::NotFound)
+        m_flagBits |= IgnoreCase;
+    if (flags.find('m') != UString::NotFound)
+        m_flagBits |= Multiline;
+
     compile(globalData);
 }
@@ -72 +80 @@
 }
 #endif
+
+PassRefPtr<RegExp> RegExp::create(JSGlobalData* globalData, const UString& pattern)
+{
+    return adoptRef(new RegExp(globalData, pattern));
+}
 
 PassRefPtr<RegExp> RegExp::create(JSGlobalData* globalData, const UString& pattern, const UString& flags)