From f9d4d316ef9666f6b122b0eec8180351216e95f8 Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Fri, 15 Mar 2019 00:23:49 -0400
Subject: Changed the convention for the structure opening separator from "/"
 to ";", to avoid confusion since "/" is used for relative module paths.

---
 stdlib/source/program/licentia/document.lux             |  4 ++--
 stdlib/source/program/licentia/license/black-list.lux   |  8 ++++----
 stdlib/source/program/licentia/license/commercial.lux   |  2 +-
 stdlib/source/program/licentia/license/distribution.lux |  4 ++--
 stdlib/source/program/licentia/license/extension.lux    |  2 +-
 stdlib/source/program/licentia/license/notice.lux       |  4 ++--
 stdlib/source/program/licentia/output.lux               | 14 +++++++-------
 7 files changed, 19 insertions(+), 19 deletions(-)

(limited to 'stdlib/source/program/licentia')

diff --git a/stdlib/source/program/licentia/document.lux b/stdlib/source/program/licentia/document.lux
index 9afbb8d7b..c04cd9d72 100644
--- a/stdlib/source/program/licentia/document.lux
+++ b/stdlib/source/program/licentia/document.lux
@@ -4,7 +4,7 @@
     ["." text
      format]
     [collection
-     ["." list ("#/." functor)]]]])
+     ["." list ("#;." functor)]]]])
 
 (def: #export (quote text)
   (-> Text Text)
@@ -24,7 +24,7 @@
 
 (def: #export paragraph
   (-> (List Text) Text)
-  (|>> (list/map ..sentence)
+  (|>> (list;map ..sentence)
        (text.join-with text.new-line)))
 
 (do-template [<name> <word>]
diff --git a/stdlib/source/program/licentia/license/black-list.lux b/stdlib/source/program/licentia/license/black-list.lux
index 1b1ec2dff..ac5ab8a2c 100644
--- a/stdlib/source/program/licentia/license/black-list.lux
+++ b/stdlib/source/program/licentia/license/black-list.lux
@@ -1,11 +1,11 @@
 (.module:
   [lux #*
    [data
-    ["." maybe ("#/." functor)]
+    ["." maybe ("#;." functor)]
     ["." text
      format]
     [collection
-     ["." list ("#/." functor)]]]]
+     ["." list ("#;." functor)]]]]
   ["." // (#+ Entity Black-List)
    ["_" term]
    [//
@@ -21,11 +21,11 @@
         effect "shall not be granted to the following entities, or any subsidiary thereof"
         justification (|> black-list
                           (get@ #//.justification)
-                          (maybe/map (|>> (format ", due to ")))
+                          (maybe;map (|>> (format ", due to ")))
                           (maybe.default ""))
         entities (|> black-list
                      (get@ #//.entities)
-                     (list/map ..entity)
+                     (list;map ..entity)
                      (text.join-with text.new-line))]
     (format scope " " effect justification ":" text.new-line
             entities)))
diff --git a/stdlib/source/program/licentia/license/commercial.lux b/stdlib/source/program/licentia/license/commercial.lux
index 37b2e2d74..787d92034 100644
--- a/stdlib/source/program/licentia/license/commercial.lux
+++ b/stdlib/source/program/licentia/license/commercial.lux
@@ -4,7 +4,7 @@
     ["." text
      format]
     [collection
-     ["." list ("#/." monoid)]]]]
+     ["." list ("#;." monoid)]]]]
   ["." // (#+ Commercial)
    ["_" term]
    [//
diff --git a/stdlib/source/program/licentia/license/distribution.lux b/stdlib/source/program/licentia/license/distribution.lux
index a42a83ba9..077735b2c 100644
--- a/stdlib/source/program/licentia/license/distribution.lux
+++ b/stdlib/source/program/licentia/license/distribution.lux
@@ -4,7 +4,7 @@
     ["." text
      format]
     [collection
-     ["." list ("#/." monoid)]]]]
+     ["." list ("#;." monoid)]]]]
   ["." // (#+ Distribution)
    ["_" term]
    [//
@@ -103,7 +103,7 @@
 
 (def: #export (extension distribution)
   (-> Distribution Text)
-  ($.paragraph ($_ list/compose
+  ($.paragraph ($_ list;compose
                    (if (get@ #//.can-re-license? distribution)
                      (list allow-re-licensing)
                      (list))
diff --git a/stdlib/source/program/licentia/license/extension.lux b/stdlib/source/program/licentia/license/extension.lux
index 7a12f45b9..83da58873 100644
--- a/stdlib/source/program/licentia/license/extension.lux
+++ b/stdlib/source/program/licentia/license/extension.lux
@@ -4,7 +4,7 @@
     ["." text
      format]
     [collection
-     ["." list ("#/." monoid)]]]]
+     ["." list ("#;." monoid)]]]]
   ["." // (#+ Extension)
    ["_" term]
    ["." grant]
diff --git a/stdlib/source/program/licentia/license/notice.lux b/stdlib/source/program/licentia/license/notice.lux
index b1cf5658e..7e775078c 100644
--- a/stdlib/source/program/licentia/license/notice.lux
+++ b/stdlib/source/program/licentia/license/notice.lux
@@ -4,7 +4,7 @@
     ["." text
      format]
     [collection
-     ["." list ("#/." functor)]]]]
+     ["." list ("#;." functor)]]]]
   ["." // #_
    ["#." time]
    ["#." copyright]
@@ -26,5 +26,5 @@
 
 (def: #export copyright
   (-> (List //copyright.Holder) Text)
-  (|>> (list/map ..copyright-holder)
+  (|>> (list;map ..copyright-holder)
        (text.join-with text.new-line)))
diff --git a/stdlib/source/program/licentia/output.lux b/stdlib/source/program/licentia/output.lux
index 475c4b908..29d61dd42 100644
--- a/stdlib/source/program/licentia/output.lux
+++ b/stdlib/source/program/licentia/output.lux
@@ -1,11 +1,11 @@
 (.module:
   [lux (#- Definition)
    [data
-    ["." maybe ("#/." functor)]
+    ["." maybe ("#;." functor)]
     ["." text
      format]
     [collection
-     ["." list ("#/." functor monoid)]]]]
+     ["." list ("#;." functor monoid)]]]]
   [//
    ["." license (#+ Identification
                     Termination
@@ -175,7 +175,7 @@
                          "")]
 
                       [(get@ #license.same-license? value) "License Retention"
-                       ($.paragraph (list/compose extension.sharing-requirement
+                       ($.paragraph (list;compose extension.sharing-requirement
                                                   extension.license-conflict-resolution))]
                       
                       [(get@ #license.must-be-distinguishable? value) (format _.extension " Distinctness")
@@ -251,7 +251,7 @@
   (-> License Text)
   (let [identification (|> value
                            (get@ #license.identification)
-                           (maybe/map ..identification)
+                           (maybe;map ..identification)
                            (maybe.default ""))
         identified? (case (get@ #license.identification value)
                       (#.Some _)
@@ -269,12 +269,12 @@
                   black-lists
                   ($.block ($.section {#$.title (format "Denial of " _.license)
                                        #$.content (|> black-lists
-                                                      (list/map black-list.black-list)
+                                                      (list;map black-list.black-list)
                                                       (text.join-with ..black-list-spacing))})))
                 
                 ($.section {#$.title "Definitions"
                             #$.content (|> definition.all
-                                           (list/map (|>> ..definition $.block))
+                                           (list;map (|>> ..definition $.block))
                                            (text.join-with ""))})
 
                 ($.block ($.section {#$.title (format "Acceptance of " _.license)
@@ -294,7 +294,7 @@
 
                 (|> value
                     (get@ #license.attribution)
-                    (maybe/map (|>> ..attribution
+                    (maybe;map (|>> ..attribution
                                     ["Attribution Information"]
                                     $.section
                                     $.block))
-- 
cgit v1.2.3