colonelpanic/dotfiles
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make imalison:compose handle undefined functions

Browse Source 
Because help-function-arglist returns t when it encounters an undefined
function, imalison:compose was choking when it was evaluated on
functions that are not defined at the time of macro expansion.
This commit is contained in:
Ivan Malison 2016-06-22 20:00:21 -07:00
parent 6a7670f4c3
commit 58d2b5c113
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
dotfiles/emacs.d/README.org
View File

@ -418,25 +418,20 @@ The packages in this section provide no functionality on their own, but provide
#+END_SRC #+END_SRC
**** A Version Supporting Macros **** A Version Supporting Macros
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
(defun imalison:args-expander (function-name) (defun imalison:help-function-arglist (function)
(lambda (args) (let ((result (help-function-arglist function )))
(apply function-name args))) (if (eq result t) '(&rest args) result)))
(defmacro imalison:compose (&rest funcs) (defmacro imalison:compose (&rest funcs)
(let* ((last-function (car (last funcs))) (let* ((last-function (car (last funcs)))
(arguments (help-function-arglist last-function)) (arguments (imalison:help-function-arglist last-function))
(call-arguments (delq '&optional arguments))) (call-arguments (delq '&optional arguments)))
(when (memq '&rest arguments) (when (memq '&rest arguments)
(setq arguments '(&rest args)) (setq arguments '(&rest args))
(setq call-arguments '(args)) (setq call-arguments '(args)))
(setq funcs
(-replace-at (- (length arguments) 1)
(imalison:args-expander last-function)
funcs)))
`(imalison:compose-argspec ,arguments ,call-arguments ,@funcs))) `(imalison:compose-argspec ,arguments ,call-arguments ,@funcs)))
(defmacro imalison:compose-argspec (defmacro imalison:compose-argspec (arguments call-arguments &rest funcs)
(arguments call-arguments &rest funcs)
"Build a new function with NAME that is the composition of FUNCS." "Build a new function with NAME that is the composition of FUNCS."
`(lambda ,arguments `(lambda ,arguments
(imalison:compose-helper ,funcs ,call-arguments))) (imalison:compose-helper ,funcs ,call-arguments)))
@ -444,7 +439,10 @@ The packages in this section provide no functionality on their own, but provide
(defmacro imalison:compose-helper (funcs arguments) (defmacro imalison:compose-helper (funcs arguments)
"Builds funcalls of FUNCS applied to the arg." "Builds funcalls of FUNCS applied to the arg."
(if (equal (length funcs) 1) (if (equal (length funcs) 1)
`(,(car funcs) ,@arguments) (let ((last-function (car funcs)))
(when (memq '&rest (imalison:help-function-arglist last-function))
(setq last-function (apply-partially 'apply last-function)))
`(,last-function ,@arguments))
`(,(car funcs) `(,(car funcs)
(imalison:compose-helper ,(cdr funcs) ,arguments)))) (imalison:compose-helper ,(cdr funcs) ,arguments))))
#+END_SRC #+END_SRC
@ -814,7 +812,7 @@ A macro for composing functions together to build an interactive command to copy
*** Copy the current branch using magit *** Copy the current branch using magit
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
(imalison:compose-copy-builder imalison:copy-current-git-branch (imalison:compose-copy-builder imalison:copy-current-git-branch
'magit-get-current-branch) magit-get-current-branch)
#+END_SRC #+END_SRC
** Advice Add Around Builder ** Advice Add Around Builder
For composing functions with an apply so that they can be used with the ~:around~ keyword of advice-add For composing functions with an apply so that they can be used with the ~:around~ keyword of advice-add