Editorial: Merge keys and values into a single list of records

Author: linusg

spec.emu

@@ -19,18 +19,16 @@ contributors: Alexander J. Vincent, Ashley Claymore, Chris de Almeida, Jordan Ha
         <h1>
           <ins>
             CreateKeyedPromiseCombinatorResultObject (
-              _keys_: a List of property keys,
-              _values_: a List of ECMAScript language values,
+              _entries_: a List of Records with fields [[Key]] (a property key) and [[Value]] (an ECMAScript language value),
             ): an Object
           </ins>
         </h1>
         <dl class="header">
         </dl>
         <emu-alg>
-          1. Assert: The number of elements in _keys_ is the same as the number of elements in _values_.
           1. Let _obj_ be OrdinaryObjectCreate(*null*).
-          1. For each integer _i_ such that 0 ≤ _i_ &lt; the number of elements in _keys_, in ascending order, do
-            1. Perform ! CreateDataPropertyOrThrow(_obj_, _keys_[_i_], _values_[_i_]).
+          1. For each Record { [[Key]], [[Value]] } _entry_ of _entries_, do
+            1. Perform ! CreateDataPropertyOrThrow(_obj_, _entry_.[[Key]], _entry_.[[Value]]).
           1. Return _obj_.
         </emu-alg>
       </emu-clause>
@@ -80,34 +78,32 @@ contributors: Alexander J. Vincent, Ashley Claymore, Chris de Almeida, Jordan Ha
           </dl>
           <emu-alg>
             1. Let _allKeys_ be ? _promises_.[[OwnPropertyKeys]]().
-            1. Let _keys_ be a new empty List.
-            1. Let _values_ be a new empty List.
+            1. Let _entries_ be a new empty List.
             1. Let _remainingElementsCount_ be the Record { [[Value]]: 1 }.
             1. Let _index_ be 0.
             1. For each element _key_ of _allKeys_, do
               1. Let _propertyDesc_ be ? _promises_.[[GetOwnProperty]](_key_).
               1. If _propertyDesc_ is not *undefined* and _propertyDesc_.[[Enumerable]] is *true*, then
                 1. Let _propertyValue_ be ? Get(_promises_, _key_).
-                1. Append _key_ to _keys_.
-                1. Append *undefined* to _values_.
+                1. Append the Record { [[Key]]: _key_, [[Value]]: *undefined* } to _entries_.
                 1. Let _nextPromise_ be ? Call(_promiseResolve_, _ctor_, « _propertyValue_ »).
                 1. Let _alreadyCalled_ be the Record { [[Value]]: *false* }.
-                1. Let _fulfilledSteps_ be a new Abstract Closure with parameters (_value_) that captures _variant_, _keys_, _values_, _resultCapability_, and _remainingElementsCount_ and performs the following steps when called:
+                1. Let _fulfilledSteps_ be a new Abstract Closure with parameters (_value_) that captures _variant_, _entries_, _resultCapability_, and _remainingElementsCount_ and performs the following steps when called:
                   1. Let _activeFunc_ be the active function object.
                   1. If _activeFunc_.[[AlreadyCalled]].[[Value]] is *true*, return *undefined*.
                   1. Set _activeFunc_.[[AlreadyCalled]].[[Value]] to *true*.
                   1. Let _thisIndex_ be _activeFunc_.[[Index]].
                   1. If _variant_ is ~all~, then
-                    1. Set _values_[_thisIndex_] to _value_.
+                    1. Set _entries_[_thisIndex_].[[Value]] to _value_.
                   1. Else,
                     1. Assert: _variant_ is ~all-settled~.
                     1. Let _obj_ be OrdinaryObjectCreate(%Object.prototype%).
                     1. Perform ! CreateDataPropertyOrThrow(_obj_, *"status"*, *"fulfilled"*).
                     1. Perform ! CreateDataPropertyOrThrow(_obj_, *"value"*, _value_).
