Skip to content

Commit 88b6c3a

Browse files
Fixes per ACE's review (#8)
1 parent b77f06d commit 88b6c3a

1 file changed

Lines changed: 8 additions & 4 deletions

File tree

spec.emu

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -288,12 +288,12 @@ contributors: Nicolò Ribaudo
288288
1. Let _requests_ be the ModuleRequests of |ModuleItemList|.
289289
1. Let _additionalRequests_ be the ModuleRequests of |ModuleItem|.
290290
1. For each ModuleRequest Record _mr_ of _additionalRequests_, do
291+
1. <del>If _requests_ does not contain a ModuleRequest Record _mr2_ such that ModuleRequestsEqual(_mr_, _mr2_) is *true* and _mr_.[[Phase]] is _mr2_.[[Phase]], then</del>
291292
1. <ins>Let _existingRequest_ be ~empty~.</ins>
292-
1. <ins>For each ModuleRequests Record _mr2_ of _additionalRequests_, do</ins>
293+
1. <ins>For each ModuleRequests Record _mr2_ of _requests_, do</ins>
293294
1. <ins>If ModuleRequestsEqual(_mr_, _mr2_) is *true* and _mr_.[[Phase]] is _mr2_.[[Phase]], then</ins>
294295
1. <ins>Assert: _existingRequest_ is ~empty~.</ins>
295296
1. <ins>Set _existingRequest_ to _mr2_.</ins>
296-
1. <del>If _requests_ does not contain a ModuleRequest Record _mr2_ such that ModuleRequestsEqual(_mr_, _mr2_) is *true* and _mr_.[[Phase]] is _mr2_.[[Phase]], then</del>
297297
1. <ins>If _existingRequest_ is ~empty~, then</ins>
298298
1. Append _mr_ to _requests_.
299299
1. <ins>Else,</ins>
@@ -494,7 +494,7 @@ contributors: Nicolò Ribaudo
494494
ResolveExport(_exportName_ [, _resolveSet_])
495495
</td>
496496
<td>
497-
<p>Return the binding of a name exported by this module. Bindings are represented by a <dfn id="resolvedbinding-record" variants="ResolvedBinding Records">ResolvedBinding Record</dfn>, of the form { [[Module]]: Module Record, [[BindingName]]: String | ~namespace~, <ins>[[DeferredModules]]: List of Module Records</ins> }. If the export is a Module Namespace Object without a direct binding in any module, [[BindingName]] will be set to ~namespace~. <ins>[[DeferredModule]] is the list of modules imported through `export defer` that the binding resolution process needs to go through, which need to be evaluated in order to have access to the resolved binding.</ins> Return *null* if the name cannot be resolved, or ~ambiguous~ if multiple bindings were found.</p>
497+
<p>Return the binding of a name exported by this module. Bindings are represented by a <dfn id="resolvedbinding-record" variants="ResolvedBinding Records">ResolvedBinding Record</dfn>, of the form { [[Module]]: Module Record, [[BindingName]]: String | ~namespace~, <ins>[[DeferredModules]]: List of Module Records</ins> }. If the export is a Module Namespace Object without a direct binding in any module, [[BindingName]] will be set to ~namespace~. <ins>[[DeferredModule]] is the list of modules imported through `export defer` that the binding resolution process needs to go through which need to be evaluated in order to have access to the resolved binding.</ins> Return *null* if the name cannot be resolved, or ~ambiguous~ if multiple bindings were found.</p>
498498
<p>Each time this operation is called with a specific _exportName_, _resolveSet_ pair as arguments it must return the same result.</p>
499499
<p>LoadRequestedModules must have completed successfully prior to invoking this method.</p>
500500
</td>
@@ -1653,7 +1653,11 @@ contributors: Nicolò Ribaudo
16531653

16541654
<emu-alg>
16551655
1. If _a_ is ~all~ or _b_ is ~all~, return ~all~.
1656-
1. Return the list-concatenation of _a_ and _b_.
1656+
1. Let _merged_ be a copy of the List _a_.
1657+
1. For each String _name_ of _b_, do
1658+
1. If _merged_ does not contain _name_, then
1659+
1. Append _name_ to _merged_.
1660+
1. Return _merged_.
16571661
</emu-alg>
16581662
</emu-clause>
16591663

0 commit comments

Comments
 (0)