From 94cdd9c501235aee52d772aa528584d5b023d4fd Mon Sep 17 00:00:00 2001
From: Colin Okay <cbeok@protonmail.com>
Date: Thu, 13 Aug 2020 11:18:44 -0500
Subject: renamed and> and or> to conj and disj

---
 macros.lisp  | 4 ++--
 package.lisp | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/macros.lisp b/macros.lisp
index de2dfbf..8157959 100644
--- a/macros.lisp
+++ b/macros.lisp
@@ -91,7 +91,7 @@ those numbers.
 
 
 
-(defmacro and> (&rest preds)
+(defmacro conj (&rest preds)
   (let ((block-label (gensym)))
     `(let ((preds (list ,@preds)))
        (lambda (arg)
@@ -103,7 +103,7 @@ those numbers.
                (unless acc (return-from ,block-label nil)))
              acc))))))
 
-(defmacro or> (&rest preds)
+(defmacro disj (&rest preds)
   (let ((block-label (gensym)))
     `(let ((preds (list ,@preds)))
        (lambda (arg)
diff --git a/package.lisp b/package.lisp
index e1c0bbc..dc16ff5 100644
--- a/package.lisp
+++ b/package.lisp
@@ -5,7 +5,7 @@
   (:export #:$$
            #:>>
            #:<>
-           #:and>
-           #:or>
+           #:conj
+           #:disj
            #:enable-partial-eval-reader-macro
            #:enable-lazy-eval-reader-macros))
-- 
cgit v1.2.3