write half-point as ½

lichess-org · Sep 22, 2024 · 31beccc · 31beccc
1 parent a54cf53
commit 31beccc
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/core/src/main/scala/Outcome.scala b/core/src/main/scala/Outcome.scala
@@ -4,7 +4,7 @@ case class Outcome(winner: Option[Color]):
   override def toString = winner match
     case Some(White) => "1-0"
     case Some(Black) => "0-1"
-    case None        => "1/2-1/2"
+    case None        => "½-½"
 
 object Outcome:
 
@@ -28,6 +28,10 @@ object Outcome:
         case Zero => 0f
         case Half => 0.5f
         case One  => 1f
+      def show: String = p match
+        case Zero => "0"
+        case Half => "½"
+        case One  => "1"
 
   import Points.*
   type GamePoints = ByColor[Points]
@@ -47,12 +51,8 @@ object Outcome:
     case Outcome(None)        => ByColor(Half, Half)
 
   def showPoints(points: Option[GamePoints]): String =
-    points.fold("*"): ps =>
-      ps.mapList: p =>
-        if p == Zero then "0"
-        else if p == One then "1"
-        else "1/2"
-      .mkString("-")
+    points.fold("*"):
+      _.mapList(_.show).mkString("-")
 
   def guessPointsFromStatusAndPosition(status: Status, positionWinner: Option[Color]): Option[GamePoints] =
     import Status.*

diff --git a/core/src/main/scala/format/pgn/Parser.scala b/core/src/main/scala/format/pgn/Parser.scala
@@ -54,7 +54,7 @@ object Parser:
   val numberSuffix = (P.char('.') | whitespace).rep0.void
 
   // 10. or 10... but not 0 or 1-0 or 1/2
-  val number = (positiveIntString <* !P.charIn('‑', '–', '-', '/') ~ numberSuffix).string
+  val number = (positiveIntString <* !P.charIn('‑', '–', '-', '/', '½') ~ numberSuffix).string
 
   val forbidNullMove = P
     .stringIn(List("--", "Z0", "null", "pass", "@@@@"))

diff --git a/test-kit/src/test/scala/OutcomeTest.scala b/test-kit/src/test/scala/OutcomeTest.scala
@@ -26,7 +26,7 @@ class OutcomeTest extends ScalaCheckSuite:
     assertEquals(normalize("1-0"), "1-0")
     assertEquals(normalize("0-1"), "0-1")
     assertEquals(normalize("—:—"), "0-0")
-    assertEquals(normalize("1/2_0"), "1/2-0")
-    assertEquals(normalize("0-½"), "0-1/2")
-    assertEquals(normalize("0.5-0"), "1/2-0")
+    assertEquals(normalize("1/2_0"), "½-0")
+    assertEquals(normalize("0-½"), "0-½")
+    assertEquals(normalize("0.5-0"), "½-0")
     assertEquals(normalize("*"), "*")