Changeset 75595 in webkit for trunk/Source/JavaScriptCore/yarr/YarrPattern.cpp

Timestamp:

Jan 12, 2011, 2:32:29 AM (14 years ago)

Author:

[email protected]

Message:

2011-01-12 Peter Varga <​[email protected]>

Reviewed by Gavin Barraclough.

Add Yarr.h to YARR
​https://bugs.webkit.org/show_bug.cgi?id=51021

Move other common constants and functions from YARR's different files
to Yarr.h.
Use Yarr.h header instead of including other YARR headers where it
is possible.

• JavaScriptCore.gypi:
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
• JavaScriptCore.xcodeproj/project.pbxproj:
• runtime/RegExp.cpp:
• yarr/Yarr.h: Added.
• yarr/YarrInterpreter.cpp:
• yarr/YarrInterpreter.h:
• yarr/YarrJIT.cpp: (JSC::Yarr::jitCompile): (JSC::Yarr::execute):
• yarr/YarrJIT.h:
• yarr/YarrParser.h:
• yarr/YarrPattern.cpp: (JSC::Yarr::YarrPattern::compile): (JSC::Yarr::YarrPattern::YarrPattern):
• yarr/YarrPattern.h:

File:

• trunk/Source/JavaScriptCore/yarr/YarrPattern.cpp (modified) (5 diffs)

trunk/Source/JavaScriptCore/yarr/YarrPattern.cpp

@@ -28 +28 @@
 #include "YarrPattern.h"
 
-#include "YarrInterpreter.h"
+#include "Yarr.h"
+#include "YarrParser.h"
 #include <wtf/Vector.h>
 
@@ -930 +931 @@
 };
 
-
-static const char* compile(const UString& patternString, YarrPattern& pattern)
+const char* YarrPattern::compile(const UString& patternString)
 {
-    YarrPatternConstructor constructor(pattern);
+    YarrPatternConstructor constructor(*this);
 
     if (const char* error = parse(constructor, patternString))
@@ -942 +942 @@
     //      "Note: if the number of left parentheses is less than the number specified
     //       in \#, the \# is taken as an octal escape as described in the next row."
-    if (pattern.containsIllegalBackReference()) {
-        unsigned numSubpatterns = pattern.m_numSubpatterns;
-
+    if (containsIllegalBackReference()) {
         constructor.reset();
 #if !ASSERT_DISABLED
         const char* error =
 #endif
-            parse(constructor, patternString, numSubpatterns);
+            parse(constructor, patternString, m_numSubpatterns);
 
         ASSERT(!error);
-        ASSERT(numSubpatterns == pattern.m_numSubpatterns);
     }
 
@@ -962 +959 @@
 
     return 0;
-};
+}
 
 YarrPattern::YarrPattern(const UString& pattern, bool ignoreCase, bool multiline, const char** error)
@@ -980 +977 @@
     , nonwordcharCached(0)
 {
-    *error = compile(pattern, *this);
+    *error = compile(pattern);
 }