Merge branch 'master' into 2021-08-cleanup-InitializeDateTimeFormat

Author: leobalter

spec/collator.html

@@ -243,7 +243,7 @@ <h1>CompareStrings ( _collator_, _x_, _y_ )</h1>
         </p>
 
         <p>
-          The actual return values are implementation-defined to permit implementers to encode additional information in the value. The method is required to return *+0*<sub>𝔽</sub> when comparing Strings that are considered canonically equivalent by the Unicode standard.
+          The actual return values are implementation-defined to permit implementers to encode additional information in the value. The method is required to return *+0*<sub>𝔽</sub> when comparing Strings that are considered canonically equivalent by the Unicode Standard.
         </p>
 
         <emu-note>

spec/datetimeformat.html

@@ -73,18 +73,37 @@ <h1>InitializeDateTimeFormat ( _dateTimeFormat_, _locales_, _options_ )</h1>
         1. Set _dateTimeFormat_.[[Locale]] to _r_.[[locale]].
         1. Set _calendar_ to _r_.[[ca]].
         1. Set _dateTimeFormat_.[[Calendar]] to _calendar_.
-        1. Set _dateTimeFormat_.[[HourCycle]] to _r_.[[hc]].
         1. Set _dateTimeFormat_.[[NumberingSystem]] to _r_.[[nu]].
         1. Let _dataLocale_ be _r_.[[dataLocale]].
+        1. Let _dataLocaleData_ be _localeData_.[[&lt;_dataLocale_&gt;]].
+        1. Let _hcDefault_ be _dataLocaleData_.[[hourCycle]].
+        1. If _r_.[[hc]] is *null*, then
+          1. Let _hc_ be _hcDefault_.
+        1. If _hour12_ is *true*, then
+          1. If _hcDefault_ is *"h11"* or *"h23"*, then
+            1. Let _hc_ be *"h11"*.
+          1. Else,
+            1. Let _hc_ be *"h12"*.
+        1. Else if _hour12_ is *false*, then
+          1. If _hcDefault_ is *"h11"* or *"h23"*, then
+            1. Let _hc_ be *"h23"*.
+          1. Else,
+            1. Let _hc_ be *"h24"*.
+        1. Else,
+          1. Let _hc_ be _r_.[[hc]].
+          1. Assert: _hour12_ is *undefined*.
+        1. Set _dateTimeFormat_.[[HourCycle]] to _hc_.
+        1. Let _formatOptions_ be a new Record.
+        1. Set _formatOptions_.[[hourCycle]] to _hc_.
         1. Let _timeZone_ be ? Get(_options_, *"timeZone"*).
         1. If _timeZone_ is *undefined*, then
           1. Set _timeZone_ to ! DefaultTimeZone().
         1. Else,
           1. Set _timeZone_ to ? ToString(_timeZone_).
-          1. If ! IsValidTimeZoneName(_timeZone_) is *false*, throw a *RangeError* exception.
+          1. If the result of ! IsValidTimeZoneName(_timeZone_) is *false*, then
+            1. Throw a *RangeError* exception.
           1. Set _timeZone_ to ! CanonicalizeTimeZoneName(_timeZone_).
         1. Set _dateTimeFormat_.[[TimeZone]] to _timeZone_.
-        1. Let _formatOptions_ be a new Record.
         1. Let _hasExplicitFormatComponents_ be *false*.
         1. For each row of <emu-xref href="#table-datetimeformat-components"></emu-xref>, except the header row, in table order, do
           1. Let _prop_ be the name given in the Property column of the row.
@@ -94,33 +113,16 @@ <h1>InitializeDateTimeFormat ( _dateTimeFormat_, _locales_, _options_ )</h1>
             1. Let _values_ be a List whose elements are the strings given in the Values column of the row.
             1. Let _value_ be ? GetOption(_options_, _prop_, *"string"*, _values_, *undefined*).
           1. Set _formatOptions_.[[&lt;_prop_&gt;]] to _value_.
