From e00e0b5f1e5fb509cf8f32424397110f524b8148 Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Thu, 16 Jun 2022 02:16:07 -0400
Subject: New "parser" hierarchy. [Part 3]

---
 licentia/source/program/licentia.lux       | 6 +++---
 licentia/source/program/licentia/input.lux | 8 +++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'licentia')

diff --git a/licentia/source/program/licentia.lux b/licentia/source/program/licentia.lux
index 11819681d..d736a5fa7 100644
--- a/licentia/source/program/licentia.lux
+++ b/licentia/source/program/licentia.lux
@@ -25,8 +25,7 @@
     ["[0]" maybe]
     ["[0]" try (.only Try)]
     ["[0]" parser
-     ["<[0]>" cli]
-     ["<[0]>" json]]
+     ["<[0]>" cli]]
     [security
      ["!" capability]]]
    [data
@@ -35,7 +34,8 @@
      [encoding
       ["[0]" utf8]]]
     [format
-     ["[0]" json]]]
+     ["[0]" json (.only)
+      ["<[1]>" \\parser (.only Parser)]]]]
    [world
     ["[0]" file]]]]
  ["[0]" /
diff --git a/licentia/source/program/licentia/input.lux b/licentia/source/program/licentia/input.lux
index b11f1a576..aa63f81d7 100644
--- a/licentia/source/program/licentia/input.lux
+++ b/licentia/source/program/licentia/input.lux
@@ -5,11 +5,13 @@
     [monad (.only do)]]
    [control
     ["[0]" exception (.only exception:)]
-    ["<>" parser
-     ["<[0]>" json (.only Parser)]]]
+    ["<>" parser]]
    [data
     [text
-     ["%" \\format (.only format)]]]
+     ["%" \\format (.only format)]]
+    [format
+     ["[0]" json
+      ["<[1]>" \\parser (.only Parser)]]]]
    [math
     [number
      ["n" nat]
-- 
cgit v1.2.3