Merge pull request #30 from tc39/do-not-capture-per-loop-values

Author: acutmore

spec.emu

@@ -92,40 +92,48 @@ contributors: Alexander J. Vincent, Ashley Claymore, Chris de Almeida, Jordan Ha
                 1. Append *undefined* to _values_.
                 1. Let _nextPromise_ be ? Call(_promiseResolve_, _constructor_, « _value_ »).
                 1. Let _alreadyCalled_ be the Record { [[Value]]: *false* }.
-                1. Let _onFulfilled_ be a new Abstract Closure with parameters (_x_) that captures _variant_, _alreadyCalled_, _index_, _keys_, _values_, _resultCapability_, and _remainingElementsCount_ and performs the following steps when called:
-                  1. If _alreadyCalled_.[[Value]] is *true*, return *undefined*.
-                  1. Set _alreadyCalled_.[[Value]] to *true*.
+                1. Let _onFulfilledSteps_ be a new Abstract Closure with parameters (_x_) that captures _variant_, _keys_, _values_, _resultCapability_, and _remainingElementsCount_ and performs the following steps when called:
+                  1. Let _F_ be the active function object.
+                  1. If _F_.[[AlreadyCalled]].[[Value]] is *true*, return *undefined*.
+                  1. Set _F_.[[AlreadyCalled]].[[Value]] to *true*.
+                  1. Let _thisIndex_ be _F_.[[Index]].
                   1. If _variant_ is ~all~, then
-                    1. Set _values_[_index_] to _x_.
+                    1. Set _values_[_thisIndex_] to _x_.
                   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"*, _x_).
-                    1. Set _values_[_index_] to _obj_.
+                    1. Set _values_[_thisIndex_] to _obj_.
                   1. Set _remainingElementsCount_.[[Value]] to _remainingElementsCount_.[[Value]] - 1.
                   1. If _remainingElementsCount_.[[Value]] = 0, then
                     1. Let _result_ be CreateKeyedPromiseCombinatorResultObject(_keys_, _values_).
                     1. Return ? Call(_resultCapability_.[[Resolve]], *undefined*, « _result_ »).
                   1. Return *undefined*.
-                1. Set _onFulfilled_.[[Length]] to 1.
+                1. Let _onFulfilled_ be CreateBuiltinFunction(_onFulfilledSteps_, 1, *""*, « [[AlreadyCalled]], [[Index]] »).
+                1. Set _onFulfilled_.[[AlreadyCalled]] to _alreadyCalled_.
+                1. Set _onFulfilled_.[[Index]] to _index_.
                 1. If _variant_ is ~all~, then
                   1. Let _onRejected_ be _resultCapability_.[[Reject]].
                 1. Else,
                   1. Assert: _variant_ is ~all-settled~.
-                  1. Let _onRejected_ be a new Abstract Closure with parameters (_x_) that captures _alreadyCalled_, _index_, _keys_, _values_, _resultCapability_, and _remainingElementsCount_ and performs the following steps when called:
-                    1. If _alreadyCalled_.[[Value]] is *true*, return *undefined*.
-                    1. Set _alreadyCalled_.[[Value]] to *true*.
+                  1. Let _onRejectedSteps_ be a new Abstract Closure with parameters (_x_) that captures _keys_, _values_, _resultCapability_, and _remainingElementsCount_ and performs the following steps when called:
+                    1. Let _F_ be the active function object.
+                    1. If _F_.[[AlreadyCalled]].[[Value]] is *true*, return *undefined*.
+                    1. Set _F_.[[AlreadyCalled]].[[Value]] to *true*.
+                    1. Let _thisIndex_ be _F_.[[Index]].
                     1. Let _obj_ be OrdinaryObjectCreate(%Object.prototype%).
                     1. Perform ! CreateDataPropertyOrThrow(_obj_, *"status"*, *"rejected"*).
                     1. Perform ! CreateDataPropertyOrThrow(_obj_, *"reason"*, _x_).
-                    1. Set _values_[_index_] to _obj_.
+                    1. Set _values_[_thisIndex_] to _obj_.
                     1. Set _remainingElementsCount_.[[Value]] to _remainingElementsCount_.[[Value]] - 1.
                     1. If _remainingElementsCount_.[[Value]] = 0, then
                       1. Let _result_ be CreateKeyedPromiseCombinatorResultObject(_keys_, _values_).
                       1. Return ? Call(_resultCapability_.[[Resolve]], *undefined*, « _result_ »).
                     1. Return *undefined*.
-                  1. Set _onRejected_.[[Length]] to 1.
+                  1. Let _onRejected_ be CreateBuiltinFunction(_onRejectedSteps_, 1, *""*, « [[AlreadyCalled]], [[Index]] »).
+                  1. Set _onRejected_.[[AlreadyCalled]] to _alreadyCalled_.
+                  1. Set _onRejected_.[[Index]] to _index_.
                 1. Set _remainingElementsCount_.[[Value]] to _remainingElementsCount_.[[Value]] + 1.
                 1. Perform ? Invoke(_nextPromise_, *"then"*, « _onFulfilled_, _onRejected_ »).
                 1. Set _index_ to _index_ + 1.