From 13656ee46dbbddd912b0317d3c107c005cf24322 Mon Sep 17 00:00:00 2001 From: Ben Allen Date: Tue, 14 Mar 2023 16:53:08 -0700 Subject: [PATCH 1/3] changed [[localeMatcher]] to [[LocaleMatcher]] in all relevant places --- spec/collator.html | 2 +- spec/datetimeformat.html | 5 +++-- spec/displaynames.html | 2 +- spec/listformat.html | 2 +- spec/negotiation.html | 2 +- spec/numberformat.html | 2 +- spec/pluralrules.html | 2 +- spec/segmenter.html | 2 +- 8 files changed, 10 insertions(+), 9 deletions(-) diff --git a/spec/collator.html b/spec/collator.html index 24961af9..de69e1a0 100644 --- a/spec/collator.html +++ b/spec/collator.html @@ -45,7 +45,7 @@

InitializeCollator ( _collator_, _locales_, _options_ )

1. Let _localeData_ be %Collator%.[[SearchLocaleData]]. 1. Let _opt_ be a new Record. 1. Let _matcher_ be ? GetOption(_options_, *"localeMatcher"*, ~string~, « *"lookup"*, *"best fit"* », *"best fit"*). - 1. Set _opt_.[[localeMatcher]] to _matcher_. + 1. Set _opt_.[[LocaleMatcher]] to _matcher_. 1. Let _collation_ be ? GetOption(_options_, *"collation"*, ~string~, ~empty~, *undefined*). 1. If _collation_ is not *undefined*, then 1. If _collation_ does not match the Unicode Locale Identifier `type` nonterminal, throw a *RangeError* exception. diff --git a/spec/datetimeformat.html b/spec/datetimeformat.html index 008f5df0..122b03f6 100644 --- a/spec/datetimeformat.html +++ b/spec/datetimeformat.html @@ -54,7 +54,7 @@

InitializeDateTimeFormat ( _dateTimeFormat_, _locales_, _options_ )

1. Set _options_ to ? ToDateTimeOptions(_options_, *"any"*, *"date"*). 1. Let _opt_ be a new Record. 1. Let _matcher_ be ? GetOption(_options_, *"localeMatcher"*, ~string~, « *"lookup"*, *"best fit"* », *"best fit"*). - 1. Set _opt_.[[localeMatcher]] to _matcher_. + 1. Set _opt_.[[LocaleMatcher]] to _matcher_. 1. Let _calendar_ be ? GetOption(_options_, *"calendar"*, ~string~, ~empty~, *undefined*). 1. If _calendar_ is not *undefined*, then 1. If _calendar_ does not match the Unicode Locale Identifier `type` nonterminal, throw a *RangeError* exception. @@ -125,6 +125,7 @@

InitializeDateTimeFormat ( _dateTimeFormat_, _locales_, _options_ )

1. Else, 1. Let _bestFormat_ be BestFitFormatMatcher(_formatOptions_, _formats_). 1. For each row in , except the header row, in table order, do + 1. Let _prop_ be the name given in the Property column of the row. 1. If _bestFormat_ has a field [[<_prop_>]], then 1. Let _p_ be _bestFormat_.[[<_prop_>]]. @@ -203,7 +204,7 @@

Internal slots

