From e0ff97d930076e6e8c91b22f0e124a35415b690f Mon Sep 17 00:00:00 2001
From: kilianmh <kilian.haemmerle@protonmail.com>
Date: Mon, 20 Feb 2023 17:52:13 +0100
Subject: [PATCH] Refactor: use anaphora library

Reuse aif and acond from anaphora library instead of own util functions.
---
 fiveam.asd       |  2 +-
 src/package.lisp |  2 ++
 src/utils.lisp   | 38 +-------------------------------------
 3 files changed, 4 insertions(+), 38 deletions(-)

diff --git a/fiveam.asd b/fiveam.asd
index e364e2f..6dd35eb 100644
--- a/fiveam.asd
+++ b/fiveam.asd
@@ -8,7 +8,7 @@
   :version (:read-file-form "version.sexp")
   :description "A simple regression testing framework"
   :license "BSD"
-  :depends-on (:alexandria :net.didierverna.asdf-flv  :trivial-backtrace)
+  :depends-on (:alexandria :net.didierverna.asdf-flv  :trivial-backtrace :anaphora)
   :pathname "src/"
   :components ((:file "package")
                (:file "utils" :depends-on ("package"))
diff --git a/src/package.lisp b/src/package.lisp
index 1cc8dcc..f86a592 100644
--- a/src/package.lisp
+++ b/src/package.lisp
@@ -22,6 +22,8 @@
   (:nicknames :5am :fiveam)
   #+sb-package-locks
   (:lock t)
+  (:import-from #:anaphora
+                #:aif #:acond #:it)
   (:export
    ;; creating tests and test-suites
    #:make-suite
diff --git a/src/utils.lisp b/src/utils.lisp
index 8f4b58b..7890b7f 100644
--- a/src/utils.lisp
+++ b/src/utils.lisp
@@ -55,42 +55,6 @@ current list of values."
             (return-from item)))))
     (mapcar #'funcall (mapcar #'cdr collectors))))
 
-;;;; ** Anaphoric conditionals
-
-(defmacro if-bind (var test &body then/else)
-  "Anaphoric IF control structure.
-
-VAR (a symbol) will be bound to the primary value of TEST. If
-TEST returns a true value then THEN will be executed, otherwise
-ELSE will be executed."
-  (assert (first then/else)
-          (then/else)
-          "IF-BIND missing THEN clause.")
-  (destructuring-bind (then &optional else)
-      then/else
-    `(let ((,var ,test))
-       (if ,var ,then ,else))))
-
-(defmacro aif (test then &optional else)
-  "Just like IF-BIND but the var is always IT."
-  `(if-bind it ,test ,then ,else))
-
-;;;; ** Simple list matching based on code from Paul Graham's On Lisp.
-
-(defmacro acond2 (&rest clauses)
-  (if (null clauses)
-      nil
-      (with-gensyms (val foundp)
-        (destructuring-bind ((test &rest progn) &rest others)
-            clauses
-          `(multiple-value-bind (,val ,foundp)
-               ,test
-             (if (or ,val ,foundp)
-                 (let ((it ,val))
-                   (declare (ignorable it))
-                   ,@progn)
-                 (acond2 ,@others)))))))
-
 (defun varsymp (x)
   (and (symbolp x)
        (let ((name (symbol-name x)))
@@ -106,7 +70,7 @@ ELSE will be executed."
       (values (cdr b) b))))
 
 (defun list-match (x y &optional binds)
-  (acond2
+  (acond
     ((or (eql x y) (eql x '_) (eql y '_))
      (values binds t))
     ((binding x binds) (list-match it y binds))