From 78ec3e6290d2024aa48b44562418a2a11dafc169 Mon Sep 17 00:00:00 2001
From: AnotherTest <ali.mpfard@gmail.com>
Date: Sat, 8 Feb 2020 03:14:40 +0330
Subject: [PATCH] add reader macros

---
 xslt/printer.xslt          |  39 ++++++-
 xslt/reader.xslt           | 234 +++++++++++++++++++++++++++++++------
 xslt/step1_read_print.xslt |   2 +-
 3 files changed, 235 insertions(+), 40 deletions(-)

diff --git a/xslt/printer.xslt b/xslt/printer.xslt
index 35e25852..a32b907f 100644
--- a/xslt/printer.xslt
+++ b/xslt/printer.xslt
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="3.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:stylesheet version="3.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:fn="http://www.w3.org/2005/02/xpath-functions">
     <!-- expects input as a single <value><malval .../></value> -->
     <!-- output of form <value>literal string</value> -->
     <xsl:template name="malprinter-pr_str">
+        <xsl:param name="readably" as="xs:boolean" />
+
         <xsl:variable name="value">
             <xsl:copy-of select="value/malval" />
         </xsl:variable> 
@@ -19,7 +21,7 @@
             </xsl:when>
             <xsl:when test="malval/@kind = 'string'">
                 <value>
-                    <xsl:value-of select="concat('&quot;', malval/@value, '&quot;')" />
+                    <xsl:value-of select="concat('&quot;', fn:desc_string(malval/@value, $readably), '&quot;')" />
                 </value>
             </xsl:when>
             <xsl:when test="malval/@kind = 'keyword'">
@@ -44,7 +46,7 @@
                             <value><xsl:copy-of select="." /></value>
                         </xsl:variable>
                         <xsl:for-each select="$ctx">
-                            <xsl:call-template name="malprinter-pr_str"></xsl:call-template>
+                            <xsl:call-template name="malprinter-pr_str"><xsl:with-param name="readably" select="$readably"/></xsl:call-template>
                         </xsl:for-each>
                     </xsl:for-each>
                 </xsl:variable>
@@ -61,6 +63,33 @@
         </xsl:for-each>
     </xsl:template>
 
-    <xsl:template name="malprinter-pr_list">
-    </xsl:template>
+    <xsl:function name="fn:desc_string" as="xs:string">
+        <xsl:param name="str" as="xs:string" />
+        <xsl:param name="readable" as="xs:boolean" />
+        <xsl:choose>
+          <xsl:when test="$readable">
+            <xsl:variable name="sx">
+                <xsl:analyze-string select="$str" regex="\\(n|&quot;|\\)">
+                    <xsl:matching-substring>
+                        <x>
+                            <xsl:choose>
+                              <xsl:when test="regex-group(1) = 'n'">
+                                <xsl:value-of select="'&#10;'" />
+                              </xsl:when>
+                              <xsl:otherwise>
+                                <xsl:value-of select="regex-group(1)" />
+                              </xsl:otherwise>
+                            </xsl:choose>
+                        </x>
+                    </xsl:matching-substring>
+                    <xsl:non-matching-substring><x><xsl:value-of select="." /></x></xsl:non-matching-substring>
+                </xsl:analyze-string>
+            </xsl:variable>
+            <xsl:value-of select="string-join($sx/x, '')" />
+          </xsl:when>
+          <xsl:otherwise>
+              <xsl:value-of select="$str" />
+          </xsl:otherwise>
+        </xsl:choose>
+    </xsl:function>
 </xsl:stylesheet>
\ No newline at end of file
diff --git a/xslt/reader.xslt b/xslt/reader.xslt
index 86c94d39..0bb9d7e0 100644
--- a/xslt/reader.xslt
+++ b/xslt/reader.xslt
@@ -2,49 +2,49 @@
 <xsl:stylesheet version="3.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
     <!-- Expects a "tokens" in current scope -->
     <xsl:template name="malreader-peek">
