From d89d837de3475b75587a4293e094d755d2cd4626 Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Tue, 17 Nov 2020 20:23:53 -0400
Subject: Made the syntax of ^template more consistent.

---
 stdlib/source/program/scriptum.lux | 46 +++++++++++++++++++-------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

(limited to 'stdlib/source/program/scriptum.lux')

diff --git a/stdlib/source/program/scriptum.lux b/stdlib/source/program/scriptum.lux
index 9ad2c59a4..8cc7e3afb 100644
--- a/stdlib/source/program/scriptum.lux
+++ b/stdlib/source/program/scriptum.lux
@@ -168,24 +168,24 @@
       (parameter->name type-func-info level idx)
 
       (^template [<tag> <pre> <post>]
-        [_ (<tag> id)]
-        (format <pre> (%.nat id) <post>))
+        [[_ (<tag> id)]
+         (format <pre> (%.nat id) <post>)])
       ([#.Var "⌈v:" "⌋"]
        [#.Ex  "⟨e:" "⟩"])
 
       (^template [<tag> <name> <flatten>]
-        [_ (<tag> _)]
-        (let [[level' body] (<flatten> type)
-              args (level->args level level')
-              body-doc (pprint-type-definition (n.+ level level') type-func-info tags module signature? recursive-type? body)]
-          (format "(" <name> " " "[" (text.join-with " " args) "]"
-                  (case tags
-                    #.Nil
-                    (format " " body-doc)
-
-                    _
-                    (format text.new-line (prefix-lines "  " body-doc)))
-                  ")")))
+        [[_ (<tag> _)]
+         (let [[level' body] (<flatten> type)
+               args (level->args level level')
+               body-doc (pprint-type-definition (n.+ level level') type-func-info tags module signature? recursive-type? body)]
+           (format "(" <name> " " "[" (text.join-with " " args) "]"
+                   (case tags
+                     #.Nil
+                     (format " " body-doc)
+
+                     _
+                     (format text.new-line (prefix-lines "  " body-doc)))
+                   ")"))])
       ([#.UnivQ "All" type.flatten-univ-q]
        [#.ExQ   "Ex"  type.flatten-ex-q])
 
@@ -233,19 +233,19 @@
     (parameter->name [type-func-name (list)] level idx)
 
     (^template [<tag> <pre> <post>]
-      (<tag> id)
-      (format <pre> (%.nat id) <post>))
+      [(<tag> id)
+       (format <pre> (%.nat id) <post>)])
     ([#.Var "⌈" "⌋"]
      [#.Ex  "⟨" "⟩"])
 
     (^template [<tag> <name> <flatten>]
-      (<tag> _)
-      (let [[level' body] (<flatten> type)
-            args (level->args level level')
-            body-doc (pprint-type (n.+ level level') type-func-name module body)]
-        (format "(" <name> " " "[" (|> args (list.interpose " ") (text.join-with "")) "]"
-                (format " " body-doc)
-                ")")))
+      [(<tag> _)
+       (let [[level' body] (<flatten> type)
+             args (level->args level level')
+             body-doc (pprint-type (n.+ level level') type-func-name module body)]
+         (format "(" <name> " " "[" (|> args (list.interpose " ") (text.join-with "")) "]"
+                 (format " " body-doc)
+                 ")"))])
     ([#.UnivQ "All" type.flatten-univ-q]
      [#.ExQ   "Ex"  type.flatten-ex-q])
 
-- 
cgit v1.2.3