From a62ce3f9c2b605e0033f4772b0f64c4525de4d86 Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Wed, 11 Aug 2021 02:38:59 -0400
Subject: Relocated maybe and lazy from data to control.

---
 licentia/source/program/licentia.lux                    | 4 ++--
 licentia/source/program/licentia/license/black_list.lux | 3 ++-
 licentia/source/program/licentia/output.lux             | 3 ++-
 licentia/source/test/licentia.lux                       | 4 ++--
 4 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'licentia')

diff --git a/licentia/source/program/licentia.lux b/licentia/source/program/licentia.lux
index 69080caba..e421fe344 100644
--- a/licentia/source/program/licentia.lux
+++ b/licentia/source/program/licentia.lux
@@ -22,6 +22,7 @@
     [control
      [remember (#+ to_do)]
      ["." io (#+ IO) ("#\." monad)]
+     ["." maybe]
      ["." try (#+ Try)]
      ["." parser
       ["<.>" cli]
@@ -29,7 +30,6 @@
      [security
       ["!" capability]]]
     [data
-     ["." maybe]
      ["." text
       ["%" format (#+ format)]
       [encoding
@@ -72,7 +72,7 @@
                                                java/lang/String::trim
                                                (\ json.codec decode))]
                                      (|> json
-                                         (<json>.run /input.license)
+                                         (<json>.result /input.license)
                                          (\ ! map /output.license))))]
                 (\ file.default write (\ utf8.codec encode document) output)))]
     (wrap (debug.log! (case ?done
diff --git a/licentia/source/program/licentia/license/black_list.lux b/licentia/source/program/licentia/license/black_list.lux
index 99f85029e..96fafb6c7 100644
--- a/licentia/source/program/licentia/license/black_list.lux
+++ b/licentia/source/program/licentia/license/black_list.lux
@@ -1,8 +1,9 @@
 (.module:
   [library
    [lux #*
+    [control
+     ["." maybe ("#\." functor)]]
     [data
-     ["." maybe ("#\." functor)]
      ["." text
       ["%" format (#+ format)]]
      [collection
diff --git a/licentia/source/program/licentia/output.lux b/licentia/source/program/licentia/output.lux
index 63a70e521..9b753b4c6 100644
--- a/licentia/source/program/licentia/output.lux
+++ b/licentia/source/program/licentia/output.lux
@@ -1,9 +1,10 @@
 (.module:
   [library
    [lux (#- Definition)
+    [control
+     ["." maybe ("#\." functor)]]
     [data
      ["." bit]
-     ["." maybe ("#\." functor)]
      ["." text
       ["%" format (#+ format)]]
      [collection
diff --git a/licentia/source/test/licentia.lux b/licentia/source/test/licentia.lux
index 1ad1bb72d..b2302d8ef 100644
--- a/licentia/source/test/licentia.lux
+++ b/licentia/source/test/licentia.lux
@@ -6,10 +6,10 @@
     [abstract
      [monad (#+ do)]]
     [control
-     ["." io]]
+     ["." io]
+     ["." maybe ("#\." functor)]]
     [data
      ["." bit ("#\." equivalence)]
-     ["." maybe ("#\." functor)]
      ["." text]
      [collection
       ["." list ("#\." functor)]]]
-- 
cgit v1.2.3