From b96beb587c11fcfbce86ce2d62351600cf6cad1b Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Sat, 2 Jul 2022 05:38:27 -0400
Subject: More traditional names for unquoting macros.

---
 stdlib/source/documentation/lux.lux | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

(limited to 'stdlib/source/documentation/lux.lux')

diff --git a/stdlib/source/documentation/lux.lux b/stdlib/source/documentation/lux.lux
index 0b0e815a7..7be9e1622 100644
--- a/stdlib/source/documentation/lux.lux
+++ b/stdlib/source/documentation/lux.lux
@@ -34,7 +34,6 @@
   ["[1][0]" test]
   ["[1][0]" time]
   ["[1][0]" tool] ... TODO: Documentation for this
-  ["[1][0]" type]
   ["[1][0]" world]])
 
 (.`` (.def .public documentation
@@ -235,18 +234,18 @@
 
                   ($.documentation /.`
                     (format "Hygienic quasi-quotation as a macro."
-                            \n "Unquote (~) and unquote-splice (~+) must also be used as forms."
+                            \n "Unquote (,) and unquote-splice (,*) must also be used as forms."
                             \n "All unprefixed macros will receive their parent module's prefix if imported; otherwise will receive the prefix of the module on which the quasi-quote is being used.")
-                    [(` (def (~ name)
-                          (function ((~' _) (~+ args))
-                            (~ body))))])
+                    [(` (def (, name)
+                          (function ((,' _) (,* args))
+                            (, body))))])
 
                   ($.documentation /.`'
                     (format "Unhygienic quasi-quotation as a macro."
-                            \n "Unquote (~) and unquote-splice (~+) must also be used as forms.")
-                    [(`' (def (~ name)
-                           (function (_ (~+ args))
-                             (~ body))))])
+                            \n "Unquote (,) and unquote-splice (,*) must also be used as forms.")
+                    [(`' (def (, name)
+                           (function (_ (,* args))
+                             (, body))))])
 
                   ($.documentation /.'
                     "Quotation as a macro."
@@ -430,7 +429,7 @@
                          (case tokens
                            (^with_template [<tag>]
                                            [(pattern (list [_ {<tag> [module name]}]))
-                                            (in (list (` [(~ (text$ module)) (~ (text$ name))])))])
+                                            (in (list (` [(, (text$ module)) (, (text$ name))])))])
                            ([#Symbol])
                            
                            _
@@ -502,7 +501,7 @@
                         (is (-> a a Bit)
                             <)))])
 
-                  (.~~ (.with_template [<name>]
+                  (.,, (.with_template [<name>]
                          [($.documentation <name>
                             "Safe type-casting for I64 values.")]
 
@@ -655,7 +654,7 @@
                   ...        type
                   ...        ))])
 
-                  (.~~ (.with_template [<name> <doc>]
+                  (.,, (.with_template [<name> <doc>]
                          [($.documentation <name>
                             <doc>)]
 
@@ -846,15 +845,15 @@
 
                   ($.documentation /.``
                     (format "Delimits a controlled (spliced) macro-expansion."
-                            \n "Uses a (~~) special form to specify where to expand.")
+                            \n "Uses a (,,) special form to specify where to expand.")
                     [(`` (some expression
-                               (~~ (some macro which may yield 0 or more results))))])
+                               (,, (some macro which may yield 0 or more results))))])
 
                   ... ($.documentation /.^code
                   ...   "Generates pattern-matching code for Code values in a way that looks like code-templating."
                   ...   [(is (Maybe Nat)
                   ...        (case (` (#0 123 +456.789))
-                  ...          (^code (#0 (~ [_ {.#Nat number}]) +456.789))
+                  ...          (^code (#0 (, [_ {.#Nat number}]) +456.789))
                   ...          {.#Some number}
 
                   ...          _
@@ -908,7 +907,6 @@
                   /test.documentation
                   /time.documentation
                   /tool.documentation
-                  /type.documentation
                   /world.documentation])))
 
 (program: inputs
-- 
cgit v1.2.3