modify expansion of ?

1 files 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 @@
 
   (<predicate-clause>
    :match (:seq (:= :?) (:item))
-   :then (list :unless nil (second <predicate-clause>)))
+   :then (list :when nil (second <predicate-clause>)))
   
   (<simple-clause>
    :match (:@ simple (:item))