Skip to content

Commit 0439a01

Browse files
committed
add _
1 parent 1ff75a2 commit 0439a01

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2840,7 +2840,7 @@ <h1><span class="secnum">1.8</span> CalendarDateMergeFields ( <var>calendar</var
28402840
<emu-note><span class="note">Note</span><div class="note-contents">
28412841
For example, if <var>fields</var> contains <emu-val>"year"</emu-val> but <var>additionalFields</var> contains <emu-val>"era"</emu-val> and <emu-val>"eraYear"</emu-val>, then the returned list must not include <emu-val>"year"</emu-val> in order to avoid ambiguity or conflict between different ways of specifying the year.
28422842
</div></emu-note>
2843-
<emu-alg><ol><li>Let <var>handleEra</var> be <emu-xref aoid="IsCalendarSupportEra" id="_ref_10"><a href="#sec-temporal-iscalendarsupportera">IsCalendarSupportEra</a></emu-xref>(_calendar).</li><li>Let <var>merged</var> be <emu-xref aoid="OrdinaryObjectCreate"><a href="https://tc39.es/ecma262/#sec-ordinaryobjectcreate">OrdinaryObjectCreate</a></emu-xref>(<emu-xref href="#sec-properties-of-the-object-prototype-object"><a href="https://tc39.es/ecma262/#sec-properties-of-the-object-prototype-object">%Object.prototype%</a></emu-xref>).</li><li>Let <var>fieldsKeys</var> be ?&nbsp;<emu-xref aoid="EnumerableOwnPropertyNames"><a href="https://tc39.es/ecma262/#sec-enumerableownpropertynames">EnumerableOwnPropertyNames</a></emu-xref>(<var>fields</var>, <emu-const>key</emu-const>).</li><li>For each element <var>key</var> of <var>fieldsKeys</var>, do<ol><li>If <var>key</var> is not <emu-val>"month"</emu-val> or <emu-val>"monthCode"</emu-val>, then<ol><li>If <var>handlEra</var> is <emu-val>false</emu-val> or <var>key</var> is not <emu-val>"era"</emu-val>, <emu-val>"eraYear"</emu-val> or <emu-val>"year"</emu-val>, then<ol><li>Let <var>propValue</var> be ?&nbsp;<emu-xref aoid="Get"><a href="https://tc39.es/ecma262/#sec-get-o-p">Get</a></emu-xref>(<var>fields</var>, <var>key</var>).</li><li>If <var>propValue</var> is not <emu-val>undefined</emu-val>, then<ol><li>Perform !&nbsp;<emu-xref aoid="CreateDataPropertyOrThrow"><a href="https://tc39.es/ecma262/#sec-createdatapropertyorthrow">CreateDataPropertyOrThrow</a></emu-xref>(<var>merged</var>, <var>key</var>, <var>propValue</var>).</li></ol></li></ol></li></ol></li></ol></li><li>Let <var>additionalFieldsKeys</var> be ?&nbsp;<emu-xref aoid="EnumerableOwnPropertyNames"><a href="https://tc39.es/ecma262/#sec-enumerableownpropertynames">EnumerableOwnPropertyNames</a></emu-xref>(<var>additionalFields</var>, <emu-const>key</emu-const>).</li><li>For each element <var>key</var> of <var>additionalFieldsKeys</var>, do<ol><li>Let <var>propValue</var> be ?&nbsp;<emu-xref aoid="Get"><a href="https://tc39.es/ecma262/#sec-get-o-p">Get</a></emu-xref>(<var>additionalFields</var>, <var>key</var>).</li><li>If <var>propValue</var> is not <emu-val>undefined</emu-val>, then<ol><li>Perform !&nbsp;<emu-xref aoid="CreateDataPropertyOrThrow"><a href="https://tc39.es/ecma262/#sec-createdatapropertyorthrow">CreateDataPropertyOrThrow</a></emu-xref>(<var>merged</var>, <var>key</var>, <var>propValue</var>).</li></ol></li></ol></li><li>If <var>additionalFieldsKeys</var> does not contain either <emu-val>"month"</emu-val> or <emu-val>"monthCode"</emu-val>, then<ol><li>Let <var>month</var> be ?&nbsp;<emu-xref aoid="Get"><a href="https://tc39.es/ecma262/#sec-get-o-p">Get</a></emu-xref>(<var>fields</var>, <emu-val>"month"</emu-val>).</li><li>If <var>month</var> is not <emu-val>undefined</emu-val>, then<ol><li>Perform !&nbsp;<emu-xref aoid="CreateDataPropertyOrThrow"><a href="https://tc39.es/ecma262/#sec-createdatapropertyorthrow">CreateDataPropertyOrThrow</a></emu-xref>(<var>merged</var>, <emu-val>"month"</emu-val>, <var>month</var>).</li></ol></li><li>Let <var>monthCode</var> be ?&nbsp;<emu-xref aoid="Get"><a href="https://tc39.es/ecma262/#sec-get-o-p">Get</a></emu-xref>(<var>fields</var>, <emu-val>"monthCode"</emu-val>).</li><li>If <var>monthCode</var> is not <emu-val>undefined</emu-val>, then<ol><li>Perform !&nbsp;<emu-xref aoid="CreateDataPropertyOrThrow"><a href="https://tc39.es/ecma262/#sec-createdatapropertyorthrow">CreateDataPropertyOrThrow</a></emu-xref>(<var>merged</var>, <emu-val>"monthCode"</emu-val>, <var>monthCode</var>).</li></ol></li></ol></li><li>If <var>handleEra</var> is <emu-val>true</emu-val>, then<ol><li>If <var>additionalFieldsKeys</var> does not contain <emu-val>"era"</emu-val>, <emu-val>"eraYear"</emu-val>, or <emu-val>"year"</emu-val>, then<ol><li>Let <var>year</var> be ?&nbsp;<emu-xref aoid="Get"><a href="https://tc39.es/ecma262/#sec-get-o-p">Get</a></emu-xref>(<var>fields</var>, <emu-val>"year"</emu-val>).</li><li>If <var>year</var> is not <emu-val>undefined</emu-val>, then<ol><li>Perform !&nbsp;<emu-xref aoid="CreateDataPropertyOrThrow"><a href="https://tc39.es/ecma262/#sec-createdatapropertyorthrow">CreateDataPropertyOrThrow</a></emu-xref>(<var>merged</var>, <emu-val>"year"</emu-val>, <var>year</var>).</li></ol></li></ol></li></ol></li><li>Return <var>merged</var>.</li></ol></emu-alg>
2843+
<emu-alg><ol><li>Let <var>handleEra</var> be <emu-xref aoid="IsCalendarSupportEra" id="_ref_10"><a href="#sec-temporal-iscalendarsupportera">IsCalendarSupportEra</a></emu-xref>(<var>calendar</var>).</li><li>Let <var>merged</var> be <emu-xref aoid="OrdinaryObjectCreate"><a href="https://tc39.es/ecma262/#sec-ordinaryobjectcreate">OrdinaryObjectCreate</a></emu-xref>(<emu-xref href="#sec-properties-of-the-object-prototype-object"><a href="https://tc39.es/ecma262/#sec-properties-of-the-object-prototype-object">%Object.prototype%</a></emu-xref>).</li><li>Let <var>fieldsKeys</var> be ?&nbsp;<emu-xref aoid="EnumerableOwnPropertyNames"><a href="https://tc39.es/ecma262/#sec-enumerableownpropertynames">EnumerableOwnPropertyNames</a></emu-xref>(<var>fields</var>, <emu-const>key</emu-const>).</li><li>For each element <var>key</var> of <var>fieldsKeys</var>, do<ol><li>If <var>key</var> is not <emu-val>"month"</emu-val> or <emu-val>"monthCode"</emu-val>, then<ol><li>If <var>handlEra</var> is <emu-val>false</emu-val> or <var>key</var> is not <emu-val>"era"</emu-val>, <emu-val>"eraYear"</emu-val> or <emu-val>"year"</emu-val>, then<ol><li>Let <var>propValue</var> be ?&nbsp;<emu-xref aoid="Get"><a href="https://tc39.es/ecma262/#sec-get-o-p">Get</a></emu-xref>(<var>fields</var>, <var>key</var>).</li><li>If <var>propValue</var> is not <emu-val>undefined</emu-val>, then<ol><li>Perform !&nbsp;<emu-xref aoid="CreateDataPropertyOrThrow"><a href="https://tc39.es/ecma262/#sec-createdatapropertyorthrow">CreateDataPropertyOrThrow</a></emu-xref>(<var>merged</var>, <var>key</var>, <var>propValue</var>).</li></ol></li></ol></li></ol></li></ol></li><li>Let <var>additionalFieldsKeys</var> be ?&nbsp;<emu-xref aoid="EnumerableOwnPropertyNames"><a href="https://tc39.es/ecma262/#sec-enumerableownpropertynames">EnumerableOwnPropertyNames</a></emu-xref>(<var>additionalFields</var>, <emu-const>key</emu-const>).</li><li>For each element <var>key</var> of <var>additionalFieldsKeys</var>, do<ol><li>Let <var>propValue</var> be ?&nbsp;<emu-xref aoid="Get"><a href="https://tc39.es/ecma262/#sec-get-o-p">Get</a></emu-xref>(<var>additionalFields</var>, <var>key</var>).</li><li>If <var>propValue</var> is not <emu-val>undefined</emu-val>, then<ol><li>Perform !&nbsp;<emu-xref aoid="CreateDataPropertyOrThrow"><a href="https://tc39.es/ecma262/#sec-createdatapropertyorthrow">CreateDataPropertyOrThrow</a></emu-xref>(<var>merged</var>, <var>key</var>, <var>propValue</var>).</li></ol></li></ol></li><li>If <var>additionalFieldsKeys</var> does not contain either <emu-val>"month"</emu-val> or <emu-val>"monthCode"</emu-val>, then<ol><li>Let <var>month</var> be ?&nbsp;<emu-xref aoid="Get"><a href="https://tc39.es/ecma262/#sec-get-o-p">Get</a></emu-xref>(<var>fields</var>, <emu-val>"month"</emu-val>).</li><li>If <var>month</var> is not <emu-val>undefined</emu-val>, then<ol><li>Perform !&nbsp;<emu-xref aoid="CreateDataPropertyOrThrow"><a href="https://tc39.es/ecma262/#sec-createdatapropertyorthrow">CreateDataPropertyOrThrow</a></emu-xref>(<var>merged</var>, <emu-val>"month"</emu-val>, <var>month</var>).</li></ol></li><li>Let <var>monthCode</var> be ?&nbsp;<emu-xref aoid="Get"><a href="https://tc39.es/ecma262/#sec-get-o-p">Get</a></emu-xref>(<var>fields</var>, <emu-val>"monthCode"</emu-val>).</li><li>If <var>monthCode</var> is not <emu-val>undefined</emu-val>, then<ol><li>Perform !&nbsp;<emu-xref aoid="CreateDataPropertyOrThrow"><a href="https://tc39.es/ecma262/#sec-createdatapropertyorthrow">CreateDataPropertyOrThrow</a></emu-xref>(<var>merged</var>, <emu-val>"monthCode"</emu-val>, <var>monthCode</var>).</li></ol></li></ol></li><li>If <var>handleEra</var> is <emu-val>true</emu-val>, then<ol><li>If <var>additionalFieldsKeys</var> does not contain <emu-val>"era"</emu-val>, <emu-val>"eraYear"</emu-val>, or <emu-val>"year"</emu-val>, then<ol><li>Let <var>year</var> be ?&nbsp;<emu-xref aoid="Get"><a href="https://tc39.es/ecma262/#sec-get-o-p">Get</a></emu-xref>(<var>fields</var>, <emu-val>"year"</emu-val>).</li><li>If <var>year</var> is not <emu-val>undefined</emu-val>, then<ol><li>Perform !&nbsp;<emu-xref aoid="CreateDataPropertyOrThrow"><a href="https://tc39.es/ecma262/#sec-createdatapropertyorthrow">CreateDataPropertyOrThrow</a></emu-xref>(<var>merged</var>, <emu-val>"year"</emu-val>, <var>year</var>).</li></ol></li></ol></li></ol></li><li>Return <var>merged</var>.</li></ol></emu-alg>
28442844
</emu-clause>
28452845
</emu-clause><emu-annex id="sec-copyright-and-software-license">
28462846
<h1><span class="secnum">A</span> Copyright &amp; Software License</h1>

spec.emu

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@ contributors: Google, Ecma International
432432
For example, if _fields_ contains *"year"* but _additionalFields_ contains *"era"* and *"eraYear"*, then the returned list must not include *"year"* in order to avoid ambiguity or conflict between different ways of specifying the year.
433433
</emu-note>
434434
<emu-alg>
435-
1. Let _handleEra_ be IsCalendarSupportEra(_calendar).
435+
1. Let _handleEra_ be IsCalendarSupportEra(_calendar_).
436436
1. Let _merged_ be OrdinaryObjectCreate(%Object.prototype%).
437437
1. Let _fieldsKeys_ be ? EnumerableOwnPropertyNames(_fields_, ~key~).
438438
1. For each element _key_ of _fieldsKeys_, do

0 commit comments

Comments
 (0)