Refactorings based on Steffan153's work (#40)

* Refactorings based on Steffan153's work

* No longer need dash before string keys for case/condp

* Update for 0.1.81

* Small change based on vendethiel's review

Author: ingydotnet

.github/workflows/test.yml

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

Makefile

@@ -4,7 +4,7 @@ ROOT := $(shell pwd)
 
 BIN := bin
 
-YS_VERSION := 0.1.80
+YS_VERSION := 0.1.81
 
 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.80
+export YS_VERSION := 0.1.81
 
 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.80
+export YS_VERSION := 0.1.81
 
 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.80
+export YS_VERSION := 0.1.81
 
 YS_LOCAL_PREFIX := ../../../../.local/v$(YS_VERSION)
 

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

@@ -1,6 +1,5 @@
 !yamlscript/v0
 
 defn abbreviate(phrase):
-  uc(phrase):
-    .re-seq(/[A-Z']+/)
+  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.80
+export YS_VERSION := 0.1.81
 
 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.80
+export YS_VERSION := 0.1.81
 
 YS_LOCAL_PREFIX := ../../../../.local/v$(YS_VERSION)
 

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

@@ -1,28 +1,12 @@
 !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.
-
-  cond:
-    input-base  < 2: die('input base must be >= 2')
-    output-base < 2: die('output base must be >= 2')
-    digits.some(neg?) || digits.some(ge(input-base)):
-      die: 'all digits must satisfy 0 <= d < input base'
-
-    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 \(%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
-        quot: num output-base
-      else: digits
+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.--)):
+    die('all digits must satisfy 0 <= d < input base')
+
+  loop n reduce(\((%1 * input) + %2) 0 digits), res []:
+    if n.?:
+      =>: recur(quot(n output) res.cons(n % output))
+      res |||: -[0]

exercises/practice/all-your-base/GNUmakefile

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