Adjusted new compilers to work with the new variant syntax.

1 files changed, 27 insertions, 12 deletions

diff --git a/stdlib/source/library/lux/data/format/json.lux b/stdlib/source/library/lux/data/format/json.lux
index aa6ef2279..f29042a83 100644
--- a/stdlib/source/library/lux/data/format/json.lux
+++ b/stdlib/source/library/lux/data/format/json.lux
@@ -67,8 +67,19 @@
   (-> (List [String JSON]) JSON)
   (|>> (dictionary.of_list text.hash) #..Object))
 
+(type: JSON'
+  (Rec JSON'
+    (Variant
+     {#Null'    Null}
+     {#Boolean' Boolean}
+     {#Number'  Number}
+     {#String'  String}
+     {#Array'   (Row JSON')}
+     {#Object'  (Dictionary String JSON')}
+     {#Code'    Code})))
+
 (def: jsonP
-  (<code>.Parser JSON)
+  (<code>.Parser JSON')
   (<>.rec
    (function (_ jsonP)
      ($_ <>.or
@@ -80,31 +91,35 @@
                   (<code>.tuple (<>.some jsonP)))
          (<>\each (dictionary.of_list text.hash)
                   (<code>.variant (<>.some (<>.and <code>.text jsonP))))
+         <code>.any
          ))))
 
 (def: (jsonF token)
-  (-> JSON Code)
+  (-> JSON' Code)
   (case token
-    {#Null _}
+    {#Null' _}
     (` #..Null)
     
-    (^template [<ctor> <json_tag>]
-      [{<json_tag> value}
-       (` {<json_tag> (~ (<ctor> value))})])
-    ([code.bit  #..Boolean]
-     [code.frac #..Number]
-     [code.text #..String])
+    (^template [<ctor> <input_tag> <output_tag>]
+      [{<input_tag> value}
+       (` {<output_tag> (~ (<ctor> value))})])
+    ([code.bit  #..Boolean' #..Boolean]
+     [code.frac #..Number' #..Number]
+     [code.text #..String' #..String])
     
-    {#Array members}
+    {#Array' members}
     (` {#..Array ((~! row.row) (~+ (row.list (row\each jsonF members))))})
 
-    {#Object pairs}
+    {#Object' pairs}
     (` {#..Object ((~! dictionary.of_list)
                    (~! text.hash)
                    (list (~+ (|> pairs
                                  dictionary.entries
                                  (list\each (function (_ [key_name value])
-                                              (` [(~ (code.text key_name)) (~ (jsonF value))])))))))})))
+                                              (` [(~ (code.text key_name)) (~ (jsonF value))])))))))})
+
+    {#Code' code}
+    code))
 
 (syntax: .public (json [token ..jsonP])
   (in (list (` (: JSON (~ (jsonF token)))))))