Skip to content

Commit

Permalink
Editorial: use dotted intrinsic form
Browse files Browse the repository at this point in the history
Since tc39/ecma262#1376, the dotted form of intrinsic notation is preferred.

Additionally, tc39/ecma262#2056 intends to remove these legacy intrinsics, once it is non-normative to do so. HTML has already been updated to no longer use them.
  • Loading branch information
ljharb committed Jul 9, 2020
1 parent 7f83b8a commit eb9cb6f
Show file tree
Hide file tree
Showing 9 changed files with 49 additions and 49 deletions.
10 changes: 5 additions & 5 deletions spec/collator.html
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ <h1>Intl.Collator ( [ _locales_ [ , _options_ ] ] )</h1>
1. Append [[Numeric]] as the last element of _internalSlotsList_.
1. If %Collator%.[[RelevantExtensionKeys]] contains *"kf"*, then
1. Append [[CaseFirst]] as the last element of _internalSlotsList_.
1. Let _collator_ be ? OrdinaryCreateFromConstructor(_newTarget_, *"%CollatorPrototype%"*, _internalSlotsList_).
1. Let _collator_ be ? OrdinaryCreateFromConstructor(_newTarget_, *"%Collator.prototype%"*, _internalSlotsList_).
1. Return ? InitializeCollator(_collator_, _locales_, _options_).
</emu-alg>
</emu-clause>
Expand All @@ -92,7 +92,7 @@ <h1>Properties of the Intl.Collator Constructor</h1>
<h1>Intl.Collator.prototype</h1>

<p>
The value of `Intl.Collator.prototype` is %CollatorPrototype%.
The value of `Intl.Collator.prototype` is %Collator.prototype%.
</p>

<p>
Expand Down Expand Up @@ -146,7 +146,7 @@ <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>%CollatorPrototype%</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>%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">
Expand Down Expand Up @@ -271,7 +271,7 @@ <h1>Intl.Collator.prototype.resolvedOptions ()</h1>
<emu-alg>
1. Let _collator_ be *this* value.
1. Perform ? RequireInternalSlot(_collator_, [[InitializedCollator]]).
1. Let _options_ be ! ObjectCreate(%ObjectPrototype%).
1. Let _options_ be ! ObjectCreate(%Object.prototype%).
1. For each row of <emu-xref href="#table-collator-resolvedoptions-properties"></emu-xref>, except the header row, in table order, do
1. Let _p_ be the Property value of the current row.
1. Let _v_ be the value of _collator_'s internal slot whose name is the Internal Slot value of the current row.
Expand Down Expand Up @@ -338,7 +338,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 %CollatorPrototype%.
Intl.Collator instances are ordinary objects that inherit properties from %Collator.prototype%.
</p>

<p>
Expand Down
2 changes: 1 addition & 1 deletion spec/conventions.html
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ <h1>Well-Known Intrinsic Objects</h1>
<tr>
<td><dfn>%StringProto_indexOf%</dfn></td>
<td>`String.prototype.indexOf`</td>
<td>The initial value of the *"indexOf"* data property of the intrinsic %StringPrototype% (ES2021, <emu-xref href="#sec-string.prototype.indexof"></emu-xref>)</td>
<td>The initial value of the *"indexOf"* data property of the intrinsic %String.prototype% (ES2021, <emu-xref href="#sec-string.prototype.indexof"></emu-xref>)</td>
</tr>
</table>
</emu-table>
Expand Down
16 changes: 8 additions & 8 deletions spec/datetimeformat.html
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ <h1>DateTime Format Functions</h1>
1. Let _dtf_ be _F_.[[DateTimeFormat]].
1. Assert: Type(_dtf_) is Object and _dtf_ has an [[InitializedDateTimeFormat]] internal slot.
1. If _date_ is not provided or is *undefined*, then
1. Let _x_ be Call(%Date_now%, *undefined*).
1. Let _x_ be Call(%Date.now%, *undefined*).
1. Else,
1. Let _x_ be ? ToNumber(_date_).
1. Return ? FormatDateTime(_dtf_, _x_).
Expand Down Expand Up @@ -361,7 +361,7 @@ <h1>FormatDateTimeToParts ( _dateTimeFormat_, _x_ )</h1>
1. Let _result_ be ArrayCreate(0).
1. Let _n_ be 0.
1. For each _part_ in _parts_, do
1. Let _O_ be ObjectCreate(%ObjectPrototype%).
1. Let _O_ be ObjectCreate(%Object.prototype%).
1. Perform ! CreateDataPropertyOrThrow(_O_, *"type"*, _part_.[[Type]]).
1. Perform ! CreateDataPropertyOrThrow(_O_, *"value"*, _part_.[[Value]]).
1. Perform ! CreateDataProperty(_result_, ! ToString(_n_), _O_).
Expand Down Expand Up @@ -489,7 +489,7 @@ <h1>Intl.DateTimeFormat ( [ _locales_ [ , _options_ ] ] )</h1>

