- Re-named the "." function to "compose" and moved it to lux/function.

3 files changed, 16 insertions, 16 deletions

diff --git a/stdlib/source/lux/data/coll/array.lux b/stdlib/source/lux/data/coll/array.lux
index 1eeb1342c..ac15bfe9d 100644
--- a/stdlib/source/lux/data/coll/array.lux
+++ b/stdlib/source/lux/data/coll/array.lux
@@ -1,6 +1,6 @@
 (;module:
   lux
-  (lux (control monoid
+  (lux (control [monoid #+ Monoid]
                 [functor #+ Functor]
                 [eq #+ Eq]
                 fold)
diff --git a/stdlib/source/lux/data/coll/list.lux b/stdlib/source/lux/data/coll/list.lux
index 6de9eeaa2..28deea034 100644
--- a/stdlib/source/lux/data/coll/list.lux
+++ b/stdlib/source/lux/data/coll/list.lux
@@ -1,12 +1,12 @@
 (;module:
   lux
   (lux (control [monoid #+ Monoid]
-                ["F" functor]
-                ["A" applicative]
-                ["M" monad #+ do Monad]
+                [functor #+ Functor]
+                [applicative #+ Applicative]
+                [monad #+ do Monad]
                 [eq #+ Eq]
                 [fold])
-       (data [number "Nat/" Codec<Text,Nat>]
+       (data [number "nat/" Codec<Text,Nat>]
              bool
              [product])))
 
@@ -260,7 +260,7 @@
 
 (open Monoid<List>)
 
-(struct: #export _ (F;Functor List)
+(struct: #export _ (Functor List)
   (def: (map f ma)
     (case ma
       #;Nil          #;Nil
@@ -268,7 +268,7 @@
 
 (open Functor<List>)
 
-(struct: #export _ (A;Applicative List)
+(struct: #export _ (Applicative List)
   (def: functor Functor<List>)
 
   (def: (wrap a)
@@ -358,7 +358,7 @@
     (if (n/> +0 num-lists)
       (let [(^open) Functor<List>
             indices (n/range +0 (n/dec num-lists))
-            type-vars (: (List Code) (map (. symbol$ Nat/encode) indices))
+            type-vars (: (List Code) (map (|>> nat/encode symbol$) indices))
             zip-type (` (All [(~@ type-vars)]
                           (-> (~@ (map (: (-> Code Code) (function [var] (` (List (~ var)))))
                                        type-vars))
@@ -366,7 +366,7 @@
             vars+lists (|> indices
                            (map n/inc)
                            (map (function [idx]
-                                  (let [base (Nat/encode idx)]
+                                  (let [base (nat/encode idx)]
                                     [(symbol$ base)
                                      (symbol$ ("lux text concat" base "'"))]))))
             pattern (` [(~@ (map (function [[v vs]] (` (#;Cons (~ v) (~ vs))))
@@ -404,7 +404,7 @@
             indices (n/range +0 (n/dec num-lists))
             g!return-type (symbol$ "\treturn-type\t")
             g!func (symbol$ "\tfunc\t")
-            type-vars (: (List Code) (map (. symbol$ Nat/encode) indices))
+            type-vars (: (List Code) (map (|>> nat/encode symbol$) indices))
             zip-type (` (All [(~@ type-vars) (~ g!return-type)]
                           (-> (-> (~@ type-vars) (~ g!return-type))
                               (~@ (map (: (-> Code Code) (function [var] (` (List (~ var)))))
@@ -413,7 +413,7 @@
             vars+lists (|> indices
                            (map n/inc)
                            (map (function [idx]
-                                  (let [base (Nat/encode idx)]
+                                  (let [base (nat/encode idx)]
                                     [(symbol$ base)
                                      (symbol$ ("lux text concat" base "'"))]))))
             pattern (` [(~@ (map (function [[v vs]] (` (#;Cons (~ v) (~ vs))))
@@ -478,19 +478,19 @@
 
 (struct: #export (ListT Monad<M>)
   (All [M] (-> (Monad M) (Monad (All [a] (M (List a))))))
-  (def: applicative (A;compose (get@ #M;applicative Monad<M>) Applicative<List>))
+  (def: applicative (applicative;compose (get@ #monad;applicative Monad<M>) Applicative<List>))
   (def: (join MlMla)
     (do Monad<M>
       [lMla MlMla
        lla (: (($ +0) (List (List ($ +1))))
-              (M;seq @ lMla))
-       ## lla (M;seq @ lMla)
+              (monad;seq @ lMla))
+       ## lla (monad;seq @ lMla)
        ]
       (wrap (concat lla)))))
 
 (def: #export (lift Monad<M>)
   (All [M a] (-> (Monad M) (-> (M a) (M (List a)))))
-  (M;lift Monad<M> (:: Monad<List> wrap)))
+  (monad;lift Monad<M> (:: Monad<List> wrap)))
 
 (def: (enumerate' idx xs)
   (All [a] (-> Nat (List a) (List [Nat a])))
diff --git a/stdlib/source/lux/data/coll/ordered/set.lux b/stdlib/source/lux/data/coll/ordered/set.lux
index 376624033..a8f5ed45d 100644
--- a/stdlib/source/lux/data/coll/ordered/set.lux
+++ b/stdlib/source/lux/data/coll/ordered/set.lux
@@ -69,7 +69,7 @@
 (def: #export (difference param subject)
   (All [a] (-> (Set a) (Set a) (Set a)))
   (|> (to-list subject)
-      (list;filter (. not (member? param)))
+      (list;filter (|>> (member? param) not))
       (from-list (get@ #d;order subject))))
 
 (def: #export (sub? super sub)