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

Timestamp:

Jul 2, 2010, 2:34:43 PM (15 years ago)

Author:

[email protected]

Message:

[ Updated after rollout. ]

Patch by Renata Hodovan <​[email protected]> on 2010-07-02
Reviewed by Oliver Hunt.

Merged RegExp constructor and RegExp::create methods.
Both functions are called with three parameters and check whether
flags (the third param) is given or not.
Avoid extra hash lookups in RegExpCache::create by passing a pre-computed
iterator parameter.
​https://bugs.webkit.org/show_bug.cgi?id=41055

• runtime/RegExp.cpp:

(JSC::RegExp::RegExp):

• 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)
-    , m_lastMatchStart(-1)
-{
-    compile(globalData);
-}
-
 inline RegExp::RegExp(JSGlobalData* globalData, const UString& pattern, const UString& flags)
     : m_pattern(pattern)
@@ -66 +56 @@
     // NOTE: The global flag is handled on a case-by-case basis by functions like
     // String::match and RegExpObject::match.
-    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.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;
+    }
     compile(globalData);
 }
@@ -82 +73 @@
 }
 #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)