From c77e046409ecb8d199ed94960d105f55f61c533e Mon Sep 17 00:00:00 2001
From: AnotherTest <ali.mpfard@gmail.com>
Date: Tue, 25 Feb 2020 23:27:34 +0330
Subject: [PATCH] be more spec-compatible with readline

---
 impls/xslt/env.xslt       | 9 ++++++++-
 impls/xslt/stepA_mal.xslt | 3 ++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/impls/xslt/env.xslt b/impls/xslt/env.xslt
index 7be5a958..0b6ee5f4 100644
--- a/impls/xslt/env.xslt
+++ b/impls/xslt/env.xslt
@@ -29,7 +29,14 @@
                 <xsl:variable name="apos" select='"&apos;"'></xsl:variable>
                 <xsl:value-of select="error(QName('MAL', 'Error'), concat($apos, $name, $apos, ' not found'), fn:makeMALValue(concat($apos, $name, $apos, ' not found'), 'string'))" />
             </xsl:when>
-            <xsl:otherwise><xsl:sequence select="parse-xml($value)"/></xsl:otherwise>
+            <xsl:otherwise>
+                <xsl:try>
+                    <xsl:sequence select="parse-xml($value)"/>
+                    <xsl:catch errors="*">
+                        <xsl:sequence select="$value"/>
+                    </xsl:catch>
+                </xsl:try>
+            </xsl:otherwise>
         </xsl:choose>
     </xsl:function>
 
diff --git a/impls/xslt/stepA_mal.xslt b/impls/xslt/stepA_mal.xslt
index 58948d8b..6959dc4d 100644
--- a/impls/xslt/stepA_mal.xslt
+++ b/impls/xslt/stepA_mal.xslt
@@ -836,7 +836,8 @@ ENV IS <xsl:sequence select="$value/env/@data => env:deserialise()"/>
                                 <xsl:message>
                                   <request kind="readline" value="{$args/value/malval/lvalue/malval[1]/@value}"/>
                                 </xsl:message>
-                                <xsl:sequence select="core:makeMALType(unparsed-text('xsl_input-string'), 'string')"/>
+                                <xsl:variable name="str" select="unparsed-text('xsl_input-string')"></xsl:variable>
+                                <xsl:sequence select="core:makeMALType($str, if (string-length($str) = 0) then 'nil' else 'string')"/>
                                 <xsl:sequence select="env"/>
                                 <xsl:sequence select="$atoms"/>
                               </xsl:when>
-- 
2.20.1