diff --git a/exercises/practice/acronym/libs/exercism/test b/exercises/practice/acronym/libs/exercism/test index ff9cb4e..1d08eb2 100644 --- a/exercises/practice/acronym/libs/exercism/test +++ b/exercises/practice/acronym/libs/exercism/test @@ -117,7 +117,7 @@ true var, run-test eq? if test-passed else test-failed then ; -: approx_eaqual? \ s x w n -- | s w x n -- +: approx_equal? \ s x w n -- | s w x n -- run-test? !if 3drop test-skipped ;; then -rot isword? !if swap then w:exec diff --git a/exercises/practice/affine-cipher/libs/exercism/test b/exercises/practice/affine-cipher/libs/exercism/test index ff9cb4e..1d08eb2 100644 --- a/exercises/practice/affine-cipher/libs/exercism/test +++ b/exercises/practice/affine-cipher/libs/exercism/test @@ -117,7 +117,7 @@ true var, run-test eq? if test-passed else test-failed then ; -: approx_eaqual? \ s x w n -- | s w x n -- +: approx_equal? \ s x w n -- | s w x n -- run-test? !if 3drop test-skipped ;; then -rot isword? !if swap then w:exec diff --git a/exercises/practice/armstrong-numbers/libs/exercism/test b/exercises/practice/armstrong-numbers/libs/exercism/test index ff9cb4e..1d08eb2 100644 --- a/exercises/practice/armstrong-numbers/libs/exercism/test +++ b/exercises/practice/armstrong-numbers/libs/exercism/test @@ -117,7 +117,7 @@ true var, run-test eq? if test-passed else test-failed then ; -: approx_eaqual? \ s x w n -- | s w x n -- +: approx_equal? \ s x w n -- | s w x n -- run-test? !if 3drop test-skipped ;; then -rot isword? !if swap then w:exec diff --git a/exercises/practice/atbash-cipher/libs/exercism/test b/exercises/practice/atbash-cipher/libs/exercism/test index ff9cb4e..1d08eb2 100644 --- a/exercises/practice/atbash-cipher/libs/exercism/test +++ b/exercises/practice/atbash-cipher/libs/exercism/test @@ -117,7 +117,7 @@ true var, run-test eq? if test-passed else test-failed then ; -: approx_eaqual? \ s x w n -- | s w x n -- +: approx_equal? \ s x w n -- | s w x n -- run-test? !if 3drop test-skipped ;; then -rot isword? !if swap then w:exec diff --git a/exercises/practice/bob/libs/exercism/test b/exercises/practice/bob/libs/exercism/test index ff9cb4e..1d08eb2 100644 --- a/exercises/practice/bob/libs/exercism/test +++ b/exercises/practice/bob/libs/exercism/test @@ -117,7 +117,7 @@ true var, run-test eq? if test-passed else test-failed then ; -: approx_eaqual? \ s x w n -- | s w x n -- +: approx_equal? \ s x w n -- | s w x n -- run-test? !if 3drop test-skipped ;; then -rot isword? !if swap then w:exec diff --git a/exercises/practice/collatz-conjecture/libs/exercism/test b/exercises/practice/collatz-conjecture/libs/exercism/test index ff9cb4e..1d08eb2 100644 --- a/exercises/practice/collatz-conjecture/libs/exercism/test +++ b/exercises/practice/collatz-conjecture/libs/exercism/test @@ -117,7 +117,7 @@ true var, run-test eq? if test-passed else test-failed then ; -: approx_eaqual? \ s x w n -- | s w x n -- +: approx_equal? \ s x w n -- | s w x n -- run-test? !if 3drop test-skipped ;; then -rot isword? !if swap then w:exec diff --git a/exercises/practice/darts/libs/exercism/test b/exercises/practice/darts/libs/exercism/test index ff9cb4e..1d08eb2 100644 --- a/exercises/practice/darts/libs/exercism/test +++ b/exercises/practice/darts/libs/exercism/test @@ -117,7 +117,7 @@ true var, run-test eq? if test-passed else test-failed then ; -: approx_eaqual? \ s x w n -- | s w x n -- +: approx_equal? \ s x w n -- | s w x n -- run-test? !if 3drop test-skipped ;; then -rot isword? !if swap then w:exec diff --git a/exercises/practice/difference-of-squares/libs/exercism/test b/exercises/practice/difference-of-squares/libs/exercism/test index ff9cb4e..1d08eb2 100644 --- a/exercises/practice/difference-of-squares/libs/exercism/test +++ b/exercises/practice/difference-of-squares/libs/exercism/test @@ -117,7 +117,7 @@ true var, run-test eq? if test-passed else test-failed then ; -: approx_eaqual? \ s x w n -- | s w x n -- +: approx_equal? \ s x w n -- | s w x n -- run-test? !if 3drop test-skipped ;; then -rot isword? !if swap then w:exec diff --git a/exercises/practice/eliuds-eggs/libs/exercism/test b/exercises/practice/eliuds-eggs/libs/exercism/test index ff9cb4e..1d08eb2 100644 --- a/exercises/practice/eliuds-eggs/libs/exercism/test +++ b/exercises/practice/eliuds-eggs/libs/exercism/test @@ -117,7 +117,7 @@ true var, run-test eq? if test-passed else test-failed then ; -: approx_eaqual? \ s x w n -- | s w x n -- +: approx_equal? \ s x w n -- | s w x n -- run-test? !if 3drop test-skipped ;; then -rot isword? !if swap then w:exec diff --git a/exercises/practice/etl/libs/exercism/test b/exercises/practice/etl/libs/exercism/test index ff9cb4e..1d08eb2 100644 --- a/exercises/practice/etl/libs/exercism/test +++ b/exercises/practice/etl/libs/exercism/test @@ -117,7 +117,7 @@ true var, run-test eq? if test-passed else test-failed then ; -: approx_eaqual? \ s x w n -- | s w x n -- +: approx_equal? \ s x w n -- | s w x n -- run-test? !if 3drop test-skipped ;; then -rot isword? !if swap then w:exec diff --git a/exercises/practice/flatten-array/libs/exercism/test b/exercises/practice/flatten-array/libs/exercism/test index 0d1e39a..1d08eb2 100644 --- a/exercises/practice/flatten-array/libs/exercism/test +++ b/exercises/practice/flatten-array/libs/exercism/test @@ -68,6 +68,14 @@ true var, run-test l: = ; +: eps_eq? \ n x x -- T + \ are the items the same kind? + 2dup >kind swap >kind n:= + !if 2drop false ;then + number? !if 2drop false ;then + rot n:~= +; + : check-depth \ ... n -- ... dup>r n:1+ depth n:= @@ -109,6 +117,16 @@ true var, run-test eq? if test-passed else test-failed then ; +: approx_equal? \ s x w n -- | s w x n -- + run-test? !if 3drop test-skipped ;; then + -rot isword? !if swap then + w:exec + 4 check-depth + 3dup \ so test-failed can show actual and expected + eps_eq? + if rot drop test-passed else rot drop test-failed then +; + : true? \ s w -- run-test? !if drop test-skipped ;; then w:exec diff --git a/exercises/practice/gigasecond/libs/exercism/test b/exercises/practice/gigasecond/libs/exercism/test index ff9cb4e..1d08eb2 100644 --- a/exercises/practice/gigasecond/libs/exercism/test +++ b/exercises/practice/gigasecond/libs/exercism/test @@ -117,7 +117,7 @@ true var, run-test eq? if test-passed else test-failed then ; -: approx_eaqual? \ s x w n -- | s w x n -- +: approx_equal? \ s x w n -- | s w x n -- run-test? !if 3drop test-skipped ;; then -rot isword? !if swap then w:exec diff --git a/exercises/practice/grains/libs/exercism/test b/exercises/practice/grains/libs/exercism/test index f8d847d..1d08eb2 100644 --- a/exercises/practice/grains/libs/exercism/test +++ b/exercises/practice/grains/libs/exercism/test @@ -12,6 +12,13 @@ true var, run-test \ Some utility words + +: test-passed \ s x x -- \\ test name, expected value, actual value + 2drop + 1 tests-passed n:+! + con:green con:onBlack . space " ... OK" . con:white con:onBlack cr +; + : test-skipped \ s -- 1 tests-skipped n:+! con:cyan con:onBlack . space " ... SKIPPED" . con:white con:onBlack cr @@ -110,7 +117,7 @@ true var, run-test eq? if test-passed else test-failed then ; -: approx_eaqual? \ s x w n -- | s w x n -- +: approx_equal? \ s x w n -- | s w x n -- run-test? !if 3drop test-skipped ;; then -rot isword? !if swap then w:exec diff --git a/exercises/practice/hamming/libs/exercism/test b/exercises/practice/hamming/libs/exercism/test index ff9cb4e..1d08eb2 100644 --- a/exercises/practice/hamming/libs/exercism/test +++ b/exercises/practice/hamming/libs/exercism/test @@ -117,7 +117,7 @@ true var, run-test eq? if test-passed else test-failed then ; -: approx_eaqual? \ s x w n -- | s w x n -- +: approx_equal? \ s x w n -- | s w x n -- run-test? !if 3drop test-skipped ;; then -rot isword? !if swap then w:exec diff --git a/exercises/practice/hello-world/libs/exercism/test b/exercises/practice/hello-world/libs/exercism/test index ff9cb4e..1d08eb2 100644 --- a/exercises/practice/hello-world/libs/exercism/test +++ b/exercises/practice/hello-world/libs/exercism/test @@ -117,7 +117,7 @@ true var, run-test eq? if test-passed else test-failed then ; -: approx_eaqual? \ s x w n -- | s w x n -- +: approx_equal? \ s x w n -- | s w x n -- run-test? !if 3drop test-skipped ;; then -rot isword? !if swap then w:exec diff --git a/exercises/practice/high-scores/libs/exercism/test b/exercises/practice/high-scores/libs/exercism/test index ff9cb4e..1d08eb2 100644 --- a/exercises/practice/high-scores/libs/exercism/test +++ b/exercises/practice/high-scores/libs/exercism/test @@ -117,7 +117,7 @@ true var, run-test eq? if test-passed else test-failed then ; -: approx_eaqual? \ s x w n -- | s w x n -- +: approx_equal? \ s x w n -- | s w x n -- run-test? !if 3drop test-skipped ;; then -rot isword? !if swap then w:exec diff --git a/exercises/practice/isogram/libs/exercism/test b/exercises/practice/isogram/libs/exercism/test index ff9cb4e..1d08eb2 100644 --- a/exercises/practice/isogram/libs/exercism/test +++ b/exercises/practice/isogram/libs/exercism/test @@ -117,7 +117,7 @@ true var, run-test eq? if test-passed else test-failed then ; -: approx_eaqual? \ s x w n -- | s w x n -- +: approx_equal? \ s x w n -- | s w x n -- run-test? !if 3drop test-skipped ;; then -rot isword? !if swap then w:exec diff --git a/exercises/practice/largest-series-product/libs/exercism/test b/exercises/practice/largest-series-product/libs/exercism/test index ff9cb4e..1d08eb2 100644 --- a/exercises/practice/largest-series-product/libs/exercism/test +++ b/exercises/practice/largest-series-product/libs/exercism/test @@ -117,7 +117,7 @@ true var, run-test eq? if test-passed else test-failed then ; -: approx_eaqual? \ s x w n -- | s w x n -- +: approx_equal? \ s x w n -- | s w x n -- run-test? !if 3drop test-skipped ;; then -rot isword? !if swap then w:exec diff --git a/exercises/practice/leap/libs/exercism/test b/exercises/practice/leap/libs/exercism/test index ff9cb4e..1d08eb2 100644 --- a/exercises/practice/leap/libs/exercism/test +++ b/exercises/practice/leap/libs/exercism/test @@ -117,7 +117,7 @@ true var, run-test eq? if test-passed else test-failed then ; -: approx_eaqual? \ s x w n -- | s w x n -- +: approx_equal? \ s x w n -- | s w x n -- run-test? !if 3drop test-skipped ;; then -rot isword? !if swap then w:exec diff --git a/exercises/practice/luhn/libs/exercism/test b/exercises/practice/luhn/libs/exercism/test index ff9cb4e..1d08eb2 100644 --- a/exercises/practice/luhn/libs/exercism/test +++ b/exercises/practice/luhn/libs/exercism/test @@ -117,7 +117,7 @@ true var, run-test eq? if test-passed else test-failed then ; -: approx_eaqual? \ s x w n -- | s w x n -- +: approx_equal? \ s x w n -- | s w x n -- run-test? !if 3drop test-skipped ;; then -rot isword? !if swap then w:exec diff --git a/exercises/practice/matching-brackets/libs/exercism/test b/exercises/practice/matching-brackets/libs/exercism/test index ff9cb4e..1d08eb2 100644 --- a/exercises/practice/matching-brackets/libs/exercism/test +++ b/exercises/practice/matching-brackets/libs/exercism/test @@ -117,7 +117,7 @@ true var, run-test eq? if test-passed else test-failed then ; -: approx_eaqual? \ s x w n -- | s w x n -- +: approx_equal? \ s x w n -- | s w x n -- run-test? !if 3drop test-skipped ;; then -rot isword? !if swap then w:exec diff --git a/exercises/practice/pangram/libs/exercism/test b/exercises/practice/pangram/libs/exercism/test index 1a3de29..1d08eb2 100644 --- a/exercises/practice/pangram/libs/exercism/test +++ b/exercises/practice/pangram/libs/exercism/test @@ -28,8 +28,8 @@ true var, run-test 1 tests-failed n:+! rot con:red con:onBlack . space " ... FAIL" . con:white con:onBlack cr - " Actual: «" . . - " Expected: «" . . + " Actual: «" . . "»" . cr + " Expected: «" . . "»" . cr cr ; : isword? \ x -- x f @@ -117,7 +117,7 @@ true var, run-test eq? if test-passed else test-failed then ; -: approx_eaqual? \ s x w n -- | s w x n -- +: approx_equal? \ s x w n -- | s w x n -- run-test? !if 3drop test-skipped ;; then -rot isword? !if swap then w:exec diff --git a/exercises/practice/pascals-triangle/libs/exercism/test b/exercises/practice/pascals-triangle/libs/exercism/test index ff9cb4e..1d08eb2 100644 --- a/exercises/practice/pascals-triangle/libs/exercism/test +++ b/exercises/practice/pascals-triangle/libs/exercism/test @@ -117,7 +117,7 @@ true var, run-test eq? if test-passed else test-failed then ; -: approx_eaqual? \ s x w n -- | s w x n -- +: approx_equal? \ s x w n -- | s w x n -- run-test? !if 3drop test-skipped ;; then -rot isword? !if swap then w:exec diff --git a/exercises/practice/perfect-numbers/libs/exercism/test b/exercises/practice/perfect-numbers/libs/exercism/test index ff9cb4e..1d08eb2 100644 --- a/exercises/practice/perfect-numbers/libs/exercism/test +++ b/exercises/practice/perfect-numbers/libs/exercism/test @@ -117,7 +117,7 @@ true var, run-test eq? if test-passed else test-failed then ; -: approx_eaqual? \ s x w n -- | s w x n -- +: approx_equal? \ s x w n -- | s w x n -- run-test? !if 3drop test-skipped ;; then -rot isword? !if swap then w:exec diff --git a/exercises/practice/pythagorean-triplet/libs/exercism/test b/exercises/practice/pythagorean-triplet/libs/exercism/test index f8d847d..1d08eb2 100644 --- a/exercises/practice/pythagorean-triplet/libs/exercism/test +++ b/exercises/practice/pythagorean-triplet/libs/exercism/test @@ -12,6 +12,13 @@ true var, run-test \ Some utility words + +: test-passed \ s x x -- \\ test name, expected value, actual value + 2drop + 1 tests-passed n:+! + con:green con:onBlack . space " ... OK" . con:white con:onBlack cr +; + : test-skipped \ s -- 1 tests-skipped n:+! con:cyan con:onBlack . space " ... SKIPPED" . con:white con:onBlack cr @@ -110,7 +117,7 @@ true var, run-test eq? if test-passed else test-failed then ; -: approx_eaqual? \ s x w n -- | s w x n -- +: approx_equal? \ s x w n -- | s w x n -- run-test? !if 3drop test-skipped ;; then -rot isword? !if swap then w:exec diff --git a/exercises/practice/raindrops/libs/exercism/test b/exercises/practice/raindrops/libs/exercism/test index ff9cb4e..1d08eb2 100644 --- a/exercises/practice/raindrops/libs/exercism/test +++ b/exercises/practice/raindrops/libs/exercism/test @@ -117,7 +117,7 @@ true var, run-test eq? if test-passed else test-failed then ; -: approx_eaqual? \ s x w n -- | s w x n -- +: approx_equal? \ s x w n -- | s w x n -- run-test? !if 3drop test-skipped ;; then -rot isword? !if swap then w:exec diff --git a/exercises/practice/resistor-color/libs/exercism/test b/exercises/practice/resistor-color/libs/exercism/test index ff9cb4e..1d08eb2 100644 --- a/exercises/practice/resistor-color/libs/exercism/test +++ b/exercises/practice/resistor-color/libs/exercism/test @@ -117,7 +117,7 @@ true var, run-test eq? if test-passed else test-failed then ; -: approx_eaqual? \ s x w n -- | s w x n -- +: approx_equal? \ s x w n -- | s w x n -- run-test? !if 3drop test-skipped ;; then -rot isword? !if swap then w:exec diff --git a/exercises/practice/reverse-string/libs/exercism/test b/exercises/practice/reverse-string/libs/exercism/test index 1a3de29..1d08eb2 100644 --- a/exercises/practice/reverse-string/libs/exercism/test +++ b/exercises/practice/reverse-string/libs/exercism/test @@ -28,8 +28,8 @@ true var, run-test 1 tests-failed n:+! rot con:red con:onBlack . space " ... FAIL" . con:white con:onBlack cr - " Actual: «" . . - " Expected: «" . . + " Actual: «" . . "»" . cr + " Expected: «" . . "»" . cr cr ; : isword? \ x -- x f @@ -117,7 +117,7 @@ true var, run-test eq? if test-passed else test-failed then ; -: approx_eaqual? \ s x w n -- | s w x n -- +: approx_equal? \ s x w n -- | s w x n -- run-test? !if 3drop test-skipped ;; then -rot isword? !if swap then w:exec diff --git a/exercises/practice/rna-transcription/libs/exercism/test b/exercises/practice/rna-transcription/libs/exercism/test index ff9cb4e..1d08eb2 100644 --- a/exercises/practice/rna-transcription/libs/exercism/test +++ b/exercises/practice/rna-transcription/libs/exercism/test @@ -117,7 +117,7 @@ true var, run-test eq? if test-passed else test-failed then ; -: approx_eaqual? \ s x w n -- | s w x n -- +: approx_equal? \ s x w n -- | s w x n -- run-test? !if 3drop test-skipped ;; then -rot isword? !if swap then w:exec diff --git a/exercises/practice/roman-numerals/libs/exercism/test b/exercises/practice/roman-numerals/libs/exercism/test index ff9cb4e..1d08eb2 100644 --- a/exercises/practice/roman-numerals/libs/exercism/test +++ b/exercises/practice/roman-numerals/libs/exercism/test @@ -117,7 +117,7 @@ true var, run-test eq? if test-passed else test-failed then ; -: approx_eaqual? \ s x w n -- | s w x n -- +: approx_equal? \ s x w n -- | s w x n -- run-test? !if 3drop test-skipped ;; then -rot isword? !if swap then w:exec diff --git a/exercises/practice/rotational-cipher/libs/exercism/test b/exercises/practice/rotational-cipher/libs/exercism/test index ff9cb4e..1d08eb2 100644 --- a/exercises/practice/rotational-cipher/libs/exercism/test +++ b/exercises/practice/rotational-cipher/libs/exercism/test @@ -117,7 +117,7 @@ true var, run-test eq? if test-passed else test-failed then ; -: approx_eaqual? \ s x w n -- | s w x n -- +: approx_equal? \ s x w n -- | s w x n -- run-test? !if 3drop test-skipped ;; then -rot isword? !if swap then w:exec diff --git a/exercises/practice/scrabble-score/libs/exercism/test b/exercises/practice/scrabble-score/libs/exercism/test index ff9cb4e..1d08eb2 100644 --- a/exercises/practice/scrabble-score/libs/exercism/test +++ b/exercises/practice/scrabble-score/libs/exercism/test @@ -117,7 +117,7 @@ true var, run-test eq? if test-passed else test-failed then ; -: approx_eaqual? \ s x w n -- | s w x n -- +: approx_equal? \ s x w n -- | s w x n -- run-test? !if 3drop test-skipped ;; then -rot isword? !if swap then w:exec diff --git a/exercises/practice/series/libs/exercism/test b/exercises/practice/series/libs/exercism/test index f8d847d..1d08eb2 100644 --- a/exercises/practice/series/libs/exercism/test +++ b/exercises/practice/series/libs/exercism/test @@ -12,6 +12,13 @@ true var, run-test \ Some utility words + +: test-passed \ s x x -- \\ test name, expected value, actual value + 2drop + 1 tests-passed n:+! + con:green con:onBlack . space " ... OK" . con:white con:onBlack cr +; + : test-skipped \ s -- 1 tests-skipped n:+! con:cyan con:onBlack . space " ... SKIPPED" . con:white con:onBlack cr @@ -110,7 +117,7 @@ true var, run-test eq? if test-passed else test-failed then ; -: approx_eaqual? \ s x w n -- | s w x n -- +: approx_equal? \ s x w n -- | s w x n -- run-test? !if 3drop test-skipped ;; then -rot isword? !if swap then w:exec diff --git a/exercises/practice/sieve/libs/exercism/test b/exercises/practice/sieve/libs/exercism/test index e7d3780..1d08eb2 100644 --- a/exercises/practice/sieve/libs/exercism/test +++ b/exercises/practice/sieve/libs/exercism/test @@ -12,6 +12,13 @@ true var, run-test \ Some utility words + +: test-passed \ s x x -- \\ test name, expected value, actual value + 2drop + 1 tests-passed n:+! + con:green con:onBlack . space " ... OK" . con:white con:onBlack cr +; + : test-skipped \ s -- 1 tests-skipped n:+! con:cyan con:onBlack . space " ... SKIPPED" . con:white con:onBlack cr @@ -21,8 +28,8 @@ true var, run-test 1 tests-failed n:+! rot con:red con:onBlack . space " ... FAIL" . con:white con:onBlack cr - " Actual: «" . . - " Expected: «" . . + " Actual: «" . . "»" . cr + " Expected: «" . . "»" . cr cr ; : isword? \ x -- x f @@ -110,7 +117,7 @@ true var, run-test eq? if test-passed else test-failed then ; -: approx_eaqual? \ s x w n -- | s w x n -- +: approx_equal? \ s x w n -- | s w x n -- run-test? !if 3drop test-skipped ;; then -rot isword? !if swap then w:exec diff --git a/exercises/practice/space-age/libs/exercism/test b/exercises/practice/space-age/libs/exercism/test index ba35024..1d08eb2 100644 --- a/exercises/practice/space-age/libs/exercism/test +++ b/exercises/practice/space-age/libs/exercism/test @@ -12,13 +12,6 @@ true var, run-test \ Some utility words -: array-insens-dot \ x -- \\ removes leading space on stringified arrays - dup >kind ns:a n:= - if - >s s:trim - then - . -; : test-passed \ s x x -- \\ test name, expected value, actual value 2drop @@ -35,8 +28,8 @@ true var, run-test 1 tests-failed n:+! rot con:red con:onBlack . space " ... FAIL" . con:white con:onBlack cr - " Actual: «" . array-insens-dot "»" . cr - " Expected: «" . array-insens-dot "»" . cr cr + " Actual: «" . . "»" . cr + " Expected: «" . . "»" . cr cr ; : isword? \ x -- x f diff --git a/exercises/practice/sum-of-multiples/libs/exercism/test b/exercises/practice/sum-of-multiples/libs/exercism/test index e7d3780..1d08eb2 100644 --- a/exercises/practice/sum-of-multiples/libs/exercism/test +++ b/exercises/practice/sum-of-multiples/libs/exercism/test @@ -12,6 +12,13 @@ true var, run-test \ Some utility words + +: test-passed \ s x x -- \\ test name, expected value, actual value + 2drop + 1 tests-passed n:+! + con:green con:onBlack . space " ... OK" . con:white con:onBlack cr +; + : test-skipped \ s -- 1 tests-skipped n:+! con:cyan con:onBlack . space " ... SKIPPED" . con:white con:onBlack cr @@ -21,8 +28,8 @@ true var, run-test 1 tests-failed n:+! rot con:red con:onBlack . space " ... FAIL" . con:white con:onBlack cr - " Actual: «" . . - " Expected: «" . . + " Actual: «" . . "»" . cr + " Expected: «" . . "»" . cr cr ; : isword? \ x -- x f @@ -110,7 +117,7 @@ true var, run-test eq? if test-passed else test-failed then ; -: approx_eaqual? \ s x w n -- | s w x n -- +: approx_equal? \ s x w n -- | s w x n -- run-test? !if 3drop test-skipped ;; then -rot isword? !if swap then w:exec diff --git a/exercises/practice/triangle/libs/exercism/test b/exercises/practice/triangle/libs/exercism/test index ff9cb4e..1d08eb2 100644 --- a/exercises/practice/triangle/libs/exercism/test +++ b/exercises/practice/triangle/libs/exercism/test @@ -117,7 +117,7 @@ true var, run-test eq? if test-passed else test-failed then ; -: approx_eaqual? \ s x w n -- | s w x n -- +: approx_equal? \ s x w n -- | s w x n -- run-test? !if 3drop test-skipped ;; then -rot isword? !if swap then w:exec diff --git a/exercises/practice/trinary/libs/exercism/test b/exercises/practice/trinary/libs/exercism/test index ff9cb4e..1d08eb2 100644 --- a/exercises/practice/trinary/libs/exercism/test +++ b/exercises/practice/trinary/libs/exercism/test @@ -117,7 +117,7 @@ true var, run-test eq? if test-passed else test-failed then ; -: approx_eaqual? \ s x w n -- | s w x n -- +: approx_equal? \ s x w n -- | s w x n -- run-test? !if 3drop test-skipped ;; then -rot isword? !if swap then w:exec diff --git a/exercises/practice/two-fer/libs/exercism/test b/exercises/practice/two-fer/libs/exercism/test index ff9cb4e..1d08eb2 100644 --- a/exercises/practice/two-fer/libs/exercism/test +++ b/exercises/practice/two-fer/libs/exercism/test @@ -117,7 +117,7 @@ true var, run-test eq? if test-passed else test-failed then ; -: approx_eaqual? \ s x w n -- | s w x n -- +: approx_equal? \ s x w n -- | s w x n -- run-test? !if 3drop test-skipped ;; then -rot isword? !if swap then w:exec diff --git a/exercises/practice/word-count/libs/exercism/test b/exercises/practice/word-count/libs/exercism/test index ff9cb4e..1d08eb2 100644 --- a/exercises/practice/word-count/libs/exercism/test +++ b/exercises/practice/word-count/libs/exercism/test @@ -117,7 +117,7 @@ true var, run-test eq? if test-passed else test-failed then ; -: approx_eaqual? \ s x w n -- | s w x n -- +: approx_equal? \ s x w n -- | s w x n -- run-test? !if 3drop test-skipped ;; then -rot isword? !if swap then w:exec diff --git a/exercises/practice/yacht/libs/exercism/test b/exercises/practice/yacht/libs/exercism/test index 1a3de29..1d08eb2 100644 --- a/exercises/practice/yacht/libs/exercism/test +++ b/exercises/practice/yacht/libs/exercism/test @@ -28,8 +28,8 @@ true var, run-test 1 tests-failed n:+! rot con:red con:onBlack . space " ... FAIL" . con:white con:onBlack cr - " Actual: «" . . - " Expected: «" . . + " Actual: «" . . "»" . cr + " Expected: «" . . "»" . cr cr ; : isword? \ x -- x f @@ -117,7 +117,7 @@ true var, run-test eq? if test-passed else test-failed then ; -: approx_eaqual? \ s x w n -- | s w x n -- +: approx_equal? \ s x w n -- | s w x n -- run-test? !if 3drop test-skipped ;; then -rot isword? !if swap then w:exec diff --git a/libs/exercism/test b/libs/exercism/test index ff9cb4e..1d08eb2 100644 --- a/libs/exercism/test +++ b/libs/exercism/test @@ -117,7 +117,7 @@ true var, run-test eq? if test-passed else test-failed then ; -: approx_eaqual? \ s x w n -- | s w x n -- +: approx_equal? \ s x w n -- | s w x n -- run-test? !if 3drop test-skipped ;; then -rot isword? !if swap then w:exec