Mercurial > hg > xemacs-beta
comparison lisp/cl-extra.el @ 5574:d4f334808463
Support inlining labels, bytecomp.el.
lisp/ChangeLog addition:
2011-10-02 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-initial-macro-environment):
Add #'declare to this, so it doesn't need to rely on
#'cl-compiling file to determine when we're byte-compiling.
Update #'labels to support declaring labels inline, as Common Lisp
requires.
* bytecomp.el (byte-compile-function-form):
Don't error if FUNCTION is quoting a non-lambda, non-symbol, just
return it.
* cl-extra.el (cl-macroexpand-all):
If a label name has been quoted, expand to the label placeholder
quoted with 'function. This allows the byte compiler to
distinguish between uses of the placeholder as data and uses in
contexts where it should be inlined.
* cl-macs.el:
* cl-macs.el (cl-do-proclaim):
When proclaming something as inline, if it is bound as a label,
don't modify the symbol's plist; instead, treat the first element
of its placeholder constant vector as a place to store compile
information.
* cl-macs.el (declare):
Leave processing declarations while compiling to the
implementation of #'declare in
byte-compile-initial-macro-environment.
tests/ChangeLog addition:
2011-10-02 Aidan Kehoe <kehoea@parhasard.net>
* automated/lisp-tests.el:
* automated/lisp-tests.el (+):
Test #'labels and inlining.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sun, 02 Oct 2011 15:32:16 +0100 |
parents | 855b667dea13 |
children | 10f179710250 |
comparison
equal
deleted
inserted
replaced
5573:f0f1fd0d8486 | 5574:d4f334808463 |
---|---|
617 ;; It's a cons; this is the implementation of | 617 ;; It's a cons; this is the implementation of |
618 ;; labels in cl-macs.el. | 618 ;; labels in cl-macs.el. |
619 (cl-macroexpand-all (nth 1 (nth 2 (nth 2 found))) env) | 619 (cl-macroexpand-all (nth 1 (nth 2 (nth 2 found))) env) |
620 ;; It's an atom, almost certainly a compiled function; | 620 ;; It's an atom, almost certainly a compiled function; |
621 ;; we're using the implementation of labels in | 621 ;; we're using the implementation of labels in |
622 ;; bytecomp.el. | 622 ;; bytecomp.el. Quote it with FUNCTION so that code can |
623 (nth 2 (nth 2 found))) | 623 ;; tell uses as data apart from the uses with funcall, |
624 ;; where it's unquoted. #### We should warn if (car form) | |
625 ;; above is quote, rather than function. | |
626 (list 'function (nth 2 (nth 2 found)))) | |
624 form)))) | 627 form)))) |
625 ((memq (car form) '(defun defmacro)) | 628 ((memq (car form) '(defun defmacro)) |
626 (list* (car form) (nth 1 form) (cl-macroexpand-body (cddr form) env))) | 629 (list* (car form) (nth 1 form) (cl-macroexpand-body (cddr form) env))) |
627 ((and (eq (car form) 'progn) (not (cddr form))) | 630 ((and (eq (car form) 'progn) (not (cddr form))) |
628 (cl-macroexpand-all (nth 1 form) env)) | 631 (cl-macroexpand-all (nth 1 form) env)) |