From 381ec5920d9ebeb335963778dec182268819e718 Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Wed, 30 Mar 2022 14:05:57 -0400
Subject: Now demanding mandatory loop names, instead of using default "again"
 name.

---
 stdlib/source/test/lux.lux                       |  8 ++++----
 stdlib/source/test/lux/control/pipe.lux          |  4 ++--
 stdlib/source/test/lux/data/binary.lux           |  2 +-
 stdlib/source/test/lux/data/collection/array.lux | 12 ++++++------
 stdlib/source/test/lux/target/jvm.lux            |  6 +++---
 5 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'stdlib/source/test')

diff --git a/stdlib/source/test/lux.lux b/stdlib/source/test/lux.lux
index d7a2ac3eb..9e52c5465 100644
--- a/stdlib/source/test/lux.lux
+++ b/stdlib/source/test/lux.lux
@@ -387,8 +387,8 @@
     {.#Right [lux (list (code.bit (text.contains? ..crosshair source_code)))]}))
 
 (/.macro: (sum tokens)
-  (loop [tokens tokens
-         output 0]
+  (loop (again [tokens tokens
+                output 0])
     (case tokens
       {.#End}
       (meta#in (list (code.nat output)))
@@ -1033,8 +1033,8 @@
          .let [expected (n.* factor iterations)]]
         (_.cover [/.loop]
                  (n.= expected
-                      (/.loop [counter 0
-                               value 0]
+                      (/.loop (again [counter 0
+                                      value 0])
                         (if (n.< iterations counter)
                           (again (++ counter) (n.+ factor value))
                           value)))))
diff --git a/stdlib/source/test/lux/control/pipe.lux b/stdlib/source/test/lux/control/pipe.lux
index 32153db22..0d9782913 100644
--- a/stdlib/source/test/lux/control/pipe.lux
+++ b/stdlib/source/test/lux/control/pipe.lux
@@ -57,10 +57,10 @@
                           (|> sample
                               (/.when [n.even?]
                                       [(n.* 2)]))))
-            (_.cover [/.loop]
+            (_.cover [/.while]
                      (n.= (n.* 10 sample)
                           (|> sample
-                              (/.loop [(n.= (n.* 10 sample)) not]
+                              (/.while [(n.= (n.* 10 sample)) not]
                                 [(n.+ sample)]))))
             (_.cover [/.do]
                      (n.= (++ (n.+ 4 (n.* 3 sample)))
diff --git a/stdlib/source/test/lux/data/binary.lux b/stdlib/source/test/lux/data/binary.lux
index 650ee562a..2098203de 100644
--- a/stdlib/source/test/lux/data/binary.lux
+++ b/stdlib/source/test/lux/data/binary.lux
@@ -38,7 +38,7 @@
 (def: .public (random size)
   (-> Nat (Random /.Binary))
   (let [output (/.empty size)]
-    (loop [idx 0]
+    (loop (again [idx 0])
       (if (n.< size idx)
         (do random.monad
           [byte random.nat]
diff --git a/stdlib/source/test/lux/data/collection/array.lux b/stdlib/source/test/lux/data/collection/array.lux
index 1d0d95f34..2d413f633 100644
--- a/stdlib/source/test/lux/data/collection/array.lux
+++ b/stdlib/source/test/lux/data/collection/array.lux
@@ -211,9 +211,9 @@
                 (do !
                   [occupancy (# ! each (n.% (++ size)) random.nat)]
                   (_.cover [!.occupancy !.vacancy]
-                           (let [the_array (loop [output (is (Array Nat)
-                                                             (!.empty size))
-                                                  idx 0]
+                           (let [the_array (loop (again [output (is (Array Nat)
+                                                                    (!.empty size))
+                                                         idx 0])
                                              (if (n.< occupancy idx)
                                                (again (!.has! idx expected output)
                                                       (++ idx))
@@ -394,9 +394,9 @@
             (do !
               [occupancy (# ! each (n.% (++ size)) random.nat)]
               (_.cover [/.occupancy /.vacancy]
-                       (let [the_array (loop [output (is (Array Nat)
-                                                         (/.empty size))
-                                              idx 0]
+                       (let [the_array (loop (again [output (is (Array Nat)
+                                                                (/.empty size))
+                                                     idx 0])
                                          (if (n.< occupancy idx)
                                            (again (/.write! idx expected output)
                                                   (++ idx))
diff --git a/stdlib/source/test/lux/target/jvm.lux b/stdlib/source/test/lux/target/jvm.lux
index a665a398c..57a6e56e1 100644
--- a/stdlib/source/test/lux/target/jvm.lux
+++ b/stdlib/source/test/lux/target/jvm.lux
@@ -1040,9 +1040,9 @@
                dimensions size
                sizesH size
                sizesT (random.list (-- dimensions) size)
-               .let [type (loop [dimensions dimensions
-                                 type (is (Type Object)
-                                          ..$Object)]
+               .let [type (loop (again [dimensions dimensions
+                                        type (is (Type Object)
+                                                 ..$Object)])
                             (case dimensions
                               0 type
                               _ (again (-- dimensions) (/type.array type))))]]
-- 
cgit v1.2.3