Editorial: Prefix names of intrinsics with "Intl"

#843

spec/collator.html

@@ -4,7 +4,7 @@ <h1>Collator Objects</h1>
   <emu-clause id="sec-the-intl-collator-constructor">
     <h1>The Intl.Collator Constructor</h1>
     <p>
-      The Intl.Collator constructor is the <dfn>%Collator%</dfn> intrinsic object and a standard built-in property of the Intl object. Behaviour common to all service constructor properties of the Intl object is specified in <emu-xref href="#sec-internal-slots"></emu-xref>.
+      The Intl.Collator constructor is the <dfn>%Intl.Collator%</dfn> intrinsic object and a standard built-in property of the Intl object. Behaviour common to all service constructor properties of the Intl object is specified in <emu-xref href="#sec-internal-slots"></emu-xref>.
     </p>
 
     <emu-clause id="sec-intl.collator">
@@ -16,11 +16,11 @@ <h1>Intl.Collator ( [ _locales_ [ , _options_ ] ] )</h1>
       <emu-alg>
         1. If NewTarget is *undefined*, let _newTarget_ be the active function object, else let _newTarget_ be NewTarget.
         1. Let _internalSlotsList_ be &laquo; [[InitializedCollator]], [[Locale]], [[Usage]], [[Sensitivity]], [[IgnorePunctuation]], [[Collation]], [[BoundCompare]] &raquo;.
-        1. If %Collator%.[[RelevantExtensionKeys]] contains *"kn"*, then
+        1. If %Intl.Collator%.[[RelevantExtensionKeys]] contains *"kn"*, then
           1. Append [[Numeric]] to _internalSlotsList_.
-        1. If %Collator%.[[RelevantExtensionKeys]] contains *"kf"*, then
+        1. If %Intl.Collator%.[[RelevantExtensionKeys]] contains *"kf"*, then
           1. Append [[CaseFirst]] to _internalSlotsList_.
-        1. Let _collator_ be ? OrdinaryCreateFromConstructor(_newTarget_, *"%Collator.prototype%"*, _internalSlotsList_).
+        1. Let _collator_ be ? OrdinaryCreateFromConstructor(_newTarget_, *"%Intl.Collator.prototype%"*, _internalSlotsList_).
         1. Return ? InitializeCollator(_collator_, _locales_, _options_).
       </emu-alg>
     </emu-clause>
@@ -43,9 +43,9 @@ <h1>
         1. Let _usage_ be ? GetOption(_options_, *"usage"*, ~string~, &laquo; *"sort"*, *"search"* &raquo;, *"sort"*).
         1. Set _collator_.[[Usage]] to _usage_.
         1. If _usage_ is *"sort"*, then
-          1. Let _localeData_ be %Collator%.[[SortLocaleData]].
+          1. Let _localeData_ be %Intl.Collator%.[[SortLocaleData]].
         1. Else,
-          1. Let _localeData_ be %Collator%.[[SearchLocaleData]].
+          1. Let _localeData_ be %Intl.Collator%.[[SearchLocaleData]].
         1. Let _opt_ be a new Record.
         1. Let _matcher_ be ? GetOption(_options_, *"localeMatcher"*, ~string~, &laquo; *"lookup"*, *"best fit"* &raquo;, *"best fit"*).
         1. Set _opt_.[[localeMatcher]] to _matcher_.
@@ -59,8 +59,8 @@ <h1>
         1. Set _opt_.[[kn]] to _numeric_.
         1. Let _caseFirst_ be ? GetOption(_options_, *"caseFirst"*, ~string~, &laquo; *"upper"*, *"lower"*, *"false"* &raquo;, *undefined*).
         1. Set _opt_.[[kf]] to _caseFirst_.
