<!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>[172381] 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/172381">172381</a></dd>
<dt>Author</dt> <dd>oliver@apple.com</dd>
<dt>Date</dt> <dd>2014-08-10 13:12:01 -0700 (Sun, 10 Aug 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Destructuring assignment in a var declaration list incorrectly consumes subsequent variable initialisers
https://bugs.webkit.org/show_bug.cgi?id=135773

Reviewed by Michael Saboff.

Source/JavaScriptCore:

We should be using parseAssignment expression in order to get the correct
precedence.

* parser/Parser.cpp:
(JSC::Parser&lt;LexerType&gt;::parseVarDeclarationList):

LayoutTests:

Add new tests.

* js/destructuring-assignment-expected.txt:
* js/script-tests/destructuring-assignment.js:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsjsdestructuringassignmentexpectedtxt">trunk/LayoutTests/js/destructuring-assignment-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsscripttestsdestructuringassignmentjs">trunk/LayoutTests/js/script-tests/destructuring-assignment.js</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserParsercpp">trunk/Source/JavaScriptCore/parser/Parser.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (172380 => 172381)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2014-08-10 20:07:34 UTC (rev 172380)
+++ trunk/LayoutTests/ChangeLog        2014-08-10 20:12:01 UTC (rev 172381)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-08-10  Oliver Hunt  &lt;oliver@apple.com&gt;
+
+        Destructuring assignment in a var declaration list incorrectly consumes subsequent variable initialisers
+        https://bugs.webkit.org/show_bug.cgi?id=135773
+
+        Reviewed by Michael Saboff.
+
+        Add new tests.
+
+        * js/destructuring-assignment-expected.txt:
+        * js/script-tests/destructuring-assignment.js:
+
</ins><span class="cx"> 2014-08-09  Zalan Bujtas  &lt;zalan@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Subpixel rendering: Transforms on non-compositing layers leave bits behind when the box boundaries changes.
</span></span></pre></div>
<a id="trunkLayoutTestsjsdestructuringassignmentexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/destructuring-assignment-expected.txt (172380 => 172381)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/destructuring-assignment-expected.txt        2014-08-10 20:07:34 UTC (rev 172380)
+++ trunk/LayoutTests/js/destructuring-assignment-expected.txt        2014-08-10 20:12:01 UTC (rev 172381)
</span><span class="lines">@@ -81,6 +81,10 @@
</span><span class="cx"> PASS testDeconstructArgs('1', '2') is '12'
</span><span class="cx"> PASS testDeconstructArgLength('1', '2') is 2
</span><span class="cx"> PASS testDeconstructArgs('2') is '23'
</span><ins>+PASS a is 1
+PASS b is 2
+PASS c is 3
+PASS d is 4
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx"> 
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsjsscripttestsdestructuringassignmentjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/script-tests/destructuring-assignment.js (172380 => 172381)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/script-tests/destructuring-assignment.js        2014-08-10 20:07:34 UTC (rev 172380)
+++ trunk/LayoutTests/js/script-tests/destructuring-assignment.js        2014-08-10 20:12:01 UTC (rev 172381)
</span><span class="lines">@@ -50,6 +50,11 @@
</span><span class="cx"> Object.prototype.__defineGetter__(1, function(){ var r = text; text = &quot;fail&quot;; return r; })
</span><span class="cx"> shouldBe(&quot;testDeconstructArgs('2')&quot;, &quot;'23'&quot;);
</span><span class="cx"> 
</span><ins>+var [a,b] = [1,2], [c,d] = [3,4]
</ins><span class="cx"> 
</span><ins>+shouldBe(&quot;a&quot;, &quot;1&quot;)
+shouldBe(&quot;b&quot;, &quot;2&quot;)
+shouldBe(&quot;c&quot;, &quot;3&quot;)
+shouldBe(&quot;d&quot;, &quot;4&quot;)
</ins><span class="cx"> 
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (172380 => 172381)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog        2014-08-10 20:07:34 UTC (rev 172380)
+++ trunk/Source/JavaScriptCore/ChangeLog        2014-08-10 20:12:01 UTC (rev 172381)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-08-10  Oliver Hunt  &lt;oliver@apple.com&gt;
+
+        Destructuring assignment in a var declaration list incorrectly consumes subsequent variable initialisers
+        https://bugs.webkit.org/show_bug.cgi?id=135773
+
+        Reviewed by Michael Saboff.
+
+        We should be using parseAssignment expression in order to get the correct
+        precedence.
+
+        * parser/Parser.cpp:
+        (JSC::Parser&lt;LexerType&gt;::parseVarDeclarationList):
+
</ins><span class="cx"> 2014-08-10  Diego Pino Garcia  &lt;dpino@igalia.com&gt;
</span><span class="cx"> 
</span><span class="cx">         JSC Lexer is allowing octals 08 and 09 in strict mode functions
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/Parser.cpp (172380 => 172381)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/Parser.cpp        2014-08-10 20:07:34 UTC (rev 172380)
+++ trunk/Source/JavaScriptCore/parser/Parser.cpp        2014-08-10 20:12:01 UTC (rev 172381)
</span><span class="lines">@@ -484,7 +484,7 @@
</span><span class="cx">             lastPattern = pattern;
</span><span class="cx">             if (hasInitializer) {
</span><span class="cx">                 next(TreeBuilder::DontBuildStrings); // consume '='
</span><del>-                TreeExpression rhs = parseExpression(context);
</del><ins>+                TreeExpression rhs = parseAssignmentExpression(context);
</ins><span class="cx">                 node = context.createDeconstructingAssignment(location, pattern, rhs);
</span><span class="cx">                 lastInitializer = rhs;
</span><span class="cx">             }
</span></span></pre>
</div>
</div>

</body>
</html>