<!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>[192945] 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/192945">192945</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-12-02 09:27:37 -0800 (Wed, 02 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Handle YieldExpressions in the ScriptSyntaxTree
https://bugs.webkit.org/show_bug.cgi?id=151730
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2015-12-02
Reviewed by Brian Burg.
Source/WebInspectorUI:
* UserInterface/Models/NativeFunctionParameters.js:
Add the Generator API.
* UserInterface/Models/ScriptSyntaxTree.js:
(WebInspector.ScriptSyntaxTree.prototype._recurse):
(WebInspector.ScriptSyntaxTree.prototype._createInternalSyntaxTree):
Handle YieldExpressions.
LayoutTests:
* inspector/model/parse-script-syntax-tree-expected.txt:
* inspector/model/parse-script-syntax-tree.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsinspectormodelparsescriptsyntaxtreeexpectedtxt">trunk/LayoutTests/inspector/model/parse-script-syntax-tree-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectormodelparsescriptsyntaxtreehtml">trunk/LayoutTests/inspector/model/parse-script-syntax-tree.html</a></li>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsNativeFunctionParametersjs">trunk/Source/WebInspectorUI/UserInterface/Models/NativeFunctionParameters.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsScriptSyntaxTreejs">trunk/Source/WebInspectorUI/UserInterface/Models/ScriptSyntaxTree.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (192944 => 192945)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2015-12-02 16:53:12 UTC (rev 192944)
+++ trunk/LayoutTests/ChangeLog        2015-12-02 17:27:37 UTC (rev 192945)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-12-02 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Handle YieldExpressions in the ScriptSyntaxTree
+ https://bugs.webkit.org/show_bug.cgi?id=151730
+
+ Reviewed by Brian Burg.
+
+ * inspector/model/parse-script-syntax-tree-expected.txt:
+ * inspector/model/parse-script-syntax-tree.html:
+
</ins><span class="cx"> 2015-12-01 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Test gardening after r192895
</span></span></pre></div>
<a id="trunkLayoutTestsinspectormodelparsescriptsyntaxtreeexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/model/parse-script-syntax-tree-expected.txt (192944 => 192945)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/model/parse-script-syntax-tree-expected.txt        2015-12-02 16:53:12 UTC (rev 192944)
+++ trunk/LayoutTests/inspector/model/parse-script-syntax-tree-expected.txt        2015-12-02 17:27:37 UTC (rev 192945)
</span><span class="lines">@@ -38,6 +38,7 @@
</span><span class="cx"> passed VariableDeclarator
</span><span class="cx"> passed WhileStatement
</span><span class="cx"> passed WithStatement
</span><ins>+passed YieldExpression
</ins><span class="cx"> passed ClassStatement, Super, MetaProperty
</span><span class="cx"> passed AssignmentPattern
</span><span class="cx"> passed ArrowFunctionExpression
</span></span></pre></div>
<a id="trunkLayoutTestsinspectormodelparsescriptsyntaxtreehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/model/parse-script-syntax-tree.html (192944 => 192945)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/model/parse-script-syntax-tree.html        2015-12-02 16:53:12 UTC (rev 192944)
+++ trunk/LayoutTests/inspector/model/parse-script-syntax-tree.html        2015-12-02 17:27:37 UTC (rev 192945)
</span><span class="lines">@@ -193,6 +193,7 @@
</span><span class="cx"> InspectorTest.assert(node.params[1].type === WebInspector.ScriptSyntaxTree.NodeType.Identifier);
</span><span class="cx"> InspectorTest.assert(node.body);
</span><span class="cx"> InspectorTest.assert(node.body.type === WebInspector.ScriptSyntaxTree.NodeType.BlockStatement);
</span><ins>+ InspectorTest.assert(!node.generator);
</ins><span class="cx"> node = makeNode("x = {get foo(){return 20}}", true);
</span><span class="cx"> InspectorTest.assert(node.right.properties[0].value.type === WebInspector.ScriptSyntaxTree.NodeType.FunctionExpression);
</span><span class="cx"> node = makeNode("x = {set foo(x){return 20}}", true);
</span><span class="lines">@@ -207,6 +208,7 @@
</span><span class="cx"> InspectorTest.assert(node.arguments[0].params[1].type === WebInspector.ScriptSyntaxTree.NodeType.Identifier);
</span><span class="cx"> InspectorTest.assert(node.arguments[0].body);
</span><span class="cx"> InspectorTest.assert(node.arguments[0].body.type === WebInspector.ScriptSyntaxTree.NodeType.BlockStatement);
</span><ins>+ InspectorTest.assert(!node.arguments[0].generator);
</ins><span class="cx"> InspectorTest.log("passed FunctionExpression");
</span><span class="cx">
</span><span class="cx"> node = makeNode("foo;", true);
</span><span class="lines">@@ -443,6 +445,21 @@
</span><span class="cx"> InspectorTest.assert(node.body.type === WebInspector.ScriptSyntaxTree.NodeType.BlockStatement);
</span><span class="cx"> InspectorTest.log("passed WithStatement");
</span><span class="cx">
</span><ins>+ node = makeNode("function* gen() { yield 1; yield* [1,2]; }", false);
+ InspectorTest.assert(node.type === WebInspector.ScriptSyntaxTree.NodeType.FunctionDeclaration);
+ InspectorTest.assert(node.generator);
+ InspectorTest.assert(node.body.type === WebInspector.ScriptSyntaxTree.NodeType.BlockStatement);
+ InspectorTest.assert(node.body.body.length === 2);
+ InspectorTest.assert(node.body.body[0].type === WebInspector.ScriptSyntaxTree.NodeType.ExpressionStatement);
+ InspectorTest.assert(node.body.body[0].expression.type === WebInspector.ScriptSyntaxTree.NodeType.YieldExpression);
+ InspectorTest.assert(!node.body.body[0].expression.delegate);
+ InspectorTest.assert(node.body.body[0].expression.argument.type === WebInspector.ScriptSyntaxTree.NodeType.Literal);
+ InspectorTest.assert(node.body.body[1].type === WebInspector.ScriptSyntaxTree.NodeType.ExpressionStatement);
+ InspectorTest.assert(node.body.body[1].expression.type === WebInspector.ScriptSyntaxTree.NodeType.YieldExpression);
+ InspectorTest.assert(node.body.body[1].expression.delegate);
+ InspectorTest.assert(node.body.body[1].expression.argument.type === WebInspector.ScriptSyntaxTree.NodeType.ArrayExpression);
+ InspectorTest.log("passed YieldExpression");
+
</ins><span class="cx"> node = makeNode("class C { constructor() { super(); new.target; } }", false);
</span><span class="cx"> InspectorTest.assert(node.type === WebInspector.ScriptSyntaxTree.NodeType.ClassDeclaration);
</span><span class="cx"> InspectorTest.assert(node.body.type === WebInspector.ScriptSyntaxTree.NodeType.ClassBody);
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (192944 => 192945)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog        2015-12-02 16:53:12 UTC (rev 192944)
+++ trunk/Source/WebInspectorUI/ChangeLog        2015-12-02 17:27:37 UTC (rev 192945)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-12-02 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Handle YieldExpressions in the ScriptSyntaxTree
+ https://bugs.webkit.org/show_bug.cgi?id=151730
+
+ Reviewed by Brian Burg.
+
+ * UserInterface/Models/NativeFunctionParameters.js:
+ Add the Generator API.
+
+ * UserInterface/Models/ScriptSyntaxTree.js:
+ (WebInspector.ScriptSyntaxTree.prototype._recurse):
+ (WebInspector.ScriptSyntaxTree.prototype._createInternalSyntaxTree):
+ Handle YieldExpressions.
+
</ins><span class="cx"> 2015-12-01 Matt Baker <mattbaker@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: TreeOutline should just dispatch events via WebInspector.Object
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsNativeFunctionParametersjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/NativeFunctionParameters.js (192944 => 192945)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/NativeFunctionParameters.js        2015-12-02 16:53:12 UTC (rev 192944)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/NativeFunctionParameters.js        2015-12-02 17:27:37 UTC (rev 192945)
</span><span class="lines">@@ -345,6 +345,13 @@
</span><span class="cx"> __proto__: null,
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ Generator: {
+ next: "value",
+ return: "value",
+ throw: "exception",
+ __proto__: null,
+ },
+
</ins><span class="cx"> // Curated DOM Interfaces.
</span><span class="cx">
</span><span class="cx"> Element: {
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsScriptSyntaxTreejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/ScriptSyntaxTree.js (192944 => 192945)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/ScriptSyntaxTree.js        2015-12-02 16:53:12 UTC (rev 192944)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/ScriptSyntaxTree.js        2015-12-02 17:27:37 UTC (rev 192945)
</span><span class="lines">@@ -494,6 +494,10 @@
</span><span class="cx"> this._recurse(node.object, callback, state);
</span><span class="cx"> this._recurse(node.body, callback, state);
</span><span class="cx"> break;
</span><ins>+ case WebInspector.ScriptSyntaxTree.NodeType.YieldExpression:
+ callback(node, state);
+ this._recurse(node.argument, callback, state);
+ break;
</ins><span class="cx"> // All the leaf nodes go here.
</span><span class="cx"> case WebInspector.ScriptSyntaxTree.NodeType.DebuggerStatement:
</span><span class="cx"> case WebInspector.ScriptSyntaxTree.NodeType.EmptyStatement:
</span><span class="lines">@@ -546,6 +550,7 @@
</span><span class="cx"> params: node.params.map(this._createInternalSyntaxTree, this),
</span><span class="cx"> defaults: node.defaults.map(this._createInternalSyntaxTree, this),
</span><span class="cx"> body: this._createInternalSyntaxTree(node.body),
</span><ins>+ generator: node.generator,
</ins><span class="cx"> expression: node.expression, // Boolean indicating if the body a single expression or a block statement.
</span><span class="cx"> typeProfilingReturnDivot: node.range[0]
</span><span class="cx"> };
</span><span class="lines">@@ -690,6 +695,7 @@
</span><span class="cx"> params: node.params.map(this._createInternalSyntaxTree, this),
</span><span class="cx"> defaults: node.defaults.map(this._createInternalSyntaxTree, this),
</span><span class="cx"> body: this._createInternalSyntaxTree(node.body),
</span><ins>+ generator: node.generator,
</ins><span class="cx"> typeProfilingReturnDivot: node.range[0]
</span><span class="cx"> };
</span><span class="cx"> break;
</span><span class="lines">@@ -700,6 +706,7 @@
</span><span class="cx"> params: node.params.map(this._createInternalSyntaxTree, this),
</span><span class="cx"> defaults: node.defaults.map(this._createInternalSyntaxTree, this),
</span><span class="cx"> body: this._createInternalSyntaxTree(node.body),
</span><ins>+ generator: node.generator,
</ins><span class="cx"> typeProfilingReturnDivot: node.range[0] // This may be overridden in the Property AST node.
</span><span class="cx"> };
</span><span class="cx"> break;
</span><span class="lines">@@ -924,6 +931,13 @@
</span><span class="cx"> body: this._createInternalSyntaxTree(node.body)
</span><span class="cx"> };
</span><span class="cx"> break;
</span><ins>+ case "YieldExpression":
+ result = {
+ type: WebInspector.ScriptSyntaxTree.NodeType.YieldExpression,
+ argument: this._createInternalSyntaxTree(node.argument),
+ delegate: node.delegate
+ };
+ break;
</ins><span class="cx"> default:
</span><span class="cx"> console.error("Unsupported Syntax Tree Node: " + node.type, node);
</span><span class="cx"> return null;
</span><span class="lines">@@ -999,4 +1013,5 @@
</span><span class="cx"> VariableDeclarator: Symbol("variable-declarator"),
</span><span class="cx"> WhileStatement: Symbol("while-statement"),
</span><span class="cx"> WithStatement: Symbol("with-statement"),
</span><ins>+ YieldExpression: Symbol("yield-expression"),
</ins><span class="cx"> };
</span></span></pre>
</div>
</div>
</body>
</html>