-        1. Let _relevantExtensionKeys_ be %Collator%.[[RelevantExtensionKeys]].
-        1. Let _r_ be ResolveLocale(%Collator%.[[AvailableLocales]], _requestedLocales_, _opt_, _relevantExtensionKeys_, _localeData_).
+        1. Let _relevantExtensionKeys_ be %Intl.Collator%.[[RelevantExtensionKeys]].
+        1. Let _r_ be ResolveLocale(%Intl.Collator%.[[AvailableLocales]], _requestedLocales_, _opt_, _relevantExtensionKeys_, _localeData_).
         1. Set _collator_.[[Locale]] to _r_.[[locale]].
         1. Set _collation_ to _r_.[[co]].
         1. If _collation_ is *null*, set _collation_ to *"default"*.
@@ -100,7 +100,7 @@ <h1>Properties of the Intl.Collator Constructor</h1>
       <h1>Intl.Collator.prototype</h1>
 
       <p>
-        The value of `Intl.Collator.prototype` is %Collator.prototype%.
+        The value of `Intl.Collator.prototype` is %Intl.Collator.prototype%.
       </p>
 
       <p>
@@ -116,7 +116,7 @@ <h1>Intl.Collator.supportedLocalesOf ( _locales_ [ , _options_ ] )</h1>
       </p>
 
       <emu-alg>
-        1. Let _availableLocales_ be %Collator%.[[AvailableLocales]].
+        1. Let _availableLocales_ be %Intl.Collator%.[[AvailableLocales]].
         1. Let _requestedLocales_ be ? CanonicalizeLocaleList(_locales_).
         1. Return ? SupportedLocales(_availableLocales_, _requestedLocales_, _options_).
       </emu-alg>
@@ -149,14 +149,14 @@ <h1>Internal slots</h1>
     <h1>Properties of the Intl.Collator Prototype Object</h1>
 
     <p>
-      The Intl.Collator prototype object is itself an ordinary object. <dfn>%Collator.prototype%</dfn> is not an Intl.Collator instance and does not have an [[InitializedCollator]] internal slot or any of the other internal slots of Intl.Collator instance objects.
+      The Intl.Collator prototype object is itself an ordinary object. <dfn>%Intl.Collator.prototype%</dfn> is not an Intl.Collator instance and does not have an [[InitializedCollator]] internal slot or any of the other internal slots of Intl.Collator instance objects.
     </p>
 
     <emu-clause id="sec-intl.collator.prototype.constructor">
       <h1>Intl.Collator.prototype.constructor</h1>
 
       <p>
-        The initial value of `Intl.Collator.prototype.constructor` is %Collator%.
+        The initial value of `Intl.Collator.prototype.constructor` is %Intl.Collator%.
       </p>
     </emu-clause>
 
@@ -316,7 +316,7 @@ <h1>Intl.Collator.prototype.resolvedOptions ( )</h1>
           1. Let _v_ be the value of _collator_'s internal slot whose name is the Internal Slot value of the current row.
           1. If the current row has an Extension Key value, then
             1. Let _extensionKey_ be the Extension Key value of the current row.
-            1. If %Collator%.[[RelevantExtensionKeys]] does not contain _extensionKey_, then
+            1. If %Intl.Collator%.[[RelevantExtensionKeys]] does not contain _extensionKey_, then
               1. Set _v_ to *undefined*.
           1. If _v_ is not *undefined*, then
             1. Perform ! CreateDataPropertyOrThrow(_options_, _p_, _v_).
@@ -377,7 +377,7 @@ <h1>Intl.Collator.prototype.resolvedOptions ( )</h1>
     <h1>Properties of Intl.Collator Instances</h1>
 
     <p>
-      Intl.Collator instances are ordinary objects that inherit properties from %Collator.prototype%.
+      Intl.Collator instances are ordinary objects that inherit properties from %Intl.Collator.prototype%.
     </p>
 
     <p>

spec/conventions.html

@@ -42,64 +42,64 @@ <h1>Well-Known Intrinsic Objects</h1>
           </tr>
         </thead>
         <tr>
