Allow run-hook to take arguments.

Author: ruricolist

hooks.lisp

@@ -24,33 +24,26 @@
      ,@body))
 
 (defun run-hooks (&rest hooks)
-  "Run all the hooks in HOOKS.
+  "Run all the hooks in HOOKS, without arguments.
 The variable `*hook*' is bound to the name of each hook as it is being
 run."
   (dolist (*hook* hooks)
     (run-hook *hook*)))
 
-(defgeneric run-hook (hook)
-  (:documentation "Run the functions in HOOK.")
-  (:method ((*hook* symbol))
-    (dolist (fn (symbol-value *hook*))
-      (with-hook-restart
-        (funcall fn)))))
-
-(defgeneric run-hook-with-args (hook &rest args)
+(defgeneric run-hook (hook &rest args)
   (:documentation "Apply each function in HOOK to ARGS.")
   (:method ((*hook* symbol) &rest args)
     (dolist (fn (symbol-value *hook*))
       (with-hook-restart
         (apply fn args)))))
 
-(defgeneric run-hook-with-args-until-failure (hook &rest args)
+(defgeneric run-hook-until-failure (hook &rest args)
   (:documentation "Like `run-hook-with-args', but quit once a function returns nil.")
   (:method ((*hook* symbol) &rest args)
     (loop for fn in (symbol-value *hook*)
           always (apply fn args))))
 
-(defgeneric run-hook-with-args-until-success (hook &rest args)
+(defgeneric run-hook-until-success (hook &rest args)
   (:documentation "Like `run-hook-with-args', but quit once a function returns
 non-nil.")
   (:method ((*hook* symbol) &rest args)

package.lisp

@@ -286,9 +286,9 @@
    #:remove-hook
    #:run-hooks
    #:run-hook
-   #:run-hook-with-args
-   #:run-hook-with-args-until-failure
-   #:run-hook-with-args-until-success
+   #:run-hook
+   #:run-hook-until-failure
+   #:run-hook-until-success
    ;; Fbind.
    #:fbind
    #:fbind*

tests/hooks.lisp

@@ -34,22 +34,22 @@
     (let ((list '()))
       (flet ((add (n) (push n list)))
         (add-hook hook #'add)
-        (run-hook-with-args hook '2)
-        (run-hook-with-args hook '1)
+        (run-hook hook '2)
+        (run-hook hook '1)
         (is (equal list '(1 2)))))))
 
-(test run-hook-with-args-until-failure
+(test run-hook-until-failure
   (with-temp-hook (hook)
     (add-hook hook (constantly nil))
     (add-hook hook
               (lambda () (fail "This function should not run"))
               :append t)
-    (run-hook-with-args-until-failure hook)))
+    (run-hook-until-failure hook)))
 
-(test run-hook-with-args-until-success
+(test run-hook-until-success
   (with-temp-hook (hook)
     (add-hook hook (constantly t))
     (add-hook hook
               (lambda () (fail "This function should not run"))
               :append t)
-    (run-hook-with-args-until-success hook)))
+    (run-hook-until-success hook)))