Better syntax for "library/lux.^multi".

15 files changed, 73 insertions, 73 deletions

diff --git a/stdlib/source/test/aedifex/artifact/extension.lux b/stdlib/source/test/aedifex/artifact/extension.lux
index b8a2144aa..132293d4f 100644
--- a/stdlib/source/test/aedifex/artifact/extension.lux
+++ b/stdlib/source/test/aedifex/artifact/extension.lux
@@ -26,7 +26,7 @@
                  (_.cover [/.lux_library /.jvm_library /.pom
                            /.sha-1 /.md5]
                           (let [options (list /.lux_library /.jvm_library /.pom /.sha-1 /.md5)
-                                uniques (set.from_list text.hash options)]
+                                uniques (set.of_list text.hash options)]
                             (n.= (list.size options)
                                  (set.size uniques))))
                  (_.cover [/.extension /.type]
diff --git a/stdlib/source/test/aedifex/artifact/time.lux b/stdlib/source/test/aedifex/artifact/time.lux
index 131155500..8873a7f1d 100644
--- a/stdlib/source/test/aedifex/artifact/time.lux
+++ b/stdlib/source/test/aedifex/artifact/time.lux
@@ -47,10 +47,10 @@
                          (try.default false))))
           (do random.monad
             [expected ..random]
-            (_.cover [/.instant /.from_instant]
+            (_.cover [/.instant /.of_instant]
                      (|> expected
                          /.instant
-                         /.from_instant
+                         /.of_instant
                          (try\map (\ /.equivalence = expected))
                          (try.default false))))
           (_.cover [/.epoch]
diff --git a/stdlib/source/test/aedifex/artifact/type.lux b/stdlib/source/test/aedifex/artifact/type.lux
index 93a13e26a..017e417cb 100644
--- a/stdlib/source/test/aedifex/artifact/type.lux
+++ b/stdlib/source/test/aedifex/artifact/type.lux
@@ -37,7 +37,7 @@
                            /.pom /.md5 /.sha-1]
                           (let [options (list /.lux_library /.jvm_library /.js_library
                                               /.pom /.md5 /.sha-1)
-                                uniques (set.from_list text.hash options)]
+                                uniques (set.of_list text.hash options)]
                             (n.= (list.size options)
                                  (set.size uniques))))
                  ))))
