<!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>[195431] 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/195431">195431</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-01-21 18:05:28 -0800 (Thu, 21 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[INTL] Implement Array.prototype.toLocaleString in ECMA-402
https://bugs.webkit.org/show_bug.cgi?id=147614
Patch by Andy VanWagoner <andy@instructure.com> on 2016-01-21
Reviewed by Benjamin Poulain.
Source/JavaScriptCore:
The primary changes in the ECMA-402 version, and the existing implementation
are passing the arguments on to each element's toLocaleString call, and
missing/undefined/null elements become empty string instead of being skipped.
* runtime/ArrayPrototype.cpp:
(JSC::arrayProtoFuncToLocaleString):
LayoutTests:
* js/array-toLocaleString-expected.txt: Added.
* js/array-toLocaleString.html: Added.
* js/script-tests/array-toLocaleString.js: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeArrayPrototypecpp">trunk/Source/JavaScriptCore/runtime/ArrayPrototype.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsjsarraytoLocaleStringexpectedtxt">trunk/LayoutTests/js/array-toLocaleString-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsarraytoLocaleStringhtml">trunk/LayoutTests/js/array-toLocaleString.html</a></li>
<li><a href="#trunkLayoutTestsjsscripttestsarraytoLocaleStringjs">trunk/LayoutTests/js/script-tests/array-toLocaleString.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (195430 => 195431)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-01-22 02:00:42 UTC (rev 195430)
+++ trunk/LayoutTests/ChangeLog 2016-01-22 02:05:28 UTC (rev 195431)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-01-21 Andy VanWagoner <andy@instructure.com>
+
+ [INTL] Implement Array.prototype.toLocaleString in ECMA-402
+ https://bugs.webkit.org/show_bug.cgi?id=147614
+
+ Reviewed by Benjamin Poulain.
+
+ * js/array-toLocaleString-expected.txt: Added.
+ * js/array-toLocaleString.html: Added.
+ * js/script-tests/array-toLocaleString.js: Added.
+
</ins><span class="cx"> 2016-01-21 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Rebaseline fast/block/float/overhanging-tall-block.html for ios-simulator-wk2
</span></span></pre></div>
<a id="trunkLayoutTestsjsarraytoLocaleStringexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/array-toLocaleString-expected.txt (0 => 195431)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/array-toLocaleString-expected.txt (rev 0)
+++ trunk/LayoutTests/js/array-toLocaleString-expected.txt 2016-01-22 02:05:28 UTC (rev 195431)
</span><span class="lines">@@ -0,0 +1,23 @@
</span><ins>+This test checks the behavior of Array.prototype.toLocaleString as described in the ECMAScript Internationalization API Specification (ECMA-402 2.0).
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS Array.prototype.toLocaleString.length is 0
+PASS Object.getOwnPropertyDescriptor(Array.prototype, 'toLocaleString').enumerable is false
+PASS Object.getOwnPropertyDescriptor(Array.prototype, 'toLocaleString').configurable is true
+PASS Object.getOwnPropertyDescriptor(Array.prototype, 'toLocaleString').writable is true
+PASS Array.prototype.toLocaleString.call() threw exception TypeError: undefined is not an object (evaluating 'Array.prototype.toLocaleString.call()').
+PASS Array.prototype.toLocaleString.call(undefined) threw exception TypeError: undefined is not an object (evaluating 'Array.prototype.toLocaleString.call(undefined)').
+PASS Array.prototype.toLocaleString.call(null) threw exception TypeError: null is not an object (evaluating 'Array.prototype.toLocaleString.call(null)').
+PASS Array.prototype.toLocaleString.call({ length: 5, 0: 'zero', 1: 1, 3: 'three', 5: 'five' }) is "zero,1,,three,"
+PASS [].toLocaleString() is ""
+PASS Array(5).toLocaleString() is ",,,,"
+PASS [ null, null ].toLocaleString() is ","
+PASS [ undefined, undefined ].toLocaleString() is ","
+PASS [ new Date ].toLocaleString('i') threw exception RangeError: invalid language tag: i.
+PASS [ new Date(NaN), new Date(0) ].toLocaleString('zh-Hans-CN-u-nu-hanidec', { timeZone: 'UTC' }) is "Invalid Date,一九七〇/一/一 上午一二:〇〇:〇〇"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsjsarraytoLocaleStringhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/array-toLocaleString.html (0 => 195431)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/array-toLocaleString.html (rev 0)
+++ trunk/LayoutTests/js/array-toLocaleString.html 2016-01-22 02:05:28 UTC (rev 195431)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<meta charset="utf-8">
+<script src="../resources/js-test-pre.js"></script>
+</head>
+<body>
+<script src="script-tests/array-toLocaleString.js"></script>
+<script src="../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsjsscripttestsarraytoLocaleStringjs"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/script-tests/array-toLocaleString.js (0 => 195431)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/script-tests/array-toLocaleString.js (rev 0)
+++ trunk/LayoutTests/js/script-tests/array-toLocaleString.js 2016-01-22 02:05:28 UTC (rev 195431)
</span><span class="lines">@@ -0,0 +1,26 @@
</span><ins>+description("This test checks the behavior of Array.prototype.toLocaleString as described in the ECMAScript Internationalization API Specification (ECMA-402 2.0).");
+
+shouldBe("Array.prototype.toLocaleString.length", "0");
+shouldBeFalse("Object.getOwnPropertyDescriptor(Array.prototype, 'toLocaleString').enumerable");
+shouldBeTrue("Object.getOwnPropertyDescriptor(Array.prototype, 'toLocaleString').configurable");
+shouldBeTrue("Object.getOwnPropertyDescriptor(Array.prototype, 'toLocaleString').writable");
+
+// Test toObject abrupt completion.
+shouldThrow("Array.prototype.toLocaleString.call()", "'TypeError: undefined is not an object (evaluating \\'Array.prototype.toLocaleString.call()\\')'");
+shouldThrow("Array.prototype.toLocaleString.call(undefined)", "'TypeError: undefined is not an object (evaluating \\'Array.prototype.toLocaleString.call(undefined)\\')'");
+shouldThrow("Array.prototype.toLocaleString.call(null)", "'TypeError: null is not an object (evaluating \\'Array.prototype.toLocaleString.call(null)\\')'");
+
+// Test Generic invocation.
+shouldBeEqualToString("Array.prototype.toLocaleString.call({ length: 5, 0: 'zero', 1: 1, 3: 'three', 5: 'five' })", "zero,1,,three,")
+
+// Empty array is always an empty string.
+shouldBeEqualToString("[].toLocaleString()", "");
+
+// Missing still get a separator.
+shouldBeEqualToString("Array(5).toLocaleString()", ",,,,");
+shouldBeEqualToString("[ null, null ].toLocaleString()", ",");
+shouldBeEqualToString("[ undefined, undefined ].toLocaleString()", ",");
+
+// Test that parameters are passed through properly.
+shouldThrow("[ new Date ].toLocaleString('i')");
+shouldBeEqualToString("[ new Date(NaN), new Date(0) ].toLocaleString('zh-Hans-CN-u-nu-hanidec', { timeZone: 'UTC' })", "Invalid Date,一九七〇/一/一 上午一二:〇〇:〇〇");
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (195430 => 195431)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-01-22 02:00:42 UTC (rev 195430)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-01-22 02:05:28 UTC (rev 195431)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-01-21 Andy VanWagoner <andy@instructure.com>
+
+ [INTL] Implement Array.prototype.toLocaleString in ECMA-402
+ https://bugs.webkit.org/show_bug.cgi?id=147614
+
+ Reviewed by Benjamin Poulain.
+
+ The primary changes in the ECMA-402 version, and the existing implementation
+ are passing the arguments on to each element's toLocaleString call, and
+ missing/undefined/null elements become empty string instead of being skipped.
+
+ * runtime/ArrayPrototype.cpp:
+ (JSC::arrayProtoFuncToLocaleString):
+
</ins><span class="cx"> 2016-01-21 Per Arne Vollan <peavo@outlook.com>
</span><span class="cx">
</span><span class="cx"> [B3][Win64] Compile fixes.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeArrayPrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ArrayPrototype.cpp (195430 => 195431)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ArrayPrototype.cpp 2016-01-22 02:00:42 UTC (rev 195430)
+++ trunk/Source/JavaScriptCore/runtime/ArrayPrototype.cpp 2016-01-22 02:05:28 UTC (rev 195431)
</span><span class="lines">@@ -336,11 +336,36 @@
</span><span class="cx"> if (exec->hadException())
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><ins>+#if ENABLE(INTL)
+ ArgList arguments(exec);
</ins><span class="cx"> for (unsigned i = 0; i < length; ++i) {
</span><span class="cx"> JSValue element = thisObject->getIndex(exec, i);
</span><span class="cx"> if (exec->hadException())
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> if (element.isUndefinedOrNull())
</span><ins>+ element = jsEmptyString(exec);
+ else {
+ JSValue conversionFunction = element.get(exec, exec->propertyNames().toLocaleString);
+ if (exec->hadException())
+ return JSValue::encode(jsUndefined());
+ CallData callData;
+ CallType callType = getCallData(conversionFunction, callData);
+ if (callType != CallTypeNone) {
+ element = call(exec, conversionFunction, callType, callData, element, arguments);
+ if (exec->hadException())
+ return JSValue::encode(jsUndefined());
+ }
+ }
+ stringJoiner.append(*exec, element);
+ if (exec->hadException())
+ return JSValue::encode(jsUndefined());
+ }
+#else // !ENABLE(INTL)
+ for (unsigned i = 0; i < length; ++i) {
+ JSValue element = thisObject->getIndex(exec, i);
+ if (exec->hadException())
+ return JSValue::encode(jsUndefined());
+ if (element.isUndefinedOrNull())
</ins><span class="cx"> continue;
</span><span class="cx"> JSValue conversionFunction = element.get(exec, exec->propertyNames().toLocaleString);
</span><span class="cx"> if (exec->hadException())
</span><span class="lines">@@ -356,6 +381,7 @@
</span><span class="cx"> if (exec->hadException())
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><ins>+#endif // !ENABLE(INTL)
</ins><span class="cx">
</span><span class="cx"> return JSValue::encode(stringJoiner.join(*exec));
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>