Even more renamings.

9 files changed, 18 insertions, 18 deletions

diff --git a/stdlib/source/program/aedifex/command/build.lux b/stdlib/source/program/aedifex/command/build.lux
index 072e6e094..00791f787 100644
--- a/stdlib/source/program/aedifex/command/build.lux
+++ b/stdlib/source/program/aedifex/command/build.lux
@@ -174,7 +174,7 @@
                         #.None
                         (dictionary.put identity [version dependency] uniques))))
                   (: (Dictionary [Group Name] [Version Dependency])
-                     (dictionary.new (product.hash text.hash text.hash))))
+                     (dictionary.empty (product.hash text.hash text.hash))))
        dictionary.values
        (list\map (|>> product.right (..path fs home)))))
 
diff --git a/stdlib/source/program/aedifex/dependency/resolution.lux b/stdlib/source/program/aedifex/dependency/resolution.lux
index f793bfd1e..a48909375 100644
--- a/stdlib/source/program/aedifex/dependency/resolution.lux
+++ b/stdlib/source/program/aedifex/dependency/resolution.lux
@@ -148,7 +148,7 @@
 
 (def: #export empty
   Resolution
-  (dictionary.new //.hash))
+  (dictionary.empty //.hash))
 
 (def: #export equivalence
   (Equivalence Resolution)
diff --git a/stdlib/source/program/aedifex/format.lux b/stdlib/source/program/aedifex/format.lux
index f87fcfaae..c2c0849ac 100644
--- a/stdlib/source/program/aedifex/format.lux
+++ b/stdlib/source/program/aedifex/format.lux
@@ -65,7 +65,7 @@
 
 (def: empty
   Aggregate
-  (dictionary.new text.hash))
+  (dictionary.empty text.hash))
 
 (def: (on_maybe field value format aggregate)
   (All [a]
diff --git a/stdlib/source/program/aedifex/parser.lux b/stdlib/source/program/aedifex/parser.lux
index 49384a986..b2e6ab0f9 100644
--- a/stdlib/source/program/aedifex/parser.lux
+++ b/stdlib/source/program/aedifex/parser.lux
@@ -197,12 +197,12 @@
            ^repositories (: (Parser (Set //repository.Address))
                             (|> (..plural input "repositories" ..repository)
                                 (\ ! map (set.of_list text.hash))
-                                (<>.else (set.new text.hash))
+                                (<>.else (set.empty text.hash))
                                 (\ ! map (set.add /.default_repository))))
            ^dependencies (: (Parser (Set //dependency.Dependency))
                             (|> (..plural input "dependencies" ..dependency)
                                 (\ ! map (set.of_list //dependency.hash))
-                                (<>.else (set.new //dependency.hash))))
+                                (<>.else (set.empty //dependency.hash))))
            ^compiler (|> ..dependency
                          (..singular input "compiler")
                          (<>.else /.default_compiler))
diff --git a/stdlib/source/program/aedifex/profile.lux b/stdlib/source/program/aedifex/profile.lux
index 4953032a8..fc9ae2d42 100644
--- a/stdlib/source/program/aedifex/profile.lux
+++ b/stdlib/source/program/aedifex/profile.lux
@@ -214,14 +214,14 @@
     {#parents (list)
      #identity #.None
      #info #.None
-     #repositories (set.new text.hash)
-     #dependencies (set.new dependency.hash)
+     #repositories (set.empty text.hash)
+     #dependencies (set.empty dependency.hash)
      #compiler default_compiler
-     #sources (set.new text.hash)
+     #sources (set.empty text.hash)
      #target ..default_target
      #program #.None
      #test #.None
-     #deploy_repositories (dictionary.new text.hash)
+     #deploy_repositories (dictionary.empty text.hash)
      #java runtime.default_java
      #js runtime.default_js
      #python runtime.default_python
@@ -247,7 +247,7 @@
                  (get@ #target baseline))
        #program (maybe\compose (get@ #program override) (get@ #program baseline))
        #test (maybe\compose (get@ #test override) (get@ #test baseline))
-       #deploy_repositories (dictionary.merge (get@ #deploy_repositories override) (get@ #deploy_repositories baseline))
+       #deploy_repositories (dictionary.merged (get@ #deploy_repositories override) (get@ #deploy_repositories baseline))
        #java (!runtime #java runtime.default_java)
        #js (!runtime #js runtime.default_js)
        #python (!runtime #python runtime.default_python)
diff --git a/stdlib/source/program/aedifex/project.lux b/stdlib/source/program/aedifex/project.lux
index 9d3574bd1..f8fb0334d 100644
--- a/stdlib/source/program/aedifex/project.lux
+++ b/stdlib/source/program/aedifex/project.lux
@@ -36,10 +36,10 @@
   (Monoid Project)
 
   (def: identity
-    (dictionary.new text.hash))
+    (dictionary.empty text.hash))
 
   (def: compose
-    (dictionary.merge_with (\ //.monoid compose))))
+    (dictionary.merged_with (\ //.monoid compose))))
 
 (exception: #export (unknown_profile {name Name})
   (exception.report
@@ -73,4 +73,4 @@
 
 (def: #export (profile name project)
   (-> Name Project (Try Profile))
-  (..profile' (set.new text.hash) project name))
+  (..profile' (set.empty text.hash) project name))
diff --git a/stdlib/source/program/compositor.lux b/stdlib/source/program/compositor.lux
index 5976c681a..6d19548fb 100644
--- a/stdlib/source/program/compositor.lux
+++ b/stdlib/source/program/compositor.lux
@@ -99,7 +99,7 @@
     []
     (loop [pending host_dependencies
            output (: (Dictionary file.Path Binary)
-                     (dictionary.new text.hash))]
+                     (dictionary.empty text.hash))]
       (case pending
         #.End
         (in output)
diff --git a/stdlib/source/program/compositor/import.lux b/stdlib/source/program/compositor/import.lux
index 1e9145bdb..eec954cd5 100644
--- a/stdlib/source/program/compositor/import.lux
+++ b/stdlib/source/program/compositor/import.lux
@@ -72,5 +72,5 @@
   (monad.fold (: (Monad Action)
                  (try.with async.monad))
               (..import_library system)
-              (dictionary.new text.hash)
+              (dictionary.empty text.hash)
               libraries))
diff --git a/stdlib/source/program/scriptum.lux b/stdlib/source/program/scriptum.lux
index a440042c4..da76896eb 100644
--- a/stdlib/source/program/scriptum.lux
+++ b/stdlib/source/program/scriptum.lux
@@ -43,7 +43,7 @@
   (-> Nat Text)
   (case (text.nth id ..name_options)
     (#.Some char)
-    (text.of_code char)
+    (text.of_char char)
 
     #.None
     (format (parameter_type_name (n./ name_options_count id))
@@ -119,7 +119,7 @@
       (let [members (type.flat_variant type)]
         (case tags
           #.End
-          (format "(| "
+          (format "(Or "
                   (|> members
                       (list\map (pprint_type_definition level type_func_info #.None module signature? recursive_type?))
                       (text.join_with " "))
@@ -218,7 +218,7 @@
 
     (#.Sum _)
     (let [members (type.flat_variant type)]
-      (format "(| " (|> members (list\map (pprint_type level type_func_name module)) (list.interpose " ") (text.join_with "")) ")"))
+      (format "(Or " (|> members (list\map (pprint_type level type_func_name module)) (list.interpose " ") (text.join_with "")) ")"))
 
     (#.Product _)
     (let [members (type.flat_tuple type)]