<emu-alg>
1. If NewTarget is *undefined*, let _newTarget_ be the active function object, else let _newTarget_ be NewTarget.
1. Let _dateTimeFormat_ be ? OrdinaryCreateFromConstructor(_newTarget_, *"%DateTimeFormatPrototype%"*, &laquo; [[InitializedDateTimeFormat]], [[Locale]], [[Calendar]], [[NumberingSystem]], [[TimeZone]], [[Weekday]], [[Era]], [[Year]], [[Month]], [[Day]], [[Hour]], [[Minute]], [[Second]], [[TimeZoneName]], [[HourCycle]], [[Pattern]], [[BoundFormat]] &raquo;).
1. Let _dateTimeFormat_ be ? OrdinaryCreateFromConstructor(_newTarget_, *"%DateTimeFormat.prototype%"*, &laquo; [[InitializedDateTimeFormat]], [[Locale]], [[Calendar]], [[NumberingSystem]], [[TimeZone]], [[Weekday]], [[Era]], [[Year]], [[Month]], [[Day]], [[Hour]], [[Minute]], [[Second]], [[TimeZoneName]], [[HourCycle]], [[Pattern]], [[BoundFormat]] &raquo;).
1. Perform ? InitializeDateTimeFormat(_dateTimeFormat_, _locales_, _options_).
</emu-alg>
<emu-normative-optional>
Expand Down Expand Up @@ -518,7 +518,7 @@ <h1>Properties of the Intl.DateTimeFormat Constructor</h1>
<h1>Intl.DateTimeFormat.prototype</h1>

<p>
The value of `Intl.DateTimeFormat.prototype` is %DateTimeFormatPrototype%.
The value of `Intl.DateTimeFormat.prototype` is %DateTimeFormat.prototype%.
</p>
<p>
This property has the attributes { [[Writable]]: *false*, [[Enumerable]]: *false*, [[Configurable]]: *false* }.
Expand Down Expand Up @@ -601,7 +601,7 @@ <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>%DateTimeFormatPrototype%</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>%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">
Expand Down Expand Up @@ -659,7 +659,7 @@ <h1>Intl.DateTimeFormat.prototype.formatToParts ( _date_ )</h1>
1. Let _dtf_ be *this* value.
1. Perform ? RequireInternalSlot(_dtf_, [[InitializedDateTimeFormat]]).
1. If _date_ is *undefined*, then
1. Let _x_ be Call(%Date_now%, *undefined*).
1. Let _x_ be Call(%Date.now%, *undefined*).
1. Else,
1. Let _x_ be ? ToNumber(_date_).
1. Return ? FormatDateTimeToParts(_dtf_, _x_).
Expand All @@ -677,7 +677,7 @@ <h1>Intl.DateTimeFormat.prototype.resolvedOptions ()</h1>
1. Let _dtf_ be *this* value.
1. If Type(_dtf_) is not Object, throw a *TypeError* exception.
1. Let _dtf_ be ? UnwrapDateTimeFormat(_dtf_).
1. Let _options_ be ! ObjectCreate(%ObjectPrototype%).
1. Let _options_ be ! ObjectCreate(%Object.prototype%).
1. For each row of <emu-xref href="#table-datetimeformat-resolvedoptions-properties"></emu-xref>, except the header row, in table order, do
1. Let _p_ be the Property value of the current row.
1. If _p_ is *"hour12"*, then
Expand Down Expand Up @@ -782,7 +782,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 %DateTimeFormatPrototype%.
Intl.DateTimeFormat instances are ordinary objects that inherit properties from %DateTimeFormat.prototype%.
</p>

