From 07d67ae2ced4a8fa82608cbce480b019300b7da6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ingy=20d=C3=B6t=20Net?= <ingy@ingy.net>
Date: Mon, 14 Oct 2024 22:49:24 -0700
Subject: [PATCH] Improvements for food-chain

---
 .../practice/food-chain/.meta/food-chain.ys   | 39 +++++++------------
 .../.meta/resistor-color-duo.ys               |  1 -
 2 files changed, 15 insertions(+), 25 deletions(-)

diff --git a/exercises/practice/food-chain/.meta/food-chain.ys b/exercises/practice/food-chain/.meta/food-chain.ys
index 66095dc..ab9ee22 100644
--- a/exercises/practice/food-chain/.meta/food-chain.ys
+++ b/exercises/practice/food-chain/.meta/food-chain.ys
@@ -11,30 +11,21 @@ barn =::
 - horse: She's dead, of course!
 
 defn recite(start-verse end-verse):
-  drop-last:
-    reduce: add-verse [] (start-verse.-- .. end-verse.--)
+  reduce(add-verse [] (start-verse.-- .. end-verse.--)):drop-last
 
 defn add-verse(lines verse):
   animal =: barn.$verse.first().0
-  lines =:
-    conj lines:
-      -"I know an old lady who swallowed a $animal."
-      barn.$verse.first().1
-  lines =:
-    if 0 < verse < barn.#.--:
-      conj _ barn.0:first.1:
-        reduce _ lines (verse .. 1):
-          fn(lines verse):
-            lines =:
-              animal1 animal2 =:
-                L(barn.$verse.first().0
-                barn.nth(verse.--):first.0)
-              line =: "She swallowed the $animal1 to catch the $animal2."
-              line =:
-                if animal2 == 'spider':
-                  replace(line /\./ replace(barn.1:first.1 /It/ ' that'))
-                  line
-              conj lines: line
-            =>: lines
-      =>: lines
-  conj lines: ''
+  lines .=: conj("I know an old lady who swallowed a $animal.")
+  lines .=: conj(barn.$verse.first().1)
+  conj _ '':
+    or _ lines:
+      when 0 < verse < barn.#.--:
+        conj _ barn.0:first.1:
+          reduce _ lines (verse .. 1):
+            fn(lines verse):
+              conj lines:
+                animal1 =: barn.$verse.first().0
+                animal2 =: barn.nth(verse.--):first.0
+                S("She swallowed the $animal1 to catch the $animal2."):
+                  .call(fn([s] if((animal2 != 'spider') s
+                   replace(s /\./ replace(barn.1:first.1 /It/ ' that'))))_)
diff --git a/exercises/practice/resistor-color-duo/.meta/resistor-color-duo.ys b/exercises/practice/resistor-color-duo/.meta/resistor-color-duo.ys
index e10d0fe..8ccd62c 100644
--- a/exercises/practice/resistor-color-duo/.meta/resistor-color-duo.ys
+++ b/exercises/practice/resistor-color-duo/.meta/resistor-color-duo.ys
@@ -1,6 +1,5 @@
 !yamlscript/v0
 
-
 colors =:
   zipmap _ range():
     qw(black brown red orange yellow