-          <td>%Collator%</td>
+          <td>%Intl%</td>
+          <td>`Intl`</td>
+          <td>The `Intl` object (<emu-xref href="#intl-object"></emu-xref>)</td>
+        </tr>
+        <tr>
+          <td>%Intl.Collator%</td>
           <td>`Intl.Collator`</td>
           <td>The `Intl.Collator` constructor (<emu-xref href="#sec-the-intl-collator-constructor"></emu-xref>)</td>
         </tr>
         <tr>
-          <td>%DateTimeFormat%</td>
+          <td>%Intl.DateTimeFormat%</td>
           <td>`Intl.DateTimeFormat`</td>
           <td>The `Intl.DateTimeFormat` constructor (<emu-xref href="#sec-intl-datetimeformat-constructor"></emu-xref>)</td>
         </tr>
         <tr>
-          <td>%DisplayNames%</td>
+          <td>%Intl.DisplayNames%</td>
           <td>`Intl.DisplayNames`</td>
           <td>The `Intl.DisplayNames` constructor (<emu-xref href="#sec-intl-displaynames-constructor"></emu-xref>)</td>
         </tr>
         <tr>
-          <td>%Intl%</td>
-          <td>`Intl`</td>
-          <td>The `Intl` object (<emu-xref href="#intl-object"></emu-xref>)</td>
-        </tr>
-        <tr>
-          <td>%ListFormat%</td>
+          <td>%Intl.ListFormat%</td>
           <td>`Intl.ListFormat`</td>
           <td>The `Intl.ListFormat` constructor (<emu-xref href="#sec-intl-listformat-constructor"></emu-xref>)</td>
         </tr>
         <tr>
-          <td>%Locale%</td>
+          <td>%Intl.Locale%</td>
           <td>`Intl.Locale`</td>
           <td>The `Intl.Locale` constructor (<emu-xref href="#sec-intl-locale-constructor"></emu-xref>)</td>
         </tr>
         <tr>
-          <td>%NumberFormat%</td>
+          <td>%Intl.NumberFormat%</td>
           <td>`Intl.NumberFormat`</td>
           <td>The `Intl.NumberFormat` constructor (<emu-xref href="#sec-intl-numberformat-constructor"></emu-xref>)</td>
         </tr>
         <tr>
-          <td>%PluralRules%</td>
+          <td>%Intl.PluralRules%</td>
           <td>`Intl.PluralRules`</td>
           <td>The `Intl.PluralRules` constructor (<emu-xref href="#sec-intl-pluralrules-constructor"></emu-xref>)</td>
         </tr>
         <tr>
-          <td>%RelativeTimeFormat%</td>
+          <td>%Intl.RelativeTimeFormat%</td>
           <td>`Intl.RelativeTimeFormat`</td>
           <td>The `Intl.RelativeTimeFormat` constructor (<emu-xref href="#sec-intl-relativetimeformat-constructor"></emu-xref>)</td>
         </tr>
         <tr>
-          <td>%Segmenter%</td>
+          <td>%Intl.Segmenter%</td>
           <td>`Intl.Segmenter`</td>
           <td>The `Intl.Segmenter` constructor (<emu-xref href="#sec-intl-segmenter-constructor"></emu-xref>)</td>
         </tr>
         <tr>
-          <td>%SegmentIteratorPrototype%</td>
+          <td>%IntlSegmentIteratorPrototype%</td>
           <td></td>
-          <td>The prototype of Segment Iterator objects (<emu-xref href="#sec-%segmentiteratorprototype%-object"></emu-xref>)</td>
+          <td>The prototype of Segment Iterator objects (<emu-xref href="#sec-%intlsegmentiteratorprototype%-object"></emu-xref>)</td>
         </tr>
         <tr>
-          <td>%SegmentsPrototype%</td>
+          <td>%IntlSegmentsPrototype%</td>
           <td></td>
