Refactorings for v0.1.79

.github/workflows/test.yml

@@ -12,7 +12,7 @@ defaults:
 jobs:
   test:
     runs-on: ubuntu-latest
-    container: ingy/exercism-yamlscript-test-runner:0.1.76
+    container: ingy/exercism-yamlscript-test-runner:0.1.79
 
     steps:
     - name: Checkout repository

Makefile

@@ -4,7 +4,7 @@ ROOT := $(shell pwd)
 
 BIN := bin
 
-YS_VERSION := 0.1.76
+YS_VERSION := 0.1.79
 
 YS_LOCAL := .local
 YS_LOCAL_PREFIX := $(YS_LOCAL)/v$(YS_VERSION)

common/gnumakefile.mk

@@ -2,7 +2,7 @@ SHELL := bash
 
 BASE := $(shell pwd)
 
-export YS_VERSION := 0.1.76
+export YS_VERSION := 0.1.79
 
 YS_LOCAL_PREFIX := ../../../.local/v$(YS_VERSION)
 ifeq (,$(shell [[ -d "$(YS_LOCAL_PREFIX)" ]] && echo ok))

common/meta-makefile.mk

@@ -2,7 +2,7 @@ SHELL := bash
 
 BASE := $(shell pwd)
 
-export YS_VERSION := 0.1.76
+export YS_VERSION := 0.1.79
 
 YS_LOCAL_PREFIX := ../../../../.local/v$(YS_VERSION)
 

exercises/practice/acronym/.meta/Makefile

@@ -2,7 +2,7 @@ SHELL := bash
 
 BASE := $(shell pwd)
 
-export YS_VERSION := 0.1.76
+export YS_VERSION := 0.1.79
 
 YS_LOCAL_PREFIX := ../../../../.local/v$(YS_VERSION)
 

exercises/practice/acronym/.meta/acronym.ys

@@ -1,4 +1,6 @@
 !yamlscript/v0
 
 defn abbreviate(phrase):
