<!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>[182118] trunk/Source/JavaScriptCore</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/182118">182118</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-03-28 23:58:26 -0700 (Sat, 28 Mar 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>Clean up JavaScriptCore/builtins
https://bugs.webkit.org/show_bug.cgi?id=143177

Patch by Joseph Pecoraro &lt;pecoraro@apple.com&gt; on 2015-03-28
Reviewed by Ryosuke Niwa.

* builtins/ArrayConstructor.js:
(from):
- We can compare to undefined instead of using a typeof undefined check.
- Converge on double quoted strings everywhere.

* builtins/ArrayIterator.prototype.js:
(next):
* builtins/StringIterator.prototype.js:
(next):
- Use shorthand object construction to avoid duplication.
- Improve grammar in error messages.

* tests/stress/array-iterators-next-with-call.js:
* tests/stress/string-iterators.js:
- Update for new error message strings.</pre>

<h3>Modified Paths</h3>
<ul>
<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="#trunkSourceJavaScriptCorebuiltinsArrayIteratorprototypejs">trunk/Source/JavaScriptCore/builtins/ArrayIterator.prototype.js</a></li>
<li><a href="#trunkSourceJavaScriptCorebuiltinsStringIteratorprototypejs">trunk/Source/JavaScriptCore/builtins/StringIterator.prototype.js</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstressarrayiteratorsnextwithcalljs">trunk/Source/JavaScriptCore/tests/stress/array-iterators-next-with-call.js</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstressstringiteratorsjs">trunk/Source/JavaScriptCore/tests/stress/string-iterators.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (182117 => 182118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog        2015-03-29 02:07:43 UTC (rev 182117)
+++ trunk/Source/JavaScriptCore/ChangeLog        2015-03-29 06:58:26 UTC (rev 182118)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2015-03-28  Joseph Pecoraro  &lt;pecoraro@apple.com&gt;
+
+        Clean up JavaScriptCore/builtins
+        https://bugs.webkit.org/show_bug.cgi?id=143177
+
+        Reviewed by Ryosuke Niwa.
+
+        * builtins/ArrayConstructor.js:
+        (from):
+        - We can compare to undefined instead of using a typeof undefined check.
+        - Converge on double quoted strings everywhere.
+
+        * builtins/ArrayIterator.prototype.js:
+        (next):
+        * builtins/StringIterator.prototype.js:
+        (next):
+        - Use shorthand object construction to avoid duplication.
+        - Improve grammar in error messages.
+
+        * tests/stress/array-iterators-next-with-call.js:
+        * tests/stress/string-iterators.js:
+        - Update for new error message strings.
+
</ins><span class="cx"> 2015-03-28  Saam Barati  &lt;saambarati1@gmail.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Web Inspector: ES6: Better support for Symbol types in Type Profiler
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebuiltinsArrayConstructorjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/builtins/ArrayConstructor.js (182117 => 182118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/builtins/ArrayConstructor.js        2015-03-29 02:07:43 UTC (rev 182117)
+++ trunk/Source/JavaScriptCore/builtins/ArrayConstructor.js        2015-03-29 06:58:26 UTC (rev 182118)
</span><span class="lines">@@ -24,11 +24,10 @@
</span><span class="cx">  */
</span><span class="cx"> 
</span><span class="cx"> function from(arrayLike /*, mapFn, thisArg */) {
</span><del>-
</del><span class="cx">     &quot;use strict&quot;;
</span><span class="cx"> 
</span><span class="cx">     if (arrayLike == null)
</span><del>-         throw new @TypeError(&quot;Array.from requires an array-like object - not null or undefined&quot;);
</del><ins>+        throw new @TypeError(&quot;Array.from requires an array-like object - not null or undefined&quot;);
</ins><span class="cx"> 
</span><span class="cx">     var thisObj = this;
</span><span class="cx"> 
</span><span class="lines">@@ -37,8 +36,8 @@
</span><span class="cx"> 
</span><span class="cx">     var thisArg;
</span><span class="cx"> 
</span><del>-    if (typeof mapFn !== &quot;undefined&quot;) {
-        if (typeof mapFn !== 'function')
</del><ins>+    if (mapFn !== undefined) {
+        if (typeof mapFn !== &quot;function&quot;)
</ins><span class="cx">             throw new @TypeError(&quot;Array.from requires that the second argument, when provided, be a function&quot;);
</span><span class="cx"> 
</span><span class="cx">         if (arguments.length &gt; 2)
</span><span class="lines">@@ -58,7 +57,7 @@
</span><span class="cx">     // originally Math.min(Math.max(length, 0), maxSafeInteger));
</span><span class="cx">     var itemsLength = lengthValue &gt; 0 ? (lengthValue &lt; maxSafeInteger ? lengthValue : maxSafeInteger) : 0;
</span><span class="cx"> 
</span><del>-    var result = (typeof thisObj === 'function') ? @Object(new thisObj(itemsLength)) : new @Array(itemsLength);
</del><ins>+    var result = (typeof thisObj === &quot;function&quot;) ? @Object(new thisObj(itemsLength)) : new @Array(itemsLength);
</ins><span class="cx"> 
</span><span class="cx">     var k = 0;
</span><span class="cx">     while (k &lt; itemsLength) {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebuiltinsArrayIteratorprototypejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/builtins/ArrayIterator.prototype.js (182117 => 182118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/builtins/ArrayIterator.prototype.js        2015-03-29 02:07:43 UTC (rev 182117)
+++ trunk/Source/JavaScriptCore/builtins/ArrayIterator.prototype.js        2015-03-29 06:58:26 UTC (rev 182118)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> 
</span><span class="cx">     var itemKind = this.@arrayIterationKind;
</span><span class="cx">     if (itemKind === undefined)
</span><del>-        throw new @TypeError(&quot;%ArrayIteratorPrototype%.next requires that |this| be Array Iterator Instance&quot;);
</del><ins>+        throw new @TypeError(&quot;%ArrayIteratorPrototype%.next requires that |this| be an Array Iterator instance&quot;);
</ins><span class="cx"> 
</span><span class="cx">     var done = true;
</span><span class="cx">     var value = undefined;
</span><span class="lines">@@ -55,8 +55,5 @@
</span><span class="cx">         }
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    return {
-        done: done,
-        value: value
-    };
</del><ins>+    return {done, value};
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebuiltinsStringIteratorprototypejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/builtins/StringIterator.prototype.js (182117 => 182118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/builtins/StringIterator.prototype.js        2015-03-29 02:07:43 UTC (rev 182117)
+++ trunk/Source/JavaScriptCore/builtins/StringIterator.prototype.js        2015-03-29 06:58:26 UTC (rev 182118)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> 
</span><span class="cx">     var position = this.@stringIteratorNextIndex;
</span><span class="cx">     if (position === undefined)
</span><del>-        throw new @TypeError(&quot;%StringIteratorPrototype%.next requires that |this| be String Iterator Instance&quot;);
</del><ins>+        throw new @TypeError(&quot;%StringIteratorPrototype%.next requires that |this| be a String Iterator instance&quot;);
</ins><span class="cx"> 
</span><span class="cx">     var done = true;
</span><span class="cx">     var value = undefined;
</span><span class="lines">@@ -59,8 +59,5 @@
</span><span class="cx">         }
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    return {
-        done: done,
-        value: value
-    };
</del><ins>+    return {done, value};
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressarrayiteratorsnextwithcalljs"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/tests/stress/array-iterators-next-with-call.js (182117 => 182118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/array-iterators-next-with-call.js        2015-03-29 02:07:43 UTC (rev 182117)
+++ trunk/Source/JavaScriptCore/tests/stress/array-iterators-next-with-call.js        2015-03-29 06:58:26 UTC (rev 182118)
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx">     }
</span><span class="cx">     if (!didThrow)
</span><span class="cx">         throw &quot;Error: no error thrown&quot;;
</span><del>-    var expectedMessage = 'TypeError: %ArrayIteratorPrototype%.next requires that |this| be Array Iterator Instance';
</del><ins>+    var expectedMessage = 'TypeError: %ArrayIteratorPrototype%.next requires that |this| be an Array Iterator instance';
</ins><span class="cx">     if (primitive == null)
</span><span class="cx">         expectedMessage = 'TypeError: %ArrayIteratorPrototype%.next requires that |this| not be null or undefined';
</span><span class="cx">     if (String(didThrow) !== expectedMessage)
</span><span class="lines">@@ -110,6 +110,6 @@
</span><span class="cx">     }
</span><span class="cx">     if (!didThrow)
</span><span class="cx">         throw &quot;Error: no error thrown&quot;;
</span><del>-    if (String(didThrow) !== 'TypeError: %ArrayIteratorPrototype%.next requires that |this| be Array Iterator Instance')
</del><ins>+    if (String(didThrow) !== 'TypeError: %ArrayIteratorPrototype%.next requires that |this| be an Array Iterator instance')
</ins><span class="cx">         throw &quot;Error: bad error thrown: &quot; + didThrow;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressstringiteratorsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/tests/stress/string-iterators.js (182117 => 182118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/string-iterators.js        2015-03-29 02:07:43 UTC (rev 182117)
+++ trunk/Source/JavaScriptCore/tests/stress/string-iterators.js        2015-03-29 06:58:26 UTC (rev 182118)
</span><span class="lines">@@ -180,7 +180,7 @@
</span><span class="cx">     }
</span><span class="cx">     if (!didThrow)
</span><span class="cx">         throw &quot;Error: no error thrown&quot;;
</span><del>-    var message = 'TypeError: %StringIteratorPrototype%.next requires that |this| be String Iterator Instance';
</del><ins>+    var message = 'TypeError: %StringIteratorPrototype%.next requires that |this| be a String Iterator instance';
</ins><span class="cx">     if (primitive == null)
</span><span class="cx">         message = 'TypeError: %StringIteratorPrototype%.next requires that |this| be not null or undefined'
</span><span class="cx">     if (String(didThrow) !== message)
</span><span class="lines">@@ -207,6 +207,6 @@
</span><span class="cx">     }
</span><span class="cx">     if (!didThrow)
</span><span class="cx">         throw &quot;Error: no error thrown&quot;;
</span><del>-    if (String(didThrow) !== 'TypeError: %StringIteratorPrototype%.next requires that |this| be String Iterator Instance')
</del><ins>+    if (String(didThrow) !== 'TypeError: %StringIteratorPrototype%.next requires that |this| be a String Iterator instance')
</ins><span class="cx">         throw &quot;Error: bad error thrown: &quot; + didThrow;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>

</body>
</html>