-          <td>The prototype of Segments objects (<emu-xref href="#sec-%segmentsprototype%-object"></emu-xref>)</td>
+          <td>The prototype of Segments objects (<emu-xref href="#sec-%intlsegmentsprototype%-object"></emu-xref>)</td>
         </tr>
       </table>
     </emu-table>

spec/datetimeformat.html

@@ -5,7 +5,7 @@ <h1>DateTimeFormat Objects</h1>
     <h1>The Intl.DateTimeFormat Constructor</h1>
 
     <p>
-      The Intl.DateTimeFormat constructor is the <dfn>%DateTimeFormat%</dfn> intrinsic object and a standard built-in property of the Intl object. Behaviour common to all service constructor properties of the Intl object is specified in <emu-xref href="#sec-internal-slots"></emu-xref>.
+      The Intl.DateTimeFormat constructor is the <dfn>%Intl.DateTimeFormat%</dfn> intrinsic object and a standard built-in property of the Intl object. Behaviour common to all service constructor properties of the Intl object is specified in <emu-xref href="#sec-internal-slots"></emu-xref>.
     </p>
 
     <emu-clause id="sec-intl.datetimeformat">
@@ -36,7 +36,7 @@ <h1>
         <dl class="header">
         </dl>
         <emu-alg>
-          1. If _newTarget_ is *undefined* and ? OrdinaryHasInstance(%DateTimeFormat%, _this_) is *true*, then
+          1. If _newTarget_ is *undefined* and ? OrdinaryHasInstance(%Intl.DateTimeFormat%, _this_) is *true*, then
             1. Perform ? DefinePropertyOrThrow(_this_, %Intl%.[[FallbackSymbol]], PropertyDescriptor{ [[Value]]: _dateTimeFormat_, [[Writable]]: *false*, [[Enumerable]]: *false*, [[Configurable]]: *false* }).
             1. Return _this_.
           1. Return _dateTimeFormat_.
@@ -60,7 +60,7 @@ <h1>
       </dl>
 
       <emu-alg>
-        1. Let _dateTimeFormat_ be ? OrdinaryCreateFromConstructor(_newTarget_, *"%DateTimeFormat.prototype%"*, &laquo; [[InitializedDateTimeFormat]], [[Locale]], [[Calendar]], [[NumberingSystem]], [[TimeZone]], [[Weekday]], [[Era]], [[Year]], [[Month]], [[Day]], [[DayPeriod]], [[Hour]], [[Minute]], [[Second]], [[FractionalSecondDigits]], [[TimeZoneName]], [[HourCycle]], [[DateStyle]], [[TimeStyle]], [[Pattern]], [[RangePatterns]], [[BoundFormat]] &raquo;).
+        1. Let _dateTimeFormat_ be ? OrdinaryCreateFromConstructor(_newTarget_, *"%Intl.DateTimeFormat.prototype%"*, &laquo; [[InitializedDateTimeFormat]], [[Locale]], [[Calendar]], [[NumberingSystem]], [[TimeZone]], [[Weekday]], [[Era]], [[Year]], [[Month]], [[Day]], [[DayPeriod]], [[Hour]], [[Minute]], [[Second]], [[FractionalSecondDigits]], [[TimeZoneName]], [[HourCycle]], [[DateStyle]], [[TimeStyle]], [[Pattern]], [[RangePatterns]], [[BoundFormat]] &raquo;).
         1. Let _requestedLocales_ be ? CanonicalizeLocaleList(_locales_).
         1. Set _options_ to ? CoerceOptionsToObject(_options_).
         1. Let _opt_ be a new Record.
@@ -79,8 +79,8 @@ <h1>
         1. If _hour12_ is not *undefined*, then
           1. Set _hourCycle_ to *null*.
         1. Set _opt_.[[hc]] to _hourCycle_.
