(third) Allow IntegerLiterals as variant keys

Author: stasm

experiments/stasm/third/impl/context.ts

@@ -1,6 +1,14 @@
-import {Message, Parameter, PatternElement, Selector, StringLiteral, Variant} from "./model.js";
+import {
+	IntegerLiteral,
+	Message,
+	Parameter,
+	PatternElement,
+	Selector,
+	StringLiteral,
+	Variant,
+} from "./model.js";
 import {REGISTRY} from "./registry.js";
-import {BooleanValue, NumberValue, RuntimeValue, StringValue} from "./runtime.js";
+import {BooleanValue, NumberValue, PluralValue, RuntimeValue, StringValue} from "./runtime.js";
 
 // Resolution context for a single formatMessage() call.
 
@@ -95,12 +103,31 @@ export class FormattingContext {
 			}
 		}
 
-		// TODO(stasm): Add NumberLiterals as keys (maybe).
-		function matches_corresponding_selector(key: StringLiteral, idx: number) {
-			return (
-				key.value === resolved_selectors[idx].value?.value ||
-				key.value === resolved_selectors[idx].default
-			);
+		function matches_corresponding_selector(key: StringLiteral | IntegerLiteral, idx: number) {
+			let selector = resolved_selectors[idx];
+			switch (key.type) {
+				case "StringLiteral": {
+					if (key.value === selector.value?.value) {
+						return true;
+					}
+					break;
+				}
+				case "IntegerLiteral": {
+					let num = parseInt(key.value);
+					if (selector.value instanceof NumberValue) {
+						if (num === selector.value.value) {
+							return true;
+						}
+					} else if (selector.value instanceof PluralValue) {
+						if (key.value === selector.value.value || num === selector.value.count) {
+							return true;
+						}
+					}
+					break;
+				}
+			}
+
+			return key.value === selector.default;
 		}
 
 		for (let variant of variants) {

experiments/stasm/third/impl/model.ts

@@ -17,7 +17,7 @@ export interface Selector {
 }
 
 export interface Variant {
-	keys: Array<StringLiteral>;
+	keys: Array<StringLiteral | IntegerLiteral>;
 	value: Array<PatternElement>;
 }
 

experiments/stasm/third/impl/runtime.ts

@@ -57,7 +57,7 @@ export class NumberValue extends RuntimeValue<number> {
 }
 
 export class PluralValue extends RuntimeValue<Intl.LDMLPluralRule> {
-	private count: number;
+	public count: number;
 
 	constructor(value: Intl.LDMLPluralRule, count: number) {
 		super(value);