New "parser" hierarchy. [Part 3]

3 files changed, 12 insertions, 13 deletions

diff --git a/stdlib/source/library/lux/world/net/http/request.lux b/stdlib/source/library/lux/world/net/http/request.lux
index d3a970d14..13c57ed23 100644
--- a/stdlib/source/library/lux/world/net/http/request.lux
+++ b/stdlib/source/library/lux/world/net/http/request.lux
@@ -8,17 +8,16 @@
     ["[0]" try (.only Try)]
     [concurrency
      ["[0]" async (.only Async)]
-     ["[0]" frp]]
-    [parser
-     ["<[0]>" json]]]
+     ["[0]" frp]]]
    [data
     ["[0]" number
      ["n" nat]]
     ["[0]" text
      ["[0]" encoding]]
     [format
-     ["[0]" json (.only JSON)]
-     ["[0]" context (.only Context Property)]]
+     ["[0]" context (.only Context Property)]
+     ["[0]" json (.only JSON)
+      ["<[1]>" \\parser]]]
     [collection
      ["[0]" list (.open: "[1]#[0]" functor mix)]
      ["[0]" dictionary]]]
diff --git a/stdlib/source/library/lux/control/parser/json.lux b/stdlib/source/parser/lux/data/format/json.lux
index 308c8c918..2f54560e9 100644
--- a/stdlib/source/library/lux/control/parser/json.lux
+++ b/stdlib/source/parser/lux/data/format/json.lux
@@ -4,6 +4,7 @@
    [abstract
     ["[0]" monad (.only do)]]
    [control
+    ["//" parser (.open: "[1]#[0]" functor)]
     ["[0]" try (.only Try)]
     ["[0]" exception (.only exception:)]]
    [data
@@ -12,15 +13,14 @@
     [collection
      ["[0]" list (.open: "[1]#[0]" functor)]
      ["[0]" sequence]
-     ["[0]" dictionary (.only Dictionary)]]
-    [format
-     ["/" json (.only JSON)]]]
+     ["[0]" dictionary (.only Dictionary)]]]
    [macro
     ["[0]" code]]
    [math
     [number
      ["[0]" frac]]]]]
- ["[0]" // (.open: "[1]#[0]" functor)])
+ [\\library
+  ["[0]" / (.only JSON)]])
 
 (type: .public (Parser a)
   (//.Parser (List JSON) a))
diff --git a/stdlib/source/library/lux/control/parser/xml.lux b/stdlib/source/parser/lux/data/format/xml.lux
index 16802de51..6b2ddf79c 100644
--- a/stdlib/source/library/lux/control/parser/xml.lux
+++ b/stdlib/source/parser/lux/data/format/xml.lux
@@ -4,6 +4,7 @@
    [abstract
     [monad (.only do)]]
    [control
+    ["//" parser]
     ["[0]" try (.only Try) (.open: "[1]#[0]" functor)]
     ["[0]" exception (.only exception:)]]
    [data
@@ -11,12 +12,11 @@
      ["%" \\format (.only format)]]
     [collection
      ["[0]" list]
-     ["[0]" dictionary]]
-    [format
-     ["/" xml (.only Attribute Attrs Tag XML)]]]
+     ["[0]" dictionary]]]
    [meta
     ["[0]" symbol (.open: "[1]#[0]" equivalence codec)]]]]
- ["[0]" //])
+ [\\library
+  ["[0]" / (.only Attribute Attrs Tag XML)]])
 
 (type: .public (Parser a)
   (//.Parser [Attrs (List XML)] a))