-        1. Let _localeData_ be %DateTimeFormat%.[[LocaleData]].
-        1. Let _r_ be ResolveLocale(%DateTimeFormat%.[[AvailableLocales]], _requestedLocales_, _opt_, %DateTimeFormat%.[[RelevantExtensionKeys]], _localeData_).
+        1. Let _localeData_ be %Intl.DateTimeFormat%.[[LocaleData]].
+        1. Let _r_ be ResolveLocale(%Intl.DateTimeFormat%.[[AvailableLocales]], _requestedLocales_, _opt_, %Intl.DateTimeFormat%.[[RelevantExtensionKeys]], _localeData_).
         1. Set _dateTimeFormat_.[[Locale]] to _r_.[[locale]].
         1. Let _resolvedCalendar_ be _r_.[[ca]].
         1. Set _dateTimeFormat_.[[Calendar]] to _resolvedCalendar_.
@@ -214,7 +214,7 @@ <h1>Properties of the Intl.DateTimeFormat Constructor</h1>
       <h1>Intl.DateTimeFormat.prototype</h1>
 
       <p>
-        The value of `Intl.DateTimeFormat.prototype` is %DateTimeFormat.prototype%.
+        The value of `Intl.DateTimeFormat.prototype` is %Intl.DateTimeFormat.prototype%.
       </p>
       <p>
         This property has the attributes { [[Writable]]: *false*, [[Enumerable]]: *false*, [[Configurable]]: *false* }.
@@ -229,7 +229,7 @@ <h1>Intl.DateTimeFormat.supportedLocalesOf ( _locales_ [ , _options_ ] )</h1>
       </p>
 
       <emu-alg>
-        1. Let _availableLocales_ be %DateTimeFormat%.[[AvailableLocales]].
+        1. Let _availableLocales_ be %Intl.DateTimeFormat%.[[AvailableLocales]].
         1. Let _requestedLocales_ be ? CanonicalizeLocaleList(_locales_).
         1. Return ? SupportedLocales(_availableLocales_, _requestedLocales_, _options_).
       </emu-alg>
@@ -471,14 +471,14 @@ <h1>Internal slots</h1>
     <h1>Properties of the Intl.DateTimeFormat Prototype Object</h1>
 
     <p>
-      The Intl.DateTimeFormat prototype object is itself an ordinary object. <dfn>%DateTimeFormat.prototype%</dfn> is not an Intl.DateTimeFormat instance and does not have an [[InitializedDateTimeFormat]] internal slot or any of the other internal slots of Intl.DateTimeFormat instance objects.
+      The Intl.DateTimeFormat prototype object is itself an ordinary object. <dfn>%Intl.DateTimeFormat.prototype%</dfn> is not an Intl.DateTimeFormat instance and does not have an [[InitializedDateTimeFormat]] internal slot or any of the other internal slots of Intl.DateTimeFormat instance objects.
     </p>
 
     <emu-clause id="sec-intl.datetimeformat.prototype.constructor">
       <h1>Intl.DateTimeFormat.prototype.constructor</h1>
 
       <p>
-        The initial value of `Intl.DateTimeFormat.prototype.constructor` is %DateTimeFormat%.
+        The initial value of `Intl.DateTimeFormat.prototype.constructor` is %Intl.DateTimeFormat%.
       </p>
     </emu-clause>
 
@@ -728,7 +728,7 @@ <h1>Intl.DateTimeFormat.prototype.resolvedOptions ( )</h1>
     <h1>Properties of Intl.DateTimeFormat Instances</h1>
 
     <p>
-      Intl.DateTimeFormat instances are ordinary objects that inherit properties from %DateTimeFormat.prototype%.
+      Intl.DateTimeFormat instances are ordinary objects that inherit properties from %Intl.DateTimeFormat.prototype%.
     </p>
 
     <p>
@@ -842,7 +842,7 @@ <h1>
       </h1>
       <dl class="header">
         <dt>description</dt>