-                    1. Set _values_[_thisIndex_] to _obj_.
+                    1. Set _entries_[_thisIndex_].[[Value]] to _obj_.
                   1. Set _remainingElementsCount_.[[Value]] to _remainingElementsCount_.[[Value]] - 1.
                   1. If _remainingElementsCount_.[[Value]] = 0, then
-                    1. Let _result_ be CreateKeyedPromiseCombinatorResultObject(_keys_, _values_).
+                    1. Let _result_ be CreateKeyedPromiseCombinatorResultObject(_entries_).
                     1. Return ? Call(_resultCapability_.[[Resolve]], *undefined*, « _result_ »).
                   1. Return *undefined*.
                 1. Let _onFulfilled_ be CreateBuiltinFunction(_fulfilledSteps_, 1, *""*, « [[AlreadyCalled]], [[Index]] »).
@@ -117,18 +113,18 @@ contributors: Alexander J. Vincent, Ashley Claymore, Chris de Almeida, Jordan Ha
                   1. Let _onRejected_ be _resultCapability_.[[Reject]].
                 1. Else,
                   1. Assert: _variant_ is ~all-settled~.
-                  1. Let _rejectedSteps_ be a new Abstract Closure with parameters (_error_) that captures _keys_, _values_, _resultCapability_, and _remainingElementsCount_ and performs the following steps when called:
+                  1. Let _rejectedSteps_ be a new Abstract Closure with parameters (_error_) that captures _entries_, _resultCapability_, and _remainingElementsCount_ and performs the following steps when called:
                     1. Let _activeFunc_ be the active function object.
                     1. If _activeFunc_.[[AlreadyCalled]].[[Value]] is *true*, return *undefined*.
                     1. Set _activeFunc_.[[AlreadyCalled]].[[Value]] to *true*.
                     1. Let _thisIndex_ be _activeFunc_.[[Index]].
                     1. Let _obj_ be OrdinaryObjectCreate(%Object.prototype%).
                     1. Perform ! CreateDataPropertyOrThrow(_obj_, *"status"*, *"rejected"*).
                     1. Perform ! CreateDataPropertyOrThrow(_obj_, *"reason"*, _error_).
-                    1. Set _values_[_thisIndex_] to _obj_.
+                    1. Set _entries_[_thisIndex_].[[Value]] to _obj_.
                     1. Set _remainingElementsCount_.[[Value]] to _remainingElementsCount_.[[Value]] - 1.
                     1. If _remainingElementsCount_.[[Value]] = 0, then
-                      1. Let _result_ be CreateKeyedPromiseCombinatorResultObject(_keys_, _values_).
+                      1. Let _result_ be CreateKeyedPromiseCombinatorResultObject(_entries_).
                       1. Return ? Call(_resultCapability_.[[Resolve]], *undefined*, « _result_ »).
                     1. Return *undefined*.
                   1. Let _onRejected_ be CreateBuiltinFunction(_rejectedSteps_, 1, *""*, « [[AlreadyCalled]], [[Index]] »).
@@ -139,8 +135,8 @@ contributors: Alexander J. Vincent, Ashley Claymore, Chris de Almeida, Jordan Ha
                 1. Set _index_ to _index_ + 1.
             1. Set _remainingElementsCount_.[[Value]] to _remainingElementsCount_.[[Value]] - 1.
             1. If _remainingElementsCount_.[[Value]] = 0, then
-              1. NOTE: This can happen even if _keys_ was non-empty if an ill-behaved thenable synchronously invoked the callback passed to its *"then"* method.
-              1. Let _result_ be CreateKeyedPromiseCombinatorResultObject(_keys_, _values_).
+              1. NOTE: This can happen even if _entries_ is non-empty if an ill-behaved thenable synchronously invoked the callback passed to its *"then"* method.
+              1. Let _result_ be CreateKeyedPromiseCombinatorResultObject(_entries_).
               1. Perform ? Call(_resultCapability_.[[Resolve]], *undefined*, « _result_ »).
             1. Return _resultCapability_.[[Promise]].
           </emu-alg>