From fa4f0148f683c8e59ffa762f93045f9edfc69994 Mon Sep 17 00:00:00 2001
From: Niklas Fiekas <niklas.fiekas@backscattering.de>
Date: Tue, 8 Oct 2024 22:07:21 +0200
Subject: [PATCH] Merge pull request #1113 from MarkZH/options-fix

Fix error when parsing UCI options
---
 .github/workflows/setup-ubuntu-latest.sh  |  3 +++
 .github/workflows/setup-windows-latest.sh |  6 +++++-
 chess/engine.py                           |  3 ++-
 test.py                                   | 20 ++++++++++++++++++++
 tox.ini                                   |  1 +
 5 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/setup-ubuntu-latest.sh b/.github/workflows/setup-ubuntu-latest.sh
index fae35b61a..10b8d1115 100755
--- a/.github/workflows/setup-ubuntu-latest.sh
+++ b/.github/workflows/setup-ubuntu-latest.sh
@@ -6,6 +6,9 @@ sudo apt-get install -y stockfish
 # Crafty
 sudo apt-get install -y crafty
 
+# Fairy-stockfish
+sudo apt-get install -y fairy-stockfish
+
 # Gaviota libgtb
 git clone https://github.com/michiguel/Gaviota-Tablebases.git --depth 1
 cd Gaviota-Tablebases
diff --git a/.github/workflows/setup-windows-latest.sh b/.github/workflows/setup-windows-latest.sh
index 815eb0db2..48037cbef 100755
--- a/.github/workflows/setup-windows-latest.sh
+++ b/.github/workflows/setup-windows-latest.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 
-echo Download ...
+echo Download stockfish ...
 choco install wget
 wget https://github.com/official-stockfish/Stockfish/releases/download/sf_16/stockfish-windows-x86-64-avx2.zip
 
@@ -10,3 +10,7 @@ echo Unzip ..
 echo Setup path ...
 mv stockfish-windows-x86-64-avx2.exe stockfish.exe
 pwd >> $GITHUB_PATH
+
+echo Download fairy-stockfish ...
+wget https://github.com/fairy-stockfish/Fairy-Stockfish/releases/latest/download/fairy-stockfish-largeboard_x86-64.exe
+mv fairy-stockfish-largeboard_x86-64.exe fairy-stockfish.exe
diff --git a/chess/engine.py b/chess/engine.py
index ccd6894d2..270e31e71 100644
--- a/chess/engine.py
+++ b/chess/engine.py
@@ -1367,7 +1367,8 @@ def _option(self, arg: str) -> None:
                 var = []
 
                 parameters = list(option_parts.keys()) + ['var']
-                option_regex = fr"\s*({'|'.join(parameters)})\s*"
+                inner_regex = '|'.join([fr"\b{parameter}\b" for parameter in parameters])
+                option_regex = fr"\s*({inner_regex})\s*"
                 for token in re.split(option_regex, arg.strip()):
                     if token == "var" or (token in option_parts and not option_parts[token]):
                         current_parameter = token
diff --git a/test.py b/test.py
index 6102eabdb..9e2f9d166 100755
--- a/test.py
+++ b/test.py
@@ -3134,6 +3134,26 @@ def test_sf_quit(self):
         with self.assertRaises(chess.engine.EngineTerminatedError), engine:
             engine.ping()
 
+    @catchAndSkip(FileNotFoundError, "need fairy-stockfish")
+    def test_fairy_sf_initialize(self):
+        with chess.engine.SimpleEngine.popen_uci("fairy-stockfish", setpgrp=True, debug=True):
+            pass
+
+    def test_uci_option_parse(self):
+        async def main():
+            protocol = chess.engine.UciProtocol()
+            mock = chess.engine.MockTransport(protocol)
+
+            mock.expect("uci", ["option name UCI_Variant type combo default chess var bughouse var chess var mini var minishogi var threekings", "uciok"])
+            await protocol.initialize()
+            mock.assert_done()
+
+            mock.expect("isready", ["readyok"])
+            await protocol.ping()
+            mock.assert_done()
+
+        asyncio.run(main())
+
     @catchAndSkip(FileNotFoundError, "need crafty")
     def test_crafty_play_to_mate(self):
         logging.disable(logging.WARNING)
diff --git a/tox.ini b/tox.ini
index f629723cd..8d8033676 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,6 +6,7 @@ passenv = LD_LIBRARY_PATH
 whitelist_externals =
     stockfish
     crafty
+    fairy-stockfish
 commands =
     python test.py --verbose
     python -m doctest README.rst --verbose