-        <dd>_styles_ is a record from %DateTimeFormat%.[[LocaleData]].[[&lt;_locale_&gt;]].[[styles]].[[&lt;_calendar_&gt;]] for some locale _locale_ and calendar _calendar_. It returns the appropriate format record for date time formatting based on the parameters.</dd>
+        <dd>_styles_ is a record from %Intl.DateTimeFormat%.[[LocaleData]].[[&lt;_locale_&gt;]].[[styles]].[[&lt;_calendar_&gt;]] for some locale _locale_ and calendar _calendar_. It returns the appropriate format record for date time formatting based on the parameters.</dd>
       </dl>
       <emu-alg>
         1. Assert: _dateStyle_ is not *undefined* or _timeStyle_ is not *undefined*.
@@ -995,17 +995,17 @@ <h1>
         1. Let _locale_ be _dateTimeFormat_.[[Locale]].
         1. Let _nfOptions_ be OrdinaryObjectCreate(*null*).
         1. Perform ! CreateDataPropertyOrThrow(_nfOptions_, *"useGrouping"*, *false*).
-        1. Let _nf_ be ! Construct(%NumberFormat%, &laquo; _locale_, _nfOptions_ &raquo;).
+        1. Let _nf_ be ! Construct(%Intl.NumberFormat%, &laquo; _locale_, _nfOptions_ &raquo;).
         1. Let _nf2Options_ be OrdinaryObjectCreate(*null*).
         1. Perform ! CreateDataPropertyOrThrow(_nf2Options_, *"minimumIntegerDigits"*, *2*<sub>𝔽</sub>).
         1. Perform ! CreateDataPropertyOrThrow(_nf2Options_, *"useGrouping"*, *false*).
-        1. Let _nf2_ be ! Construct(%NumberFormat%, &laquo; _locale_, _nf2Options_ &raquo;).
+        1. Let _nf2_ be ! Construct(%Intl.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. Perform ! CreateDataPropertyOrThrow(_nf3Options_, *"minimumIntegerDigits"*, 𝔽(_fractionalSecondDigits_)).
           1. Perform ! CreateDataPropertyOrThrow(_nf3Options_, *"useGrouping"*, *false*).
-          1. Let _nf3_ be ! Construct(%NumberFormat%, &laquo; _locale_, _nf3Options_ &raquo;).
+          1. Let _nf3_ be ! Construct(%Intl.NumberFormat%, &laquo; _locale_, _nf3Options_ &raquo;).
         1. Let _tm_ be ToLocalTime(ℤ(ℝ(_x_) &times; 10<sup>6</sup>), _dateTimeFormat_.[[Calendar]], _dateTimeFormat_.[[TimeZone]]).
         1. Let _result_ be a new empty List.
         1. For each Record { [[Type]], [[Value]] } _patternPart_ of _patternParts_, do
@@ -1373,12 +1373,12 @@ <h1>
       <dl class="header">
         <dt>description</dt>
         <dd>
-          It returns the DateTimeFormat instance of its input object, which is either the value itself or a value associated with it by %DateTimeFormat% according to the normative optional constructor mode of <emu-xref href="#legacy-constructor"></emu-xref>.
+          It returns the DateTimeFormat instance of its input object, which is either the value itself or a value associated with it by %Intl.DateTimeFormat% according to the normative optional constructor mode of <emu-xref href="#legacy-constructor"></emu-xref>.
         </dd>
       </dl>
       <emu-alg>
         1. If Type(_dtf_) is not Object, throw a *TypeError* exception.
-        1. If _dtf_ does not have an [[InitializedDateTimeFormat]] internal slot and ? OrdinaryHasInstance(%DateTimeFormat%, _dtf_) is *true*, then
+        1. If _dtf_ does not have an [[InitializedDateTimeFormat]] internal slot and ? OrdinaryHasInstance(%Intl.DateTimeFormat%, _dtf_) is *true*, then
           1. Return ? Get(_dtf_, %Intl%.[[FallbackSymbol]]).
         1. Return _dtf_.
       </emu-alg>