-        <!-- <xsl:message>PEEK <xsl:copy-of select=".">
+        <!-- <xsl:message>PEEK <xsl:sequence select=".">
               
-            </xsl:copy-of>
+            </xsl:sequence>
         
         ;</xsl:message> -->
       <xsl:variable name="context">
         <tokens>
-            <xsl:copy-of select="tokens/*" />
+            <xsl:sequence select="tokens/*" />
         </tokens>
         <value>
             <xsl:for-each select="tokens/token[1]">
-                <xsl:copy-of select="."></xsl:copy-of>
+                <xsl:sequence select="."></xsl:sequence>
             </xsl:for-each>
         </value>
-        <xsl:copy-of select="lvalue"></xsl:copy-of>
-        <xsl:copy-of select="error"></xsl:copy-of>
+        <xsl:sequence select="lvalue"></xsl:sequence>
+        <xsl:sequence select="error"></xsl:sequence>
       </xsl:variable>
-      <xsl:for-each select="$context"><xsl:copy-of select="." /></xsl:for-each>
+      <xsl:for-each select="$context"><xsl:sequence select="." /></xsl:for-each>
     </xsl:template>
 
 
     <xsl:template name="malreader-next">
-        <!-- <xsl:message>NEXT <xsl:copy-of select=".">
+        <!-- <xsl:message>NEXT <xsl:sequence select=".">
               
-            </xsl:copy-of>
+            </xsl:sequence>
         
         ;
         </xsl:message> -->
       <xsl:variable name="context">
         <tokens>
             <xsl:for-each select="tokens/token[position() != 1]">
-                <xsl:copy-of select="." />
+                <xsl:sequence select="." />
             </xsl:for-each>
         </tokens>
         <value>
             <xsl:for-each select="tokens/token[1]">
-                <xsl:copy-of select="."></xsl:copy-of>
+                <xsl:sequence select="."></xsl:sequence>
             </xsl:for-each>
         </value>
-        <xsl:copy-of select="lvalue"></xsl:copy-of>
-        <xsl:copy-of select="error"></xsl:copy-of>
+        <xsl:sequence select="lvalue"></xsl:sequence>
+        <xsl:sequence select="error"></xsl:sequence>
       </xsl:variable>
-      <xsl:for-each select="$context"><xsl:copy-of select="./*" /></xsl:for-each>
+      <xsl:for-each select="$context"><xsl:sequence select="./*" /></xsl:for-each>
     </xsl:template>
 
     <xsl:template name="malreader-read_str">
@@ -57,14 +57,14 @@
         <xsl:for-each select="$context">
             <xsl:call-template name="malreader-read_form"></xsl:call-template>
         </xsl:for-each>
-        <!-- <xsl:copy-of select="$context" /> -->
+        <!-- <xsl:sequence select="$context" /> -->
     </xsl:template>
 
     <xsl:template name="malreader-tokenize">
         <xsl:analyze-string select="str" regex="[\s,]*(~@|[\[\]{{}}()'`~^@]|&quot;(?:\\.|[^\\&quot;])*&quot;?|;.*|[^\s\[\]{{}}('&quot;`,;)]+)" flags=";j">
             <xsl:matching-substring>
                 <xsl:variable name="match">
-                  <xsl:copy-of select="regex-group(1)" />
+                  <xsl:sequence select="regex-group(1)" />
                 </xsl:variable>
                 <xsl:if test="string-length($match) > 0">
                     <xsl:choose>
@@ -80,7 +80,7 @@
                                     <token type="string" text="{replace($match, '&quot;(.*)&quot;', '$1')}"> </token>
                                 </xsl:when>
                                 <xsl:otherwise>
-                                    <token type="error" text="Unbalanced quotes"></token>
+                                    <token type="error" text="EOF while reading string"></token>
                                 </xsl:otherwise>
                             </xsl:choose>
                         </xsl:when>
