From 9f039e8a0a09e0278547d697efa018cd3fd68672 Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Fri, 30 Jul 2021 01:12:05 -0400
Subject: More renamings.

---
 .../specification/compositor/generation/common.lux       |  8 ++++----
 stdlib/source/specification/lux/world/file.lux           | 16 ++++++++--------
 stdlib/source/specification/lux/world/shell.lux          |  4 ++--
 3 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'stdlib/source/specification')

diff --git a/stdlib/source/specification/compositor/generation/common.lux b/stdlib/source/specification/compositor/generation/common.lux
index 1ef9f780b..c13cd9eae 100644
--- a/stdlib/source/specification/compositor/generation/common.lux
+++ b/stdlib/source/specification/compositor/generation/common.lux
@@ -52,8 +52,8 @@
                                  ["lux i64 and"                 i64.and               param]
                                  ["lux i64 or"                  i64.or                param]
                                  ["lux i64 xor"                 i64.xor               param]
-                                 ["lux i64 left-shift"          i64.left_shift        (n.% 64 param)]
-                                 ["lux i64 logical-right-shift" i64.logic_right_shift (n.% 64 param)]
+                                 ["lux i64 left-shift"          i64.left_shifted        (n.% 64 param)]
+                                 ["lux i64 logical-right-shift" i64.logic_right_shifted (n.% 64 param)]
                                  )]
       ($_ _.and
           <binary>
@@ -64,7 +64,7 @@
                       (run (..safe "lux i64 arithmetic-right-shift"))
                       (case> (#try.Success valueT)
                              ("lux i64 ="
-                              (i64.arithmetic_right_shift param subject)
+                              (i64.arithmetic_right_shifted param subject)
                               (:as I64 valueT))
 
                              (#try.Failure _)
@@ -92,7 +92,7 @@
                   ["lux i64 f64"  Frac i.frac f.= subject]
                   ["lux i64 char" Text (|>> (:as Nat) text.from_code) text\= (|> subject
                                                                                  (:as Nat)
-                                                                                 (n.% (i64.left_shift 8 1))
+                                                                                 (n.% (i64.left_shifted 8 1))
                                                                                  (:as Int))]
                   ))
             (~~ (template [<extension> <reference> <outputT> <comp>]
diff --git a/stdlib/source/specification/lux/world/file.lux b/stdlib/source/specification/lux/world/file.lux
index 910dfde68..79eb871fe 100644
--- a/stdlib/source/specification/lux/world/file.lux
+++ b/stdlib/source/specification/lux/world/file.lux
@@ -67,7 +67,7 @@
                       (|> (/.nest fs parent child)
                           (/.parent fs)
                           (maybe\map (text\= parent))
-                          (maybe.default false)))
+                          (maybe.else false)))
             (_.cover' [/.name]
                       (|> (/.nest fs parent child)
                           (/.name fs)
@@ -106,7 +106,7 @@
      appended? (\ fs append appendix path)
      post_file_size (\ fs file_size path)
      post_content (\ fs read path)]
-    (in (<| (try.default false)
+    (in (<| (try.else false)
             (do {! try.monad}
               [pre_file_size!
                (\ ! map (n.= expected_file_size) pre_file_size)
@@ -131,7 +131,7 @@
   (do async.monad
     [modified? (\ fs modify expected_time path)
      last_modified (\ fs last_modified path)]
-    (in (<| (try.default false)
+    (in (<| (try.else false)
             (do {! try.monad}
               [_ modified?]
               (\ ! map (instant\= expected_time) last_modified))))))
@@ -145,15 +145,15 @@
        directory_files (\ fs directory_files parent)
        sub_directories (\ fs sub_directories parent)
        #let [(^open "list\.") (list.equivalence text.equivalence)]]
-      (in (<| (try.default false)
+      (in (<| (try.else false)
               (do try.monad
                 [_ made_sub?]
                 (in (and (|> directory_files
                              (try\map (list\= (list child)))
-                             (try.default false))
+                             (try.else false))
                          (|> sub_directories
                              (try\map (list\= (list sub_dir)))
-                             (try.default false))))))))))
+                             (try.else false))))))))))
 
 (def: (move&delete fs parent child alternate_child)
   (-> (/.System Async) /.Path Text Text (Async Bit))
@@ -166,7 +166,7 @@
                  (\ ! map not))
        found? (\ fs file? destination)
        deleted? (\ fs delete destination)]
-      (in (<| (try.default false)
+      (in (<| (try.else false)
               (do try.monad
                 [_ moved?
                  _ deleted?]
@@ -208,7 +208,7 @@
          can_execute?
          (|> path
              (\ fs can_execute?)
-             (\ ! map (|>> (try.default true) not)))
+             (\ ! map (|>> (try.else true) not)))
 
          directory_files&sub_directories
          (..directory_files&sub_directories fs parent sub_dir child)
diff --git a/stdlib/source/specification/lux/world/shell.lux b/stdlib/source/specification/lux/world/shell.lux
index f7d8f28e7..16e0b6db8 100644
--- a/stdlib/source/specification/lux/world/shell.lux
+++ b/stdlib/source/specification/lux/world/shell.lux
@@ -37,7 +37,7 @@
   (-> (/.Process Async) _.Assertion)
   (|> (\ process await [])
       (async\map (|>> (try\map (i.= /.normal))
-                      (try.default false)
+                      (try.else false)
                       (_.cover' [/.Exit /.normal])))
       async\join))
 
@@ -45,7 +45,7 @@
   (-> Text (/.Process Async) (Async Bit))
   (|> (\ process read [])
       (async\map (|>> (try\map (text\= expected))
-                      (try.default false)))))
+                      (try.else false)))))
 
 (def: (can_destroy! process)
   (-> (/.Process Async) (Async Bit))
-- 
cgit v1.2.3