[[LocaleData]].[[<_locale_>]].[[hc]] must be « *null*, *"h11"*, *"h12"*, *"h23"*, *"h24"* ».
  • - [[LocaleData]].[[<_locale_>]].[[hourCycle]] must be a String value equal to *"h11"*, *"h12"*, *"h23"*, or *"h24"*. + [[LocaleData]].[[<_locale_>]].[[HourCycle]] must be a String value equal to *"h11"*, *"h12"*, *"h23"*, or *"h24"*.
  • [[LocaleData]].[[<_locale_>]] must have a [[formats]] field. This [[formats]] field must be a Record with [[<_calendar_>]] fields for all calendar values _calendar_. The value of this field must be a list of records, each of which has a subset of the fields shown in , where each field must have one of the values specified for the field in . Multiple records in a list may use the same subset of the fields as long as they have different values for the fields. The following subsets must be available for each locale: diff --git a/spec/displaynames.html b/spec/displaynames.html index f2ce314c..47659b9e 100644 --- a/spec/displaynames.html +++ b/spec/displaynames.html @@ -24,7 +24,7 @@

    Intl.DisplayNames ( _locales_, _options_ )

    1. Let _opt_ be a new Record. 1. Let _localeData_ be %DisplayNames%.[[LocaleData]]. 1. Let _matcher_ be ? GetOption(_options_, *"localeMatcher"*, ~string~, « *"lookup"*, *"best fit"* », *"best fit"*). - 1. Set _opt_.[[localeMatcher]] to _matcher_. + 1. Set _opt_.[[LocaleMatcher]] to _matcher_. 1. Let _r_ be ResolveLocale(%DisplayNames%.[[AvailableLocales]], _requestedLocales_, _opt_, %DisplayNames%.[[RelevantExtensionKeys]]). 1. Let _style_ be ? GetOption(_options_, *"style"*, ~string~, « *"narrow"*, *"short"*, *"long"* », *"long"*). 1. Set _displayNames_.[[Style]] to _style_. diff --git a/spec/listformat.html b/spec/listformat.html index 9dfe8cfa..54146ba8 100644 --- a/spec/listformat.html +++ b/spec/listformat.html @@ -22,7 +22,7 @@

    Intl.ListFormat ( [ _locales_ [ , _options_ ] ] )

    1. Set _options_ to ? GetOptionsObject(_options_). 1. Let _opt_ be a new Record. 1. Let _matcher_ be ? GetOption(_options_, *"localeMatcher"*, ~string~, « *"lookup"*, *"best fit"* », *"best fit"*). - 1. Set _opt_.[[localeMatcher]] to _matcher_. + 1. Set _opt_.[[LocaleMatcher]] to _matcher_. 1. Let _localeData_ be %ListFormat%.[[LocaleData]]. 1. Let _r_ be ResolveLocale(%ListFormat%.[[AvailableLocales]], _requestedLocales_, _opt_, %ListFormat%.[[RelevantExtensionKeys]], _localeData_). 1. Set _listFormat_.[[Locale]] to _r_.[[locale]]. diff --git a/spec/negotiation.html b/spec/negotiation.html index b68ebdef..5c5df458 100644 --- a/spec/negotiation.html +++ b/spec/negotiation.html @@ -200,7 +200,7 @@

    ResolveLocale ( _availableLocales_, _requestedLocales_, _options_, _relevant

    - 1. Let _matcher_ be _options_.[[localeMatcher]]. + 1. Let _matcher_ be _options_.[[LocaleMatcher]]. 1. If _matcher_ is *"lookup"*, then 1. Let _r_ be ! LookupMatcher(_availableLocales_, _requestedLocales_). 1. Else, diff --git a/spec/numberformat.html b/spec/numberformat.html index 211edba5..d0aacdbd 100644 --- a/spec/numberformat.html +++ b/spec/numberformat.html @@ -54,7 +54,7 @@

    InitializeNumberFormat ( _numberFormat_, _locales_, _options_ )

    1. Set _options_ to ? CoerceOptionsToObject(_options_). 1. Let _opt_ be a new Record. 1. Let _matcher_ be ? GetOption(_options_, *"localeMatcher"*, ~string~, « *"lookup"*, *"best fit"* », *"best fit"*). - 1. Set _opt_.[[localeMatcher]] to _matcher_. + 1. Set _opt_.[[LocaleMatcher]] to _matcher_. 1. Let _numberingSystem_ be ? GetOption(_options_, *"numberingSystem"*, ~string~, ~empty~, *undefined*). 1. If _numberingSystem_ is not *undefined*, then 1. If _numberingSystem_ does not match the Unicode Locale Identifier `type` nonterminal, throw a *RangeError* exception. diff --git a/spec/pluralrules.html b/spec/pluralrules.html index a2fad4d0..33761067 100644 --- a/spec/pluralrules.html +++ b/spec/pluralrules.html @@ -34,7 +34,7 @@

    InitializePluralRules ( _pluralRules_, _locales_, _options_ )

    1. Set _options_ to ? CoerceOptionsToObject(_options_). 1. Let _opt_ be a new Record. 1. Let _matcher_ be ? GetOption(_options_, *"localeMatcher"*, ~string~, « *"lookup"*, *"best fit"* », *"best fit"*). - 1. Set _opt_.[[localeMatcher]] to _matcher_. + 1. Set _opt_.[[LocaleMatcher]] to _matcher_. 1. Let _t_ be ? GetOption(_options_, *"type"*, ~string~, « *"cardinal"*, *"ordinal"* », *"cardinal"*). 1. Set _pluralRules_.[[Type]] to _t_. 1. Perform ? SetNumberFormatDigitOptions(_pluralRules_, _options_, *+0*𝔽, *3*𝔽, *"standard"*). diff --git a/spec/segmenter.html b/spec/segmenter.html index 030355ef..c09d13ff 100644 --- a/spec/segmenter.html +++ b/spec/segmenter.html @@ -23,7 +23,7 @@

    Intl.Segmenter ( [ _locales_ [ , _options_ ] ] )

    1. Set _options_ to ? GetOptionsObject(_options_). 1. Let _opt_ be a new Record. 1. Let _matcher_ be ? GetOption(_options_, *"localeMatcher"*, ~string~, « *"lookup"*, *"best fit"* », *"best fit"*). - 1. Set _opt_.[[localeMatcher]] to _matcher_. + 1. Set _opt_.[[LocaleMatcher]] to _matcher_. 1. Let _localeData_ be %Segmenter%.[[LocaleData]]. 1. Let _r_ be ResolveLocale(%Segmenter%.[[AvailableLocales]], _requestedLocales_, _opt_, %Segmenter%.[[RelevantExtensionKeys]], _localeData_). 1. Set _segmenter_.[[Locale]] to _r_.[[locale]]. From 6cafaa8ed9f8ec1aae26cbabdf39af0b787176f7 Mon Sep 17 00:00:00 2001 From: Ben Allen Date: Tue, 14 Mar 2023 16:53:08 -0700 Subject: [PATCH 2/3] changed [[localeMatcher]] to [[LocaleMatcher]] in all relevant places --- spec/collator.html | 2 +- spec/datetimeformat.html | 4 ++-- spec/displaynames.html | 2 +- spec/listformat.html | 2 +- spec/negotiation.html | 2 +- spec/numberformat.html | 2 +- spec/pluralrules.html | 2 +- spec/segmenter.html | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/spec/collator.html b/spec/collator.html index 24961af9..de69e1a0 100644 --- a/spec/collator.html +++ b/spec/collator.html @@ -45,7 +45,7 @@

    InitializeCollator ( _collator_, _locales_, _options_ )

    1. Let _localeData_ be %Collator%.[[SearchLocaleData]]. 1. Let _opt_ be a new Record. 1. Let _matcher_ be ? GetOption(_options_, *"localeMatcher"*, ~string~, « *"lookup"*, *"best fit"* », *"best fit"*). - 1. Set _opt_.[[localeMatcher]] to _matcher_. + 1. Set _opt_.[[LocaleMatcher]] to _matcher_. 1. Let _collation_ be ? GetOption(_options_, *"collation"*, ~string~, ~empty~, *undefined*). 1. If _collation_ is not *undefined*, then 1. If _collation_ does not match the Unicode Locale Identifier `type` nonterminal, throw a *RangeError* exception. diff --git a/spec/datetimeformat.html b/spec/datetimeformat.html index 008f5df0..8ee2705e 100644 --- a/spec/datetimeformat.html +++ b/spec/datetimeformat.html @@ -54,7 +54,7 @@

    InitializeDateTimeFormat ( _dateTimeFormat_, _locales_, _options_ )

    1. Set _options_ to ? ToDateTimeOptions(_options_, *"any"*, *"date"*). 1. Let _opt_ be a new Record. 1. Let _matcher_ be ? GetOption(_options_, *"localeMatcher"*, ~string~, « *"lookup"*, *"best fit"* », *"best fit"*). - 1. Set _opt_.[[localeMatcher]] to _matcher_. + 1. Set _opt_.[[LocaleMatcher]] to _matcher_. 1. Let _calendar_ be ? GetOption(_options_, *"calendar"*, ~string~, ~empty~, *undefined*). 1. If _calendar_ is not *undefined*, then 1. If _calendar_ does not match the Unicode Locale Identifier `type` nonterminal, throw a *RangeError* exception. @@ -203,7 +203,7 @@

    Internal slots

    [[LocaleData]].[[<_locale_>]].[[hc]] must be « *null*, *"h11"*, *"h12"*, *"h23"*, *"h24"* ».

  • - [[LocaleData]].[[<_locale_>]].[[hourCycle]] must be a String value equal to *"h11"*, *"h12"*, *"h23"*, or *"h24"*. + [[LocaleData]].[[<_locale_>]].[[HourCycle]] must be a String value equal to *"h11"*, *"h12"*, *"h23"*, or *"h24"*.
  • [[LocaleData]].[[<_locale_>]] must have a [[formats]] field. This [[formats]] field must be a Record with [[<_calendar_>]] fields for all calendar values _calendar_. The value of this field must be a list of records, each of which has a subset of the fields shown in , where each field must have one of the values specified for the field in . Multiple records in a list may use the same subset of the fields as long as they have different values for the fields. The following subsets must be available for each locale: diff --git a/spec/displaynames.html b/spec/displaynames.html index f2ce314c..47659b9e 100644 --- a/spec/displaynames.html +++ b/spec/displaynames.html @@ -24,7 +24,7 @@

    Intl.DisplayNames ( _locales_, _options_ )

    1. Let _opt_ be a new Record. 1. Let _localeData_ be %DisplayNames%.[[LocaleData]]. 1. Let _matcher_ be ? GetOption(_options_, *"localeMatcher"*, ~string~, « *"lookup"*, *"best fit"* », *"best fit"*). - 1. Set _opt_.[[localeMatcher]] to _matcher_. + 1. Set _opt_.[[LocaleMatcher]] to _matcher_. 1. Let _r_ be ResolveLocale(%DisplayNames%.[[AvailableLocales]], _requestedLocales_, _opt_, %DisplayNames%.[[RelevantExtensionKeys]]). 1. Let _style_ be ? GetOption(_options_, *"style"*, ~string~, « *"narrow"*, *"short"*, *"long"* », *"long"*). 1. Set _displayNames_.[[Style]] to _style_. diff --git a/spec/listformat.html b/spec/listformat.html index 9dfe8cfa..54146ba8 100644 --- a/spec/listformat.html +++ b/spec/listformat.html @@ -22,7 +22,7 @@

    Intl.ListFormat ( [ _locales_ [ , _options_ ] ] )

    1. Set _options_ to ? GetOptionsObject(_options_). 1. Let _opt_ be a new Record. 1. Let _matcher_ be ? GetOption(_options_, *"localeMatcher"*, ~string~, « *"lookup"*, *"best fit"* », *"best fit"*). - 1. Set _opt_.[[localeMatcher]] to _matcher_. + 1. Set _opt_.[[LocaleMatcher]] to _matcher_. 1. Let _localeData_ be %ListFormat%.[[LocaleData]]. 1. Let _r_ be ResolveLocale(%ListFormat%.[[AvailableLocales]], _requestedLocales_, _opt_, %ListFormat%.[[RelevantExtensionKeys]], _localeData_). 1. Set _listFormat_.[[Locale]] to _r_.[[locale]]. diff --git a/spec/negotiation.html b/spec/negotiation.html index b68ebdef..5c5df458 100644 --- a/spec/negotiation.html +++ b/spec/negotiation.html @@ -200,7 +200,7 @@

    ResolveLocale ( _availableLocales_, _requestedLocales_, _options_, _relevant

    - 1. Let _matcher_ be _options_.[[localeMatcher]]. + 1. Let _matcher_ be _options_.[[LocaleMatcher]]. 1. If _matcher_ is *"lookup"*, then 1. Let _r_ be ! LookupMatcher(_availableLocales_, _requestedLocales_). 1. Else, diff --git a/spec/numberformat.html b/spec/numberformat.html index 211edba5..d0aacdbd 100644 --- a/spec/numberformat.html +++ b/spec/numberformat.html @@ -54,7 +54,7 @@

    InitializeNumberFormat ( _numberFormat_, _locales_, _options_ )

    1. Set _options_ to ? CoerceOptionsToObject(_options_). 1. Let _opt_ be a new Record. 1. Let _matcher_ be ? GetOption(_options_, *"localeMatcher"*, ~string~, « *"lookup"*, *"best fit"* », *"best fit"*). - 1. Set _opt_.[[localeMatcher]] to _matcher_. + 1. Set _opt_.[[LocaleMatcher]] to _matcher_. 1. Let _numberingSystem_ be ? GetOption(_options_, *"numberingSystem"*, ~string~, ~empty~, *undefined*). 1. If _numberingSystem_ is not *undefined*, then 1. If _numberingSystem_ does not match the Unicode Locale Identifier `type` nonterminal, throw a *RangeError* exception. diff --git a/spec/pluralrules.html b/spec/pluralrules.html index a2fad4d0..33761067 100644 --- a/spec/pluralrules.html +++ b/spec/pluralrules.html @@ -34,7 +34,7 @@

    InitializePluralRules ( _pluralRules_, _locales_, _options_ )

    1. Set _options_ to ? CoerceOptionsToObject(_options_). 1. Let _opt_ be a new Record. 1. Let _matcher_ be ? GetOption(_options_, *"localeMatcher"*, ~string~, « *"lookup"*, *"best fit"* », *"best fit"*). - 1. Set _opt_.[[localeMatcher]] to _matcher_. + 1. Set _opt_.[[LocaleMatcher]] to _matcher_. 1. Let _t_ be ? GetOption(_options_, *"type"*, ~string~, « *"cardinal"*, *"ordinal"* », *"cardinal"*). 1. Set _pluralRules_.[[Type]] to _t_. 1. Perform ? SetNumberFormatDigitOptions(_pluralRules_, _options_, *+0*𝔽, *3*𝔽, *"standard"*). diff --git a/spec/segmenter.html b/spec/segmenter.html index 030355ef..c09d13ff 100644 --- a/spec/segmenter.html +++ b/spec/segmenter.html @@ -23,7 +23,7 @@

    Intl.Segmenter ( [ _locales_ [ , _options_ ] ] )

    1. Set _options_ to ? GetOptionsObject(_options_). 1. Let _opt_ be a new Record. 1. Let _matcher_ be ? GetOption(_options_, *"localeMatcher"*, ~string~, « *"lookup"*, *"best fit"* », *"best fit"*). - 1. Set _opt_.[[localeMatcher]] to _matcher_. + 1. Set _opt_.[[LocaleMatcher]] to _matcher_. 1. Let _localeData_ be %Segmenter%.[[LocaleData]]. 1. Let _r_ be ResolveLocale(%Segmenter%.[[AvailableLocales]], _requestedLocales_, _opt_, %Segmenter%.[[RelevantExtensionKeys]], _localeData_). 1. Set _segmenter_.[[Locale]] to _r_.[[locale]]. From 2036748d500a080d8fe9003263b7adf1c91cced8 Mon Sep 17 00:00:00 2001 From: Ben Allen Date: Tue, 14 Mar 2023 16:55:43 -0700 Subject: [PATCH 3/3] remove extraneous TODO --- spec/datetimeformat.html | 1 - 1 file changed, 1 deletion(-) diff --git a/spec/datetimeformat.html b/spec/datetimeformat.html index 122b03f6..8ee2705e 100644 --- a/spec/datetimeformat.html +++ b/spec/datetimeformat.html @@ -125,7 +125,6 @@

    InitializeDateTimeFormat ( _dateTimeFormat_, _locales_, _options_ )

    1. Else, 1. Let _bestFormat_ be BestFitFormatMatcher(_formatOptions_, _formats_). 1. For each row in , except the header row, in table order, do - 1. Let _prop_ be the name given in the Property column of the row. 1. If _bestFormat_ has a field [[<_prop_>]], then 1. Let _p_ be _bestFormat_.[[<_prop_>]].