diff --git a/spec/datetimeformat.html b/spec/datetimeformat.html
index 85fa757b..7f22eba1 100644
--- a/spec/datetimeformat.html
+++ b/spec/datetimeformat.html
@@ -894,95 +894,6 @@
Intl.DateTimeFormat.prototype.constructor
-
- Intl.DateTimeFormat.prototype [ %Symbol.toStringTag% ]
-
-
- The initial value of the %Symbol.toStringTag% property is the String value *"Intl.DateTimeFormat"*.
-
-
-
- This property has the attributes { [[Writable]]: *false*, [[Enumerable]]: *false*, [[Configurable]]: *true* }.
-
-
-
-
- get Intl.DateTimeFormat.prototype.format
-
-
- Intl.DateTimeFormat.prototype.format is an accessor property whose set accessor function is *undefined*. Its get accessor function performs the following steps:
-
-
-
- 1. Let _dtf_ be the *this* value.
- 1. If the implementation supports the normative optional constructor mode of , then
- 1. Set _dtf_ to ? UnwrapDateTimeFormat(_dtf_).
- 1. Perform ? RequireInternalSlot(_dtf_, [[InitializedDateTimeFormat]]).
- 1. If _dtf_.[[BoundFormat]] is *undefined*, then
- 1. Let _F_ be a new built-in function object as defined in DateTime Format Functions ().
- 1. Set _F_.[[DateTimeFormat]] to _dtf_.
- 1. Set _dtf_.[[BoundFormat]] to _F_.
- 1. Return _dtf_.[[BoundFormat]].
-
-
-
- The returned function is bound to _dtf_ so that it can be passed directly to `Array.prototype.map` or other functions.
- This is considered a historical artefact, as part of a convention which is no longer followed for new features, but is preserved to maintain compatibility with existing programs.
-
-
-
-
- Intl.DateTimeFormat.prototype.formatToParts ( _date_ )
-
-
- When the `formatToParts` method is called with an argument _date_, the following steps are taken:
-
-
-
- 1. Let _dtf_ be the *this* value.
- 1. Perform ? RequireInternalSlot(_dtf_, [[InitializedDateTimeFormat]]).
- 1. If _date_ is *undefined*, then
- 1. Let _x_ be ! Call(%Date.now%, *undefined*).
- 1. Else,
- 1. Let _x_ be ? ToNumber(_date_).
- 1. Return ? FormatDateTimeToParts(_dtf_, _x_).
-
-
-
-
- Intl.DateTimeFormat.prototype.formatRange ( _startDate_, _endDate_ )
-
-
- When the `formatRange` method is called with arguments _startDate_ and _endDate_, the following steps are taken:
-
-
-
- 1. Let _dtf_ be *this* value.
- 1. Perform ? RequireInternalSlot(_dtf_, [[InitializedDateTimeFormat]]).
- 1. If _startDate_ is *undefined* or _endDate_ is *undefined*, throw a *TypeError* exception.
- 1. Let _x_ be ? ToNumber(_startDate_).
- 1. Let _y_ be ? ToNumber(_endDate_).
- 1. Return ? FormatDateTimeRange(_dtf_, _x_, _y_).
-
-
-
-
- Intl.DateTimeFormat.prototype.formatRangeToParts ( _startDate_, _endDate_ )
-
-
- When the `formatRangeToParts` method is called with arguments _startDate_ and _endDate_, the following steps are taken:
-
-
-
- 1. Let _dtf_ be *this* value.
- 1. Perform ? RequireInternalSlot(_dtf_, [[InitializedDateTimeFormat]]).
- 1. If _startDate_ is *undefined* or _endDate_ is *undefined*, throw a *TypeError* exception.
- 1. Let _x_ be ? ToNumber(_startDate_).
- 1. Let _y_ be ? ToNumber(_endDate_).
- 1. Return ? FormatDateTimeRangeToParts(_dtf_, _x_, _y_).
-
-
-
Intl.DateTimeFormat.prototype.resolvedOptions ( )
@@ -1138,6 +1049,95 @@ Intl.DateTimeFormat.prototype.resolvedOptions ( )
For compatibility with versions prior to the fifth edition, the *"hour12"* property is set in addition to the *"hourCycle"* property.
+
+
+ Intl.DateTimeFormat.prototype [ %Symbol.toStringTag% ]
+
+
+ The initial value of the %Symbol.toStringTag% property is the String value *"Intl.DateTimeFormat"*.
+
+
+
+ This property has the attributes { [[Writable]]: *false*, [[Enumerable]]: *false*, [[Configurable]]: *true* }.
+
+
+
+
+ get Intl.DateTimeFormat.prototype.format
+
+
+ Intl.DateTimeFormat.prototype.format is an accessor property whose set accessor function is *undefined*. Its get accessor function performs the following steps:
+
+
+
+ 1. Let _dtf_ be the *this* value.
+ 1. If the implementation supports the normative optional constructor mode of , then
+ 1. Set _dtf_ to ? UnwrapDateTimeFormat(_dtf_).
+ 1. Perform ? RequireInternalSlot(_dtf_, [[InitializedDateTimeFormat]]).
+ 1. If _dtf_.[[BoundFormat]] is *undefined*, then
+ 1. Let _F_ be a new built-in function object as defined in DateTime Format Functions ().
+ 1. Set _F_.[[DateTimeFormat]] to _dtf_.
+ 1. Set _dtf_.[[BoundFormat]] to _F_.
+ 1. Return _dtf_.[[BoundFormat]].
+
+
+
+ The returned function is bound to _dtf_ so that it can be passed directly to `Array.prototype.map` or other functions.
+ This is considered a historical artefact, as part of a convention which is no longer followed for new features, but is preserved to maintain compatibility with existing programs.
+
+
+
+
+ Intl.DateTimeFormat.prototype.formatRange ( _startDate_, _endDate_ )
+
+
+ When the `formatRange` method is called with arguments _startDate_ and _endDate_, the following steps are taken:
+
+
+
+ 1. Let _dtf_ be *this* value.
+ 1. Perform ? RequireInternalSlot(_dtf_, [[InitializedDateTimeFormat]]).
+ 1. If _startDate_ is *undefined* or _endDate_ is *undefined*, throw a *TypeError* exception.
+ 1. Let _x_ be ? ToNumber(_startDate_).
+ 1. Let _y_ be ? ToNumber(_endDate_).
+ 1. Return ? FormatDateTimeRange(_dtf_, _x_, _y_).
+
+
+
+
+ Intl.DateTimeFormat.prototype.formatRangeToParts ( _startDate_, _endDate_ )
+
+
+ When the `formatRangeToParts` method is called with arguments _startDate_ and _endDate_, the following steps are taken:
+
+
+
+ 1. Let _dtf_ be *this* value.
+ 1. Perform ? RequireInternalSlot(_dtf_, [[InitializedDateTimeFormat]]).
+ 1. If _startDate_ is *undefined* or _endDate_ is *undefined*, throw a *TypeError* exception.
+ 1. Let _x_ be ? ToNumber(_startDate_).
+ 1. Let _y_ be ? ToNumber(_endDate_).
+ 1. Return ? FormatDateTimeRangeToParts(_dtf_, _x_, _y_).
+
+
+
+
+ Intl.DateTimeFormat.prototype.formatToParts ( _date_ )
+
+
+ When the `formatToParts` method is called with an argument _date_, the following steps are taken:
+
+
+
+ 1. Let _dtf_ be the *this* value.
+ 1. Perform ? RequireInternalSlot(_dtf_, [[InitializedDateTimeFormat]]).
+ 1. If _date_ is *undefined*, then
+ 1. Let _x_ be ! Call(%Date.now%, *undefined*).
+ 1. Else,
+ 1. Let _x_ be ? ToNumber(_date_).
+ 1. Return ? FormatDateTimeToParts(_dtf_, _x_).
+
+
diff --git a/spec/locale.html b/spec/locale.html
index cfe65621..cddeb48c 100644
--- a/spec/locale.html
+++ b/spec/locale.html
@@ -204,38 +204,6 @@ Intl.Locale.prototype [ %Symbol.toStringTag% ]
-
- Intl.Locale.prototype.maximize ( )
-
-
- 1. Let _loc_ be the *this* value.
- 1. Perform ? RequireInternalSlot(_loc_, [[InitializedLocale]]).
- 1. Let _maximal_ be the result of the Add Likely Subtags algorithm applied to _loc_.[[Locale]]. If an error is signaled, set _maximal_ to _loc_.[[Locale]].
- 1. Return ! Construct(%Intl.Locale%, _maximal_).
-
-
-
-
- Intl.Locale.prototype.minimize ( )
-
-
- 1. Let _loc_ be the *this* value.
- 1. Perform ? RequireInternalSlot(_loc_, [[InitializedLocale]]).
- 1. Let _minimal_ be the result of the Remove Likely Subtags algorithm applied to _loc_.[[Locale]]. If an error is signaled, set _minimal_ to _loc_.[[Locale]].
- 1. Return ! Construct(%Intl.Locale%, _minimal_).
-
-
-
-
- Intl.Locale.prototype.toString ( )
-
-
- 1. Let _loc_ be the *this* value.
- 1. Perform ? RequireInternalSlot(_loc_, [[InitializedLocale]]).
- 1. Return _loc_.[[Locale]].
-
-
-
get Intl.Locale.prototype.baseName
`Intl.Locale.prototype.baseName` is an accessor property whose set accessor function is *undefined*. Its get accessor function performs the following steps:
@@ -287,14 +255,35 @@ get Intl.Locale.prototype.hourCycle
-
- get Intl.Locale.prototype.numeric
- This property only exists if %Intl.Locale%.[[LocaleExtensionKeys]] contains *"kn"*.
- `Intl.Locale.prototype.numeric` is an accessor property whose set accessor function is *undefined*. Its get accessor function performs the following steps:
+
+ get Intl.Locale.prototype.language
+ `Intl.Locale.prototype.language` is an accessor property whose set accessor function is *undefined*. Its get accessor function performs the following steps:
1. Let _loc_ be the *this* value.
1. Perform ? RequireInternalSlot(_loc_, [[InitializedLocale]]).
- 1. Return _loc_.[[Numeric]].
+ 1. Return GetLocaleLanguage(_loc_.[[Locale]]).
+
+
+
+
+ Intl.Locale.prototype.maximize ( )
+
+
+ 1. Let _loc_ be the *this* value.
+ 1. Perform ? RequireInternalSlot(_loc_, [[InitializedLocale]]).
+ 1. Let _maximal_ be the result of the Add Likely Subtags algorithm applied to _loc_.[[Locale]]. If an error is signaled, set _maximal_ to _loc_.[[Locale]].
+ 1. Return ! Construct(%Intl.Locale%, _maximal_).
+
+
+
+
+ Intl.Locale.prototype.minimize ( )
+
+
+ 1. Let _loc_ be the *this* value.
+ 1. Perform ? RequireInternalSlot(_loc_, [[InitializedLocale]]).
+ 1. Let _minimal_ be the result of the Remove Likely Subtags algorithm applied to _loc_.[[Locale]]. If an error is signaled, set _minimal_ to _loc_.[[Locale]].
+ 1. Return ! Construct(%Intl.Locale%, _minimal_).
@@ -308,13 +297,24 @@ get Intl.Locale.prototype.numberingSystem
-
- get Intl.Locale.prototype.language
- `Intl.Locale.prototype.language` is an accessor property whose set accessor function is *undefined*. Its get accessor function performs the following steps:
+
+ get Intl.Locale.prototype.numeric
+ This property only exists if %Intl.Locale%.[[LocaleExtensionKeys]] contains *"kn"*.
+ `Intl.Locale.prototype.numeric` is an accessor property whose set accessor function is *undefined*. Its get accessor function performs the following steps:
1. Let _loc_ be the *this* value.
1. Perform ? RequireInternalSlot(_loc_, [[InitializedLocale]]).
- 1. Return GetLocaleLanguage(_loc_.[[Locale]]).
+ 1. Return _loc_.[[Numeric]].
+
+
+
+
+ get Intl.Locale.prototype.region
+ `Intl.Locale.prototype.region` is an accessor property whose set accessor function is *undefined*. Its get accessor function performs the following steps:
+
+ 1. Let _loc_ be the *this* value.
+ 1. Perform ? RequireInternalSlot(_loc_, [[InitializedLocale]]).
+ 1. Return GetLocaleRegion(_loc_.[[Locale]]).
@@ -328,13 +328,13 @@ get Intl.Locale.prototype.script
-
- get Intl.Locale.prototype.region
- `Intl.Locale.prototype.region` is an accessor property whose set accessor function is *undefined*. Its get accessor function performs the following steps:
+
+ Intl.Locale.prototype.toString ( )
+
- 1. Let _loc_ be the *this* value.
- 1. Perform ? RequireInternalSlot(_loc_, [[InitializedLocale]]).
- 1. Return GetLocaleRegion(_loc_.[[Locale]]).
+ 1. Let _loc_ be the *this* value.
+ 1. Perform ? RequireInternalSlot(_loc_, [[InitializedLocale]]).
+ 1. Return _loc_.[[Locale]].
diff --git a/spec/numberformat.html b/spec/numberformat.html
index f960071e..a80bb860 100644
--- a/spec/numberformat.html
+++ b/spec/numberformat.html
@@ -480,21 +480,6 @@ get Intl.NumberFormat.prototype.format
-
- Intl.NumberFormat.prototype.formatToParts ( _value_ )
-
-
- When the `formatToParts` method is called with an optional argument _value_, the following steps are taken:
-
-
-
- 1. Let _nf_ be the *this* value.
- 1. Perform ? RequireInternalSlot(_nf_, [[InitializedNumberFormat]]).
- 1. Let _x_ be ? ToIntlMathematicalValue(_value_).
- 1. Return FormatNumericToParts(_nf_, _x_).
-
-
-
Intl.NumberFormat.prototype.formatRange ( _start_, _end_ )
@@ -528,6 +513,21 @@ Intl.NumberFormat.prototype.formatRangeToParts ( _start_, _end_ )
1. Return ? FormatNumericRangeToParts(_nf_, _x_, _y_).
+
+
+ Intl.NumberFormat.prototype.formatToParts ( _value_ )
+
+
+ When the `formatToParts` method is called with an optional argument _value_, the following steps are taken:
+
+
+
+ 1. Let _nf_ be the *this* value.
+ 1. Perform ? RequireInternalSlot(_nf_, [[InitializedNumberFormat]]).
+ 1. Let _x_ be ? ToIntlMathematicalValue(_value_).
+ 1. Return FormatNumericToParts(_nf_, _x_).
+
+