<!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>[204438] 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/204438">204438</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2016-08-12 19:02:04 -0700 (Fri, 12 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add a helper class for enumerating elements in an iterable object
https://bugs.webkit.org/show_bug.cgi?id=160800
Reviewed by Benjamin Poulain.
Added iteratorForIterable which provides an abstraction for iterating over an iterable object,
and deployed it in the constructors of Set, WeakSet, Map, and WeakMap.
Also added a helper function iteratorForIterable, which retrieves the iterator out of an iterable object.
* runtime/IteratorOperations.cpp:
(JSC::iteratorForIterable): Added.
* runtime/IteratorOperations.h:
(JSC::forEachInIterable): Added.
* runtime/MapConstructor.cpp:
(JSC::constructMap):
* runtime/SetConstructor.cpp:
(JSC::constructSet):
* runtime/WeakMapConstructor.cpp:
(JSC::constructWeakMap):
* runtime/WeakSetConstructor.cpp:
(JSC::constructWeakSet):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeIteratorOperationscpp">trunk/Source/JavaScriptCore/runtime/IteratorOperations.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeIteratorOperationsh">trunk/Source/JavaScriptCore/runtime/IteratorOperations.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeMapConstructorcpp">trunk/Source/JavaScriptCore/runtime/MapConstructor.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeSetConstructorcpp">trunk/Source/JavaScriptCore/runtime/SetConstructor.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeWeakMapConstructorcpp">trunk/Source/JavaScriptCore/runtime/WeakMapConstructor.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeWeakSetConstructorcpp">trunk/Source/JavaScriptCore/runtime/WeakSetConstructor.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (204437 => 204438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-08-13 00:56:48 UTC (rev 204437)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-08-13 02:02:04 UTC (rev 204438)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2016-08-12 Ryosuke Niwa <rniwa@webkit.org>
+
+ Add a helper class for enumerating elements in an iterable object
+ https://bugs.webkit.org/show_bug.cgi?id=160800
+
+ Reviewed by Benjamin Poulain.
+
+ Added iteratorForIterable which provides an abstraction for iterating over an iterable object,
+ and deployed it in the constructors of Set, WeakSet, Map, and WeakMap.
+
+ Also added a helper function iteratorForIterable, which retrieves the iterator out of an iterable object.
+
+ * runtime/IteratorOperations.cpp:
+ (JSC::iteratorForIterable): Added.
+ * runtime/IteratorOperations.h:
+ (JSC::forEachInIterable): Added.
+ * runtime/MapConstructor.cpp:
+ (JSC::constructMap):
+ * runtime/SetConstructor.cpp:
+ (JSC::constructSet):
+ * runtime/WeakMapConstructor.cpp:
+ (JSC::constructWeakMap):
+ * runtime/WeakSetConstructor.cpp:
+ (JSC::constructWeakSet):
+
</ins><span class="cx"> 2016-08-12 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove unused includes of RefCountedLeakCounter.h
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeIteratorOperationscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/IteratorOperations.cpp (204437 => 204438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/IteratorOperations.cpp 2016-08-13 00:56:48 UTC (rev 204437)
+++ trunk/Source/JavaScriptCore/runtime/IteratorOperations.cpp 2016-08-13 02:02:04 UTC (rev 204438)
</span><span class="lines">@@ -153,4 +153,30 @@
</span><span class="cx"> return resultObject;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+JSValue iteratorForIterable(ExecState* state, JSValue iterable)
+{
+ JSValue iteratorFunction = iterable.get(state, state->propertyNames().iteratorSymbol);
+ if (state->hadException())
+ return JSValue();
+
+ CallData iteratorFunctionCallData;
+ CallType iteratorFunctionCallType = getCallData(iteratorFunction, iteratorFunctionCallData);
+ if (iteratorFunctionCallType == CallType::None) {
+ throwTypeError(state);
+ return JSValue();
+ }
+
+ ArgList iteratorFunctionArguments;
+ JSValue iterator = call(state, iteratorFunction, iteratorFunctionCallType, iteratorFunctionCallData, iterable, iteratorFunctionArguments);
+ if (state->hadException())
+ return JSValue();
+
+ if (!iterator.isObject()) {
+ throwTypeError(state);
+ return JSValue();
+ }
+
+ return iterator;
+}
+
</ins><span class="cx"> } // namespace JSC
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeIteratorOperationsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/IteratorOperations.h (204437 => 204438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/IteratorOperations.h 2016-08-13 00:56:48 UTC (rev 204437)
+++ trunk/Source/JavaScriptCore/runtime/IteratorOperations.h 2016-08-13 02:02:04 UTC (rev 204438)
</span><span class="lines">@@ -41,6 +41,32 @@
</span><span class="cx">
</span><span class="cx"> Structure* createIteratorResultObjectStructure(VM&, JSGlobalObject&);
</span><span class="cx">
</span><ins>+JSValue iteratorForIterable(ExecState*, JSValue iterable);
+
+template <typename CallBackType>
+void forEachInIterable(ExecState* state, JSValue iterable, const CallBackType& callback)
+{
+ auto& vm = state->vm();
+ JSValue iterator = iteratorForIterable(state, iterable);
+ if (vm.exception())
+ return;
+ while (true) {
+ JSValue next = iteratorStep(state, iterator);
+ if (next.isFalse() || vm.exception())
+ return;
+
+ JSValue nextValue = iteratorValue(state, next);
+ if (vm.exception())
+ return;
+
+ callback(vm, state, nextValue);
+ if (vm.exception()) {
+ iteratorClose(state, iterator);
+ return;
+ }
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+}
+
</ins><span class="cx"> #endif // !defined(IteratorOperations_h)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeMapConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/MapConstructor.cpp (204437 => 204438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/MapConstructor.cpp 2016-08-13 00:56:48 UTC (rev 204437)
+++ trunk/Source/JavaScriptCore/runtime/MapConstructor.cpp 2016-08-13 02:02:04 UTC (rev 204438)
</span><span class="lines">@@ -73,63 +73,26 @@
</span><span class="cx"> if (adderFunctionCallType == CallType::None)
</span><span class="cx"> return JSValue::encode(throwTypeError(exec));
</span><span class="cx">
</span><del>- JSValue iteratorFunction = iterable.get(exec, exec->propertyNames().iteratorSymbol);
- if (exec->hadException())
- return JSValue::encode(jsUndefined());
-
- CallData iteratorFunctionCallData;
- CallType iteratorFunctionCallType = getCallData(iteratorFunction, iteratorFunctionCallData);
- if (iteratorFunctionCallType == CallType::None)
- return JSValue::encode(throwTypeError(exec));
-
- ArgList iteratorFunctionArguments;
- JSValue iterator = call(exec, iteratorFunction, iteratorFunctionCallType, iteratorFunctionCallData, iterable, iteratorFunctionArguments);
- if (exec->hadException())
- return JSValue::encode(jsUndefined());
-
- if (!iterator.isObject())
- return JSValue::encode(throwTypeError(exec));
-
- while (true) {
- JSValue next = iteratorStep(exec, iterator);
- if (exec->hadException())
- return JSValue::encode(jsUndefined());
-
- if (next.isFalse())
- return JSValue::encode(map);
-
- JSValue nextItem = iteratorValue(exec, next);
- if (exec->hadException())
- return JSValue::encode(jsUndefined());
-
</del><ins>+ forEachInIterable(exec, iterable, [&](VM& vm, ExecState* exec, JSValue nextItem) {
</ins><span class="cx"> if (!nextItem.isObject()) {
</span><span class="cx"> throwTypeError(exec);
</span><del>- iteratorClose(exec, iterator);
- return JSValue::encode(jsUndefined());
</del><ins>+ return;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSValue key = nextItem.get(exec, static_cast<unsigned>(0));
</span><del>- if (exec->hadException()) {
- iteratorClose(exec, iterator);
- return JSValue::encode(jsUndefined());
- }
</del><ins>+ if (vm.exception())
+ return;
</ins><span class="cx">
</span><span class="cx"> JSValue value = nextItem.get(exec, static_cast<unsigned>(1));
</span><del>- if (exec->hadException()) {
- iteratorClose(exec, iterator);
- return JSValue::encode(jsUndefined());
- }
</del><ins>+ if (vm.exception())
+ return;
</ins><span class="cx">
</span><span class="cx"> MarkedArgumentBuffer arguments;
</span><span class="cx"> arguments.append(key);
</span><span class="cx"> arguments.append(value);
</span><span class="cx"> call(exec, adderFunction, adderFunctionCallType, adderFunctionCallData, map, arguments);
</span><del>- if (exec->hadException()) {
- iteratorClose(exec, iterator);
- return JSValue::encode(jsUndefined());
- }
- }
- RELEASE_ASSERT_NOT_REACHED();
</del><ins>+ });
+
</ins><span class="cx"> return JSValue::encode(map);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeSetConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/SetConstructor.cpp (204437 => 204438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/SetConstructor.cpp 2016-08-13 00:56:48 UTC (rev 204437)
+++ trunk/Source/JavaScriptCore/runtime/SetConstructor.cpp 2016-08-13 02:02:04 UTC (rev 204438)
</span><span class="lines">@@ -74,44 +74,12 @@
</span><span class="cx"> if (adderFunctionCallType == CallType::None)
</span><span class="cx"> return JSValue::encode(throwTypeError(exec));
</span><span class="cx">
</span><del>- JSValue iteratorFunction = iterable.get(exec, exec->propertyNames().iteratorSymbol);
- if (exec->hadException())
- return JSValue::encode(jsUndefined());
-
- CallData iteratorFunctionCallData;
- CallType iteratorFunctionCallType = getCallData(iteratorFunction, iteratorFunctionCallData);
- if (iteratorFunctionCallType == CallType::None)
- return JSValue::encode(throwTypeError(exec));
-
- ArgList iteratorFunctionArguments;
- JSValue iterator = call(exec, iteratorFunction, iteratorFunctionCallType, iteratorFunctionCallData, iterable, iteratorFunctionArguments);
- if (exec->hadException())
- return JSValue::encode(jsUndefined());
-
- if (!iterator.isObject())
- return JSValue::encode(throwTypeError(exec));
-
- while (true) {
- JSValue next = iteratorStep(exec, iterator);
- if (exec->hadException())
- return JSValue::encode(jsUndefined());
-
- if (next.isFalse())
- return JSValue::encode(set);
-
- JSValue nextValue = iteratorValue(exec, next);
- if (exec->hadException())
- return JSValue::encode(jsUndefined());
-
</del><ins>+ forEachInIterable(exec, iterable, [&](VM&, ExecState* exec, JSValue nextValue) {
</ins><span class="cx"> MarkedArgumentBuffer arguments;
</span><span class="cx"> arguments.append(nextValue);
</span><span class="cx"> call(exec, adderFunction, adderFunctionCallType, adderFunctionCallData, set, arguments);
</span><del>- if (exec->hadException()) {
- iteratorClose(exec, iterator);
- return JSValue::encode(jsUndefined());
- }
- }
- RELEASE_ASSERT_NOT_REACHED();
</del><ins>+ });
+
</ins><span class="cx"> return JSValue::encode(set);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeWeakMapConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/WeakMapConstructor.cpp (204437 => 204438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/WeakMapConstructor.cpp 2016-08-13 00:56:48 UTC (rev 204437)
+++ trunk/Source/JavaScriptCore/runtime/WeakMapConstructor.cpp 2016-08-13 02:02:04 UTC (rev 204438)
</span><span class="lines">@@ -71,63 +71,26 @@
</span><span class="cx"> if (adderFunctionCallType == CallType::None)
</span><span class="cx"> return JSValue::encode(throwTypeError(exec));
</span><span class="cx">
</span><del>- JSValue iteratorFunction = iterable.get(exec, exec->propertyNames().iteratorSymbol);
- if (exec->hadException())
- return JSValue::encode(jsUndefined());
-
- CallData iteratorFunctionCallData;
- CallType iteratorFunctionCallType = getCallData(iteratorFunction, iteratorFunctionCallData);
- if (iteratorFunctionCallType == CallType::None)
- return JSValue::encode(throwTypeError(exec));
-
- ArgList iteratorFunctionArguments;
- JSValue iterator = call(exec, iteratorFunction, iteratorFunctionCallType, iteratorFunctionCallData, iterable, iteratorFunctionArguments);
- if (exec->hadException())
- return JSValue::encode(jsUndefined());
-
- if (!iterator.isObject())
- return JSValue::encode(throwTypeError(exec));
-
- while (true) {
- JSValue next = iteratorStep(exec, iterator);
- if (exec->hadException())
- return JSValue::encode(jsUndefined());
-
- if (next.isFalse())
- return JSValue::encode(weakMap);
-
- JSValue nextItem = iteratorValue(exec, next);
- if (exec->hadException())
- return JSValue::encode(jsUndefined());
-
</del><ins>+ forEachInIterable(exec, iterable, [&](VM& vm, ExecState* exec, JSValue nextItem) {
</ins><span class="cx"> if (!nextItem.isObject()) {
</span><span class="cx"> throwTypeError(exec);
</span><del>- iteratorClose(exec, iterator);
- return JSValue::encode(jsUndefined());
</del><ins>+ return;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSValue key = nextItem.get(exec, static_cast<unsigned>(0));
</span><del>- if (exec->hadException()) {
- iteratorClose(exec, iterator);
- return JSValue::encode(jsUndefined());
- }
</del><ins>+ if (vm.exception())
+ return;
</ins><span class="cx">
</span><span class="cx"> JSValue value = nextItem.get(exec, static_cast<unsigned>(1));
</span><del>- if (exec->hadException()) {
- iteratorClose(exec, iterator);
- return JSValue::encode(jsUndefined());
- }
</del><ins>+ if (vm.exception())
+ return;
</ins><span class="cx">
</span><span class="cx"> MarkedArgumentBuffer arguments;
</span><span class="cx"> arguments.append(key);
</span><span class="cx"> arguments.append(value);
</span><span class="cx"> call(exec, adderFunction, adderFunctionCallType, adderFunctionCallData, weakMap, arguments);
</span><del>- if (exec->hadException()) {
- iteratorClose(exec, iterator);
- return JSValue::encode(jsUndefined());
- }
- }
- RELEASE_ASSERT_NOT_REACHED();
</del><ins>+ });
+
</ins><span class="cx"> return JSValue::encode(weakMap);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeWeakSetConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/WeakSetConstructor.cpp (204437 => 204438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/WeakSetConstructor.cpp 2016-08-13 00:56:48 UTC (rev 204437)
+++ trunk/Source/JavaScriptCore/runtime/WeakSetConstructor.cpp 2016-08-13 02:02:04 UTC (rev 204438)
</span><span class="lines">@@ -71,44 +71,12 @@
</span><span class="cx"> if (adderFunctionCallType == CallType::None)
</span><span class="cx"> return JSValue::encode(throwTypeError(exec));
</span><span class="cx">
</span><del>- JSValue iteratorFunction = iterable.get(exec, exec->propertyNames().iteratorSymbol);
- if (exec->hadException())
- return JSValue::encode(jsUndefined());
-
- CallData iteratorFunctionCallData;
- CallType iteratorFunctionCallType = getCallData(iteratorFunction, iteratorFunctionCallData);
- if (iteratorFunctionCallType == CallType::None)
- return JSValue::encode(throwTypeError(exec));
-
- ArgList iteratorFunctionArguments;
- JSValue iterator = call(exec, iteratorFunction, iteratorFunctionCallType, iteratorFunctionCallData, iterable, iteratorFunctionArguments);
- if (exec->hadException())
- return JSValue::encode(jsUndefined());
-
- if (!iterator.isObject())
- return JSValue::encode(throwTypeError(exec));
-
- while (true) {
- JSValue next = iteratorStep(exec, iterator);
- if (exec->hadException())
- return JSValue::encode(jsUndefined());
-
- if (next.isFalse())
- return JSValue::encode(weakSet);
-
- JSValue nextValue = iteratorValue(exec, next);
- if (exec->hadException())
- return JSValue::encode(jsUndefined());
-
</del><ins>+ forEachInIterable(exec, iterable, [&](VM&, ExecState* exec, JSValue nextValue) {
</ins><span class="cx"> MarkedArgumentBuffer arguments;
</span><span class="cx"> arguments.append(nextValue);
</span><span class="cx"> call(exec, adderFunction, adderFunctionCallType, adderFunctionCallData, weakSet, arguments);
</span><del>- if (exec->hadException()) {
- iteratorClose(exec, iterator);
- return JSValue::encode(jsUndefined());
- }
- }
- RELEASE_ASSERT_NOT_REACHED();
</del><ins>+ });
+
</ins><span class="cx"> return JSValue::encode(weakSet);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>