[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-142-g786665c

[ossy at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 3047f55f93d4719e902798854f34e48c5a1dbbeb
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 21 14:42:41 2010 +0000

    Unify the name of parentheses in YARR: rename parenthesis to
    parentheses.
    
    Patch by Peter Varga <pvarga at inf.u-szeged.hu> on 2010-12-21
    Reviewed by Csaba Osztrogonác.
    
    * yarr/RegexCompiler.cpp:
    (JSC::Yarr::RegexPatternConstructor::atomParenthesesEnd):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74412 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index eb1be8b..b7a100e 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-12-21  Peter Varga  <pvarga at inf.u-szeged.hu>
+
+        Reviewed by Csaba Osztrogonác.
+
+        Unify the name of parentheses in YARR: rename parenthesis to
+        parentheses.
+
+        * yarr/RegexCompiler.cpp:
+        (JSC::Yarr::RegexPatternConstructor::atomParenthesesEnd):
+
 2010-12-21  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
 
         Reviewed by Andreas Kling.
diff --git a/JavaScriptCore/yarr/RegexCompiler.cpp b/JavaScriptCore/yarr/RegexCompiler.cpp
index 3a76083..9063359 100644
--- a/JavaScriptCore/yarr/RegexCompiler.cpp
+++ b/JavaScriptCore/yarr/RegexCompiler.cpp
@@ -477,16 +477,16 @@ public:
         ASSERT(m_alternative->m_parent);
         ASSERT(m_alternative->m_parent->m_parent);
 
-        PatternDisjunction* parenthesisDisjunction = m_alternative->m_parent;
+        PatternDisjunction* parenthesesDisjunction = m_alternative->m_parent;
         m_alternative = m_alternative->m_parent->m_parent;
 
         PatternTerm& lastTerm = m_alternative->lastTerm();
         
-        unsigned numParenAlternatives = parenthesisDisjunction->m_alternatives.size();
+        unsigned numParenAlternatives = parenthesesDisjunction->m_alternatives.size();
         unsigned numBOLAnchoredAlts = 0;
         // Bubble up BOL flags
         for (unsigned i = 0; i < numParenAlternatives; i++) {
-            if (parenthesisDisjunction->m_alternatives[i]->m_startsWithBOL)
+            if (parenthesesDisjunction->m_alternatives[i]->m_startsWithBOL)
                 numBOLAnchoredAlts++;
         }
         

-- 
WebKit Debian packaging