more syntax checking for task-handler-bind

lmj · Nov 6, 2014 · 9c65e4f · 9c65e4f
1 parent 77516ae
commit 9c65e4f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/kernel/handling.lisp b/src/kernel/handling.lisp
@@ -62,8 +62,8 @@ that were created in `body'."
   (let ((forms (loop
                   :for clause :in clauses
                   :for (name fn . more) := clause
-                  :do (unless (and (symbolp name) (not more))
-                        (error "Wrong format in TASK-HANDLER-BIND clause: ~a"
+                  :do (unless (and name (symbolp name) fn (not more))
+                        (error "Ill-formed binding in `task-handler-bind': ~a"
                                clause))
                   :collect `(cons ',name ,fn))))
     `(let ((*client-handlers* (list* ,@forms *client-handlers*)))

diff --git a/test/kernel-test.lisp b/test/kernel-test.lisp
@@ -500,6 +500,16 @@
     (is (equal '(inner outer)
                (extract-queue q)))))
 
+(base-test task-handler-bind-syntax-test
+  (signals error
+    (macroexpand '(task-handler-bind ((())))))
+  (signals error
+    (macroexpand '(task-handler-bind (()))))
+  (signals error
+    (macroexpand '(task-handler-bind ((x)))))
+  (signals error
+    (macroexpand '(task-handler-bind ((x y z))))))
+
 (full-test print-kernel-test
   (is (plusp (length (with-output-to-string (s)
                        (print *kernel* s))))))