-  uc(phrase).re-seq(/[A-Z']+/).map(first).str(*)
+  uc(phrase):
+    .re-seq(/[A-Z']+/)
+    .map(first):join

exercises/practice/acronym/GNUmakefile

@@ -2,7 +2,7 @@ SHELL := bash
 
 BASE := $(shell pwd)
 
-export YS_VERSION := 0.1.76
+export YS_VERSION := 0.1.79
 
 YS_LOCAL_PREFIX := ../../../.local/v$(YS_VERSION)
 ifeq (,$(shell [[ -d "$(YS_LOCAL_PREFIX)" ]] && echo ok))

exercises/practice/all-your-base/.meta/Makefile

@@ -2,7 +2,7 @@ SHELL := bash
 
 BASE := $(shell pwd)
 
-export YS_VERSION := 0.1.76
+export YS_VERSION := 0.1.79
 
 YS_LOCAL_PREFIX := ../../../../.local/v$(YS_VERSION)
 

exercises/practice/all-your-base/.meta/all-your-base.ys

@@ -1,28 +1,28 @@
 !yamlscript/v0
 
 defn rebase(input-base digits output-base):
-  :: Converts a sequence of digits given in input-base into a sequence of
-     digits in the desired output-base.
+  :: Converts a sequence of digits given in input-base
+     into a sequence of digits in the desired output-base.
 
   cond:
-    input-base < 2: die('input base must be >= 2')
+    input-base  < 2: die('input base must be >= 2')
     output-base < 2: die('output base must be >= 2')
-    digits.some(neg?) || digits.some(\(_ >= input-base)):
+    digits.some(neg?) || digits.some(ge(input-base)):
       die: 'all digits must satisfy 0 <= d < input base'
 
-    digits.every?(zero?) || digits.! :: [0]
+    digits.every?(zero?) || count(digits).eq(0) :: [0]
 
     else: digits
       .digits-to-decimal(input-base)
       .decimal-to-digits(output-base)
 
 defn digits-to-decimal(digits input-base):
-  reduce \((%1 * input-base) + %2): 0 digits
+  reduce \(%2 + (%1 * input-base)): digits
 
 defn decimal-to-digits(number output-base):
   loop digits nil, num number:
     if num > 0:
       recur:
-        conj: digits (num % output-base)
+        conj digits: num % output-base
         quot: num output-base
       else: digits

exercises/practice/all-your-base/GNUmakefile

@@ -2,7 +2,7 @@ SHELL := bash
 
 BASE := $(shell pwd)
 
-export YS_VERSION := 0.1.76
+export YS_VERSION := 0.1.79
 
 YS_LOCAL_PREFIX := ../../../.local/v$(YS_VERSION)
 ifeq (,$(shell [[ -d "$(YS_LOCAL_PREFIX)" ]] && echo ok))

exercises/practice/allergies/.meta/Makefile

@@ -2,7 +2,7 @@ SHELL := bash
 
 BASE := $(shell pwd)
 
-export YS_VERSION := 0.1.76
+export YS_VERSION := 0.1.79
 
 YS_LOCAL_PREFIX := ../../../../.local/v$(YS_VERSION)
 

exercises/practice/allergies/GNUmakefile

@@ -2,7 +2,7 @@ SHELL := bash
 
 BASE := $(shell pwd)
 
-export YS_VERSION := 0.1.76
+export YS_VERSION := 0.1.79
 
 YS_LOCAL_PREFIX := ../../../.local/v$(YS_VERSION)
 ifeq (,$(shell [[ -d "$(YS_LOCAL_PREFIX)" ]] && echo ok))

exercises/practice/anagram/.meta/Makefile

@@ -2,7 +2,7 @@ SHELL := bash
 
 BASE := $(shell pwd)
 
-export YS_VERSION := 0.1.76
+export YS_VERSION := 0.1.79
 
 YS_LOCAL_PREFIX := ../../../../.local/v$(YS_VERSION)
 

exercises/practice/anagram/.meta/anagram.ys

@@ -3,6 +3,7 @@
 defn find-anagrams(subject candidates):
   filter _ candidates:
     partial _ subject:
-      fn(*):
-        -[word1 word2] =: _.map(lc)
-        word1 != word2 &&: sort(word1) == sort(word2)
+      fn(*words):
+        word1 word2 =: words.map(lc)
+        word1 != word2 &&:
+          sort(word1) == sort(word2)

exercises/practice/anagram/GNUmakefile

@@ -2,7 +2,7 @@ SHELL := bash
 
 BASE := $(shell pwd)
 
-export YS_VERSION := 0.1.76
+export YS_VERSION := 0.1.79
 
 YS_LOCAL_PREFIX := ../../../.local/v$(YS_VERSION)
 ifeq (,$(shell [[ -d "$(YS_LOCAL_PREFIX)" ]] && echo ok))

exercises/practice/armstrong-numbers/.meta/Makefile

@@ -2,7 +2,7 @@ SHELL := bash
 
 BASE := $(shell pwd)
 
-export YS_VERSION := 0.1.76
+export YS_VERSION := 0.1.79
 
 YS_LOCAL_PREFIX := ../../../../.local/v$(YS_VERSION)
 

exercises/practice/armstrong-numbers/.meta/armstrong-numbers.ys

@@ -1,4 +1,5 @@
 !yamlscript/v0
 
 defn is-armstrong-number(number):
-  number ==: map(\(_ ** str(number).#) digits(number)).sum()
+  ds =: digits(number)
+  number ==: ds.map(\(_ ** ds.#)):sum

exercises/practice/armstrong-numbers/GNUmakefile

@@ -2,7 +2,7 @@ SHELL := bash
 
 BASE := $(shell pwd)
 
-export YS_VERSION := 0.1.76
+export YS_VERSION := 0.1.79
 
 YS_LOCAL_PREFIX := ../../../.local/v$(YS_VERSION)
 ifeq (,$(shell [[ -d "$(YS_LOCAL_PREFIX)" ]] && echo ok))

exercises/practice/atbash-cipher/.meta/Makefile

@@ -2,7 +2,7 @@ SHELL := bash
 
 BASE := $(shell pwd)
 
-export YS_VERSION := 0.1.76
+export YS_VERSION := 0.1.79
 
 YS_LOCAL_PREFIX := ../../../../.local/v$(YS_VERSION)
 

exercises/practice/atbash-cipher/.meta/atbash-cipher.ys

@@ -4,8 +4,9 @@ dict =:
   zipmap (\\a .. \\z): \\z .. \\a
 
 defn encode(phrase):
-  lc(phrase).replace(/[^a-z0-9]/ '').str/escape(dict)
-  .partition(5 5 '').map(join).join(' ')
+  lc(phrase):
+    .replace(/[^a-z0-9]/).escape(dict)
+    .partition(5 5 '').map(join):joins
 
 defn decode(phrase):
-  phrase.replace(' ' '').str/escape(dict)
+  phrase.replace(' ').escape(dict)

exercises/practice/atbash-cipher/GNUmakefile

@@ -2,7 +2,7 @@ SHELL := bash
 
 BASE := $(shell pwd)
 
-export YS_VERSION := 0.1.76
+export YS_VERSION := 0.1.79
 
 YS_LOCAL_PREFIX := ../../../.local/v$(YS_VERSION)
 ifeq (,$(shell [[ -d "$(YS_LOCAL_PREFIX)" ]] && echo ok))

exercises/practice/bank-account/.meta/Makefile

@@ -2,7 +2,7 @@ SHELL := bash
 
 BASE := $(shell pwd)
 
-export YS_VERSION := 0.1.76
+export YS_VERSION := 0.1.79
 
 YS_LOCAL_PREFIX := ../../../../.local/v$(YS_VERSION)
 

exercises/practice/bank-account/.meta/bank-account.ys

@@ -32,19 +32,19 @@ defn- do-balance(op):
 defn- do-deposit(op):
   when-not deref(account):
     die: 'account not open'
-  swap! account +: op.get-amount()
+  swap! account +: op:get-amount
 
 defn- do-withdraw(op):
   balance =: deref(account)
   when-not balance:
     die: 'account not open'
-  amount =: op.get-amount()
+  amount =: op:get-amount
   when amount > balance:
     die: 'amount must be less than balance'
   swap! account -: amount
 
 defn- get-amount(op):
   amount =: op.amount
-  if amount <= 0:
+  if amount < 0:
     die: 'amount must be greater than 0'
     else: amount

exercises/practice/bank-account/GNUmakefile

@@ -2,7 +2,7 @@ SHELL := bash
 
 BASE := $(shell pwd)
 
-export YS_VERSION := 0.1.76
+export YS_VERSION := 0.1.79
 
 YS_LOCAL_PREFIX := ../../../.local/v$(YS_VERSION)
 ifeq (,$(shell [[ -d "$(YS_LOCAL_PREFIX)" ]] && echo ok))

exercises/practice/binary-search/.meta/Makefile

@@ -2,7 +2,7 @@ SHELL := bash
 
 BASE := $(shell pwd)
 
-export YS_VERSION := 0.1.76
+export YS_VERSION := 0.1.79
 
 YS_LOCAL_PREFIX := ../../../../.local/v$(YS_VERSION)
 

exercises/practice/binary-search/.meta/binary-search.ys

@@ -1,11 +1,12 @@
 !yamlscript/v0
 
 defn find(array value):
- loop low 0, high array.#--:
+ loop low 0, high array.--:
    when low > high:
      die: 'value not in array'
-   mid =: quot((high + low) 2)
+   mid =: (high + low).quot(2)
    item =: array.$mid
+
    cond:
      value == item : mid
      value <  item : recur(low mid.--)

exercises/practice/binary-search/GNUmakefile

@@ -2,7 +2,7 @@ SHELL := bash
 
 BASE := $(shell pwd)
 
-export YS_VERSION := 0.1.76
+export YS_VERSION := 0.1.79
 
 YS_LOCAL_PREFIX := ../../../.local/v$(YS_VERSION)
 ifeq (,$(shell [[ -d "$(YS_LOCAL_PREFIX)" ]] && echo ok))

exercises/practice/bob/.meta/Makefile

@@ -2,7 +2,7 @@ SHELL := bash
 
 BASE := $(shell pwd)
 
-export YS_VERSION := 0.1.76
+export YS_VERSION := 0.1.79
 
 YS_LOCAL_PREFIX := ../../../../.local/v$(YS_VERSION)
 

exercises/practice/bob/.meta/bob.ys

@@ -1,7 +1,7 @@
 !yamlscript/v0
 
 defn response(hey-bob):
-  condp re-matches hey-bob.trim():
+  condp re-matches hey-bob:trim:
     /\s*/          : 'Fine. Be that way!'
     /[^a-zA-Z]+\?/ : 'Sure.'
     /[^a-z]+\?/    : "Calm down, I know what I'm doing!"

exercises/practice/bob/GNUmakefile

@@ -2,7 +2,7 @@ SHELL := bash
 
 BASE := $(shell pwd)
 
-export YS_VERSION := 0.1.76
+export YS_VERSION := 0.1.79
 
 YS_LOCAL_PREFIX := ../../../.local/v$(YS_VERSION)
 ifeq (,$(shell [[ -d "$(YS_LOCAL_PREFIX)" ]] && echo ok))

exercises/practice/bottle-song/.meta/Makefile

@@ -2,7 +2,7 @@ SHELL := bash
 
 BASE := $(shell pwd)
 
-export YS_VERSION := 0.1.76
+export YS_VERSION := 0.1.79
 
 YS_LOCAL_PREFIX := ../../../../.local/v$(YS_VERSION)
 

exercises/practice/bottle-song/.meta/bottle-song.ys

@@ -1,22 +1,22 @@
 !yamlscript/v0
 
 defn recite(start-bottles take-down):
- lines:
-   join "\n":
-     map verse: start-bottles .. (start-bottles - take-down).++
+  nums =: start-bottles ..
+          (start-bottles - take-down).++
+  nums: .map(verse).join("\n"):lines
 
 defn- verse(num): |
   $uc1(bottles(num)) hanging on the wall,
   $uc1(bottles(num)) hanging on the wall,
   And if one green bottle should accidentally fall,
-  There'll be $bottles(num - 1) hanging on the wall.
+  There'll be $bottles(num.--) hanging on the wall.
 
-dict =:
+nums =:
   zipmap (2 .. 10):
     qw(two three four five six seven eight nine ten)
 
 defn- bottles(num):
   case num:
     0    : 'no green bottles'
     1    : 'one green bottle'
-    else : "$(dict.$num) green bottles"
+    else : "$(nums.$num) green bottles"

exercises/practice/bottle-song/GNUmakefile

@@ -2,7 +2,7 @@ SHELL := bash
 
 BASE := $(shell pwd)
 
-export YS_VERSION := 0.1.76
+export YS_VERSION := 0.1.79
 
 YS_LOCAL_PREFIX := ../../../.local/v$(YS_VERSION)
 ifeq (,$(shell [[ -d "$(YS_LOCAL_PREFIX)" ]] && echo ok))

exercises/practice/collatz-conjecture/.meta/Makefile

@@ -2,7 +2,7 @@ SHELL := bash
 
 BASE := $(shell pwd)
 
-export YS_VERSION := 0.1.76
+export YS_VERSION := 0.1.79
 
 YS_LOCAL_PREFIX := ../../../../.local/v$(YS_VERSION)
 

exercises/practice/collatz-conjecture/.meta/collatz-conjecture.ys

@@ -1,11 +1,11 @@
 !yamlscript/v0
 
 defn steps(number):
-  when-not pos?(number):
-    die('Only positive integers are allowed')
+  number > 0 ||:
+    die: 'Only positive integers are allowed'
 
   loop num number, steps 0:
     cond:
-      num == 1:   steps
-      even?(num): recur((num / 2), steps.++)
-      else:       recur((num * 3).++, steps.++)
+      num.eq(1) : steps
+      num:even? : recur(num.div(2), steps.++)
+      else      : recur(num.mul(3).++, steps.++)