Title: [174443] releases/WebKitGTK/webkit-2.6/Source/_javascript_Core
Revision
174443
Author
carlo...@webkit.org
Date
2014-10-08 06:05:48 -0700 (Wed, 08 Oct 2014)

Log Message

Merge r174012 - Fix typo in YARR at BOL check
https://bugs.webkit.org/show_bug.cgi?id=137144

Reviewed by Darin Adler.

* yarr/YarrPattern.cpp: replace bitwise and operator by logical and
(JSC::Yarr::YarrPatternConstructor::assertionBOL):

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.6/Source/_javascript_Core/ChangeLog (174442 => 174443)


--- releases/WebKitGTK/webkit-2.6/Source/_javascript_Core/ChangeLog	2014-10-08 13:03:53 UTC (rev 174442)
+++ releases/WebKitGTK/webkit-2.6/Source/_javascript_Core/ChangeLog	2014-10-08 13:05:48 UTC (rev 174443)
@@ -1,3 +1,13 @@
+2014-09-26  Peter Varga  <pva...@webkit.org>
+
+        Fix typo in YARR at BOL check
+        https://bugs.webkit.org/show_bug.cgi?id=137144
+
+        Reviewed by Darin Adler.
+
+        * yarr/YarrPattern.cpp: replace bitwise and operator by logical and
+        (JSC::Yarr::YarrPatternConstructor::assertionBOL):
+
 2014-09-25  Saam Barati  <saambara...@gmail.com>
 
         Web Inspector: console.assert(bitString) TypeSet:50 

Modified: releases/WebKitGTK/webkit-2.6/Source/_javascript_Core/yarr/YarrPattern.cpp (174442 => 174443)


--- releases/WebKitGTK/webkit-2.6/Source/_javascript_Core/yarr/YarrPattern.cpp	2014-10-08 13:03:53 UTC (rev 174442)
+++ releases/WebKitGTK/webkit-2.6/Source/_javascript_Core/yarr/YarrPattern.cpp	2014-10-08 13:05:48 UTC (rev 174443)
@@ -297,7 +297,7 @@
     
     void assertionBOL()
     {
-        if (!m_alternative->m_terms.size() & !m_invertParentheticalAssertion) {
+        if (!m_alternative->m_terms.size() && !m_invertParentheticalAssertion) {
             m_alternative->m_startsWithBOL = true;
             m_alternative->m_containsBOL = true;
             m_pattern.m_containsBOL = true;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to