exercism · ingydotnet · May 6, 2025 · Jan 16, 2025 · Feb 27, 2025 · Feb 27, 2025
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -12,7 +12,7 @@ defaults:
 jobs:
   test:
     runs-on: ubuntu-latest
-    container: ingy/exercism-yamlscript-test-runner:0.1.81
+    container: ingy/exercism-yamlscript-test-runner:0.1.96
 
     steps:
     - name: Checkout repository

diff --git a/Makefile b/Makefile
@@ -4,7 +4,7 @@ ROOT := $(shell pwd)
 
 BIN := bin
 
-YS_VERSION := 0.1.81
+YS_VERSION := 0.1.96
 
 YS_LOCAL := .local
 YS_LOCAL_PREFIX := $(YS_LOCAL)/v$(YS_VERSION)

diff --git a/bin/generate-stub-program b/bin/generate-stub-program
@@ -3,9 +3,9 @@
 defn main(slug):
   data =:
     json/load:
-      slurp: ".problem/exercises/$slug/canonical-data.json"
+      read: ".problem/exercises/$slug/canonical-data.json"
 
-  say: "!yamlscript/v0\n"
+  say: "!YS-v0\n"
 
   say:
     join "\n\n": gen-funcs(data.cases)

diff --git a/bin/generate-test-file b/bin/generate-test-file
@@ -3,16 +3,15 @@
 defn main(slug):
   data =:
     json/load:
-      slurp: ".problem/exercises/$slug/canonical-data.json"
+      read: ".problem/exercises/$slug/canonical-data.json"
 
   tests =: gen-tests(data.cases)
 
   test =: |-
     #!/usr/bin/env ys-0
 
-    require ys::taptest: :all
-
-    use: $slug
+    use ys::taptest: :all
+    require: '$slug.ys'
     $gen-comments(data)
     test::
     $(join("\n" tests).trimr())

diff --git a/common/gnumakefile.mk b/common/gnumakefile.mk
@@ -2,7 +2,7 @@ SHELL := bash
 
 BASE := $(shell pwd)
 
-export YS_VERSION := 0.1.81
+export YS_VERSION := 0.1.96
 
 YS_LOCAL_PREFIX := ../../../.local/v$(YS_VERSION)
 ifeq (,$(shell [[ -d "$(YS_LOCAL_PREFIX)" ]] && echo ok))

diff --git a/common/meta-makefile.mk b/common/meta-makefile.mk
@@ -2,7 +2,7 @@ SHELL := bash
 
 BASE := $(shell pwd)
 
-export YS_VERSION := 0.1.81
+export YS_VERSION := 0.1.96
 
 YS_LOCAL_PREFIX := ../../../../.local/v$(YS_VERSION)
 

diff --git a/docs/SNIPPET.txt b/docs/SNIPPET.txt
@@ -1,5 +1,5 @@
 # A YAMLScript Program!
-!yamlscript/v0
+!YS-v0
 
 # Define a hello function, 0 or 1 args:
 defn hello(name='World'):

