Re-named \ => # && \\ => ##

7 files changed, 44 insertions, 44 deletions

diff --git a/licentia/source/program/licentia.lux b/licentia/source/program/licentia.lux
index 5ba705517..fd2ee3202 100644
--- a/licentia/source/program/licentia.lux
+++ b/licentia/source/program/licentia.lux
@@ -21,7 +21,7 @@
      [monad {"+" [do]}]]
     [control
      [remember {"+" [to_do]}]
-     ["[0]" io {"+" [IO]} ("[1]\[0]" monad)]
+     ["[0]" io {"+" [IO]} ("[1]#[0]" monad)]
      ["[0]" maybe]
      ["[0]" try {"+" [Try]}]
      ["[0]" parser
@@ -65,16 +65,16 @@
   (do io.monad
     [?done (: (IO (Try Any))
               (do (try.with io.monad)
-                [blob (\ file.default read input)
-                 document (io\wrap (do [! try.monad]
-                                     [raw_json (\ utf8.codec decoded blob)
+                [blob (# file.default read input)
+                 document (io#wrap (do [! try.monad]
+                                     [raw_json (# utf8.codec decoded blob)
                                       json (|> raw_json
                                                java/lang/String::trim
-                                               (\ json.codec decoded))]
+                                               (# json.codec decoded))]
                                      (|> json
                                          (<json>.result /input.license)
-                                         (\ ! each /output.license))))]
-                (\ file.default write (\ utf8.codec encoded document) output)))]
+                                         (# ! each /output.license))))]
+                (# file.default write (# utf8.codec encoded document) output)))]
     (wrap (debug.log! (case ?done
                         {try.#Success _}
                         (success_message output)
diff --git a/licentia/source/program/licentia/document.lux b/licentia/source/program/licentia/document.lux
index a5a6251b2..b4eb63453 100644
--- a/licentia/source/program/licentia/document.lux
+++ b/licentia/source/program/licentia/document.lux
@@ -5,7 +5,7 @@
      ["[0]" text
       ["%" format {"+" [format]}]]
      [collection
-      ["[0]" list ("[1]\[0]" functor)]]]]])
+      ["[0]" list ("[1]#[0]" functor)]]]]])
 
 (def: .public (quote text)
   (-> Text Text)
@@ -25,7 +25,7 @@
 
 (def: .public paragraph
   (-> (List Text) Text)
-  (|>> (list\each ..sentence)
+  (|>> (list#each ..sentence)
        (text.interposed text.new_line)))
 
 (template [<name> <word>]
diff --git a/licentia/source/program/licentia/license/black_list.lux b/licentia/source/program/licentia/license/black_list.lux
index b17c674bf..14e851c99 100644
--- a/licentia/source/program/licentia/license/black_list.lux
+++ b/licentia/source/program/licentia/license/black_list.lux
@@ -2,12 +2,12 @@
   [library
    [lux "*"
     [control
-     ["[0]" maybe ("[1]\[0]" functor)]]
+     ["[0]" maybe ("[1]#[0]" functor)]]
     [data
      ["[0]" text
       ["%" format {"+" [format]}]]
      [collection
-      ["[0]" list ("[1]\[0]" functor)]]]]]
+      ["[0]" list ("[1]#[0]" functor)]]]]]
   ["[0]" // {"+" [Entity Black_List]}
    ["_" term]
    [//
@@ -23,11 +23,11 @@
         effect "shall not be granted to the following entities, or any subsidiary thereof"
         justification (|> black_list
                           (value@ //.#justification)
-                          (maybe\each (|>> (format ", due to ")))
+                          (maybe#each (|>> (format ", due to ")))
                           (maybe.default ""))
         entities (|> black_list
                      (value@ //.#entities)
-                     (list\each ..entity)
+                     (list#each ..entity)
                      (text.interposed text.new_line))]
     (format scope " " effect justification ":" text.new_line
             entities)))
diff --git a/licentia/source/program/licentia/license/distribution.lux b/licentia/source/program/licentia/license/distribution.lux
index 8471653fa..1a0e58601 100644
--- a/licentia/source/program/licentia/license/distribution.lux
+++ b/licentia/source/program/licentia/license/distribution.lux
@@ -5,7 +5,7 @@
      ["[0]" text
       ["%" format {"+" [format]}]]
      [collection
-      ["[0]" list ("[1]\[0]" monoid)]]]]]
+      ["[0]" list ("[1]#[0]" monoid)]]]]]
   ["[0]" // {"+" [Distribution]}
    ["_" term]
    [//
@@ -104,7 +104,7 @@
 
 (def: .public (extension distribution)
   (-> Distribution Text)
-  ($.paragraph ($_ list\composite
+  ($.paragraph ($_ list#composite
                    (if (value@ //.#can_re_license? distribution)
                      (list allow_re_licensing)
                      (list))
diff --git a/licentia/source/program/licentia/license/notice.lux b/licentia/source/program/licentia/license/notice.lux
index 2579e51e0..634cf6a16 100644
--- a/licentia/source/program/licentia/license/notice.lux
+++ b/licentia/source/program/licentia/license/notice.lux
@@ -5,7 +5,7 @@
      ["[0]" text
       ["%" format {"+" [format]}]]
      [collection
-      ["[0]" list ("[1]\[0]" functor)]]]
+      ["[0]" list ("[1]#[0]" functor)]]]
     [math
      [number
       ["n" nat]]]]]
@@ -30,5 +30,5 @@
 
 (def: .public copyright
   (-> (List //copyright.Holder) Text)
-  (|>> (list\each ..copyright_holder)
+  (|>> (list#each ..copyright_holder)
        (text.interposed text.new_line)))
diff --git a/licentia/source/program/licentia/output.lux b/licentia/source/program/licentia/output.lux
index 583305dd9..72257a0ac 100644
--- a/licentia/source/program/licentia/output.lux
+++ b/licentia/source/program/licentia/output.lux
@@ -2,13 +2,13 @@
   [library
    [lux {"-" [Definition]}
     [control
-     ["[0]" maybe ("[1]\[0]" functor)]]
+     ["[0]" maybe ("[1]#[0]" functor)]]
     [data
      ["[0]" bit]
      ["[0]" text
       ["%" format {"+" [format]}]]
      [collection
-      ["[0]" list ("[1]\[0]" functor monoid)]]]]]
+      ["[0]" list ("[1]#[0]" functor monoid)]]]]]
   [//
    ["[0]" license {"+" [Identification
                         Termination
@@ -179,7 +179,7 @@
                          "")]
 
                       [(value@ license.#same_license? value) "License Retention"
-                       ($.paragraph (list\composite extension.sharing_requirement
+                       ($.paragraph (list#composite extension.sharing_requirement
                                                     extension.license_conflict_resolution))]
                       
                       [(value@ license.#must_be_distinguishable? value) (format _.extension " Distinctness")
@@ -255,7 +255,7 @@
   (-> License Text)
   (let [identification (|> value
                            (value@ license.#identification)
-                           (maybe\each ..identification)
+                           (maybe#each ..identification)
                            (maybe.default ""))
         identified? (case (value@ license.#identification value)
                       {.#Some _}
@@ -273,12 +273,12 @@
                   black_lists
                   ($.block ($.section [#$.title (format "Denial of " _.license)
                                        #$.content (|> black_lists
-                                                      (list\each black_list.black_list)
+                                                      (list#each black_list.black_list)
                                                       (text.interposed ..black_list_spacing))])))
                 
                 ($.section [#$.title "Definitions"
                             #$.content (|> definition.all
-                                           (list\each (|>> ..definition $.block))
+                                           (list#each (|>> ..definition $.block))
                                            (text.interposed ""))])
 
                 ($.block ($.section [#$.title (format "Acceptance of " _.license)
@@ -298,7 +298,7 @@
 
                 (|> value
                     (value@ license.#attribution)
-                    (maybe\each (|>> ..attribution
+                    (maybe#each (|>> ..attribution
                                      ["Attribution Information"]
                                      $.section
                                      $.block))
diff --git a/licentia/source/test/licentia.lux b/licentia/source/test/licentia.lux
index e297f92e0..40e0f5677 100644
--- a/licentia/source/test/licentia.lux
+++ b/licentia/source/test/licentia.lux
@@ -7,16 +7,16 @@
      [monad {"+" [do]}]]
     [control
      ["[0]" io]
-     ["[0]" maybe ("[1]\[0]" functor)]]
+     ["[0]" maybe ("[1]#[0]" functor)]]
     [data
-     ["[0]" bit ("[1]\[0]" equivalence)]
+     ["[0]" bit ("[1]#[0]" equivalence)]
      ["[0]" text]
      [collection
-      ["[0]" list ("[1]\[0]" functor)]]]
+      ["[0]" list ("[1]#[0]" functor)]]]
     [math
      ["[0]" random {"+" [Random]}]
      [number
-      ["n" nat ("[1]\[0]" interval)]]]]]
+      ["n" nat ("[1]#[0]" interval)]]]]]
   [\\program
    ["[0]" output]
    ["[0]" license {"+" [Identification
@@ -47,10 +47,10 @@
 (def: period
   (Random (Period Nat))
   (do [! random.monad]
-    [start (random.filter (|>> (n.= n\top) not)
+    [start (random.filter (|>> (n.= n#top) not)
                           random.nat)
-     #let [wiggle_room (n.- start n\top)]
-     end (\ ! each
+     #let [wiggle_room (n.- start n#top)]
+     end (# ! each
             (|>> (n.% wiggle_room) (n.max 1))
             random.nat)]
     (wrap [time.#start start
@@ -109,7 +109,7 @@
 (def: (variable_list max_size gen_element)
   (All (_ a) (-> Nat (Random a) (Random (List a))))
   (do [! random.monad]
-    [amount (\ ! each (n.% (n.max 1 max_size))
+    [amount (# ! each (n.% (n.max 1 max_size))
                random.nat)]
     (random.list amount gen_element)))
 
@@ -185,10 +185,10 @@
       (_.test "Litigation conditions are present."
               (present? liability.litigation))
       (_.test "Liability acceptance conditions may be present."
-              (bit\= (value@ license.#can_accept? liability)
+              (bit#= (value@ license.#can_accept? liability)
                      (present? liability.can_accept)))
       (_.test "Liability acceptance conditions may be present."
-              (bit\= (value@ license.#disclaim_high_risk? liability)
+              (bit#= (value@ license.#disclaim_high_risk? liability)
                      (present? liability.disclaim_high_risk)))
       ))
 
@@ -207,13 +207,13 @@
   (Concern Commercial)
   ($_ _.and
       (_.test "Non-commercial clause is present."
-              (bit\= (not (value@ license.#can_sell? commercial))
+              (bit#= (not (value@ license.#can_sell? commercial))
                      (present? commercial.cannot_sell)))
       (_.test "Contributor credit condition is present."
-              (bit\= (value@ license.#require_contributor_credit? commercial)
+              (bit#= (value@ license.#require_contributor_credit? commercial)
                      (present? commercial.require_contributor_attribution)))
       (_.test "Anti-endorsement condition is present."
-              (bit\= (not (value@ license.#allow_contributor_endorsement? commercial))
+              (bit#= (not (value@ license.#allow_contributor_endorsement? commercial))
                      (present? commercial.disallow_contributor_endorsement)))
       ))
 
@@ -221,11 +221,11 @@
   (Concern Extension)
   ($_ _.and
       (_.test "The license is viral."
-              (bit\= (value@ license.#same_license? extension)
+              (bit#= (value@ license.#same_license? extension)
                      (and (list.every? present? extension.sharing_requirement)
                           (list.every? present? extension.license_conflict_resolution))))
       (_.test "Extensions must be distinguishable from the original work."
-              (bit\= (value@ license.#must_be_distinguishable? extension)
+              (bit#= (value@ license.#must_be_distinguishable? extension)
                      (present? extension.distinctness_requirement)))
       (_.test "The community must be notified of new extensions."
               (case (value@ license.#notification_period extension)
@@ -235,7 +235,7 @@
                 {.#None}
                 true))
       (_.test "Must describe modifications."
-              (bit\= (value@ license.#must_describe_modifications? extension)
+              (bit#= (value@ license.#must_describe_modifications? extension)
                      (present? extension.description_requirement)))
       ))
 
@@ -247,14 +247,14 @@
       (_.test "The attribution phrase is present."
               (|> attribution
                   (value@ license.#phrase)
-                  (maybe\each present?)
+                  (maybe#each present?)
                   (maybe.default true)))
       (_.test "The attribution URL is present."
               (present? (value@ license.#url attribution)))
       (_.test "The attribution image is present."
               (|> attribution
                   (value@ license.#image)
-                  (maybe\each present?)
+                  (maybe#each present?)
                   (maybe.default true)))
       ))
 
@@ -279,7 +279,7 @@
   (Concern Addendum)
   ($_ _.and
       (_.test "Commons clause"
-              (bit\= (value@ license.#commons_clause? value)
+              (bit#= (value@ license.#commons_clause? value)
                      (present? addendum.commons_clause)))
       ))
 
@@ -315,7 +315,7 @@
                                                                 bit.yes)
                                      every_entity_is_mentioned? (|> black_list
                                                                     (value@ license.#entities)
-                                                                    (list\each black_list.entity)
+                                                                    (list#each black_list.entity)
                                                                     (list.every? present?))]
                                  (and black_list_is_justified?
                                       every_entity_is_mentioned?)))