From 2c99b4515447315d76a8dc203a2dbcafc09506ea Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Sat, 17 Jul 2021 01:48:49 -0400
Subject: Now properly loading cached modules.

---
 licentia/source/program/licentia.lux               | 51 +++++++++++-----------
 licentia/source/program/licentia/document.lux      | 13 +++---
 licentia/source/program/licentia/input.lux         | 31 ++++++-------
 licentia/source/program/licentia/license.lux       |  3 +-
 .../source/program/licentia/license/addendum.lux   |  9 ++--
 .../source/program/licentia/license/assurance.lux  |  9 ++--
 .../source/program/licentia/license/black_list.lux | 15 ++++---
 .../source/program/licentia/license/commercial.lux |  9 ++--
 .../source/program/licentia/license/copyright.lux  |  3 +-
 .../source/program/licentia/license/definition.lux |  9 ++--
 .../program/licentia/license/distribution.lux      | 13 +++---
 .../source/program/licentia/license/extension.lux  |  9 ++--
 licentia/source/program/licentia/license/grant.lux |  9 ++--
 .../source/program/licentia/license/liability.lux  |  9 ++--
 .../source/program/licentia/license/limitation.lux |  9 ++--
 .../program/licentia/license/miscellaneous.lux     |  9 ++--
 .../source/program/licentia/license/notice.lux     | 19 ++++----
 .../source/program/licentia/license/submission.lux |  9 ++--
 licentia/source/program/licentia/license/term.lux  |  3 +-
 licentia/source/program/licentia/license/time.lux  |  3 +-
 licentia/source/program/licentia/output.lux        | 38 ++++++++--------
 licentia/source/test/licentia.lux                  | 43 +++++++++---------
 22 files changed, 174 insertions(+), 151 deletions(-)

(limited to 'licentia/source')

