<!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>[184942] 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/184942">184942</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-05-27 22:47:11 -0700 (Wed, 27 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Array.of should work with other constructors
https://bugs.webkit.org/show_bug.cgi?id=145365
Source/JavaScriptCore:
Per https://people.mozilla.org/~jorendorff/es6-draft.html#sec-array.of
step 4
Patch by Jordan Harband <ljharb@gmail.com> on 2015-05-27
Reviewed by Yusuke Suzuki.
* builtins/ArrayConstructor.js:
(of):
* runtime/ArrayConstructor.cpp:
(JSC::arrayConstructorOf): Deleted.
LayoutTests:
Patch by Jordan Harband <ljharb@gmail.com> on 2015-05-27
Reviewed by Yusuke Suzuki.
* js/array-of-expected.txt:
* js/script-tests/array-of.js:
(Foo):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsjsarrayofexpectedtxt">trunk/LayoutTests/js/array-of-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsscripttestsarrayofjs">trunk/LayoutTests/js/script-tests/array-of.js</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorebuiltinsArrayConstructorjs">trunk/Source/JavaScriptCore/builtins/ArrayConstructor.js</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeArrayConstructorcpp">trunk/Source/JavaScriptCore/runtime/ArrayConstructor.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (184941 => 184942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-05-28 04:52:25 UTC (rev 184941)
+++ trunk/LayoutTests/ChangeLog 2015-05-28 05:47:11 UTC (rev 184942)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-05-27 Jordan Harband <ljharb@gmail.com>
+
+ Array.of should work with other constructors
+ https://bugs.webkit.org/show_bug.cgi?id=145365
+
+ Reviewed by Yusuke Suzuki.
+
+ * js/array-of-expected.txt:
+ * js/script-tests/array-of.js:
+ (Foo):
+
</ins><span class="cx"> 2015-05-27 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> [JSC] Add undefined->double conversion to DoubleRep
</span></span></pre></div>
<a id="trunkLayoutTestsjsarrayofexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/array-of-expected.txt (184941 => 184942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/array-of-expected.txt 2015-05-28 04:52:25 UTC (rev 184941)
+++ trunk/LayoutTests/js/array-of-expected.txt 2015-05-28 05:47:11 UTC (rev 184942)
</span><span class="lines">@@ -3,6 +3,8 @@
</span><span class="cx"> On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
</span><span class="cx">
</span><span class="cx">
</span><ins>+PASS Array.of.length is 0
+PASS Array.of.name is 'of'
</ins><span class="cx"> PASS Array.of(1) is [1]
</span><span class="cx"> PASS Array.of(1, 2) is [1, 2]
</span><span class="cx"> PASS Array.of(1, 2, 3) is [1, 2, 3]
</span><span class="lines">@@ -15,6 +17,9 @@
</span><span class="cx"> PASS x[1].length is 5
</span><span class="cx"> Check that a setter isn't called.
</span><span class="cx"> PASS Array.of(1, 2, 3) did not throw exception.
</span><ins>+PASS Array.of.call(Foo, 'a', 'b', 'c') instanceof Foo is true
+PASS Array.of.call(Foo, 'a', 'b', 'c').givenLength is 3
+PASS var foo = Array.of.call(Foo, 'a', 'b', 'c'); [foo.length, foo[0], foo[1], foo[2]] is [3, 'a', 'b', 'c']
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsjsscripttestsarrayofjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/script-tests/array-of.js (184941 => 184942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/script-tests/array-of.js 2015-05-28 04:52:25 UTC (rev 184941)
+++ trunk/LayoutTests/js/script-tests/array-of.js 2015-05-28 05:47:11 UTC (rev 184942)
</span><span class="lines">@@ -1,5 +1,8 @@
</span><span class="cx"> description("Tests for Array.of");
</span><span class="cx">
</span><ins>+shouldBe("Array.of.length", "0");
+shouldBe("Array.of.name", "'of'");
+
</ins><span class="cx"> shouldBe("Array.of(1)", "[1]");
</span><span class="cx"> shouldBe("Array.of(1, 2)", "[1, 2]");
</span><span class="cx"> shouldBe("Array.of(1, 2, 3)", "[1, 2, 3]");
</span><span class="lines">@@ -22,3 +25,7 @@
</span><span class="cx">
</span><span class="cx"> shouldNotThrow("Array.of(1, 2, 3)");
</span><span class="cx">
</span><ins>+var Foo = function FooBar(length) { this.givenLength = length; };
+shouldBeTrue("Array.of.call(Foo, 'a', 'b', 'c') instanceof Foo")
+shouldBe("Array.of.call(Foo, 'a', 'b', 'c').givenLength", "3");
+shouldBe("var foo = Array.of.call(Foo, 'a', 'b', 'c'); [foo.length, foo[0], foo[1], foo[2]]", "[3, 'a', 'b', 'c']");
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (184941 => 184942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-05-28 04:52:25 UTC (rev 184941)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-05-28 05:47:11 UTC (rev 184942)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-05-27 Jordan Harband <ljharb@gmail.com>
+
+ Array.of should work with other constructors
+ https://bugs.webkit.org/show_bug.cgi?id=145365
+ Per https://people.mozilla.org/~jorendorff/es6-draft.html#sec-array.of
+ step 4
+
+ Reviewed by Yusuke Suzuki.
+
+ * builtins/ArrayConstructor.js:
+ (of):
+ * runtime/ArrayConstructor.cpp:
+ (JSC::arrayConstructorOf): Deleted.
+
</ins><span class="cx"> 2015-05-27 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> [JSC] Add undefined->double conversion to DoubleRep
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebuiltinsArrayConstructorjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/builtins/ArrayConstructor.js (184941 => 184942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/builtins/ArrayConstructor.js 2015-05-28 04:52:25 UTC (rev 184941)
+++ trunk/Source/JavaScriptCore/builtins/ArrayConstructor.js 2015-05-28 05:47:11 UTC (rev 184942)
</span><span class="lines">@@ -23,6 +23,19 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><ins>+function of(/* items... */)
+{
+ "use strict";
+
+ var length = arguments.length;
+ // TODO: Need isConstructor(this) instead of typeof "function" check.
+ var array = typeof this === 'function' ? new this(length) : new @Array(length);
+ for (var k = 0; k < length; ++k)
+ @putByValDirect(array, k, arguments[k]);
+ array.length = length;
+ return array;
+}
+
</ins><span class="cx"> function from(items /*, mapFn, thisArg */) {
</span><span class="cx"> "use strict";
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeArrayConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ArrayConstructor.cpp (184941 => 184942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ArrayConstructor.cpp 2015-05-28 04:52:25 UTC (rev 184941)
+++ trunk/Source/JavaScriptCore/runtime/ArrayConstructor.cpp 2015-05-28 05:47:11 UTC (rev 184942)
</span><span class="lines">@@ -37,7 +37,6 @@
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><span class="cx"> static EncodedJSValue JSC_HOST_CALL arrayConstructorIsArray(ExecState*);
</span><del>-static EncodedJSValue JSC_HOST_CALL arrayConstructorOf(ExecState*);
</del><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -129,17 +128,4 @@
</span><span class="cx"> return JSValue::encode(jsBoolean(exec->argument(0).inherits(JSArray::info())));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-EncodedJSValue JSC_HOST_CALL arrayConstructorOf(ExecState* exec)
-{
- ArgList args(exec);
- size_t length = args.size();
-
- JSArray* result = constructEmptyArray(exec, nullptr, length);
-
- for (unsigned i = 0; i < length; i++)
- result->putDirectIndex(exec, i, args.at(i));
-
- return JSValue::encode(result);
-}
-
</del><span class="cx"> } // namespace JSC
</span></span></pre>
</div>
</div>
</body>
</html>