From 73d17124df0a837fe7ca400a0c79a9fa5c6dfbe9 Mon Sep 17 00:00:00 2001 From: colin Date: Fri, 19 Apr 2024 10:36:09 -0700 Subject: Refactored to reuse variablep --- obwyn.lisp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/obwyn.lisp b/obwyn.lisp index e9f8c33..1b3193f 100644 --- a/obwyn.lisp +++ b/obwyn.lisp @@ -18,10 +18,9 @@ (:is (not (values-binding-p :x))) (:is (not (values-binding-p '(a b 4)))) (:is (not (values-binding-p '(a :b 4))))) - (or (and (symbolp form) - (not (keywordp form))) + (or (variablep form) (and (listp form) - (every (a:conjoin #'symbolp (complement #'keywordp)) form)))) + (every #'variablep form)))) (defun destructuring-bind-list-p (form) #+testiere @@ -129,7 +128,7 @@ ( :match (:seq (:@ var (:item)) (:= :when=) (:@ form (:item))) - :if (and (symbolp var) (not (keywordp var))) + :if variablep :then (list :when= var form) :note "Bind variable to form, exit early if form evaluated to nil.") -- cgit v1.2.3