ryuslash/clark
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Simplify usage of call-command

Browse source
This commit is contained in:
Tom Willemsen 2013-03-23 20:57:13 +01:00
parent e41bb3a930
commit 9d5973a022
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lisp/clark.lisp
View file

@ -35,7 +35,7 @@
(defmacro call-command (name &rest args) (defmacro call-command (name &rest args)
(let ((command-name (make-command-name (symbol-name name)))) (let ((command-name (make-command-name (symbol-name name))))
`(,command-name ,@args))) `(,command-name ',args)))
(defmacro defcommand (name (&key (min-args 0) (max-args nil)) sdoc ldoc (defmacro defcommand (name (&key (min-args 0) (max-args nil)) sdoc ldoc
&body body) &body body)
@ -52,11 +52,11 @@
((< num-args min-args) ((< num-args min-args)
(format t "Too few arguments, need at least ~D, got ~D~%" (format t "Too few arguments, need at least ~D, got ~D~%"
min-args num-args) min-args num-args)
(call-command help '(,sname))) (call-command help ,sname))
((and max-args (> num-args max-args)) ((and max-args (> num-args max-args))
(format t "Too many arguments, need at most ~D, got ~D~%" (format t "Too many arguments, need at most ~D, got ~D~%"
max-args num-args) max-args num-args)
(call-command help '(,sname))) (call-command help ,sname))
(t ,@body)))) (t ,@body))))
(setf *help-messages* (setf *help-messages*
(nconc *help-messages* '((,sname ,sdoc ,ldoc))) (nconc *help-messages* '((,sname ,sdoc ,ldoc)))
@ -172,7 +172,7 @@ The executable name should already have been removed."
(funcall cmd-name (cdr args)) (funcall cmd-name (cdr args))
(progn (progn
(format t "Unknown command: ~A~%" (car args)) (format t "Unknown command: ~A~%" (car args))
(call-command help nil)))) (call-command help))))
(map nil #'print-bookmark (get-bookmarks)))) (map nil #'print-bookmark (get-bookmarks))))
(defun print-bookmark (bm) (defun print-bookmark (bm)
@ -240,7 +240,7 @@ otherwise."
((null ldoc) (format t "Unkown command: ~A~%" (car args))) ((null ldoc) (format t "Unkown command: ~A~%" (car args)))
((and (symbolp ldoc) (fboundp ldoc)) (funcall ldoc)) ((and (symbolp ldoc) (fboundp ldoc)) (funcall ldoc))
(t (format t "~A~%" ldoc)))) (t (format t "~A~%" ldoc))))
(call-command help '("help")))) (call-command help "help")))
(defcommand remove (:min-args 1 :max-args 1) (defcommand remove (:min-args 1 :max-args 1)
"Remove a bookmark from the database." "Remove a bookmark from the database."