Outsourced the syntax for labelled type definitions to macros.

1 files changed, 4 insertions, 4 deletions

diff --git a/stdlib/source/specification/compositor/generation/structure.lux b/stdlib/source/specification/compositor/generation/structure.lux
index de61ed882..ec9893e7c 100644
--- a/stdlib/source/specification/compositor/generation/structure.lux
+++ b/stdlib/source/specification/compositor/generation/structure.lux
@@ -31,8 +31,8 @@
 (def: (variant run)
   (-> Runner Test)
   (do {! r.monad}
-    [num_tags (|> r.nat (\ ! map (|>> (n.% 10) (n.max 2))))
-     tag_in (|> r.nat (\ ! map (n.% num_tags)))
+    [num_tags (|> r.nat (\ ! each (|>> (n.% 10) (n.max 2))))
+     tag_in (|> r.nat (\ ! each (n.% num_tags)))
      .let [last?_in (|> num_tags -- (n.= tag_in))]
      value_in r.i64]
     (_.test (%.name (name_of synthesis.variant))
@@ -66,10 +66,10 @@
 (def: (tuple run)
   (-> Runner Test)
   (do {! r.monad}
-    [size (|> r.nat (\ ! map (|>> (n.% 10) (n.max 2))))
+    [size (|> r.nat (\ ! each (|>> (n.% 10) (n.max 2))))
      tuple_in (r.list size r.i64)]
     (_.test (%.name (name_of synthesis.tuple))
-            (|> (synthesis.tuple (list\map (|>> synthesis.i64) tuple_in))
+            (|> (synthesis.tuple (list\each (|>> synthesis.i64) tuple_in))
                 (run "tuple")
                 (case> (#try.Success tuple_out)
                        (let [tuple_out (:as (Array Any) tuple_out)]