Allow multi-digit held pieces in SFEN

TollyH · Feb 23, 2023 · f80a8e8 · f80a8e8
1 parent 9e8aac3
commit f80a8e8
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/ShogiGame.cs b/ShogiGame.cs
@@ -860,6 +860,7 @@ public static ShogiGame FromShogiForsythEdwards(string forsythEdwards)
             };
 
             int numberToAdd = 1;
+            bool numberChanged = false;
             foreach (char pieceChar in fields[2])
             {
                 switch (pieceChar)
@@ -912,7 +913,17 @@ public static ShogiGame FromShogiForsythEdwards(string forsythEdwards)
                         if (pieceChar is > '0' and <= '9')
                         {
                             // char - '0' gets numeric value of ASCII number
-                            numberToAdd = pieceChar - '0';
+                            int charValue = pieceChar - '0';
+                            if (!numberChanged)
+                            {
+                                numberToAdd = charValue;
+                                numberChanged = true;
+                            }
+                            else
+                            {
+                                numberToAdd *= 10;
+                                numberToAdd += charValue;
+                            }
                             continue;
                         }
                         else
@@ -921,6 +932,7 @@ public static ShogiGame FromShogiForsythEdwards(string forsythEdwards)
                         }
                 }
                 numberToAdd = 1;
+                numberChanged = false;
             }
 
             // Shogi Forsyth–Edwards doesn't define what the previous moves were, so they moves list starts empty