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

Timestamp:

Mar 3, 2011, 2:22:56 AM (14 years ago)

Author:

[email protected]

Message:

2011-03-03 Peter Varga <​[email protected]>

Reviewed by Oliver Hunt.

Begin Characters Optimization Causes YARR Interpreter Errors
​https://bugs.webkit.org/show_bug.cgi?id=55479

The addBeginTerm function is removed because it doesn't correctly handle those
cases when an "invalid" term has been
collected (e.g. CharacterClass). Move the removed function to the
setupAlternativeBeginTerms method's switch-case
where the non-allowed cases are correctly handled.

Reenable the Beginning Character Optimization in the YARR Interpreter again.

• fast/js/regexp-alternatives-expected.txt: Added.
• fast/js/regexp-alternatives.html: Added.
• fast/js/script-tests/regexp-alternatives.js: Added.

2011-03-03 Peter Varga <​[email protected]>

Reviewed by Oliver Hunt.

Begin Characters Optimization Causes YARR Interpreter Errors
​https://bugs.webkit.org/show_bug.cgi?id=55479

The addBeginTerm function is removed because it doesn't correctly handle those
cases when an "invalid" term has been
collected (e.g. CharacterClass). Move the removed function to the
setupAlternativeBeginTerms method's switch-case
where the non-allowed cases are correctly handled.

Reenable the Beginning Character Optimization in the YARR Interpreter again.

• yarr/YarrPattern.cpp: (JSC::Yarr::YarrPatternConstructor::setupAlternativeBeginTerms): (JSC::Yarr::YarrPattern::compile):

File:

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

trunk/Source/JavaScriptCore/yarr/YarrPattern.cpp

@@ -815 +815 @@
     }
 
-    bool addBeginTerm(PatternTerm term, Vector<TermChain>* beginTerms, PatternAlternative* alternative, unsigned numTerms, unsigned termIndex, unsigned depth)
-    {
-        if (term.quantityType == QuantifierFixedCount) {
-            beginTerms->append(TermChain(term));
-            if (depth < 2 && termIndex < numTerms - 1 && term.quantityCount == 1)
-                setupAlternativeBeginTerms(alternative, &beginTerms->last().hotTerms, termIndex + 1, depth + 1);
-        } else if (termIndex != numTerms - 1) {
-            beginTerms->append(TermChain(term));
-            return true;
-        }
-
-        return false;
-    }
-
     // This function collects the terms which are potentially matching the first number of depth characters in the result.
     // If this function returns false then it found at least one term which makes the beginning character
@@ -864 +850 @@
 
             case PatternTerm::TypePatternCharacter:
-                if (addBeginTerm(term, beginTerms, alternative, numTerms, termIndex, depth)) {
+                if (termIndex != numTerms - 1) {
+                    beginTerms->append(TermChain(term));
                     termIndex++;
                     checkNext = true;
+                } else if (term.quantityType == QuantifierFixedCount) {
+                    beginTerms->append(TermChain(term));
+                    if (depth < 2 && termIndex < numTerms - 1 && term.quantityCount == 1)
+                        if (!setupAlternativeBeginTerms(alternative, &beginTerms->last().hotTerms, termIndex + 1, depth + 1))
+                            return false;
                 }
+
                 break;
 
@@ -884 +877 @@
                     termIndex++;
                     checkNext = true;
-
                 }
 
@@ -993 +985 @@
         
     constructor.setupOffsets();
-    // TODO: Disabling the begin characters optimization due to problems found
-    //    in https://bugs.webkit.org/show_bug.cgi?id=54978.
-    //    A new defect was filed to track this issue: 
-    //        https://bugs.webkit.org/show_bug.cgi?id=55479
-    // constructor.setupBeginChars();
+    constructor.setupBeginChars();
 
     return 0;