Rename as test:func & test:select, add test:format

Author: eemeli

test/README.md

@@ -40,73 +40,85 @@ Some examples of test harnesses using these tests, from the source repository:
 
 As the behaviour of `:number`, `:datetime`, and other default message functions
 is dependent on locale-specific data and may vary between implementations,
-the following functions are defined for test use only:
+the following functions are defined for **test use only**:
 
-### `test:number`
+### `test:func`
 
 This function is valid both as a selector and as a formatter.
-The only option it recognizes is `fractionDigits`,
+The only option it recognizes is `fd`,
 all other option values passed to it are ignored.
 
-When resolving a `test:number` expression,
-its internal _input_ and _fractionDigits_ values are determined as follows:
-1. If the expression argument resolves to a numerical value
+When resolving a `test:func` expression,
+its _Input_ and _FD_ values are determined as follows:
+
+1. Let _FD_ be `0`.
+1. Let _arg_ be the resolved value of the expression argument.
+1. If _arg_ is the resolved value of an expression
+   with a `test:func`, `test:select`, or `test:format` annotation
+   for which resolution has succeeded, then
+   1. Let _Input_ be the _Input_ value of _arg_.
+   1. Set _FD_ to be _FD_ value of _arg_.
+1. Else if _arg_ is a numerical value
    or a string matching the `number-literal` production, then
-   1. Let _input_ be the numerical value of the argument.
-2. Else,
-   1. Emit "bad-input" error.
-   1. Use a fallback representation is used as the resolved value of the expression.
-      The _fractionDigits_ value is not determined.
-3. If the `fractionDigits` option is set, then
-   1. If its value resolves to a numerical integer value `0`, `1` or `2`,
-      or their corresponding string representations `'0'`, `'1'`, or `'2'`, then
-      1. Let _fractionDigits_ be the numerical value of the option.
-   2. Else,
-      1. Emit "bad-option" error.
-      2. Let _fractionDigits_ be `0`.
-4. Else,
-   1. Let _fractionDigits_ be `0`.
-
-When `test:number` is used as a selector,
+   1. Let _Input_ be the numerical value of _arg_.
+1. Else,
+   1. Emit "bad-input" Resolution Error.
+   1. Use a fallback representation as the resolved value of the expression.
+      Further steps of this algorithm are not followed.
+1. If the `fd` option is set, then
+   1. If its value resolves to a numerical integer value `0` or `1`
+      or their corresponding string representations `'0'` or `'1'`, then
+      1. Set _FD_ to be the numerical value of the option.
+   1. Else if its value is not an unresolved value set by [Option Resolution](/spec/formatting.md#option-resolution),
+      1. Emit "bad-option" Resolution Error.
+      1. Use a fallback representation as the resolved value of the expression.
+
+When `test:func` is used as a selector,
 the behaviour of calling it as the `rv` value of MatchSelectorKeys(`rv`, `keys`)
 (see [Resolve Preferences](/spec/formatting.md#resolve-preferences) for more information)
-depends on its _input_ and _fractionDigits_ values.
-- If the _input_ is `1` and _fractionDigits_ is `0`,
-  the method will return some slice of the list « `'1'`, `'one'` »,
+depends on its _Input_ and _FD_ values.
+
+- If the _Input_ is `1` and _FD_ is `1`,
+  the method will return some slice of the list « `'1.0'`, `'1'` »,
   depending on whether those values are included in `keys`.
-- If the _input_ is `1` and _fractionDigits_ is not `0`,
+- If the _Input_ is `1` and _FD_ is `0`,
   the method will return the list « `'1'` » if `keys` includes `'1'`, or an empty list otherwise.
-- If the _input_ is any other value, the method will return an empty list.
+- If the _Input_ is any other value, the method will return an empty list.
 
-When an expression with a `test:number` annotation is assigned to a variable by a declaration
-and that variable is used as an argument or option value,
-its resolved value is the _input_ value.
+When an expression with a `test:func` annotation is assigned to a variable by a declaration
+and that variable is used as an option value,
+its resolved value is the _Input_ value.
 
-When `test:number` is used as a formatter,
-a placeholder resolving to a value with a `test:number` expression
+When `test:func` is used as a formatter,
+a placeholder resolving to a value with a `test:func` expression
 is formatted as a concatenation of the following parts:
-1. If _input_ is less than `0`, the character `-` U+002D Hyphen-Minus.
-2. The truncated absolute integer value of _input_, i.e. floor(abs(_input_)),
+
+1. If _Input_ is less than `0`, the character `-` U+002D Hyphen-Minus.
+1. The truncated absolute integer value of _Input_, i.e. floor(abs(_Input_)),
    formatted as a sequence of decimal digit caharacters.
-3. If _fractionDigits_ is `1`, then
-   1. The character `.` U+002E Full Stop.
-   2. The single decimal digit character representing the value floor((abs(_input_) - floor(abs(_input_))) * 10)
-4. Else if _fractionDigits_ is `2`, then
+1. If _FD_ is `1`, then
    1. The character `.` U+002E Full Stop.
-   2. The two decimal digit character string representing the value floor((abs(_input_) - floor(abs(_input_))) * 100),
-      with a `0` U+0030 Digit Zero padding at start if the result is less than `10`.
+   1. The single decimal digit character representing the value floor((abs(_Input_) - floor(abs(_Input_))) \* 10)
 
 If the formatting target is a sequence of parts,
 each of the above parts will be emitted separately
 rather than being concatenated into a single string.
 
-Note that for purposes of clarity, the formatting of `test:number` does not perform any rounding.
+Note that for purposes of clarity, the formatting of `test:func` does not perform any rounding.
 
-### `test:plural`
+### `test:select`
 
-This function behaves exactly the same as `test:number`,
+This function behaves exactly the same as `test:func`,
 except that it cannot be used for formatting.
 
-When `test:plural` is used as a formatter,
+When `test:select` is used as a formatter,
 a "not-formattable" error is emitted and the placeholder is formatted with
 a fallback representation.
+
+### `test:format`
+
+This function behaves exactly the same as `test:func`,
+except that it cannot be used for selection.
+
+When `test:format` is used as a selector,
+the steps under 2.iii. of [Resolve Selectors](/spec/formatting.md#resolve-selectors) are followed.