<!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>[165682] 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/165682">165682</a></dd>
<dt>Author</dt> <dd>oliver@apple.com</dd>
<dt>Date</dt> <dd>2014-03-15 11:48:51 -0700 (Sat, 15 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Reinstate intialiser syntax in for-in loops
https://bugs.webkit.org/show_bug.cgi?id=130269
Reviewed by Michael Saboff.
Source/JavaScriptCore:
Disallowing the initialiser broke some sites so this patch re-allows
the syntax. We still disallow the syntax in 'of' and pattern based
enumeration.
* parser/ASTBuilder.h:
(JSC::ASTBuilder::isBindingNode):
* parser/Parser.cpp:
(JSC::Parser<LexerType>::parseVarDeclarationList):
(JSC::Parser<LexerType>::parseForStatement):
* parser/SyntaxChecker.h:
(JSC::SyntaxChecker::operatorStackPop):
LayoutTests:
Update and add test.
* js/parser-syntax-check-expected.txt:
* js/script-tests/parser-syntax-check.js:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsjsparsersyntaxcheckexpectedtxt">trunk/LayoutTests/js/parser-syntax-check-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsscripttestsparsersyntaxcheckjs">trunk/LayoutTests/js/script-tests/parser-syntax-check.js</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserASTBuilderh">trunk/Source/JavaScriptCore/parser/ASTBuilder.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserParsercpp">trunk/Source/JavaScriptCore/parser/Parser.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserSyntaxCheckerh">trunk/Source/JavaScriptCore/parser/SyntaxChecker.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (165681 => 165682)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-03-15 15:21:06 UTC (rev 165681)
+++ trunk/LayoutTests/ChangeLog 2014-03-15 18:48:51 UTC (rev 165682)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-03-14 Oliver Hunt <oliver@apple.com>
+
+ Reinstate intialiser syntax in for-in loops
+ https://bugs.webkit.org/show_bug.cgi?id=130269
+
+ Reviewed by Michael Saboff.
+
+ Update and add test.
+
+ * js/parser-syntax-check-expected.txt:
+ * js/script-tests/parser-syntax-check.js:
+
</ins><span class="cx"> 2014-03-14 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> Accessing __lookupGetter__ and __lookupSetter__ should not crash the VM when undefined.
</span></span></pre></div>
<a id="trunkLayoutTestsjsparsersyntaxcheckexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/parser-syntax-check-expected.txt (165681 => 165682)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/parser-syntax-check-expected.txt 2014-03-15 15:21:06 UTC (rev 165681)
+++ trunk/LayoutTests/js/parser-syntax-check-expected.txt 2014-03-15 18:48:51 UTC (rev 165682)
</span><span class="lines">@@ -431,8 +431,10 @@
</span><span class="cx"> PASS Valid: "function f() { for ((a ? b : c) in c) break }"
</span><span class="cx"> PASS Valid: "for (var a in b in c) break"
</span><span class="cx"> PASS Valid: "function f() { for (var a in b in c) break }"
</span><del>-PASS Invalid: "for (var a = 5 += 6 in b) break"
-PASS Invalid: "function f() { for (var a = 5 += 6 in b) break }"
</del><ins>+PASS Valid: "for (var a = 5 += 6 in b) break"
+PASS Valid: "function f() { for (var a = 5 += 6 in b) break }"
+PASS Valid: "for (var a = debug('should not be hit') in b) break"
+PASS Valid: "function f() { for (var a = debug('should not be hit') in b) break }"
</ins><span class="cx"> PASS Invalid: "for (var a += 5 in b) break"
</span><span class="cx"> PASS Invalid: "function f() { for (var a += 5 in b) break }"
</span><span class="cx"> PASS Invalid: "for (var a = in b) break"
</span><span class="lines">@@ -443,8 +445,8 @@
</span><span class="cx"> PASS Invalid: "function f() { for (var a = -6, b in b) break }"
</span><span class="cx"> PASS Invalid: "for (var a, b = 8 in b) break"
</span><span class="cx"> PASS Invalid: "function f() { for (var a, b = 8 in b) break }"
</span><del>-PASS Invalid: "for (var a = (b in c) in d) break"
-PASS Invalid: "function f() { for (var a = (b in c) in d) break }"
</del><ins>+PASS Valid: "for (var a = (b in c) in d) break"
+PASS Valid: "function f() { for (var a = (b in c) in d) break }"
</ins><span class="cx"> PASS Invalid: "for (var a = (b in c in d) break"
</span><span class="cx"> PASS Invalid: "function f() { for (var a = (b in c in d) break }"
</span><span class="cx"> PASS Invalid: "for (var (a) in b) { }"
</span></span></pre></div>
<a id="trunkLayoutTestsjsscripttestsparsersyntaxcheckjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/script-tests/parser-syntax-check.js (165681 => 165682)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/script-tests/parser-syntax-check.js 2014-03-15 15:21:06 UTC (rev 165681)
+++ trunk/LayoutTests/js/script-tests/parser-syntax-check.js 2014-03-15 18:48:51 UTC (rev 165682)
</span><span class="lines">@@ -284,13 +284,14 @@
</span><span class="cx"> invalid("for (a ? b : c in c) break");
</span><span class="cx"> valid ("for ((a ? b : c) in c) break");
</span><span class="cx"> valid ("for (var a in b in c) break");
</span><del>-invalid("for (var a = 5 += 6 in b) break");
</del><ins>+valid("for (var a = 5 += 6 in b) break");
+valid("for (var a = debug('should not be hit') in b) break");
</ins><span class="cx"> invalid("for (var a += 5 in b) break");
</span><span class="cx"> invalid("for (var a = in b) break");
</span><span class="cx"> invalid("for (var a, b in b) break");
</span><span class="cx"> invalid("for (var a = -6, b in b) break");
</span><span class="cx"> invalid("for (var a, b = 8 in b) break");
</span><del>-invalid("for (var a = (b in c) in d) break");
</del><ins>+valid("for (var a = (b in c) in d) break");
</ins><span class="cx"> invalid("for (var a = (b in c in d) break");
</span><span class="cx"> invalid("for (var (a) in b) { }");
</span><span class="cx"> valid ("for (var a = 7, b = c < d >= d ; f()[6]++ ; --i()[1]++ ) {}");
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (165681 => 165682)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-03-15 15:21:06 UTC (rev 165681)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-03-15 18:48:51 UTC (rev 165682)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-03-14 Oliver Hunt <oliver@apple.com>
+
+ Reinstate intialiser syntax in for-in loops
+ https://bugs.webkit.org/show_bug.cgi?id=130269
+
+ Reviewed by Michael Saboff.
+
+ Disallowing the initialiser broke some sites so this patch re-allows
+ the syntax. We still disallow the syntax in 'of' and pattern based
+ enumeration.
+
+ * parser/ASTBuilder.h:
+ (JSC::ASTBuilder::isBindingNode):
+ * parser/Parser.cpp:
+ (JSC::Parser<LexerType>::parseVarDeclarationList):
+ (JSC::Parser<LexerType>::parseForStatement):
+ * parser/SyntaxChecker.h:
+ (JSC::SyntaxChecker::operatorStackPop):
+
</ins><span class="cx"> 2014-03-14 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> Accessing __lookupGetter__ and __lookupSetter__ should not crash the VM when undefined.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserASTBuilderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/ASTBuilder.h (165681 => 165682)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/ASTBuilder.h 2014-03-15 15:21:06 UTC (rev 165681)
+++ trunk/Source/JavaScriptCore/parser/ASTBuilder.h 2014-03-15 18:48:51 UTC (rev 165682)
</span><span class="lines">@@ -406,6 +406,11 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ bool isBindingNode(const DeconstructionPattern& pattern)
+ {
+ return pattern->isBindingNode();
+ }
+
</ins><span class="cx"> StatementNode* createEmptyStatement(const JSTokenLocation& location) { return new (m_vm) EmptyStatementNode(location); }
</span><span class="cx">
</span><span class="cx"> StatementNode* createVarStatement(const JSTokenLocation& location, ExpressionNode* expr, int start, int end)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/Parser.cpp (165681 => 165682)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/Parser.cpp 2014-03-15 15:21:06 UTC (rev 165681)
+++ trunk/Source/JavaScriptCore/parser/Parser.cpp 2014-03-15 18:48:51 UTC (rev 165682)
</span><span class="lines">@@ -486,6 +486,7 @@
</span><span class="cx"> next(TreeBuilder::DontBuildStrings); // consume '='
</span><span class="cx"> TreeExpression rhs = parseExpression(context);
</span><span class="cx"> node = context.createDeconstructingAssignment(location, pattern, rhs);
</span><ins>+ lastInitializer = rhs;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -734,18 +735,21 @@
</span><span class="cx"> if (match(SEMICOLON))
</span><span class="cx"> goto standardForLoop;
</span><span class="cx">
</span><del>- failIfFalse(declarations == 1, "must declare variables after 'var'");
- failIfTrue(forInInitializer, "Cannot use initialiser syntax in a for-in loop");
-
</del><ins>+ failIfFalse(declarations == 1, "can only declare a single variable in an enumeration");
+ failIfTrueIfStrict(forInInitializer, "Cannot use initialiser syntax in a strict mode enumeration");
+
+ if (forInInitializer)
+ failIfFalse(context.isBindingNode(forInTarget), "Cannot use initialiser syntax when binding to a pattern during enumeration");
+
</ins><span class="cx"> // Handle for-in with var declaration
</span><span class="cx"> JSTextPosition inLocation = tokenStartPosition();
</span><span class="cx"> bool isOfEnumeration = false;
</span><span class="cx"> if (!consume(INTOKEN)) {
</span><span class="cx"> failIfFalse(match(IDENT) && *m_token.m_data.ident == m_vm->propertyNames->of, "Expected either 'in' or 'of' in enumeration syntax");
</span><span class="cx"> isOfEnumeration = true;
</span><ins>+ failIfTrue(forInInitializer, "Cannot use initialiser syntax in a for-of enumeration");
</ins><span class="cx"> next();
</span><span class="cx"> }
</span><del>-
</del><span class="cx"> TreeExpression expr = parseExpression(context);
</span><span class="cx"> failIfFalse(expr, "Expected expression to enumerate");
</span><span class="cx"> JSTextPosition exprEnd = lastTokenEndPosition();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserSyntaxCheckerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/SyntaxChecker.h (165681 => 165682)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/SyntaxChecker.h 2014-03-15 15:21:06 UTC (rev 165681)
+++ trunk/Source/JavaScriptCore/parser/SyntaxChecker.h 2014-03-15 18:48:51 UTC (rev 165682)
</span><span class="lines">@@ -111,9 +111,10 @@
</span><span class="cx"> typedef int Clause;
</span><span class="cx"> typedef int ConstDeclList;
</span><span class="cx"> typedef int BinaryOperand;
</span><ins>+ enum { BindingDeconstruction = 1, ArrayDeconstruction, ObjectDeconstruction };
</ins><span class="cx"> typedef int DeconstructionPattern;
</span><del>- typedef int ArrayPattern;
- typedef int ObjectPattern;
</del><ins>+ typedef DeconstructionPattern ArrayPattern;
+ typedef DeconstructionPattern ObjectPattern;
</ins><span class="cx">
</span><span class="cx"> static const bool CreatesAST = false;
</span><span class="cx"> static const bool NeedsFreeVariableInfo = false;
</span><span class="lines">@@ -265,7 +266,7 @@
</span><span class="cx">
</span><span class="cx"> ArrayPattern createArrayPattern(const JSTokenLocation&)
</span><span class="cx"> {
</span><del>- return 1;
</del><ins>+ return ArrayDeconstruction;
</ins><span class="cx"> }
</span><span class="cx"> void appendArrayPatternSkipEntry(ArrayPattern, const JSTokenLocation&)
</span><span class="cx"> {
</span><span class="lines">@@ -275,15 +276,21 @@
</span><span class="cx"> }
</span><span class="cx"> ObjectPattern createObjectPattern(const JSTokenLocation&)
</span><span class="cx"> {
</span><del>- return 1;
</del><ins>+ return ObjectDeconstruction;
</ins><span class="cx"> }
</span><span class="cx"> void appendObjectPatternEntry(ArrayPattern, const JSTokenLocation&, bool, const Identifier&, DeconstructionPattern)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> DeconstructionPattern createBindingLocation(const JSTokenLocation&, const Identifier&, const JSTextPosition&, const JSTextPosition&)
</span><span class="cx"> {
</span><del>- return 1;
</del><ins>+ return BindingDeconstruction;
</ins><span class="cx"> }
</span><ins>+
+ bool isBindingNode(DeconstructionPattern pattern)
+ {
+ return pattern == BindingDeconstruction;
+ }
+
</ins><span class="cx"> private:
</span><span class="cx"> int m_topBinaryExpr;
</span><span class="cx"> int m_topUnaryToken;
</span></span></pre>
</div>
</div>
</body>
</html>