@@ -119,9 +119,12 @@
         <xsl:variable name="peek">
             <xsl:call-template name="malreader-peek"></xsl:call-template>
         </xsl:variable>
+        <xsl:variable name="next">
+            <xsl:call-template name="malreader-next"></xsl:call-template>
+        </xsl:variable>
         <xsl:for-each select="$peek">
             <xsl:choose>
-                <xsl:when test="value/token/@text = '('">
+                <xsl:when test="value/token/@text = '(' and value/token/@type = 'special'">
                     <xsl:variable name="next">
                         <xsl:call-template name="malreader-next"></xsl:call-template>
                     </xsl:variable>
@@ -132,6 +135,169 @@
                         <xsl:call-template name="malreader-read_list" />
                     </xsl:for-each>
                 </xsl:when>
+                <xsl:when test="value/token/@text = &quot;'&quot; and value/token/@type = 'special'">
+                    <xsl:for-each select="$next">
+                        <xsl:variable name="inner">
+                            <xsl:variable name="ctx">
+                                <xsl:sequence select="tokens"/>
+                            </xsl:variable>
+                            <xsl:for-each select="$ctx">
+                                <xsl:call-template name="malreader-read_form"></xsl:call-template>
+                            </xsl:for-each>
+                        </xsl:variable>
+                        <xsl:for-each select="$inner">
+                            <value>
+                                <malval kind="list">
+                                    <lvalue>
+                                        <malval kind="symbol" value="quote"></malval>
+                                        <xsl:sequence select="/value/malval" />
+                                    </lvalue>
+                                </malval>
+                            </value>
+                            <xsl:sequence select="tokens"/>
+                            <xsl:sequence select="error"/>
+                        </xsl:for-each>
+                        <xsl:sequence select="lvalue"/> <!-- preserve previous list (if any) -->
+                    </xsl:for-each>
+                </xsl:when>
+                <xsl:when test="value/token/@text = '`' and value/token/@type = 'special'">
+                    <xsl:for-each select="$next">
+                        <xsl:variable name="inner">
+                            <xsl:variable name="ctx">
+                                <xsl:sequence select="tokens"/>
+                            </xsl:variable>
+                            <xsl:for-each select="$ctx">
+                                <xsl:call-template name="malreader-read_form"></xsl:call-template>
+                            </xsl:for-each>
+                        </xsl:variable>
+                        <xsl:for-each select="$inner">
+                            <value>
+                                <malval kind="list">
+                                    <lvalue>
+                                        <malval kind="symbol" value="quasiquote"></malval>
+                                        <xsl:sequence select="/value/malval" />
+                                    </lvalue>
+                                </malval>
+                            </value>
+                            <xsl:sequence select="tokens"/>
+                            <xsl:sequence select="error"/>
+                        </xsl:for-each>
+                        <xsl:sequence select="lvalue"/> <!-- preserve previous list (if any) -->
+                    </xsl:for-each>
+                </xsl:when>
+                <xsl:when test="value/token/@text = '~' and value/token/@type = 'special'">
+                    <xsl:for-each select="$next">
+                        <xsl:variable name="inner">
+                            <xsl:variable name="ctx">
+                                <xsl:sequence select="tokens"/>
+                            </xsl:variable>
+                            <xsl:for-each select="$ctx">
+                                <xsl:call-template name="malreader-read_form"></xsl:call-template>
+                            </xsl:for-each>
+                        </xsl:variable>
+                        <xsl:for-each select="$inner">
+                            <value>
+                                <malval kind="list">
+                                    <lvalue>
+                                        <malval kind="symbol" value="unquote"></malval>
+                                        <xsl:sequence select="/value/malval" />
+                                    </lvalue>
+                                </malval>
+                            </value>
+                            <xsl:sequence select="tokens"/>
+                            <xsl:sequence select="error"/>
+                        </xsl:for-each>
+                        <xsl:sequence select="lvalue"/> <!-- preserve previous list (if any) -->
+                    </xsl:for-each>
+                </xsl:when>
+                <xsl:when test="value/token/@text = '~@' and value/token/@type = 'special'">
+                    <xsl:for-each select="$next">
+                        <xsl:variable name="inner">
+                            <xsl:variable name="ctx">
+                                <xsl:sequence select="tokens"/>
+                            </xsl:variable>
+                            <xsl:for-each select="$ctx">
+                                <xsl:call-template name="malreader-read_form"></xsl:call-template>
+                            </xsl:for-each>
+                        </xsl:variable>
+                        <xsl:for-each select="$inner">
+                            <value>
+                                <malval kind="list">
+                                    <lvalue>
+                                        <malval kind="symbol" value="splice-unquote"></malval>
+                                        <xsl:sequence select="/value/malval" />
+                                    </lvalue>
+                                </malval>
+                            </value>
+                            <xsl:sequence select="tokens"/>
+                            <xsl:sequence select="error"/>
+                        </xsl:for-each>
+                        <xsl:sequence select="lvalue"/> <!-- preserve previous list (if any) -->
+                    </xsl:for-each>
+                </xsl:when>
+                <xsl:when test="value/token/@text = '@' and value/token/@type = 'special'">
+                    <xsl:for-each select="$next">
+                        <xsl:variable name="inner">
+                            <xsl:variable name="ctx">
+                                <xsl:sequence select="tokens"/>
+                            </xsl:variable>
+                            <xsl:for-each select="$ctx">
+                                <xsl:call-template name="malreader-read_form"></xsl:call-template>
+                            </xsl:for-each>
+                        </xsl:variable>
+                        <xsl:for-each select="$inner">
+                            <value>
+                                <malval kind="list">
+                                    <lvalue>
+                                        <malval kind="symbol" value="deref"></malval>
+                                        <xsl:sequence select="/value/malval" />
+                                    </lvalue>
+                                </malval>
+                            </value>
+                            <xsl:sequence select="tokens"/>
+                            <xsl:sequence select="error"/>
+                        </xsl:for-each>
+                        <xsl:sequence select="lvalue"/> <!-- preserve previous list (if any) -->
+                    </xsl:for-each>
+                </xsl:when>
+                <xsl:when test="value/token/@text = '^' and value/token/@type = 'special'">
+                    <xsl:for-each select="$next">
+                        <xsl:variable name="meta">
+                            <xsl:variable name="ctx">
+                                <xsl:sequence select="tokens"/>
+                            </xsl:variable>
+                            <xsl:for-each select="$ctx">
+                                <xsl:call-template name="malreader-read_form"></xsl:call-template>
+                            </xsl:for-each>
+                        </xsl:variable>
+                        <xsl:variable name="form">
+                            <xsl:for-each select="$meta">
+                                <xsl:variable name="ctx">
+                                    <xsl:sequence select="tokens"/>
+                                </xsl:variable>
+                                <xsl:for-each select="$ctx">
+                                    <xsl:call-template name="malreader-read_form"></xsl:call-template>
+                                </xsl:for-each>
+                            </xsl:for-each>
+                        </xsl:variable>
+                        <xsl:for-each select="$form">
+                            <value>
+                                <malval kind="list">
+                                    <lvalue>
+                                        <malval kind="symbol" value="with-meta"></malval>
+                                        <xsl:sequence select="/value/malval" />
+                                        <xsl:for-each select="$meta">
+                                            <xsl:sequence select="/value/malval"/>
+                                        </xsl:for-each>
+                                    </lvalue>
+                                </malval>
+                            </value>
+                            <xsl:sequence select="tokens"/>
+                            <xsl:sequence select="error"/>
+                        </xsl:for-each>
+                        <xsl:sequence select="lvalue"/> <!-- preserve previous list (if any) -->
+                    </xsl:for-each>
+                </xsl:when>
                 <xsl:otherwise>
                     <xsl:call-template name="malreader-read_atom"></xsl:call-template>
                 </xsl:otherwise>
