From 3053fd79bc6ae42415298ee056a268dc2c9b690c Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Sun, 26 Jun 2022 12:55:04 -0400
Subject: New "parser" hierarchy. [Part 4]

---
 stdlib/source/program/aedifex/input.lux  | 7 ++++---
 stdlib/source/program/aedifex/parser.lux | 8 +++++---
 2 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'stdlib/source/program')

diff --git a/stdlib/source/program/aedifex/input.lux b/stdlib/source/program/aedifex/input.lux
index 0cbe189b0..918c051b1 100644
--- a/stdlib/source/program/aedifex/input.lux
+++ b/stdlib/source/program/aedifex/input.lux
@@ -6,9 +6,7 @@
     ["[0]" mix]]
    [control
     ["[0]" pipe]
-    ["[0]" try (.only Try)]
-    [parser
-     ["<[0]>" code]]]
+    ["[0]" try (.only Try)]]
    [data
     [binary (.only Binary)]
     ["[0]" text
@@ -16,6 +14,9 @@
       ["[0]" utf8]]]
     [collection
      ["[0]" list]]]
+   [macro
+    ["[0]" code (.only)
+     ["<[1]>" \\parser]]]
    [meta
     ["[0]" location]]
    [tool
diff --git a/stdlib/source/program/aedifex/parser.lux b/stdlib/source/program/aedifex/parser.lux
index 18a682362..30660e707 100644
--- a/stdlib/source/program/aedifex/parser.lux
+++ b/stdlib/source/program/aedifex/parser.lux
@@ -4,15 +4,17 @@
    [abstract
     [monad (.only do)]]
    [control
-    ["[0]" maybe]
-    ["<>" parser (.use "[1]#[0]" functor)
-     ["<[0]>" code (.only Parser)]]]
+    ["<>" parser (.use "[1]#[0]" functor)]
+    ["[0]" maybe]]
    [data
     ["[0]" text]
     [collection
      ["[0]" set (.only Set)]
      ["[0]" dictionary (.only Dictionary)
       ["[0]" plist (.only PList)]]]]
+   [macro
+    ["[0]" code (.only)
+     ["<[1]>" \\parser (.only Parser)]]]
    [tool
     [compiler
      [meta
-- 
cgit v1.2.3