diff --git a/docs/TESTS.md b/docs/TESTS.md
@@ -50,9 +50,8 @@ It's actually the first 3 tests from the `acronym` exercise. :-)
 ```yaml
 #!/usr/bin/env ys-0
 
-require ys::taptest: :all
-
-use: acronym
+use ys::taptest: :all
+load: 'acronym.ys'
 
 test::
 - name: Basic
@@ -74,7 +73,7 @@ The first line is a shebang line that tells the `prove` command (run by the
 Makefile) to use the YAMLScript `ys` interpreter to run the tests instead of
 `perl` which is the default for `prove`.
 
-The second line is a `require` statement that loads YAMLScript's `ys::taptest`
+The second line is a `use` statement that loads YAMLScript's `ys::taptest`
 [TAP](https://testanything.org) testing library.
 
 > Note: TAP is a simple text-based interface between test scripts and test

diff --git a/exercises/practice/acronym/.meta/Makefile b/exercises/practice/acronym/.meta/Makefile
@@ -2,7 +2,7 @@ SHELL := bash
 
 BASE := $(shell pwd)
 
-export YS_VERSION := 0.1.81
+export YS_VERSION := 0.1.96
 
 YS_LOCAL_PREFIX := ../../../../.local/v$(YS_VERSION)
 

diff --git a/exercises/practice/acronym/.meta/acronym-test.ys b/exercises/practice/acronym/.meta/acronym-test.ys
@@ -1,8 +1,7 @@
 #!/usr/bin/env ys-0
 
-require ys::taptest: :all
-
-use: acronym
+use ys::taptest: :all
+load: 'acronym.ys'
 
 test::
 - name: Basic

diff --git a/exercises/practice/acronym/.meta/acronym.ys b/exercises/practice/acronym/.meta/acronym.ys
@@ -1,5 +1,6 @@
-!yamlscript/v0
+!YS-v0
 
 defn abbreviate(phrase):
-  uc(phrase).re-seq(/[A-Z']+/)
+  phrase:str/upper-case
+    .re-seq(/[A-Z']+/)
     .map(first):join
diff --git a/exercises/practice/acronym/GNUmakefile b/exercises/practice/acronym/GNUmakefile
@@ -2,7 +2,7 @@ SHELL := bash
 
 BASE := $(shell pwd)
 
-export YS_VERSION := 0.1.81
+export YS_VERSION := 0.1.96
 
 YS_LOCAL_PREFIX := ../../../.local/v$(YS_VERSION)
 ifeq (,$(shell [[ -d "$(YS_LOCAL_PREFIX)" ]] && echo ok))

diff --git a/exercises/practice/acronym/acronym-test.ys b/exercises/practice/acronym/acronym-test.ys
@@ -1,8 +1,7 @@
 #!/usr/bin/env ys-0
 
-require ys::taptest: :all
-
-use: acronym
+use ys::taptest: :all
+load: 'acronym.ys'
 
 test::
 - name: Basic

diff --git a/exercises/practice/acronym/acronym.ys b/exercises/practice/acronym/acronym.ys
@@ -1,4 +1,4 @@
-!yamlscript/v0
+!YS-v0
 
 defn abbreviate(phrase):
   # Implement the 'abbreviate' function.
diff --git a/exercises/practice/all-your-base/.meta/Makefile b/exercises/practice/all-your-base/.meta/Makefile
@@ -2,7 +2,7 @@ SHELL := bash
 
 BASE := $(shell pwd)
 
-export YS_VERSION := 0.1.81
+export YS_VERSION := 0.1.96
 
 YS_LOCAL_PREFIX := ../../../../.local/v$(YS_VERSION)
 

diff --git a/exercises/practice/all-your-base/.meta/all-your-base-test.ys b/exercises/practice/all-your-base/.meta/all-your-base-test.ys
@@ -1,8 +1,7 @@
 #!/usr/bin/env ys-0
 
-require ys::taptest: :all
-
-use: all-your-base
+use ys::taptest: :all
+load: 'all-your-base.ys'
 
 test::
 - name: Single bit one to decimal

diff --git a/exercises/practice/all-your-base/.meta/all-your-base.ys b/exercises/practice/all-your-base/.meta/all-your-base.ys
@@ -1,12 +1,15 @@
-!yamlscript/v0
+!YS-v0
 
 defn rebase(input digits output):
   when input < 2: die('input base must be >= 2')
   when output < 2: die('output base must be >= 2')
-  when-not digits.every?(\(0 <= _ <= input.--)):
+  when-not digits.every?(\(-1 < _ < input)):
     die('all digits must satisfy 0 <= d < input base')
 
-  loop n reduce(\((%1 * input) + %2) 0 digits), res []:
+  loop n reduce(\(input.mul(%1).add(%2)) 0 digits), res []:
     if n.?:
-      =>: recur(quot(n output) res.cons(n % output))
-      res |||: -[0]
+      recur: quot(n output) res.cons(n % output)
+      res |||:: [0]
+
+# TODO:
+# loop n reduce(\(input * _1 + _2) 0 digits), res []:
diff --git a/exercises/practice/all-your-base/GNUmakefile b/exercises/practice/all-your-base/GNUmakefile
@@ -2,7 +2,7 @@ SHELL := bash
 
 BASE := $(shell pwd)
 
-export YS_VERSION := 0.1.81
+export YS_VERSION := 0.1.96
 
 YS_LOCAL_PREFIX := ../../../.local/v$(YS_VERSION)
 ifeq (,$(shell [[ -d "$(YS_LOCAL_PREFIX)" ]] && echo ok))

diff --git a/exercises/practice/all-your-base/all-your-base-test.ys b/exercises/practice/all-your-base/all-your-base-test.ys
@@ -1,8 +1,7 @@
 #!/usr/bin/env ys-0
 
-require ys::taptest: :all
-
-use: all-your-base
+use ys::taptest: :all
+load: 'all-your-base.ys'
 
 test::
 - name: Single bit one to decimal

diff --git a/exercises/practice/all-your-base/all-your-base.ys b/exercises/practice/all-your-base/all-your-base.ys
@@ -1,4 +1,4 @@
-!yamlscript/v0
+!YS-v0
 
 defn rebase(input-base digits output-base):
   # Implement the 'rebase' function.
diff --git a/exercises/practice/allergies/.meta/Makefile b/exercises/practice/allergies/.meta/Makefile
@@ -2,7 +2,7 @@ SHELL := bash
 
 BASE := $(shell pwd)
 
-export YS_VERSION := 0.1.81
+export YS_VERSION := 0.1.96
 
 YS_LOCAL_PREFIX := ../../../../.local/v$(YS_VERSION)
 

diff --git a/exercises/practice/allergies/.meta/allergies-test.ys b/exercises/practice/allergies/.meta/allergies-test.ys
@@ -1,8 +1,7 @@
 #!/usr/bin/env ys-0
 
-require ys::taptest: :all
-
-use: allergies
+use ys::taptest: :all
+load: 'allergies.ys'
 
 test::
 - name: Not allergic to anything

diff --git a/exercises/practice/allergies/.meta/allergies.ys b/exercises/practice/allergies/.meta/allergies.ys
@@ -1,9 +1,15 @@
-!yamlscript/v0
+!YS-v0
+
+hmmm =::
+  [eggs, peanuts, shellfish,
+   strawberries, tomatoes,
+   chocolate, pollen, cats]
 
 defn allergic-to(item score):
-  list-allergens(score).has?(item)
+  list-allergens(score)
+    .has?(item)
 
 defn list-allergens(score):
-  (0 .. 7).filter(P(bit-test score))
-    .map(qw(eggs peanuts shellfish strawberries
-            tomatoes chocolate pollen cats))
+  (0 .. 7)
+    .filter(bit-test + score)
+    .map(hmmm)
diff --git a/exercises/practice/allergies/GNUmakefile b/exercises/practice/allergies/GNUmakefile
@@ -2,7 +2,7 @@ SHELL := bash
 
 BASE := $(shell pwd)
 
-export YS_VERSION := 0.1.81
+export YS_VERSION := 0.1.96
 
 YS_LOCAL_PREFIX := ../../../.local/v$(YS_VERSION)
 ifeq (,$(shell [[ -d "$(YS_LOCAL_PREFIX)" ]] && echo ok))

diff --git a/exercises/practice/allergies/allergies-test.ys b/exercises/practice/allergies/allergies-test.ys
@@ -1,8 +1,7 @@
 #!/usr/bin/env ys-0
 
-require ys::taptest: :all
-
-use: allergies
+use ys::taptest: :all
+load: 'allergies.ys'
 
 test::
 - name: Not allergic to anything

diff --git a/exercises/practice/allergies/allergies.ys b/exercises/practice/allergies/allergies.ys
@@ -1,4 +1,4 @@
-!yamlscript/v0
+!YS-v0
 
 defn allergic-to(item score):
   # Implement the 'allergic-to' function.

diff --git a/exercises/practice/anagram/.meta/Makefile b/exercises/practice/anagram/.meta/Makefile
@@ -2,7 +2,7 @@ SHELL := bash
 
 BASE := $(shell pwd)
 
-export YS_VERSION := 0.1.81
+export YS_VERSION := 0.1.96
 
 YS_LOCAL_PREFIX := ../../../../.local/v$(YS_VERSION)
 

diff --git a/exercises/practice/anagram/.meta/anagram-test.ys b/exercises/practice/anagram/.meta/anagram-test.ys
@@ -1,8 +1,7 @@
 #!/usr/bin/env ys-0
 
-require ys::taptest: :all
-
-use: anagram
+use ys::taptest: :all
+load: 'anagram.ys'
 
 test::
 - name: No matches

diff --git a/exercises/practice/anagram/.meta/anagram.ys b/exercises/practice/anagram/.meta/anagram.ys
@@ -1,6 +1,6 @@
-!yamlscript/v0
+!YS-v0
 
 defn find-anagrams(subject candidates):
   filter _ candidates:
-    \((_:lc != subject:lc) &&
-      (_:lc:sort == subject:lc:sort))
+    \( _:lc.ne(subject:lc) &&
+       _:lc:sort.eq(subject:lc:sort) )
diff --git a/exercises/practice/anagram/GNUmakefile b/exercises/practice/anagram/GNUmakefile
@@ -2,7 +2,7 @@ SHELL := bash
 
 BASE := $(shell pwd)
 
-export YS_VERSION := 0.1.81
+export YS_VERSION := 0.1.96
 
 YS_LOCAL_PREFIX := ../../../.local/v$(YS_VERSION)
 ifeq (,$(shell [[ -d "$(YS_LOCAL_PREFIX)" ]] && echo ok))

diff --git a/exercises/practice/anagram/anagram-test.ys b/exercises/practice/anagram/anagram-test.ys
@@ -1,8 +1,7 @@
 #!/usr/bin/env ys-0
 
-require ys::taptest: :all
-
-use: anagram
+use ys::taptest: :all
+load: 'anagram.ys'
 
 test::
 - name: No matches

diff --git a/exercises/practice/anagram/anagram.ys b/exercises/practice/anagram/anagram.ys
@@ -1,4 +1,4 @@
-!yamlscript/v0
+!YS-v0
 
 defn find-anagrams(subject candidates):
   # Implement the 'find-anagrams' function.
diff --git a/exercises/practice/armstrong-numbers/.meta/Makefile b/exercises/practice/armstrong-numbers/.meta/Makefile
@@ -2,7 +2,7 @@ SHELL := bash
 
 BASE := $(shell pwd)
 
-export YS_VERSION := 0.1.81
+export YS_VERSION := 0.1.96
 
 YS_LOCAL_PREFIX := ../../../../.local/v$(YS_VERSION)
 

diff --git a/exercises/practice/armstrong-numbers/.meta/armstrong-numbers-test.ys b/exercises/practice/armstrong-numbers/.meta/armstrong-numbers-test.ys
@@ -1,8 +1,7 @@
 #!/usr/bin/env ys-0
 
-require ys::taptest: :all
-
-use: armstrong-numbers
+use ys::taptest: :all
+load: 'armstrong-numbers.ys'
 
 test::
 - name: Zero is an armstrong number

diff --git a/exercises/practice/armstrong-numbers/.meta/armstrong-numbers.ys b/exercises/practice/armstrong-numbers/.meta/armstrong-numbers.ys
@@ -1,4 +1,4 @@
-!yamlscript/v0
+!YS-v0
 
 defn is-armstrong-number(number):
   ds =: digits(number)

diff --git a/exercises/practice/armstrong-numbers/GNUmakefile b/exercises/practice/armstrong-numbers/GNUmakefile
@@ -2,7 +2,7 @@ SHELL := bash
 
 BASE := $(shell pwd)
 
-export YS_VERSION := 0.1.81
+export YS_VERSION := 0.1.96
 
 YS_LOCAL_PREFIX := ../../../.local/v$(YS_VERSION)
 ifeq (,$(shell [[ -d "$(YS_LOCAL_PREFIX)" ]] && echo ok))

diff --git a/exercises/practice/armstrong-numbers/armstrong-numbers-test.ys b/exercises/practice/armstrong-numbers/armstrong-numbers-test.ys
@@ -1,8 +1,7 @@
 #!/usr/bin/env ys-0
 
-require ys::taptest: :all
-
-use: armstrong-numbers
+use ys::taptest: :all
+load: 'armstrong-numbers.ys'
 
 test::
 - name: Zero is an armstrong number

diff --git a/exercises/practice/armstrong-numbers/armstrong-numbers.ys b/exercises/practice/armstrong-numbers/armstrong-numbers.ys
@@ -1,4 +1,4 @@
-!yamlscript/v0
+!YS-v0
 
 defn is-armstrong-number(number):
   # Implement the 'is-armstrong-number' function.