-          1. If _value_ is not *undefined*, set _hasExplicitFormatComponents_ to *true*.
-        1. Let _dataLocaleData_ be _localeData_.[[&lt;_dataLocale_&gt;]].
-        1. Let _hcDefault_ be _dataLocaleData_.[[hourCycle]].
-        1. Let _hc_ be _dateTimeFormat_.[[HourCycle]].
-        1. If _hc_ is *null*, then
-          1. Set _hc_ to _hcDefault_.
-        1. If _hour12_ is *true*, then
-          1. If _hcDefault_ is *"h11"* or *"h23"*, then
-            1. Set _hc_ to *"h11"*.
-          1. Else,
-            1. Set _hc_ to *"h12"*.
-        1. Else if _hour12_ is *false*, then
-          1. If _hcDefault_ is *"h11"* or *"h23"*, then
-            1. Set _hc_ to *"h23"*.
-          1. Else,
-            1. Set _hc_ to *"h24"*.
-        1. Else,
-          1. Assert: _hour12_ is *undefined*.
-        1. Set _dateTimeFormat_.[[HourCycle]] to _hc_.
-        1. Set _formatOptions_.[[hourCycle]] to _hc_.
+          1. If _value_ is not *undefined*, then
+            1. Set _hasExplicitFormatComponents_ to *true*.
         1. Let _matcher_ be ? GetOption(_options_, *"formatMatcher"*, *"string"*, &laquo; *"basic"*, *"best fit"* &raquo;, *"best fit"*).
         1. Let _dateStyle_ be ? GetOption(_options_, *"dateStyle"*, *"string"*, &laquo; *"full"*, *"long"*, *"medium"*, *"short"* &raquo;, *undefined*).
         1. Set _dateTimeFormat_.[[DateStyle]] to _dateStyle_.
         1. Let _timeStyle_ be ? GetOption(_options_, *"timeStyle"*, *"string"*, &laquo; *"full"*, *"long"*, *"medium"*, *"short"* &raquo;, *undefined*).
         1. Set _dateTimeFormat_.[[TimeStyle]] to _timeStyle_.
         1. If _dateStyle_ is not *undefined* or _timeStyle_ is not *undefined*, then
-          1. If _hasExplicitFormatComponents_ is *true*, throw a *TypeError* exception.
+          1. If _hasExplicitFormatComponents_ is *true*, then
+            1. Throw a *TypeError* exception.
           1. Let _styles_ be _dataLocaleData_.[[styles]].[[&lt;_calendar_&gt;]].
           1. Let _bestFormat_ be DateTimeStyleFormat(_dateStyle_, _timeStyle_, _styles_).
         1. Else,
@@ -760,7 +762,7 @@ <h1>ToDateTimeOptions ( _options_, _required_, _defaults_ )</h1>
 
       <emu-alg>
         1. If _options_ is *undefined*, let _options_ be *null*; otherwise let _options_ be ? ToObject(_options_).
-        1. Let _options_ be OrdinaryObjectCreate(_options_).
+        1. Let _options_ be ! OrdinaryObjectCreate(_options_).
         1. Let _needDefaults_ be *true*.
         1. If _required_ is *"date"* or *"any"*, then
           1. For each property name _prop_ of &laquo; *"weekday"*, *"year"*, *"month"*, *"day"* &raquo;, do
