From a90622e8e520ae8e427748fd958778cfd447b28c Mon Sep 17 00:00:00 2001
From: Mylloon <kennel.anri@tutanota.com>
Date: Tue, 7 May 2024 12:24:09 +0200
Subject: [PATCH] translate STORE/RESTORE in XML instead of Python

---
 converter.py  | 9 ---------
 l-systems.xsd | 2 +-
 tortue.xsl    | 8 ++------
 3 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/converter.py b/converter.py
index 9e98e6a..9ba7637 100644
--- a/converter.py
+++ b/converter.py
@@ -40,15 +40,6 @@ class System:
         represented as a couple (member, interpretation)
         """
 
-        # Interpretation of extra symbols added if necessary
-        extra_symbols = ["[", "]"]
-        for _, substitution in substitutions:
-            if any(symbol in substitution for symbol in extra_symbols):
-                self.interpretations.extend(
-                    [(extra_symbols[0], "STORE"), (extra_symbols[1], "RESTORE")]
-                )
-                break
-
     def __repr__(self):
         return pformat(object=self.__dict__, compact=True, width=120, sort_dicts=False)
 
diff --git a/l-systems.xsd b/l-systems.xsd
index 8b9fd33..2c25df7 100644
--- a/l-systems.xsd
+++ b/l-systems.xsd
@@ -44,7 +44,7 @@
                <!-- Membre d'une interprétation -->
                <xs:simpleType>
                   <xs:restriction base="xs:string">
-                     <xs:pattern value="[A-Z|\[|\]]{1}" />
+                     <xs:pattern value="[A-Z]{1}" />
                   </xs:restriction>
                </xs:simpleType>
             </xs:attribute>
diff --git a/tortue.xsl b/tortue.xsl
index f707982..ef117a9 100644
--- a/tortue.xsl
+++ b/tortue.xsl
@@ -72,10 +72,6 @@
             <xsl:choose>
                <!-- Si pas de substitution trouvé, alors on renvoie le caractère
                     tel qu'il est -->
-               <!-- TODO: Est-ce la meilleur chose à faire ?
-                    On pourrait dire que [ = [ et ] = ] dans le script python
-                    et ainsi ça ouvrirais la porte à autoriser des substitution
-                    vide -->
                <xsl:when test="not($sub)">
                   <xsl:value-of select="current()" />
                </xsl:when>
@@ -126,12 +122,12 @@
                </xsl:when>
 
                <!-- Store -->
-               <xsl:when test="$action = 'STORE'">
+               <xsl:when test="current() = '['">
                   <store />
                </xsl:when>
 
                <!-- Restore -->
-               <xsl:when test="$action = 'RESTORE'">
+               <xsl:when test="current() = ']'">
                   <restore />
                </xsl:when>