Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Editorial: Define a structured signature for PluralRuleSelect #594

Merged
merged 7 commits into from
Jan 6, 2022
Merged

Editorial: Define a structured signature for PluralRuleSelect #594

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5f843cb
Meta: Upgrade ecmarkup
gibson042 Jul 15, 2021
0624298
Editorial: Define a structured signature for PluralRuleSelect
gibson042 Jul 15, 2021
1b78e65
Editorial: Restore use of _operands_ in PluralRuleSelect
gibson042 Jul 22, 2021
a7c7fc2
Editorial: Define a structured signature for GetOperands
gibson042 Jul 22, 2021
b8993d2
Editorial: Align GetOperands with UTS #35
gibson042 Jul 23, 2021
7024f5f
Merge branch 'master' into gh-593-improve-PluralRuleSelect
gibson042 Jan 6, 2022
d440499
Editorial: Use conventional string substring phrasing
gibson042 Jan 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion spec/datetimeformat.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,7 @@ <h1>FormatDateTimePattern ( _dateTimeFormat_, _patternParts_, _x_, _rangeFormatO
1. Else if _p_ is equal to *"timeZoneName"*, then
1. Let _f_ be _dateTimeFormat_.[[TimeZoneName]].
1. Let _v_ be _dateTimeFormat_.[[TimeZone]].
1. Let _fv_ be a String value representing _v_ in the form given by _f_; the String value depends upon the implementation and the effective locale of _dateTimeFormat_. The String value may also depend on the value of the [[InDST]] field of _tm_ if _f_ is *"short"*, *"long"*, *"shortOffset"*, or *"longOffset"*. If the implementation does not have a localized representation of _f_, then use the String value of _v_ itself.
1. Let _fv_ be a String value representing _v_ in the form given by _f_; the String value depends upon the implementation and the effective locale of _dateTimeFormat_. The String value may also depend on the value of the [[InDST]] field of _tm_ if _f_ is *"short"*, *"long"*, *"shortOffset"*, or *"longOffset"*. If the implementation does not have a localized representation of _f_, then use the String value of _v_ itself.
1. Append a new Record { [[Type]]: _p_, [[Value]]: _fv_ } as the last element of the list _result_.
1. Else if _p_ matches a Property column of the row in <emu-xref href="#table-datetimeformat-components"></emu-xref>, then
1. If _rangeFormatOptions_ is not *undefined*, let _f_ be the value of _rangeFormatOptions_'s field whose name matches _p_.
Expand Down
92 changes: 52 additions & 40 deletions spec/pluralrules.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,35 +27,33 @@ <h1>InitializePluralRules ( _pluralRules_, _locales_, _options_ )</h1>
</emu-alg>
</emu-clause>

<emu-clause id="sec-getoperands" aoid="GetOperands">
<h1>GetOperands ( _s_ )</h1>
<p>
When the GetOperands abstract operation is called with argument _s_, it performs the following steps:
</p>

<emu-clause id="sec-getoperands" type="abstract operation">
<h1>
GetOperands (
_s_: a decimal String,
)
</h1>
<dl class="header">
<dt>description</dt>
<dd>It extracts numeric features from _s_ that correspond with the operands of <a href="https://unicode.org/reports/tr35/tr35-numbers.html#Operands">Unicode Technical Standard #35, Part 3, Section 5.1.1</a>.</dd>
</dl>
<emu-alg>
1. Assert: Type(_s_) is String.
1. Let _n_ be ! ToNumber(_s_).
1. Assert: _n_ is finite.
1. Let _dp_ be ! StringIndexOf(_s_, *"."*, 0).
1. If _dp_ = -1, then
1. Set _iv_ to _n_.
1. Let _f_ be 0.
1. Let _v_ be 0.
1. Else,
1. Let _iv_ be the substring of _s_ from position 0, inclusive, to position _dp_, exclusive.
1. Let _fv_ be the substring of _s_ from position _dp_, exclusive, to the end of _s_.
1. Let _f_ be ! ToNumber(_fv_).
1. Let _v_ be the length of _fv_.
1. Let _i_ be abs(! ToNumber(_iv_)).
1. If _f_ ≠ 0, then
1. Let _ft_ be the value of _fv_ stripped of trailing *"0"*.
1. Let _w_ be the length of _ft_.
1. Let _t_ be ! ToNumber(_ft_).
1. Let _intPart_ be _n_.
1. Let _fracSlice_ be *""*.
1. Else,
1. Let _w_ be 0.
1. Let _t_ be 0.
1. Return a new Record { [[Number]]: _n_, [[IntegerDigits]]: _i_, [[NumberOfFractionDigits]]: _v_, [[NumberOfFractionDigitsWithoutTrailing]]: _w_, [[FractionDigits]]: _f_, [[FractionDigitsWithoutTrailing]]: _t_ }.
1. Let _intPart_ be the substring of _s_ from 0 to _dp_.
1. Let _fracSlice_ be the substring of _s_ from _dp_ + 1.
1. Let _i_ be abs(! ToNumber(_intPart_)).
1. Let _fracDigitCount_ be the length of _fracSlice_.
1. Let _f_ be ! ToNumber(_fracSlice_).
1. Let _significantFracSlice_ be the value of _fracSlice_ stripped of trailing *"0"*.
1. Let _significantFracDigitCount_ be the length of _significantFracSlice_.
1. Let _significantFrac_ be ! ToNumber(_significantFracSlice_).
1. Return a new Record { [[Number]]: abs(_n_), [[IntegerDigits]]: _i_, [[FractionDigits]]: _f_, [[NumberOfFractionDigits]]: _fracDigitCount_, [[FractionDigitsWithoutTrailing]]: _significantFrac_, [[NumberOfFractionDigitsWithoutTrailing]]: _significantFracDigitCount_ }.
</emu-alg>

<emu-table id="table-plural-operands">
Expand All @@ -65,49 +63,63 @@ <h1>GetOperands ( _s_ )</h1>
<tr>
<th>Internal Slot</th>
<th>Type</th>
<th>UTS #35 Operand</th>
<th>Description</th>
</tr>
</thead>
<tr>
<td>[[Number]]</td>
<td>Number</td>
<td>Absolute value of the source number (integer and decimals)</td>
<td>n</td>
<td>Absolute value of the source number</td>
</tr>
<tr>
<td>[[IntegerDigits]]</td>
<td>Number</td>
<td>Number of digits of [[Number]].</td>
<td>i</td>
<td>Integer part of [[Number]].</td>
</tr>
<tr>
<td>[[NumberOfFractionDigits]]</td>
<td>[[FractionDigits]]</td>
<td>Number</td>
<td>Number of visible fraction digits in [[Number]], <i>with</i> trailing zeroes.</td>
<td>f</td>
<td>Visible fraction digits in [[Number]], <em>with</em> trailing zeroes, as an integer having [[NumberOfFractionDigits]] digits.</td>
</tr>
<tr>
<td>[[NumberOfFractionDigitsWithoutTrailing]]</td>
<td>[[NumberOfFractionDigits]]</td>
<td>Number</td>
<td>Number of visible fraction digits in [[Number]], <i>without</i> trailing zeroes.</td>
<td>v</td>
<td>Number of visible fraction digits in [[Number]], <em>with</em> trailing zeroes.</td>
</tr>
<tr>
<td>[[FractionDigits]]</td>
<td>[[FractionDigitsWithoutTrailing]]</td>
<td>Number</td>
<td>Number of visible fractional digits in [[Number]], <i>with</i> trailing zeroes.</td>
<td>t</td>
<td>Visible fraction digits in [[Number]], <em>without</em> trailing zeroes, as an integer having [[NumberOfFractionDigitsWithoutTrailing]] digits.</td>
</tr>
<tr>
<td>[[FractionDigitsWithoutTrailing]]</td>
<td>[[NumberOfFractionDigitsWithoutTrailing]]</td>
<td>Number</td>
<td>Number of visible fractional digits in [[Number]], <i>without</i> trailing zeroes.</td>
<td>w</td>
<td>Number of visible fraction digits in [[Number]], <em>without</em> trailing zeroes.</td>
</tr>
</table>
</emu-table>
</emu-clause>

<emu-clause id="sec-pluralruleselect" aoid="PluralRuleSelect">
<h1>PluralRuleSelect ( _locale_, _type_, _n_, _operands_ )</h1>

<p>
When the PluralRuleSelect abstract operation is called with four arguments, it performs an implementation-dependent algorithm to map _n_ to the appropriate plural representation of the Plural Rules Operands Record _operands_ by selecting the rules denoted by _type_ for the corresponding _locale_, or the String value *"other"*.
</p>
<emu-clause id="sec-pluralruleselect" type="implementation-defined abstract operation">
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The aoid is gone, I suppose automagic linking of this AO from algorithms won't work anymore.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

aoid is now pulled from the structured header, cf. https://github.com/tc39/ecmarkup/blob/6253fe32dec8a8b7f4271e76f734fbab2ee4c5f4/src/Clause.ts#L122-L143

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh wow, this is great. I should really keep up with all the exciting new stuff in ecmarkup

<h1>
PluralRuleSelect (
_locale_: a String,
_type_: a String,
_n_: a finite Number,
_operands_: a Plural Rules Operands Record derived from formatting _n_,
)
</h1>
<dl class="header">
<dt>description</dt>
<dd>It returns the String from &laquo; *"zero"*, *"one"*, *"two"*, *"few"*, *"many"*, *"other"* &raquo; that best categorizes the _operands_ representation of _n_ according to the rules for _locale_ and _type_.</dd>
</dl>
</emu-clause>

<emu-clause id="sec-resolveplural" aoid="ResolvePlural">
Expand Down Expand Up @@ -268,7 +280,7 @@ <h1>Intl.PluralRules.prototype.resolvedOptions ( )</h1>
1. Let _v_ be the value of _pr_'s internal slot whose name is the Internal Slot value of the current row.
1. If _v_ is not *undefined*, then
1. Perform ! CreateDataPropertyOrThrow(_options_, _p_, _v_).
1. Let _pluralCategories_ be a List of Strings representing the possible results of <emu-xref href="#sec-pluralruleselect">PluralRuleSelect</emu-xref> for the selected locale _pr_.[[Locale]]. This List consists of unique String values, from the the list *"zero"*, *"one"*, *"two"*, *"few"*, *"many"* and *"other"*, that are relevant for the locale whose localization is specified in LDML Language Plural Rules.
1. Let _pluralCategories_ be a List of Strings containing all possible results of <emu-xref href="#sec-pluralruleselect">PluralRuleSelect</emu-xref> for the selected locale _pr_.[[Locale]].
1. Perform ! CreateDataProperty(_options_, *"pluralCategories"*, CreateArrayFromList(_pluralCategories_)).
1. Return _options_.
</emu-alg>
Expand Down