From 6e075d897d8f293c17e52cb41fd50d5660e0db55 Mon Sep 17 00:00:00 2001 From: colin Date: Fri, 19 Apr 2024 06:41:11 -0700 Subject: modify expansion of ? --- obwyn.lisp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/obwyn.lisp b/obwyn.lisp index 58eeff0..19e2501 100644 --- a/obwyn.lisp +++ b/obwyn.lisp @@ -51,12 +51,12 @@ (t `(progn ,form ,expanded)))) - (:unless + (:when (cond ((null expanded) form) ((eq 'cl:progn (first expanded)) - `(progn (unless ,form (return)) ,@(rest expanded))) + `(when ,form ,@(rest expanded))) (t - `(progn (unless ,form (return)) ,expanded)))) + `(when ,form ,expanded)))) (:mvbind `(multiple-value-bind @@ -127,7 +127,7 @@ ( :match (:seq (:= :?) (:item)) - :then (list :unless nil (second ))) + :then (list :when nil (second ))) ( :match (:@ simple (:item)) -- cgit v1.2.3