<p>
Expand Down
2 changes: 1 addition & 1 deletion spec/intl.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ <h1>The Intl Object</h1>
</p>

<p>
The value of the [[Prototype]] internal slot of the Intl object is the intrinsic object %ObjectPrototype%.
The value of the [[Prototype]] internal slot of the Intl object is the intrinsic object %Object.prototype%.
</p>

<p>
Expand Down
8 changes: 4 additions & 4 deletions spec/locale.html
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ <h1>Intl.Locale( _tag_ [, _options_] )</h1>
1. Append [[CaseFirst]] as the last element of _internalSlotsList_.
1. If _relevantExtensionKeys_ contains *"kn"*, then
1. Append [[Numeric]] as the last element of _internalSlotsList_.
1. Let _locale_ be ? OrdinaryCreateFromConstructor(NewTarget, *%LocalePrototype%*, _internalSlotsList_).
1. Let _locale_ be ? OrdinaryCreateFromConstructor(NewTarget, *%Locale.prototype%*, _internalSlotsList_).
1. If Type(_tag_) is not String or Object, throw a *TypeError* exception.
1. If Type(_tag_) is Object and _tag_ has an [[InitializedLocale]] internal slot, then
1. Let _tag_ be _tag_.[[Locale]].
Expand Down Expand Up @@ -169,7 +169,7 @@ <h1>Properties of the Intl.Locale Constructor</h1>
<h1>Intl.Locale.prototype</h1>

<p>
The value of *Intl.Locale.prototype* is *%LocalePrototype%*.
The value of *Intl.Locale.prototype* is *%Locale.prototype%*.
</p>
<p>
This property has the attributes { [[Writable]]: *false*, [[Enumerable]]: *false*, [[Configurable]]: *false* }.
Expand All @@ -189,7 +189,7 @@ <h1>Internal slots</h1>
<h1>Properties of the Intl.Locale Prototype Object</h1>

<p>
The Intl.Locale prototype object is itself an ordinary object. <dfn>%LocalePrototype%</dfn> is not an Intl.Locale instance and does not have an [[InitializedLocale]] internal slot or any of the other internal slots of Intl.Locale instance objects.
The Intl.Locale prototype object is itself an ordinary object. <dfn>%Locale.prototype%</dfn> is not an Intl.Locale instance and does not have an [[InitializedLocale]] internal slot or any of the other internal slots of Intl.Locale instance objects.
</p>

<emu-clause id="sec-Intl.Locale.prototype.constructor">
Expand Down Expand Up @@ -251,7 +251,7 @@ <h1>get Intl.Locale.prototype.baseName</h1>
1. Let _loc_ be the *this* value.
1. Perform ? RequireInternalSlot(_loc_, [[InitializedLocale]]).
1. Let _locale_ be _loc_.[[Locale]].
1. Return the substring of _locale_ corresponding to the `unicode_language_id` production.
1. Return the substring of _locale_ corresponding to the `unicode_language_id` production.
</emu-clause>

<emu-clause id="sec-Intl.Locale.prototype.calendar">
Expand Down
10 changes: 5 additions & 5 deletions spec/negotiation.html
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ <h1>UnicodeExtensionComponents( _extension_ )</h1>
1. Let _size_ be the number of elements in _extension_.
1. Let _k_ be 3.
1. Repeat, while _k_ &lt; _size_
1. Let _e_ be ! Call(%StringProto_indexOf%, _extension_, « *"-"*, _k_ »).
1. Let _e_ be ! Call(%String.prototype.indexOf%, _extension_, « *"-"*, _k_ »).
1. If _e_ = -1, let _len_ be _size_ - _k_; else let _len_ be _e_ - _k_.
1. Let _subtag_ be the String value equal to the substring of _extension_ consisting of the code units at indices _k_ (inclusive) through _k_ + _len_ (exclusive).
1. If _isKeyword_ is *false*, then
Expand Down Expand Up @@ -178,7 +178,7 @@ <h1>InsertUnicodeExtensionAndCanonicalize( _locale_, _extension_ )</h1>
1. Assert: _locale_ does not contain a substring that is a Unicode locale extension sequence.
1. Assert: _extension_ is a Unicode locale extension sequence.
1. Assert: _tag_ matches the `unicode_locale_id` production.
1. Let _privateIndex_ be ! Call(%StringProto_indexOf%, _locale_, &laquo; *"-x-"* &raquo;).
1. Let _privateIndex_ be ! Call(%String.prototype.indexOf%, _locale_, &laquo; *"-x-"* &raquo;).
1. If _privateIndex_ = -1, then
1. Let _locale_ be the string-concatenation of _locale_ and _extension_.
1. Else,
Expand Down Expand Up @@ -367,20 +367,20 @@ <h1>PartitionPattern ( _pattern_ )</h1>

<emu-alg>
1. Let _result_ be a new empty List.
1. Let _beginIndex_ be ! Call(%StringProto_indexOf%, _pattern_, &laquo; *"{"*, 0 &raquo;).
1. Let _beginIndex_ be ! Call(%String.prototype.indexOf%, _pattern_, &laquo; *"{"*, 0 &raquo;).
1. Let _endIndex_ be 0.
1. Let _nextIndex_ be 0.
1. Let _length_ be the number of code units in _pattern_.
1. Repeat, while _beginIndex_ is an integer index into _pattern_
1. Set _endIndex_ to ! Call(%StringProto_indexOf%, _pattern_, &laquo; *"}"*, _beginIndex_ &raquo;).
1. Set _endIndex_ to ! Call(%String.prototype.indexOf%, _pattern_, &laquo; *"}"*, _beginIndex_ &raquo;).
1. Assert: _endIndex_ is greater than _beginIndex_.
1. If _beginIndex_ is greater than _nextIndex_, then
1. Let _literal_ be a substring of _pattern_ from position _nextIndex_, inclusive, to position _beginIndex_, exclusive.
1. Append a new Record { [[Type]]: *"literal"*, [[Value]]: _literal_ } as the last element of the list _result_.
1. Let _p_ be the substring of _pattern_ from position _beginIndex_, exclusive, to position _endIndex_, exclusive.
1. Append a new Record { [[Type]]: _p_, [[Value]]: *undefined* } as the last element of the list _result_.
1. Set _nextIndex_ to _endIndex_ + 1.
1. Set _beginIndex_ to ! Call(%StringProto_indexOf%, _pattern_, &laquo; *"{"*, _nextIndex_ &raquo;).
1. Set _beginIndex_ to ! Call(%String.prototype.indexOf%, _pattern_, &laquo; *"{"*, _nextIndex_ &raquo;).
1. If _nextIndex_ is less than _length_, then
1. Let _literal_ be the substring of _pattern_ from position _nextIndex_, inclusive, to position _length_, exclusive.
1. Append a new Record { [[Type]]: *"literal"*, [[Value]]: _literal_ } as the last element of the list _result_.
Expand Down
Loading

0 comments on commit eb9cb6f

Please sign in to comment.