Changeset 72180 in webkit for trunk/JavaScriptCore/yarr/RegexPattern.h

Timestamp:

Nov 17, 2010, 1:42:41 AM (15 years ago)

Author:

[email protected]

Message:

2010-11-17 Peter Varga <​[email protected]>

Reviewed by Gavin Barraclough.

Collect the beginning characters in a RegExp pattern for look-up
optimization
​https://bugs.webkit.org/show_bug.cgi?id=45748

Extend the YARR's parser with an algorithm which collects the potential
beginning characters from a RegExp pattern for later look-up optimization.

• yarr/RegexCompiler.cpp: (JSC::Yarr::BeginCharHelper::BeginCharHelper): (JSC::Yarr::BeginCharHelper::addBeginChar): (JSC::Yarr::BeginCharHelper::merge): (JSC::Yarr::BeginCharHelper::addCharacter): (JSC::Yarr::BeginCharHelper::linkHotTerms): (JSC::Yarr::RegexPatternConstructor::RegexPatternConstructor): (JSC::Yarr::RegexPatternConstructor::addBeginTerm): (JSC::Yarr::RegexPatternConstructor::setupDisjunctionBeginTerms): (JSC::Yarr::RegexPatternConstructor::setupAlternativeBeginTerms): (JSC::Yarr::RegexPatternConstructor::setupBeginChars): (JSC::Yarr::compileRegex):
• yarr/RegexPattern.h: (JSC::Yarr::TermChain::TermChain): (JSC::Yarr::BeginChar::BeginChar): (JSC::Yarr::RegexPattern::RegexPattern): (JSC::Yarr::RegexPattern::reset):

File:

• trunk/JavaScriptCore/yarr/RegexPattern.h (modified) (7 diffs)

trunk/JavaScriptCore/yarr/RegexPattern.h

@@ -1 +1 @@
 /*
  * Copyright (C) 2009 Apple Inc. All rights reserved.
+ * Copyright (C) 2010 Peter Varga ([email protected]), University of Szeged
  *
  * Redistribution and use in source and binary forms, with or without
@@ -284 +285 @@
 CharacterClass* nonwordcharCreate();
 
+struct TermChain {
+    TermChain(PatternTerm term)
+        : term(term)
+    {}
+
+    PatternTerm term;
+    Vector<TermChain> hotTerms;
+};
+
+struct BeginChar {
+    BeginChar()
+        : value(0)
+        , mask(0)
+    {}
+
+    BeginChar(unsigned value, unsigned mask)
+        : value(value)
+        , mask(mask)
+    {}
+
+    unsigned value;
+    unsigned mask;
+};
+
 struct RegexPattern {
     RegexPattern(bool ignoreCase, bool multiline)
@@ -289 +314 @@
         , m_multiline(multiline)
         , m_containsBackreferences(false)
+        , m_containsBeginChars(false)
         , m_containsBOL(false)
         , m_numSubpatterns(0)
@@ -314 +340 @@
 
         m_containsBackreferences = false;
+        m_containsBeginChars = false;
         m_containsBOL = false;
 
@@ -328 +355 @@
         deleteAllValues(m_userCharacterClasses);
         m_userCharacterClasses.clear();
+        m_beginChars.clear();
     }
 
@@ -381 +409 @@
     bool m_multiline : 1;
     bool m_containsBackreferences : 1;
+    bool m_containsBeginChars : 1;
     bool m_containsBOL : 1;
     unsigned m_numSubpatterns;
@@ -387 +416 @@
     Vector<PatternDisjunction*, 4> m_disjunctions;
     Vector<CharacterClass*> m_userCharacterClasses;
+    Vector<BeginChar> m_beginChars;
 
 private: