Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

remove hint from GetIteratorFlattenable #271

Merged
merged 4 commits into from
Mar 30, 2023
Merged

remove hint from GetIteratorFlattenable #271

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7023abb
remove hint from GetIteratorFlattenable
michaelficarra Mar 30, 2023
28b067f
trailing comma
michaelficarra Mar 30, 2023
7712f24
make it purely editorial
michaelficarra Mar 30, 2023
de977b6
Merge branch 'main' into michaelficarra-patch-1
michaelficarra Mar 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 3 additions & 14 deletions spec.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,32 +130,21 @@ <h1>
<h1>
GetIteratorFlattenable (
_obj_: an ECMAScript language value,
_hint_: ~sync~ or ~async~,
): either a normal completion containing an Iterator Record or a throw completion
</h1>
<dl class="header">
</dl>
<emu-alg>
1. If _obj_ is not an Object, throw a *TypeError* exception.
1. Let _alreadyAsync_ be *false*.
1. Let _method_ be *undefined*.
1. If _hint_ is ~async~, then
1. Set _method_ to ? Get(_obj_, @@asyncIterator).
1. Set _alreadyAsync_ to *true*.
1. If IsCallable(_method_) is *false*, then
1. Set _method_ to ? Get(_obj_, @@iterator).
1. Set _alreadyAsync_ to *false*.
1. Let _method_ be ? Get(_obj_, @@iterator).
1. If IsCallable(_method_) is *false*, then
1. Let _iterator_ be _obj_.
1. Set _alreadyAsync_ to *true*.
1. Else,
1. Let _iterator_ be ? Call(_method_, _obj_).
1. If _iterator_ is not an Object, throw a *TypeError* exception.
1. Let _nextMethod_ be ? Get(_iterator_, *"next"*).
1. If IsCallable(_nextMethod_) is *false*, throw a *TypeError* exception.
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This line diverges from GetIterator but the early failure is IMO better. See related tc39/ecma262#3033.

1. Let _iteratorRecord_ be the Iterator Record { [[Iterator]]: _iterator_, [[NextMethod]]: _nextMethod_, [[Done]]: *false* }.
1. If _hint_ is ~async~ and _alreadyAsync_ is *false*, then
1. Return CreateAsyncFromSyncIterator(_iteratorRecord_).
1. Return _iteratorRecord_.
</emu-alg>
</emu-clause>
Expand Down Expand Up @@ -203,7 +192,7 @@ <h1>Iterator.prototype</h1>
<h1>Iterator.from ( _O_ )</h1>
<emu-alg>
1. If _O_ is a String, set _O_ to ! ToObject(_O_).
1. Let _iteratorRecord_ be ? GetIteratorFlattenable(_O_, ~sync~).
1. Let _iteratorRecord_ be ? GetIteratorFlattenable(_O_).
1. Let _hasInstance_ be ? OrdinaryHasInstance(%Iterator%, _iteratorRecord_.[[Iterator]]).
1. If _hasInstance_ is *true*, then
1. Return _iteratorRecord_.[[Iterator]].
Expand Down Expand Up @@ -414,7 +403,7 @@ <h1>Iterator.prototype.flatMap ( _mapper_ )</h1>
1. Let _value_ be ? IteratorValue(_next_).
1. Let _mapped_ be Completion(Call(_mapper_, *undefined*, « _value_, 𝔽(_counter_) »)).
1. IfAbruptCloseIterator(_mapped_, _iterated_).
1. Let _innerIterator_ be Completion(GetIteratorFlattenable(_mapped_, ~sync~)).
1. Let _innerIterator_ be Completion(GetIteratorFlattenable(_mapped_)).
1. IfAbruptCloseIterator(_innerIterator_, _iterated_).
1. Let _innerAlive_ be *true*.
1. Repeat, while _innerAlive_ is *true*,
Expand Down