Mercurial > hg > xemacs-beta
changeset 5553:62edcc6a11ec
Add an assertion about argument order to #'apply-partially compiler macro
lisp/ChangeLog addition:
2011-08-24 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (apply-partially):
Add an assertion to this compiler macro, requiring that the order
of the placeholders corresponding to the arguments in the
constants vector of the constructed compiled function be the same
as the order of the arguments to #'apply-partially.
tests/ChangeLog addition:
2011-08-24 Aidan Kehoe <kehoea@parhasard.net>
* automated/lisp-tests.el:
Add a test of apply partially that depends on the relative order
of its arguments.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Wed, 24 Aug 2011 11:06:41 +0100 |
| parents | b908c7265a2b |
| children | a42e686a01bf |
| files | lisp/ChangeLog lisp/cl-macs.el tests/ChangeLog tests/automated/lisp-tests.el |
| diffstat | 4 files changed, 26 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Fri Aug 12 16:02:30 2011 +0100 +++ b/lisp/ChangeLog Wed Aug 24 11:06:41 2011 +0100 @@ -1,3 +1,11 @@ +2011-08-24 Aidan Kehoe <kehoea@parhasard.net> + + * cl-macs.el (apply-partially): + Add an assertion to this compiler macro, requiring that the order + of the placeholders corresponding to the arguments in the + constants vector of the constructed compiled function be the same + as the order of the arguments to #'apply-partially. + 2011-08-12 Aidan Kehoe <kehoea@parhasard.net> * cl-macs.el:
--- a/lisp/cl-macs.el Fri Aug 12 16:02:30 2011 +0100 +++ b/lisp/cl-macs.el Wed Aug 24 11:06:41 2011 +0100 @@ -3519,6 +3519,13 @@ (let* ((placeholders (mapcar 'quote-maybe (mapcar 'gensym args))) (compiled (byte-compile-sexp `#'(lambda (&rest args) (apply ,@placeholders args))))) + (assert (equal (intersection + (mapcar 'quote-maybe (compiled-function-constants + compiled)) + placeholders :test 'equal :stable t) + placeholders) + t "This macro requires that the relative order is the same\ +in the constants vector and in the arguments") `(make-byte-code ',(compiled-function-arglist compiled) ,(compiled-function-instructions compiled)
--- a/tests/ChangeLog Fri Aug 12 16:02:30 2011 +0100 +++ b/tests/ChangeLog Wed Aug 24 11:06:41 2011 +0100 @@ -1,3 +1,9 @@ +2011-08-24 Aidan Kehoe <kehoea@parhasard.net> + + * automated/lisp-tests.el: + Add a test of apply partially that depends on the relative order + of its arguments. + 2011-08-12 Aidan Kehoe <kehoea@parhasard.net> * automated/lisp-tests.el:
--- a/tests/automated/lisp-tests.el Fri Aug 12 16:02:30 2011 +0100 +++ b/tests/automated/lisp-tests.el Wed Aug 24 11:06:41 2011 +0100 @@ -2929,10 +2929,13 @@ ;; Basic tests of #'apply-partially. (let* ((four 4) (times-four (apply-partially '* four)) - (plus-twelve (apply-partially '+ 6 (* 3 2)))) + (plus-twelve (apply-partially '+ 6 (* 3 2))) + (construct-list (apply-partially 'list (incf four) (incf four) + (incf four)))) (Assert (eql (funcall times-four 6) 24)) (Assert (eql (funcall times-four 4 4) 64)) (Assert (eql (funcall plus-twelve (funcall times-four 4) 4 4) 36)) - (Check-Error wrong-number-of-arguments (apply-partially))) + (Check-Error wrong-number-of-arguments (apply-partially)) + (Assert (equal (funcall construct-list) '(5 6 7)))) ;;; end of lisp-tests.el