Changeset 100167 in webkit for trunk/Source/JavaScriptCore/yarr/YarrParser.h

Timestamp:

Nov 14, 2011, 11:25:40 AM (14 years ago)

Author:

[email protected]

Message:

Towards 8 Bit Strings: Templatize YARR Parser
​https://bugs.webkit.org/show_bug.cgi?id=72288

Changed Yarr::Parser to be a template based on character type.

Reviewed by Oliver Hunt.

• yarr/YarrParser.h:

(JSC::Yarr::Parser::Parser):
(JSC::Yarr::parse):

File:

• trunk/Source/JavaScriptCore/yarr/YarrParser.h (modified) (5 diffs)

trunk/Source/JavaScriptCore/yarr/YarrParser.h

@@ -44 +44 @@
 
 // The Parser class should not be used directly - only via the Yarr::parse() method.
-template<class Delegate>
+template<class Delegate, typename CharType>
 class Parser {
 private:
@@ -232 +232 @@
         , m_backReferenceLimit(backReferenceLimit)
         , m_err(NoError)
-        , m_data(pattern.characters16())
+        , m_data(pattern.getCharacters<CharType>())
         , m_size(pattern.length())
         , m_index(0)
@@ -238 +238 @@
     {
     }
-    
+
     /*
      * parseEscape():
@@ -794 +794 @@
     unsigned m_backReferenceLimit;
     ErrorCode m_err;
-    const UChar* m_data;
+    const CharType* m_data;
     unsigned m_size;
     unsigned m_index;
@@ -865 +865 @@
 const char* parse(Delegate& delegate, const UString& pattern, unsigned backReferenceLimit = quantifyInfinite)
 {
-    return Parser<Delegate>(delegate, pattern, backReferenceLimit).parse();
+    if (pattern.is8Bit())
+        return Parser<Delegate, LChar>(delegate, pattern, backReferenceLimit).parse();
+    return Parser<Delegate, UChar>(delegate, pattern, backReferenceLimit).parse();
 }