Support LocalDateFormat.appendMonthName

Author: dkhalanskyjb

core/common/src/internal/format/FieldFormatDirective.kt

@@ -42,12 +42,12 @@ internal interface FieldFormatDirective<in Target> {
  */
 internal abstract class UnsignedIntFieldFormatDirective<in Target>(
     final override val field: UnsignedFieldSpec<Target>,
-    val minDigits: Int,
+    private val minDigits: Int,
 ) : FieldFormatDirective<Target> {
 
     final override val signGetter: ((Target) -> Int)? = null
 
-    val maxDigits: Int = field.maxDigits
+    private val maxDigits: Int = field.maxDigits
 
     init {
         require(minDigits >= 0)
@@ -96,11 +96,19 @@ internal abstract class NamedUnsignedIntFieldFormatDirective<in Target>(
 
     final override val signGetter: ((Target) -> Int)? = null
 
+    private fun getStringValue(target: Target): String = values[field.getNotNull(target) - field.minValue]
+
+    private fun setStringValue(target: Target, value: String) {
+        field.setWithoutReassigning(target, values.indexOf(value) + field.minValue)
+    }
+
     override fun formatter(): FormatterOperation<Target> =
-        TODO()
+        StringFormatterOperation(::getStringValue)
 
     override fun parser(signsInverted: Boolean): ParserStructure<Target> =
-        TODO()
+        ParserStructure(listOf(
+            StringSetParserOperation(values, ::setStringValue, "One of $values for ${field.name}")
+        ), emptyList())
 }
 
 internal abstract class StringFieldFormatDirective<in Target>(

core/common/src/internal/format/parser/ParserOperation.kt

@@ -106,11 +106,12 @@ internal class NumberSpanParserOperation<Output>(
  * Matches the longest suitable string from `strings` and calls [consume] with the matched string.
  */
 internal class StringSetParserOperation<Output>(
-    strings: Set<String>,
+    strings: Collection<String>,
     private val setter: (Output, String) -> Unit,
-    private val whatThisExpects: String
-) :
-    ParserOperation<Output> {
+    private val whatThisExpects: String,
+) : ParserOperation<Output> {
+
+    // TODO: tries don't have good performance characteristics for small sets, add a special case for small sets
 
     private class TrieNode(
         val children: MutableList<Pair<String, TrieNode>> = mutableListOf(),
@@ -125,7 +126,7 @@ internal class StringSetParserOperation<Output>(
             for (char in string) {
                 val searchResult = node.children.binarySearchBy(char.toString()) { it.first }
                 node = if (searchResult < 0) {
-                    TrieNode().also { node.children.add(-searchResult + 1, char.toString() to it) }
+                    TrieNode().also { node.children.add(-searchResult - 1, char.toString() to it) }
                 } else {
                     node.children[searchResult].second
                 }

core/common/test/format/DateFormatTest.kt

@@ -84,6 +84,54 @@ class DateFormatTest {
         }, dates)
     }
 
+    @Test
+    fun testDayMonthNameYear() {
+        val dates = buildMap<LocalDate, Pair<String, Set<String>>> {
+            put(LocalDate(2008, 7, 5), ("05 July 2008" to setOf()))
+            put(LocalDate(2007, 12, 31), ("31 December 2007" to setOf()))
+            put(LocalDate(999, 11, 30), ("30 November 0999" to setOf()))
+            put(LocalDate(-1, 1, 2), ("02 January -0001" to setOf()))
+            put(LocalDate(9999, 10, 31), ("31 October 9999" to setOf()))
+            put(LocalDate(-9999, 9, 30), ("30 September -9999" to setOf()))
+            put(LocalDate(10000, 8, 1), ("01 August 10000" to setOf()))
+            put(LocalDate(-10000, 7, 1), ("01 July -10000" to setOf()))
+            put(LocalDate(123456, 6, 1), ("01 June 123456" to setOf()))
+            put(LocalDate(-123456, 5, 1), ("01 May -123456" to setOf()))
+        }
+        val format = LocalDateFormat.build {
+            appendDayOfMonth(2)
+            appendLiteral(' ')
+            appendMonthName(listOf("January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"))
+            appendLiteral(' ')
+            appendYear(4)
+        }
+        test(format, dates)
+    }
+
+    @Test
+    fun testRomanNumerals() {
+        val dates = buildMap<LocalDate, Pair<String, Set<String>>> {
+            put(LocalDate(2008, 7, 5), ("05 VII 2008" to setOf()))
+            put(LocalDate(2007, 12, 31), ("31 XII 2007" to setOf()))
+            put(LocalDate(999, 11, 30), ("30 XI 999" to setOf()))
+            put(LocalDate(-1, 1, 2), ("02 I -1" to setOf()))
+            put(LocalDate(9999, 10, 31), ("31 X 9999" to setOf()))
+            put(LocalDate(-9999, 9, 30), ("30 IX -9999" to setOf()))
+            put(LocalDate(10000, 8, 1), ("01 VIII 10000" to setOf()))
+            put(LocalDate(-10000, 7, 1), ("01 VII -10000" to setOf()))
+            put(LocalDate(123456, 6, 1), ("01 VI 123456" to setOf()))
+            put(LocalDate(-123456, 5, 1), ("01 V -123456" to setOf()))
+        }
+        val format = LocalDateFormat.build {
+            appendDayOfMonth(2)
+            appendLiteral(' ')
+            appendMonthName(listOf("I", "II", "III", "IV", "V", "VI", "VII", "VIII", "IX", "X", "XI", "XII"))
+            appendLiteral(' ')
+            appendYear()
+        }
+        test(format, dates)
+    }
+
     private fun test(format: LocalDateFormat, strings: Map<LocalDate, Pair<String, Set<String>>>) {
         for ((date, stringsForDate) in strings) {
             val (canonicalString, otherStrings) = stringsForDate