diff --git a/stdlib/source/test/aedifex/cache.lux b/stdlib/source/test/aedifex/cache.lux
index 20dcf506d..2f52b1d7b 100644
--- a/stdlib/source/test/aedifex/cache.lux
+++ b/stdlib/source/test/aedifex/cache.lux
@@ -57,7 +57,7 @@
                 (try.to_maybe
                  (do try.monad
                    [pom (//pom.write profile)
-                    identity (try.from_maybe (get@ #//.identity profile))]
+                    identity (try.of_maybe (get@ #//.identity profile))]
                    (wrap [identity profile pom]))))
               @profile.random))
 
@@ -96,7 +96,7 @@
                                         content ..content]
                                        (wrap [dependency
                                               (set@ #//package.origin (#//repository/origin.Remote "") (//package.local pom content))])))))]
-    (wrap (dictionary.from_list //dependency.hash (list& [main_dependency main_package] dependencies)))))
+    (wrap (dictionary.of_list //dependency.hash (list& [main_dependency main_package] dependencies)))))
 
 (def: singular
   Test
diff --git a/stdlib/source/test/aedifex/cli.lux b/stdlib/source/test/aedifex/cli.lux
index 71ea72b8c..4239644aa 100644
--- a/stdlib/source/test/aedifex/cli.lux
+++ b/stdlib/source/test/aedifex/cli.lux
@@ -48,7 +48,7 @@
       ## #Auto
       ..compilation))
 
-(def: (format-compilation value)
+(def: (format_compilation value)
   (-> /.Compilation (List Text))
   (case value
     #/.Build (list "build")
@@ -63,10 +63,10 @@
     #/.Dependencies (list "deps")
     #/.Install (list "install")
     (#/.Deploy repository [user password]) (list "deploy" repository user password)
-    (#/.Compilation compilation) (..format-compilation compilation)
-    (#/.Auto compilation) (list& "auto" (..format-compilation compilation))))
+    (#/.Compilation compilation) (..format_compilation compilation)
+    (#/.Auto compilation) (list& "auto" (..format_compilation compilation))))
 
-(def: without-profile
+(def: without_profile
   Test
   (do random.monad
     [expected ..command]
@@ -81,19 +81,19 @@
                        (#try.Failure error)
                        false)))))
 
-(def: with-profile
+(def: with_profile
   Test
   (do random.monad
-    [expected-profile (random.ascii/alpha 1)
-     expected-command ..command]
+    [expected_profile (random.ascii/alpha 1)
+     expected_command ..command]
     (_.test "With profile."
-            (|> expected-command
+            (|> expected_command
                 ..format
-                (list& "with" expected-profile)
+                (list& "with" expected_profile)
                 (cli.run /.command)
-                (case> (#try.Success [actual-profile actual-command])
-                       (and (text\= expected-profile actual-profile)
-                            (\ /.equivalence = expected-command actual-command))
+                (case> (#try.Success [actual_profile actual_command])
+                       (and (text\= expected_profile actual_profile)
+                            (\ /.equivalence = expected_command actual_command))
                        
                        (#try.Failure error)
                        false)))))
@@ -108,6 +108,6 @@
 
                  (_.for [/.command]
                         ($_ _.and
-                            ..without-profile
-                            ..with-profile
+                            ..without_profile
+                            ..with_profile
                             ))))))
diff --git a/stdlib/source/test/aedifex/command/auto.lux b/stdlib/source/test/aedifex/command/auto.lux
index a7ea2795b..474a8dd1f 100644
--- a/stdlib/source/test/aedifex/command/auto.lux
+++ b/stdlib/source/test/aedifex/command/auto.lux
@@ -59,7 +59,7 @@
            (do (try.with !)
              [_ (\ fs write (\ utf8.codec encode (%.nat actual_runs)) dummy_file)
               _ (\ fs modify
-                   (|> actual_runs .int instant.from_millis)
+                   (|> actual_runs .int instant.of_millis)
                    dummy_file)]
              (wrap [shell.normal []])))))]))
 
@@ -84,7 +84,7 @@
                profile (|> empty_profile
                            with_program
                            with_target
-                           (set@ #///.sources (set.from_list text.hash (list source))))]
+                           (set@ #///.sources (set.of_list text.hash (list source))))]
 
          home (random.ascii/alpha 5)
          working_directory (random.ascii/alpha 5)
diff --git a/stdlib/source/test/aedifex/command/deps.lux b/stdlib/source/test/aedifex/command/deps.lux
index 738cd5090..40645b731 100644
--- a/stdlib/source/test/aedifex/command/deps.lux
+++ b/stdlib/source/test/aedifex/command/deps.lux
@@ -60,9 +60,9 @@
          working_directory (random.ascii/alpha 5)
 
          dependee_artifact $///artifact.random
-         depender_artifact (random.filter (predicate.complement
-                                           (\ ///artifact.equivalence = dependee_artifact))
-                                          $///artifact.random)
+         depender_artifact (random.only (predicate.complement
+                                         (\ ///artifact.equivalence = dependee_artifact))
+                                        $///artifact.random)
 
          [_ dependee_package] $///package.random
          [_ depender_package] $///package.random
@@ -75,12 +75,12 @@
                dependee_pom (|> (\ ///.monoid identity)
                                 (set@ #///.identity (#.Some dependee_artifact))
                                 ///pom.write
-                                try.assume)
+                                try.assumed)
                depender_pom (|> (\ ///.monoid identity)
                                 (set@ #///.identity (#.Some depender_artifact))
-                                (set@ #///.dependencies (set.from_list ///dependency.hash (list dependee)))
+                                (set@ #///.dependencies (set.of_list ///dependency.hash (list dependee)))
                                 ///pom.write
-                                try.assume)
+                                try.assumed)
                
                dependee_package (|> dependee_package
                                     (set@ #///package.origin (#///repository/origin.Remote ""))
@@ -103,7 +103,7 @@
                                     (dictionary.put dependee dependee_package)
                                     (///dependency/deployment.all local))
                             post (|> (\ ///.monoid identity)
-                                     (set@ #///.dependencies (set.from_list ///dependency.hash (list dependee depender)))
+                                     (set@ #///.dependencies (set.of_list ///dependency.hash (list dependee depender)))
                                      (/.do! console local
                                             (list (///repository.mock ($///dependency/resolution.single depender_artifact depender_package)
                                                                       []))
diff --git a/stdlib/source/test/aedifex/command/version.lux b/stdlib/source/test/aedifex/command/version.lux
index 4a8ccc1be..d0d172a7a 100644
--- a/stdlib/source/test/aedifex/command/version.lux
+++ b/stdlib/source/test/aedifex/command/version.lux
@@ -35,7 +35,7 @@
 
   (def: (on_read [open? state])
     (if open?
-      (try.from_maybe
+      (try.of_maybe
        (do maybe.monad
          [head (text.nth 0 state)
           [_ tail] (text.split 1 state)]
@@ -43,7 +43,7 @@
       (exception.throw ..console_is_closed! [])))
   (def: (on_read_line [open? state])
     (if open?
-      (try.from_maybe
+      (try.of_maybe
        (do maybe.monad
          [[output state] (text.split_with text.new_line state)]
          (wrap [[open? state] output])))
diff --git a/stdlib/source/test/aedifex/dependency/resolution.lux b/stdlib/source/test/aedifex/dependency/resolution.lux
index deb74abcd..9d1f287c6 100644
--- a/stdlib/source/test/aedifex/dependency/resolution.lux
+++ b/stdlib/source/test/aedifex/dependency/resolution.lux
@@ -249,11 +249,11 @@
   (do {! random.monad}
     [expected_artifact $///artifact.random
      [_ expected_package] $///package.random
-     [_ dummy_package] (random.filter (|>> product.right
-                                           (set@ #///package.pom (get@ #///package.pom expected_package))
-                                           (\ ///package.equivalence = expected_package)
-                                           not)
-                                      $///package.random)
+     [_ dummy_package] (random.only (|>> product.right
+                                         (set@ #///package.pom (get@ #///package.pom expected_package))
+                                         (\ ///package.equivalence = expected_package)
+                                         not)
+                                    $///package.random)
      #let [good (..single expected_artifact expected_package)
            bad_sha-1 (..bad_sha-1 expected_artifact expected_package dummy_package)
            bad_md5 (..bad_md5 expected_artifact expected_package dummy_package)]]
@@ -296,11 +296,11 @@
   (do {! random.monad}
     [expected_artifact $///artifact.random
      [_ expected_package] $///package.random
-     [_ dummy_package] (random.filter (|>> product.right
-                                           (set@ #///package.pom (get@ #///package.pom expected_package))
-                                           (\ ///package.equivalence = expected_package)
-                                           not)
-                                      $///package.random)
+     [_ dummy_package] (random.only (|>> product.right
+                                         (set@ #///package.pom (get@ #///package.pom expected_package))
+                                         (\ ///package.equivalence = expected_package)
+                                         not)
+                                    $///package.random)
      #let [good (..single expected_artifact expected_package)
            bad_sha-1 (..bad_sha-1 expected_artifact expected_package dummy_package)
            bad_md5 (..bad_md5 expected_artifact expected_package dummy_package)]]
@@ -344,13 +344,13 @@
   (Random [Artifact Artifact Artifact])
   (do random.monad
     [dependee_artifact $///artifact.random
-     depender_artifact (random.filter (predicate.complement
-                                       (\ ///artifact.equivalence = dependee_artifact))
-                                      $///artifact.random)
-     ignored_artifact (random.filter (predicate.complement
-                                      (predicate.unite (\ ///artifact.equivalence = dependee_artifact)
-                                                       (\ ///artifact.equivalence = depender_artifact)))
-                                     $///artifact.random)]
+     depender_artifact (random.only (predicate.complement
+                                     (\ ///artifact.equivalence = dependee_artifact))
+                                    $///artifact.random)
+     ignored_artifact (random.only (predicate.complement
+                                    (predicate.unite (\ ///artifact.equivalence = dependee_artifact)
+                                                     (\ ///artifact.equivalence = depender_artifact)))
+                                   $///artifact.random)]
     (wrap [dependee_artifact depender_artifact ignored_artifact])))
 
 (def: (packages [dependee_artifact depender_artifact ignored_artifact])
@@ -372,16 +372,16 @@
            dependee_pom (|> (\ ///.monoid identity)
                             (set@ #///.identity (#.Some dependee_artifact))
                             ///pom.write
-                            try.assume)
+                            try.assumed)
            depender_pom (|> (\ ///.monoid identity)
                             (set@ #///.identity (#.Some depender_artifact))
-                            (set@ #///.dependencies (set.from_list ///dependency.hash (list dependee)))
+                            (set@ #///.dependencies (set.of_list ///dependency.hash (list dependee)))
                             ///pom.write
-                            try.assume)
+                            try.assumed)
            ignored_pom (|> (\ ///.monoid identity)
                            (set@ #///.identity (#.Some ignored_artifact))
                            ///pom.write
-                           try.assume)
+                           try.assumed)
 
            dependee_package (set@ #///package.pom
                                   [dependee_pom
diff --git a/stdlib/source/test/aedifex/metadata/artifact.lux b/stdlib/source/test/aedifex/metadata/artifact.lux
index 5ba4bdbe4..cc2d78db7 100644
--- a/stdlib/source/test/aedifex/metadata/artifact.lux
+++ b/stdlib/source/test/aedifex/metadata/artifact.lux
@@ -54,7 +54,7 @@
          hour (\ ! map (n.% 24) random.nat)
          minute (\ ! map (n.% 60) random.nat)
          second (\ ! map (n.% 60) random.nat)]
-        (wrap (try.assume
+        (wrap (try.assumed
                (do try.monad
                  [year (year.year year)
                   month (month.by_number month)
@@ -64,7 +64,7 @@
                          #time.minute minute
                          #time.second second
                          #time.milli_second 0})]
-                 (wrap (instant.from_date_time date time))))))))
+                 (wrap (instant.of_date_time date time))))))))
 
 (def: #export test
   Test
diff --git a/stdlib/source/test/aedifex/metadata/snapshot.lux b/stdlib/source/test/aedifex/metadata/snapshot.lux
index 431370048..48738522a 100644
--- a/stdlib/source/test/aedifex/metadata/snapshot.lux
+++ b/stdlib/source/test/aedifex/metadata/snapshot.lux
@@ -58,7 +58,7 @@
      hour (\ ! map (n.% 24) random.nat)
      minute (\ ! map (n.% 60) random.nat)
      second (\ ! map (n.% 60) random.nat)]
-    (wrap (try.assume
+    (wrap (try.assumed
            (do try.monad
              [year (year.year year)
               month (month.by_number month)
@@ -68,7 +68,7 @@
                      #time.minute minute
                      #time.second second
                      #time.milli_second 0})]
-             (wrap (instant.from_date_time date time)))))))
+             (wrap (instant.of_date_time date time)))))))
 
 (def: random_versioning
   (Random Versioning)
diff --git a/stdlib/source/test/aedifex/parser.lux b/stdlib/source/test/aedifex/parser.lux
index 33beaa7f9..360c30a4a 100644
--- a/stdlib/source/test/aedifex/parser.lux
+++ b/stdlib/source/test/aedifex/parser.lux
@@ -46,7 +46,7 @@
 (def: (dictionary_of key_hash key_random value_random)
   (All [k v] (-> (Hash k) (Random k) (Random v) (Random (Dictionary k v))))
   (\ random.functor map
-     (dictionary.from_list key_hash)
+     (dictionary.of_list key_hash)
      (..list_of (random.and key_random value_random))))
 
 (def: random
@@ -59,7 +59,7 @@
            (: (-> (Set //.Source) (Set //.Source))
               (function (_ sources)
                 (if (set.empty? sources)
-                  (set.from_list text.hash (list //.default_source))
+                  (set.of_list text.hash (list //.default_source))
                   sources)))))
 
 (def: with_default_repository
@@ -108,7 +108,7 @@
                                        [name (|> profile
                                                  ..with_default_sources
                                                  ..with_default_repository)]))
-                           (dictionary.from_list text.hash)
+                           (dictionary.of_list text.hash)
                            (\ //project.equivalence = actual))
                        
                        (#try.Failure error)
diff --git a/stdlib/source/test/aedifex/profile.lux b/stdlib/source/test/aedifex/profile.lux
index 7163ac780..f29ae7087 100644
--- a/stdlib/source/test/aedifex/profile.lux
+++ b/stdlib/source/test/aedifex/profile.lux
@@ -80,13 +80,13 @@
 (def: (set_of hash random)
   (All [a] (-> (Hash a) (Random a) (Random (Set a))))
   (\ random.functor map
-     (set.from_list hash)
+     (set.of_list hash)
      (..list_of random)))
 
 (def: (dictionary_of key_hash key_random value_random)
   (All [k v] (-> (Hash k) (Random k) (Random v) (Random (Dictionary k v))))
   (\ random.functor map
-     (dictionary.from_list key_hash)
+     (dictionary.of_list key_hash)
      (..list_of (random.and key_random value_random))))
 
 (def: info
diff --git a/stdlib/source/test/aedifex/project.lux b/stdlib/source/test/aedifex/project.lux
index 5b6de5403..d76d4afb3 100644
--- a/stdlib/source/test/aedifex/project.lux
+++ b/stdlib/source/test/aedifex/project.lux
@@ -52,17 +52,17 @@
                               not))
                  (do random.monad
                    [[super_name super_profile] ..profile
-                    [dummy_name dummy_profile] (random.filter (|>> product.left (text\= super_name) not)
-                                                              ..profile)
-                    [sub_name sub_profile] (random.filter (function (_ [name profile])
-                                                            (and (not (text\= super_name name))
-                                                                 (not (text\= dummy_name name))))
-                                                          ..profile)
-                    fake_name (random.filter (function (_ name)
-                                               (and (not (text\= super_name name))
-                                                    (not (text\= dummy_name name))
-                                                    (not (text\= sub_name name))))
-                                             (random.ascii/alpha 1))
+                    [dummy_name dummy_profile] (random.only (|>> product.left (text\= super_name) not)
+                                                            ..profile)
+                    [sub_name sub_profile] (random.only (function (_ [name profile])
+                                                          (and (not (text\= super_name name))
+                                                               (not (text\= dummy_name name))))
+                                                        ..profile)
+                    fake_name (random.only (function (_ name)
+                                             (and (not (text\= super_name name))
+                                                  (not (text\= dummy_name name))
+                                                  (not (text\= sub_name name))))
+                                           (random.ascii/alpha 1))
                     #let [project ($_ (\ /.monoid compose)
                                       (/.project super_name super_profile)
                                       (/.project dummy_name dummy_profile)
diff --git a/stdlib/source/test/aedifex/runtime.lux b/stdlib/source/test/aedifex/runtime.lux
index 7d6d3f98b..f9749c968 100644
--- a/stdlib/source/test/aedifex/runtime.lux
+++ b/stdlib/source/test/aedifex/runtime.lux
@@ -44,7 +44,7 @@
                       [(_.cover [/.default_java /.default_js /.default_python /.default_lua /.default_ruby]
                                 (let [listing (|> (list /.default_java /.default_js /.default_python /.default_lua /.default_ruby)
                                                   (list\map (get@ #/.program)))
-                                      unique (set.from_list text.hash listing)]
+                                      unique (set.of_list text.hash listing)]
                                   (n.= (list.size listing)
                                        (set.size unique))))]