Unbreak new tests. For #2

Author: eigenhombre

Dockerfile

@@ -15,6 +15,8 @@ RUN ecl --load quicklisp.lisp \
 RUN echo | ecl --load /home/janice/quicklisp/setup.lisp --eval '(ql:add-to-init-file)'
 RUN echo | sbcl --load /home/janice/quicklisp/setup.lisp --eval '(ql:add-to-init-file)' --quit
 
+RUN sbcl --eval '(ql-dist:install-dist "http://dist.ultralisp.org/" :prompt nil)'
+
 ENV LISP_HOME=/home/janice/quicklisp/local-projects
 WORKDIR /home/janice/hbook
 

hbook.asd

@@ -5,12 +5,7 @@
   :license "FIXME"
   :serial t
   :in-order-to ((asdf:test-op (asdf:test-op :hbook/test)))
-  :depends-on (:arrows
-               ;; FIXME: Though not an explicit run-time dependency,
-               ;; for some reason I needed to add this for GitHub
-               ;; Action CI build to succeed.  This merits more
-               ;; investigation:
-               :1am)
+  :depends-on (:cl-oju :1am)
   :components ((:module "src"
                 :serial t
                 :components ((:file "package")
@@ -20,7 +15,7 @@
   :description "FIXME"
   :author "FIXME"
   :license "FIXME"
-  :depends-on (:hbook :1am)
+  :depends-on (:hbook :1am :cl-oju)
   :serial t
   :components ((:module "test"
                 :serial t

src/main.lisp

@@ -1,9 +1,6 @@
 (in-package #:hbook)
 
 ;; Utilities
-(defmacro comment (&rest x)
-  (declare (ignore x)))
-
 (defun minmax (list)
   (loop for el in list
         maximizing el into max
@@ -138,6 +135,9 @@
         do (setf acc (dn acc))
         finally (return acc)))
 
+(defmacro comment (&rest x)
+  (declare (ignore x)))
+
 (comment
  (dr 1)
  (dr 2)

test/package.lisp

@@ -1,3 +1,3 @@
 (defpackage :hbook.test
-  (:use :cl :1am :hbook)
+  (:use :cl :1am :hbook :cl-oju)
   (:export :run-tests))

test/test.lisp

@@ -1,5 +1,5 @@
 (defpackage :hbook.test
-  (:use :cl :1am :hbook)
+  (:use :cl :1am :hbook :cl-oju)
   (:export :run-tests))
 
 (in-package #:hbook.test)
@@ -29,44 +29,19 @@
              (loop for el in '(2 3 4 5 6 7 8 9 10 11 12)
                    collect (bin-index 11 2 12 el)))))
 
-;; TODO: Use cl-oju?
-(defun take (n l)
-  "
-  Take the first `n` items from `l`.
-  "
-  (subseq l 0 n))
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  (defun apply-bindings (bindings case expr)
+    "
+    (apply-bindings '(x y) '(2 3) '(+ x y))
 
-(defun partition-n (cell-size step-size lst)
-  "
-  Analog of Clojure's `partition` function with explicit
-  step size and padding value.
-
-  (partition-n 2 2 '(eenie meanie
-                     miney moe))
-  ;;=>
-  '((EENIE MEANIE) (MINEY MOE))
-  "
-  (let ((ret nil))
-    (loop for cell on lst
-          by #'(lambda (lst1) (nthcdr step-size lst1))
-          do (let ((this (take cell-size cell)))
-               (when (= (length (the list this))
-                        (the fixnum cell-size))
-                 (push (take cell-size cell) ret))))
-    (nreverse ret)))
-
-(defun apply-bindings (bindings case expr)
-  "
-  (apply-bindings '(x y) '(2 3) '(+ x y))
-
-  ;;=>
-  '(+ 2 3)
-  "
-  (loop with ret = expr
-        for b in bindings
-        for c in case
-        do (setf ret (subst c b ret))
-        finally (return ret)))
+    ;;=>
+    '(+ 2 3)
+    "
+    (loop with ret = expr
+          for b in bindings
+          for c in case
+          do (setf ret (subst c b ret))
+          finally (return ret))))
 
 (defmacro are (argv expr &rest cases)
   "