From 414c0a1a1f53322d8f4c11230ded98c5b83b6310 Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Fri, 1 Dec 2017 23:40:15 -0400
Subject: - Changed some of the syntax for macro templating. - "gensym" now
 produces Ident instead of Code.

---
 stdlib/source/lux/data/format/json.lux | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'stdlib/source/lux/data/format/json.lux')

diff --git a/stdlib/source/lux/data/format/json.lux b/stdlib/source/lux/data/format/json.lux
index 37d6f954f..2e9a1ec8a 100644
--- a/stdlib/source/lux/data/format/json.lux
+++ b/stdlib/source/lux/data/format/json.lux
@@ -75,7 +75,7 @@
       (wrap (list (` (: JSON #Null))))
 
       [_ (#.Tuple members)]
-      (wrap (list (` (: JSON (#Array (sequence (~@ (list/map wrapper members))))))))
+      (wrap (list (` (: JSON (#Array (sequence (~+ (list/map wrapper members))))))))
 
       [_ (#.Record pairs)]
       (do Monad<Meta>
@@ -88,7 +88,7 @@
                                _
                                (macro.fail "Wrong syntax for JSON object.")))
                            pairs)]
-        (wrap (list (` (: JSON (#Object (dict.from-list text.Hash<Text> (list (~@ pairs')))))))))
+        (wrap (list (` (: JSON (#Object (dict.from-list text.Hash<Text> (list (~+ pairs')))))))))
       
       _
       (wrap (list token))
-- 
cgit v1.2.3


From 1651d847ba70ee36171f3809a25bece325fd5715 Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Sat, 2 Dec 2017 12:49:25 -0400
Subject: - Added context-sensitive macro-expansion by means of "lux
 in-module", and removed all the (now unnecessary) #hidden tags. - Fixed a bug
 when loading the imports from the cache. - Added special notation for
 context-sensitive macro-expansion.

---
 stdlib/source/lux/data/format/json.lux | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'stdlib/source/lux/data/format/json.lux')

diff --git a/stdlib/source/lux/data/format/json.lux b/stdlib/source/lux/data/format/json.lux
index 2e9a1ec8a..49a739b4f 100644
--- a/stdlib/source/lux/data/format/json.lux
+++ b/stdlib/source/lux/data/format/json.lux
@@ -356,7 +356,7 @@
 ############################################################
 ############################################################
 
-(def: #hidden (show-null _) (-> Null Text) "null")
+(def: (show-null _) (-> Null Text) "null")
 (do-template [<name> <type> <codec>]
   [(def: <name> (-> <type> Text) <codec>)]
 
-- 
cgit v1.2.3