<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[179485] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/179485">179485</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2015-02-02 12:13:05 -0800 (Mon, 02 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Get rid of invalidSelectorVector, use Bison's error recovery instead
https://bugs.webkit.org/show_bug.cgi?id=141147
Reviewed by Darin Adler.
* css/CSSGrammar.y.in:
Instead of reducing a null selector, we can use a real parsing error
to get out of invalid selector endings.
When that happens, Bison will pop the stack until it can reduce any
valid error recovery rules.
The problem is to make sure there is no floating values because
none of the reduce block between the error and the recovery would
be executed.
In this case, "nth_selector_ending" is a non-recursive production of
the NTHCHILDFUNCTIONS. In turn, NTHCHILDFUNCTIONS are productions
of the non-recursive "pseudo". "pseudo" is only used as a trivial
production of "specifier". "specifier" is only used by "specifier_list".
"specifier_list" has error recovery code -> no production could have
generated a floating values between "specifier_list" and "nth_selector_ending".</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSGrammaryin">trunk/Source/WebCore/css/CSSGrammar.y.in</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (179484 => 179485)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-02-02 20:10:17 UTC (rev 179484)
+++ trunk/Source/WebCore/ChangeLog 2015-02-02 20:13:05 UTC (rev 179485)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2015-02-02 Benjamin Poulain <benjamin@webkit.org>
+
+ Get rid of invalidSelectorVector, use Bison's error recovery instead
+ https://bugs.webkit.org/show_bug.cgi?id=141147
+
+ Reviewed by Darin Adler.
+
+ * css/CSSGrammar.y.in:
+ Instead of reducing a null selector, we can use a real parsing error
+ to get out of invalid selector endings.
+
+ When that happens, Bison will pop the stack until it can reduce any
+ valid error recovery rules.
+
+ The problem is to make sure there is no floating values because
+ none of the reduce block between the error and the recovery would
+ be executed.
+
+ In this case, "nth_selector_ending" is a non-recursive production of
+ the NTHCHILDFUNCTIONS. In turn, NTHCHILDFUNCTIONS are productions
+ of the non-recursive "pseudo". "pseudo" is only used as a trivial
+ production of "specifier". "specifier" is only used by "specifier_list".
+
+ "specifier_list" has error recovery code -> no production could have
+ generated a floating values between "specifier_list" and "nth_selector_ending".
+
</ins><span class="cx"> 2015-01-30 Roger Fong <roger_fong@apple.com>
</span><span class="cx">
</span><span class="cx"> WebGL2: Implement spec section 3.7.1 Setting and getting state (Part 1).
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSGrammaryin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSGrammar.y.in (179484 => 179485)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSGrammar.y.in 2015-02-02 20:10:17 UTC (rev 179484)
+++ trunk/Source/WebCore/css/CSSGrammar.y.in 2015-02-02 20:13:05 UTC (rev 179485)
</span><span class="lines">@@ -85,8 +85,6 @@
</span><span class="cx"> return v;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static auto* const invalidSelectorVector = reinterpret_cast<Vector<std::unique_ptr<CSSParserSelector>>*>(-1);
-
</del><span class="cx"> static bool selectorListDoesNotMatchAnyPseudoElement(const Vector<std::unique_ptr<CSSParserSelector>>* selectorVector)
</span><span class="cx"> {
</span><span class="cx"> if (!selectorVector)
</span><span class="lines">@@ -305,7 +303,7 @@
</span><span class="cx"> %union { Vector<std::unique_ptr<CSSParserSelector>>* selectorList; }
</span><span class="cx"> %type <selectorList> selector_list nested_selector_list simple_selector_list nth_selector_ending
</span><span class="cx"> %destructor { delete $$; } selector_list nested_selector_list simple_selector_list
</span><del>-%destructor { if ($$ != invalidSelectorVector) delete $$; } nth_selector_ending
</del><ins>+%destructor { delete $$; } nth_selector_ending
</ins><span class="cx">
</span><span class="cx"> %union { bool boolean; }
</span><span class="cx"> %type <boolean> declaration declaration_list decl_list priority
</span><span class="lines">@@ -1323,7 +1321,7 @@
</span><span class="cx"> if ($4)
</span><span class="cx"> $$ = $4;
</span><span class="cx"> else
</span><del>- $$ = invalidSelectorVector;
</del><ins>+ YYERROR;
</ins><span class="cx"> }
</span><span class="cx"> ;
</span><span class="cx">
</span><span class="lines">@@ -1405,53 +1403,47 @@
</span><span class="cx"> // Definition of :nth-child().
</span><span class="cx"> | ':' NTHCHILDFUNCTIONS maybe_space NTH nth_selector_ending {
</span><span class="cx"> $$ = nullptr;
</span><del>- if ($5 != invalidSelectorVector) {
- std::unique_ptr<Vector<std::unique_ptr<CSSParserSelector>>> ending($5);
- if (selectorListDoesNotMatchAnyPseudoElement(ending.get())) {
- auto selector = std::make_unique<CSSParserSelector>();
- selector->setMatch(CSSSelector::PseudoClass);
- selector->setArgument($4);
- selector->setPseudoClassValue($2);
- if (ending)
- selector->adoptSelectorVector(*ending);
- CSSSelector::PseudoClassType pseudoClassType = selector->pseudoClassType();
- if (pseudoClassType == CSSSelector::PseudoClassNthChild || pseudoClassType == CSSSelector::PseudoClassNthLastChild)
- $$ = selector.release();
- }
</del><ins>+ std::unique_ptr<Vector<std::unique_ptr<CSSParserSelector>>> ending($5);
+ if (selectorListDoesNotMatchAnyPseudoElement(ending.get())) {
+ auto selector = std::make_unique<CSSParserSelector>();
+ selector->setMatch(CSSSelector::PseudoClass);
+ selector->setArgument($4);
+ selector->setPseudoClassValue($2);
+ if (ending)
+ selector->adoptSelectorVector(*ending);
+ CSSSelector::PseudoClassType pseudoClassType = selector->pseudoClassType();
+ if (pseudoClassType == CSSSelector::PseudoClassNthChild || pseudoClassType == CSSSelector::PseudoClassNthLastChild)
+ $$ = selector.release();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> | ':' NTHCHILDFUNCTIONS maybe_space maybe_unary_operator INTEGER nth_selector_ending {
</span><span class="cx"> $$ = nullptr;
</span><del>- if ($6 != invalidSelectorVector) {
- std::unique_ptr<Vector<std::unique_ptr<CSSParserSelector>>> ending($6);
- if (selectorListDoesNotMatchAnyPseudoElement(ending.get())) {
- auto selector = std::make_unique<CSSParserSelector>();
- selector->setMatch(CSSSelector::PseudoClass);
- selector->setArgument(AtomicString::number($4 * $5));
- selector->setPseudoClassValue($2);
- if (ending)
- selector->adoptSelectorVector(*ending);
- CSSSelector::PseudoClassType pseudoClassType = selector->pseudoClassType();
- if (pseudoClassType == CSSSelector::PseudoClassNthChild || pseudoClassType == CSSSelector::PseudoClassNthLastChild)
- $$ = selector.release();
- }
</del><ins>+ std::unique_ptr<Vector<std::unique_ptr<CSSParserSelector>>> ending($6);
+ if (selectorListDoesNotMatchAnyPseudoElement(ending.get())) {
+ auto selector = std::make_unique<CSSParserSelector>();
+ selector->setMatch(CSSSelector::PseudoClass);
+ selector->setArgument(AtomicString::number($4 * $5));
+ selector->setPseudoClassValue($2);
+ if (ending)
+ selector->adoptSelectorVector(*ending);
+ CSSSelector::PseudoClassType pseudoClassType = selector->pseudoClassType();
+ if (pseudoClassType == CSSSelector::PseudoClassNthChild || pseudoClassType == CSSSelector::PseudoClassNthLastChild)
+ $$ = selector.release();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> | ':' NTHCHILDFUNCTIONS maybe_space IDENT nth_selector_ending {
</span><span class="cx"> $$ = nullptr;
</span><del>- if ($5 != invalidSelectorVector) {
- std::unique_ptr<Vector<std::unique_ptr<CSSParserSelector>>> ending($5);
- if (isValidNthToken($4) && selectorListDoesNotMatchAnyPseudoElement(ending.get())) {
- auto selector = std::make_unique<CSSParserSelector>();
- selector->setMatch(CSSSelector::PseudoClass);
- selector->setArgument($4);
- selector->setPseudoClassValue($2);
- if (ending)
- selector->adoptSelectorVector(*ending);
- CSSSelector::PseudoClassType pseudoClassType = selector->pseudoClassType();
- if (pseudoClassType == CSSSelector::PseudoClassNthChild || pseudoClassType == CSSSelector::PseudoClassNthLastChild)
- $$ = selector.release();
- }
</del><ins>+ std::unique_ptr<Vector<std::unique_ptr<CSSParserSelector>>> ending($5);
+ if (isValidNthToken($4) && selectorListDoesNotMatchAnyPseudoElement(ending.get())) {
+ auto selector = std::make_unique<CSSParserSelector>();
+ selector->setMatch(CSSSelector::PseudoClass);
+ selector->setArgument($4);
+ selector->setPseudoClassValue($2);
+ if (ending)
+ selector->adoptSelectorVector(*ending);
+ CSSSelector::PseudoClassType pseudoClassType = selector->pseudoClassType();
+ if (pseudoClassType == CSSSelector::PseudoClassNthChild || pseudoClassType == CSSSelector::PseudoClassNthLastChild)
+ $$ = selector.release();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>