@@ -919,16 +921,16 @@ <h1>FormatDateTimePattern ( _dateTimeFormat_, _patternParts_, _x_, _rangeFormatO
         1. Let _x_ be TimeClip(_x_).
         1. If _x_ is *NaN*, throw a *RangeError* exception.
         1. Let _locale_ be _dateTimeFormat_.[[Locale]].
-        1. Let _nfOptions_ be OrdinaryObjectCreate(*null*).
+        1. Let _nfOptions_ be ! OrdinaryObjectCreate(*null*).
         1. Perform ! CreateDataPropertyOrThrow(_nfOptions_, *"useGrouping"*, *false*).
         1. Let _nf_ be ? Construct(%NumberFormat%, &laquo; _locale_, _nfOptions_ &raquo;).
-        1. Let _nf2Options_ be OrdinaryObjectCreate(*null*).
+        1. Let _nf2Options_ be ! OrdinaryObjectCreate(*null*).
         1. Perform ! CreateDataPropertyOrThrow(_nf2Options_, *"minimumIntegerDigits"*, 2).
         1. Perform ! CreateDataPropertyOrThrow(_nf2Options_, *"useGrouping"*, *false*).
         1. Let _nf2_ be ? Construct(%NumberFormat%, &laquo; _locale_, _nf2Options_ &raquo;).
         1. Let _fractionalSecondDigits_ be _dateTimeFormat_.[[FractionalSecondDigits]].
         1. If _fractionalSecondDigits_ is not *undefined*, then
-          1. Let _nf3Options_ be OrdinaryObjectCreate(*null*).
+          1. Let _nf3Options_ be ! OrdinaryObjectCreate(*null*).
           1. Perform ! CreateDataPropertyOrThrow(_nf3Options_, *"minimumIntegerDigits"*, _fractionalSecondDigits_).
           1. Perform ! CreateDataPropertyOrThrow(_nf3Options_, *"useGrouping"*, *false*).
           1. Let _nf3_ be ? Construct(%NumberFormat%, &laquo; _locale_, _nf3Options_ &raquo;).
@@ -1039,10 +1041,10 @@ <h1>FormatDateTimeToParts ( _dateTimeFormat_, _x_ )</h1>
 
       <emu-alg>
         1. Let _parts_ be ? PartitionDateTimePattern(_dateTimeFormat_, _x_).
-        1. Let _result_ be ArrayCreate(0).
+        1. Let _result_ be ! ArrayCreate(0).
         1. Let _n_ be 0.
         1. For each Record { [[Type]], [[Value]] } _part_ in _parts_, do
-          1. Let _O_ be OrdinaryObjectCreate(%Object.prototype%).
+          1. Let _O_ be ! OrdinaryObjectCreate(%Object.prototype%).
           1. Perform ! CreateDataPropertyOrThrow(_O_, *"type"*, _part_.[[Type]]).
           1. Perform ! CreateDataPropertyOrThrow(_O_, *"value"*, _part_.[[Value]]).
           1. Perform ! CreateDataProperty(_result_, ! ToString(_n_), _O_).
@@ -1152,10 +1154,10 @@ <h1>FormatDateTimeRangeToParts ( _dateTimeFormat_, _x_, _y_ )</h1>
 
       <emu-alg>
         1. Let _parts_ be ? PartitionDateTimeRangePattern(_dateTimeFormat_, _x_, _y_).
-        1. Let _result_ be ArrayCreate(0).
+        1. Let _result_ be ! ArrayCreate(0).
         1. Let _n_ be 0.
         1. For each Record { [[Type]], [[Value]], [[Source]] } _part_ in _parts_, do
-          1. Let _O_ be OrdinaryObjectCreate(%ObjectPrototype%).
+          1. Let _O_ be ! OrdinaryObjectCreate(%Object.prototype%).
           1. Perform ! CreateDataPropertyOrThrow(_O_, *"type"*, _part_.[[Type]]).
           1. Perform ! CreateDataPropertyOrThrow(_O_, *"value"*, _part_.[[Value]]).
           1. Perform ! CreateDataPropertyOrThrow(_O_, *"source"*, _part_.[[Source]]).

spec/displaynames.html

@@ -248,33 +248,32 @@ <h1>Abstract Operations for DisplayNames Objects</h1>
     <emu-clause id="sec-canonicalcodefordisplaynames" aoid="CanonicalCodeForDisplayNames">
       <h1>CanonicalCodeForDisplayNames ( _type_, _code_ )</h1>
       <p>
-        The CanonicalCodeForDisplayNames abstract operation is called with arguments _type_ and _code_. It verifies that the _code_ argument represents a well-formed code according to the _type_ argument and returns the case-regularized form of the _code_. The algorithm refers to <a href="https://www.unicode.org/reports/tr35/#Identifiers">UTS 35's Unicode Language and Locale Identifiers grammar</a>. The following steps are taken:
+        The CanonicalCodeForDisplayNames abstract operation takes arguments _type_ (a String) and _code_ (a String). It verifies that the _code_ argument represents a well-formed code according to the _type_ argument and returns the case-regularized form of the _code_. The algorithm refers to <a href="https://www.unicode.org/reports/tr35/#Identifiers">UTS 35's Unicode Language and Locale Identifiers grammar</a>. The following steps are taken:
       </p>
       <emu-alg>
         1. If _type_ is *"language"*, then
           1. If _code_ does not match the `unicode_language_id` production, throw a *RangeError* exception.
-          1. If IsStructurallyValidLanguageTag(_code_) is *false*, throw a *RangeError* exception.
-          1. Set _code_ to CanonicalizeUnicodeLocaleId(_code_).
-          1. Return _code_.
+          1. If ! IsStructurallyValidLanguageTag(_code_) is *false*, throw a *RangeError* exception.
+          1. Return ! CanonicalizeUnicodeLocaleId(_code_).
         1. If _type_ is *"region"*, then
           1. If _code_ does not match the `unicode_region_subtag` production, throw a *RangeError* exception.
-          1. Let _code_ be the result of mapping _code_ to upper case as described in <emu-xref href="#sec-case-sensitivity-and-case-mapping"></emu-xref>.
-          1. Return _code_.
+          1. Return the ASCII-uppercase of _code_.
         1. If _type_ is *"script"*, then
           1. If _code_ does not match the `unicode_script_subtag` production, throw a *RangeError* exception.
-          1. Let _code_ be the result of mapping the first character in _code_ to upper case, and mapping the second, third, and fourth character in _code_ to lower case, as described in <emu-xref href="#sec-case-sensitivity-and-case-mapping"></emu-xref>.
-          1. Return _code_.
+          1. Assert: The length of _code_ is 4, and every code unit of _code_ represents an ASCII letter (0x0041 through 0x005A and 0x0061 through 0x007A, both inclusive).
+          1. Let _first_ be the ASCII-uppercase of the substring of _code_ from 0 to 1.
+          1. Let _rest_ be the ASCII-lowercase of the substring of _code_ from 1.
+          1. Return the string-concatenation of _first_ and _rest_.
         1. If _type_ is *"calendar"*, then
           1. If _code_ does not match the Unicode Locale Identifier `type` nonterminal, throw a *RangeError* exception.
-          1. Let _code_ be the result of mapping _code_ to lower case as described in <emu-xref href="#sec-case-sensitivity-and-case-mapping"></emu-xref>.
-          1. Return _code_.
+          1. If _code_ uses any of the backwards compatibility syntax described in <a href="https://unicode.org/reports/tr35/#BCP_47_Conformance">Unicode Technical Standard #35 LDML § 3.3 BCP 47 Conformance</a>, throw a *RangeError* exception.
+          1. Return the ASCII-lowercase of _code_.
         1. If _type_ is *"dateTimeField"*, then
           1. If the result of IsValidDateTimeFieldCode(_code_) is *false*, throw a *RangeError* exception.
           1. Return _code_.
         1. Assert: _type_ is *"currency"*.
         1. If ! IsWellFormedCurrencyCode(_code_) is *false*, throw a *RangeError* exception.
-        1. Let _code_ be the result of mapping _code_ to upper case as described in <emu-xref href="#sec-case-sensitivity-and-case-mapping"></emu-xref>.
-        1. Return _code_.
+        1. Return the ASCII-uppercase of _code_.
       </emu-alg>
     </emu-clause>
 

spec/intl.html

@@ -114,7 +114,7 @@ <h1>Intl.getCanonicalLocales ( _locales_ )</h1>
 
       <emu-alg>
         1. Let _ll_ be ? CanonicalizeLocaleList(_locales_).
-        1. Return CreateArrayFromList(_ll_).
+        1. Return ! CreateArrayFromList(_ll_).
       </emu-alg>
     </emu-clause>
   </emu-clause>

spec/listformat.html

@@ -142,7 +142,7 @@ <h1>Intl.ListFormat.prototype.format ( _list_ )</h1>
         1. Let _lf_ be the *this* value.
         1. Perform ? RequireInternalSlot(_lf_, [[InitializedListFormat]]).
         1. Let _stringList_ be ? StringListFromIterable(_list_).
-        1. Return FormatList(_lf_, _stringList_).
+        1. Return ! FormatList(_lf_, _stringList_).
       </emu-alg>
     </emu-clause>
 
@@ -157,7 +157,7 @@ <h1>Intl.ListFormat.prototype.formatToParts ( _list_ )</h1>
         1. Let _lf_ be the *this* value.
         1. Perform ? RequireInternalSlot(_lf_, [[InitializedListFormat]]).
         1. Let _stringList_ be ? StringListFromIterable(_list_).
-        1. Return FormatListToParts(_lf_, _stringList_).
+        1. Return ! FormatListToParts(_lf_, _stringList_).
       </emu-alg>
     </emu-clause>
 
@@ -259,7 +259,7 @@ <h1>DeconstructPattern ( _pattern_, _placeables_ )</h1>
         &raquo;
       </pre>
       <emu-alg>
-        1. Let _patternParts_ be PartitionPattern(_pattern_).
+        1. Let _patternParts_ be ! PartitionPattern(_pattern_).
         1. Let _result_ be a new empty List.
         1. For each Record { [[Type]], [[Value]] } _patternPart_ of _patternParts_, do
           1. Let _part_ be _patternPart_.[[Type]].
@@ -296,7 +296,7 @@ <h1>CreatePartsFromList ( _listFormat_, _list_ )</h1>
           1. Let _first_ be a new Record { [[Type]]: *"element"*, [[Value]]: _list_[0] }.
           1. Let _second_ be a new Record { [[Type]]: *"element"*, [[Value]]: _list_[1] }.
           1. Let _placeables_ be a new Record { [[0]]: _first_, [[1]]: _second_ }.
-          1. Return DeconstructPattern(_pattern_, _placeables_).
+          1. Return ! DeconstructPattern(_pattern_, _placeables_).
         1. Let _last_ be a new Record { [[Type]]: *"element"*, [[Value]]: _list_[_size_ - 1] }.
         1. Let _parts_ be &laquo; _last_ &raquo;.
         1. Let _i_ be _size_ - 2.
@@ -310,7 +310,7 @@ <h1>CreatePartsFromList ( _listFormat_, _list_ )</h1>
           1. Else,
             1. Let _pattern_ be _listFormat_.[[Templates]][_n_].[[End]].
           1. Let _placeables_ be a new Record { [[0]]: _head_, [[1]]: _parts_ }.
-          1. Set _parts_ to DeconstructPattern(_pattern_, _placeables_).
+          1. Set _parts_ to ! DeconstructPattern(_pattern_, _placeables_).
           1. Decrement _i_ by 1.
         1. Return _parts_.
       </emu-alg>
@@ -328,7 +328,7 @@ <h1>FormatList ( _listFormat_, _list_ )</h1>
       </p>
 
       <emu-alg>
-        1. Let _parts_ be CreatePartsFromList(_listFormat_, _list_).
+        1. Let _parts_ be ! CreatePartsFromList(_listFormat_, _list_).
         1. Let _result_ be an empty String.
         1. For each Record { [[Type]], [[Value]] } _part_ in _parts_, do
           1. Set _result_ to the string-concatenation of _result_ and _part_.[[Value]].
@@ -344,11 +344,11 @@ <h1>FormatListToParts ( _listFormat_, _list_ )</h1>
       </p>
 
       <emu-alg>
-        1. Let _parts_ be CreatePartsFromList(_listFormat_, _list_).
-        1. Let _result_ be ArrayCreate(0).
+        1. Let _parts_ be ! CreatePartsFromList(_listFormat_, _list_).
+        1. Let _result_ be ! ArrayCreate(0).
         1. Let _n_ be 0.
         1. For each Record { [[Type]], [[Value]] } _part_ in _parts_, do
-          1. Let _O_ be OrdinaryObjectCreate(%Object.prototype%).
+          1. Let _O_ be ! OrdinaryObjectCreate(%Object.prototype%).
           1. Perform ! CreateDataPropertyOrThrow(_O_, *"type"*, _part_.[[Type]]).
           1. Perform ! CreateDataPropertyOrThrow(_O_, *"value"*, _part_.[[Value]]).
           1. Perform ! CreateDataPropertyOrThrow(_result_, ! ToString(_n_), _O_).