From bcd70df3568d71f14763959f454c15d8164e2d15 Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Sun, 1 Aug 2021 03:36:11 -0400
Subject: Even more renamings.

---
 stdlib/source/test/lux.lux | 40 +++++++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 19 deletions(-)

(limited to 'stdlib/source/test/lux.lux')

diff --git a/stdlib/source/test/lux.lux b/stdlib/source/test/lux.lux
index 793fd23b3..63d468945 100644
--- a/stdlib/source/test/lux.lux
+++ b/stdlib/source/test/lux.lux
@@ -423,22 +423,24 @@
                    (#.Right [lux (list)])))]
     (do random.monad
       [expected random.nat]
-      ($_ _.and
-          (_.cover [/.Macro']
-                   (|> macro
-                       (: /.Macro')
-                       (is? macro)))
-          (_.cover [/.Macro]
-                   (|> macro
-                       "lux macro"
-                       (: /.Macro)
-                       (: Any)
-                       (is? (: Any macro))))
-          (_.cover [/.macro:]
-                   (is? expected (..identity_macro expected)))
-          (_.cover [/.Source]
-                   (..found_crosshair?))
-          ))))
+      (with_expansions [<found_crosshair?> (for {@.old (~~ (as_is))}
+                                                (_.cover [/.Source]
+                                                         (..found_crosshair?)))]
+        (`` ($_ _.and
+                (_.cover [/.Macro']
+                         (|> macro
+                             (: /.Macro')
+                             (is? macro)))
+                (_.cover [/.Macro]
+                         (|> macro
+                             "lux macro"
+                             (: /.Macro)
+                             (: Any)
+                             (is? (: Any macro))))
+                (_.cover [/.macro:]
+                         (is? expected (..identity_macro expected)))
+                <found_crosshair?>
+                ))))))
 
 (/.type: for_type/variant
   #Case/0
@@ -484,7 +486,7 @@
             (_.cover [/.:let]
                      (let [[actual_left actual_right]
                            (: (/.:let [side /.Nat]
-                                (& side side))
+                                [side side])
                               [expected_left expected_right])]
                        (and (is? expected_left actual_left)
                             (is? expected_right actual_right))))
@@ -506,7 +508,7 @@
 
                             _
                             false)
-                          (case (/.type (| expected/0 expected/1))
+                          (case (/.type (/.Or expected/0 expected/1))
                             (#.Sum actual/0 actual/1)
                             (and (is? expected/0 actual/0)
                                  (is? expected/1 actual/1))
@@ -626,7 +628,7 @@
                    _ false))
         (_.cover [/.char]
                  (|> (`` (/.char (~~ (/.static static_char))))
-                     text.of_code
+                     text.of_char
                      (text\= static_char)))
         )))
 
-- 
cgit v1.2.3