<!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>[207241] 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/207241">207241</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2016-10-12 14:01:00 -0700 (Wed, 12 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rename variables in arrayProtoFuncSplice() to match names in the spec.
https://bugs.webkit.org/show_bug.cgi?id=163354
Reviewed by Saam Barati.
This will make it easier to see whether the code matches the spec or not.
Ref: https://tc39.github.io/ecma262/#sec-array.prototype.splice
* runtime/ArrayPrototype.cpp:
(JSC::arrayProtoFuncSplice):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeArrayPrototypecpp">trunk/Source/JavaScriptCore/runtime/ArrayPrototype.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (207240 => 207241)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-10-12 20:53:02 UTC (rev 207240)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-10-12 21:01:00 UTC (rev 207241)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-10-12 Mark Lam <mark.lam@apple.com>
+
+ Rename variables in arrayProtoFuncSplice() to match names in the spec.
+ https://bugs.webkit.org/show_bug.cgi?id=163354
+
+ Reviewed by Saam Barati.
+
+ This will make it easier to see whether the code matches the spec or not.
+ Ref: https://tc39.github.io/ecma262/#sec-array.prototype.splice
+
+ * runtime/ArrayPrototype.cpp:
+ (JSC::arrayProtoFuncSplice):
+
</ins><span class="cx"> 2016-10-12 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> [DOMJIT][JSC] Explore the way to embed nodeType into JSC::JSType in WebCore
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeArrayPrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ArrayPrototype.cpp (207240 => 207241)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ArrayPrototype.cpp 2016-10-12 20:53:02 UTC (rev 207240)
+++ trunk/Source/JavaScriptCore/runtime/ArrayPrototype.cpp 2016-10-12 21:01:00 UTC (rev 207241)
</span><span class="lines">@@ -921,33 +921,33 @@
</span><span class="cx"> return JSValue::encode(result);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- unsigned begin = argumentClampedIndexFromStartOrEnd(exec, 0, length);
</del><ins>+ unsigned actualStart = argumentClampedIndexFromStartOrEnd(exec, 0, length);
</ins><span class="cx">
</span><del>- unsigned deleteCount = length - begin;
</del><ins>+ unsigned actualDeleteCount = length - actualStart;
</ins><span class="cx"> if (exec->argumentCount() > 1) {
</span><del>- double deleteDouble = exec->uncheckedArgument(1).toInteger(exec);
- if (deleteDouble < 0)
- deleteCount = 0;
- else if (deleteDouble > length - begin)
- deleteCount = length - begin;
</del><ins>+ double deleteCount = exec->uncheckedArgument(1).toInteger(exec);
+ if (deleteCount < 0)
+ actualDeleteCount = 0;
+ else if (deleteCount > length - actualStart)
+ actualDeleteCount = length - actualStart;
</ins><span class="cx"> else
</span><del>- deleteCount = static_cast<unsigned>(deleteDouble);
</del><ins>+ actualDeleteCount = static_cast<unsigned>(deleteCount);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- std::pair<SpeciesConstructResult, JSObject*> speciesResult = speciesConstructArray(exec, thisObj, deleteCount);
</del><ins>+ std::pair<SpeciesConstructResult, JSObject*> speciesResult = speciesConstructArray(exec, thisObj, actualDeleteCount);
</ins><span class="cx"> if (speciesResult.first == SpeciesConstructResult::Exception)
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> JSObject* result = nullptr;
</span><span class="cx"> if (speciesResult.first == SpeciesConstructResult::FastPath && isJSArray(thisObj) && length == getLength(exec, thisObj))
</span><del>- result = asArray(thisObj)->fastSlice(*exec, begin, deleteCount);
</del><ins>+ result = asArray(thisObj)->fastSlice(*exec, actualStart, actualDeleteCount);
</ins><span class="cx">
</span><span class="cx"> if (!result) {
</span><span class="cx"> if (speciesResult.first == SpeciesConstructResult::CreatedObject) {
</span><span class="cx"> result = speciesResult.second;
</span><span class="cx">
</span><del>- for (unsigned k = 0; k < deleteCount; ++k) {
- JSValue v = getProperty(exec, thisObj, k + begin);
</del><ins>+ for (unsigned k = 0; k < actualDeleteCount; ++k) {
+ JSValue v = getProperty(exec, thisObj, k + actualStart);
</ins><span class="cx"> RETURN_IF_EXCEPTION(scope, encodedJSValue());
</span><span class="cx"> if (UNLIKELY(!v))
</span><span class="cx"> continue;
</span><span class="lines">@@ -955,12 +955,12 @@
</span><span class="cx"> RETURN_IF_EXCEPTION(scope, encodedJSValue());
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><del>- result = JSArray::tryCreateUninitialized(vm, exec->lexicalGlobalObject()->arrayStructureForIndexingTypeDuringAllocation(ArrayWithUndecided), deleteCount);
</del><ins>+ result = JSArray::tryCreateUninitialized(vm, exec->lexicalGlobalObject()->arrayStructureForIndexingTypeDuringAllocation(ArrayWithUndecided), actualDeleteCount);
</ins><span class="cx"> if (!result)
</span><span class="cx"> return JSValue::encode(throwOutOfMemoryError(exec, scope));
</span><span class="cx">
</span><del>- for (unsigned k = 0; k < deleteCount; ++k) {
- JSValue v = getProperty(exec, thisObj, k + begin);
</del><ins>+ for (unsigned k = 0; k < actualDeleteCount; ++k) {
+ JSValue v = getProperty(exec, thisObj, k + actualStart);
</ins><span class="cx"> RETURN_IF_EXCEPTION(scope, encodedJSValue());
</span><span class="cx"> if (UNLIKELY(!v))
</span><span class="cx"> continue;
</span><span class="lines">@@ -969,21 +969,21 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- unsigned additionalArgs = std::max<int>(exec->argumentCount() - 2, 0);
- if (additionalArgs < deleteCount) {
- shift<JSArray::ShiftCountForSplice>(exec, thisObj, begin, deleteCount, additionalArgs, length);
</del><ins>+ unsigned itemCount = std::max<int>(exec->argumentCount() - 2, 0);
+ if (itemCount < actualDeleteCount) {
+ shift<JSArray::ShiftCountForSplice>(exec, thisObj, actualStart, actualDeleteCount, itemCount, length);
</ins><span class="cx"> RETURN_IF_EXCEPTION(scope, encodedJSValue());
</span><del>- } else if (additionalArgs > deleteCount) {
- unshift<JSArray::ShiftCountForSplice>(exec, thisObj, begin, deleteCount, additionalArgs, length);
</del><ins>+ } else if (itemCount > actualDeleteCount) {
+ unshift<JSArray::ShiftCountForSplice>(exec, thisObj, actualStart, actualDeleteCount, itemCount, length);
</ins><span class="cx"> RETURN_IF_EXCEPTION(scope, encodedJSValue());
</span><span class="cx"> }
</span><del>- for (unsigned k = 0; k < additionalArgs; ++k) {
- thisObj->putByIndexInline(exec, k + begin, exec->uncheckedArgument(k + 2), true);
</del><ins>+ for (unsigned k = 0; k < itemCount; ++k) {
+ thisObj->putByIndexInline(exec, k + actualStart, exec->uncheckedArgument(k + 2), true);
</ins><span class="cx"> RETURN_IF_EXCEPTION(scope, encodedJSValue());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> scope.release();
</span><del>- setLength(exec, vm, thisObj, length - deleteCount + additionalArgs);
</del><ins>+ setLength(exec, vm, thisObj, length - actualDeleteCount + itemCount);
</ins><span class="cx"> return JSValue::encode(result);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>