<!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>[189267] trunk</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/189267">189267</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-09-02 19:34:58 -0700 (Wed, 02 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make bison grammar compatible with bison 2.1
https://bugs.webkit.org/show_bug.cgi?id=148731
Patch by Alex Christensen <achristensen@webkit.org> on 2015-09-02
Reviewed by Tim Horton.
.:
* Source/cmake/WebKitCommon.cmake:
Support bison 2.1.
Source/WebCore:
* css/CSSGrammar.y.in:
* xml/XPathGrammar.y:
Move all union fields to one union so bison 2.1 generates equivalent output.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSGrammaryin">trunk/Source/WebCore/css/CSSGrammar.y.in</a></li>
<li><a href="#trunkSourceWebCorexmlXPathGrammary">trunk/Source/WebCore/xml/XPathGrammar.y</a></li>
<li><a href="#trunkSourcecmakeWebKitCommoncmake">trunk/Source/cmake/WebKitCommon.cmake</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (189266 => 189267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2015-09-02 21:05:06 UTC (rev 189266)
+++ trunk/ChangeLog 2015-09-03 02:34:58 UTC (rev 189267)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-09-02 Alex Christensen <achristensen@webkit.org>
+
+ Make bison grammar compatible with bison 2.1
+ https://bugs.webkit.org/show_bug.cgi?id=148731
+
+ Reviewed by Tim Horton.
+
+ * Source/cmake/WebKitCommon.cmake:
+ Support bison 2.1.
+
</ins><span class="cx"> 2015-08-31 Carlos Alberto Lopez Perez <clopez@igalia.com>
</span><span class="cx">
</span><span class="cx"> [CMake] Build with Debug Fission on by default on Debug builds.
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (189266 => 189267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-09-02 21:05:06 UTC (rev 189266)
+++ trunk/Source/WebCore/ChangeLog 2015-09-03 02:34:58 UTC (rev 189267)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-09-02 Alex Christensen <achristensen@webkit.org>
+
+ Make bison grammar compatible with bison 2.1
+ https://bugs.webkit.org/show_bug.cgi?id=148731
+
+ Reviewed by Tim Horton.
+
+ * css/CSSGrammar.y.in:
+ * xml/XPathGrammar.y:
+ Move all union fields to one union so bison 2.1 generates equivalent output.
+
</ins><span class="cx"> 2015-09-02 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> Add some Houdini specs to the features list
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSGrammaryin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSGrammar.y.in (189266 => 189267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSGrammar.y.in 2015-09-02 21:05:06 UTC (rev 189266)
+++ trunk/Source/WebCore/css/CSSGrammar.y.in 2015-09-03 02:34:58 UTC (rev 189267)
</span><span class="lines">@@ -31,6 +31,27 @@
</span><span class="cx"> CSSParserString string;
</span><span class="cx"> CSSSelector::MarginBoxType marginBox;
</span><span class="cx"> CSSParserValue value;
</span><ins>+ CSSParserSelectorCombinator relation;
+ StyleRuleBase* rule;
+ Vector<RefPtr<StyleRuleBase>>* ruleList;
+ MediaQuerySet* mediaList;
+ MediaQuery* mediaQuery;
+ MediaQuery::Restrictor mediaQueryRestrictor;
+ MediaQueryExp* mediaQueryExp;
+ Vector<CSSParser::SourceSize>* sourceSizeList;
+ Vector<std::unique_ptr<MediaQueryExp>>* mediaQueryExpList;
+ StyleKeyframe* keyframe;
+ Vector<RefPtr<StyleKeyframe>>* keyframeRuleList;
+ CSSPropertyID id;
+ CSSParserSelector* selector;
+ Vector<std::unique_ptr<CSSParserSelector>>* selectorList;
+ bool boolean;
+ CSSSelector::Match match;
+ int integer;
+ char character;
+ CSSParserValueList* valueList;
+ Vector<CSSParserString>* stringList;
+ CSSParser::Location location;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> %{
</span><span class="lines">@@ -225,14 +246,11 @@
</span><span class="cx">
</span><span class="cx"> %token <string> UNICODERANGE
</span><span class="cx">
</span><del>-%union { CSSParserSelectorCombinator relation; }
</del><span class="cx"> %type <relation> combinator
</span><span class="cx">
</span><del>-%union { StyleRuleBase* rule; }
</del><span class="cx"> %type <rule> block_rule block_valid_rule font_face import keyframes media page region rule ruleset valid_rule
</span><span class="cx"> %destructor { if ($$) $$->deref(); } block_rule block_valid_rule font_face import keyframes media page region rule ruleset valid_rule
</span><span class="cx">
</span><del>-%union { Vector<RefPtr<StyleRuleBase>>* ruleList; }
</del><span class="cx"> %type <ruleList> block_rule_list block_valid_rule_list
</span><span class="cx"> %destructor { delete $$; } block_rule_list block_valid_rule_list
</span><span class="cx">
</span><span class="lines">@@ -240,22 +258,17 @@
</span><span class="cx">
</span><span class="cx"> %type <marginBox> margin_sym
</span><span class="cx">
</span><del>-%union { MediaQuerySet* mediaList; }
</del><span class="cx"> %type <mediaList> media_list maybe_media_list
</span><span class="cx"> %destructor { if ($$) $$->deref(); } media_list maybe_media_list
</span><span class="cx">
</span><del>-%union { MediaQuery* mediaQuery; }
</del><span class="cx"> %type <mediaQuery> media_query
</span><span class="cx"> %destructor { delete $$; } media_query
</span><span class="cx">
</span><del>-%union { MediaQuery::Restrictor mediaQueryRestrictor; }
</del><span class="cx"> %type <mediaQueryRestrictor> maybe_media_restrictor
</span><span class="cx">
</span><del>-%union { MediaQueryExp* mediaQueryExp; }
</del><span class="cx"> %type <mediaQueryExp> media_query_exp base_media_query_exp
</span><span class="cx"> %destructor { delete $$; } media_query_exp base_media_query_exp
</span><span class="cx">
</span><del>-%union { Vector<CSSParser::SourceSize>* sourceSizeList; }
</del><span class="cx"> %type <sourceSizeList> source_size_list
</span><span class="cx"> %destructor { delete $$; } source_size_list
</span><span class="cx">
</span><span class="lines">@@ -265,17 +278,14 @@
</span><span class="cx"> %type <value> source_size_length
</span><span class="cx"> %destructor { destroy($$); } source_size_length
</span><span class="cx">
</span><del>-%union { Vector<std::unique_ptr<MediaQueryExp>>* mediaQueryExpList; }
</del><span class="cx"> %type <mediaQueryExpList> media_query_exp_list maybe_and_media_query_exp_list
</span><span class="cx"> %destructor { delete $$; } media_query_exp_list maybe_and_media_query_exp_list
</span><span class="cx">
</span><span class="cx"> %type <string> keyframe_name
</span><span class="cx">
</span><del>-%union { StyleKeyframe* keyframe; }
</del><span class="cx"> %type <keyframe> keyframe_rule
</span><span class="cx"> %destructor { if ($$) $$->deref(); } keyframe_rule
</span><span class="cx">
</span><del>-%union { Vector<RefPtr<StyleKeyframe>>* keyframeRuleList; }
</del><span class="cx"> %type <keyframeRuleList> keyframes_rule
</span><span class="cx"> %destructor { delete $$; } keyframes_rule
</span><span class="cx">
</span><span class="lines">@@ -286,36 +296,27 @@
</span><span class="cx"> %type <value> calc_function function min_or_max_function term
</span><span class="cx"> %destructor { destroy($$); } calc_function function min_or_max_function term
</span><span class="cx">
</span><del>-%union { CSSPropertyID id; }
</del><span class="cx"> %type <id> property
</span><span class="cx">
</span><del>-%union { CSSParserSelector* selector; }
</del><span class="cx"> %type <selector> attrib class page_selector pseudo pseudo_page complex_selector complex_selector_with_trailing_whitespace compound_selector specifier specifier_list
</span><span class="cx"> %destructor { delete $$; } attrib class page_selector pseudo pseudo_page complex_selector complex_selector_with_trailing_whitespace compound_selector specifier specifier_list
</span><span class="cx">
</span><del>-%union { Vector<std::unique_ptr<CSSParserSelector>>* selectorList; }
</del><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><span class="cx"> %destructor { delete $$; } nth_selector_ending
</span><span class="cx">
</span><del>-%union { bool boolean; }
</del><span class="cx"> %type <boolean> attrib_flags declaration declaration_list decl_list priority
</span><span class="cx">
</span><del>-%union { CSSSelector::Match match; }
</del><span class="cx"> %type <match> match
</span><span class="cx">
</span><del>-%union { int integer; }
</del><span class="cx"> %type <integer> unary_operator maybe_unary_operator
</span><span class="cx">
</span><del>-%union { char character; }
</del><span class="cx"> %type <character> operator calc_func_operator
</span><span class="cx">
</span><del>-%union { CSSParserValueList* valueList; }
</del><span class="cx"> %type <valueList> calc_func_expr calc_func_expr_list calc_func_paren_expr expr key_list maybe_media_value valid_calc_func_expr valid_expr
</span><span class="cx"> %destructor { delete $$; } calc_func_expr calc_func_expr_list calc_func_paren_expr expr key_list maybe_media_value valid_calc_func_expr valid_expr
</span><span class="cx">
</span><span class="cx"> %type <string> lang_range
</span><del>-%union { Vector<CSSParserString>* stringList; }
</del><span class="cx"> %type <stringList> comma_separated_lang_ranges
</span><span class="cx"> %destructor { delete $$; } comma_separated_lang_ranges
</span><span class="cx">
</span><span class="lines">@@ -323,7 +324,6 @@
</span><span class="cx">
</span><span class="cx"> %type <string> element_name
</span><span class="cx">
</span><del>-%union { CSSParser::Location location; }
</del><span class="cx"> %type <location> error_location
</span><span class="cx">
</span><span class="cx"> #if ENABLE_CSS_GRID_LAYOUT
</span></span></pre></div>
<a id="trunkSourceWebCorexmlXPathGrammary"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/XPathGrammar.y (189266 => 189267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/XPathGrammar.y 2015-09-02 21:05:06 UTC (rev 189266)
+++ trunk/Source/WebCore/xml/XPathGrammar.y 2015-09-03 02:34:58 UTC (rev 189267)
</span><span class="lines">@@ -51,46 +51,50 @@
</span><span class="cx"> %lex-param { parser }
</span><span class="cx"> %parse-param { Parser& parser }
</span><span class="cx">
</span><del>-%union { NumericOp::Opcode numericOpcode; }
</del><ins>+%union {
+ NumericOp::Opcode numericOpcode;
+ EqTestOp::Opcode equalityTestOpcode;
+ StringImpl* string;
+ Step::Axis axis;
+ LocationPath* locationPath;
+ Step::NodeTest* nodeTest;
+ Vector<std::unique_ptr<Expression>>* expressionVector;
+ Step* step;
+ Expression* expression;
+}
</ins><span class="cx"> %left <numericOpcode> MULOP
</span><span class="cx">
</span><del>-%union { EqTestOp::Opcode equalityTestOpcode; }
</del><span class="cx"> %left <equalityTestOpcode> EQOP RELOP
</span><span class="cx">
</span><span class="cx"> %left PLUS MINUS
</span><span class="cx">
</span><span class="cx"> %left OR AND
</span><span class="cx">
</span><del>-%union { StringImpl* string; }
</del><span class="cx"> %token <string> FUNCTIONNAME LITERAL NAMETEST NUMBER NODETYPE VARIABLEREFERENCE
</span><span class="cx"> %destructor { if ($$) $$->deref(); } FUNCTIONNAME LITERAL NAMETEST NUMBER NODETYPE VARIABLEREFERENCE
</span><span class="cx">
</span><del>-%union { Step::Axis axis; }
</del><span class="cx"> %token <axis> AXISNAME
</span><span class="cx"> %type <axis> AxisSpecifier
</span><span class="cx">
</span><span class="cx"> %token COMMENT DOTDOT PI NODE SLASHSLASH TEXT XPATH_ERROR
</span><span class="cx">
</span><del>-%union { LocationPath* locationPath; }
</del><span class="cx"> %type <locationPath> LocationPath AbsoluteLocationPath RelativeLocationPath
</span><span class="cx"> %destructor { delete $$; } LocationPath AbsoluteLocationPath RelativeLocationPath
</span><span class="cx">
</span><del>-%union { Step::NodeTest* nodeTest; }
</del><span class="cx"> %type <nodeTest> NodeTest
</span><span class="cx"> %destructor { delete $$; } NodeTest
</span><span class="cx">
</span><del>-%union { Vector<std::unique_ptr<Expression>>* expressionVector; }
</del><span class="cx"> %type <expressionVector> ArgumentList PredicateList OptionalPredicateList
</span><span class="cx"> %destructor { delete $$; } ArgumentList PredicateList OptionalPredicateList
</span><span class="cx">
</span><del>-%union { Step* step; }
</del><span class="cx"> %type <step> Step AbbreviatedStep DescendantOrSelf
</span><span class="cx"> %destructor { delete $$; } Step AbbreviatedStep DescendantOrSelf
</span><span class="cx">
</span><del>-%union { Expression* expression; }
</del><span class="cx"> %type <expression> AdditiveExpr AndExpr Argument EqualityExpr Expr FilterExpr FunctionCall MultiplicativeExpr OrExpr PathExpr Predicate PrimaryExpr RelationalExpr UnaryExpr UnionExpr
</span><span class="cx"> %destructor { delete $$; } AdditiveExpr AndExpr Argument EqualityExpr Expr FilterExpr FunctionCall MultiplicativeExpr OrExpr PathExpr Predicate PrimaryExpr RelationalExpr UnaryExpr UnionExpr
</span><span class="cx">
</span><ins>+
+
</ins><span class="cx"> %{
</span><span class="cx">
</span><span class="cx"> static int xpathyylex(YYSTYPE* yylval, Parser& parser) { return parser.lex(*yylval); }
</span></span></pre></div>
<a id="trunkSourcecmakeWebKitCommoncmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/WebKitCommon.cmake (189266 => 189267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/WebKitCommon.cmake 2015-09-02 21:05:06 UTC (rev 189266)
+++ trunk/Source/cmake/WebKitCommon.cmake 2015-09-03 02:34:58 UTC (rev 189267)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> # -----------------------------------------------------------------------------
</span><span class="cx"> # Find common packages (used by all ports)
</span><span class="cx"> # -----------------------------------------------------------------------------
</span><del>-find_package(BISON 2.3 REQUIRED)
</del><ins>+find_package(BISON 2.1 REQUIRED)
</ins><span class="cx"> if (!APPLE)
</span><span class="cx"> find_package(FLEX 2.5.34 REQUIRED)
</span><span class="cx"> endif ()
</span></span></pre>
</div>
</div>
</body>
</html>