@@ -144,11 +310,11 @@
         <xsl:call-template name="malreader-read_list_helper"></xsl:call-template>
       </xsl:variable>
       <xsl:for-each select="$value">
-        <xsl:copy-of select="tokens" />
-        <xsl:copy-of select="error" />
+        <xsl:sequence select="tokens" />
+        <xsl:sequence select="error" />
         <value>
             <malval kind="list">
-                <xsl:copy-of select="lvalue[1]"/>
+                <xsl:sequence select="lvalue[1]"/>
             </malval>
         </value>
       </xsl:for-each>
@@ -167,9 +333,9 @@
                         <xsl:variable name="next">
                             <xsl:call-template name="malreader-next"></xsl:call-template>
                         </xsl:variable>
-                        <xsl:copy-of select="lvalue" />
-                        <xsl:copy-of select="$next/tokens" />
-                        <xsl:copy-of select="error" />
+                        <xsl:sequence select="lvalue" />
+                        <xsl:sequence select="$next/tokens" />
+                        <xsl:sequence select="error" />
                     </xsl:when>
                     <xsl:otherwise>
                         <xsl:variable name="form">
@@ -177,15 +343,15 @@
                         </xsl:variable>
                         <xsl:variable name="context">
                             <xsl:for-each select="$form">
-                            <!-- <xsl:message>READ_FORM <xsl:copy-of select=".">
+                            <!-- <xsl:message>READ_FORM <xsl:sequence select=".">
                                   