diff --git a/licentia/source/program/licentia.lux b/licentia/source/program/licentia.lux
index a3b30a5c2..523a0a55c 100644
--- a/licentia/source/program/licentia.lux
+++ b/licentia/source/program/licentia.lux
@@ -12,31 +12,32 @@
 ## Eclipse Public License v2.0: https://www.eclipse.org/legal/epl-2.0/
 
 (.module:
-  [lux #*
-   [ffi (#+ import:)]
-   [program (#+ program:)]
-   ["." debug]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    [remember (#+ to_do)]
-    ["." io (#+ IO) ("#\." monad)]
-    ["." try (#+ Try)]
-    ["." parser
-     ["<.>" cli]
-     ["<.>" json]]
-    [security
-     ["!" capability]]]
-   [data
-    ["." maybe]
-    ["." text
-     ["%" format (#+ format)]
-     [encoding
-      ["." utf8]]]
-    [format
-     ["." json]]]
-   [world
-    ["." file]]]
+  [library
+   [lux #*
+    [ffi (#+ import:)]
+    [program (#+ program:)]
+    ["." debug]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     [remember (#+ to_do)]
+     ["." io (#+ IO) ("#\." monad)]
+     ["." try (#+ Try)]
+     ["." parser
+      ["<.>" cli]
+      ["<.>" json]]
+     [security
+      ["!" capability]]]
+    [data
+     ["." maybe]
+     ["." text
+      ["%" format (#+ format)]
+      [encoding
+       ["." utf8]]]
+     [format
+      ["." json]]]
+    [world
+     ["." file]]]]
   ["." / #_
    ["#." input]
    ["#." output]])
diff --git a/licentia/source/program/licentia/document.lux b/licentia/source/program/licentia/document.lux
index f56f0dbe7..31f05a818 100644
--- a/licentia/source/program/licentia/document.lux
+++ b/licentia/source/program/licentia/document.lux
@@ -1,10 +1,11 @@
 (.module:
-  [lux (#- or and)
-   [data
-    ["." text
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#\." functor)]]]])
+  [library
+   [lux (#- or and)
+    [data
+     ["." text
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#\." functor)]]]]])
 
 (def: #export (quote text)
   (-> Text Text)
diff --git a/licentia/source/program/licentia/input.lux b/licentia/source/program/licentia/input.lux
index 52205762d..06c73fef2 100644
--- a/licentia/source/program/licentia/input.lux
+++ b/licentia/source/program/licentia/input.lux
@@ -1,19 +1,20 @@
 (.module:
-  [lux #*
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." exception (#+ exception:)]
-    ["<>" parser
-     ["<.>" json (#+ Parser)]]]
-   [data
-    [text
-     ["%" format (#+ format)]]]
-   [math
-    [number
-     ["n" nat]
-     ["i" int]
-     ["f" frac]]]]
+  [library
+   [lux #*
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." exception (#+ exception:)]
+     ["<>" parser
+      ["<.>" json (#+ Parser)]]]
+    [data
+     [text
+      ["%" format (#+ format)]]]
+    [math
+     [number
+      ["n" nat]
+      ["i" int]
+      ["f" frac]]]]]
   ["." // #_
    ["#" license (#+ Identification
                     Termination
diff --git a/licentia/source/program/licentia/license.lux b/licentia/source/program/licentia/license.lux
index ad7328641..811b983e0 100644
--- a/licentia/source/program/licentia/license.lux
+++ b/licentia/source/program/licentia/license.lux
@@ -1,5 +1,6 @@
 (.module:
-  [lux #*]
+  [library
+   [lux #*]]
   ["." / #_
    [time (#+ Days Months Period)]
    ["#." copyright]])
diff --git a/licentia/source/program/licentia/license/addendum.lux b/licentia/source/program/licentia/license/addendum.lux
index e4a8d6364..dd13cfeb7 100644
--- a/licentia/source/program/licentia/license/addendum.lux
+++ b/licentia/source/program/licentia/license/addendum.lux
@@ -1,8 +1,9 @@
 (.module:
-  [lux #*
-   [data
-    [text
-     ["%" format (#+ format)]]]]
+  [library
+   [lux #*
+    [data
+     [text
+      ["%" format (#+ format)]]]]]
   ["." // (#+ Addendum)
    [//
     ["$" document]]])
diff --git a/licentia/source/program/licentia/license/assurance.lux b/licentia/source/program/licentia/license/assurance.lux
index 5c1adfef7..a60de7a91 100644
--- a/licentia/source/program/licentia/license/assurance.lux
+++ b/licentia/source/program/licentia/license/assurance.lux
@@ -1,8 +1,9 @@
 (.module:
-  [lux #*
-   [data
-    ["." text
-     ["%" format (#+ format)]]]]
+  [library
+   [lux #*
+    [data
+     ["." text
+      ["%" format (#+ format)]]]]]
   [//
    ["_" term]
    [//
diff --git a/licentia/source/program/licentia/license/black_list.lux b/licentia/source/program/licentia/license/black_list.lux
index d260f1865..0a5b62580 100644
--- a/licentia/source/program/licentia/license/black_list.lux
+++ b/licentia/source/program/licentia/license/black_list.lux
@@ -1,11 +1,12 @@
 (.module:
-  [lux #*
-   [data
-    ["." maybe ("#\." functor)]
-    ["." text
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#\." functor)]]]]
+  [library
+   [lux #*
+    [data
+     ["." maybe ("#\." functor)]
+     ["." text
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#\." functor)]]]]]
   ["." // (#+ Entity Black_List)
    ["_" term]
    [//
diff --git a/licentia/source/program/licentia/license/commercial.lux b/licentia/source/program/licentia/license/commercial.lux
index 3c223b05d..03f3757e1 100644
--- a/licentia/source/program/licentia/license/commercial.lux
+++ b/licentia/source/program/licentia/license/commercial.lux
@@ -1,8 +1,9 @@
 (.module:
-  [lux #*
-   [data
-    ["." text
-     ["%" format (#+ format)]]]]
+  [library
+   [lux #*
+    [data
+     ["." text
+      ["%" format (#+ format)]]]]]
   ["." // (#+ Commercial)
    ["_" term]
    [//
diff --git a/licentia/source/program/licentia/license/copyright.lux b/licentia/source/program/licentia/license/copyright.lux
index 872af9d2b..ab9b262d6 100644
--- a/licentia/source/program/licentia/license/copyright.lux
+++ b/licentia/source/program/licentia/license/copyright.lux
@@ -1,5 +1,6 @@
 (.module:
-  [lux #*]
+  [library
+   [lux #*]]
   [//
    [time (#+ Year Period)]])
 
diff --git a/licentia/source/program/licentia/license/definition.lux b/licentia/source/program/licentia/license/definition.lux
index f44a06fdc..0c930c847 100644
--- a/licentia/source/program/licentia/license/definition.lux
+++ b/licentia/source/program/licentia/license/definition.lux
@@ -1,8 +1,9 @@
 (.module:
-  [lux (#- Definition)
-   [data
-    ["." text
-     ["%" format (#+ format)]]]]
+  [library
+   [lux (#- Definition)
+    [data
+     ["." text
+      ["%" format (#+ format)]]]]]
   [///
    ["$" document]])
 
diff --git a/licentia/source/program/licentia/license/distribution.lux b/licentia/source/program/licentia/license/distribution.lux
index 7c736be7a..82450ac0a 100644
--- a/licentia/source/program/licentia/license/distribution.lux
+++ b/licentia/source/program/licentia/license/distribution.lux
@@ -1,10 +1,11 @@
 (.module:
-  [lux #*
-   [data
-    ["." text
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#\." monoid)]]]]
+  [library
+   [lux #*
+    [data
+     ["." text
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#\." monoid)]]]]]
   ["." // (#+ Distribution)
    ["_" term]
    [//
diff --git a/licentia/source/program/licentia/license/extension.lux b/licentia/source/program/licentia/license/extension.lux
index 0ed6ca040..7ded0d0ca 100644
--- a/licentia/source/program/licentia/license/extension.lux
+++ b/licentia/source/program/licentia/license/extension.lux
@@ -1,8 +1,9 @@
 (.module:
-  [lux #*
-   [data
-    ["." text
-     ["%" format (#+ format)]]]]
+  [library
+   [lux #*
+    [data
+     ["." text
+      ["%" format (#+ format)]]]]]
   ["." // (#+ Extension)
    ["_" term]
    ["." grant]
diff --git a/licentia/source/program/licentia/license/grant.lux b/licentia/source/program/licentia/license/grant.lux
index ea7ac399f..92995f0b4 100644
--- a/licentia/source/program/licentia/license/grant.lux
+++ b/licentia/source/program/licentia/license/grant.lux
@@ -1,8 +1,9 @@
 (.module:
-  [lux #*
-   [data
-    ["." text
-     ["%" format (#+ format)]]]]
+  [library
+   [lux #*
+    [data
+     ["." text
+      ["%" format (#+ format)]]]]]
   [//
    [time (#+ Days)]
    ["_" term]
diff --git a/licentia/source/program/licentia/license/liability.lux b/licentia/source/program/licentia/license/liability.lux
index b4c410444..d6208b3e4 100644
--- a/licentia/source/program/licentia/license/liability.lux
+++ b/licentia/source/program/licentia/license/liability.lux
@@ -1,8 +1,9 @@
 (.module:
-  [lux #*
-   [data
-    ["." text
-     ["%" format (#+ format)]]]]
+  [library
+   [lux #*
+    [data
+     ["." text
+      ["%" format (#+ format)]]]]]
   [//
    ["_" term]
    [//
diff --git a/licentia/source/program/licentia/license/limitation.lux b/licentia/source/program/licentia/license/limitation.lux
index 77611d3a6..daec0f569 100644
--- a/licentia/source/program/licentia/license/limitation.lux
+++ b/licentia/source/program/licentia/license/limitation.lux
@@ -1,8 +1,9 @@
 (.module:
-  [lux #*
-   [data
-    ["." text
-     ["%" format (#+ format)]]]]
+  [library
+   [lux #*
+    [data
+     ["." text
+      ["%" format (#+ format)]]]]]
   [//
    ["_" term]
    [//
diff --git a/licentia/source/program/licentia/license/miscellaneous.lux b/licentia/source/program/licentia/license/miscellaneous.lux
index 3e4371fe1..321482860 100644
--- a/licentia/source/program/licentia/license/miscellaneous.lux
+++ b/licentia/source/program/licentia/license/miscellaneous.lux
@@ -1,8 +1,9 @@
 (.module:
-  [lux #*
-   [data
-    ["." text
-     ["%" format (#+ format)]]]]
+  [library
+   [lux #*
+    [data
+     ["." text
+      ["%" format (#+ format)]]]]]
   [//
    ["_" term]
    [//
diff --git a/licentia/source/program/licentia/license/notice.lux b/licentia/source/program/licentia/license/notice.lux
index 7ee61397a..b6422205f 100644
--- a/licentia/source/program/licentia/license/notice.lux
+++ b/licentia/source/program/licentia/license/notice.lux
@@ -1,13 +1,14 @@
 (.module:
-  [lux #*
-   [data
-    ["." text
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#\." functor)]]]
-   [math
-    [number
-     ["n" nat]]]]
+  [library
+   [lux #*
+    [data
+     ["." text
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#\." functor)]]]
+    [math
+     [number
+      ["n" nat]]]]]
   ["." // #_
    ["#." time]
    ["#." copyright]
diff --git a/licentia/source/program/licentia/license/submission.lux b/licentia/source/program/licentia/license/submission.lux
index 284deb88b..01dfad08f 100644
--- a/licentia/source/program/licentia/license/submission.lux
+++ b/licentia/source/program/licentia/license/submission.lux
@@ -1,8 +1,9 @@
 (.module:
-  [lux #*
-   [data
-    ["." text
-     ["%" format (#+ format)]]]]
+  [library
+   [lux #*
+    [data
+     ["." text
+      ["%" format (#+ format)]]]]]
   [//
    ["_" term]
    [//
diff --git a/licentia/source/program/licentia/license/term.lux b/licentia/source/program/licentia/license/term.lux
index cd42b569f..49fd42569 100644
--- a/licentia/source/program/licentia/license/term.lux
+++ b/licentia/source/program/licentia/license/term.lux
@@ -1,5 +1,6 @@
 (.module:
-  [lux (#- Definition)]
+  [library
+   [lux (#- Definition)]]
   ["." // #_
    ["#." definition]])
 
diff --git a/licentia/source/program/licentia/license/time.lux b/licentia/source/program/licentia/license/time.lux
index 22f28f607..32be12aa8 100644
--- a/licentia/source/program/licentia/license/time.lux
+++ b/licentia/source/program/licentia/license/time.lux
@@ -1,5 +1,6 @@
 (.module:
-  [lux #*])
+  [library
+   [lux #*]])
 
 (type: #export Days
   Nat)
diff --git a/licentia/source/program/licentia/output.lux b/licentia/source/program/licentia/output.lux
index 691612b6e..3519a88ce 100644
--- a/licentia/source/program/licentia/output.lux
+++ b/licentia/source/program/licentia/output.lux
@@ -1,11 +1,13 @@
 (.module:
-  [lux (#- Definition)
-   [data
-    ["." maybe ("#\." functor)]
-    ["." text
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#\." functor monoid)]]]]
+  [library
+   [lux (#- Definition)
+    [data
+     ["." bit]
+     ["." maybe ("#\." functor)]
+     ["." text
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#\." functor monoid)]]]]]
   [//
    ["." license (#+ Identification
                     Termination
@@ -100,15 +102,15 @@
                        "")]
 
                     ["Disclaimer of Warranty"
-                     on
+                     bit.on
                      liability.warranty]
                     
                     ["Limitation of Liability"
-                     on
+                     bit.on
                      liability.limitation]
                     
                     ["Litigation"
-                     on
+                     bit.on
                      liability.litigation]
                     
                     ["Accepting Warranty or Additional Liability"
@@ -128,11 +130,11 @@
                        "")]
                     
                     [(format "Distribution of a " _.source_code_form)
-                     on
+                     bit.on
                      distribution.source_code_form]
                     
                     [(format "Distribution of an " _.object_form)
-                     on
+                     bit.on
                      distribution.object_form]
                     
                     [(format "Distribution of an " _.extension)
@@ -218,27 +220,27 @@
                        "")]
 
                     ["Entire Agreement"
-                     on
+                     bit.on
                      miscellaneous.entire_agreement]
 
                     ["Relationship of Parties"
-                     on
+                     bit.on
                      miscellaneous.relationship_of_parties]
 
                     ["Independent Development"
-                     on
+                     bit.on
                      miscellaneous.independent_development]
 
                     ["Consent To Breach Not Waiver"
-                     on
+                     bit.on
                      miscellaneous.not_waiver]
                     
                     ["Severability"
-                     on
+                     bit.on
                      miscellaneous.severability]
 
                     ["Export Restrictions"
-                     on
+                     bit.on
                      miscellaneous.export_restrictions]
 
                     [(format "Versions of " _.license)
diff --git a/licentia/source/test/licentia.lux b/licentia/source/test/licentia.lux
index 5ae86cfdb..1ad1bb72d 100644
--- a/licentia/source/test/licentia.lux
+++ b/licentia/source/test/licentia.lux
@@ -1,22 +1,24 @@
 (.module:
-  [lux #*
-   [program (#+ program:)]
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." io]]
-   [data
-    ["." bit ("#\." equivalence)]
-    ["." maybe ("#\." functor)]
-    ["." text]
-    [collection
-     ["." list ("#\." functor)]]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["n" nat ("#\." interval)]]]]
+  [library
+   [lux #*
+    [program (#+ program:)]
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." io]]
+    [data
+     ["." bit ("#\." equivalence)]
+     ["." maybe ("#\." functor)]
+     ["." text]
+     [collection
+      ["." list ("#\." functor)]]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["n" nat ("#\." interval)]]]]]
   [\\program
+   ["." output]
    ["." license (#+ Identification
                     Termination
                     Liability
@@ -40,8 +42,7 @@
     ["." extension]
     ["." miscellaneous]
     ["." black_list]
-    ["." addendum]]
-   ["." output]])
+    ["." addendum]]])
 
 (def: period
   (Random (Period Nat))
@@ -311,7 +312,7 @@
                                                                 (present? justification)
 
                                                                 #.None
-                                                                yes)
+                                                                bit.yes)
                                      every_entity_is_mentioned? (|> black_list
                                                                     (get@ #license.entities)
                                                                     (list\map black_list.entity)
@@ -352,7 +353,7 @@
 
           #.None
           (_.test "Attribution is missing."
-                  yes))
+                  bit.yes))
 
         (..about_miscellaneous present?)
 
-- 
cgit v1.2.3