-                                </xsl:copy-of>
+                                </xsl:sequence>
                             
                             ;</xsl:message> -->
-                                <xsl:copy-of select="tokens" />
+                                <xsl:sequence select="tokens" />
                                 <lvalue>
-                                    <xsl:for-each select="lvalue/malval"><xsl:copy-of select="." /></xsl:for-each>
-                                    <xsl:for-each select="value/malval"><xsl:copy-of select="."/></xsl:for-each>
+                                    <xsl:for-each select="lvalue/malval"><xsl:sequence select="." /></xsl:for-each>
+                                    <xsl:for-each select="value/malval"><xsl:sequence select="."/></xsl:for-each>
                                 </lvalue>
                             </xsl:for-each>
                         </xsl:variable>
@@ -194,11 +360,11 @@
                         </xsl:for-each>
                     </xsl:otherwise>
                 </xsl:choose>
-                <xsl:copy-of select="lvalue"/>
+                <xsl:sequence select="lvalue"/>
             </xsl:for-each>
           </xsl:when>
           <xsl:otherwise>
-              <error><malval kind="error">Unbalanced input</malval></error>
+              <error><malval kind="error">EOF while reading list</malval></error>
           </xsl:otherwise>
         </xsl:choose>
     </xsl:template>
@@ -208,9 +374,9 @@
           <xsl:call-template name="malreader-next"></xsl:call-template>
         </xsl:variable>
         <xsl:for-each select="$next">
-            <xsl:copy-of select="tokens"/>
-            <xsl:copy-of select="lvalue"/>
-            <xsl:copy-of select="error"/>
+            <xsl:sequence select="tokens"/>
+            <xsl:sequence select="lvalue"/>
+            <xsl:sequence select="error"/>
             <xsl:choose>
                 <xsl:when test="value/token/@type = 'number'">
                     <value>
diff --git a/xslt/step1_read_print.xslt b/xslt/step1_read_print.xslt
index 4fa5e5fd..89a332ef 100644
--- a/xslt/step1_read_print.xslt
+++ b/xslt/step1_read_print.xslt
@@ -29,7 +29,7 @@
         </xsl:variable>
         <xsl:for-each select="$ctx">
           <xsl:variable name="str">
-            <xsl:call-template name="malprinter-pr_str"></xsl:call-template>
+            <xsl:call-template name="malprinter-pr_str"><xsl:with-param name="readably" select="true()"/></xsl:call-template>
           </xsl:variable>
           <xsl:value-of select="$str" />
         </xsl:for-each>
-- 
2.20.1