Mercurial > emacs
annotate lisp/emacs-lisp/bytecomp.el @ 94994:29adfc9354e7
Switch to recommended form of GPLv3 permissions notice.
author | Glenn Morris <rgm@gnu.org> |
---|---|
date | Thu, 15 May 2008 03:25:15 +0000 |
parents | 90a2847062be |
children | 1b0cbcea87b2 |
rev | line source |
---|---|
38412
253f761ad37b
Some fixes to follow coding conventions in files maintained by FSF.
Pavel Janík <Pavel@Janik.cz>
parents:
37909
diff
changeset
|
1 ;;; bytecomp.el --- compilation of Lisp code into byte code |
757 | 2 |
58154 | 3 ;; Copyright (C) 1985, 1986, 1987, 1992, 1994, 1998, 2000, 2001, 2002, |
79704 | 4 ;; 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
846
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
819
diff
changeset
|
5 |
819
5bbabfcef929
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
784
diff
changeset
|
6 ;; Author: Jamie Zawinski <jwz@lucid.com> |
5bbabfcef929
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
784
diff
changeset
|
7 ;; Hallvard Furuseth <hbf@ulrik.uio.no> |
20818
732ffd28a863
(byte-compile-from-buffer): Bind edebug-all-defs and edebug-all-forms to nil.
Richard M. Stallman <rms@gnu.org>
parents:
20779
diff
changeset
|
8 ;; Maintainer: FSF |
20779 | 9 ;; Keywords: lisp |
819
5bbabfcef929
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
784
diff
changeset
|
10 |
757 | 11 ;; This file is part of GNU Emacs. |
12 | |
94655
90a2847062be
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94392
diff
changeset
|
13 ;; GNU Emacs is free software: you can redistribute it and/or modify |
757 | 14 ;; it under the terms of the GNU General Public License as published by |
94655
90a2847062be
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94392
diff
changeset
|
15 ;; the Free Software Foundation, either version 3 of the License, or |
90a2847062be
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94392
diff
changeset
|
16 ;; (at your option) any later version. |
757 | 17 |
18 ;; GNU Emacs is distributed in the hope that it will be useful, | |
19 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
20 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
21 ;; GNU General Public License for more details. | |
22 | |
23 ;; You should have received a copy of the GNU General Public License | |
94655
90a2847062be
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94392
diff
changeset
|
24 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
757 | 25 |
2307
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2299
diff
changeset
|
26 ;;; Commentary: |
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2299
diff
changeset
|
27 |
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2299
diff
changeset
|
28 ;; The Emacs Lisp byte compiler. This crunches lisp source into a sort |
28295
8082575fec24
(byte-compile-warning-types, byte-compile-warnings): New warning `noruntime'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27824
diff
changeset
|
29 ;; of p-code (`lapcode') which takes up less space and can be interpreted |
8082575fec24
(byte-compile-warning-types, byte-compile-warnings): New warning `noruntime'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27824
diff
changeset
|
30 ;; faster. [`LAP' == `Lisp Assembly Program'.] |
2307
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2299
diff
changeset
|
31 ;; The user entry points are byte-compile-file and byte-recompile-directory. |
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2299
diff
changeset
|
32 |
819
5bbabfcef929
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
784
diff
changeset
|
33 ;;; Code: |
5bbabfcef929
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
784
diff
changeset
|
34 |
14169 | 35 ;; ======================================================================== |
36 ;; Entry points: | |
37 ;; byte-recompile-directory, byte-compile-file, | |
38 ;; batch-byte-compile, batch-byte-recompile-directory, | |
39 ;; byte-compile, compile-defun, | |
40 ;; display-call-tree | |
41 ;; (byte-compile-buffer and byte-compile-and-load-file were turned off | |
42 ;; because they are not terribly useful and get in the way of completion.) | |
757 | 43 |
14169 | 44 ;; This version of the byte compiler has the following improvements: |
45 ;; + optimization of compiled code: | |
46 ;; - removal of unreachable code; | |
47 ;; - removal of calls to side-effectless functions whose return-value | |
48 ;; is unused; | |
49 ;; - compile-time evaluation of safe constant forms, such as (consp nil) | |
50 ;; and (ash 1 6); | |
51 ;; - open-coding of literal lambdas; | |
52 ;; - peephole optimization of emitted code; | |
53 ;; - trivial functions are left uncompiled for speed. | |
54 ;; + support for inline functions; | |
55 ;; + compile-time evaluation of arbitrary expressions; | |
56 ;; + compile-time warning messages for: | |
57 ;; - functions being redefined with incompatible arglists; | |
58 ;; - functions being redefined as macros, or vice-versa; | |
59 ;; - functions or macros defined multiple times in the same file; | |
60 ;; - functions being called with the incorrect number of arguments; | |
28402 | 61 ;; - functions being called which are not defined globally, in the |
14169 | 62 ;; file, or as autoloads; |
63 ;; - assignment and reference of undeclared free variables; | |
64 ;; - various syntax errors; | |
65 ;; + correct compilation of nested defuns, defmacros, defvars and defsubsts; | |
66 ;; + correct compilation of top-level uses of macros; | |
67 ;; + the ability to generate a histogram of functions called. | |
757 | 68 |
14169 | 69 ;; User customization variables: |
70 ;; | |
71 ;; byte-compile-verbose Whether to report the function currently being | |
53573
3a95b6e83d47
(compile-defun): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52568
diff
changeset
|
72 ;; compiled in the echo area; |
28402 | 73 ;; byte-optimize Whether to do optimizations; this may be |
14169 | 74 ;; t, nil, 'source, or 'byte; |
28402 | 75 ;; byte-optimize-log Whether to report (in excruciating detail) |
14169 | 76 ;; exactly which optimizations have been made. |
77 ;; This may be t, nil, 'source, or 'byte; | |
78 ;; byte-compile-error-on-warn Whether to stop compilation when a warning is | |
79 ;; produced; | |
80 ;; byte-compile-delete-errors Whether the optimizer may delete calls or | |
81 ;; variable references that are side-effect-free | |
82 ;; except that they may return an error. | |
83 ;; byte-compile-generate-call-tree Whether to generate a histogram of | |
28402 | 84 ;; function calls. This can be useful for |
14169 | 85 ;; finding unused functions, as well as simple |
86 ;; performance metering. | |
87 ;; byte-compile-warnings List of warnings to issue, or t. May contain | |
49821 | 88 ;; `free-vars' (references to variables not in the |
89 ;; current lexical scope) | |
90 ;; `unresolved' (calls to unknown functions) | |
91 ;; `callargs' (lambda calls with args that don't | |
92 ;; match the lambda's definition) | |
93 ;; `redefine' (function cell redefined from | |
94 ;; a macro to a lambda or vice versa, | |
95 ;; or redefined to take other args) | |
96 ;; `obsolete' (obsolete variables and functions) | |
97 ;; `noruntime' (calls to functions only defined | |
98 ;; within `eval-when-compile') | |
81295
26b46295877f
(byte-compile-find-cl-functions): Match
Martin Rudalics <rudalics@gmx.at>
parents:
81217
diff
changeset
|
99 ;; `cl-functions' (calls to CL functions) |
57881
f57a9010e865
(byte-compile-warning-types): Add interactive-only.
Richard M. Stallman <rms@gnu.org>
parents:
57518
diff
changeset
|
100 ;; `interactive-only' (calls to commands that are |
f57a9010e865
(byte-compile-warning-types): Add interactive-only.
Richard M. Stallman <rms@gnu.org>
parents:
57518
diff
changeset
|
101 ;; not good to call from Lisp) |
81217
908a902d5545
(byte-compile-warnings): Add new option `make-local'.
Glenn Morris <rgm@gnu.org>
parents:
77119
diff
changeset
|
102 ;; `make-local' (dubious calls to |
908a902d5545
(byte-compile-warnings): Add new option `make-local'.
Glenn Morris <rgm@gnu.org>
parents:
77119
diff
changeset
|
103 ;; `make-variable-buffer-local') |
84746 | 104 ;; `mapcar' (mapcar called for effect) |
14169 | 105 ;; byte-compile-compatibility Whether the compiler should |
106 ;; generate .elc files which can be loaded into | |
107 ;; generic emacs 18. | |
108 ;; emacs-lisp-file-regexp Regexp for the extension of source-files; | |
109 ;; see also the function byte-compile-dest-file. | |
757 | 110 |
14169 | 111 ;; New Features: |
112 ;; | |
113 ;; o The form `defsubst' is just like `defun', except that the function | |
114 ;; generated will be open-coded in compiled code which uses it. This | |
115 ;; means that no function call will be generated, it will simply be | |
116 ;; spliced in. Lisp functions calls are very slow, so this can be a | |
117 ;; big win. | |
118 ;; | |
119 ;; You can generally accomplish the same thing with `defmacro', but in | |
120 ;; that case, the defined procedure can't be used as an argument to | |
121 ;; mapcar, etc. | |
122 ;; | |
123 ;; o You can also open-code one particular call to a function without | |
124 ;; open-coding all calls. Use the 'inline' form to do this, like so: | |
125 ;; | |
126 ;; (inline (foo 1 2 3)) ;; `foo' will be open-coded | |
127 ;; or... | |
28402 | 128 ;; (inline ;; `foo' and `baz' will be |
14169 | 129 ;; (foo 1 2 3 (bar 5)) ;; open-coded, but `bar' will not. |
130 ;; (baz 0)) | |
131 ;; | |
132 ;; o It is possible to open-code a function in the same file it is defined | |
53575
a679a0134e06
*** empty log message ***
Luc Teirlinck <teirllm@auburn.edu>
parents:
53573
diff
changeset
|
133 ;; in without having to load that file before compiling it. The |
14169 | 134 ;; byte-compiler has been modified to remember function definitions in |
135 ;; the compilation environment in the same way that it remembers macro | |
136 ;; definitions. | |
137 ;; | |
138 ;; o Forms like ((lambda ...) ...) are open-coded. | |
139 ;; | |
140 ;; o The form `eval-when-compile' is like progn, except that the body | |
141 ;; is evaluated at compile-time. When it appears at top-level, this | |
142 ;; is analogous to the Common Lisp idiom (eval-when (compile) ...). | |
143 ;; When it does not appear at top-level, it is similar to the | |
144 ;; Common Lisp #. reader macro (but not in interpreted code). | |
145 ;; | |
146 ;; o The form `eval-and-compile' is similar to eval-when-compile, but | |
147 ;; the whole form is evalled both at compile-time and at run-time. | |
148 ;; | |
149 ;; o The command compile-defun is analogous to eval-defun. | |
150 ;; | |
28402 | 151 ;; o If you run byte-compile-file on a filename which is visited in a |
14169 | 152 ;; buffer, and that buffer is modified, you are asked whether you want |
153 ;; to save the buffer before compiling. | |
154 ;; | |
155 ;; o byte-compiled files now start with the string `;ELC'. | |
156 ;; Some versions of `file' can be customized to recognize that. | |
757 | 157 |
1604
25173c1db5a6
* bytecomp.el: Declare unread-command-char an obsolete variable.
Jim Blandy <jimb@redhat.com>
parents:
1532
diff
changeset
|
158 (require 'backquote) |
25173c1db5a6
* bytecomp.el: Declare unread-command-char an obsolete variable.
Jim Blandy <jimb@redhat.com>
parents:
1532
diff
changeset
|
159 |
757 | 160 (or (fboundp 'defsubst) |
161 ;; This really ought to be loaded already! | |
50570
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
162 (load "byte-run")) |
757 | 163 |
39561
0881eab13b7a
(byte-recompile-directory): Make sure the file is readable.
Gerd Moellmann <gerd@gnu.org>
parents:
38895
diff
changeset
|
164 ;; The feature of compiling in a specific target Emacs version |
0881eab13b7a
(byte-recompile-directory): Make sure the file is readable.
Gerd Moellmann <gerd@gnu.org>
parents:
38895
diff
changeset
|
165 ;; has been turned off because compile time options are a bad idea. |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
166 (defmacro byte-compile-single-version () nil) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
167 (defmacro byte-compile-version-cond (cond) cond) |
757 | 168 |
39561
0881eab13b7a
(byte-recompile-directory): Make sure the file is readable.
Gerd Moellmann <gerd@gnu.org>
parents:
38895
diff
changeset
|
169 ;; The crud you see scattered through this file of the form |
0881eab13b7a
(byte-recompile-directory): Make sure the file is readable.
Gerd Moellmann <gerd@gnu.org>
parents:
38895
diff
changeset
|
170 ;; (or (and (boundp 'epoch::version) epoch::version) |
0881eab13b7a
(byte-recompile-directory): Make sure the file is readable.
Gerd Moellmann <gerd@gnu.org>
parents:
38895
diff
changeset
|
171 ;; (string-lessp emacs-version "19")) |
0881eab13b7a
(byte-recompile-directory): Make sure the file is readable.
Gerd Moellmann <gerd@gnu.org>
parents:
38895
diff
changeset
|
172 ;; is because the Epoch folks couldn't be bothered to follow the |
0881eab13b7a
(byte-recompile-directory): Make sure the file is readable.
Gerd Moellmann <gerd@gnu.org>
parents:
38895
diff
changeset
|
173 ;; normal emacs version numbering convention. |
757 | 174 |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
175 ;; (if (byte-compile-version-cond |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
176 ;; (or (and (boundp 'epoch::version) epoch::version) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
177 ;; (string-lessp emacs-version "19"))) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
178 ;; (progn |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
179 ;; ;; emacs-18 compatibility. |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
180 ;; (defvar baud-rate (baud-rate)) ;Define baud-rate if it's undefined |
40035
2b16a80692ef
Put the *Compile-Log* buffer in `compilation-mode'.
Sam Steingold <sds@gnu.org>
parents:
39852
diff
changeset
|
181 ;; |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
182 ;; (if (byte-compile-single-version) |
1819
df06a60f3362
* disass.el (disassemble): Add autoload cookie for this.
Jim Blandy <jimb@redhat.com>
parents:
1604
diff
changeset
|
183 ;; (defmacro byte-code-function-p (x) "Emacs 18 doesn't have these." nil) |
df06a60f3362
* disass.el (disassemble): Add autoload cookie for this.
Jim Blandy <jimb@redhat.com>
parents:
1604
diff
changeset
|
184 ;; (defun byte-code-function-p (x) "Emacs 18 doesn't have these." nil)) |
40035
2b16a80692ef
Put the *Compile-Log* buffer in `compilation-mode'.
Sam Steingold <sds@gnu.org>
parents:
39852
diff
changeset
|
185 ;; |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
186 ;; (or (and (fboundp 'member) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
187 ;; ;; avoid using someone else's possibly bogus definition of this. |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
188 ;; (subrp (symbol-function 'member))) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
189 ;; (defun member (elt list) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
190 ;; "like memq, but uses equal instead of eq. In v19, this is a subr." |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
191 ;; (while (and list (not (equal elt (car list)))) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
192 ;; (setq list (cdr list))) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
193 ;; list)))) |
757 | 194 |
195 | |
20779 | 196 (defgroup bytecomp nil |
64028
26cc453cc38d
(bytecomp): Finish `defgroup' description with period.
Juanma Barranquero <lekktu@gmail.com>
parents:
63939
diff
changeset
|
197 "Emacs Lisp byte-compiler." |
20779 | 198 :group 'lisp) |
199 | |
200 (defcustom emacs-lisp-file-regexp (if (eq system-type 'vax-vms) | |
201 "\\.EL\\(;[0-9]+\\)?$" | |
202 "\\.el$") | |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
203 "*Regexp which matches Emacs Lisp source files. |
20779 | 204 You may want to redefine the function `byte-compile-dest-file' |
205 if you change this variable." | |
206 :group 'bytecomp | |
207 :type 'regexp) | |
757 | 208 |
12928
5c76c36717cb
(byte-compiler-base-file-name): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12823
diff
changeset
|
209 ;; This enables file name handlers such as jka-compr |
5c76c36717cb
(byte-compiler-base-file-name): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12823
diff
changeset
|
210 ;; to remove parts of the file name that should not be copied |
5c76c36717cb
(byte-compiler-base-file-name): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12823
diff
changeset
|
211 ;; through to the output file name. |
5c76c36717cb
(byte-compiler-base-file-name): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12823
diff
changeset
|
212 (defun byte-compiler-base-file-name (filename) |
5c76c36717cb
(byte-compiler-base-file-name): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12823
diff
changeset
|
213 (let ((handler (find-file-name-handler filename |
5c76c36717cb
(byte-compiler-base-file-name): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12823
diff
changeset
|
214 'byte-compiler-base-file-name))) |
5c76c36717cb
(byte-compiler-base-file-name): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12823
diff
changeset
|
215 (if handler |
5c76c36717cb
(byte-compiler-base-file-name): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12823
diff
changeset
|
216 (funcall handler 'byte-compiler-base-file-name filename) |
5c76c36717cb
(byte-compiler-base-file-name): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12823
diff
changeset
|
217 filename))) |
5c76c36717cb
(byte-compiler-base-file-name): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12823
diff
changeset
|
218 |
757 | 219 (or (fboundp 'byte-compile-dest-file) |
3653
974055b516d9
* bytecomp.el: Bring it up to version 2.10 of the
Jim Blandy <jimb@redhat.com>
parents:
3591
diff
changeset
|
220 ;; The user may want to redefine this along with emacs-lisp-file-regexp, |
757 | 221 ;; so only define it if it is undefined. |
222 (defun byte-compile-dest-file (filename) | |
75836
6a3bdbdc77a5
(byte-compile-dest-file, byte-compile-file): Doc fixes.
Juanma Barranquero <lekktu@gmail.com>
parents:
75489
diff
changeset
|
223 "Convert an Emacs Lisp source file name to a compiled file name. |
6a3bdbdc77a5
(byte-compile-dest-file, byte-compile-file): Doc fixes.
Juanma Barranquero <lekktu@gmail.com>
parents:
75489
diff
changeset
|
224 If FILENAME matches `emacs-lisp-file-regexp' (by default, files |
6a3bdbdc77a5
(byte-compile-dest-file, byte-compile-file): Doc fixes.
Juanma Barranquero <lekktu@gmail.com>
parents:
75489
diff
changeset
|
225 with the extension `.el'), add `c' to it; otherwise add `.elc'." |
12928
5c76c36717cb
(byte-compiler-base-file-name): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12823
diff
changeset
|
226 (setq filename (byte-compiler-base-file-name filename)) |
757 | 227 (setq filename (file-name-sans-versions filename)) |
228 (cond ((eq system-type 'vax-vms) | |
23054 | 229 (concat (substring filename 0 (string-match ";" filename)) "c")) |
230 ((string-match emacs-lisp-file-regexp filename) | |
231 (concat (substring filename 0 (match-beginning 0)) ".elc")) | |
232 (t (concat filename ".elc"))))) | |
757 | 233 |
234 ;; This can be the 'byte-compile property of any symbol. | |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
235 (autoload 'byte-compile-inline-expand "byte-opt") |
757 | 236 |
237 ;; This is the entrypoint to the lapcode optimizer pass1. | |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
238 (autoload 'byte-optimize-form "byte-opt") |
757 | 239 ;; This is the entrypoint to the lapcode optimizer pass2. |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
240 (autoload 'byte-optimize-lapcode "byte-opt") |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
241 (autoload 'byte-compile-unfold-lambda "byte-opt") |
757 | 242 |
1819
df06a60f3362
* disass.el (disassemble): Add autoload cookie for this.
Jim Blandy <jimb@redhat.com>
parents:
1604
diff
changeset
|
243 ;; This is the entry point to the decompiler, which is used by the |
df06a60f3362
* disass.el (disassemble): Add autoload cookie for this.
Jim Blandy <jimb@redhat.com>
parents:
1604
diff
changeset
|
244 ;; disassembler. The disassembler just requires 'byte-compile, but |
df06a60f3362
* disass.el (disassemble): Add autoload cookie for this.
Jim Blandy <jimb@redhat.com>
parents:
1604
diff
changeset
|
245 ;; that doesn't define this function, so this seems to be a reasonable |
df06a60f3362
* disass.el (disassemble): Add autoload cookie for this.
Jim Blandy <jimb@redhat.com>
parents:
1604
diff
changeset
|
246 ;; thing to do. |
df06a60f3362
* disass.el (disassemble): Add autoload cookie for this.
Jim Blandy <jimb@redhat.com>
parents:
1604
diff
changeset
|
247 (autoload 'byte-decompile-bytecode "byte-opt") |
df06a60f3362
* disass.el (disassemble): Add autoload cookie for this.
Jim Blandy <jimb@redhat.com>
parents:
1604
diff
changeset
|
248 |
20779 | 249 (defcustom byte-compile-verbose |
757 | 250 (and (not noninteractive) (> baud-rate search-slow-speed)) |
20779 | 251 "*Non-nil means print messages describing progress of byte-compiler." |
252 :group 'bytecomp | |
253 :type 'boolean) | |
757 | 254 |
20779 | 255 (defcustom byte-compile-compatibility nil |
53753
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
256 "*Non-nil means generate output that can run in Emacs 18. |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
257 This only means that it can run in principle, if it doesn't require |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
258 facilities that have been added more recently." |
20779 | 259 :group 'bytecomp |
260 :type 'boolean) | |
757 | 261 |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
262 ;; (defvar byte-compile-generate-emacs19-bytecodes |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
263 ;; (not (or (and (boundp 'epoch::version) epoch::version) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
264 ;; (string-lessp emacs-version "19"))) |
28402 | 265 ;; "*If this is true, then the byte-compiler will generate bytecode which |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
266 ;; makes use of byte-ops which are present only in Emacs 19. Code generated |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
267 ;; this way can never be run in Emacs 18, and may even cause it to crash.") |
757 | 268 |
20779 | 269 (defcustom byte-optimize t |
74334
5a84c691a685
(byte-optimize, byte-compile-warnings): Doc fixes.
Juanma Barranquero <lekktu@gmail.com>
parents:
74285
diff
changeset
|
270 "*Enable optimization in the byte compiler. |
5a84c691a685
(byte-optimize, byte-compile-warnings): Doc fixes.
Juanma Barranquero <lekktu@gmail.com>
parents:
74285
diff
changeset
|
271 Possible values are: |
5a84c691a685
(byte-optimize, byte-compile-warnings): Doc fixes.
Juanma Barranquero <lekktu@gmail.com>
parents:
74285
diff
changeset
|
272 nil - no optimization |
5a84c691a685
(byte-optimize, byte-compile-warnings): Doc fixes.
Juanma Barranquero <lekktu@gmail.com>
parents:
74285
diff
changeset
|
273 t - all optimizations |
5a84c691a685
(byte-optimize, byte-compile-warnings): Doc fixes.
Juanma Barranquero <lekktu@gmail.com>
parents:
74285
diff
changeset
|
274 `source' - source-level optimizations only |
5a84c691a685
(byte-optimize, byte-compile-warnings): Doc fixes.
Juanma Barranquero <lekktu@gmail.com>
parents:
74285
diff
changeset
|
275 `byte' - code-level optimizations only" |
20779 | 276 :group 'bytecomp |
277 :type '(choice (const :tag "none" nil) | |
278 (const :tag "all" t) | |
279 (const :tag "source-level" source) | |
280 (const :tag "byte-level" byte))) | |
757 | 281 |
47318
1a358c4f4b8b
(byte-compile-delete-errors): Default to nil.
Richard M. Stallman <rms@gnu.org>
parents:
47110
diff
changeset
|
282 (defcustom byte-compile-delete-errors nil |
1129 | 283 "*If non-nil, the optimizer may delete forms that may signal an error. |
20779 | 284 This includes variable references and calls to functions such as `car'." |
285 :group 'bytecomp | |
286 :type 'boolean) | |
757 | 287 |
10235
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
288 (defvar byte-compile-dynamic nil |
20779 | 289 "If non-nil, compile function bodies so they load lazily. |
23342
8cc9aa86ee9d
(byte-compile-dynamic): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
23135
diff
changeset
|
290 They are hidden in comments in the compiled file, |
8cc9aa86ee9d
(byte-compile-dynamic): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
23135
diff
changeset
|
291 and each one is brought into core when the |
10235
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
292 function is called. |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
293 |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
294 To enable this option, make it a file-local variable |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
295 in the source file you want it to apply to. |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
296 For example, add -*-byte-compile-dynamic: t;-*- on the first line. |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
297 |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
298 When this option is true, if you load the compiled file and then move it, |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
299 the functions you loaded will not be able to run.") |
70590
63b772bfba93
Move `safe-local-variable' declarations to the respective files.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
69937
diff
changeset
|
300 ;;;###autoload(put 'byte-compile-dynamic 'safe-local-variable 'booleanp) |
10235
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
301 |
75489
76c18a7841bf
(byte-compile-disable-print-circle): New
Kenichi Handa <handa@m17n.org>
parents:
75402
diff
changeset
|
302 (defvar byte-compile-disable-print-circle nil |
76c18a7841bf
(byte-compile-disable-print-circle): New
Kenichi Handa <handa@m17n.org>
parents:
75402
diff
changeset
|
303 "If non-nil, disable `print-circle' on printing a byte-compiled code.") |
76c18a7841bf
(byte-compile-disable-print-circle): New
Kenichi Handa <handa@m17n.org>
parents:
75402
diff
changeset
|
304 ;;;###autoload(put 'byte-compile-disable-print-circle 'safe-local-variable 'booleanp) |
76c18a7841bf
(byte-compile-disable-print-circle): New
Kenichi Handa <handa@m17n.org>
parents:
75402
diff
changeset
|
305 |
20779 | 306 (defcustom byte-compile-dynamic-docstrings t |
10235
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
307 "*If non-nil, compile doc strings for lazy access. |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
308 We bury the doc strings of functions and variables |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
309 inside comments in the file, and bring them into core only when they |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
310 are actually needed. |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
311 |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
312 When this option is true, if you load the compiled file and then move it, |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
313 you won't be able to find the documentation of anything in that file. |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
314 |
11848
1a50b9d542ce
(byte-compile-dynamic-docstrings): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
11819
diff
changeset
|
315 To disable this option for a certain file, make it a file-local variable |
1a50b9d542ce
(byte-compile-dynamic-docstrings): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
11819
diff
changeset
|
316 in the source file. For example, add this to the first line: |
1a50b9d542ce
(byte-compile-dynamic-docstrings): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
11819
diff
changeset
|
317 -*-byte-compile-dynamic-docstrings:nil;-*- |
1a50b9d542ce
(byte-compile-dynamic-docstrings): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
11819
diff
changeset
|
318 You can also set the variable globally. |
1a50b9d542ce
(byte-compile-dynamic-docstrings): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
11819
diff
changeset
|
319 |
20779 | 320 This option is enabled by default because it reduces Emacs memory usage." |
321 :group 'bytecomp | |
322 :type 'boolean) | |
70590
63b772bfba93
Move `safe-local-variable' declarations to the respective files.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
69937
diff
changeset
|
323 ;;;###autoload(put 'byte-compile-dynamic-docstrings 'safe-local-variable 'booleanp) |
10235
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
324 |
20779 | 325 (defcustom byte-optimize-log nil |
757 | 326 "*If true, the byte-compiler will log its optimizations into *Compile-Log*. |
327 If this is 'source, then only source-level optimizations will be logged. | |
20779 | 328 If it is 'byte, then only byte-level optimizations will be logged." |
329 :group 'bytecomp | |
330 :type '(choice (const :tag "none" nil) | |
331 (const :tag "all" t) | |
332 (const :tag "source-level" source) | |
333 (const :tag "byte-level" byte))) | |
757 | 334 |
20779 | 335 (defcustom byte-compile-error-on-warn nil |
336 "*If true, the byte-compiler reports warnings with `error'." | |
337 :group 'bytecomp | |
338 :type 'boolean) | |
757 | 339 |
10256
83d56dd99a40
(byte-compile-warning-types): Add obsolete.
Richard M. Stallman <rms@gnu.org>
parents:
10235
diff
changeset
|
340 (defconst byte-compile-warning-types |
57881
f57a9010e865
(byte-compile-warning-types): Add interactive-only.
Richard M. Stallman <rms@gnu.org>
parents:
57518
diff
changeset
|
341 '(redefine callargs free-vars unresolved |
84747
c793c2191087
(byte-compile-warning-types): Add mapcar and make-local.
Glenn Morris <rgm@gnu.org>
parents:
84746
diff
changeset
|
342 obsolete noruntime cl-functions interactive-only |
c793c2191087
(byte-compile-warning-types): Add mapcar and make-local.
Glenn Morris <rgm@gnu.org>
parents:
84746
diff
changeset
|
343 make-local mapcar) |
46136
79f132657570
(byte-compile-warning-types):
Richard M. Stallman <rms@gnu.org>
parents:
46050
diff
changeset
|
344 "The list of warning types used when `byte-compile-warnings' is t.") |
20779 | 345 (defcustom byte-compile-warnings t |
757 | 346 "*List of warnings that the byte-compiler should issue (t for all). |
46136
79f132657570
(byte-compile-warning-types):
Richard M. Stallman <rms@gnu.org>
parents:
46050
diff
changeset
|
347 |
74334
5a84c691a685
(byte-optimize, byte-compile-warnings): Doc fixes.
Juanma Barranquero <lekktu@gmail.com>
parents:
74285
diff
changeset
|
348 Elements of the list may be: |
958 | 349 |
350 free-vars references to variables not in the current lexical scope. | |
351 unresolved calls to unknown functions. | |
62319
150380a7c3d6
(byte-compile-nogroup-warn): New function.
Richard M. Stallman <rms@gnu.org>
parents:
61966
diff
changeset
|
352 callargs function calls with args that don't match the definition. |
150380a7c3d6
(byte-compile-nogroup-warn): New function.
Richard M. Stallman <rms@gnu.org>
parents:
61966
diff
changeset
|
353 redefine function name redefined from a macro to ordinary function or vice |
958 | 354 versa, or redefined to take a different number of arguments. |
46136
79f132657570
(byte-compile-warning-types):
Richard M. Stallman <rms@gnu.org>
parents:
46050
diff
changeset
|
355 obsolete obsolete variables and functions. |
79f132657570
(byte-compile-warning-types):
Richard M. Stallman <rms@gnu.org>
parents:
46050
diff
changeset
|
356 noruntime functions that may not be defined at runtime (typically |
79f132657570
(byte-compile-warning-types):
Richard M. Stallman <rms@gnu.org>
parents:
46050
diff
changeset
|
357 defined only under `eval-when-compile'). |
47912 | 358 cl-functions calls to runtime functions from the CL package (as |
57881
f57a9010e865
(byte-compile-warning-types): Add interactive-only.
Richard M. Stallman <rms@gnu.org>
parents:
57518
diff
changeset
|
359 distinguished from macros and aliases). |
f57a9010e865
(byte-compile-warning-types): Add interactive-only.
Richard M. Stallman <rms@gnu.org>
parents:
57518
diff
changeset
|
360 interactive-only |
81217
908a902d5545
(byte-compile-warnings): Add new option `make-local'.
Glenn Morris <rgm@gnu.org>
parents:
77119
diff
changeset
|
361 commands that normally shouldn't be called from Lisp code. |
84746 | 362 make-local calls to make-variable-buffer-local that may be incorrect. |
85730
a1e136978a9a
(byte-compile-warnings): Document `not'.
Glenn Morris <rgm@gnu.org>
parents:
85657
diff
changeset
|
363 mapcar mapcar called for effect. |
a1e136978a9a
(byte-compile-warnings): Document `not'.
Glenn Morris <rgm@gnu.org>
parents:
85657
diff
changeset
|
364 |
a1e136978a9a
(byte-compile-warnings): Document `not'.
Glenn Morris <rgm@gnu.org>
parents:
85657
diff
changeset
|
365 If the list begins with `not', then the remaining elements specify warnings to |
a1e136978a9a
(byte-compile-warnings): Document `not'.
Glenn Morris <rgm@gnu.org>
parents:
85657
diff
changeset
|
366 suppress. For example, (not mapcar) will suppress warnings about mapcar." |
20779 | 367 :group 'bytecomp |
46136
79f132657570
(byte-compile-warning-types):
Richard M. Stallman <rms@gnu.org>
parents:
46050
diff
changeset
|
368 :type `(choice (const :tag "All" t) |
21510
daf7dfe93205
(byte-compile-warnings): Fix customize
Andreas Schwab <schwab@suse.de>
parents:
20847
diff
changeset
|
369 (set :menu-tag "Some" |
daf7dfe93205
(byte-compile-warnings): Fix customize
Andreas Schwab <schwab@suse.de>
parents:
20847
diff
changeset
|
370 (const free-vars) (const unresolved) |
46136
79f132657570
(byte-compile-warning-types):
Richard M. Stallman <rms@gnu.org>
parents:
46050
diff
changeset
|
371 (const callargs) (const redefine) |
57881
f57a9010e865
(byte-compile-warning-types): Add interactive-only.
Richard M. Stallman <rms@gnu.org>
parents:
57518
diff
changeset
|
372 (const obsolete) (const noruntime) |
81217
908a902d5545
(byte-compile-warnings): Add new option `make-local'.
Glenn Morris <rgm@gnu.org>
parents:
77119
diff
changeset
|
373 (const cl-functions) (const interactive-only) |
84746 | 374 (const make-local) (const mapcar)))) |
79231
3dd857fc95d9
(byte-compile-warnings): Autoload the safe-local-variable property.
Glenn Morris <rgm@gnu.org>
parents:
78711
diff
changeset
|
375 ;;;###autoload(put 'byte-compile-warnings 'safe-local-variable 'byte-compile-warnings-safe-p) |
3dd857fc95d9
(byte-compile-warnings): Autoload the safe-local-variable property.
Glenn Morris <rgm@gnu.org>
parents:
78711
diff
changeset
|
376 |
70674
13c49a63f416
(byte-compile-warnings-safe-p): New
Reiner Steib <Reiner.Steib@gmx.de>
parents:
70590
diff
changeset
|
377 ;;;###autoload |
13c49a63f416
(byte-compile-warnings-safe-p): New
Reiner Steib <Reiner.Steib@gmx.de>
parents:
70590
diff
changeset
|
378 (defun byte-compile-warnings-safe-p (x) |
93457
4d3eb46a3b84
(byte-compile-warnings-safe-p): Use `byte-compile-warning-types'.
Juanma Barranquero <lekktu@gmail.com>
parents:
93244
diff
changeset
|
379 "Return non-nil if X is valid as a value of `byte-compile-warnings'." |
70674
13c49a63f416
(byte-compile-warnings-safe-p): New
Reiner Steib <Reiner.Steib@gmx.de>
parents:
70590
diff
changeset
|
380 (or (booleanp x) |
13c49a63f416
(byte-compile-warnings-safe-p): New
Reiner Steib <Reiner.Steib@gmx.de>
parents:
70590
diff
changeset
|
381 (and (listp x) |
85730
a1e136978a9a
(byte-compile-warnings): Document `not'.
Glenn Morris <rgm@gnu.org>
parents:
85657
diff
changeset
|
382 (if (eq (car x) 'not) (setq x (cdr x)) |
a1e136978a9a
(byte-compile-warnings): Document `not'.
Glenn Morris <rgm@gnu.org>
parents:
85657
diff
changeset
|
383 t) |
70674
13c49a63f416
(byte-compile-warnings-safe-p): New
Reiner Steib <Reiner.Steib@gmx.de>
parents:
70590
diff
changeset
|
384 (equal (mapcar |
13c49a63f416
(byte-compile-warnings-safe-p): New
Reiner Steib <Reiner.Steib@gmx.de>
parents:
70590
diff
changeset
|
385 (lambda (e) |
93457
4d3eb46a3b84
(byte-compile-warnings-safe-p): Use `byte-compile-warning-types'.
Juanma Barranquero <lekktu@gmail.com>
parents:
93244
diff
changeset
|
386 (when (memq e byte-compile-warning-types) |
70674
13c49a63f416
(byte-compile-warnings-safe-p): New
Reiner Steib <Reiner.Steib@gmx.de>
parents:
70590
diff
changeset
|
387 e)) |
13c49a63f416
(byte-compile-warnings-safe-p): New
Reiner Steib <Reiner.Steib@gmx.de>
parents:
70590
diff
changeset
|
388 x) |
13c49a63f416
(byte-compile-warnings-safe-p): New
Reiner Steib <Reiner.Steib@gmx.de>
parents:
70590
diff
changeset
|
389 x)))) |
57881
f57a9010e865
(byte-compile-warning-types): Add interactive-only.
Richard M. Stallman <rms@gnu.org>
parents:
57518
diff
changeset
|
390 |
85730
a1e136978a9a
(byte-compile-warnings): Document `not'.
Glenn Morris <rgm@gnu.org>
parents:
85657
diff
changeset
|
391 (defun byte-compile-warning-enabled-p (warning) |
a1e136978a9a
(byte-compile-warnings): Document `not'.
Glenn Morris <rgm@gnu.org>
parents:
85657
diff
changeset
|
392 "Return non-nil if WARNING is enabled, according to `byte-compile-warnings'." |
a1e136978a9a
(byte-compile-warnings): Document `not'.
Glenn Morris <rgm@gnu.org>
parents:
85657
diff
changeset
|
393 (or (eq byte-compile-warnings t) |
a1e136978a9a
(byte-compile-warnings): Document `not'.
Glenn Morris <rgm@gnu.org>
parents:
85657
diff
changeset
|
394 (if (eq (car byte-compile-warnings) 'not) |
a1e136978a9a
(byte-compile-warnings): Document `not'.
Glenn Morris <rgm@gnu.org>
parents:
85657
diff
changeset
|
395 (not (memq warning byte-compile-warnings)) |
a1e136978a9a
(byte-compile-warnings): Document `not'.
Glenn Morris <rgm@gnu.org>
parents:
85657
diff
changeset
|
396 (memq warning byte-compile-warnings)))) |
a1e136978a9a
(byte-compile-warnings): Document `not'.
Glenn Morris <rgm@gnu.org>
parents:
85657
diff
changeset
|
397 |
a1e136978a9a
(byte-compile-warnings): Document `not'.
Glenn Morris <rgm@gnu.org>
parents:
85657
diff
changeset
|
398 ;;;###autoload |
a1e136978a9a
(byte-compile-warnings): Document `not'.
Glenn Morris <rgm@gnu.org>
parents:
85657
diff
changeset
|
399 (defun byte-compile-disable-warning (warning) |
a1e136978a9a
(byte-compile-warnings): Document `not'.
Glenn Morris <rgm@gnu.org>
parents:
85657
diff
changeset
|
400 "Change `byte-compile-warnings' to disable WARNING. |
a1e136978a9a
(byte-compile-warnings): Document `not'.
Glenn Morris <rgm@gnu.org>
parents:
85657
diff
changeset
|
401 If `byte-compile-warnings' is t, set it to `(not WARNING)'. |
85780
1b8904c5babf
(byte-compile-disable-warning)
Glenn Morris <rgm@gnu.org>
parents:
85730
diff
changeset
|
402 Otherwise, if the first element is `not', add WARNING, else remove it. |
1b8904c5babf
(byte-compile-disable-warning)
Glenn Morris <rgm@gnu.org>
parents:
85730
diff
changeset
|
403 Normally you should let-bind `byte-compile-warnings' before calling this, |
1b8904c5babf
(byte-compile-disable-warning)
Glenn Morris <rgm@gnu.org>
parents:
85730
diff
changeset
|
404 else the global value will be modified." |
85730
a1e136978a9a
(byte-compile-warnings): Document `not'.
Glenn Morris <rgm@gnu.org>
parents:
85657
diff
changeset
|
405 (setq byte-compile-warnings |
a1e136978a9a
(byte-compile-warnings): Document `not'.
Glenn Morris <rgm@gnu.org>
parents:
85657
diff
changeset
|
406 (cond ((eq byte-compile-warnings t) |
a1e136978a9a
(byte-compile-warnings): Document `not'.
Glenn Morris <rgm@gnu.org>
parents:
85657
diff
changeset
|
407 (list 'not warning)) |
a1e136978a9a
(byte-compile-warnings): Document `not'.
Glenn Morris <rgm@gnu.org>
parents:
85657
diff
changeset
|
408 ((eq (car byte-compile-warnings) 'not) |
a1e136978a9a
(byte-compile-warnings): Document `not'.
Glenn Morris <rgm@gnu.org>
parents:
85657
diff
changeset
|
409 (if (memq warning byte-compile-warnings) |
a1e136978a9a
(byte-compile-warnings): Document `not'.
Glenn Morris <rgm@gnu.org>
parents:
85657
diff
changeset
|
410 byte-compile-warnings |
a1e136978a9a
(byte-compile-warnings): Document `not'.
Glenn Morris <rgm@gnu.org>
parents:
85657
diff
changeset
|
411 (append byte-compile-warnings (list warning)))) |
a1e136978a9a
(byte-compile-warnings): Document `not'.
Glenn Morris <rgm@gnu.org>
parents:
85657
diff
changeset
|
412 (t |
a1e136978a9a
(byte-compile-warnings): Document `not'.
Glenn Morris <rgm@gnu.org>
parents:
85657
diff
changeset
|
413 (delq warning byte-compile-warnings))))) |
a1e136978a9a
(byte-compile-warnings): Document `not'.
Glenn Morris <rgm@gnu.org>
parents:
85657
diff
changeset
|
414 |
a1e136978a9a
(byte-compile-warnings): Document `not'.
Glenn Morris <rgm@gnu.org>
parents:
85657
diff
changeset
|
415 ;;;###autoload |
a1e136978a9a
(byte-compile-warnings): Document `not'.
Glenn Morris <rgm@gnu.org>
parents:
85657
diff
changeset
|
416 (defun byte-compile-enable-warning (warning) |
a1e136978a9a
(byte-compile-warnings): Document `not'.
Glenn Morris <rgm@gnu.org>
parents:
85657
diff
changeset
|
417 "Change `byte-compile-warnings' to enable WARNING. |
a1e136978a9a
(byte-compile-warnings): Document `not'.
Glenn Morris <rgm@gnu.org>
parents:
85657
diff
changeset
|
418 If `byte-compile-warnings' is `t', do nothing. Otherwise, if the |
85780
1b8904c5babf
(byte-compile-disable-warning)
Glenn Morris <rgm@gnu.org>
parents:
85730
diff
changeset
|
419 first element is `not', remove WARNING, else add it. |
1b8904c5babf
(byte-compile-disable-warning)
Glenn Morris <rgm@gnu.org>
parents:
85730
diff
changeset
|
420 Normally you should let-bind `byte-compile-warnings' before calling this, |
1b8904c5babf
(byte-compile-disable-warning)
Glenn Morris <rgm@gnu.org>
parents:
85730
diff
changeset
|
421 else the global value will be modified." |
85730
a1e136978a9a
(byte-compile-warnings): Document `not'.
Glenn Morris <rgm@gnu.org>
parents:
85657
diff
changeset
|
422 (or (eq byte-compile-warnings t) |
a1e136978a9a
(byte-compile-warnings): Document `not'.
Glenn Morris <rgm@gnu.org>
parents:
85657
diff
changeset
|
423 (setq byte-compile-warnings |
a1e136978a9a
(byte-compile-warnings): Document `not'.
Glenn Morris <rgm@gnu.org>
parents:
85657
diff
changeset
|
424 (cond ((eq (car byte-compile-warnings) 'not) |
a1e136978a9a
(byte-compile-warnings): Document `not'.
Glenn Morris <rgm@gnu.org>
parents:
85657
diff
changeset
|
425 (delq warning byte-compile-warnings)) |
a1e136978a9a
(byte-compile-warnings): Document `not'.
Glenn Morris <rgm@gnu.org>
parents:
85657
diff
changeset
|
426 ((memq warning byte-compile-warnings) |
a1e136978a9a
(byte-compile-warnings): Document `not'.
Glenn Morris <rgm@gnu.org>
parents:
85657
diff
changeset
|
427 byte-compile-warnings) |
a1e136978a9a
(byte-compile-warnings): Document `not'.
Glenn Morris <rgm@gnu.org>
parents:
85657
diff
changeset
|
428 (t |
a1e136978a9a
(byte-compile-warnings): Document `not'.
Glenn Morris <rgm@gnu.org>
parents:
85657
diff
changeset
|
429 (append byte-compile-warnings (list warning))))))) |
a1e136978a9a
(byte-compile-warnings): Document `not'.
Glenn Morris <rgm@gnu.org>
parents:
85657
diff
changeset
|
430 |
57881
f57a9010e865
(byte-compile-warning-types): Add interactive-only.
Richard M. Stallman <rms@gnu.org>
parents:
57518
diff
changeset
|
431 (defvar byte-compile-interactive-only-functions |
f57a9010e865
(byte-compile-warning-types): Add interactive-only.
Richard M. Stallman <rms@gnu.org>
parents:
57518
diff
changeset
|
432 '(beginning-of-buffer end-of-buffer replace-string replace-regexp |
82503
ee14b9e1fa7f
(byte-compile-interactive-only-functions): Add previous-line and next-line.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
433 insert-file insert-buffer insert-file-literally previous-line next-line) |
57881
f57a9010e865
(byte-compile-warning-types): Add interactive-only.
Richard M. Stallman <rms@gnu.org>
parents:
57518
diff
changeset
|
434 "List of commands that are not meant to be called from Lisp.") |
757 | 435 |
52133
4c112142c56f
(byte-compile-not-obsolete-var): New var.
Richard M. Stallman <rms@gnu.org>
parents:
51737
diff
changeset
|
436 (defvar byte-compile-not-obsolete-var nil |
4c112142c56f
(byte-compile-not-obsolete-var): New var.
Richard M. Stallman <rms@gnu.org>
parents:
51737
diff
changeset
|
437 "If non-nil, this is a variable that shouldn't be reported as obsolete.") |
4c112142c56f
(byte-compile-not-obsolete-var): New var.
Richard M. Stallman <rms@gnu.org>
parents:
51737
diff
changeset
|
438 |
20779 | 439 (defcustom byte-compile-generate-call-tree nil |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
440 "*Non-nil means collect call-graph information when compiling. |
57004
e9a116c0f176
(byte-compile-generate-call-tree): Doc fix.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56657
diff
changeset
|
441 This records which functions were called and from where. |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
442 If the value is t, compilation displays the call graph when it finishes. |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
443 If the value is neither t nor nil, compilation asks you whether to display |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
444 the graph. |
757 | 445 |
446 The call tree only lists functions called, not macros used. Those functions | |
447 which the byte-code interpreter knows about directly (eq, cons, etc.) are | |
448 not reported. | |
449 | |
450 The call tree also lists those functions which are not known to be called | |
10372 | 451 \(that is, to which no calls have been compiled). Functions which can be |
20779 | 452 invoked interactively are excluded from this list." |
453 :group 'bytecomp | |
454 :type '(choice (const :tag "Yes" t) (const :tag "No" nil) | |
22578
f330ab785b83
(byte-compile-generate-call-tree):
Andreas Schwab <schwab@suse.de>
parents:
22350
diff
changeset
|
455 (other :tag "Ask" lambda))) |
757 | 456 |
41176
2d63191afacd
(byte-compile-call-tree, byte-code-vector)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40451
diff
changeset
|
457 (defvar byte-compile-call-tree nil "Alist of functions and their call tree. |
757 | 458 Each element looks like |
459 | |
460 \(FUNCTION CALLERS CALLS\) | |
461 | |
462 where CALLERS is a list of functions that call FUNCTION, and CALLS | |
463 is a list of functions for which calls were generated while compiling | |
464 FUNCTION.") | |
465 | |
20779 | 466 (defcustom byte-compile-call-tree-sort 'name |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
467 "*If non-nil, sort the call tree. |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
468 The values `name', `callers', `calls', `calls+callers' |
20779 | 469 specify different fields to sort on." |
470 :group 'bytecomp | |
471 :type '(choice (const name) (const callers) (const calls) | |
472 (const calls+callers) (const nil))) | |
757 | 473 |
45558
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
474 (defvar byte-compile-debug nil) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
475 |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
476 ;; (defvar byte-compile-overwrite-file t |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
477 ;; "If nil, old .elc files are deleted before the new is saved, and .elc |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
478 ;; files will have the same modes as the corresponding .el file. Otherwise, |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
479 ;; existing .elc files will simply be overwritten, and the existing modes |
28402 | 480 ;; will not be changed. If this variable is nil, then an .elc file which |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
481 ;; is a symbolic link will be turned into a normal file, instead of the file |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
482 ;; which the link points to being overwritten.") |
757 | 483 |
484 (defvar byte-compile-constants nil | |
28295
8082575fec24
(byte-compile-warning-types, byte-compile-warnings): New warning `noruntime'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27824
diff
changeset
|
485 "List of all constants encountered during compilation of this form.") |
757 | 486 (defvar byte-compile-variables nil |
28295
8082575fec24
(byte-compile-warning-types, byte-compile-warnings): New warning `noruntime'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27824
diff
changeset
|
487 "List of all variables encountered during compilation of this form.") |
757 | 488 (defvar byte-compile-bound-variables nil |
26922
6fdf1f6c23a0
(byte-compile-bound-variables): Doc fix.
Dave Love <fx@gnu.org>
parents:
25636
diff
changeset
|
489 "List of variables bound in the context of the current form. |
6fdf1f6c23a0
(byte-compile-bound-variables): Doc fix.
Dave Love <fx@gnu.org>
parents:
25636
diff
changeset
|
490 This list lives partly on the stack.") |
50570
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
491 (defvar byte-compile-const-variables nil |
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
492 "List of variables declared as constants during compilation of this file.") |
757 | 493 (defvar byte-compile-free-references) |
494 (defvar byte-compile-free-assignments) | |
495 | |
1129 | 496 (defvar byte-compiler-error-flag) |
497 | |
757 | 498 (defconst byte-compile-initial-macro-environment |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
499 '( |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
500 ;; (byte-compiler-options . (lambda (&rest forms) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
501 ;; (apply 'byte-compiler-options-handler forms))) |
757 | 502 (eval-when-compile . (lambda (&rest body) |
28295
8082575fec24
(byte-compile-warning-types, byte-compile-warnings): New warning `noruntime'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27824
diff
changeset
|
503 (list 'quote |
8082575fec24
(byte-compile-warning-types, byte-compile-warnings): New warning `noruntime'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27824
diff
changeset
|
504 (byte-compile-eval (byte-compile-top-level |
8082575fec24
(byte-compile-warning-types, byte-compile-warnings): New warning `noruntime'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27824
diff
changeset
|
505 (cons 'progn body)))))) |
757 | 506 (eval-and-compile . (lambda (&rest body) |
46136
79f132657570
(byte-compile-warning-types):
Richard M. Stallman <rms@gnu.org>
parents:
46050
diff
changeset
|
507 (byte-compile-eval-before-compile (cons 'progn body)) |
757 | 508 (cons 'progn body)))) |
509 "The default macro-environment passed to macroexpand by the compiler. | |
510 Placing a macro here will cause a macro to have different semantics when | |
511 expanded by the compiler as when expanded by the interpreter.") | |
512 | |
513 (defvar byte-compile-macro-environment byte-compile-initial-macro-environment | |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
514 "Alist of macros defined in the file being compiled. |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
515 Each element looks like (MACRONAME . DEFINITION). It is |
3653
974055b516d9
* bytecomp.el: Bring it up to version 2.10 of the
Jim Blandy <jimb@redhat.com>
parents:
3591
diff
changeset
|
516 \(MACRONAME . nil) when a macro is redefined as a function.") |
757 | 517 |
518 (defvar byte-compile-function-environment nil | |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
519 "Alist of functions defined in the file being compiled. |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
520 This is so we can inline them when necessary. |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
521 Each element looks like (FUNCTIONNAME . DEFINITION). It is |
58073
9412413950a3
(byte-compile-defalias):
Richard M. Stallman <rms@gnu.org>
parents:
57881
diff
changeset
|
522 \(FUNCTIONNAME . nil) when a function is redefined as a macro. |
9412413950a3
(byte-compile-defalias):
Richard M. Stallman <rms@gnu.org>
parents:
57881
diff
changeset
|
523 It is \(FUNCTIONNAME . t) when all we know is that it was defined, |
9412413950a3
(byte-compile-defalias):
Richard M. Stallman <rms@gnu.org>
parents:
57881
diff
changeset
|
524 and we don't know the definition.") |
757 | 525 |
526 (defvar byte-compile-unresolved-functions nil | |
28295
8082575fec24
(byte-compile-warning-types, byte-compile-warnings): New warning `noruntime'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27824
diff
changeset
|
527 "Alist of undefined functions to which calls have been compiled. |
78210
964d6961bdb6
(byte-compile-from-buffer): initialise byte-compile-unresolved-functions before
Alan Mackenzie <acm@muc.de>
parents:
77119
diff
changeset
|
528 This variable is only significant whilst compiling an entire buffer. |
964d6961bdb6
(byte-compile-from-buffer): initialise byte-compile-unresolved-functions before
Alan Mackenzie <acm@muc.de>
parents:
77119
diff
changeset
|
529 Used for warnings when a function is not known to be defined or is later |
28295
8082575fec24
(byte-compile-warning-types, byte-compile-warnings): New warning `noruntime'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27824
diff
changeset
|
530 defined with incorrect args.") |
757 | 531 |
53753
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
532 (defvar byte-compile-noruntime-functions nil |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
533 "Alist of functions called that may not be defined when the compiled code is run. |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
534 Used for warnings about calling a function that is defined during compilation |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
535 but won't necessarily be defined when the compiled file is loaded.") |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
536 |
757 | 537 (defvar byte-compile-tag-number 0) |
538 (defvar byte-compile-output nil | |
539 "Alist describing contents to put in byte code string. | |
540 Each element is (INDEX . VALUE)") | |
541 (defvar byte-compile-depth 0 "Current depth of execution stack.") | |
542 (defvar byte-compile-maxdepth 0 "Maximum depth of execution stack.") | |
543 | |
544 | |
545 ;;; The byte codes; this information is duplicated in bytecomp.c | |
546 | |
41176
2d63191afacd
(byte-compile-call-tree, byte-code-vector)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40451
diff
changeset
|
547 (defvar byte-code-vector nil |
757 | 548 "An array containing byte-code names indexed by byte-code values.") |
549 | |
41176
2d63191afacd
(byte-compile-call-tree, byte-code-vector)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40451
diff
changeset
|
550 (defvar byte-stack+-info nil |
757 | 551 "An array with the stack adjustment for each byte-code.") |
552 | |
553 (defmacro byte-defop (opcode stack-adjust opname &optional docstring) | |
554 ;; This is a speed-hack for building the byte-code-vector at compile-time. | |
555 ;; We fill in the vector at macroexpand-time, and then after the last call | |
556 ;; to byte-defop, we write the vector out as a constant instead of writing | |
557 ;; out a bunch of calls to aset. | |
558 ;; Actually, we don't fill in the vector itself, because that could make | |
559 ;; it problematic to compile big changes to this compiler; we store the | |
560 ;; values on its plist, and remove them later in -extrude. | |
561 (let ((v1 (or (get 'byte-code-vector 'tmp-compile-time-value) | |
562 (put 'byte-code-vector 'tmp-compile-time-value | |
563 (make-vector 256 nil)))) | |
564 (v2 (or (get 'byte-stack+-info 'tmp-compile-time-value) | |
565 (put 'byte-stack+-info 'tmp-compile-time-value | |
566 (make-vector 256 nil))))) | |
567 (aset v1 opcode opname) | |
568 (aset v2 opcode stack-adjust)) | |
569 (if docstring | |
570 (list 'defconst opname opcode (concat "Byte code opcode " docstring ".")) | |
571 (list 'defconst opname opcode))) | |
572 | |
573 (defmacro byte-extrude-byte-code-vectors () | |
574 (prog1 (list 'setq 'byte-code-vector | |
575 (get 'byte-code-vector 'tmp-compile-time-value) | |
576 'byte-stack+-info | |
577 (get 'byte-stack+-info 'tmp-compile-time-value)) | |
27230
6eba74503556
(byte-extrude-byte-code-vectors): Use remprop.
Dave Love <fx@gnu.org>
parents:
26936
diff
changeset
|
578 (put 'byte-code-vector 'tmp-compile-time-value nil) |
6eba74503556
(byte-extrude-byte-code-vectors): Use remprop.
Dave Love <fx@gnu.org>
parents:
26936
diff
changeset
|
579 (put 'byte-stack+-info 'tmp-compile-time-value nil))) |
757 | 580 |
581 | |
582 ;; unused: 0-7 | |
583 | |
584 ;; These opcodes are special in that they pack their argument into the | |
585 ;; opcode word. | |
586 ;; | |
587 (byte-defop 8 1 byte-varref "for variable reference") | |
588 (byte-defop 16 -1 byte-varset "for setting a variable") | |
589 (byte-defop 24 -1 byte-varbind "for binding a variable") | |
590 (byte-defop 32 0 byte-call "for calling a function") | |
591 (byte-defop 40 0 byte-unbind "for unbinding special bindings") | |
3591
507f64624555
Apply typo patches from Paul Eggert.
Jim Blandy <jimb@redhat.com>
parents:
3455
diff
changeset
|
592 ;; codes 8-47 are consumed by the preceding opcodes |
757 | 593 |
594 ;; unused: 48-55 | |
595 | |
596 (byte-defop 56 -1 byte-nth) | |
597 (byte-defop 57 0 byte-symbolp) | |
598 (byte-defop 58 0 byte-consp) | |
599 (byte-defop 59 0 byte-stringp) | |
600 (byte-defop 60 0 byte-listp) | |
601 (byte-defop 61 -1 byte-eq) | |
602 (byte-defop 62 -1 byte-memq) | |
603 (byte-defop 63 0 byte-not) | |
604 (byte-defop 64 0 byte-car) | |
605 (byte-defop 65 0 byte-cdr) | |
606 (byte-defop 66 -1 byte-cons) | |
607 (byte-defop 67 0 byte-list1) | |
608 (byte-defop 68 -1 byte-list2) | |
609 (byte-defop 69 -2 byte-list3) | |
610 (byte-defop 70 -3 byte-list4) | |
611 (byte-defop 71 0 byte-length) | |
612 (byte-defop 72 -1 byte-aref) | |
613 (byte-defop 73 -2 byte-aset) | |
614 (byte-defop 74 0 byte-symbol-value) | |
615 (byte-defop 75 0 byte-symbol-function) ; this was commented out | |
616 (byte-defop 76 -1 byte-set) | |
617 (byte-defop 77 -1 byte-fset) ; this was commented out | |
618 (byte-defop 78 -1 byte-get) | |
619 (byte-defop 79 -2 byte-substring) | |
620 (byte-defop 80 -1 byte-concat2) | |
621 (byte-defop 81 -2 byte-concat3) | |
622 (byte-defop 82 -3 byte-concat4) | |
623 (byte-defop 83 0 byte-sub1) | |
624 (byte-defop 84 0 byte-add1) | |
625 (byte-defop 85 -1 byte-eqlsign) | |
626 (byte-defop 86 -1 byte-gtr) | |
627 (byte-defop 87 -1 byte-lss) | |
628 (byte-defop 88 -1 byte-leq) | |
629 (byte-defop 89 -1 byte-geq) | |
630 (byte-defop 90 -1 byte-diff) | |
631 (byte-defop 91 0 byte-negate) | |
632 (byte-defop 92 -1 byte-plus) | |
633 (byte-defop 93 -1 byte-max) | |
634 (byte-defop 94 -1 byte-min) | |
635 (byte-defop 95 -1 byte-mult) ; v19 only | |
636 (byte-defop 96 1 byte-point) | |
637 (byte-defop 98 0 byte-goto-char) | |
638 (byte-defop 99 0 byte-insert) | |
639 (byte-defop 100 1 byte-point-max) | |
640 (byte-defop 101 1 byte-point-min) | |
641 (byte-defop 102 0 byte-char-after) | |
642 (byte-defop 103 1 byte-following-char) | |
643 (byte-defop 104 1 byte-preceding-char) | |
644 (byte-defop 105 1 byte-current-column) | |
645 (byte-defop 106 0 byte-indent-to) | |
646 (byte-defop 107 0 byte-scan-buffer-OBSOLETE) ; no longer generated as of v18 | |
647 (byte-defop 108 1 byte-eolp) | |
648 (byte-defop 109 1 byte-eobp) | |
649 (byte-defop 110 1 byte-bolp) | |
650 (byte-defop 111 1 byte-bobp) | |
651 (byte-defop 112 1 byte-current-buffer) | |
652 (byte-defop 113 0 byte-set-buffer) | |
18266
fd7bd1ad0763
(byte-save-current-buffer): Change to code 114 (0162).
Richard M. Stallman <rms@gnu.org>
parents:
17704
diff
changeset
|
653 (byte-defop 114 0 byte-save-current-buffer |
fd7bd1ad0763
(byte-save-current-buffer): Change to code 114 (0162).
Richard M. Stallman <rms@gnu.org>
parents:
17704
diff
changeset
|
654 "To make a binding to record the current buffer") |
757 | 655 (byte-defop 115 0 byte-set-mark-OBSOLETE) |
656 (byte-defop 116 1 byte-interactive-p) | |
657 | |
658 ;; These ops are new to v19 | |
659 (byte-defop 117 0 byte-forward-char) | |
660 (byte-defop 118 0 byte-forward-word) | |
661 (byte-defop 119 -1 byte-skip-chars-forward) | |
662 (byte-defop 120 -1 byte-skip-chars-backward) | |
663 (byte-defop 121 0 byte-forward-line) | |
664 (byte-defop 122 0 byte-char-syntax) | |
665 (byte-defop 123 -1 byte-buffer-substring) | |
666 (byte-defop 124 -1 byte-delete-region) | |
667 (byte-defop 125 -1 byte-narrow-to-region) | |
668 (byte-defop 126 1 byte-widen) | |
669 (byte-defop 127 0 byte-end-of-line) | |
670 | |
671 ;; unused: 128 | |
672 | |
673 ;; These store their argument in the next two bytes | |
674 (byte-defop 129 1 byte-constant2 | |
675 "for reference to a constant with vector index >= byte-constant-limit") | |
676 (byte-defop 130 0 byte-goto "for unconditional jump") | |
677 (byte-defop 131 -1 byte-goto-if-nil "to pop value and jump if it's nil") | |
678 (byte-defop 132 -1 byte-goto-if-not-nil "to pop value and jump if it's not nil") | |
679 (byte-defop 133 -1 byte-goto-if-nil-else-pop | |
28402 | 680 "to examine top-of-stack, jump and don't pop it if it's nil, |
757 | 681 otherwise pop it") |
682 (byte-defop 134 -1 byte-goto-if-not-nil-else-pop | |
28402 | 683 "to examine top-of-stack, jump and don't pop it if it's non nil, |
757 | 684 otherwise pop it") |
685 | |
686 (byte-defop 135 -1 byte-return "to pop a value and return it from `byte-code'") | |
687 (byte-defop 136 -1 byte-discard "to discard one value from stack") | |
688 (byte-defop 137 1 byte-dup "to duplicate the top of the stack") | |
689 | |
690 (byte-defop 138 0 byte-save-excursion | |
691 "to make a binding to record the buffer, point and mark") | |
692 (byte-defop 139 0 byte-save-window-excursion | |
693 "to make a binding to record entire window configuration") | |
694 (byte-defop 140 0 byte-save-restriction | |
695 "to make a binding to record the current buffer clipping restrictions") | |
696 (byte-defop 141 -1 byte-catch | |
697 "for catch. Takes, on stack, the tag and an expression for the body") | |
698 (byte-defop 142 -1 byte-unwind-protect | |
699 "for unwind-protect. Takes, on stack, an expression for the unwind-action") | |
700 | |
28402 | 701 ;; For condition-case. Takes, on stack, the variable to bind, |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
702 ;; an expression for the body, and a list of clauses. |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
703 (byte-defop 143 -2 byte-condition-case) |
757 | 704 |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
705 ;; For entry to with-output-to-temp-buffer. |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
706 ;; Takes, on stack, the buffer name. |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
707 ;; Binds standard-output and does some other things. |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
708 ;; Returns with temp buffer on the stack in place of buffer name. |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
709 (byte-defop 144 0 byte-temp-output-buffer-setup) |
757 | 710 |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
711 ;; For exit from with-output-to-temp-buffer. |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
712 ;; Expects the temp buffer on the stack underneath value to return. |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
713 ;; Pops them both, then pushes the value back on. |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
714 ;; Unbinds standard-output and makes the temp buffer visible. |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
715 (byte-defop 145 -1 byte-temp-output-buffer-show) |
757 | 716 |
717 ;; these ops are new to v19 | |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
718 |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
719 ;; To unbind back to the beginning of this frame. |
11117
34477ac36e6e
(byte-compile-out-toplevel): Compile lambda forms even if trivial.
Karl Heuer <kwzh@gnu.org>
parents:
10836
diff
changeset
|
720 ;; Not used yet, but will be needed for tail-recursion elimination. |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
721 (byte-defop 146 0 byte-unbind-all) |
757 | 722 |
723 ;; these ops are new to v19 | |
724 (byte-defop 147 -2 byte-set-marker) | |
725 (byte-defop 148 0 byte-match-beginning) | |
726 (byte-defop 149 0 byte-match-end) | |
727 (byte-defop 150 0 byte-upcase) | |
728 (byte-defop 151 0 byte-downcase) | |
729 (byte-defop 152 -1 byte-string=) | |
730 (byte-defop 153 -1 byte-string<) | |
731 (byte-defop 154 -1 byte-equal) | |
732 (byte-defop 155 -1 byte-nthcdr) | |
733 (byte-defop 156 -1 byte-elt) | |
734 (byte-defop 157 -1 byte-member) | |
735 (byte-defop 158 -1 byte-assq) | |
736 (byte-defop 159 0 byte-nreverse) | |
737 (byte-defop 160 -1 byte-setcar) | |
738 (byte-defop 161 -1 byte-setcdr) | |
739 (byte-defop 162 0 byte-car-safe) | |
740 (byte-defop 163 0 byte-cdr-safe) | |
741 (byte-defop 164 -1 byte-nconc) | |
742 (byte-defop 165 -1 byte-quo) | |
743 (byte-defop 166 -1 byte-rem) | |
744 (byte-defop 167 0 byte-numberp) | |
745 (byte-defop 168 0 byte-integerp) | |
746 | |
848 | 747 ;; unused: 169-174 |
757 | 748 (byte-defop 175 nil byte-listN) |
749 (byte-defop 176 nil byte-concatN) | |
750 (byte-defop 177 nil byte-insertN) | |
751 | |
752 ;; unused: 178-191 | |
753 | |
754 (byte-defop 192 1 byte-constant "for reference to a constant") | |
755 ;; codes 193-255 are consumed by byte-constant. | |
756 (defconst byte-constant-limit 64 | |
757 "Exclusive maximum index usable in the `byte-constant' opcode.") | |
758 | |
759 (defconst byte-goto-ops '(byte-goto byte-goto-if-nil byte-goto-if-not-nil | |
760 byte-goto-if-nil-else-pop | |
761 byte-goto-if-not-nil-else-pop) | |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
762 "List of byte-codes whose offset is a pc.") |
757 | 763 |
764 (defconst byte-goto-always-pop-ops '(byte-goto-if-nil byte-goto-if-not-nil)) | |
765 | |
766 (byte-extrude-byte-code-vectors) | |
767 | |
768 ;;; lapcode generator | |
39561
0881eab13b7a
(byte-recompile-directory): Make sure the file is readable.
Gerd Moellmann <gerd@gnu.org>
parents:
38895
diff
changeset
|
769 ;; |
0881eab13b7a
(byte-recompile-directory): Make sure the file is readable.
Gerd Moellmann <gerd@gnu.org>
parents:
38895
diff
changeset
|
770 ;; the byte-compiler now does source -> lapcode -> bytecode instead of |
0881eab13b7a
(byte-recompile-directory): Make sure the file is readable.
Gerd Moellmann <gerd@gnu.org>
parents:
38895
diff
changeset
|
771 ;; source -> bytecode, because it's a lot easier to make optimizations |
0881eab13b7a
(byte-recompile-directory): Make sure the file is readable.
Gerd Moellmann <gerd@gnu.org>
parents:
38895
diff
changeset
|
772 ;; on lapcode than on bytecode. |
0881eab13b7a
(byte-recompile-directory): Make sure the file is readable.
Gerd Moellmann <gerd@gnu.org>
parents:
38895
diff
changeset
|
773 ;; |
0881eab13b7a
(byte-recompile-directory): Make sure the file is readable.
Gerd Moellmann <gerd@gnu.org>
parents:
38895
diff
changeset
|
774 ;; Elements of the lapcode list are of the form (<instruction> . <parameter>) |
0881eab13b7a
(byte-recompile-directory): Make sure the file is readable.
Gerd Moellmann <gerd@gnu.org>
parents:
38895
diff
changeset
|
775 ;; where instruction is a symbol naming a byte-code instruction, |
0881eab13b7a
(byte-recompile-directory): Make sure the file is readable.
Gerd Moellmann <gerd@gnu.org>
parents:
38895
diff
changeset
|
776 ;; and parameter is an argument to that instruction, if any. |
0881eab13b7a
(byte-recompile-directory): Make sure the file is readable.
Gerd Moellmann <gerd@gnu.org>
parents:
38895
diff
changeset
|
777 ;; |
0881eab13b7a
(byte-recompile-directory): Make sure the file is readable.
Gerd Moellmann <gerd@gnu.org>
parents:
38895
diff
changeset
|
778 ;; The instruction can be the pseudo-op TAG, which means that this position |
0881eab13b7a
(byte-recompile-directory): Make sure the file is readable.
Gerd Moellmann <gerd@gnu.org>
parents:
38895
diff
changeset
|
779 ;; in the instruction stream is a target of a goto. (car PARAMETER) will be |
0881eab13b7a
(byte-recompile-directory): Make sure the file is readable.
Gerd Moellmann <gerd@gnu.org>
parents:
38895
diff
changeset
|
780 ;; the PC for this location, and the whole instruction "(TAG pc)" will be the |
0881eab13b7a
(byte-recompile-directory): Make sure the file is readable.
Gerd Moellmann <gerd@gnu.org>
parents:
38895
diff
changeset
|
781 ;; parameter for some goto op. |
0881eab13b7a
(byte-recompile-directory): Make sure the file is readable.
Gerd Moellmann <gerd@gnu.org>
parents:
38895
diff
changeset
|
782 ;; |
0881eab13b7a
(byte-recompile-directory): Make sure the file is readable.
Gerd Moellmann <gerd@gnu.org>
parents:
38895
diff
changeset
|
783 ;; If the operation is varbind, varref, varset or push-constant, then the |
0881eab13b7a
(byte-recompile-directory): Make sure the file is readable.
Gerd Moellmann <gerd@gnu.org>
parents:
38895
diff
changeset
|
784 ;; parameter is (variable/constant . index_in_constant_vector). |
0881eab13b7a
(byte-recompile-directory): Make sure the file is readable.
Gerd Moellmann <gerd@gnu.org>
parents:
38895
diff
changeset
|
785 ;; |
0881eab13b7a
(byte-recompile-directory): Make sure the file is readable.
Gerd Moellmann <gerd@gnu.org>
parents:
38895
diff
changeset
|
786 ;; First, the source code is macroexpanded and optimized in various ways. |
0881eab13b7a
(byte-recompile-directory): Make sure the file is readable.
Gerd Moellmann <gerd@gnu.org>
parents:
38895
diff
changeset
|
787 ;; Then the resultant code is compiled into lapcode. Another set of |
0881eab13b7a
(byte-recompile-directory): Make sure the file is readable.
Gerd Moellmann <gerd@gnu.org>
parents:
38895
diff
changeset
|
788 ;; optimizations are then run over the lapcode. Then the variables and |
0881eab13b7a
(byte-recompile-directory): Make sure the file is readable.
Gerd Moellmann <gerd@gnu.org>
parents:
38895
diff
changeset
|
789 ;; constants referenced by the lapcode are collected and placed in the |
0881eab13b7a
(byte-recompile-directory): Make sure the file is readable.
Gerd Moellmann <gerd@gnu.org>
parents:
38895
diff
changeset
|
790 ;; constants-vector. (This happens now so that variables referenced by dead |
0881eab13b7a
(byte-recompile-directory): Make sure the file is readable.
Gerd Moellmann <gerd@gnu.org>
parents:
38895
diff
changeset
|
791 ;; code don't consume space.) And finally, the lapcode is transformed into |
0881eab13b7a
(byte-recompile-directory): Make sure the file is readable.
Gerd Moellmann <gerd@gnu.org>
parents:
38895
diff
changeset
|
792 ;; compacted byte-code. |
0881eab13b7a
(byte-recompile-directory): Make sure the file is readable.
Gerd Moellmann <gerd@gnu.org>
parents:
38895
diff
changeset
|
793 ;; |
0881eab13b7a
(byte-recompile-directory): Make sure the file is readable.
Gerd Moellmann <gerd@gnu.org>
parents:
38895
diff
changeset
|
794 ;; A distinction is made between variables and constants because the variable- |
0881eab13b7a
(byte-recompile-directory): Make sure the file is readable.
Gerd Moellmann <gerd@gnu.org>
parents:
38895
diff
changeset
|
795 ;; referencing instructions are more sensitive to the variables being near the |
0881eab13b7a
(byte-recompile-directory): Make sure the file is readable.
Gerd Moellmann <gerd@gnu.org>
parents:
38895
diff
changeset
|
796 ;; front of the constants-vector than the constant-referencing instructions. |
0881eab13b7a
(byte-recompile-directory): Make sure the file is readable.
Gerd Moellmann <gerd@gnu.org>
parents:
38895
diff
changeset
|
797 ;; Also, this lets us notice references to free variables. |
757 | 798 |
799 (defun byte-compile-lapcode (lap) | |
800 "Turns lapcode into bytecode. The lapcode is destroyed." | |
801 ;; Lapcode modifications: changes the ID of a tag to be the tag's PC. | |
802 (let ((pc 0) ; Program counter | |
803 op off ; Operation & offset | |
804 (bytes '()) ; Put the output bytes here | |
50570
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
805 (patchlist nil)) ; List of tags and goto's to patch |
757 | 806 (while lap |
807 (setq op (car (car lap)) | |
808 off (cdr (car lap))) | |
809 (cond ((not (symbolp op)) | |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
810 (error "Non-symbolic opcode `%s'" op)) |
757 | 811 ((eq op 'TAG) |
812 (setcar off pc) | |
813 (setq patchlist (cons off patchlist))) | |
814 ((memq op byte-goto-ops) | |
815 (setq pc (+ pc 3)) | |
816 (setq bytes (cons (cons pc (cdr off)) | |
817 (cons nil | |
818 (cons (symbol-value op) bytes)))) | |
819 (setq patchlist (cons bytes patchlist))) | |
820 (t | |
821 (setq bytes | |
822 (cond ((cond ((consp off) | |
823 ;; Variable or constant reference | |
824 (setq off (cdr off)) | |
825 (eq op 'byte-constant))) | |
826 (cond ((< off byte-constant-limit) | |
827 (setq pc (1+ pc)) | |
828 (cons (+ byte-constant off) bytes)) | |
829 (t | |
830 (setq pc (+ 3 pc)) | |
831 (cons (lsh off -8) | |
832 (cons (logand off 255) | |
833 (cons byte-constant2 bytes)))))) | |
834 ((<= byte-listN (symbol-value op)) | |
835 (setq pc (+ 2 pc)) | |
836 (cons off (cons (symbol-value op) bytes))) | |
837 ((< off 6) | |
838 (setq pc (1+ pc)) | |
839 (cons (+ (symbol-value op) off) bytes)) | |
840 ((< off 256) | |
841 (setq pc (+ 2 pc)) | |
842 (cons off (cons (+ (symbol-value op) 6) bytes))) | |
843 (t | |
844 (setq pc (+ 3 pc)) | |
845 (cons (lsh off -8) | |
846 (cons (logand off 255) | |
847 (cons (+ (symbol-value op) 7) | |
848 bytes)))))))) | |
849 (setq lap (cdr lap))) | |
850 ;;(if (not (= pc (length bytes))) | |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
851 ;; (error "Compiler error: pc mismatch - %s %s" pc (length bytes))) |
757 | 852 ;; Patch PC into jumps |
853 (let (bytes) | |
854 (while patchlist | |
855 (setq bytes (car patchlist)) | |
856 (cond ((atom (car bytes))) ; Tag | |
857 (t ; Absolute jump | |
858 (setq pc (car (cdr (car bytes)))) ; Pick PC from tag | |
859 (setcar (cdr bytes) (logand pc 255)) | |
860 (setcar bytes (lsh pc -8)))) | |
861 (setq patchlist (cdr patchlist)))) | |
91797
5ed3a8ae2d11
(byte-compile-lapcode): Use
Kenichi Handa <handa@m17n.org>
parents:
91327
diff
changeset
|
862 (apply 'unibyte-string (nreverse bytes)))) |
757 | 863 |
864 | |
28295
8082575fec24
(byte-compile-warning-types, byte-compile-warnings): New warning `noruntime'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27824
diff
changeset
|
865 ;;; compile-time evaluation |
8082575fec24
(byte-compile-warning-types, byte-compile-warnings): New warning `noruntime'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27824
diff
changeset
|
866 |
28336
49b7af1b8e1b
(byte-compile-eval): Fix and reenable the code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28305
diff
changeset
|
867 (defun byte-compile-eval (form) |
49b7af1b8e1b
(byte-compile-eval): Fix and reenable the code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28305
diff
changeset
|
868 "Eval FORM and mark the functions defined therein. |
53753
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
869 Each function's symbol gets added to `byte-compile-noruntime-functions'." |
28295
8082575fec24
(byte-compile-warning-types, byte-compile-warnings): New warning `noruntime'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27824
diff
changeset
|
870 (let ((hist-orig load-history) |
8082575fec24
(byte-compile-warning-types, byte-compile-warnings): New warning `noruntime'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27824
diff
changeset
|
871 (hist-nil-orig current-load-list)) |
28336
49b7af1b8e1b
(byte-compile-eval): Fix and reenable the code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28305
diff
changeset
|
872 (prog1 (eval form) |
85730
a1e136978a9a
(byte-compile-warnings): Document `not'.
Glenn Morris <rgm@gnu.org>
parents:
85657
diff
changeset
|
873 (when (byte-compile-warning-enabled-p 'noruntime) |
28295
8082575fec24
(byte-compile-warning-types, byte-compile-warnings): New warning `noruntime'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27824
diff
changeset
|
874 (let ((hist-new load-history) |
8082575fec24
(byte-compile-warning-types, byte-compile-warnings): New warning `noruntime'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27824
diff
changeset
|
875 (hist-nil-new current-load-list)) |
28336
49b7af1b8e1b
(byte-compile-eval): Fix and reenable the code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28305
diff
changeset
|
876 ;; Go through load-history, look for newly loaded files |
49b7af1b8e1b
(byte-compile-eval): Fix and reenable the code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28305
diff
changeset
|
877 ;; and mark all the functions defined therein. |
49b7af1b8e1b
(byte-compile-eval): Fix and reenable the code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28305
diff
changeset
|
878 (while (and hist-new (not (eq hist-new hist-orig))) |
48719
0cc3c6bc6da0
(byte-compile-eval): Handle (t . SYMBOL) elements in load-history.
Richard M. Stallman <rms@gnu.org>
parents:
48468
diff
changeset
|
879 (let ((xs (pop hist-new)) |
0cc3c6bc6da0
(byte-compile-eval): Handle (t . SYMBOL) elements in load-history.
Richard M. Stallman <rms@gnu.org>
parents:
48468
diff
changeset
|
880 old-autoloads) |
28336
49b7af1b8e1b
(byte-compile-eval): Fix and reenable the code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28305
diff
changeset
|
881 ;; Make sure the file was not already loaded before. |
57518
25bf13fe1c10
(byte-compile-eval): Don't process
Richard M. Stallman <rms@gnu.org>
parents:
57004
diff
changeset
|
882 (unless (or (assoc (car xs) hist-orig) |
25bf13fe1c10
(byte-compile-eval): Don't process
Richard M. Stallman <rms@gnu.org>
parents:
57004
diff
changeset
|
883 (equal (car xs) "cl")) |
28336
49b7af1b8e1b
(byte-compile-eval): Fix and reenable the code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28305
diff
changeset
|
884 (dolist (s xs) |
49b7af1b8e1b
(byte-compile-eval): Fix and reenable the code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28305
diff
changeset
|
885 (cond |
48719
0cc3c6bc6da0
(byte-compile-eval): Handle (t . SYMBOL) elements in load-history.
Richard M. Stallman <rms@gnu.org>
parents:
48468
diff
changeset
|
886 ((symbolp s) |
0cc3c6bc6da0
(byte-compile-eval): Handle (t . SYMBOL) elements in load-history.
Richard M. Stallman <rms@gnu.org>
parents:
48468
diff
changeset
|
887 (unless (memq s old-autoloads) |
53753
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
888 (push s byte-compile-noruntime-functions))) |
48719
0cc3c6bc6da0
(byte-compile-eval): Handle (t . SYMBOL) elements in load-history.
Richard M. Stallman <rms@gnu.org>
parents:
48468
diff
changeset
|
889 ((and (consp s) (eq t (car s))) |
50570
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
890 (push (cdr s) old-autoloads)) |
28336
49b7af1b8e1b
(byte-compile-eval): Fix and reenable the code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28305
diff
changeset
|
891 ((and (consp s) (eq 'autoload (car s))) |
53753
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
892 (push (cdr s) byte-compile-noruntime-functions))))))) |
28336
49b7af1b8e1b
(byte-compile-eval): Fix and reenable the code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28305
diff
changeset
|
893 ;; Go through current-load-list for the locally defined funs. |
48719
0cc3c6bc6da0
(byte-compile-eval): Handle (t . SYMBOL) elements in load-history.
Richard M. Stallman <rms@gnu.org>
parents:
48468
diff
changeset
|
894 (let (old-autoloads) |
0cc3c6bc6da0
(byte-compile-eval): Handle (t . SYMBOL) elements in load-history.
Richard M. Stallman <rms@gnu.org>
parents:
48468
diff
changeset
|
895 (while (and hist-nil-new (not (eq hist-nil-new hist-nil-orig))) |
0cc3c6bc6da0
(byte-compile-eval): Handle (t . SYMBOL) elements in load-history.
Richard M. Stallman <rms@gnu.org>
parents:
48468
diff
changeset
|
896 (let ((s (pop hist-nil-new))) |
0cc3c6bc6da0
(byte-compile-eval): Handle (t . SYMBOL) elements in load-history.
Richard M. Stallman <rms@gnu.org>
parents:
48468
diff
changeset
|
897 (when (and (symbolp s) (not (memq s old-autoloads))) |
53753
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
898 (push s byte-compile-noruntime-functions)) |
48719
0cc3c6bc6da0
(byte-compile-eval): Handle (t . SYMBOL) elements in load-history.
Richard M. Stallman <rms@gnu.org>
parents:
48468
diff
changeset
|
899 (when (and (consp s) (eq t (car s))) |
57518
25bf13fe1c10
(byte-compile-eval): Don't process
Richard M. Stallman <rms@gnu.org>
parents:
57004
diff
changeset
|
900 (push (cdr s) old-autoloads))))))) |
85730
a1e136978a9a
(byte-compile-warnings): Document `not'.
Glenn Morris <rgm@gnu.org>
parents:
85657
diff
changeset
|
901 (when (byte-compile-warning-enabled-p 'cl-functions) |
81333
fc32f1336974
(byte-compile-current-group): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81295
diff
changeset
|
902 (let ((hist-new load-history)) |
57518
25bf13fe1c10
(byte-compile-eval): Don't process
Richard M. Stallman <rms@gnu.org>
parents:
57004
diff
changeset
|
903 ;; Go through load-history, look for newly loaded files |
25bf13fe1c10
(byte-compile-eval): Don't process
Richard M. Stallman <rms@gnu.org>
parents:
57004
diff
changeset
|
904 ;; and mark all the functions defined therein. |
25bf13fe1c10
(byte-compile-eval): Don't process
Richard M. Stallman <rms@gnu.org>
parents:
57004
diff
changeset
|
905 (while (and hist-new (not (eq hist-new hist-orig))) |
81333
fc32f1336974
(byte-compile-current-group): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81295
diff
changeset
|
906 (let ((xs (pop hist-new))) |
57518
25bf13fe1c10
(byte-compile-eval): Don't process
Richard M. Stallman <rms@gnu.org>
parents:
57004
diff
changeset
|
907 ;; Make sure the file was not already loaded before. |
25bf13fe1c10
(byte-compile-eval): Don't process
Richard M. Stallman <rms@gnu.org>
parents:
57004
diff
changeset
|
908 (when (and (equal (car xs) "cl") (not (assoc (car xs) hist-orig))) |
25bf13fe1c10
(byte-compile-eval): Don't process
Richard M. Stallman <rms@gnu.org>
parents:
57004
diff
changeset
|
909 (byte-compile-find-cl-functions))))))))) |
28295
8082575fec24
(byte-compile-warning-types, byte-compile-warnings): New warning `noruntime'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27824
diff
changeset
|
910 |
46136
79f132657570
(byte-compile-warning-types):
Richard M. Stallman <rms@gnu.org>
parents:
46050
diff
changeset
|
911 (defun byte-compile-eval-before-compile (form) |
79f132657570
(byte-compile-warning-types):
Richard M. Stallman <rms@gnu.org>
parents:
46050
diff
changeset
|
912 "Evaluate FORM for `eval-and-compile'." |
79f132657570
(byte-compile-warning-types):
Richard M. Stallman <rms@gnu.org>
parents:
46050
diff
changeset
|
913 (let ((hist-nil-orig current-load-list)) |
79f132657570
(byte-compile-warning-types):
Richard M. Stallman <rms@gnu.org>
parents:
46050
diff
changeset
|
914 (prog1 (eval form) |
79f132657570
(byte-compile-warning-types):
Richard M. Stallman <rms@gnu.org>
parents:
46050
diff
changeset
|
915 ;; (eval-and-compile (require 'cl) turns off warnings for cl functions. |
79f132657570
(byte-compile-warning-types):
Richard M. Stallman <rms@gnu.org>
parents:
46050
diff
changeset
|
916 (let ((tem current-load-list)) |
79f132657570
(byte-compile-warning-types):
Richard M. Stallman <rms@gnu.org>
parents:
46050
diff
changeset
|
917 (while (not (eq tem hist-nil-orig)) |
79f132657570
(byte-compile-warning-types):
Richard M. Stallman <rms@gnu.org>
parents:
46050
diff
changeset
|
918 (when (equal (car tem) '(require . cl)) |
85730
a1e136978a9a
(byte-compile-warnings): Document `not'.
Glenn Morris <rgm@gnu.org>
parents:
85657
diff
changeset
|
919 (byte-compile-disable-warning 'cl-functions)) |
46136
79f132657570
(byte-compile-warning-types):
Richard M. Stallman <rms@gnu.org>
parents:
46050
diff
changeset
|
920 (setq tem (cdr tem))))))) |
28295
8082575fec24
(byte-compile-warning-types, byte-compile-warnings): New warning `noruntime'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27824
diff
changeset
|
921 |
757 | 922 ;;; byte compiler messages |
923 | |
10235
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
924 (defvar byte-compile-current-form nil) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
925 (defvar byte-compile-dest-file nil) |
33352
bd48e8729dbb
(byte-compiling-files-p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
33348
diff
changeset
|
926 (defvar byte-compile-current-file nil) |
45558
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
927 (defvar byte-compile-current-buffer nil) |
33348
af3d766a1234
(byte-compile-current-file): Don't bind
Gerd Moellmann <gerd@gnu.org>
parents:
32765
diff
changeset
|
928 |
46576 | 929 ;; Log something that isn't a warning. |
757 | 930 (defmacro byte-compile-log (format-string &rest args) |
55694
62803bbfc576
(byte-compile-log): Use backquotes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55077
diff
changeset
|
931 `(and |
62803bbfc576
(byte-compile-log): Use backquotes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55077
diff
changeset
|
932 byte-optimize |
62803bbfc576
(byte-compile-log): Use backquotes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55077
diff
changeset
|
933 (memq byte-optimize-log '(t source)) |
62803bbfc576
(byte-compile-log): Use backquotes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55077
diff
changeset
|
934 (let ((print-escape-newlines t) |
62803bbfc576
(byte-compile-log): Use backquotes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55077
diff
changeset
|
935 (print-level 4) |
62803bbfc576
(byte-compile-log): Use backquotes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55077
diff
changeset
|
936 (print-length 4)) |
62803bbfc576
(byte-compile-log): Use backquotes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55077
diff
changeset
|
937 (byte-compile-log-1 |
62803bbfc576
(byte-compile-log): Use backquotes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55077
diff
changeset
|
938 (format |
62803bbfc576
(byte-compile-log): Use backquotes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55077
diff
changeset
|
939 ,format-string |
62803bbfc576
(byte-compile-log): Use backquotes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55077
diff
changeset
|
940 ,@(mapcar |
62803bbfc576
(byte-compile-log): Use backquotes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55077
diff
changeset
|
941 (lambda (x) (if (symbolp x) (list 'prin1-to-string x) x)) |
62803bbfc576
(byte-compile-log): Use backquotes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55077
diff
changeset
|
942 args)))))) |
757 | 943 |
46576 | 944 ;; Log something that isn't a warning. |
945 (defun byte-compile-log-1 (string) | |
55694
62803bbfc576
(byte-compile-log): Use backquotes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55077
diff
changeset
|
946 (with-current-buffer "*Compile-Log*" |
57518
25bf13fe1c10
(byte-compile-eval): Don't process
Richard M. Stallman <rms@gnu.org>
parents:
57004
diff
changeset
|
947 (let ((inhibit-read-only t)) |
25bf13fe1c10
(byte-compile-eval): Don't process
Richard M. Stallman <rms@gnu.org>
parents:
57004
diff
changeset
|
948 (goto-char (point-max)) |
25bf13fe1c10
(byte-compile-eval): Don't process
Richard M. Stallman <rms@gnu.org>
parents:
57004
diff
changeset
|
949 (byte-compile-warning-prefix nil nil) |
25bf13fe1c10
(byte-compile-eval): Don't process
Richard M. Stallman <rms@gnu.org>
parents:
57004
diff
changeset
|
950 (cond (noninteractive |
25bf13fe1c10
(byte-compile-eval): Don't process
Richard M. Stallman <rms@gnu.org>
parents:
57004
diff
changeset
|
951 (message " %s" string)) |
25bf13fe1c10
(byte-compile-eval): Don't process
Richard M. Stallman <rms@gnu.org>
parents:
57004
diff
changeset
|
952 (t |
25bf13fe1c10
(byte-compile-eval): Don't process
Richard M. Stallman <rms@gnu.org>
parents:
57004
diff
changeset
|
953 (insert (format "%s\n" string))))))) |
757 | 954 |
45558
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
955 (defvar byte-compile-read-position nil |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
956 "Character position we began the last `read' from.") |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
957 (defvar byte-compile-last-position nil |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
958 "Last known character position in the input.") |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
959 |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
960 ;; copied from gnus-util.el |
46690
68c134e00c87
(byte-compile-set-symbol-position): Don't recompute `entry' on each iteration.
Richard M. Stallman <rms@gnu.org>
parents:
46657
diff
changeset
|
961 (defsubst byte-compile-delete-first (elt list) |
45558
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
962 (if (eq (car list) elt) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
963 (cdr list) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
964 (let ((total list)) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
965 (while (and (cdr list) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
966 (not (eq (cadr list) elt))) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
967 (setq list (cdr list))) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
968 (when (cdr list) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
969 (setcdr list (cddr list))) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
970 total))) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
971 |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
972 ;; The purpose of this function is to iterate through the |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
973 ;; `read-symbol-positions-list'. Each time we process, say, a |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
974 ;; function definition (`defun') we remove `defun' from |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
975 ;; `read-symbol-positions-list', and set `byte-compile-last-position' |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
976 ;; to that symbol's character position. Similarly, if we encounter a |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
977 ;; variable reference, like in (1+ foo), we remove `foo' from the |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
978 ;; list. If our current position is after the symbol's position, we |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
979 ;; assume we've already passed that point, and look for the next |
47912 | 980 ;; occurrence of the symbol. |
66317
3f882faaa9ae
(byte-compile-lambda): Add parameter add-lambda.
Lars Hansen <larsh@soem.dk>
parents:
64751
diff
changeset
|
981 ;; |
3f882faaa9ae
(byte-compile-lambda): Add parameter add-lambda.
Lars Hansen <larsh@soem.dk>
parents:
64751
diff
changeset
|
982 ;; This function should not be called twice for the same occurrence of |
3f882faaa9ae
(byte-compile-lambda): Add parameter add-lambda.
Lars Hansen <larsh@soem.dk>
parents:
64751
diff
changeset
|
983 ;; a symbol, and it should not be called for symbols generated by the |
3f882faaa9ae
(byte-compile-lambda): Add parameter add-lambda.
Lars Hansen <larsh@soem.dk>
parents:
64751
diff
changeset
|
984 ;; byte compiler itself; because rather than just fail looking up the |
3f882faaa9ae
(byte-compile-lambda): Add parameter add-lambda.
Lars Hansen <larsh@soem.dk>
parents:
64751
diff
changeset
|
985 ;; symbol, we may find an occurrence of the symbol further ahead, and |
3f882faaa9ae
(byte-compile-lambda): Add parameter add-lambda.
Lars Hansen <larsh@soem.dk>
parents:
64751
diff
changeset
|
986 ;; then `byte-compile-last-position' as advanced too far. |
3f882faaa9ae
(byte-compile-lambda): Add parameter add-lambda.
Lars Hansen <larsh@soem.dk>
parents:
64751
diff
changeset
|
987 ;; |
47912 | 988 ;; So your're probably asking yourself: Isn't this function a |
45558
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
989 ;; gross hack? And the answer, of course, would be yes. |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
990 (defun byte-compile-set-symbol-position (sym &optional allow-previous) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
991 (when byte-compile-read-position |
46690
68c134e00c87
(byte-compile-set-symbol-position): Don't recompute `entry' on each iteration.
Richard M. Stallman <rms@gnu.org>
parents:
46657
diff
changeset
|
992 (let (last entry) |
45558
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
993 (while (progn |
58377
01886d0fea34
(byte-compile-form): Move the calls to byte-compile-set-symbol-position,
Richard M. Stallman <rms@gnu.org>
parents:
58154
diff
changeset
|
994 (setq last byte-compile-last-position |
01886d0fea34
(byte-compile-form): Move the calls to byte-compile-set-symbol-position,
Richard M. Stallman <rms@gnu.org>
parents:
58154
diff
changeset
|
995 entry (assq sym read-symbol-positions-list)) |
01886d0fea34
(byte-compile-form): Move the calls to byte-compile-set-symbol-position,
Richard M. Stallman <rms@gnu.org>
parents:
58154
diff
changeset
|
996 (when entry |
01886d0fea34
(byte-compile-form): Move the calls to byte-compile-set-symbol-position,
Richard M. Stallman <rms@gnu.org>
parents:
58154
diff
changeset
|
997 (setq byte-compile-last-position |
01886d0fea34
(byte-compile-form): Move the calls to byte-compile-set-symbol-position,
Richard M. Stallman <rms@gnu.org>
parents:
58154
diff
changeset
|
998 (+ byte-compile-read-position (cdr entry)) |
01886d0fea34
(byte-compile-form): Move the calls to byte-compile-set-symbol-position,
Richard M. Stallman <rms@gnu.org>
parents:
58154
diff
changeset
|
999 read-symbol-positions-list |
01886d0fea34
(byte-compile-form): Move the calls to byte-compile-set-symbol-position,
Richard M. Stallman <rms@gnu.org>
parents:
58154
diff
changeset
|
1000 (byte-compile-delete-first |
01886d0fea34
(byte-compile-form): Move the calls to byte-compile-set-symbol-position,
Richard M. Stallman <rms@gnu.org>
parents:
58154
diff
changeset
|
1001 entry read-symbol-positions-list))) |
45558
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1002 (or (and allow-previous (not (= last byte-compile-last-position))) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1003 (> last byte-compile-last-position))))))) |
39769
3bea53c3ecea
(byte-compile-display-log-head-p): New
Gerd Moellmann <gerd@gnu.org>
parents:
39657
diff
changeset
|
1004 |
46576 | 1005 (defvar byte-compile-last-warned-form nil) |
1006 (defvar byte-compile-last-logged-file nil) | |
1007 | |
1008 ;; This is used as warning-prefix for the compiler. | |
47110
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1009 ;; It is always called with the warnings buffer current. |
46576 | 1010 (defun byte-compile-warning-prefix (level entry) |
57518
25bf13fe1c10
(byte-compile-eval): Don't process
Richard M. Stallman <rms@gnu.org>
parents:
57004
diff
changeset
|
1011 (let* ((inhibit-read-only t) |
25bf13fe1c10
(byte-compile-eval): Don't process
Richard M. Stallman <rms@gnu.org>
parents:
57004
diff
changeset
|
1012 (dir default-directory) |
47110
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1013 (file (cond ((stringp byte-compile-current-file) |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1014 (format "%s:" (file-relative-name byte-compile-current-file dir))) |
39769
3bea53c3ecea
(byte-compile-display-log-head-p): New
Gerd Moellmann <gerd@gnu.org>
parents:
39657
diff
changeset
|
1015 ((bufferp byte-compile-current-file) |
40035
2b16a80692ef
Put the *Compile-Log* buffer in `compilation-mode'.
Sam Steingold <sds@gnu.org>
parents:
39852
diff
changeset
|
1016 (format "Buffer %s:" |
39769
3bea53c3ecea
(byte-compile-display-log-head-p): New
Gerd Moellmann <gerd@gnu.org>
parents:
39657
diff
changeset
|
1017 (buffer-name byte-compile-current-file))) |
3bea53c3ecea
(byte-compile-display-log-head-p): New
Gerd Moellmann <gerd@gnu.org>
parents:
39657
diff
changeset
|
1018 (t ""))) |
40035
2b16a80692ef
Put the *Compile-Log* buffer in `compilation-mode'.
Sam Steingold <sds@gnu.org>
parents:
39852
diff
changeset
|
1019 (pos (if (and byte-compile-current-file |
45558
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1020 (integerp byte-compile-read-position)) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1021 (with-current-buffer byte-compile-current-buffer |
79488
b8e6a2408b6d
(batch-byte-recompile-directory): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
79231
diff
changeset
|
1022 (format "%d:%d:" |
76463
63e4cb93803a
(byte-compile-warning-prefix): Correctly compute line number.
Richard M. Stallman <rms@gnu.org>
parents:
75836
diff
changeset
|
1023 (save-excursion |
63e4cb93803a
(byte-compile-warning-prefix): Correctly compute line number.
Richard M. Stallman <rms@gnu.org>
parents:
75836
diff
changeset
|
1024 (goto-char byte-compile-last-position) |
63e4cb93803a
(byte-compile-warning-prefix): Correctly compute line number.
Richard M. Stallman <rms@gnu.org>
parents:
75836
diff
changeset
|
1025 (1+ (count-lines (point-min) (point-at-bol)))) |
45558
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1026 (save-excursion |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1027 (goto-char byte-compile-last-position) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1028 (1+ (current-column))))) |
39769
3bea53c3ecea
(byte-compile-display-log-head-p): New
Gerd Moellmann <gerd@gnu.org>
parents:
39657
diff
changeset
|
1029 "")) |
47110
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1030 (form (if (eq byte-compile-current-form :end) "end of data" |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1031 (or byte-compile-current-form "toplevel form")))) |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1032 (when (or (and byte-compile-current-file |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1033 (not (equal byte-compile-current-file |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1034 byte-compile-last-logged-file))) |
52534
c8dcd0a4adb3
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
1035 (and byte-compile-current-form |
47110
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1036 (not (eq byte-compile-current-form |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1037 byte-compile-last-warned-form)))) |
46576 | 1038 (insert (format "\nIn %s:\n" form))) |
47110
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1039 (when level |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1040 (insert (format "%s%s" file pos)))) |
32763
5436a18ec371
[the following changes fix a bug where `define-minor-mode' didn't
Miles Bader <miles@gnu.org>
parents:
31882
diff
changeset
|
1041 (setq byte-compile-last-logged-file byte-compile-current-file |
46576 | 1042 byte-compile-last-warned-form byte-compile-current-form) |
1043 entry) | |
757 | 1044 |
47110
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1045 ;; This no-op function is used as the value of warning-series |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1046 ;; to tell inner calls to displaying-byte-compile-warnings |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1047 ;; not to bind warning-series. |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1048 (defun byte-compile-warning-series (&rest ignore) |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1049 nil) |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1050 |
86222
4aed8a9fb626
(compilation-forget-errors): Declare as function.
Glenn Morris <rgm@gnu.org>
parents:
86177
diff
changeset
|
1051 ;; (compile-mode) will cause this to be loaded. |
87112
fd5b69abce98
Remove directory part from filenames in function declarations.
Glenn Morris <rgm@gnu.org>
parents:
87060
diff
changeset
|
1052 (declare-function compilation-forget-errors "compile" ()) |
86222
4aed8a9fb626
(compilation-forget-errors): Declare as function.
Glenn Morris <rgm@gnu.org>
parents:
86177
diff
changeset
|
1053 |
11323
5f75d3e225c1
(byte-compile-log-file): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11253
diff
changeset
|
1054 ;; Log the start of a file in *Compile-Log*, and mark it as done. |
46576 | 1055 ;; Return the position of the start of the page in the log buffer. |
11323
5f75d3e225c1
(byte-compile-log-file): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11253
diff
changeset
|
1056 ;; But do nothing in batch mode. |
5f75d3e225c1
(byte-compile-log-file): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11253
diff
changeset
|
1057 (defun byte-compile-log-file () |
47110
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1058 (and (not (equal byte-compile-current-file byte-compile-last-logged-file)) |
32763
5436a18ec371
[the following changes fix a bug where `define-minor-mode' didn't
Miles Bader <miles@gnu.org>
parents:
31882
diff
changeset
|
1059 (not noninteractive) |
78613
340dd924a553
(byte-compile-log-file, byte-recompile-directory, byte-compile-file)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78217
diff
changeset
|
1060 (with-current-buffer (get-buffer-create "*Compile-Log*") |
11432
f499628d7e5b
(byte-compile-log-file): Always insert at eob.
Richard M. Stallman <rms@gnu.org>
parents:
11323
diff
changeset
|
1061 (goto-char (point-max)) |
57518
25bf13fe1c10
(byte-compile-eval): Don't process
Richard M. Stallman <rms@gnu.org>
parents:
57004
diff
changeset
|
1062 (let* ((inhibit-read-only t) |
25bf13fe1c10
(byte-compile-eval): Don't process
Richard M. Stallman <rms@gnu.org>
parents:
57004
diff
changeset
|
1063 (dir (and byte-compile-current-file |
47110
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1064 (file-name-directory byte-compile-current-file))) |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1065 (was-same (equal default-directory dir)) |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1066 pt) |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1067 (when dir |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1068 (unless was-same |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1069 (insert (format "Leaving directory `%s'\n" default-directory)))) |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1070 (unless (bolp) |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1071 (insert "\n")) |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1072 (setq pt (point-marker)) |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1073 (if byte-compile-current-file |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1074 (insert "\f\nCompiling " |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1075 (if (stringp byte-compile-current-file) |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1076 (concat "file " byte-compile-current-file) |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1077 (concat "buffer " (buffer-name byte-compile-current-file))) |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1078 " at " (current-time-string) "\n") |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1079 (insert "\f\nCompiling no file at " (current-time-string) "\n")) |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1080 (when dir |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1081 (setq default-directory dir) |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1082 (unless was-same |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1083 (insert (format "Entering directory `%s'\n" default-directory)))) |
52568
993d4afcd6d0
(byte-compile-log-file): Clear out byte-compile-last-warned-form.
Richard M. Stallman <rms@gnu.org>
parents:
52534
diff
changeset
|
1084 (setq byte-compile-last-logged-file byte-compile-current-file |
993d4afcd6d0
(byte-compile-log-file): Clear out byte-compile-last-warned-form.
Richard M. Stallman <rms@gnu.org>
parents:
52534
diff
changeset
|
1085 byte-compile-last-warned-form nil) |
50639
c3ba923eb0e9
(byte-compile-log-file, (byte-recompile-directory): Don't use
Richard M. Stallman <rms@gnu.org>
parents:
50618
diff
changeset
|
1086 ;; Do this after setting default-directory. |
84371
5ee0e4e08f91
(byte-compile-log-file): Check major-mode via derived-mode-p.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83836
diff
changeset
|
1087 (unless (derived-mode-p 'compilation-mode) (compilation-mode)) |
55694
62803bbfc576
(byte-compile-log): Use backquotes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55077
diff
changeset
|
1088 (compilation-forget-errors) |
46576 | 1089 pt)))) |
1090 | |
1091 ;; Log a message STRING in *Compile-Log*. | |
1092 ;; Also log the current function and file if not already done. | |
1093 (defun byte-compile-log-warning (string &optional fill level) | |
1094 (let ((warning-prefix-function 'byte-compile-warning-prefix) | |
52133
4c112142c56f
(byte-compile-not-obsolete-var): New var.
Richard M. Stallman <rms@gnu.org>
parents:
51737
diff
changeset
|
1095 (warning-type-format "") |
57518
25bf13fe1c10
(byte-compile-eval): Don't process
Richard M. Stallman <rms@gnu.org>
parents:
57004
diff
changeset
|
1096 (warning-fill-prefix (if fill " ")) |
25bf13fe1c10
(byte-compile-eval): Don't process
Richard M. Stallman <rms@gnu.org>
parents:
57004
diff
changeset
|
1097 (inhibit-read-only t)) |
46576 | 1098 (display-warning 'bytecomp string level "*Compile-Log*"))) |
11323
5f75d3e225c1
(byte-compile-log-file): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11253
diff
changeset
|
1099 |
757 | 1100 (defun byte-compile-warn (format &rest args) |
46576 | 1101 "Issue a byte compiler warning; use (format FORMAT ARGS...) for message." |
757 | 1102 (setq format (apply 'format format args)) |
1103 (if byte-compile-error-on-warn | |
1104 (error "%s" format) ; byte-compile-file catches and logs it | |
46576 | 1105 (byte-compile-log-warning format t :warning))) |
1106 | |
94355
b5f8ef4e3358
(byte-compile-warn-obsolete): New function.
Glenn Morris <rgm@gnu.org>
parents:
93457
diff
changeset
|
1107 (defun byte-compile-warn-obsolete (symbol) |
b5f8ef4e3358
(byte-compile-warn-obsolete): New function.
Glenn Morris <rgm@gnu.org>
parents:
93457
diff
changeset
|
1108 "Warn that SYMBOL (a variable or function) is obsolete." |
b5f8ef4e3358
(byte-compile-warn-obsolete): New function.
Glenn Morris <rgm@gnu.org>
parents:
93457
diff
changeset
|
1109 (when (byte-compile-warning-enabled-p 'obsolete) |
b5f8ef4e3358
(byte-compile-warn-obsolete): New function.
Glenn Morris <rgm@gnu.org>
parents:
93457
diff
changeset
|
1110 (let* ((funcp (get symbol 'byte-obsolete-info)) |
b5f8ef4e3358
(byte-compile-warn-obsolete): New function.
Glenn Morris <rgm@gnu.org>
parents:
93457
diff
changeset
|
1111 (obsolete (or funcp (get symbol 'byte-obsolete-variable))) |
b5f8ef4e3358
(byte-compile-warn-obsolete): New function.
Glenn Morris <rgm@gnu.org>
parents:
93457
diff
changeset
|
1112 (instead (car obsolete)) |
b5f8ef4e3358
(byte-compile-warn-obsolete): New function.
Glenn Morris <rgm@gnu.org>
parents:
93457
diff
changeset
|
1113 (asof (if funcp (nth 2 obsolete) (cdr obsolete)))) |
b5f8ef4e3358
(byte-compile-warn-obsolete): New function.
Glenn Morris <rgm@gnu.org>
parents:
93457
diff
changeset
|
1114 (byte-compile-warn "`%s' is an obsolete %s%s%s" symbol |
b5f8ef4e3358
(byte-compile-warn-obsolete): New function.
Glenn Morris <rgm@gnu.org>
parents:
93457
diff
changeset
|
1115 (if funcp "function" "variable") |
b5f8ef4e3358
(byte-compile-warn-obsolete): New function.
Glenn Morris <rgm@gnu.org>
parents:
93457
diff
changeset
|
1116 (if asof (concat " (as of Emacs " asof ")") "") |
b5f8ef4e3358
(byte-compile-warn-obsolete): New function.
Glenn Morris <rgm@gnu.org>
parents:
93457
diff
changeset
|
1117 (cond ((stringp instead) |
b5f8ef4e3358
(byte-compile-warn-obsolete): New function.
Glenn Morris <rgm@gnu.org>
parents:
93457
diff
changeset
|
1118 (concat "; " instead)) |
b5f8ef4e3358
(byte-compile-warn-obsolete): New function.
Glenn Morris <rgm@gnu.org>
parents:
93457
diff
changeset
|
1119 (instead |
b5f8ef4e3358
(byte-compile-warn-obsolete): New function.
Glenn Morris <rgm@gnu.org>
parents:
93457
diff
changeset
|
1120 (format "; use `%s' instead." instead)) |
b5f8ef4e3358
(byte-compile-warn-obsolete): New function.
Glenn Morris <rgm@gnu.org>
parents:
93457
diff
changeset
|
1121 (t ".")))))) |
b5f8ef4e3358
(byte-compile-warn-obsolete): New function.
Glenn Morris <rgm@gnu.org>
parents:
93457
diff
changeset
|
1122 |
922 | 1123 (defun byte-compile-report-error (error-info) |
46576 | 1124 "Report Lisp error in compilation. ERROR-INFO is the error data." |
1129 | 1125 (setq byte-compiler-error-flag t) |
46576 | 1126 (byte-compile-log-warning |
1127 (error-message-string error-info) | |
1128 nil :error)) | |
922 | 1129 |
757 | 1130 ;;; Used by make-obsolete. |
1131 (defun byte-compile-obsolete (form) | |
94355
b5f8ef4e3358
(byte-compile-warn-obsolete): New function.
Glenn Morris <rgm@gnu.org>
parents:
93457
diff
changeset
|
1132 (byte-compile-set-symbol-position (car form)) |
b5f8ef4e3358
(byte-compile-warn-obsolete): New function.
Glenn Morris <rgm@gnu.org>
parents:
93457
diff
changeset
|
1133 (byte-compile-warn-obsolete (car form)) |
b5f8ef4e3358
(byte-compile-warn-obsolete): New function.
Glenn Morris <rgm@gnu.org>
parents:
93457
diff
changeset
|
1134 (funcall (or (cadr (get (car form) 'byte-obsolete-info)) ; handler |
b5f8ef4e3358
(byte-compile-warn-obsolete): New function.
Glenn Morris <rgm@gnu.org>
parents:
93457
diff
changeset
|
1135 'byte-compile-normal-call) form)) |
757 | 1136 |
1137 ;; Compiler options | |
1138 | |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1139 ;; (defvar byte-compiler-valid-options |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1140 ;; '((optimize byte-optimize (t nil source byte) val) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1141 ;; (file-format byte-compile-compatibility (emacs18 emacs19) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1142 ;; (eq val 'emacs18)) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1143 ;; ;; (new-bytecodes byte-compile-generate-emacs19-bytecodes (t nil) val) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1144 ;; (delete-errors byte-compile-delete-errors (t nil) val) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1145 ;; (verbose byte-compile-verbose (t nil) val) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1146 ;; (warnings byte-compile-warnings ((callargs redefine free-vars unresolved)) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1147 ;; val))) |
757 | 1148 |
1149 ;; Inhibit v18/v19 selectors if the version is hardcoded. | |
28402 | 1150 ;; #### This should print a warning if the user tries to change something |
757 | 1151 ;; than can't be changed because the running compiler doesn't support it. |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1152 ;; (cond |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1153 ;; ((byte-compile-single-version) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1154 ;; (setcar (cdr (cdr (assq 'new-bytecodes byte-compiler-valid-options))) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1155 ;; (list (byte-compile-version-cond |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1156 ;; byte-compile-generate-emacs19-bytecodes))) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1157 ;; (setcar (cdr (cdr (assq 'file-format byte-compiler-valid-options))) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1158 ;; (if (byte-compile-version-cond byte-compile-compatibility) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1159 ;; '(emacs18) '(emacs19))))) |
757 | 1160 |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1161 ;; (defun byte-compiler-options-handler (&rest args) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1162 ;; (let (key val desc choices) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1163 ;; (while args |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1164 ;; (if (or (atom (car args)) (nthcdr 2 (car args)) (null (cdr (car args)))) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1165 ;; (error "Malformed byte-compiler option `%s'" (car args))) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1166 ;; (setq key (car (car args)) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1167 ;; val (car (cdr (car args))) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1168 ;; desc (assq key byte-compiler-valid-options)) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1169 ;; (or desc |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1170 ;; (error "Unknown byte-compiler option `%s'" key)) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1171 ;; (setq choices (nth 2 desc)) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1172 ;; (if (consp (car choices)) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1173 ;; (let (this |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1174 ;; (handler 'cons) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1175 ;; (ret (and (memq (car val) '(+ -)) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1176 ;; (copy-sequence (if (eq t (symbol-value (nth 1 desc))) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1177 ;; choices |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1178 ;; (symbol-value (nth 1 desc))))))) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1179 ;; (setq choices (car choices)) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1180 ;; (while val |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1181 ;; (setq this (car val)) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1182 ;; (cond ((memq this choices) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1183 ;; (setq ret (funcall handler this ret))) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1184 ;; ((eq this '+) (setq handler 'cons)) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1185 ;; ((eq this '-) (setq handler 'delq)) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1186 ;; ((error "`%s' only accepts %s" key choices))) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1187 ;; (setq val (cdr val))) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1188 ;; (set (nth 1 desc) ret)) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1189 ;; (or (memq val choices) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1190 ;; (error "`%s' must be one of `%s'" key choices)) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1191 ;; (set (nth 1 desc) (eval (nth 3 desc)))) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1192 ;; (setq args (cdr args))) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1193 ;; nil)) |
757 | 1194 |
1195 ;;; sanity-checking arglists | |
1196 | |
58073
9412413950a3
(byte-compile-defalias):
Richard M. Stallman <rms@gnu.org>
parents:
57881
diff
changeset
|
1197 ;; If a function has an entry saying (FUNCTION . t). |
9412413950a3
(byte-compile-defalias):
Richard M. Stallman <rms@gnu.org>
parents:
57881
diff
changeset
|
1198 ;; that means we know it is defined but we don't know how. |
9412413950a3
(byte-compile-defalias):
Richard M. Stallman <rms@gnu.org>
parents:
57881
diff
changeset
|
1199 ;; If a function has an entry saying (FUNCTION . nil), |
9412413950a3
(byte-compile-defalias):
Richard M. Stallman <rms@gnu.org>
parents:
57881
diff
changeset
|
1200 ;; that means treat it as not defined. |
757 | 1201 (defun byte-compile-fdefinition (name macro-p) |
1202 (let* ((list (if macro-p | |
1203 byte-compile-macro-environment | |
8086
9f6348616e4d
(byte-compile-callargs-warn): Handle function defnition
Richard M. Stallman <rms@gnu.org>
parents:
7298
diff
changeset
|
1204 byte-compile-function-environment)) |
757 | 1205 (env (cdr (assq name list)))) |
1206 (or env | |
1207 (let ((fn name)) | |
1208 (while (and (symbolp fn) | |
1209 (fboundp fn) | |
1210 (or (symbolp (symbol-function fn)) | |
1211 (consp (symbol-function fn)) | |
1212 (and (not macro-p) | |
1819
df06a60f3362
* disass.el (disassemble): Add autoload cookie for this.
Jim Blandy <jimb@redhat.com>
parents:
1604
diff
changeset
|
1213 (byte-code-function-p (symbol-function fn))))) |
757 | 1214 (setq fn (symbol-function fn))) |
1819
df06a60f3362
* disass.el (disassemble): Add autoload cookie for this.
Jim Blandy <jimb@redhat.com>
parents:
1604
diff
changeset
|
1215 (if (and (not macro-p) (byte-code-function-p fn)) |
757 | 1216 fn |
1217 (and (consp fn) | |
1218 (if (eq 'macro (car fn)) | |
1219 (cdr fn) | |
1220 (if macro-p | |
1221 nil | |
1222 (if (eq 'autoload (car fn)) | |
1223 nil | |
1224 fn))))))))) | |
1225 | |
1226 (defun byte-compile-arglist-signature (arglist) | |
1227 (let ((args 0) | |
1228 opts | |
1229 restp) | |
1230 (while arglist | |
1231 (cond ((eq (car arglist) '&optional) | |
1232 (or opts (setq opts 0))) | |
1233 ((eq (car arglist) '&rest) | |
1234 (if (cdr arglist) | |
1235 (setq restp t | |
1236 arglist nil))) | |
1237 (t | |
1238 (if opts | |
1239 (setq opts (1+ opts)) | |
1240 (setq args (1+ args))))) | |
1241 (setq arglist (cdr arglist))) | |
1242 (cons args (if restp nil (if opts (+ args opts) args))))) | |
1243 | |
1244 | |
1245 (defun byte-compile-arglist-signatures-congruent-p (old new) | |
1246 (not (or | |
1247 (> (car new) (car old)) ; requires more args now | |
14040 | 1248 (and (null (cdr old)) ; took rest-args, doesn't any more |
757 | 1249 (cdr new)) |
1250 (and (cdr new) (cdr old) ; can't take as many args now | |
1251 (< (cdr new) (cdr old))) | |
1252 ))) | |
1253 | |
1254 (defun byte-compile-arglist-signature-string (signature) | |
1255 (cond ((null (cdr signature)) | |
1256 (format "%d+" (car signature))) | |
1257 ((= (car signature) (cdr signature)) | |
1258 (format "%d" (car signature))) | |
1259 (t (format "%d-%d" (car signature) (cdr signature))))) | |
1260 | |
1261 | |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1262 ;; Warn if the form is calling a function with the wrong number of arguments. |
757 | 1263 (defun byte-compile-callargs-warn (form) |
1264 (let* ((def (or (byte-compile-fdefinition (car form) nil) | |
1265 (byte-compile-fdefinition (car form) t))) | |
58073
9412413950a3
(byte-compile-defalias):
Richard M. Stallman <rms@gnu.org>
parents:
57881
diff
changeset
|
1266 (sig (if (and def (not (eq def t))) |
29239
86949998e6fd
(byte-compile-callargs-warn): Use subr-arity to check primitives.
Dave Love <fx@gnu.org>
parents:
28441
diff
changeset
|
1267 (byte-compile-arglist-signature |
86177
fadd23918501
(byte-compile-declare-function): New function, byte-hunk-handler for
Glenn Morris <rgm@gnu.org>
parents:
86003
diff
changeset
|
1268 (if (memq (car-safe def) '(declared lambda)) |
29239
86949998e6fd
(byte-compile-callargs-warn): Use subr-arity to check primitives.
Dave Love <fx@gnu.org>
parents:
28441
diff
changeset
|
1269 (nth 1 def) |
86949998e6fd
(byte-compile-callargs-warn): Use subr-arity to check primitives.
Dave Love <fx@gnu.org>
parents:
28441
diff
changeset
|
1270 (if (byte-code-function-p def) |
86949998e6fd
(byte-compile-callargs-warn): Use subr-arity to check primitives.
Dave Love <fx@gnu.org>
parents:
28441
diff
changeset
|
1271 (aref def 0) |
86949998e6fd
(byte-compile-callargs-warn): Use subr-arity to check primitives.
Dave Love <fx@gnu.org>
parents:
28441
diff
changeset
|
1272 '(&rest def)))) |
86949998e6fd
(byte-compile-callargs-warn): Use subr-arity to check primitives.
Dave Love <fx@gnu.org>
parents:
28441
diff
changeset
|
1273 (if (and (fboundp (car form)) |
86949998e6fd
(byte-compile-callargs-warn): Use subr-arity to check primitives.
Dave Love <fx@gnu.org>
parents:
28441
diff
changeset
|
1274 (subrp (symbol-function (car form)))) |
86949998e6fd
(byte-compile-callargs-warn): Use subr-arity to check primitives.
Dave Love <fx@gnu.org>
parents:
28441
diff
changeset
|
1275 (subr-arity (symbol-function (car form)))))) |
757 | 1276 (ncall (length (cdr form)))) |
29239
86949998e6fd
(byte-compile-callargs-warn): Use subr-arity to check primitives.
Dave Love <fx@gnu.org>
parents:
28441
diff
changeset
|
1277 ;; Check many or unevalled from subr-arity. |
86949998e6fd
(byte-compile-callargs-warn): Use subr-arity to check primitives.
Dave Love <fx@gnu.org>
parents:
28441
diff
changeset
|
1278 (if (and (cdr-safe sig) |
86949998e6fd
(byte-compile-callargs-warn): Use subr-arity to check primitives.
Dave Love <fx@gnu.org>
parents:
28441
diff
changeset
|
1279 (not (numberp (cdr sig)))) |
86949998e6fd
(byte-compile-callargs-warn): Use subr-arity to check primitives.
Dave Love <fx@gnu.org>
parents:
28441
diff
changeset
|
1280 (setcdr sig nil)) |
757 | 1281 (if sig |
45558
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1282 (when (or (< ncall (car sig)) |
757 | 1283 (and (cdr sig) (> ncall (cdr sig)))) |
45558
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1284 (byte-compile-set-symbol-position (car form)) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1285 (byte-compile-warn |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1286 "%s called with %d argument%s, but %s %s" |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1287 (car form) ncall |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1288 (if (= 1 ncall) "" "s") |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1289 (if (< ncall (car sig)) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1290 "requires" |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1291 "accepts only") |
46003
503e1f14ba3d
(byte-compile-callargs-warn):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45842
diff
changeset
|
1292 (byte-compile-arglist-signature-string sig)))) |
53753
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
1293 (byte-compile-format-warn form) |
46003
503e1f14ba3d
(byte-compile-callargs-warn):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45842
diff
changeset
|
1294 ;; Check to see if the function will be available at runtime |
503e1f14ba3d
(byte-compile-callargs-warn):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45842
diff
changeset
|
1295 ;; and/or remember its arity if it's unknown. |
58073
9412413950a3
(byte-compile-defalias):
Richard M. Stallman <rms@gnu.org>
parents:
57881
diff
changeset
|
1296 (or (and (or def (fboundp (car form))) ; might be a subr or autoload. |
53753
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
1297 (not (memq (car form) byte-compile-noruntime-functions))) |
46003
503e1f14ba3d
(byte-compile-callargs-warn):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45842
diff
changeset
|
1298 (eq (car form) byte-compile-current-form) ; ## this doesn't work |
503e1f14ba3d
(byte-compile-callargs-warn):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45842
diff
changeset
|
1299 ; with recursion. |
503e1f14ba3d
(byte-compile-callargs-warn):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45842
diff
changeset
|
1300 ;; It's a currently-undefined function. |
503e1f14ba3d
(byte-compile-callargs-warn):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45842
diff
changeset
|
1301 ;; Remember number of args in call. |
503e1f14ba3d
(byte-compile-callargs-warn):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45842
diff
changeset
|
1302 (let ((cons (assq (car form) byte-compile-unresolved-functions)) |
503e1f14ba3d
(byte-compile-callargs-warn):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45842
diff
changeset
|
1303 (n (length (cdr form)))) |
503e1f14ba3d
(byte-compile-callargs-warn):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45842
diff
changeset
|
1304 (if cons |
503e1f14ba3d
(byte-compile-callargs-warn):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45842
diff
changeset
|
1305 (or (memq n (cdr cons)) |
503e1f14ba3d
(byte-compile-callargs-warn):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45842
diff
changeset
|
1306 (setcdr cons (cons n (cdr cons)))) |
58154 | 1307 (push (list (car form) n) |
1308 byte-compile-unresolved-functions)))))) | |
757 | 1309 |
53753
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
1310 (defun byte-compile-format-warn (form) |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
1311 "Warn if FORM is `format'-like with inconsistent args. |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
1312 Applies if head of FORM is a symbol with non-nil property |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
1313 `byte-compile-format-like' and first arg is a constant string. |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
1314 Then check the number of format fields matches the number of |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
1315 extra args." |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
1316 (when (and (symbolp (car form)) |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
1317 (stringp (nth 1 form)) |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
1318 (get (car form) 'byte-compile-format-like)) |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
1319 (let ((nfields (with-temp-buffer |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
1320 (insert (nth 1 form)) |
81333
fc32f1336974
(byte-compile-current-group): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81295
diff
changeset
|
1321 (goto-char (point-min)) |
53753
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
1322 (let ((n 0)) |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
1323 (while (re-search-forward "%." nil t) |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
1324 (unless (eq ?% (char-after (1+ (match-beginning 0)))) |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
1325 (setq n (1+ n)))) |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
1326 n))) |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
1327 (nargs (- (length form) 2))) |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
1328 (unless (= nargs nfields) |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
1329 (byte-compile-warn |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
1330 "`%s' called with %d args to fill %d format field(s)" (car form) |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
1331 nargs nfields))))) |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
1332 |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
1333 (dolist (elt '(format message error)) |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
1334 (put elt 'byte-compile-format-like t)) |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
1335 |
62319
150380a7c3d6
(byte-compile-nogroup-warn): New function.
Richard M. Stallman <rms@gnu.org>
parents:
61966
diff
changeset
|
1336 ;; Warn if a custom definition fails to specify :group. |
150380a7c3d6
(byte-compile-nogroup-warn): New function.
Richard M. Stallman <rms@gnu.org>
parents:
61966
diff
changeset
|
1337 (defun byte-compile-nogroup-warn (form) |
150380a7c3d6
(byte-compile-nogroup-warn): New function.
Richard M. Stallman <rms@gnu.org>
parents:
61966
diff
changeset
|
1338 (let ((keyword-args (cdr (cdr (cdr (cdr form))))) |
81427
9445d2ed7385
(byte-compile-current-group, byte-compile-nogroup-warn, byte-compile-file):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81333
diff
changeset
|
1339 (name (cadr form))) |
63939
885d1b72a2b1
(byte-compile-nogroup-warn): Don't warn when name is not constant
Richard M. Stallman <rms@gnu.org>
parents:
62885
diff
changeset
|
1340 (or (not (eq (car-safe name) 'quote)) |
81427
9445d2ed7385
(byte-compile-current-group, byte-compile-nogroup-warn, byte-compile-file):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81333
diff
changeset
|
1341 (and (eq (car form) 'custom-declare-group) |
9445d2ed7385
(byte-compile-current-group, byte-compile-nogroup-warn, byte-compile-file):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81333
diff
changeset
|
1342 (equal name ''emacs)) |
9445d2ed7385
(byte-compile-current-group, byte-compile-nogroup-warn, byte-compile-file):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81333
diff
changeset
|
1343 (plist-get keyword-args :group) |
9445d2ed7385
(byte-compile-current-group, byte-compile-nogroup-warn, byte-compile-file):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81333
diff
changeset
|
1344 (not (and (consp name) (eq (car name) 'quote))) |
9445d2ed7385
(byte-compile-current-group, byte-compile-nogroup-warn, byte-compile-file):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81333
diff
changeset
|
1345 (byte-compile-warn |
9445d2ed7385
(byte-compile-current-group, byte-compile-nogroup-warn, byte-compile-file):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81333
diff
changeset
|
1346 "%s for `%s' fails to specify containing group" |
9445d2ed7385
(byte-compile-current-group, byte-compile-nogroup-warn, byte-compile-file):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81333
diff
changeset
|
1347 (cdr (assq (car form) |
9445d2ed7385
(byte-compile-current-group, byte-compile-nogroup-warn, byte-compile-file):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81333
diff
changeset
|
1348 '((custom-declare-group . defgroup) |
9445d2ed7385
(byte-compile-current-group, byte-compile-nogroup-warn, byte-compile-file):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81333
diff
changeset
|
1349 (custom-declare-face . defface) |
9445d2ed7385
(byte-compile-current-group, byte-compile-nogroup-warn, byte-compile-file):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81333
diff
changeset
|
1350 (custom-declare-variable . defcustom)))) |
9445d2ed7385
(byte-compile-current-group, byte-compile-nogroup-warn, byte-compile-file):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81333
diff
changeset
|
1351 (cadr name))))) |
62319
150380a7c3d6
(byte-compile-nogroup-warn): New function.
Richard M. Stallman <rms@gnu.org>
parents:
61966
diff
changeset
|
1352 |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1353 ;; Warn if the function or macro is being redefined with a different |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1354 ;; number of arguments. |
757 | 1355 (defun byte-compile-arglist-warn (form macrop) |
1356 (let ((old (byte-compile-fdefinition (nth 1 form) macrop))) | |
58073
9412413950a3
(byte-compile-defalias):
Richard M. Stallman <rms@gnu.org>
parents:
57881
diff
changeset
|
1357 (if (and old (not (eq old t))) |
757 | 1358 (let ((sig1 (byte-compile-arglist-signature |
1359 (if (eq 'lambda (car-safe old)) | |
1360 (nth 1 old) | |
10235
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1361 (if (byte-code-function-p old) |
8086
9f6348616e4d
(byte-compile-callargs-warn): Handle function defnition
Richard M. Stallman <rms@gnu.org>
parents:
7298
diff
changeset
|
1362 (aref old 0) |
9f6348616e4d
(byte-compile-callargs-warn): Handle function defnition
Richard M. Stallman <rms@gnu.org>
parents:
7298
diff
changeset
|
1363 '(&rest def))))) |
757 | 1364 (sig2 (byte-compile-arglist-signature (nth 2 form)))) |
45558
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1365 (unless (byte-compile-arglist-signatures-congruent-p sig1 sig2) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1366 (byte-compile-set-symbol-position (nth 1 form)) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1367 (byte-compile-warn |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1368 "%s %s used to take %s %s, now takes %s" |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1369 (if (eq (car form) 'defun) "function" "macro") |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1370 (nth 1 form) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1371 (byte-compile-arglist-signature-string sig1) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1372 (if (equal sig1 '(1 . 1)) "argument" "arguments") |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1373 (byte-compile-arglist-signature-string sig2)))) |
757 | 1374 ;; This is the first definition. See if previous calls are compatible. |
1375 (let ((calls (assq (nth 1 form) byte-compile-unresolved-functions)) | |
1376 nums sig min max) | |
1377 (if calls | |
1378 (progn | |
1379 (setq sig (byte-compile-arglist-signature (nth 2 form)) | |
1380 nums (sort (copy-sequence (cdr calls)) (function <)) | |
1381 min (car nums) | |
1382 max (car (nreverse nums))) | |
45558
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1383 (when (or (< min (car sig)) |
757 | 1384 (and (cdr sig) (> max (cdr sig)))) |
45558
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1385 (byte-compile-set-symbol-position (nth 1 form)) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1386 (byte-compile-warn |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1387 "%s being defined to take %s%s, but was previously called with %s" |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1388 (nth 1 form) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1389 (byte-compile-arglist-signature-string sig) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1390 (if (equal sig '(1 . 1)) " arg" " args") |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1391 (byte-compile-arglist-signature-string (cons min max)))) |
40035
2b16a80692ef
Put the *Compile-Log* buffer in `compilation-mode'.
Sam Steingold <sds@gnu.org>
parents:
39852
diff
changeset
|
1392 |
757 | 1393 (setq byte-compile-unresolved-functions |
1394 (delq calls byte-compile-unresolved-functions))))) | |
1395 ))) | |
1396 | |
46657
04d87f195cd1
(byte-compile-cl-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
46576
diff
changeset
|
1397 (defvar byte-compile-cl-functions nil |
04d87f195cd1
(byte-compile-cl-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
46576
diff
changeset
|
1398 "List of functions defined in CL.") |
04d87f195cd1
(byte-compile-cl-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
46576
diff
changeset
|
1399 |
04d87f195cd1
(byte-compile-cl-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
46576
diff
changeset
|
1400 (defun byte-compile-find-cl-functions () |
04d87f195cd1
(byte-compile-cl-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
46576
diff
changeset
|
1401 (unless byte-compile-cl-functions |
04d87f195cd1
(byte-compile-cl-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
46576
diff
changeset
|
1402 (dolist (elt load-history) |
46763
4dff8f2c0a4e
(byte-compile-find-cl-functions):
Richard M. Stallman <rms@gnu.org>
parents:
46690
diff
changeset
|
1403 (when (and (stringp (car elt)) |
81295
26b46295877f
(byte-compile-find-cl-functions): Match
Martin Rudalics <rudalics@gmx.at>
parents:
81217
diff
changeset
|
1404 (string-match |
26b46295877f
(byte-compile-find-cl-functions): Match
Martin Rudalics <rudalics@gmx.at>
parents:
81217
diff
changeset
|
1405 "^cl\\>" (file-name-nondirectory (car elt)))) |
94386
a674a09b0ac8
Johan Bockg? <bojohan at gnu.org>
Glenn Morris <rgm@gnu.org>
parents:
94355
diff
changeset
|
1406 (dolist (e (cdr elt)) |
a674a09b0ac8
Johan Bockg? <bojohan at gnu.org>
Glenn Morris <rgm@gnu.org>
parents:
94355
diff
changeset
|
1407 (when (memq (car-safe e) '(autoload defun)) |
a674a09b0ac8
Johan Bockg? <bojohan at gnu.org>
Glenn Morris <rgm@gnu.org>
parents:
94355
diff
changeset
|
1408 (push (cdr e) byte-compile-cl-functions))))))) |
46657
04d87f195cd1
(byte-compile-cl-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
46576
diff
changeset
|
1409 |
46136
79f132657570
(byte-compile-warning-types):
Richard M. Stallman <rms@gnu.org>
parents:
46050
diff
changeset
|
1410 (defun byte-compile-cl-warn (form) |
79f132657570
(byte-compile-warning-types):
Richard M. Stallman <rms@gnu.org>
parents:
46050
diff
changeset
|
1411 "Warn if FORM is a call of a function from the CL package." |
46657
04d87f195cd1
(byte-compile-cl-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
46576
diff
changeset
|
1412 (let ((func (car-safe form))) |
04d87f195cd1
(byte-compile-cl-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
46576
diff
changeset
|
1413 (if (and byte-compile-cl-functions |
04d87f195cd1
(byte-compile-cl-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
46576
diff
changeset
|
1414 (memq func byte-compile-cl-functions) |
53753
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
1415 ;; Aliases which won't have been expanded at this point. |
46136
79f132657570
(byte-compile-warning-types):
Richard M. Stallman <rms@gnu.org>
parents:
46050
diff
changeset
|
1416 ;; These aren't all aliases of subrs, so not trivial to |
79f132657570
(byte-compile-warning-types):
Richard M. Stallman <rms@gnu.org>
parents:
46050
diff
changeset
|
1417 ;; avoid hardwiring the list. |
79f132657570
(byte-compile-warning-types):
Richard M. Stallman <rms@gnu.org>
parents:
46050
diff
changeset
|
1418 (not (memq func |
46568
a9a03aa7ba8a
(byte-compile-cl-warn): Delete `values'
Richard M. Stallman <rms@gnu.org>
parents:
46536
diff
changeset
|
1419 '(cl-block-wrapper cl-block-throw |
a9a03aa7ba8a
(byte-compile-cl-warn): Delete `values'
Richard M. Stallman <rms@gnu.org>
parents:
46536
diff
changeset
|
1420 multiple-value-call nth-value |
46657
04d87f195cd1
(byte-compile-cl-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
46576
diff
changeset
|
1421 copy-seq first second rest endp cl-member |
48719
0cc3c6bc6da0
(byte-compile-eval): Handle (t . SYMBOL) elements in load-history.
Richard M. Stallman <rms@gnu.org>
parents:
48468
diff
changeset
|
1422 ;; These are included in generated code |
0cc3c6bc6da0
(byte-compile-eval): Handle (t . SYMBOL) elements in load-history.
Richard M. Stallman <rms@gnu.org>
parents:
48468
diff
changeset
|
1423 ;; that can't be called except at compile time |
0cc3c6bc6da0
(byte-compile-eval): Handle (t . SYMBOL) elements in load-history.
Richard M. Stallman <rms@gnu.org>
parents:
48468
diff
changeset
|
1424 ;; or unless cl is loaded anyway. |
0cc3c6bc6da0
(byte-compile-eval): Handle (t . SYMBOL) elements in load-history.
Richard M. Stallman <rms@gnu.org>
parents:
48468
diff
changeset
|
1425 cl-defsubst-expand cl-struct-setf-expander |
47107
747c4a00be3e
(byte-compile-log-file): Use \f.
Richard M. Stallman <rms@gnu.org>
parents:
46763
diff
changeset
|
1426 ;; These would sometimes be warned about |
747c4a00be3e
(byte-compile-log-file): Use \f.
Richard M. Stallman <rms@gnu.org>
parents:
46763
diff
changeset
|
1427 ;; but such warnings are never useful, |
747c4a00be3e
(byte-compile-log-file): Use \f.
Richard M. Stallman <rms@gnu.org>
parents:
46763
diff
changeset
|
1428 ;; so don't warn about them. |
50727
bd043e09b74c
(byte-compile-cl-warn): Avoid cl warnings
Dave Love <fx@gnu.org>
parents:
50682
diff
changeset
|
1429 macroexpand cl-macroexpand-all |
bd043e09b74c
(byte-compile-cl-warn): Avoid cl warnings
Dave Love <fx@gnu.org>
parents:
50682
diff
changeset
|
1430 cl-compiling-file))) |
bd043e09b74c
(byte-compile-cl-warn): Avoid cl warnings
Dave Love <fx@gnu.org>
parents:
50682
diff
changeset
|
1431 ;; Avoid warnings for things which are safe because they |
bd043e09b74c
(byte-compile-cl-warn): Avoid cl warnings
Dave Love <fx@gnu.org>
parents:
50682
diff
changeset
|
1432 ;; have suitable compiler macros, but those aren't |
bd043e09b74c
(byte-compile-cl-warn): Avoid cl warnings
Dave Love <fx@gnu.org>
parents:
50682
diff
changeset
|
1433 ;; expanded at this stage. There should probably be more |
bd043e09b74c
(byte-compile-cl-warn): Avoid cl warnings
Dave Love <fx@gnu.org>
parents:
50682
diff
changeset
|
1434 ;; here than caaar and friends. |
bd043e09b74c
(byte-compile-cl-warn): Avoid cl warnings
Dave Love <fx@gnu.org>
parents:
50682
diff
changeset
|
1435 (not (and (eq (get func 'byte-compile) |
bd043e09b74c
(byte-compile-cl-warn): Avoid cl warnings
Dave Love <fx@gnu.org>
parents:
50682
diff
changeset
|
1436 'cl-byte-compile-compiler-macro) |
50729
680d6365cfea
(byte-compile-cl-warn): Use `string-match'.
John Paul Wallington <jpw@pobox.com>
parents:
50727
diff
changeset
|
1437 (string-match "\\`c[ad]+r\\'" (symbol-name func))))) |
46136
79f132657570
(byte-compile-warning-types):
Richard M. Stallman <rms@gnu.org>
parents:
46050
diff
changeset
|
1438 (byte-compile-warn "Function `%s' from cl package called at runtime" |
79f132657570
(byte-compile-warning-types):
Richard M. Stallman <rms@gnu.org>
parents:
46050
diff
changeset
|
1439 func))) |
79f132657570
(byte-compile-warning-types):
Richard M. Stallman <rms@gnu.org>
parents:
46050
diff
changeset
|
1440 form) |
79f132657570
(byte-compile-warning-types):
Richard M. Stallman <rms@gnu.org>
parents:
46050
diff
changeset
|
1441 |
28295
8082575fec24
(byte-compile-warning-types, byte-compile-warnings): New warning `noruntime'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27824
diff
changeset
|
1442 (defun byte-compile-print-syms (str1 strn syms) |
45558
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1443 (when syms |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1444 (byte-compile-set-symbol-position (car syms) t)) |
39769
3bea53c3ecea
(byte-compile-display-log-head-p): New
Gerd Moellmann <gerd@gnu.org>
parents:
39657
diff
changeset
|
1445 (cond ((and (cdr syms) (not noninteractive)) |
3bea53c3ecea
(byte-compile-display-log-head-p): New
Gerd Moellmann <gerd@gnu.org>
parents:
39657
diff
changeset
|
1446 (let* ((str strn) |
3bea53c3ecea
(byte-compile-display-log-head-p): New
Gerd Moellmann <gerd@gnu.org>
parents:
39657
diff
changeset
|
1447 (L (length str)) |
3bea53c3ecea
(byte-compile-display-log-head-p): New
Gerd Moellmann <gerd@gnu.org>
parents:
39657
diff
changeset
|
1448 s) |
3bea53c3ecea
(byte-compile-display-log-head-p): New
Gerd Moellmann <gerd@gnu.org>
parents:
39657
diff
changeset
|
1449 (while syms |
3bea53c3ecea
(byte-compile-display-log-head-p): New
Gerd Moellmann <gerd@gnu.org>
parents:
39657
diff
changeset
|
1450 (setq s (symbol-name (pop syms)) |
3bea53c3ecea
(byte-compile-display-log-head-p): New
Gerd Moellmann <gerd@gnu.org>
parents:
39657
diff
changeset
|
1451 L (+ L (length s) 2)) |
3bea53c3ecea
(byte-compile-display-log-head-p): New
Gerd Moellmann <gerd@gnu.org>
parents:
39657
diff
changeset
|
1452 (if (< L (1- fill-column)) |
3bea53c3ecea
(byte-compile-display-log-head-p): New
Gerd Moellmann <gerd@gnu.org>
parents:
39657
diff
changeset
|
1453 (setq str (concat str " " s (and syms ","))) |
3bea53c3ecea
(byte-compile-display-log-head-p): New
Gerd Moellmann <gerd@gnu.org>
parents:
39657
diff
changeset
|
1454 (setq str (concat str "\n " s (and syms ",")) |
3bea53c3ecea
(byte-compile-display-log-head-p): New
Gerd Moellmann <gerd@gnu.org>
parents:
39657
diff
changeset
|
1455 L (+ (length s) 4)))) |
3bea53c3ecea
(byte-compile-display-log-head-p): New
Gerd Moellmann <gerd@gnu.org>
parents:
39657
diff
changeset
|
1456 (byte-compile-warn "%s" str))) |
3bea53c3ecea
(byte-compile-display-log-head-p): New
Gerd Moellmann <gerd@gnu.org>
parents:
39657
diff
changeset
|
1457 ((cdr syms) |
40035
2b16a80692ef
Put the *Compile-Log* buffer in `compilation-mode'.
Sam Steingold <sds@gnu.org>
parents:
39852
diff
changeset
|
1458 (byte-compile-warn "%s %s" |
39769
3bea53c3ecea
(byte-compile-display-log-head-p): New
Gerd Moellmann <gerd@gnu.org>
parents:
39657
diff
changeset
|
1459 strn |
3bea53c3ecea
(byte-compile-display-log-head-p): New
Gerd Moellmann <gerd@gnu.org>
parents:
39657
diff
changeset
|
1460 (mapconcat #'symbol-name syms ", "))) |
3bea53c3ecea
(byte-compile-display-log-head-p): New
Gerd Moellmann <gerd@gnu.org>
parents:
39657
diff
changeset
|
1461 |
3bea53c3ecea
(byte-compile-display-log-head-p): New
Gerd Moellmann <gerd@gnu.org>
parents:
39657
diff
changeset
|
1462 (syms |
3bea53c3ecea
(byte-compile-display-log-head-p): New
Gerd Moellmann <gerd@gnu.org>
parents:
39657
diff
changeset
|
1463 (byte-compile-warn str1 (car syms))))) |
28295
8082575fec24
(byte-compile-warning-types, byte-compile-warnings): New warning `noruntime'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27824
diff
changeset
|
1464 |
40035
2b16a80692ef
Put the *Compile-Log* buffer in `compilation-mode'.
Sam Steingold <sds@gnu.org>
parents:
39852
diff
changeset
|
1465 ;; If we have compiled any calls to functions which are not known to be |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1466 ;; defined, issue a warning enumerating them. |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1467 ;; `unresolved' in the list `byte-compile-warnings' disables this. |
757 | 1468 (defun byte-compile-warn-about-unresolved-functions () |
85730
a1e136978a9a
(byte-compile-warnings): Document `not'.
Glenn Morris <rgm@gnu.org>
parents:
85657
diff
changeset
|
1469 (when (byte-compile-warning-enabled-p 'unresolved) |
39769
3bea53c3ecea
(byte-compile-display-log-head-p): New
Gerd Moellmann <gerd@gnu.org>
parents:
39657
diff
changeset
|
1470 (let ((byte-compile-current-form :end) |
28295
8082575fec24
(byte-compile-warning-types, byte-compile-warnings): New warning `noruntime'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27824
diff
changeset
|
1471 (noruntime nil) |
8082575fec24
(byte-compile-warning-types, byte-compile-warnings): New warning `noruntime'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27824
diff
changeset
|
1472 (unresolved nil)) |
8082575fec24
(byte-compile-warning-types, byte-compile-warnings): New warning `noruntime'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27824
diff
changeset
|
1473 ;; Separate the functions that will not be available at runtime |
8082575fec24
(byte-compile-warning-types, byte-compile-warnings): New warning `noruntime'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27824
diff
changeset
|
1474 ;; from the truly unresolved ones. |
8082575fec24
(byte-compile-warning-types, byte-compile-warnings): New warning `noruntime'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27824
diff
changeset
|
1475 (dolist (f byte-compile-unresolved-functions) |
8082575fec24
(byte-compile-warning-types, byte-compile-warnings): New warning `noruntime'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27824
diff
changeset
|
1476 (setq f (car f)) |
8082575fec24
(byte-compile-warning-types, byte-compile-warnings): New warning `noruntime'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27824
diff
changeset
|
1477 (if (fboundp f) (push f noruntime) (push f unresolved))) |
8082575fec24
(byte-compile-warning-types, byte-compile-warnings): New warning `noruntime'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27824
diff
changeset
|
1478 ;; Complain about the no-run-time functions |
8082575fec24
(byte-compile-warning-types, byte-compile-warnings): New warning `noruntime'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27824
diff
changeset
|
1479 (byte-compile-print-syms |
39769
3bea53c3ecea
(byte-compile-display-log-head-p): New
Gerd Moellmann <gerd@gnu.org>
parents:
39657
diff
changeset
|
1480 "the function `%s' might not be defined at runtime." |
3bea53c3ecea
(byte-compile-display-log-head-p): New
Gerd Moellmann <gerd@gnu.org>
parents:
39657
diff
changeset
|
1481 "the following functions might not be defined at runtime:" |
28295
8082575fec24
(byte-compile-warning-types, byte-compile-warnings): New warning `noruntime'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27824
diff
changeset
|
1482 noruntime) |
8082575fec24
(byte-compile-warning-types, byte-compile-warnings): New warning `noruntime'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27824
diff
changeset
|
1483 ;; Complain about the unresolved functions |
8082575fec24
(byte-compile-warning-types, byte-compile-warnings): New warning `noruntime'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27824
diff
changeset
|
1484 (byte-compile-print-syms |
39769
3bea53c3ecea
(byte-compile-display-log-head-p): New
Gerd Moellmann <gerd@gnu.org>
parents:
39657
diff
changeset
|
1485 "the function `%s' is not known to be defined." |
3bea53c3ecea
(byte-compile-display-log-head-p): New
Gerd Moellmann <gerd@gnu.org>
parents:
39657
diff
changeset
|
1486 "the following functions are not known to be defined:" |
28295
8082575fec24
(byte-compile-warning-types, byte-compile-warnings): New warning `noruntime'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27824
diff
changeset
|
1487 unresolved))) |
757 | 1488 nil) |
1489 | |
1490 | |
50618
ebecc2b80af6
(byte-compile-const-symbol-p): Rename arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50573
diff
changeset
|
1491 (defsubst byte-compile-const-symbol-p (symbol &optional any-value) |
50570
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
1492 "Non-nil if SYMBOL is constant. |
50618
ebecc2b80af6
(byte-compile-const-symbol-p): Rename arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50573
diff
changeset
|
1493 If ANY-VALUE is nil, only return non-nil if the value of the symbol is the |
50570
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
1494 symbol itself." |
27824 | 1495 (or (memq symbol '(nil t)) |
50570
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
1496 (keywordp symbol) |
50618
ebecc2b80af6
(byte-compile-const-symbol-p): Rename arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50573
diff
changeset
|
1497 (if any-value (memq symbol byte-compile-const-variables)))) |
27824 | 1498 |
757 | 1499 (defmacro byte-compile-constp (form) |
28402 | 1500 "Return non-nil if FORM is a constant." |
27824 | 1501 `(cond ((consp ,form) (eq (car ,form) 'quote)) |
1502 ((not (symbolp ,form))) | |
1503 ((byte-compile-const-symbol-p ,form)))) | |
757 | 1504 |
1505 (defmacro byte-compile-close-variables (&rest body) | |
1506 (cons 'let | |
1507 (cons '(;; | |
1508 ;; Close over these variables to encapsulate the | |
1509 ;; compilation state | |
1510 ;; | |
1511 (byte-compile-macro-environment | |
1512 ;; Copy it because the compiler may patch into the | |
1513 ;; macroenvironment. | |
1514 (copy-alist byte-compile-initial-macro-environment)) | |
1515 (byte-compile-function-environment nil) | |
1516 (byte-compile-bound-variables nil) | |
50570
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
1517 (byte-compile-const-variables nil) |
757 | 1518 (byte-compile-free-references nil) |
1519 (byte-compile-free-assignments nil) | |
1520 ;; | |
1521 ;; Close over these variables so that `byte-compiler-options' | |
1522 ;; can change them on a per-file basis. | |
1523 ;; | |
1524 (byte-compile-verbose byte-compile-verbose) | |
1525 (byte-optimize byte-optimize) | |
10235
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1526 (byte-compile-compatibility byte-compile-compatibility) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1527 (byte-compile-dynamic byte-compile-dynamic) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1528 (byte-compile-dynamic-docstrings |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1529 byte-compile-dynamic-docstrings) |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1530 ;; (byte-compile-generate-emacs19-bytecodes |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1531 ;; byte-compile-generate-emacs19-bytecodes) |
85730
a1e136978a9a
(byte-compile-warnings): Document `not'.
Glenn Morris <rgm@gnu.org>
parents:
85657
diff
changeset
|
1532 (byte-compile-warnings byte-compile-warnings) |
757 | 1533 ) |
1534 body))) | |
1535 | |
1536 (defmacro displaying-byte-compile-warnings (&rest body) | |
47110
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1537 `(let* ((--displaying-byte-compile-warnings-fn (lambda () ,@body)) |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1538 (warning-series-started |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1539 (and (markerp warning-series) |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1540 (eq (marker-buffer warning-series) |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1541 (get-buffer "*Compile-Log*"))))) |
46657
04d87f195cd1
(byte-compile-cl-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
46576
diff
changeset
|
1542 (byte-compile-find-cl-functions) |
47110
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1543 (if (or (eq warning-series 'byte-compile-warning-series) |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1544 warning-series-started) |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1545 ;; warning-series does come from compilation, |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1546 ;; so don't bind it, but maybe do set it. |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1547 (let (tem) |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1548 ;; Log the file name. Record position of that text. |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1549 (setq tem (byte-compile-log-file)) |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1550 (unless warning-series-started |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1551 (setq warning-series (or tem 'byte-compile-warning-series))) |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1552 (if byte-compile-debug |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1553 (funcall --displaying-byte-compile-warnings-fn) |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1554 (condition-case error-info |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1555 (funcall --displaying-byte-compile-warnings-fn) |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1556 (error (byte-compile-report-error error-info))))) |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1557 ;; warning-series does not come from compilation, so bind it. |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1558 (let ((warning-series |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1559 ;; Log the file name. Record position of that text. |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1560 (or (byte-compile-log-file) 'byte-compile-warning-series))) |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1561 (if byte-compile-debug |
46576 | 1562 (funcall --displaying-byte-compile-warnings-fn) |
47110
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1563 (condition-case error-info |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1564 (funcall --displaying-byte-compile-warnings-fn) |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1565 (error (byte-compile-report-error error-info)))))))) |
757 | 1566 |
819
5bbabfcef929
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
784
diff
changeset
|
1567 ;;;###autoload |
13338
0f082123d484
(byte-recompile-directory): New arg FORCE.
Richard M. Stallman <rms@gnu.org>
parents:
13138
diff
changeset
|
1568 (defun byte-force-recompile (directory) |
0f082123d484
(byte-recompile-directory): New arg FORCE.
Richard M. Stallman <rms@gnu.org>
parents:
13138
diff
changeset
|
1569 "Recompile every `.el' file in DIRECTORY that already has a `.elc' file. |
0f082123d484
(byte-recompile-directory): New arg FORCE.
Richard M. Stallman <rms@gnu.org>
parents:
13138
diff
changeset
|
1570 Files in subdirectories of DIRECTORY are processed also." |
13474
3e7f6fdc234d
(byte-compile-associative): Do operations left to right.
Richard M. Stallman <rms@gnu.org>
parents:
13403
diff
changeset
|
1571 (interactive "DByte force recompile (directory): ") |
13338
0f082123d484
(byte-recompile-directory): New arg FORCE.
Richard M. Stallman <rms@gnu.org>
parents:
13138
diff
changeset
|
1572 (byte-recompile-directory directory nil t)) |
0f082123d484
(byte-recompile-directory): New arg FORCE.
Richard M. Stallman <rms@gnu.org>
parents:
13138
diff
changeset
|
1573 |
92388 | 1574 ;; The `bytecomp-' prefix is applied to all local variables with |
1575 ;; otherwise common names in this and similar functions for the sake | |
1576 ;; of the boundp test in byte-compile-variable-ref. | |
1577 ;; http://lists.gnu.org/archive/html/emacs-devel/2008-01/msg00237.html | |
1578 ;; http://lists.gnu.org/archive/html/bug-gnu-emacs/2008-02/msg00134.html | |
13338
0f082123d484
(byte-recompile-directory): New arg FORCE.
Richard M. Stallman <rms@gnu.org>
parents:
13138
diff
changeset
|
1579 ;;;###autoload |
92388 | 1580 (defun byte-recompile-directory (bytecomp-directory &optional bytecomp-arg |
1581 bytecomp-force) | |
1582 "Recompile every `.el' file in BYTECOMP-DIRECTORY that needs recompilation. | |
757 | 1583 This is if a `.elc' file exists but is older than the `.el' file. |
92388 | 1584 Files in subdirectories of BYTECOMP-DIRECTORY are processed also. |
757 | 1585 |
45842
288c321d3282
(byte-recompile-directory): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
45572
diff
changeset
|
1586 If the `.elc' file does not exist, normally this function *does not* |
92388 | 1587 compile the corresponding `.el' file. However, if the prefix argument |
1588 BYTECOMP-ARG is 0, that means do compile all those files. A nonzero | |
1589 BYTECOMP-ARG means ask the user, for each such `.el' file, whether to | |
1590 compile it. A nonzero BYTECOMP-ARG also means ask about each subdirectory | |
1591 before scanning it. | |
1592 | |
1593 If the third argument BYTECOMP-FORCE is non-nil, recompile every `.el' file | |
1594 that already has a `.elc' file." | |
757 | 1595 (interactive "DByte recompile directory: \nP") |
92388 | 1596 (if bytecomp-arg |
1597 (setq bytecomp-arg (prefix-numeric-value bytecomp-arg))) | |
3653
974055b516d9
* bytecomp.el: Bring it up to version 2.10 of the
Jim Blandy <jimb@redhat.com>
parents:
3591
diff
changeset
|
1598 (if noninteractive |
974055b516d9
* bytecomp.el: Bring it up to version 2.10 of the
Jim Blandy <jimb@redhat.com>
parents:
3591
diff
changeset
|
1599 nil |
974055b516d9
* bytecomp.el: Bring it up to version 2.10 of the
Jim Blandy <jimb@redhat.com>
parents:
3591
diff
changeset
|
1600 (save-some-buffers) |
11590
97a90e900ce7
(byte-recompile-directory): Use force-mode-line-update.
Karl Heuer <kwzh@gnu.org>
parents:
11432
diff
changeset
|
1601 (force-mode-line-update)) |
78613
340dd924a553
(byte-compile-log-file, byte-recompile-directory, byte-compile-file)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78217
diff
changeset
|
1602 (with-current-buffer (get-buffer-create "*Compile-Log*") |
92388 | 1603 (setq default-directory (expand-file-name bytecomp-directory)) |
50639
c3ba923eb0e9
(byte-compile-log-file, (byte-recompile-directory): Don't use
Richard M. Stallman <rms@gnu.org>
parents:
50618
diff
changeset
|
1604 ;; compilation-mode copies value of default-directory. |
c3ba923eb0e9
(byte-compile-log-file, (byte-recompile-directory): Don't use
Richard M. Stallman <rms@gnu.org>
parents:
50618
diff
changeset
|
1605 (unless (eq major-mode 'compilation-mode) |
c3ba923eb0e9
(byte-compile-log-file, (byte-recompile-directory): Don't use
Richard M. Stallman <rms@gnu.org>
parents:
50618
diff
changeset
|
1606 (compilation-mode)) |
92388 | 1607 (let ((bytecomp-directories (list default-directory)) |
47332
96475604480c
(byte-recompile-directory): Set and then bind default-directory.
Richard M. Stallman <rms@gnu.org>
parents:
47318
diff
changeset
|
1608 (default-directory default-directory) |
96475604480c
(byte-recompile-directory): Set and then bind default-directory.
Richard M. Stallman <rms@gnu.org>
parents:
47318
diff
changeset
|
1609 (skip-count 0) |
96475604480c
(byte-recompile-directory): Set and then bind default-directory.
Richard M. Stallman <rms@gnu.org>
parents:
47318
diff
changeset
|
1610 (fail-count 0) |
96475604480c
(byte-recompile-directory): Set and then bind default-directory.
Richard M. Stallman <rms@gnu.org>
parents:
47318
diff
changeset
|
1611 (file-count 0) |
96475604480c
(byte-recompile-directory): Set and then bind default-directory.
Richard M. Stallman <rms@gnu.org>
parents:
47318
diff
changeset
|
1612 (dir-count 0) |
96475604480c
(byte-recompile-directory): Set and then bind default-directory.
Richard M. Stallman <rms@gnu.org>
parents:
47318
diff
changeset
|
1613 last-dir) |
96475604480c
(byte-recompile-directory): Set and then bind default-directory.
Richard M. Stallman <rms@gnu.org>
parents:
47318
diff
changeset
|
1614 (displaying-byte-compile-warnings |
92388 | 1615 (while bytecomp-directories |
1616 (setq bytecomp-directory (car bytecomp-directories)) | |
1617 (message "Checking %s..." bytecomp-directory) | |
1618 (let ((bytecomp-files (directory-files bytecomp-directory)) | |
1619 bytecomp-source bytecomp-dest) | |
1620 (dolist (bytecomp-file bytecomp-files) | |
1621 (setq bytecomp-source | |
1622 (expand-file-name bytecomp-file bytecomp-directory)) | |
1623 (if (and (not (member bytecomp-file '("RCS" "CVS"))) | |
1624 (not (eq ?\. (aref bytecomp-file 0))) | |
1625 (file-directory-p bytecomp-source) | |
1626 (not (file-symlink-p bytecomp-source))) | |
47332
96475604480c
(byte-recompile-directory): Set and then bind default-directory.
Richard M. Stallman <rms@gnu.org>
parents:
47318
diff
changeset
|
1627 ;; This file is a subdirectory. Handle them differently. |
92388 | 1628 (when (or (null bytecomp-arg) |
1629 (eq 0 bytecomp-arg) | |
1630 (y-or-n-p (concat "Check " bytecomp-source "? "))) | |
1631 (setq bytecomp-directories | |
1632 (nconc bytecomp-directories (list bytecomp-source)))) | |
47332
96475604480c
(byte-recompile-directory): Set and then bind default-directory.
Richard M. Stallman <rms@gnu.org>
parents:
47318
diff
changeset
|
1633 ;; It is an ordinary file. Decide whether to compile it. |
92388 | 1634 (if (and (string-match emacs-lisp-file-regexp bytecomp-source) |
1635 (file-readable-p bytecomp-source) | |
1636 (not (auto-save-file-name-p bytecomp-source)) | |
1637 (setq bytecomp-dest | |
1638 (byte-compile-dest-file bytecomp-source)) | |
1639 (if (file-exists-p bytecomp-dest) | |
47332
96475604480c
(byte-recompile-directory): Set and then bind default-directory.
Richard M. Stallman <rms@gnu.org>
parents:
47318
diff
changeset
|
1640 ;; File was already compiled. |
92388 | 1641 (or bytecomp-force |
1642 (file-newer-than-file-p bytecomp-source | |
1643 bytecomp-dest)) | |
47332
96475604480c
(byte-recompile-directory): Set and then bind default-directory.
Richard M. Stallman <rms@gnu.org>
parents:
47318
diff
changeset
|
1644 ;; No compiled file exists yet. |
92388 | 1645 (and bytecomp-arg |
1646 (or (eq 0 bytecomp-arg) | |
1647 (y-or-n-p (concat "Compile " | |
1648 bytecomp-source "? ")))))) | |
47332
96475604480c
(byte-recompile-directory): Set and then bind default-directory.
Richard M. Stallman <rms@gnu.org>
parents:
47318
diff
changeset
|
1649 (progn (if (and noninteractive (not byte-compile-verbose)) |
92388 | 1650 (message "Compiling %s..." bytecomp-source)) |
1651 (let ((bytecomp-res (byte-compile-file | |
1652 bytecomp-source))) | |
1653 (cond ((eq bytecomp-res 'no-byte-compile) | |
47332
96475604480c
(byte-recompile-directory): Set and then bind default-directory.
Richard M. Stallman <rms@gnu.org>
parents:
47318
diff
changeset
|
1654 (setq skip-count (1+ skip-count))) |
92388 | 1655 ((eq bytecomp-res t) |
47332
96475604480c
(byte-recompile-directory): Set and then bind default-directory.
Richard M. Stallman <rms@gnu.org>
parents:
47318
diff
changeset
|
1656 (setq file-count (1+ file-count))) |
92388 | 1657 ((eq bytecomp-res nil) |
47332
96475604480c
(byte-recompile-directory): Set and then bind default-directory.
Richard M. Stallman <rms@gnu.org>
parents:
47318
diff
changeset
|
1658 (setq fail-count (1+ fail-count))))) |
96475604480c
(byte-recompile-directory): Set and then bind default-directory.
Richard M. Stallman <rms@gnu.org>
parents:
47318
diff
changeset
|
1659 (or noninteractive |
92388 | 1660 (message "Checking %s..." bytecomp-directory)) |
1661 (if (not (eq last-dir bytecomp-directory)) | |
1662 (setq last-dir bytecomp-directory | |
47332
96475604480c
(byte-recompile-directory): Set and then bind default-directory.
Richard M. Stallman <rms@gnu.org>
parents:
47318
diff
changeset
|
1663 dir-count (1+ dir-count))) |
96475604480c
(byte-recompile-directory): Set and then bind default-directory.
Richard M. Stallman <rms@gnu.org>
parents:
47318
diff
changeset
|
1664 ))))) |
92388 | 1665 (setq bytecomp-directories (cdr bytecomp-directories)))) |
47332
96475604480c
(byte-recompile-directory): Set and then bind default-directory.
Richard M. Stallman <rms@gnu.org>
parents:
47318
diff
changeset
|
1666 (message "Done (Total of %d file%s compiled%s%s%s)" |
96475604480c
(byte-recompile-directory): Set and then bind default-directory.
Richard M. Stallman <rms@gnu.org>
parents:
47318
diff
changeset
|
1667 file-count (if (= file-count 1) "" "s") |
96475604480c
(byte-recompile-directory): Set and then bind default-directory.
Richard M. Stallman <rms@gnu.org>
parents:
47318
diff
changeset
|
1668 (if (> fail-count 0) (format ", %d failed" fail-count) "") |
96475604480c
(byte-recompile-directory): Set and then bind default-directory.
Richard M. Stallman <rms@gnu.org>
parents:
47318
diff
changeset
|
1669 (if (> skip-count 0) (format ", %d skipped" skip-count) "") |
92388 | 1670 (if (> dir-count 1) |
1671 (format " in %d directories" dir-count) ""))))) | |
757 | 1672 |
41176
2d63191afacd
(byte-compile-call-tree, byte-code-vector)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40451
diff
changeset
|
1673 (defvar no-byte-compile nil |
2d63191afacd
(byte-compile-call-tree, byte-code-vector)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40451
diff
changeset
|
1674 "Non-nil to prevent byte-compiling of emacs-lisp code. |
2d63191afacd
(byte-compile-call-tree, byte-code-vector)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40451
diff
changeset
|
1675 This is normally set in local file variables at the end of the elisp file: |
2d63191afacd
(byte-compile-call-tree, byte-code-vector)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40451
diff
changeset
|
1676 |
2d63191afacd
(byte-compile-call-tree, byte-code-vector)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40451
diff
changeset
|
1677 ;; Local Variables:\n;; no-byte-compile: t\n;; End: ") |
70590
63b772bfba93
Move `safe-local-variable' declarations to the respective files.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
69937
diff
changeset
|
1678 ;;;###autoload(put 'no-byte-compile 'safe-local-variable 'booleanp) |
41176
2d63191afacd
(byte-compile-call-tree, byte-code-vector)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40451
diff
changeset
|
1679 |
819
5bbabfcef929
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
784
diff
changeset
|
1680 ;;;###autoload |
92388 | 1681 (defun byte-compile-file (bytecomp-filename &optional load) |
1682 "Compile a file of Lisp code named BYTECOMP-FILENAME into a file of byte code. | |
1683 The output file's name is generated by passing BYTECOMP-FILENAME to the | |
94392 | 1684 function `byte-compile-dest-file' (which see). |
39561
0881eab13b7a
(byte-recompile-directory): Make sure the file is readable.
Gerd Moellmann <gerd@gnu.org>
parents:
38895
diff
changeset
|
1685 With prefix arg (noninteractively: 2nd arg), LOAD the file after compiling. |
40451
9c7e47dd60be
(byte-recompile-directory): Report numbers of files skipped and failed too.
Sam Steingold <sds@gnu.org>
parents:
40035
diff
changeset
|
1686 The value is non-nil if there were no errors, nil if errors." |
757 | 1687 ;; (interactive "fByte compile file: \nP") |
1688 (interactive | |
92388 | 1689 (let ((bytecomp-file buffer-file-name) |
1690 (bytecomp-file-name nil) | |
1691 (bytecomp-file-dir nil)) | |
1692 (and bytecomp-file | |
757 | 1693 (eq (cdr (assq 'major-mode (buffer-local-variables))) |
1694 'emacs-lisp-mode) | |
92388 | 1695 (setq bytecomp-file-name (file-name-nondirectory bytecomp-file) |
1696 bytecomp-file-dir (file-name-directory bytecomp-file))) | |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1697 (list (read-file-name (if current-prefix-arg |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1698 "Byte compile and load file: " |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1699 "Byte compile file: ") |
92388 | 1700 bytecomp-file-dir bytecomp-file-name nil) |
819
5bbabfcef929
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
784
diff
changeset
|
1701 current-prefix-arg))) |
757 | 1702 ;; Expand now so we get the current buffer's defaults |
92388 | 1703 (setq bytecomp-filename (expand-file-name bytecomp-filename)) |
757 | 1704 |
1705 ;; If we're compiling a file that's in a buffer and is modified, offer | |
1706 ;; to save it first. | |
1707 (or noninteractive | |
92388 | 1708 (let ((b (get-file-buffer (expand-file-name bytecomp-filename)))) |
757 | 1709 (if (and b (buffer-modified-p b) |
28295
8082575fec24
(byte-compile-warning-types, byte-compile-warnings): New warning `noruntime'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27824
diff
changeset
|
1710 (y-or-n-p (format "Save buffer %s first? " (buffer-name b)))) |
78613
340dd924a553
(byte-compile-log-file, byte-recompile-directory, byte-compile-file)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78217
diff
changeset
|
1711 (with-current-buffer b (save-buffer))))) |
757 | 1712 |
47110
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1713 ;; Force logging of the file name for each file compiled. |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1714 (setq byte-compile-last-logged-file nil) |
92388 | 1715 (let ((byte-compile-current-file bytecomp-filename) |
22689
2d69ba7d76f4
(byte-compile-file): Bind set-auto-coding-for-load to t.
Richard M. Stallman <rms@gnu.org>
parents:
22578
diff
changeset
|
1716 (set-auto-coding-for-load t) |
10235
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1717 target-file input-buffer output-buffer |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1718 byte-compile-dest-file) |
92388 | 1719 (setq target-file (byte-compile-dest-file bytecomp-filename)) |
10235
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1720 (setq byte-compile-dest-file target-file) |
79488
b8e6a2408b6d
(batch-byte-recompile-directory): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
79231
diff
changeset
|
1721 (with-current-buffer |
78613
340dd924a553
(byte-compile-log-file, byte-recompile-directory, byte-compile-file)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78217
diff
changeset
|
1722 (setq input-buffer (get-buffer-create " *Compiler Input*")) |
757 | 1723 (erase-buffer) |
24576
d11ae896247c
(byte-compile-file): Clear buffer-file-coding-system. If the coding
Richard M. Stallman <rms@gnu.org>
parents:
24025
diff
changeset
|
1724 (setq buffer-file-coding-system nil) |
21725
375190ad5062
(byte-compile-file): Always read the file in multibyte mode
Richard M. Stallman <rms@gnu.org>
parents:
21542
diff
changeset
|
1725 ;; Always compile an Emacs Lisp file as multibyte |
26922
6fdf1f6c23a0
(byte-compile-bound-variables): Doc fix.
Dave Love <fx@gnu.org>
parents:
25636
diff
changeset
|
1726 ;; unless the file itself forces unibyte with -*-coding: raw-text;-*- |
21725
375190ad5062
(byte-compile-file): Always read the file in multibyte mode
Richard M. Stallman <rms@gnu.org>
parents:
21542
diff
changeset
|
1727 (set-buffer-multibyte t) |
92388 | 1728 (insert-file-contents bytecomp-filename) |
50837
1bd0d75dbaa9
(byte-compile-file): Fix comment
Kenichi Handa <handa@m17n.org>
parents:
50729
diff
changeset
|
1729 ;; Mimic the way after-insert-file-set-coding can make the |
1bd0d75dbaa9
(byte-compile-file): Fix comment
Kenichi Handa <handa@m17n.org>
parents:
50729
diff
changeset
|
1730 ;; buffer unibyte when visiting this file. |
24576
d11ae896247c
(byte-compile-file): Clear buffer-file-coding-system. If the coding
Richard M. Stallman <rms@gnu.org>
parents:
24025
diff
changeset
|
1731 (when (or (eq last-coding-system-used 'no-conversion) |
d11ae896247c
(byte-compile-file): Clear buffer-file-coding-system. If the coding
Richard M. Stallman <rms@gnu.org>
parents:
24025
diff
changeset
|
1732 (eq (coding-system-type last-coding-system-used) 5)) |
d11ae896247c
(byte-compile-file): Clear buffer-file-coding-system. If the coding
Richard M. Stallman <rms@gnu.org>
parents:
24025
diff
changeset
|
1733 ;; For coding systems no-conversion and raw-text..., |
d11ae896247c
(byte-compile-file): Clear buffer-file-coding-system. If the coding
Richard M. Stallman <rms@gnu.org>
parents:
24025
diff
changeset
|
1734 ;; edit the buffer as unibyte. |
d11ae896247c
(byte-compile-file): Clear buffer-file-coding-system. If the coding
Richard M. Stallman <rms@gnu.org>
parents:
24025
diff
changeset
|
1735 (set-buffer-multibyte nil)) |
757 | 1736 ;; Run hooks including the uncompression hook. |
1737 ;; If they change the file name, then change it for the output also. | |
92388 | 1738 (let ((buffer-file-name bytecomp-filename) |
10836
3c9b3505feef
(byte-compile-file): Bind default-major-mode to avoid randomness.
Richard M. Stallman <rms@gnu.org>
parents:
10696
diff
changeset
|
1739 (default-major-mode 'emacs-lisp-mode) |
69937
b47563345c03
(byte-compile-file): Bind enable-local-variables to :safe,
Richard M. Stallman <rms@gnu.org>
parents:
69872
diff
changeset
|
1740 ;; Ignore unsafe local variables. |
b47563345c03
(byte-compile-file): Bind enable-local-variables to :safe,
Richard M. Stallman <rms@gnu.org>
parents:
69872
diff
changeset
|
1741 ;; We only care about a few of them for our purposes. |
b47563345c03
(byte-compile-file): Bind enable-local-variables to :safe,
Richard M. Stallman <rms@gnu.org>
parents:
69872
diff
changeset
|
1742 (enable-local-variables :safe) |
10235
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1743 (enable-local-eval nil)) |
69937
b47563345c03
(byte-compile-file): Bind enable-local-variables to :safe,
Richard M. Stallman <rms@gnu.org>
parents:
69872
diff
changeset
|
1744 ;; Arg of t means don't alter enable-local-variables. |
b47563345c03
(byte-compile-file): Bind enable-local-variables to :safe,
Richard M. Stallman <rms@gnu.org>
parents:
69872
diff
changeset
|
1745 (normal-mode t) |
92388 | 1746 (setq bytecomp-filename buffer-file-name)) |
16788
ffb387a3d054
(byte-compile-file): Set default-directory in compiler input buffer.
Richard M. Stallman <rms@gnu.org>
parents:
16666
diff
changeset
|
1747 ;; Set the default directory, in case an eval-when-compile uses it. |
92388 | 1748 (setq default-directory (file-name-directory bytecomp-filename))) |
39561
0881eab13b7a
(byte-recompile-directory): Make sure the file is readable.
Gerd Moellmann <gerd@gnu.org>
parents:
38895
diff
changeset
|
1749 ;; Check if the file's local variables explicitly specify not to |
0881eab13b7a
(byte-recompile-directory): Make sure the file is readable.
Gerd Moellmann <gerd@gnu.org>
parents:
38895
diff
changeset
|
1750 ;; compile this file. |
41176
2d63191afacd
(byte-compile-call-tree, byte-code-vector)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40451
diff
changeset
|
1751 (if (with-current-buffer input-buffer no-byte-compile) |
39561
0881eab13b7a
(byte-recompile-directory): Make sure the file is readable.
Gerd Moellmann <gerd@gnu.org>
parents:
38895
diff
changeset
|
1752 (progn |
54497
acd845de0416
(byte-recompile-directory): Ignore hidden dir.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54374
diff
changeset
|
1753 ;; (message "%s not compiled because of `no-byte-compile: %s'" |
92388 | 1754 ;; (file-relative-name bytecomp-filename) |
54497
acd845de0416
(byte-recompile-directory): Ignore hidden dir.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54374
diff
changeset
|
1755 ;; (with-current-buffer input-buffer no-byte-compile)) |
acd845de0416
(byte-recompile-directory): Ignore hidden dir.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54374
diff
changeset
|
1756 (when (file-exists-p target-file) |
acd845de0416
(byte-recompile-directory): Ignore hidden dir.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54374
diff
changeset
|
1757 (message "%s deleted because of `no-byte-compile: %s'" |
acd845de0416
(byte-recompile-directory): Ignore hidden dir.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54374
diff
changeset
|
1758 (file-relative-name target-file) |
acd845de0416
(byte-recompile-directory): Ignore hidden dir.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54374
diff
changeset
|
1759 (buffer-local-value 'no-byte-compile input-buffer)) |
acd845de0416
(byte-recompile-directory): Ignore hidden dir.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54374
diff
changeset
|
1760 (condition-case nil (delete-file target-file) (error nil))) |
39657
ea9e28db82d5
(byte-compile-file): Return success when the file says no-byte-compile.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39561
diff
changeset
|
1761 ;; We successfully didn't compile this file. |
40451
9c7e47dd60be
(byte-recompile-directory): Report numbers of files skipped and failed too.
Sam Steingold <sds@gnu.org>
parents:
40035
diff
changeset
|
1762 'no-byte-compile) |
45558
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1763 (when byte-compile-verbose |
92388 | 1764 (message "Compiling %s..." bytecomp-filename)) |
39657
ea9e28db82d5
(byte-compile-file): Return success when the file says no-byte-compile.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39561
diff
changeset
|
1765 (setq byte-compiler-error-flag nil) |
ea9e28db82d5
(byte-compile-file): Return success when the file says no-byte-compile.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39561
diff
changeset
|
1766 ;; It is important that input-buffer not be current at this call, |
ea9e28db82d5
(byte-compile-file): Return success when the file says no-byte-compile.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39561
diff
changeset
|
1767 ;; so that the value of point set in input-buffer |
ea9e28db82d5
(byte-compile-file): Return success when the file says no-byte-compile.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39561
diff
changeset
|
1768 ;; within byte-compile-from-buffer lingers in that buffer. |
47344
0b6b707c1e14
(byte-compile-file): Don't switch buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47332
diff
changeset
|
1769 (setq output-buffer |
0b6b707c1e14
(byte-compile-file): Don't switch buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47332
diff
changeset
|
1770 (save-current-buffer |
92388 | 1771 (byte-compile-from-buffer input-buffer bytecomp-filename))) |
39657
ea9e28db82d5
(byte-compile-file): Return success when the file says no-byte-compile.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39561
diff
changeset
|
1772 (if byte-compiler-error-flag |
ea9e28db82d5
(byte-compile-file): Return success when the file says no-byte-compile.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39561
diff
changeset
|
1773 nil |
45558
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1774 (when byte-compile-verbose |
92388 | 1775 (message "Compiling %s...done" bytecomp-filename)) |
39657
ea9e28db82d5
(byte-compile-file): Return success when the file says no-byte-compile.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39561
diff
changeset
|
1776 (kill-buffer input-buffer) |
ea9e28db82d5
(byte-compile-file): Return success when the file says no-byte-compile.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39561
diff
changeset
|
1777 (with-current-buffer output-buffer |
ea9e28db82d5
(byte-compile-file): Return success when the file says no-byte-compile.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39561
diff
changeset
|
1778 (goto-char (point-max)) |
ea9e28db82d5
(byte-compile-file): Return success when the file says no-byte-compile.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39561
diff
changeset
|
1779 (insert "\n") ; aaah, unix. |
ea9e28db82d5
(byte-compile-file): Return success when the file says no-byte-compile.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39561
diff
changeset
|
1780 (let ((vms-stmlf-recfm t)) |
ea9e28db82d5
(byte-compile-file): Return success when the file says no-byte-compile.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39561
diff
changeset
|
1781 (if (file-writable-p target-file) |
ea9e28db82d5
(byte-compile-file): Return success when the file says no-byte-compile.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39561
diff
changeset
|
1782 ;; We must disable any code conversion here. |
ea9e28db82d5
(byte-compile-file): Return success when the file says no-byte-compile.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39561
diff
changeset
|
1783 (let ((coding-system-for-write 'no-conversion)) |
ea9e28db82d5
(byte-compile-file): Return success when the file says no-byte-compile.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39561
diff
changeset
|
1784 (if (memq system-type '(ms-dos 'windows-nt)) |
ea9e28db82d5
(byte-compile-file): Return success when the file says no-byte-compile.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39561
diff
changeset
|
1785 (setq buffer-file-type t)) |
ea9e28db82d5
(byte-compile-file): Return success when the file says no-byte-compile.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39561
diff
changeset
|
1786 (when (file-exists-p target-file) |
ea9e28db82d5
(byte-compile-file): Return success when the file says no-byte-compile.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39561
diff
changeset
|
1787 ;; Remove the target before writing it, so that any |
ea9e28db82d5
(byte-compile-file): Return success when the file says no-byte-compile.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39561
diff
changeset
|
1788 ;; hard-links continue to point to the old file (this makes |
ea9e28db82d5
(byte-compile-file): Return success when the file says no-byte-compile.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39561
diff
changeset
|
1789 ;; it possible for installed files to share disk space with |
ea9e28db82d5
(byte-compile-file): Return success when the file says no-byte-compile.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39561
diff
changeset
|
1790 ;; the build tree, without causing problems when emacs-lisp |
ea9e28db82d5
(byte-compile-file): Return success when the file says no-byte-compile.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39561
diff
changeset
|
1791 ;; files in the build tree are recompiled). |
ea9e28db82d5
(byte-compile-file): Return success when the file says no-byte-compile.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39561
diff
changeset
|
1792 (delete-file target-file)) |
46003
503e1f14ba3d
(byte-compile-callargs-warn):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45842
diff
changeset
|
1793 (write-region (point-min) (point-max) target-file)) |
39657
ea9e28db82d5
(byte-compile-file): Return success when the file says no-byte-compile.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39561
diff
changeset
|
1794 ;; This is just to give a better error message than write-region |
ea9e28db82d5
(byte-compile-file): Return success when the file says no-byte-compile.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39561
diff
changeset
|
1795 (signal 'file-error |
ea9e28db82d5
(byte-compile-file): Return success when the file says no-byte-compile.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39561
diff
changeset
|
1796 (list "Opening output file" |
ea9e28db82d5
(byte-compile-file): Return success when the file says no-byte-compile.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39561
diff
changeset
|
1797 (if (file-exists-p target-file) |
ea9e28db82d5
(byte-compile-file): Return success when the file says no-byte-compile.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39561
diff
changeset
|
1798 "cannot overwrite file" |
ea9e28db82d5
(byte-compile-file): Return success when the file says no-byte-compile.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39561
diff
changeset
|
1799 "directory not writable or nonexistent") |
ea9e28db82d5
(byte-compile-file): Return success when the file says no-byte-compile.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39561
diff
changeset
|
1800 target-file)))) |
ea9e28db82d5
(byte-compile-file): Return success when the file says no-byte-compile.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39561
diff
changeset
|
1801 (kill-buffer (current-buffer))) |
ea9e28db82d5
(byte-compile-file): Return success when the file says no-byte-compile.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39561
diff
changeset
|
1802 (if (and byte-compile-generate-call-tree |
ea9e28db82d5
(byte-compile-file): Return success when the file says no-byte-compile.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39561
diff
changeset
|
1803 (or (eq t byte-compile-generate-call-tree) |
92388 | 1804 (y-or-n-p (format "Report call tree for %s? " |
1805 bytecomp-filename)))) | |
39657
ea9e28db82d5
(byte-compile-file): Return success when the file says no-byte-compile.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39561
diff
changeset
|
1806 (save-excursion |
92388 | 1807 (display-call-tree bytecomp-filename))) |
39657
ea9e28db82d5
(byte-compile-file): Return success when the file says no-byte-compile.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39561
diff
changeset
|
1808 (if load |
ea9e28db82d5
(byte-compile-file): Return success when the file says no-byte-compile.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39561
diff
changeset
|
1809 (load target-file)) |
ea9e28db82d5
(byte-compile-file): Return success when the file says no-byte-compile.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39561
diff
changeset
|
1810 t)))) |
757 | 1811 |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1812 ;;(defun byte-compile-and-load-file (&optional filename) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1813 ;; "Compile a file of Lisp code named FILENAME into a file of byte code, |
28402 | 1814 ;;and then load it. The output file's name is made by appending \"c\" to |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1815 ;;the end of FILENAME." |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1816 ;; (interactive) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1817 ;; (if filename ; I don't get it, (interactive-p) doesn't always work |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1818 ;; (byte-compile-file filename t) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1819 ;; (let ((current-prefix-arg '(4))) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1820 ;; (call-interactively 'byte-compile-file)))) |
757 | 1821 |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1822 ;;(defun byte-compile-buffer (&optional buffer) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1823 ;; "Byte-compile and evaluate contents of BUFFER (default: the current buffer)." |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1824 ;; (interactive "bByte compile buffer: ") |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1825 ;; (setq buffer (if buffer (get-buffer buffer) (current-buffer))) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1826 ;; (message "Compiling %s..." (buffer-name buffer)) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1827 ;; (let* ((filename (or (buffer-file-name buffer) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1828 ;; (concat "#<buffer " (buffer-name buffer) ">"))) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1829 ;; (byte-compile-current-file buffer)) |
6193
74fcc9007c39
(byte-compile-insert-header): Take a filename argument.
Richard M. Stallman <rms@gnu.org>
parents:
6081
diff
changeset
|
1830 ;; (byte-compile-from-buffer buffer nil)) |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1831 ;; (message "Compiling %s...done" (buffer-name buffer)) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1832 ;; t) |
757 | 1833 |
1834 ;;; compiling a single function | |
819
5bbabfcef929
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
784
diff
changeset
|
1835 ;;;###autoload |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1836 (defun compile-defun (&optional arg) |
757 | 1837 "Compile and evaluate the current top-level form. |
53573
3a95b6e83d47
(compile-defun): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52568
diff
changeset
|
1838 Print the result in the echo area. |
757 | 1839 With argument, insert value in current buffer after the form." |
1840 (interactive "P") | |
1841 (save-excursion | |
1842 (end-of-defun) | |
1843 (beginning-of-defun) | |
1844 (let* ((byte-compile-current-file nil) | |
45558
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1845 (byte-compile-current-buffer (current-buffer)) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1846 (byte-compile-read-position (point)) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1847 (byte-compile-last-position byte-compile-read-position) |
757 | 1848 (byte-compile-last-warned-form 'nothing) |
45558
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1849 (value (eval |
46568
a9a03aa7ba8a
(byte-compile-cl-warn): Delete `values'
Richard M. Stallman <rms@gnu.org>
parents:
46536
diff
changeset
|
1850 (let ((read-with-symbol-positions (current-buffer)) |
45558
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1851 (read-symbol-positions-list nil)) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1852 (displaying-byte-compile-warnings |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1853 (byte-compile-sexp (read (current-buffer)))))))) |
757 | 1854 (cond (arg |
1855 (message "Compiling from buffer... done.") | |
1856 (prin1 value (current-buffer)) | |
1857 (insert "\n")) | |
1858 ((message "%s" (prin1-to-string value))))))) | |
1859 | |
1860 | |
6193
74fcc9007c39
(byte-compile-insert-header): Take a filename argument.
Richard M. Stallman <rms@gnu.org>
parents:
6081
diff
changeset
|
1861 (defun byte-compile-from-buffer (inbuffer &optional filename) |
74fcc9007c39
(byte-compile-insert-header): Take a filename argument.
Richard M. Stallman <rms@gnu.org>
parents:
6081
diff
changeset
|
1862 ;; Filename is used for the loading-into-Emacs-18 error message. |
10235
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1863 (let (outbuffer |
45558
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1864 (byte-compile-current-buffer inbuffer) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1865 (byte-compile-read-position nil) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1866 (byte-compile-last-position nil) |
10235
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1867 ;; Prevent truncation of flonums and lists as we read and print them |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1868 (float-output-format nil) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1869 (case-fold-search nil) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1870 (print-length nil) |
13138
2a0ef3a2ccc3
(byte-compile-from-buffer): Bind print-level.
Richard M. Stallman <rms@gnu.org>
parents:
12928
diff
changeset
|
1871 (print-level nil) |
20818
732ffd28a863
(byte-compile-from-buffer): Bind edebug-all-defs and edebug-all-forms to nil.
Richard M. Stallman <rms@gnu.org>
parents:
20779
diff
changeset
|
1872 ;; Prevent edebug from interfering when we compile |
732ffd28a863
(byte-compile-from-buffer): Bind edebug-all-defs and edebug-all-forms to nil.
Richard M. Stallman <rms@gnu.org>
parents:
20779
diff
changeset
|
1873 ;; and put the output into a file. |
45558
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1874 ;; (edebug-all-defs nil) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1875 ;; (edebug-all-forms nil) |
10235
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1876 ;; Simulate entry to byte-compile-top-level |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1877 (byte-compile-constants nil) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1878 (byte-compile-variables nil) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1879 (byte-compile-tag-number 0) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1880 (byte-compile-depth 0) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1881 (byte-compile-maxdepth 0) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1882 (byte-compile-output nil) |
45558
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1883 ;; This allows us to get the positions of symbols read; it's |
59996
aac0a33f5772
Change release version from 21.4 to 22.1 throughout.
Kim F. Storm <storm@cua.dk>
parents:
59061
diff
changeset
|
1884 ;; new in Emacs 22.1. |
45558
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1885 (read-with-symbol-positions inbuffer) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1886 (read-symbol-positions-list nil) |
10235
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1887 ;; #### This is bound in b-c-close-variables. |
85730
a1e136978a9a
(byte-compile-warnings): Document `not'.
Glenn Morris <rgm@gnu.org>
parents:
85657
diff
changeset
|
1888 ;; (byte-compile-warnings byte-compile-warnings) |
10235
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1889 ) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1890 (byte-compile-close-variables |
78613
340dd924a553
(byte-compile-log-file, byte-recompile-directory, byte-compile-file)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78217
diff
changeset
|
1891 (with-current-buffer |
340dd924a553
(byte-compile-log-file, byte-recompile-directory, byte-compile-file)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78217
diff
changeset
|
1892 (setq outbuffer (get-buffer-create " *Compiler Output*")) |
22910
5571f38cc118
(byte-compile-from-buffer): Make the output buffer multibyte.
Richard M. Stallman <rms@gnu.org>
parents:
22689
diff
changeset
|
1893 (set-buffer-multibyte t) |
10235
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1894 (erase-buffer) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1895 ;; (emacs-lisp-mode) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1896 (setq case-fold-search nil) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1897 ;; This is a kludge. Some operating systems (OS/2, DOS) need to |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1898 ;; write files containing binary information specially. |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1899 ;; Under most circumstances, such files will be in binary |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1900 ;; overwrite mode, so those OS's use that flag to guess how |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1901 ;; they should write their data. Advise them that .elc files |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1902 ;; need to be written carefully. |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1903 (setq overwrite-mode 'overwrite-mode-binary)) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1904 (displaying-byte-compile-warnings |
22136
bc8c7f59c064
(byte-compile-insert-header): Do not look for multibyte characters here.
Richard M. Stallman <rms@gnu.org>
parents:
22050
diff
changeset
|
1905 (and filename (byte-compile-insert-header filename inbuffer outbuffer)) |
78613
340dd924a553
(byte-compile-log-file, byte-recompile-directory, byte-compile-file)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78217
diff
changeset
|
1906 (with-current-buffer inbuffer |
81333
fc32f1336974
(byte-compile-current-group): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81295
diff
changeset
|
1907 (goto-char (point-min)) |
78210
964d6961bdb6
(byte-compile-from-buffer): initialise byte-compile-unresolved-functions before
Alan Mackenzie <acm@muc.de>
parents:
77119
diff
changeset
|
1908 ;; Should we always do this? When calling multiple files, it |
964d6961bdb6
(byte-compile-from-buffer): initialise byte-compile-unresolved-functions before
Alan Mackenzie <acm@muc.de>
parents:
77119
diff
changeset
|
1909 ;; would be useful to delay this warning until all have been |
964d6961bdb6
(byte-compile-from-buffer): initialise byte-compile-unresolved-functions before
Alan Mackenzie <acm@muc.de>
parents:
77119
diff
changeset
|
1910 ;; compiled. A: Yes! b-c-u-f might contain dross from a |
964d6961bdb6
(byte-compile-from-buffer): initialise byte-compile-unresolved-functions before
Alan Mackenzie <acm@muc.de>
parents:
77119
diff
changeset
|
1911 ;; previous byte-compile. |
964d6961bdb6
(byte-compile-from-buffer): initialise byte-compile-unresolved-functions before
Alan Mackenzie <acm@muc.de>
parents:
77119
diff
changeset
|
1912 (setq byte-compile-unresolved-functions nil) |
10235
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1913 |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1914 ;; Compile the forms from the input buffer. |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1915 (while (progn |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1916 (while (progn (skip-chars-forward " \t\n\^l") |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1917 (looking-at ";")) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1918 (forward-line 1)) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1919 (not (eobp))) |
45558
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1920 (setq byte-compile-read-position (point) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1921 byte-compile-last-position byte-compile-read-position) |
78631
1150fe1ceae5
(byte-compile-from-buffer): Check old-style backquotes after each `read'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78615
diff
changeset
|
1922 (let* ((old-style-backquotes nil) |
1150fe1ceae5
(byte-compile-from-buffer): Check old-style backquotes after each `read'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78615
diff
changeset
|
1923 (form (read inbuffer))) |
1150fe1ceae5
(byte-compile-from-buffer): Check old-style backquotes after each `read'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78615
diff
changeset
|
1924 ;; Warn about the use of old-style backquotes. |
1150fe1ceae5
(byte-compile-from-buffer): Check old-style backquotes after each `read'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78615
diff
changeset
|
1925 (when old-style-backquotes |
1150fe1ceae5
(byte-compile-from-buffer): Check old-style backquotes after each `read'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78615
diff
changeset
|
1926 (byte-compile-warn "!! The file uses old-style backquotes !! |
1150fe1ceae5
(byte-compile-from-buffer): Check old-style backquotes after each `read'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78615
diff
changeset
|
1927 This functionality has been obsolete for more than 10 years already |
1150fe1ceae5
(byte-compile-from-buffer): Check old-style backquotes after each `read'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78615
diff
changeset
|
1928 and will be removed soon. See (elisp)Backquote in the manual.")) |
45558
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1929 (byte-compile-file-form form))) |
10235
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1930 ;; Compile pending forms at end of file. |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1931 (byte-compile-flush-pending) |
50639
c3ba923eb0e9
(byte-compile-log-file, (byte-recompile-directory): Don't use
Richard M. Stallman <rms@gnu.org>
parents:
50618
diff
changeset
|
1932 ;; Make warnings about unresolved functions |
c3ba923eb0e9
(byte-compile-log-file, (byte-recompile-directory): Don't use
Richard M. Stallman <rms@gnu.org>
parents:
50618
diff
changeset
|
1933 ;; give the end of the file as their position. |
c3ba923eb0e9
(byte-compile-log-file, (byte-recompile-directory): Don't use
Richard M. Stallman <rms@gnu.org>
parents:
50618
diff
changeset
|
1934 (setq byte-compile-last-position (point-max)) |
78631
1150fe1ceae5
(byte-compile-from-buffer): Check old-style backquotes after each `read'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78615
diff
changeset
|
1935 (byte-compile-warn-about-unresolved-functions)) |
22136
bc8c7f59c064
(byte-compile-insert-header): Do not look for multibyte characters here.
Richard M. Stallman <rms@gnu.org>
parents:
22050
diff
changeset
|
1936 ;; Fix up the header at the front of the output |
bc8c7f59c064
(byte-compile-insert-header): Do not look for multibyte characters here.
Richard M. Stallman <rms@gnu.org>
parents:
22050
diff
changeset
|
1937 ;; if the buffer contains multibyte characters. |
bc8c7f59c064
(byte-compile-insert-header): Do not look for multibyte characters here.
Richard M. Stallman <rms@gnu.org>
parents:
22050
diff
changeset
|
1938 (and filename (byte-compile-fix-header filename inbuffer outbuffer)))) |
8446
0199ece40d91
(byte-compile-protect-from-advice): Macro deleted.
Richard M. Stallman <rms@gnu.org>
parents:
8115
diff
changeset
|
1939 outbuffer)) |
757 | 1940 |
22136
bc8c7f59c064
(byte-compile-insert-header): Do not look for multibyte characters here.
Richard M. Stallman <rms@gnu.org>
parents:
22050
diff
changeset
|
1941 (defun byte-compile-fix-header (filename inbuffer outbuffer) |
50570
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
1942 (with-current-buffer outbuffer |
22136
bc8c7f59c064
(byte-compile-insert-header): Do not look for multibyte characters here.
Richard M. Stallman <rms@gnu.org>
parents:
22050
diff
changeset
|
1943 ;; See if the buffer has any multibyte characters. |
30624
277e6060b376
(byte-compile-fix-header): Fix the way of checking the existence of
Kenichi Handa <handa@m17n.org>
parents:
29352
diff
changeset
|
1944 (when (< (point-max) (position-bytes (point-max))) |
22136
bc8c7f59c064
(byte-compile-insert-header): Do not look for multibyte characters here.
Richard M. Stallman <rms@gnu.org>
parents:
22050
diff
changeset
|
1945 (when (byte-compile-version-cond byte-compile-compatibility) |
bc8c7f59c064
(byte-compile-insert-header): Do not look for multibyte characters here.
Richard M. Stallman <rms@gnu.org>
parents:
22050
diff
changeset
|
1946 (error "Version-18 compatibility not valid with multibyte characters")) |
bc8c7f59c064
(byte-compile-insert-header): Do not look for multibyte characters here.
Richard M. Stallman <rms@gnu.org>
parents:
22050
diff
changeset
|
1947 (goto-char (point-min)) |
bc8c7f59c064
(byte-compile-insert-header): Do not look for multibyte characters here.
Richard M. Stallman <rms@gnu.org>
parents:
22050
diff
changeset
|
1948 ;; Find the comment that describes the version test. |
bc8c7f59c064
(byte-compile-insert-header): Do not look for multibyte characters here.
Richard M. Stallman <rms@gnu.org>
parents:
22050
diff
changeset
|
1949 (search-forward "\n;;; This file") |
bc8c7f59c064
(byte-compile-insert-header): Do not look for multibyte characters here.
Richard M. Stallman <rms@gnu.org>
parents:
22050
diff
changeset
|
1950 (beginning-of-line) |
bc8c7f59c064
(byte-compile-insert-header): Do not look for multibyte characters here.
Richard M. Stallman <rms@gnu.org>
parents:
22050
diff
changeset
|
1951 (narrow-to-region (point) (point-max)) |
bc8c7f59c064
(byte-compile-insert-header): Do not look for multibyte characters here.
Richard M. Stallman <rms@gnu.org>
parents:
22050
diff
changeset
|
1952 ;; Find the line of ballast semicolons. |
bc8c7f59c064
(byte-compile-insert-header): Do not look for multibyte characters here.
Richard M. Stallman <rms@gnu.org>
parents:
22050
diff
changeset
|
1953 (search-forward ";;;;;;;;;;") |
bc8c7f59c064
(byte-compile-insert-header): Do not look for multibyte characters here.
Richard M. Stallman <rms@gnu.org>
parents:
22050
diff
changeset
|
1954 (beginning-of-line) |
bc8c7f59c064
(byte-compile-insert-header): Do not look for multibyte characters here.
Richard M. Stallman <rms@gnu.org>
parents:
22050
diff
changeset
|
1955 |
bc8c7f59c064
(byte-compile-insert-header): Do not look for multibyte characters here.
Richard M. Stallman <rms@gnu.org>
parents:
22050
diff
changeset
|
1956 (narrow-to-region (point-min) (point)) |
bc8c7f59c064
(byte-compile-insert-header): Do not look for multibyte characters here.
Richard M. Stallman <rms@gnu.org>
parents:
22050
diff
changeset
|
1957 (let ((old-header-end (point)) |
bc8c7f59c064
(byte-compile-insert-header): Do not look for multibyte characters here.
Richard M. Stallman <rms@gnu.org>
parents:
22050
diff
changeset
|
1958 delta) |
bc8c7f59c064
(byte-compile-insert-header): Do not look for multibyte characters here.
Richard M. Stallman <rms@gnu.org>
parents:
22050
diff
changeset
|
1959 (goto-char (point-min)) |
bc8c7f59c064
(byte-compile-insert-header): Do not look for multibyte characters here.
Richard M. Stallman <rms@gnu.org>
parents:
22050
diff
changeset
|
1960 (delete-region (point) (progn (re-search-forward "^(") |
bc8c7f59c064
(byte-compile-insert-header): Do not look for multibyte characters here.
Richard M. Stallman <rms@gnu.org>
parents:
22050
diff
changeset
|
1961 (beginning-of-line) |
bc8c7f59c064
(byte-compile-insert-header): Do not look for multibyte characters here.
Richard M. Stallman <rms@gnu.org>
parents:
22050
diff
changeset
|
1962 (point))) |
88777 | 1963 (insert ";;; This file contains utf-8 non-ASCII characters\n" |
1964 ";;; and therefore cannot be loaded into Emacs 21 or earlier.\n") | |
1965 ;; Replace "19" or "19.29" with "22", twice. | |
22136
bc8c7f59c064
(byte-compile-insert-header): Do not look for multibyte characters here.
Richard M. Stallman <rms@gnu.org>
parents:
22050
diff
changeset
|
1966 (re-search-forward "19\\(\\.[0-9]+\\)") |
90104
a01e7a9f1659
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-14
Miles Bader <miles@gnu.org>
parents:
90103
diff
changeset
|
1967 (replace-match "23") |
22136
bc8c7f59c064
(byte-compile-insert-header): Do not look for multibyte characters here.
Richard M. Stallman <rms@gnu.org>
parents:
22050
diff
changeset
|
1968 (re-search-forward "19\\(\\.[0-9]+\\)") |
90104
a01e7a9f1659
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-14
Miles Bader <miles@gnu.org>
parents:
90103
diff
changeset
|
1969 (replace-match "23") |
22136
bc8c7f59c064
(byte-compile-insert-header): Do not look for multibyte characters here.
Richard M. Stallman <rms@gnu.org>
parents:
22050
diff
changeset
|
1970 ;; Now compensate for the change in size, |
bc8c7f59c064
(byte-compile-insert-header): Do not look for multibyte characters here.
Richard M. Stallman <rms@gnu.org>
parents:
22050
diff
changeset
|
1971 ;; to make sure all positions in the file remain valid. |
bc8c7f59c064
(byte-compile-insert-header): Do not look for multibyte characters here.
Richard M. Stallman <rms@gnu.org>
parents:
22050
diff
changeset
|
1972 (setq delta (- (point-max) old-header-end)) |
bc8c7f59c064
(byte-compile-insert-header): Do not look for multibyte characters here.
Richard M. Stallman <rms@gnu.org>
parents:
22050
diff
changeset
|
1973 (goto-char (point-max)) |
bc8c7f59c064
(byte-compile-insert-header): Do not look for multibyte characters here.
Richard M. Stallman <rms@gnu.org>
parents:
22050
diff
changeset
|
1974 (widen) |
bc8c7f59c064
(byte-compile-insert-header): Do not look for multibyte characters here.
Richard M. Stallman <rms@gnu.org>
parents:
22050
diff
changeset
|
1975 (delete-char delta))))) |
bc8c7f59c064
(byte-compile-insert-header): Do not look for multibyte characters here.
Richard M. Stallman <rms@gnu.org>
parents:
22050
diff
changeset
|
1976 |
12823
c1fcd8660aba
(byte-compile-insert-header): Use 19.29, not 19.28.90
Richard M. Stallman <rms@gnu.org>
parents:
12794
diff
changeset
|
1977 (defun byte-compile-insert-header (filename inbuffer outbuffer) |
87564
d0544447616a
(byte-compile-from-buffer): Call byte-compile-warn-about-unresolved-functions
Richard M. Stallman <rms@gnu.org>
parents:
87112
diff
changeset
|
1978 (with-current-buffer inbuffer |
d0544447616a
(byte-compile-from-buffer): Call byte-compile-warn-about-unresolved-functions
Richard M. Stallman <rms@gnu.org>
parents:
87112
diff
changeset
|
1979 (let ((dynamic-docstrings byte-compile-dynamic-docstrings) |
d0544447616a
(byte-compile-from-buffer): Call byte-compile-warn-about-unresolved-functions
Richard M. Stallman <rms@gnu.org>
parents:
87112
diff
changeset
|
1980 (dynamic byte-compile-dynamic)) |
d0544447616a
(byte-compile-from-buffer): Call byte-compile-warn-about-unresolved-functions
Richard M. Stallman <rms@gnu.org>
parents:
87112
diff
changeset
|
1981 (set-buffer outbuffer) |
d0544447616a
(byte-compile-from-buffer): Call byte-compile-warn-about-unresolved-functions
Richard M. Stallman <rms@gnu.org>
parents:
87112
diff
changeset
|
1982 (goto-char (point-min)) |
d0544447616a
(byte-compile-from-buffer): Call byte-compile-warn-about-unresolved-functions
Richard M. Stallman <rms@gnu.org>
parents:
87112
diff
changeset
|
1983 ;; The magic number of .elc files is ";ELC", or 0x3B454C43. After |
91327 | 1984 ;; that is the file-format version number (18, 19, 20, or 23) as a |
87564
d0544447616a
(byte-compile-from-buffer): Call byte-compile-warn-about-unresolved-functions
Richard M. Stallman <rms@gnu.org>
parents:
87112
diff
changeset
|
1985 ;; byte, followed by some nulls. The primary motivation for doing |
d0544447616a
(byte-compile-from-buffer): Call byte-compile-warn-about-unresolved-functions
Richard M. Stallman <rms@gnu.org>
parents:
87112
diff
changeset
|
1986 ;; this is to get some binary characters up in the first line of |
d0544447616a
(byte-compile-from-buffer): Call byte-compile-warn-about-unresolved-functions
Richard M. Stallman <rms@gnu.org>
parents:
87112
diff
changeset
|
1987 ;; the file so that `diff' will simply say "Binary files differ" |
d0544447616a
(byte-compile-from-buffer): Call byte-compile-warn-about-unresolved-functions
Richard M. Stallman <rms@gnu.org>
parents:
87112
diff
changeset
|
1988 ;; instead of actually doing a diff of two .elc files. An extra |
d0544447616a
(byte-compile-from-buffer): Call byte-compile-warn-about-unresolved-functions
Richard M. Stallman <rms@gnu.org>
parents:
87112
diff
changeset
|
1989 ;; benefit is that you can add this to /etc/magic: |
d0544447616a
(byte-compile-from-buffer): Call byte-compile-warn-about-unresolved-functions
Richard M. Stallman <rms@gnu.org>
parents:
87112
diff
changeset
|
1990 |
d0544447616a
(byte-compile-from-buffer): Call byte-compile-warn-about-unresolved-functions
Richard M. Stallman <rms@gnu.org>
parents:
87112
diff
changeset
|
1991 ;; 0 string ;ELC GNU Emacs Lisp compiled file, |
d0544447616a
(byte-compile-from-buffer): Call byte-compile-warn-about-unresolved-functions
Richard M. Stallman <rms@gnu.org>
parents:
87112
diff
changeset
|
1992 ;; >4 byte x version %d |
d0544447616a
(byte-compile-from-buffer): Call byte-compile-warn-about-unresolved-functions
Richard M. Stallman <rms@gnu.org>
parents:
87112
diff
changeset
|
1993 |
d0544447616a
(byte-compile-from-buffer): Call byte-compile-warn-about-unresolved-functions
Richard M. Stallman <rms@gnu.org>
parents:
87112
diff
changeset
|
1994 (insert |
d0544447616a
(byte-compile-from-buffer): Call byte-compile-warn-about-unresolved-functions
Richard M. Stallman <rms@gnu.org>
parents:
87112
diff
changeset
|
1995 ";ELC" |
91327 | 1996 (if (byte-compile-version-cond byte-compile-compatibility) 18 23) |
87564
d0544447616a
(byte-compile-from-buffer): Call byte-compile-warn-about-unresolved-functions
Richard M. Stallman <rms@gnu.org>
parents:
87112
diff
changeset
|
1997 "\000\000\000\n" |
d0544447616a
(byte-compile-from-buffer): Call byte-compile-warn-about-unresolved-functions
Richard M. Stallman <rms@gnu.org>
parents:
87112
diff
changeset
|
1998 ) |
d0544447616a
(byte-compile-from-buffer): Call byte-compile-warn-about-unresolved-functions
Richard M. Stallman <rms@gnu.org>
parents:
87112
diff
changeset
|
1999 (insert ";;; Compiled by " |
d0544447616a
(byte-compile-from-buffer): Call byte-compile-warn-about-unresolved-functions
Richard M. Stallman <rms@gnu.org>
parents:
87112
diff
changeset
|
2000 (or (and (boundp 'user-mail-address) user-mail-address) |
d0544447616a
(byte-compile-from-buffer): Call byte-compile-warn-about-unresolved-functions
Richard M. Stallman <rms@gnu.org>
parents:
87112
diff
changeset
|
2001 (concat (user-login-name) "@" (system-name))) |
d0544447616a
(byte-compile-from-buffer): Call byte-compile-warn-about-unresolved-functions
Richard M. Stallman <rms@gnu.org>
parents:
87112
diff
changeset
|
2002 " on " |
d0544447616a
(byte-compile-from-buffer): Call byte-compile-warn-about-unresolved-functions
Richard M. Stallman <rms@gnu.org>
parents:
87112
diff
changeset
|
2003 (current-time-string) "\n;;; from file " filename "\n") |
d0544447616a
(byte-compile-from-buffer): Call byte-compile-warn-about-unresolved-functions
Richard M. Stallman <rms@gnu.org>
parents:
87112
diff
changeset
|
2004 (insert ";;; in Emacs version " emacs-version "\n") |
d0544447616a
(byte-compile-from-buffer): Call byte-compile-warn-about-unresolved-functions
Richard M. Stallman <rms@gnu.org>
parents:
87112
diff
changeset
|
2005 (insert ";;; " |
d0544447616a
(byte-compile-from-buffer): Call byte-compile-warn-about-unresolved-functions
Richard M. Stallman <rms@gnu.org>
parents:
87112
diff
changeset
|
2006 (cond |
d0544447616a
(byte-compile-from-buffer): Call byte-compile-warn-about-unresolved-functions
Richard M. Stallman <rms@gnu.org>
parents:
87112
diff
changeset
|
2007 ((eq byte-optimize 'source) "with source-level optimization only") |
d0544447616a
(byte-compile-from-buffer): Call byte-compile-warn-about-unresolved-functions
Richard M. Stallman <rms@gnu.org>
parents:
87112
diff
changeset
|
2008 ((eq byte-optimize 'byte) "with byte-level optimization only") |
d0544447616a
(byte-compile-from-buffer): Call byte-compile-warn-about-unresolved-functions
Richard M. Stallman <rms@gnu.org>
parents:
87112
diff
changeset
|
2009 (byte-optimize "with all optimizations") |
d0544447616a
(byte-compile-from-buffer): Call byte-compile-warn-about-unresolved-functions
Richard M. Stallman <rms@gnu.org>
parents:
87112
diff
changeset
|
2010 (t "without optimization")) |
d0544447616a
(byte-compile-from-buffer): Call byte-compile-warn-about-unresolved-functions
Richard M. Stallman <rms@gnu.org>
parents:
87112
diff
changeset
|
2011 (if (byte-compile-version-cond byte-compile-compatibility) |
d0544447616a
(byte-compile-from-buffer): Call byte-compile-warn-about-unresolved-functions
Richard M. Stallman <rms@gnu.org>
parents:
87112
diff
changeset
|
2012 "; compiled with Emacs 18 compatibility.\n" |
d0544447616a
(byte-compile-from-buffer): Call byte-compile-warn-about-unresolved-functions
Richard M. Stallman <rms@gnu.org>
parents:
87112
diff
changeset
|
2013 ".\n")) |
d0544447616a
(byte-compile-from-buffer): Call byte-compile-warn-about-unresolved-functions
Richard M. Stallman <rms@gnu.org>
parents:
87112
diff
changeset
|
2014 (if dynamic |
d0544447616a
(byte-compile-from-buffer): Call byte-compile-warn-about-unresolved-functions
Richard M. Stallman <rms@gnu.org>
parents:
87112
diff
changeset
|
2015 (insert ";;; Function definitions are lazy-loaded.\n")) |
d0544447616a
(byte-compile-from-buffer): Call byte-compile-warn-about-unresolved-functions
Richard M. Stallman <rms@gnu.org>
parents:
87112
diff
changeset
|
2016 (if (not (byte-compile-version-cond byte-compile-compatibility)) |
d0544447616a
(byte-compile-from-buffer): Call byte-compile-warn-about-unresolved-functions
Richard M. Stallman <rms@gnu.org>
parents:
87112
diff
changeset
|
2017 (let (intro-string minimum-version) |
d0544447616a
(byte-compile-from-buffer): Call byte-compile-warn-about-unresolved-functions
Richard M. Stallman <rms@gnu.org>
parents:
87112
diff
changeset
|
2018 ;; Figure out which Emacs version to require, |
d0544447616a
(byte-compile-from-buffer): Call byte-compile-warn-about-unresolved-functions
Richard M. Stallman <rms@gnu.org>
parents:
87112
diff
changeset
|
2019 ;; and what comment to use to explain why. |
d0544447616a
(byte-compile-from-buffer): Call byte-compile-warn-about-unresolved-functions
Richard M. Stallman <rms@gnu.org>
parents:
87112
diff
changeset
|
2020 ;; Note that this fails to take account of whether |
d0544447616a
(byte-compile-from-buffer): Call byte-compile-warn-about-unresolved-functions
Richard M. Stallman <rms@gnu.org>
parents:
87112
diff
changeset
|
2021 ;; the buffer contains multibyte characters. We may have to |
d0544447616a
(byte-compile-from-buffer): Call byte-compile-warn-about-unresolved-functions
Richard M. Stallman <rms@gnu.org>
parents:
87112
diff
changeset
|
2022 ;; compensate at the end in byte-compile-fix-header. |
d0544447616a
(byte-compile-from-buffer): Call byte-compile-warn-about-unresolved-functions
Richard M. Stallman <rms@gnu.org>
parents:
87112
diff
changeset
|
2023 (if dynamic-docstrings |
22047
678a1ed22116
(byte-compile-from-buffer):
Richard M. Stallman <rms@gnu.org>
parents:
22015
diff
changeset
|
2024 (setq intro-string |
22136
bc8c7f59c064
(byte-compile-insert-header): Do not look for multibyte characters here.
Richard M. Stallman <rms@gnu.org>
parents:
22050
diff
changeset
|
2025 ";;; This file uses dynamic docstrings, first added in Emacs 19.29.\n" |
bc8c7f59c064
(byte-compile-insert-header): Do not look for multibyte characters here.
Richard M. Stallman <rms@gnu.org>
parents:
22050
diff
changeset
|
2026 minimum-version "19.29") |
bc8c7f59c064
(byte-compile-insert-header): Do not look for multibyte characters here.
Richard M. Stallman <rms@gnu.org>
parents:
22050
diff
changeset
|
2027 (setq intro-string |
bc8c7f59c064
(byte-compile-insert-header): Do not look for multibyte characters here.
Richard M. Stallman <rms@gnu.org>
parents:
22050
diff
changeset
|
2028 ";;; This file uses opcodes which do not exist in Emacs 18.\n" |
bc8c7f59c064
(byte-compile-insert-header): Do not look for multibyte characters here.
Richard M. Stallman <rms@gnu.org>
parents:
22050
diff
changeset
|
2029 minimum-version "19")) |
22047
678a1ed22116
(byte-compile-from-buffer):
Richard M. Stallman <rms@gnu.org>
parents:
22015
diff
changeset
|
2030 ;; Now insert the comment and the error check. |
678a1ed22116
(byte-compile-from-buffer):
Richard M. Stallman <rms@gnu.org>
parents:
22015
diff
changeset
|
2031 (insert |
22136
bc8c7f59c064
(byte-compile-insert-header): Do not look for multibyte characters here.
Richard M. Stallman <rms@gnu.org>
parents:
22050
diff
changeset
|
2032 "\n" |
22047
678a1ed22116
(byte-compile-from-buffer):
Richard M. Stallman <rms@gnu.org>
parents:
22015
diff
changeset
|
2033 intro-string |
678a1ed22116
(byte-compile-from-buffer):
Richard M. Stallman <rms@gnu.org>
parents:
22015
diff
changeset
|
2034 ;; Have to check if emacs-version is bound so that this works |
678a1ed22116
(byte-compile-from-buffer):
Richard M. Stallman <rms@gnu.org>
parents:
22015
diff
changeset
|
2035 ;; in files loaded early in loadup.el. |
22136
bc8c7f59c064
(byte-compile-insert-header): Do not look for multibyte characters here.
Richard M. Stallman <rms@gnu.org>
parents:
22050
diff
changeset
|
2036 "(if (and (boundp 'emacs-version)\n" |
22047
678a1ed22116
(byte-compile-from-buffer):
Richard M. Stallman <rms@gnu.org>
parents:
22015
diff
changeset
|
2037 ;; If there is a name at the end of emacs-version, |
678a1ed22116
(byte-compile-from-buffer):
Richard M. Stallman <rms@gnu.org>
parents:
22015
diff
changeset
|
2038 ;; don't try to check the version number. |
678a1ed22116
(byte-compile-from-buffer):
Richard M. Stallman <rms@gnu.org>
parents:
22015
diff
changeset
|
2039 "\t (< (aref emacs-version (1- (length emacs-version))) ?A)\n" |
678a1ed22116
(byte-compile-from-buffer):
Richard M. Stallman <rms@gnu.org>
parents:
22015
diff
changeset
|
2040 "\t (or (and (boundp 'epoch::version) epoch::version)\n" |
678a1ed22116
(byte-compile-from-buffer):
Richard M. Stallman <rms@gnu.org>
parents:
22015
diff
changeset
|
2041 (format "\t (string-lessp emacs-version \"%s\")))\n" |
678a1ed22116
(byte-compile-from-buffer):
Richard M. Stallman <rms@gnu.org>
parents:
22015
diff
changeset
|
2042 minimum-version) |
678a1ed22116
(byte-compile-from-buffer):
Richard M. Stallman <rms@gnu.org>
parents:
22015
diff
changeset
|
2043 " (error \"`" |
678a1ed22116
(byte-compile-from-buffer):
Richard M. Stallman <rms@gnu.org>
parents:
22015
diff
changeset
|
2044 ;; prin1-to-string is used to quote backslashes. |
678a1ed22116
(byte-compile-from-buffer):
Richard M. Stallman <rms@gnu.org>
parents:
22015
diff
changeset
|
2045 (substring (prin1-to-string (file-name-nondirectory filename)) |
678a1ed22116
(byte-compile-from-buffer):
Richard M. Stallman <rms@gnu.org>
parents:
22015
diff
changeset
|
2046 1 -1) |
678a1ed22116
(byte-compile-from-buffer):
Richard M. Stallman <rms@gnu.org>
parents:
22015
diff
changeset
|
2047 (format "' was compiled for Emacs %s or later\"))\n\n" |
22136
bc8c7f59c064
(byte-compile-insert-header): Do not look for multibyte characters here.
Richard M. Stallman <rms@gnu.org>
parents:
22050
diff
changeset
|
2048 minimum-version) |
bc8c7f59c064
(byte-compile-insert-header): Do not look for multibyte characters here.
Richard M. Stallman <rms@gnu.org>
parents:
22050
diff
changeset
|
2049 ;; Insert semicolons as ballast, so that byte-compile-fix-header |
bc8c7f59c064
(byte-compile-insert-header): Do not look for multibyte characters here.
Richard M. Stallman <rms@gnu.org>
parents:
22050
diff
changeset
|
2050 ;; can delete them so as to keep the buffer positions |
bc8c7f59c064
(byte-compile-insert-header): Do not look for multibyte characters here.
Richard M. Stallman <rms@gnu.org>
parents:
22050
diff
changeset
|
2051 ;; constant for the actual compiled code. |
88777 | 2052 ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;\n\n")) |
22047
678a1ed22116
(byte-compile-from-buffer):
Richard M. Stallman <rms@gnu.org>
parents:
22015
diff
changeset
|
2053 ;; Here if we want Emacs 18 compatibility. |
22136
bc8c7f59c064
(byte-compile-insert-header): Do not look for multibyte characters here.
Richard M. Stallman <rms@gnu.org>
parents:
22050
diff
changeset
|
2054 (when dynamic-docstrings |
bc8c7f59c064
(byte-compile-insert-header): Do not look for multibyte characters here.
Richard M. Stallman <rms@gnu.org>
parents:
22050
diff
changeset
|
2055 (error "Version-18 compatibility doesn't support dynamic doc strings")) |
bc8c7f59c064
(byte-compile-insert-header): Do not look for multibyte characters here.
Richard M. Stallman <rms@gnu.org>
parents:
22050
diff
changeset
|
2056 (when byte-compile-dynamic |
bc8c7f59c064
(byte-compile-insert-header): Do not look for multibyte characters here.
Richard M. Stallman <rms@gnu.org>
parents:
22050
diff
changeset
|
2057 (error "Version-18 compatibility doesn't support dynamic byte code")) |
12823
c1fcd8660aba
(byte-compile-insert-header): Use 19.29, not 19.28.90
Richard M. Stallman <rms@gnu.org>
parents:
12794
diff
changeset
|
2058 (insert "(or (boundp 'current-load-list) (setq current-load-list nil))\n" |
87564
d0544447616a
(byte-compile-from-buffer): Call byte-compile-warn-about-unresolved-functions
Richard M. Stallman <rms@gnu.org>
parents:
87112
diff
changeset
|
2059 "\n"))))) |
757 | 2060 |
2061 (defun byte-compile-output-file-form (form) | |
2062 ;; writes the given form to the output buffer, being careful of docstrings | |
19637
baaf02a51ba2
(byte-compile-output-file-form): Handle custom-declare-variable.
Richard M. Stallman <rms@gnu.org>
parents:
18960
diff
changeset
|
2063 ;; in defun, defmacro, defvar, defconst, autoload and |
baaf02a51ba2
(byte-compile-output-file-form): Handle custom-declare-variable.
Richard M. Stallman <rms@gnu.org>
parents:
18960
diff
changeset
|
2064 ;; custom-declare-variable because make-docfile is so amazingly stupid. |
2566
4f201a4ab030
(define-function): Changed name back to defalisaases to get things in
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2544
diff
changeset
|
2065 ;; defalias calls are output directly by byte-compile-file-form-defmumble; |
4f201a4ab030
(define-function): Changed name back to defalisaases to get things in
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2544
diff
changeset
|
2066 ;; it does not pay to first build the defalias in defmumble and then parse |
4f201a4ab030
(define-function): Changed name back to defalisaases to get things in
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2544
diff
changeset
|
2067 ;; it here. |
19637
baaf02a51ba2
(byte-compile-output-file-form): Handle custom-declare-variable.
Richard M. Stallman <rms@gnu.org>
parents:
18960
diff
changeset
|
2068 (if (and (memq (car-safe form) '(defun defmacro defvar defconst autoload |
baaf02a51ba2
(byte-compile-output-file-form): Handle custom-declare-variable.
Richard M. Stallman <rms@gnu.org>
parents:
18960
diff
changeset
|
2069 custom-declare-variable)) |
757 | 2070 (stringp (nth 3 form))) |
10235
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2071 (byte-compile-output-docform nil nil '("\n(" 3 ")") form nil |
19637
baaf02a51ba2
(byte-compile-output-file-form): Handle custom-declare-variable.
Richard M. Stallman <rms@gnu.org>
parents:
18960
diff
changeset
|
2072 (memq (car form) |
baaf02a51ba2
(byte-compile-output-file-form): Handle custom-declare-variable.
Richard M. Stallman <rms@gnu.org>
parents:
18960
diff
changeset
|
2073 '(autoload custom-declare-variable))) |
757 | 2074 (let ((print-escape-newlines t) |
12552
176c42cc7eeb
(byte-compile-output-file-form): Bind print-length
Karl Heuer <kwzh@gnu.org>
parents:
12511
diff
changeset
|
2075 (print-length nil) |
176c42cc7eeb
(byte-compile-output-file-form): Bind print-length
Karl Heuer <kwzh@gnu.org>
parents:
12511
diff
changeset
|
2076 (print-level nil) |
16159
d4b674c08fe1
(byte-compile-output-file-form): Bind print-quoted and print-gensym to t
Erik Naggum <erik@naggum.no>
parents:
16149
diff
changeset
|
2077 (print-quoted t) |
75402
122ece8ca23d
Make byte compiler correctly write circular constants
Miles Bader <miles@gnu.org>
parents:
75346
diff
changeset
|
2078 (print-gensym t) |
75489
76c18a7841bf
(byte-compile-disable-print-circle): New
Kenichi Handa <handa@m17n.org>
parents:
75402
diff
changeset
|
2079 (print-circle ; handle circular data structures |
76c18a7841bf
(byte-compile-disable-print-circle): New
Kenichi Handa <handa@m17n.org>
parents:
75402
diff
changeset
|
2080 (not byte-compile-disable-print-circle))) |
757 | 2081 (princ "\n" outbuffer) |
2082 (prin1 form outbuffer) | |
2083 nil))) | |
2084 | |
50570
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
2085 (defvar print-gensym-alist) ;Used before print-circle existed. |
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
2086 |
10235
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2087 (defun byte-compile-output-docform (preface name info form specindex quoted) |
12794
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
2088 "Print a form with a doc string. INFO is (prefix doc-index postfix). |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
2089 If PREFACE and NAME are non-nil, print them too, |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
2090 before INFO and the FORM but after the doc string itself. |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
2091 If SPECINDEX is non-nil, it is the index in FORM |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
2092 of the function bytecode string. In that case, |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
2093 we output that argument and the following argument (the constants vector) |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
2094 together, for lazy loading. |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
2095 QUOTED says that we have to put a quote before the |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
2096 list that represents a doc string reference. |
19637
baaf02a51ba2
(byte-compile-output-file-form): Handle custom-declare-variable.
Richard M. Stallman <rms@gnu.org>
parents:
18960
diff
changeset
|
2097 `autoload' and `custom-declare-variable' need that." |
12794
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
2098 ;; We need to examine byte-compile-dynamic-docstrings |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
2099 ;; in the input buffer (now current), not in the output buffer. |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
2100 (let ((dynamic-docstrings byte-compile-dynamic-docstrings)) |
82791
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2101 (with-current-buffer outbuffer |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2102 (let (position) |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2103 |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2104 ;; Insert the doc string, and make it a comment with #@LENGTH. |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2105 (and (>= (nth 1 info) 0) |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2106 dynamic-docstrings |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2107 (not byte-compile-compatibility) |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2108 (progn |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2109 ;; Make the doc string start at beginning of line |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2110 ;; for make-docfile's sake. |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2111 (insert "\n") |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2112 (setq position |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2113 (byte-compile-output-as-comment |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2114 (nth (nth 1 info) form) nil)) |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2115 (setq position (- (position-bytes position) (point-min) -1)) |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2116 ;; If the doc string starts with * (a user variable), |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2117 ;; negate POSITION. |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2118 (if (and (stringp (nth (nth 1 info) form)) |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2119 (> (length (nth (nth 1 info) form)) 0) |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2120 (eq (aref (nth (nth 1 info) form) 0) ?*)) |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2121 (setq position (- position))))) |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2122 |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2123 (if preface |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2124 (progn |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2125 (insert preface) |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2126 (prin1 name outbuffer))) |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2127 (insert (car info)) |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2128 (let ((print-escape-newlines t) |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2129 (print-quoted t) |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2130 ;; For compatibility with code before print-circle, |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2131 ;; use a cons cell to say that we want |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2132 ;; print-gensym-alist not to be cleared |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2133 ;; between calls to print functions. |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2134 (print-gensym '(t)) |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2135 (print-circle ; handle circular data structures |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2136 (not byte-compile-disable-print-circle)) |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2137 print-gensym-alist ; was used before print-circle existed. |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2138 (print-continuous-numbering t) |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2139 print-number-table |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2140 (index 0)) |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2141 (prin1 (car form) outbuffer) |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2142 (while (setq form (cdr form)) |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2143 (setq index (1+ index)) |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2144 (insert " ") |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2145 (cond ((and (numberp specindex) (= index specindex) |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2146 ;; Don't handle the definition dynamically |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2147 ;; if it refers (or might refer) |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2148 ;; to objects already output |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2149 ;; (for instance, gensyms in the arg list). |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2150 (let (non-nil) |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2151 (dotimes (i (length print-number-table)) |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2152 (if (aref print-number-table i) |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2153 (setq non-nil t))) |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2154 (not non-nil))) |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2155 ;; Output the byte code and constants specially |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2156 ;; for lazy dynamic loading. |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2157 (let ((position |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2158 (byte-compile-output-as-comment |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2159 (cons (car form) (nth 1 form)) |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2160 t))) |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2161 (setq position (- (position-bytes position) (point-min) -1)) |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2162 (princ (format "(#$ . %d) nil" position) outbuffer) |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2163 (setq form (cdr form)) |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2164 (setq index (1+ index)))) |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2165 ((= index (nth 1 info)) |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2166 (if position |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2167 (princ (format (if quoted "'(#$ . %d)" "(#$ . %d)") |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2168 position) |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2169 outbuffer) |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2170 (let ((print-escape-newlines nil)) |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2171 (goto-char (prog1 (1+ (point)) |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2172 (prin1 (car form) outbuffer))) |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2173 (insert "\\\n") |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2174 (goto-char (point-max))))) |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2175 (t |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2176 (prin1 (car form) outbuffer))))) |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2177 (insert (nth 2 info))))) |
757 | 2178 nil) |
2179 | |
2180 (defun byte-compile-keep-pending (form &optional handler) | |
2181 (if (memq byte-optimize '(t source)) | |
2182 (setq form (byte-optimize-form form t))) | |
2183 (if handler | |
2184 (let ((for-effect t)) | |
2185 ;; To avoid consing up monstrously large forms at load time, we split | |
2186 ;; the output regularly. | |
3954
cac16b165691
(byte-compile-keep-pending): Handle fset like defalias.
Richard M. Stallman <rms@gnu.org>
parents:
3948
diff
changeset
|
2187 (and (memq (car-safe form) '(fset defalias)) |
cac16b165691
(byte-compile-keep-pending): Handle fset like defalias.
Richard M. Stallman <rms@gnu.org>
parents:
3948
diff
changeset
|
2188 (nthcdr 300 byte-compile-output) |
757 | 2189 (byte-compile-flush-pending)) |
2190 (funcall handler form) | |
2191 (if for-effect | |
2192 (byte-compile-discard))) | |
2193 (byte-compile-form form t)) | |
2194 nil) | |
2195 | |
2196 (defun byte-compile-flush-pending () | |
2197 (if byte-compile-output | |
2198 (let ((form (byte-compile-out-toplevel t 'file))) | |
2199 (cond ((eq (car-safe form) 'progn) | |
29239
86949998e6fd
(byte-compile-callargs-warn): Use subr-arity to check primitives.
Dave Love <fx@gnu.org>
parents:
28441
diff
changeset
|
2200 (mapc 'byte-compile-output-file-form (cdr form))) |
757 | 2201 (form |
2202 (byte-compile-output-file-form form))) | |
2203 (setq byte-compile-constants nil | |
2204 byte-compile-variables nil | |
2205 byte-compile-depth 0 | |
2206 byte-compile-maxdepth 0 | |
2207 byte-compile-output nil)))) | |
2208 | |
2209 (defun byte-compile-file-form (form) | |
2210 (let ((byte-compile-current-form nil) ; close over this for warnings. | |
2211 handler) | |
2212 (cond | |
2213 ((not (consp form)) | |
2214 (byte-compile-keep-pending form)) | |
2215 ((and (symbolp (car form)) | |
2216 (setq handler (get (car form) 'byte-hunk-handler))) | |
2217 (cond ((setq form (funcall handler form)) | |
2218 (byte-compile-flush-pending) | |
2219 (byte-compile-output-file-form form)))) | |
2220 ((eq form (setq form (macroexpand form byte-compile-macro-environment))) | |
2221 (byte-compile-keep-pending form)) | |
2222 (t | |
2223 (byte-compile-file-form form))))) | |
2224 | |
2225 ;; Functions and variables with doc strings must be output separately, | |
2226 ;; so make-docfile can recognise them. Most other things can be output | |
2227 ;; as byte-code. | |
2228 | |
2229 (put 'defsubst 'byte-hunk-handler 'byte-compile-file-form-defsubst) | |
2230 (defun byte-compile-file-form-defsubst (form) | |
50570
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
2231 (when (assq (nth 1 form) byte-compile-unresolved-functions) |
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
2232 (setq byte-compile-current-form (nth 1 form)) |
56082
36284d653673
Put `...' around symbols in warning messages.
Richard M. Stallman <rms@gnu.org>
parents:
55694
diff
changeset
|
2233 (byte-compile-warn "defsubst `%s' was used before it was defined" |
50570
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
2234 (nth 1 form))) |
757 | 2235 (byte-compile-file-form |
2236 (macroexpand form byte-compile-macro-environment)) | |
2237 ;; Return nil so the form is not output twice. | |
2238 nil) | |
2239 | |
2240 (put 'autoload 'byte-hunk-handler 'byte-compile-file-form-autoload) | |
2241 (defun byte-compile-file-form-autoload (form) | |
2242 (and (let ((form form)) | |
2243 (while (if (setq form (cdr form)) (byte-compile-constp (car form)))) | |
2244 (null form)) ;Constants only | |
2245 (eval (nth 5 form)) ;Macro | |
2246 (eval form)) ;Define the autoload. | |
28402 | 2247 ;; Avoid undefined function warnings for the autoload. |
28441
a7b3ff772283
(byte-compile-file-form-autoload): Re-enable new code.
Gerd Moellmann <gerd@gnu.org>
parents:
28422
diff
changeset
|
2248 (if (and (consp (nth 1 form)) |
28402 | 2249 (eq (car (nth 1 form)) 'quote) |
2250 (consp (cdr (nth 1 form))) | |
2251 (symbolp (nth 1 (nth 1 form)))) | |
58154 | 2252 (push (cons (nth 1 (nth 1 form)) |
2253 (cons 'autoload (cdr (cdr form)))) | |
2254 byte-compile-function-environment)) | |
757 | 2255 (if (stringp (nth 3 form)) |
2256 form | |
2257 ;; No doc string, so we can compile this as a normal form. | |
2258 (byte-compile-keep-pending form 'byte-compile-normal-call))) | |
2259 | |
2260 (put 'defvar 'byte-hunk-handler 'byte-compile-file-form-defvar) | |
2261 (put 'defconst 'byte-hunk-handler 'byte-compile-file-form-defvar) | |
2262 (defun byte-compile-file-form-defvar (form) | |
2263 (if (null (nth 3 form)) | |
2264 ;; Since there is no doc string, we can compile this as a normal form, | |
2265 ;; and not do a file-boundary. | |
2266 (byte-compile-keep-pending form) | |
85730
a1e136978a9a
(byte-compile-warnings): Document `not'.
Glenn Morris <rgm@gnu.org>
parents:
85657
diff
changeset
|
2267 (when (byte-compile-warning-enabled-p 'free-vars) |
50573
e80e4ccf1bfc
(byte-compile-file-form-defvar, byte-compile-defvar):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50570
diff
changeset
|
2268 (push (nth 1 form) byte-compile-bound-variables) |
50570
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
2269 (if (eq (car form) 'defconst) |
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
2270 (push (nth 1 form) byte-compile-const-variables))) |
757 | 2271 (cond ((consp (nth 2 form)) |
2272 (setq form (copy-sequence form)) | |
2273 (setcar (cdr (cdr form)) | |
2274 (byte-compile-top-level (nth 2 form) nil 'file)))) | |
2275 form)) | |
2276 | |
85989
89ba7e228a5b
(byte-compile-file-form-define-abbrev-table): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85780
diff
changeset
|
2277 (put 'define-abbrev-table 'byte-hunk-handler 'byte-compile-file-form-define-abbrev-table) |
89ba7e228a5b
(byte-compile-file-form-define-abbrev-table): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85780
diff
changeset
|
2278 (defun byte-compile-file-form-define-abbrev-table (form) |
89ba7e228a5b
(byte-compile-file-form-define-abbrev-table): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85780
diff
changeset
|
2279 (when (and (byte-compile-warning-enabled-p 'free-vars) |
89ba7e228a5b
(byte-compile-file-form-define-abbrev-table): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85780
diff
changeset
|
2280 (eq 'quote (car-safe (car-safe (cdr form))))) |
89ba7e228a5b
(byte-compile-file-form-define-abbrev-table): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85780
diff
changeset
|
2281 (push (car-safe (cdr (cadr form))) byte-compile-bound-variables)) |
89ba7e228a5b
(byte-compile-file-form-define-abbrev-table): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85780
diff
changeset
|
2282 (byte-compile-keep-pending form)) |
89ba7e228a5b
(byte-compile-file-form-define-abbrev-table): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85780
diff
changeset
|
2283 |
17704
00ed998f90d3
(byte-compile-file-form-custom-declare-variable): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17077
diff
changeset
|
2284 (put 'custom-declare-variable 'byte-hunk-handler |
00ed998f90d3
(byte-compile-file-form-custom-declare-variable): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17077
diff
changeset
|
2285 'byte-compile-file-form-custom-declare-variable) |
00ed998f90d3
(byte-compile-file-form-custom-declare-variable): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17077
diff
changeset
|
2286 (defun byte-compile-file-form-custom-declare-variable (form) |
85730
a1e136978a9a
(byte-compile-warnings): Document `not'.
Glenn Morris <rgm@gnu.org>
parents:
85657
diff
changeset
|
2287 (when (byte-compile-warning-enabled-p 'callargs) |
62519
ad1a92f77517
(byte-compile-file-form-custom-declare-variable):
Richard M. Stallman <rms@gnu.org>
parents:
62319
diff
changeset
|
2288 (byte-compile-nogroup-warn form)) |
85730
a1e136978a9a
(byte-compile-warnings): Document `not'.
Glenn Morris <rgm@gnu.org>
parents:
85657
diff
changeset
|
2289 (when (byte-compile-warning-enabled-p 'free-vars) |
50570
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
2290 (push (nth 1 (nth 1 form)) byte-compile-bound-variables)) |
86336
5dde93581c8f
(byte-compile-file-form-custom-declare-variable): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86222
diff
changeset
|
2291 ;; Don't compile the expression because it may be displayed to the user. |
5dde93581c8f
(byte-compile-file-form-custom-declare-variable): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86222
diff
changeset
|
2292 ;; (when (eq (car-safe (nth 2 form)) 'quote) |
5dde93581c8f
(byte-compile-file-form-custom-declare-variable): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86222
diff
changeset
|
2293 ;; ;; (nth 2 form) is meant to evaluate to an expression, so if we have the |
5dde93581c8f
(byte-compile-file-form-custom-declare-variable): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86222
diff
changeset
|
2294 ;; ;; final value already, we can byte-compile it. |
5dde93581c8f
(byte-compile-file-form-custom-declare-variable): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86222
diff
changeset
|
2295 ;; (setcar (cdr (nth 2 form)) |
5dde93581c8f
(byte-compile-file-form-custom-declare-variable): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86222
diff
changeset
|
2296 ;; (byte-compile-top-level (cadr (nth 2 form)) nil 'file))) |
49440
3f0a84732a62
(byte-compile-file-form-custom-declare-variable):
Richard M. Stallman <rms@gnu.org>
parents:
48822
diff
changeset
|
2297 (let ((tail (nthcdr 4 form))) |
3f0a84732a62
(byte-compile-file-form-custom-declare-variable):
Richard M. Stallman <rms@gnu.org>
parents:
48822
diff
changeset
|
2298 (while tail |
86336
5dde93581c8f
(byte-compile-file-form-custom-declare-variable): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86222
diff
changeset
|
2299 (unless (keywordp (car tail)) ;No point optimizing keywords. |
5dde93581c8f
(byte-compile-file-form-custom-declare-variable): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86222
diff
changeset
|
2300 ;; Compile the keyword arguments. |
5dde93581c8f
(byte-compile-file-form-custom-declare-variable): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86222
diff
changeset
|
2301 (setcar tail (byte-compile-top-level (car tail) nil 'file))) |
49440
3f0a84732a62
(byte-compile-file-form-custom-declare-variable):
Richard M. Stallman <rms@gnu.org>
parents:
48822
diff
changeset
|
2302 (setq tail (cdr tail)))) |
17704
00ed998f90d3
(byte-compile-file-form-custom-declare-variable): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17077
diff
changeset
|
2303 form) |
00ed998f90d3
(byte-compile-file-form-custom-declare-variable): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17077
diff
changeset
|
2304 |
57518
25bf13fe1c10
(byte-compile-eval): Don't process
Richard M. Stallman <rms@gnu.org>
parents:
57004
diff
changeset
|
2305 (put 'require 'byte-hunk-handler 'byte-compile-file-form-require) |
25bf13fe1c10
(byte-compile-eval): Don't process
Richard M. Stallman <rms@gnu.org>
parents:
57004
diff
changeset
|
2306 (defun byte-compile-file-form-require (form) |
81333
fc32f1336974
(byte-compile-current-group): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81295
diff
changeset
|
2307 (let ((args (mapcar 'eval (cdr form)))) |
57518
25bf13fe1c10
(byte-compile-eval): Don't process
Richard M. Stallman <rms@gnu.org>
parents:
57004
diff
changeset
|
2308 (apply 'require args) |
59061 | 2309 ;; Detect (require 'cl) in a way that works even if cl is already loaded. |
57518
25bf13fe1c10
(byte-compile-eval): Don't process
Richard M. Stallman <rms@gnu.org>
parents:
57004
diff
changeset
|
2310 (if (member (car args) '("cl" cl)) |
85730
a1e136978a9a
(byte-compile-warnings): Document `not'.
Glenn Morris <rgm@gnu.org>
parents:
85657
diff
changeset
|
2311 (byte-compile-disable-warning 'cl-functions))) |
757 | 2312 (byte-compile-keep-pending form 'byte-compile-normal-call)) |
2313 | |
2314 (put 'progn 'byte-hunk-handler 'byte-compile-file-form-progn) | |
2315 (put 'prog1 'byte-hunk-handler 'byte-compile-file-form-progn) | |
2316 (put 'prog2 'byte-hunk-handler 'byte-compile-file-form-progn) | |
2317 (defun byte-compile-file-form-progn (form) | |
29239
86949998e6fd
(byte-compile-callargs-warn): Use subr-arity to check primitives.
Dave Love <fx@gnu.org>
parents:
28441
diff
changeset
|
2318 (mapc 'byte-compile-file-form (cdr form)) |
757 | 2319 ;; Return nil so the forms are not output twice. |
2320 nil) | |
2321 | |
2322 ;; This handler is not necessary, but it makes the output from dont-compile | |
2323 ;; and similar macros cleaner. | |
2324 (put 'eval 'byte-hunk-handler 'byte-compile-file-form-eval) | |
2325 (defun byte-compile-file-form-eval (form) | |
2326 (if (eq (car-safe (nth 1 form)) 'quote) | |
2327 (nth 1 (nth 1 form)) | |
2328 (byte-compile-keep-pending form))) | |
2329 | |
2330 (put 'defun 'byte-hunk-handler 'byte-compile-file-form-defun) | |
2331 (defun byte-compile-file-form-defun (form) | |
2332 (byte-compile-file-form-defmumble form nil)) | |
2333 | |
2334 (put 'defmacro 'byte-hunk-handler 'byte-compile-file-form-defmacro) | |
2335 (defun byte-compile-file-form-defmacro (form) | |
2336 (byte-compile-file-form-defmumble form t)) | |
2337 | |
2338 (defun byte-compile-file-form-defmumble (form macrop) | |
2339 (let* ((name (car (cdr form))) | |
2340 (this-kind (if macrop 'byte-compile-macro-environment | |
2341 'byte-compile-function-environment)) | |
2342 (that-kind (if macrop 'byte-compile-function-environment | |
2343 'byte-compile-macro-environment)) | |
2344 (this-one (assq name (symbol-value this-kind))) | |
2345 (that-one (assq name (symbol-value that-kind))) | |
2346 (byte-compile-free-references nil) | |
2347 (byte-compile-free-assignments nil)) | |
45558
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
2348 (byte-compile-set-symbol-position name) |
757 | 2349 ;; When a function or macro is defined, add it to the call tree so that |
2350 ;; we can tell when functions are not used. | |
2351 (if byte-compile-generate-call-tree | |
2352 (or (assq name byte-compile-call-tree) | |
2353 (setq byte-compile-call-tree | |
2354 (cons (list name nil nil) byte-compile-call-tree)))) | |
2355 | |
2356 (setq byte-compile-current-form name) ; for warnings | |
85730
a1e136978a9a
(byte-compile-warnings): Document `not'.
Glenn Morris <rgm@gnu.org>
parents:
85657
diff
changeset
|
2357 (if (byte-compile-warning-enabled-p 'redefine) |
757 | 2358 (byte-compile-arglist-warn form macrop)) |
2359 (if byte-compile-verbose | |
10687
1bd70186f894
(byte-compile-file-form-defmumble, display-call-tree): Print ellipsis earlier,
Karl Heuer <kwzh@gnu.org>
parents:
10514
diff
changeset
|
2360 (message "Compiling %s... (%s)" (or filename "") (nth 1 form))) |
757 | 2361 (cond (that-one |
85730
a1e136978a9a
(byte-compile-warnings): Document `not'.
Glenn Morris <rgm@gnu.org>
parents:
85657
diff
changeset
|
2362 (if (and (byte-compile-warning-enabled-p 'redefine) |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
2363 ;; don't warn when compiling the stubs in byte-run... |
757 | 2364 (not (assq (nth 1 form) |
2365 byte-compile-initial-macro-environment))) | |
2366 (byte-compile-warn | |
56082
36284d653673
Put `...' around symbols in warning messages.
Richard M. Stallman <rms@gnu.org>
parents:
55694
diff
changeset
|
2367 "`%s' defined multiple times, as both function and macro" |
757 | 2368 (nth 1 form))) |
2369 (setcdr that-one nil)) | |
2370 (this-one | |
85730
a1e136978a9a
(byte-compile-warnings): Document `not'.
Glenn Morris <rgm@gnu.org>
parents:
85657
diff
changeset
|
2371 (when (and (byte-compile-warning-enabled-p 'redefine) |
757 | 2372 ;; hack: don't warn when compiling the magic internal |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
2373 ;; byte-compiler macros in byte-run.el... |
757 | 2374 (not (assq (nth 1 form) |
2375 byte-compile-initial-macro-environment))) | |
56082
36284d653673
Put `...' around symbols in warning messages.
Richard M. Stallman <rms@gnu.org>
parents:
55694
diff
changeset
|
2376 (byte-compile-warn "%s `%s' defined multiple times in this file" |
45558
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
2377 (if macrop "macro" "function") |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
2378 (nth 1 form)))) |
757 | 2379 ((and (fboundp name) |
2380 (eq (car-safe (symbol-function name)) | |
2381 (if macrop 'lambda 'macro))) | |
85730
a1e136978a9a
(byte-compile-warnings): Document `not'.
Glenn Morris <rgm@gnu.org>
parents:
85657
diff
changeset
|
2382 (when (byte-compile-warning-enabled-p 'redefine) |
56082
36284d653673
Put `...' around symbols in warning messages.
Richard M. Stallman <rms@gnu.org>
parents:
55694
diff
changeset
|
2383 (byte-compile-warn "%s `%s' being redefined as a %s" |
45558
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
2384 (if macrop "function" "macro") |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
2385 (nth 1 form) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
2386 (if macrop "macro" "function"))) |
757 | 2387 ;; shadow existing definition |
2388 (set this-kind | |
2389 (cons (cons name nil) (symbol-value this-kind)))) | |
2390 ) | |
2391 (let ((body (nthcdr 3 form))) | |
45558
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
2392 (when (and (stringp (car body)) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
2393 (symbolp (car-safe (cdr-safe body))) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
2394 (car-safe (cdr-safe body)) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
2395 (stringp (car-safe (cdr-safe (cdr-safe body))))) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
2396 (byte-compile-set-symbol-position (nth 1 form)) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
2397 (byte-compile-warn "probable `\"' without `\\' in doc string of %s" |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
2398 (nth 1 form)))) |
47912 | 2399 |
44130
a9c023f8b14b
(byte-compile-file-form-defmumble):
Gerd Moellmann <gerd@gnu.org>
parents:
44103
diff
changeset
|
2400 ;; Generate code for declarations in macro definitions. |
a9c023f8b14b
(byte-compile-file-form-defmumble):
Gerd Moellmann <gerd@gnu.org>
parents:
44103
diff
changeset
|
2401 ;; Remove declarations from the body of the macro definition. |
a9c023f8b14b
(byte-compile-file-form-defmumble):
Gerd Moellmann <gerd@gnu.org>
parents:
44103
diff
changeset
|
2402 (when macrop |
a9c023f8b14b
(byte-compile-file-form-defmumble):
Gerd Moellmann <gerd@gnu.org>
parents:
44103
diff
changeset
|
2403 (let ((tail (nthcdr 2 form))) |
a9c023f8b14b
(byte-compile-file-form-defmumble):
Gerd Moellmann <gerd@gnu.org>
parents:
44103
diff
changeset
|
2404 (when (stringp (car (cdr tail))) |
a9c023f8b14b
(byte-compile-file-form-defmumble):
Gerd Moellmann <gerd@gnu.org>
parents:
44103
diff
changeset
|
2405 (setq tail (cdr tail))) |
a9c023f8b14b
(byte-compile-file-form-defmumble):
Gerd Moellmann <gerd@gnu.org>
parents:
44103
diff
changeset
|
2406 (while (and (consp (car (cdr tail))) |
a9c023f8b14b
(byte-compile-file-form-defmumble):
Gerd Moellmann <gerd@gnu.org>
parents:
44103
diff
changeset
|
2407 (eq (car (car (cdr tail))) 'declare)) |
a9c023f8b14b
(byte-compile-file-form-defmumble):
Gerd Moellmann <gerd@gnu.org>
parents:
44103
diff
changeset
|
2408 (let ((declaration (car (cdr tail)))) |
a9c023f8b14b
(byte-compile-file-form-defmumble):
Gerd Moellmann <gerd@gnu.org>
parents:
44103
diff
changeset
|
2409 (setcdr tail (cdr (cdr tail))) |
76740
212e8c8f31b0
(byte-compile-file-form-defmumble): Use prin1 instead of princ.
Richard M. Stallman <rms@gnu.org>
parents:
76463
diff
changeset
|
2410 (prin1 `(if macro-declaration-function |
44130
a9c023f8b14b
(byte-compile-file-form-defmumble):
Gerd Moellmann <gerd@gnu.org>
parents:
44103
diff
changeset
|
2411 (funcall macro-declaration-function |
a9c023f8b14b
(byte-compile-file-form-defmumble):
Gerd Moellmann <gerd@gnu.org>
parents:
44103
diff
changeset
|
2412 ',name ',declaration)) |
a9c023f8b14b
(byte-compile-file-form-defmumble):
Gerd Moellmann <gerd@gnu.org>
parents:
44103
diff
changeset
|
2413 outbuffer))))) |
47912 | 2414 |
66317
3f882faaa9ae
(byte-compile-lambda): Add parameter add-lambda.
Lars Hansen <larsh@soem.dk>
parents:
64751
diff
changeset
|
2415 (let* ((new-one (byte-compile-lambda (nthcdr 2 form) t)) |
757 | 2416 (code (byte-compile-byte-code-maker new-one))) |
2417 (if this-one | |
2418 (setcdr this-one new-one) | |
2419 (set this-kind | |
2420 (cons (cons name new-one) (symbol-value this-kind)))) | |
2421 (if (and (stringp (nth 3 form)) | |
2422 (eq 'quote (car-safe code)) | |
2423 (eq 'lambda (car-safe (nth 1 code)))) | |
2424 (cons (car form) | |
2425 (cons name (cdr (nth 1 code)))) | |
10235
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2426 (byte-compile-flush-pending) |
757 | 2427 (if (not (stringp (nth 3 form))) |
10235
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2428 ;; No doc string. Provide -1 as the "doc string index" |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2429 ;; so that no element will be treated as a doc string. |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2430 (byte-compile-output-docform |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2431 (if (byte-compile-version-cond byte-compile-compatibility) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2432 "\n(fset '" "\n(defalias '") |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2433 name |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2434 (cond ((atom code) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2435 (if macrop '(" '(macro . #[" -1 "])") '(" #[" -1 "]"))) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2436 ((eq (car code) 'quote) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2437 (setq code new-one) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2438 (if macrop '(" '(macro " -1 ")") '(" '(" -1 ")"))) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2439 ((if macrop '(" (cons 'macro (" -1 "))") '(" (" -1 ")")))) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2440 (append code nil) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2441 (and (atom code) byte-compile-dynamic |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2442 1) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2443 nil) |
757 | 2444 ;; Output the form by hand, that's much simpler than having |
2566
4f201a4ab030
(define-function): Changed name back to defalisaases to get things in
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2544
diff
changeset
|
2445 ;; b-c-output-file-form analyze the defalias. |
757 | 2446 (byte-compile-output-docform |
10235
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2447 (if (byte-compile-version-cond byte-compile-compatibility) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2448 "\n(fset '" "\n(defalias '") |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2449 name |
757 | 2450 (cond ((atom code) |
2451 (if macrop '(" '(macro . #[" 4 "])") '(" #[" 4 "]"))) | |
2452 ((eq (car code) 'quote) | |
2453 (setq code new-one) | |
2454 (if macrop '(" '(macro " 2 ")") '(" '(" 2 ")"))) | |
2455 ((if macrop '(" (cons 'macro (" 5 "))") '(" (" 5 ")")))) | |
10235
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2456 (append code nil) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2457 (and (atom code) byte-compile-dynamic |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2458 1) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2459 nil)) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2460 (princ ")" outbuffer) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2461 nil)))) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2462 |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2463 ;; Print Lisp object EXP in the output file, inside a comment, |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2464 ;; and return the file position it will have. |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2465 ;; If QUOTED is non-nil, print with quoting; otherwise, print without quoting. |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2466 (defun byte-compile-output-as-comment (exp quoted) |
23135
99ab9c46504a
(byte-compile-output-as-comment):
Kenichi Handa <handa@m17n.org>
parents:
23054
diff
changeset
|
2467 (let ((position (point))) |
82791
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2468 (with-current-buffer outbuffer |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2469 |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2470 ;; Insert EXP, and make it a comment with #@LENGTH. |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2471 (insert " ") |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2472 (if quoted |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2473 (prin1 exp outbuffer) |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2474 (princ exp outbuffer)) |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2475 (goto-char position) |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2476 ;; Quote certain special characters as needed. |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2477 ;; get_doc_string in doc.c does the unquoting. |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2478 (while (search-forward "\^A" nil t) |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2479 (replace-match "\^A\^A" t t)) |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2480 (goto-char position) |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2481 (while (search-forward "\000" nil t) |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2482 (replace-match "\^A0" t t)) |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2483 (goto-char position) |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2484 (while (search-forward "\037" nil t) |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2485 (replace-match "\^A_" t t)) |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2486 (goto-char (point-max)) |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2487 (insert "\037") |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2488 (goto-char position) |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2489 (insert "#@" (format "%d" (- (position-bytes (point-max)) |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2490 (position-bytes position)))) |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2491 |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2492 ;; Save the file position of the object. |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2493 ;; Note we should add 1 to skip the space |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2494 ;; that we inserted before the actual doc string, |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2495 ;; and subtract 1 to convert from an 1-origin Emacs position |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2496 ;; to a file position; they cancel. |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2497 (setq position (point)) |
25892386493b
(byte-compile-output-docform, byte-compile-output-as-comment):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82503
diff
changeset
|
2498 (goto-char (point-max))) |
10235
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2499 position)) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2500 |
757 | 2501 |
2502 | |
819
5bbabfcef929
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
784
diff
changeset
|
2503 ;;;###autoload |
757 | 2504 (defun byte-compile (form) |
2505 "If FORM is a symbol, byte-compile its function definition. | |
2506 If FORM is a lambda or a macro, byte-compile it as a function." | |
2507 (displaying-byte-compile-warnings | |
2508 (byte-compile-close-variables | |
2509 (let* ((fun (if (symbolp form) | |
2510 (and (fboundp form) (symbol-function form)) | |
2511 form)) | |
2512 (macro (eq (car-safe fun) 'macro))) | |
2513 (if macro | |
2514 (setq fun (cdr fun))) | |
2515 (cond ((eq (car-safe fun) 'lambda) | |
2516 (setq fun (if macro | |
2517 (cons 'macro (byte-compile-lambda fun)) | |
2518 (byte-compile-lambda fun))) | |
2519 (if (symbolp form) | |
2566
4f201a4ab030
(define-function): Changed name back to defalisaases to get things in
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2544
diff
changeset
|
2520 (defalias form fun) |
757 | 2521 fun))))))) |
2522 | |
2523 (defun byte-compile-sexp (sexp) | |
2524 "Compile and return SEXP." | |
2525 (displaying-byte-compile-warnings | |
2526 (byte-compile-close-variables | |
2527 (byte-compile-top-level sexp)))) | |
2528 | |
2529 ;; Given a function made by byte-compile-lambda, make a form which produces it. | |
2530 (defun byte-compile-byte-code-maker (fun) | |
2531 (cond | |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
2532 ((byte-compile-version-cond byte-compile-compatibility) |
757 | 2533 ;; Return (quote (lambda ...)). |
2534 (list 'quote (byte-compile-byte-code-unmake fun))) | |
2535 ;; ## atom is faster than compiled-func-p. | |
2536 ((atom fun) ; compiled function. | |
2537 ;; generate-emacs19-bytecodes must be on, otherwise byte-compile-lambda | |
2538 ;; would have produced a lambda. | |
16149
eb953f4baf7b
(byte-compile-out-toplevel): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
15972
diff
changeset
|
2539 fun) |
757 | 2540 ;; b-c-lambda didn't produce a compiled-function, so it's either a trivial |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
2541 ;; function, or this is Emacs 18, or generate-emacs19-bytecodes is off. |
757 | 2542 ((let (tmp) |
2543 (if (and (setq tmp (assq 'byte-code (cdr-safe (cdr fun)))) | |
2544 (null (cdr (memq tmp fun)))) | |
2545 ;; Generate a make-byte-code call. | |
2546 (let* ((interactive (assq 'interactive (cdr (cdr fun))))) | |
2547 (nconc (list 'make-byte-code | |
2548 (list 'quote (nth 1 fun)) ;arglist | |
2549 (nth 1 tmp) ;bytes | |
2550 (nth 2 tmp) ;consts | |
2551 (nth 3 tmp)) ;depth | |
2552 (cond ((stringp (nth 2 fun)) | |
2553 (list (nth 2 fun))) ;doc | |
2554 (interactive | |
2555 (list nil))) | |
2556 (cond (interactive | |
2557 (list (if (or (null (nth 1 interactive)) | |
2558 (stringp (nth 1 interactive))) | |
2559 (nth 1 interactive) | |
2560 ;; Interactive spec is a list or a variable | |
2561 ;; (if it is correct). | |
2562 (list 'quote (nth 1 interactive)))))))) | |
2563 ;; a non-compiled function (probably trivial) | |
2564 (list 'quote fun)))))) | |
2565 | |
2566 ;; Turn a function into an ordinary lambda. Needed for v18 files. | |
2567 (defun byte-compile-byte-code-unmake (function) | |
2568 (if (consp function) | |
2569 function;;It already is a lambda. | |
2570 (setq function (append function nil)) ; turn it into a list | |
2571 (nconc (list 'lambda (nth 0 function)) | |
2572 (and (nth 4 function) (list (nth 4 function))) | |
2573 (if (nthcdr 5 function) | |
2574 (list (cons 'interactive (if (nth 5 function) | |
2575 (nthcdr 5 function))))) | |
2576 (list (list 'byte-code | |
2577 (nth 1 function) (nth 2 function) | |
2578 (nth 3 function)))))) | |
2579 | |
2580 | |
39827
d9f8c7370b3a
(byte-compile-check-lambda-list): New
Gerd Moellmann <gerd@gnu.org>
parents:
39769
diff
changeset
|
2581 (defun byte-compile-check-lambda-list (list) |
d9f8c7370b3a
(byte-compile-check-lambda-list): New
Gerd Moellmann <gerd@gnu.org>
parents:
39769
diff
changeset
|
2582 "Check lambda-list LIST for errors." |
d9f8c7370b3a
(byte-compile-check-lambda-list): New
Gerd Moellmann <gerd@gnu.org>
parents:
39769
diff
changeset
|
2583 (let (vars) |
d9f8c7370b3a
(byte-compile-check-lambda-list): New
Gerd Moellmann <gerd@gnu.org>
parents:
39769
diff
changeset
|
2584 (while list |
d9f8c7370b3a
(byte-compile-check-lambda-list): New
Gerd Moellmann <gerd@gnu.org>
parents:
39769
diff
changeset
|
2585 (let ((arg (car list))) |
45558
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
2586 (when (symbolp arg) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
2587 (byte-compile-set-symbol-position arg)) |
40035
2b16a80692ef
Put the *Compile-Log* buffer in `compilation-mode'.
Sam Steingold <sds@gnu.org>
parents:
39852
diff
changeset
|
2588 (cond ((or (not (symbolp arg)) |
50570
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
2589 (byte-compile-const-symbol-p arg t)) |
39827
d9f8c7370b3a
(byte-compile-check-lambda-list): New
Gerd Moellmann <gerd@gnu.org>
parents:
39769
diff
changeset
|
2590 (error "Invalid lambda variable %s" arg)) |
d9f8c7370b3a
(byte-compile-check-lambda-list): New
Gerd Moellmann <gerd@gnu.org>
parents:
39769
diff
changeset
|
2591 ((eq arg '&rest) |
d9f8c7370b3a
(byte-compile-check-lambda-list): New
Gerd Moellmann <gerd@gnu.org>
parents:
39769
diff
changeset
|
2592 (unless (cdr list) |
d9f8c7370b3a
(byte-compile-check-lambda-list): New
Gerd Moellmann <gerd@gnu.org>
parents:
39769
diff
changeset
|
2593 (error "&rest without variable name")) |
d9f8c7370b3a
(byte-compile-check-lambda-list): New
Gerd Moellmann <gerd@gnu.org>
parents:
39769
diff
changeset
|
2594 (when (cddr list) |
d9f8c7370b3a
(byte-compile-check-lambda-list): New
Gerd Moellmann <gerd@gnu.org>
parents:
39769
diff
changeset
|
2595 (error "Garbage following &rest VAR in lambda-list"))) |
d9f8c7370b3a
(byte-compile-check-lambda-list): New
Gerd Moellmann <gerd@gnu.org>
parents:
39769
diff
changeset
|
2596 ((eq arg '&optional) |
d9f8c7370b3a
(byte-compile-check-lambda-list): New
Gerd Moellmann <gerd@gnu.org>
parents:
39769
diff
changeset
|
2597 (unless (cdr list) |
d9f8c7370b3a
(byte-compile-check-lambda-list): New
Gerd Moellmann <gerd@gnu.org>
parents:
39769
diff
changeset
|
2598 (error "Variable name missing after &optional"))) |
d9f8c7370b3a
(byte-compile-check-lambda-list): New
Gerd Moellmann <gerd@gnu.org>
parents:
39769
diff
changeset
|
2599 ((memq arg vars) |
39852
00ea1715c90a
(byte-compile-check-lambda-list):
Gerd Moellmann <gerd@gnu.org>
parents:
39827
diff
changeset
|
2600 (byte-compile-warn "repeated variable %s in lambda-list" arg)) |
40035
2b16a80692ef
Put the *Compile-Log* buffer in `compilation-mode'.
Sam Steingold <sds@gnu.org>
parents:
39852
diff
changeset
|
2601 (t |
39827
d9f8c7370b3a
(byte-compile-check-lambda-list): New
Gerd Moellmann <gerd@gnu.org>
parents:
39769
diff
changeset
|
2602 (push arg vars)))) |
d9f8c7370b3a
(byte-compile-check-lambda-list): New
Gerd Moellmann <gerd@gnu.org>
parents:
39769
diff
changeset
|
2603 (setq list (cdr list))))) |
d9f8c7370b3a
(byte-compile-check-lambda-list): New
Gerd Moellmann <gerd@gnu.org>
parents:
39769
diff
changeset
|
2604 |
d9f8c7370b3a
(byte-compile-check-lambda-list): New
Gerd Moellmann <gerd@gnu.org>
parents:
39769
diff
changeset
|
2605 |
757 | 2606 ;; Byte-compile a lambda-expression and return a valid function. |
2607 ;; The value is usually a compiled function but may be the original | |
2608 ;; lambda-expression. | |
66317
3f882faaa9ae
(byte-compile-lambda): Add parameter add-lambda.
Lars Hansen <larsh@soem.dk>
parents:
64751
diff
changeset
|
2609 ;; When ADD-LAMBDA is non-nil, the symbol `lambda' is added as head |
3f882faaa9ae
(byte-compile-lambda): Add parameter add-lambda.
Lars Hansen <larsh@soem.dk>
parents:
64751
diff
changeset
|
2610 ;; of the list FUN and `byte-compile-set-symbol-position' is not called. |
3f882faaa9ae
(byte-compile-lambda): Add parameter add-lambda.
Lars Hansen <larsh@soem.dk>
parents:
64751
diff
changeset
|
2611 ;; Use this feature to avoid calling `byte-compile-set-symbol-position' |
3f882faaa9ae
(byte-compile-lambda): Add parameter add-lambda.
Lars Hansen <larsh@soem.dk>
parents:
64751
diff
changeset
|
2612 ;; for symbols generated by the byte compiler itself. |
3f882faaa9ae
(byte-compile-lambda): Add parameter add-lambda.
Lars Hansen <larsh@soem.dk>
parents:
64751
diff
changeset
|
2613 (defun byte-compile-lambda (fun &optional add-lambda) |
3f882faaa9ae
(byte-compile-lambda): Add parameter add-lambda.
Lars Hansen <larsh@soem.dk>
parents:
64751
diff
changeset
|
2614 (if add-lambda |
3f882faaa9ae
(byte-compile-lambda): Add parameter add-lambda.
Lars Hansen <larsh@soem.dk>
parents:
64751
diff
changeset
|
2615 (setq fun (cons 'lambda fun)) |
3f882faaa9ae
(byte-compile-lambda): Add parameter add-lambda.
Lars Hansen <larsh@soem.dk>
parents:
64751
diff
changeset
|
2616 (unless (eq 'lambda (car-safe fun)) |
3f882faaa9ae
(byte-compile-lambda): Add parameter add-lambda.
Lars Hansen <larsh@soem.dk>
parents:
64751
diff
changeset
|
2617 (error "Not a lambda list: %S" fun)) |
3f882faaa9ae
(byte-compile-lambda): Add parameter add-lambda.
Lars Hansen <larsh@soem.dk>
parents:
64751
diff
changeset
|
2618 (byte-compile-set-symbol-position 'lambda)) |
39827
d9f8c7370b3a
(byte-compile-check-lambda-list): New
Gerd Moellmann <gerd@gnu.org>
parents:
39769
diff
changeset
|
2619 (byte-compile-check-lambda-list (nth 1 fun)) |
757 | 2620 (let* ((arglist (nth 1 fun)) |
2621 (byte-compile-bound-variables | |
85730
a1e136978a9a
(byte-compile-warnings): Document `not'.
Glenn Morris <rgm@gnu.org>
parents:
85657
diff
changeset
|
2622 (nconc (and (byte-compile-warning-enabled-p 'free-vars) |
757 | 2623 (delq '&rest (delq '&optional (copy-sequence arglist)))) |
2624 byte-compile-bound-variables)) | |
2625 (body (cdr (cdr fun))) | |
2626 (doc (if (stringp (car body)) | |
2627 (prog1 (car body) | |
16232
d79492598ec8
(byte-compile-lambda): If the doc string is also the
Richard M. Stallman <rms@gnu.org>
parents:
16159
diff
changeset
|
2628 ;; Discard the doc string |
d79492598ec8
(byte-compile-lambda): If the doc string is also the
Richard M. Stallman <rms@gnu.org>
parents:
16159
diff
changeset
|
2629 ;; unless it is the last element of the body. |
22350
745759e4e099
(byte-compile-lambda): Fix previous change.
Karl Heuer <kwzh@gnu.org>
parents:
22136
diff
changeset
|
2630 (if (cdr body) |
16232
d79492598ec8
(byte-compile-lambda): If the doc string is also the
Richard M. Stallman <rms@gnu.org>
parents:
16159
diff
changeset
|
2631 (setq body (cdr body)))))) |
757 | 2632 (int (assq 'interactive body))) |
50570
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
2633 ;; Process the interactive spec. |
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
2634 (when int |
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
2635 (byte-compile-set-symbol-position 'interactive) |
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
2636 ;; Skip (interactive) if it is in front (the most usual location). |
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
2637 (if (eq int (car body)) |
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
2638 (setq body (cdr body))) |
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
2639 (cond ((consp (cdr int)) |
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
2640 (if (cdr (cdr int)) |
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
2641 (byte-compile-warn "malformed interactive spec: %s" |
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
2642 (prin1-to-string int))) |
53753
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
2643 ;; If the interactive spec is a call to `list', don't |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
2644 ;; compile it, because `call-interactively' looks at the |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
2645 ;; args of `list'. Actually, compile it to get warnings, |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
2646 ;; but don't use the result. |
50570
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
2647 (let ((form (nth 1 int))) |
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
2648 (while (memq (car-safe form) '(let let* progn save-excursion)) |
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
2649 (while (consp (cdr form)) |
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
2650 (setq form (cdr form))) |
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
2651 (setq form (car form))) |
53753
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
2652 (if (eq (car-safe form) 'list) |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
2653 (byte-compile-top-level (nth 1 int)) |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
2654 (setq int (list 'interactive |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
2655 (byte-compile-top-level (nth 1 int))))))) |
50570
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
2656 ((cdr int) |
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
2657 (byte-compile-warn "malformed interactive spec: %s" |
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
2658 (prin1-to-string int))))) |
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
2659 ;; Process the body. |
757 | 2660 (let ((compiled (byte-compile-top-level (cons 'progn body) nil 'lambda))) |
50570
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
2661 ;; Build the actual byte-coded function. |
757 | 2662 (if (and (eq 'byte-code (car-safe compiled)) |
1882
83fc53d66a31
(byte-compile-lambda): Test of byte-compile-compatibility was backwards.
Richard M. Stallman <rms@gnu.org>
parents:
1819
diff
changeset
|
2663 (not (byte-compile-version-cond |
83fc53d66a31
(byte-compile-lambda): Test of byte-compile-compatibility was backwards.
Richard M. Stallman <rms@gnu.org>
parents:
1819
diff
changeset
|
2664 byte-compile-compatibility))) |
757 | 2665 (apply 'make-byte-code |
2666 (append (list arglist) | |
2667 ;; byte-string, constants-vector, stack depth | |
2668 (cdr compiled) | |
2669 ;; optionally, the doc string. | |
2670 (if (or doc int) | |
2671 (list doc)) | |
2672 ;; optionally, the interactive spec. | |
2673 (if int | |
2674 (list (nth 1 int))))) | |
2675 (setq compiled | |
2676 (nconc (if int (list int)) | |
2677 (cond ((eq (car-safe compiled) 'progn) (cdr compiled)) | |
2678 (compiled (list compiled))))) | |
2679 (nconc (list 'lambda arglist) | |
2680 (if (or doc (stringp (car compiled))) | |
2681 (cons doc (cond (compiled) | |
2682 (body (list nil)))) | |
2683 compiled)))))) | |
2684 | |
2685 (defun byte-compile-constants-vector () | |
2686 ;; Builds the constants-vector from the current variables and constants. | |
2687 ;; This modifies the constants from (const . nil) to (const . offset). | |
2688 ;; To keep the byte-codes to look up the vector as short as possible: | |
2689 ;; First 6 elements are vars, as there are one-byte varref codes for those. | |
2690 ;; Next up to byte-constant-limit are constants, still with one-byte codes. | |
2691 ;; Next variables again, to get 2-byte codes for variable lookup. | |
2692 ;; The rest of the constants and variables need 3-byte byte-codes. | |
2693 (let* ((i -1) | |
2694 (rest (nreverse byte-compile-variables)) ; nreverse because the first | |
2695 (other (nreverse byte-compile-constants)) ; vars often are used most. | |
2696 ret tmp | |
2697 (limits '(5 ; Use the 1-byte varref codes, | |
2698 63 ; 1-constlim ; 1-byte byte-constant codes, | |
2699 255 ; 2-byte varref codes, | |
2700 65535)) ; 3-byte codes for the rest. | |
2701 limit) | |
2702 (while (or rest other) | |
2703 (setq limit (car limits)) | |
2704 (while (and rest (not (eq i limit))) | |
2705 (if (setq tmp (assq (car (car rest)) ret)) | |
2706 (setcdr (car rest) (cdr tmp)) | |
2707 (setcdr (car rest) (setq i (1+ i))) | |
2708 (setq ret (cons (car rest) ret))) | |
2709 (setq rest (cdr rest))) | |
2710 (setq limits (cdr limits) | |
2711 rest (prog1 other | |
2712 (setq other rest)))) | |
2713 (apply 'vector (nreverse (mapcar 'car ret))))) | |
2714 | |
2715 ;; Given an expression FORM, compile it and return an equivalent byte-code | |
2716 ;; expression (a call to the function byte-code). | |
2717 (defun byte-compile-top-level (form &optional for-effect output-type) | |
2718 ;; OUTPUT-TYPE advises about how form is expected to be used: | |
2719 ;; 'eval or nil -> a single form, | |
2720 ;; 'progn or t -> a list of forms, | |
2721 ;; 'lambda -> body of a lambda, | |
2722 ;; 'file -> used at file-level. | |
8446
0199ece40d91
(byte-compile-protect-from-advice): Macro deleted.
Richard M. Stallman <rms@gnu.org>
parents:
8115
diff
changeset
|
2723 (let ((byte-compile-constants nil) |
0199ece40d91
(byte-compile-protect-from-advice): Macro deleted.
Richard M. Stallman <rms@gnu.org>
parents:
8115
diff
changeset
|
2724 (byte-compile-variables nil) |
0199ece40d91
(byte-compile-protect-from-advice): Macro deleted.
Richard M. Stallman <rms@gnu.org>
parents:
8115
diff
changeset
|
2725 (byte-compile-tag-number 0) |
0199ece40d91
(byte-compile-protect-from-advice): Macro deleted.
Richard M. Stallman <rms@gnu.org>
parents:
8115
diff
changeset
|
2726 (byte-compile-depth 0) |
0199ece40d91
(byte-compile-protect-from-advice): Macro deleted.
Richard M. Stallman <rms@gnu.org>
parents:
8115
diff
changeset
|
2727 (byte-compile-maxdepth 0) |
0199ece40d91
(byte-compile-protect-from-advice): Macro deleted.
Richard M. Stallman <rms@gnu.org>
parents:
8115
diff
changeset
|
2728 (byte-compile-output nil)) |
6081
65adb7b035fd
(byte-compile-protect-from-advice): New macro that
Richard M. Stallman <rms@gnu.org>
parents:
6043
diff
changeset
|
2729 (if (memq byte-optimize '(t source)) |
65adb7b035fd
(byte-compile-protect-from-advice): New macro that
Richard M. Stallman <rms@gnu.org>
parents:
6043
diff
changeset
|
2730 (setq form (byte-optimize-form form for-effect))) |
65adb7b035fd
(byte-compile-protect-from-advice): New macro that
Richard M. Stallman <rms@gnu.org>
parents:
6043
diff
changeset
|
2731 (while (and (eq (car-safe form) 'progn) (null (cdr (cdr form)))) |
65adb7b035fd
(byte-compile-protect-from-advice): New macro that
Richard M. Stallman <rms@gnu.org>
parents:
6043
diff
changeset
|
2732 (setq form (nth 1 form))) |
65adb7b035fd
(byte-compile-protect-from-advice): New macro that
Richard M. Stallman <rms@gnu.org>
parents:
6043
diff
changeset
|
2733 (if (and (eq 'byte-code (car-safe form)) |
65adb7b035fd
(byte-compile-protect-from-advice): New macro that
Richard M. Stallman <rms@gnu.org>
parents:
6043
diff
changeset
|
2734 (not (memq byte-optimize '(t byte))) |
65adb7b035fd
(byte-compile-protect-from-advice): New macro that
Richard M. Stallman <rms@gnu.org>
parents:
6043
diff
changeset
|
2735 (stringp (nth 1 form)) (vectorp (nth 2 form)) |
65adb7b035fd
(byte-compile-protect-from-advice): New macro that
Richard M. Stallman <rms@gnu.org>
parents:
6043
diff
changeset
|
2736 (natnump (nth 3 form))) |
65adb7b035fd
(byte-compile-protect-from-advice): New macro that
Richard M. Stallman <rms@gnu.org>
parents:
6043
diff
changeset
|
2737 form |
65adb7b035fd
(byte-compile-protect-from-advice): New macro that
Richard M. Stallman <rms@gnu.org>
parents:
6043
diff
changeset
|
2738 (byte-compile-form form for-effect) |
8446
0199ece40d91
(byte-compile-protect-from-advice): Macro deleted.
Richard M. Stallman <rms@gnu.org>
parents:
8115
diff
changeset
|
2739 (byte-compile-out-toplevel for-effect output-type)))) |
757 | 2740 |
2741 (defun byte-compile-out-toplevel (&optional for-effect output-type) | |
2742 (if for-effect | |
2743 ;; The stack is empty. Push a value to be returned from (byte-code ..). | |
2744 (if (eq (car (car byte-compile-output)) 'byte-discard) | |
2745 (setq byte-compile-output (cdr byte-compile-output)) | |
2746 (byte-compile-push-constant | |
2747 ;; Push any constant - preferably one which already is used, and | |
2748 ;; a number or symbol - ie not some big sequence. The return value | |
2749 ;; isn't returned, but it would be a shame if some textually large | |
2750 ;; constant was not optimized away because we chose to return it. | |
2751 (and (not (assq nil byte-compile-constants)) ; Nil is often there. | |
2752 (let ((tmp (reverse byte-compile-constants))) | |
46003
503e1f14ba3d
(byte-compile-callargs-warn):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45842
diff
changeset
|
2753 (while (and tmp (not (or (symbolp (caar tmp)) |
503e1f14ba3d
(byte-compile-callargs-warn):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45842
diff
changeset
|
2754 (numberp (caar tmp))))) |
757 | 2755 (setq tmp (cdr tmp))) |
46003
503e1f14ba3d
(byte-compile-callargs-warn):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45842
diff
changeset
|
2756 (caar tmp)))))) |
757 | 2757 (byte-compile-out 'byte-return 0) |
2758 (setq byte-compile-output (nreverse byte-compile-output)) | |
2759 (if (memq byte-optimize '(t byte)) | |
2760 (setq byte-compile-output | |
2761 (byte-optimize-lapcode byte-compile-output for-effect))) | |
40035
2b16a80692ef
Put the *Compile-Log* buffer in `compilation-mode'.
Sam Steingold <sds@gnu.org>
parents:
39852
diff
changeset
|
2762 |
757 | 2763 ;; Decompile trivial functions: |
2764 ;; only constants and variables, or a single funcall except in lambdas. | |
2765 ;; Except for Lisp_Compiled objects, forms like (foo "hi") | |
2766 ;; are still quicker than (byte-code "..." [foo "hi"] 2). | |
2767 ;; Note that even (quote foo) must be parsed just as any subr by the | |
2768 ;; interpreter, so quote should be compiled into byte-code in some contexts. | |
2769 ;; What to leave uncompiled: | |
11117
34477ac36e6e
(byte-compile-out-toplevel): Compile lambda forms even if trivial.
Karl Heuer <kwzh@gnu.org>
parents:
10836
diff
changeset
|
2770 ;; lambda -> never. we used to leave it uncompiled if the body was |
34477ac36e6e
(byte-compile-out-toplevel): Compile lambda forms even if trivial.
Karl Heuer <kwzh@gnu.org>
parents:
10836
diff
changeset
|
2771 ;; a single atom, but that causes confusion if the docstring |
34477ac36e6e
(byte-compile-out-toplevel): Compile lambda forms even if trivial.
Karl Heuer <kwzh@gnu.org>
parents:
10836
diff
changeset
|
2772 ;; uses the (file . pos) syntax. Besides, now that we have |
34477ac36e6e
(byte-compile-out-toplevel): Compile lambda forms even if trivial.
Karl Heuer <kwzh@gnu.org>
parents:
10836
diff
changeset
|
2773 ;; the Lisp_Compiled type, the compiled form is faster. |
757 | 2774 ;; eval -> atom, quote or (function atom atom atom) |
2775 ;; progn -> as <<same-as-eval>> or (progn <<same-as-eval>> atom) | |
2776 ;; file -> as progn, but takes both quotes and atoms, and longer forms. | |
2777 (let (rest | |
2778 (maycall (not (eq output-type 'lambda))) ; t if we may make a funcall. | |
2779 tmp body) | |
2780 (cond | |
2781 ;; #### This should be split out into byte-compile-nontrivial-function-p. | |
11117
34477ac36e6e
(byte-compile-out-toplevel): Compile lambda forms even if trivial.
Karl Heuer <kwzh@gnu.org>
parents:
10836
diff
changeset
|
2782 ((or (eq output-type 'lambda) |
34477ac36e6e
(byte-compile-out-toplevel): Compile lambda forms even if trivial.
Karl Heuer <kwzh@gnu.org>
parents:
10836
diff
changeset
|
2783 (nthcdr (if (eq output-type 'file) 50 8) byte-compile-output) |
757 | 2784 (assq 'TAG byte-compile-output) ; Not necessary, but speeds up a bit. |
2785 (not (setq tmp (assq 'byte-return byte-compile-output))) | |
2786 (progn | |
2787 (setq rest (nreverse | |
2788 (cdr (memq tmp (reverse byte-compile-output))))) | |
2789 (while (cond | |
2790 ((memq (car (car rest)) '(byte-varref byte-constant)) | |
2791 (setq tmp (car (cdr (car rest)))) | |
16149
eb953f4baf7b
(byte-compile-out-toplevel): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
15972
diff
changeset
|
2792 (if (if (eq (car (car rest)) 'byte-constant) |
eb953f4baf7b
(byte-compile-out-toplevel): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
15972
diff
changeset
|
2793 (or (consp tmp) |
eb953f4baf7b
(byte-compile-out-toplevel): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
15972
diff
changeset
|
2794 (and (symbolp tmp) |
27824 | 2795 (not (byte-compile-const-symbol-p tmp))))) |
16149
eb953f4baf7b
(byte-compile-out-toplevel): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
15972
diff
changeset
|
2796 (if maycall |
eb953f4baf7b
(byte-compile-out-toplevel): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
15972
diff
changeset
|
2797 (setq body (cons (list 'quote tmp) body))) |
eb953f4baf7b
(byte-compile-out-toplevel): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
15972
diff
changeset
|
2798 (setq body (cons tmp body)))) |
757 | 2799 ((and maycall |
2800 ;; Allow a funcall if at most one atom follows it. | |
2801 (null (nthcdr 3 rest)) | |
2802 (setq tmp (get (car (car rest)) 'byte-opcode-invert)) | |
2803 (or (null (cdr rest)) | |
2804 (and (memq output-type '(file progn t)) | |
2805 (cdr (cdr rest)) | |
2806 (eq (car (nth 1 rest)) 'byte-discard) | |
2807 (progn (setq rest (cdr rest)) t)))) | |
2808 (setq maycall nil) ; Only allow one real function call. | |
2809 (setq body (nreverse body)) | |
2810 (setq body (list | |
2811 (if (and (eq tmp 'funcall) | |
2812 (eq (car-safe (car body)) 'quote)) | |
2813 (cons (nth 1 (car body)) (cdr body)) | |
2814 (cons tmp body)))) | |
2815 (or (eq output-type 'file) | |
2816 (not (delq nil (mapcar 'consp (cdr (car body)))))))) | |
2817 (setq rest (cdr rest))) | |
11117
34477ac36e6e
(byte-compile-out-toplevel): Compile lambda forms even if trivial.
Karl Heuer <kwzh@gnu.org>
parents:
10836
diff
changeset
|
2818 rest)) |
757 | 2819 (let ((byte-compile-vector (byte-compile-constants-vector))) |
2820 (list 'byte-code (byte-compile-lapcode byte-compile-output) | |
2821 byte-compile-vector byte-compile-maxdepth))) | |
2822 ;; it's a trivial function | |
2823 ((cdr body) (cons 'progn (nreverse body))) | |
2824 ((car body))))) | |
2825 | |
2826 ;; Given BODY, compile it and return a new body. | |
2827 (defun byte-compile-top-level-body (body &optional for-effect) | |
2828 (setq body (byte-compile-top-level (cons 'progn body) for-effect t)) | |
2829 (cond ((eq (car-safe body) 'progn) | |
2830 (cdr body)) | |
2831 (body | |
2832 (list body)))) | |
86177
fadd23918501
(byte-compile-declare-function): New function, byte-hunk-handler for
Glenn Morris <rgm@gnu.org>
parents:
86003
diff
changeset
|
2833 |
fadd23918501
(byte-compile-declare-function): New function, byte-hunk-handler for
Glenn Morris <rgm@gnu.org>
parents:
86003
diff
changeset
|
2834 (put 'declare-function 'byte-hunk-handler 'byte-compile-declare-function) |
fadd23918501
(byte-compile-declare-function): New function, byte-hunk-handler for
Glenn Morris <rgm@gnu.org>
parents:
86003
diff
changeset
|
2835 (defun byte-compile-declare-function (form) |
fadd23918501
(byte-compile-declare-function): New function, byte-hunk-handler for
Glenn Morris <rgm@gnu.org>
parents:
86003
diff
changeset
|
2836 (push (cons (nth 1 form) |
86987
7bd1703d4880
(byte-compile-declare-function): Reverse branches of if statement.
Glenn Morris <rgm@gnu.org>
parents:
86840
diff
changeset
|
2837 (if (and (> (length form) 3) |
7bd1703d4880
(byte-compile-declare-function): Reverse branches of if statement.
Glenn Morris <rgm@gnu.org>
parents:
86840
diff
changeset
|
2838 (listp (nth 3 form))) |
7bd1703d4880
(byte-compile-declare-function): Reverse branches of if statement.
Glenn Morris <rgm@gnu.org>
parents:
86840
diff
changeset
|
2839 (list 'declared (nth 3 form)) |
7bd1703d4880
(byte-compile-declare-function): Reverse branches of if statement.
Glenn Morris <rgm@gnu.org>
parents:
86840
diff
changeset
|
2840 t)) ; arglist not specified |
86177
fadd23918501
(byte-compile-declare-function): New function, byte-hunk-handler for
Glenn Morris <rgm@gnu.org>
parents:
86003
diff
changeset
|
2841 byte-compile-function-environment) |
87060
939b10a62bb1
(byte-compile-declare-function): Remove declared function from
Glenn Morris <rgm@gnu.org>
parents:
86987
diff
changeset
|
2842 ;; We are stating that it _will_ be defined at runtime. |
939b10a62bb1
(byte-compile-declare-function): Remove declared function from
Glenn Morris <rgm@gnu.org>
parents:
86987
diff
changeset
|
2843 (setq byte-compile-noruntime-functions |
939b10a62bb1
(byte-compile-declare-function): Remove declared function from
Glenn Morris <rgm@gnu.org>
parents:
86987
diff
changeset
|
2844 (delq (nth 1 form) byte-compile-noruntime-functions)) |
86177
fadd23918501
(byte-compile-declare-function): New function, byte-hunk-handler for
Glenn Morris <rgm@gnu.org>
parents:
86003
diff
changeset
|
2845 nil) |
fadd23918501
(byte-compile-declare-function): New function, byte-hunk-handler for
Glenn Morris <rgm@gnu.org>
parents:
86003
diff
changeset
|
2846 |
757 | 2847 |
28402 | 2848 ;; This is the recursive entry point for compiling each subform of an |
757 | 2849 ;; expression. |
2850 ;; If for-effect is non-nil, byte-compile-form will output a byte-discard | |
2851 ;; before terminating (ie no value will be left on the stack). | |
2852 ;; A byte-compile handler may, when for-effect is non-nil, choose output code | |
2853 ;; which does not leave a value on the stack, and then set for-effect to nil | |
2854 ;; (to prevent byte-compile-form from outputting the byte-discard). | |
2855 ;; If a handler wants to call another handler, it should do so via | |
2856 ;; byte-compile-form, or take extreme care to handle for-effect correctly. | |
2857 ;; (Use byte-compile-form-do-effect to reset the for-effect flag too.) | |
2858 ;; | |
2859 (defun byte-compile-form (form &optional for-effect) | |
2860 (setq form (macroexpand form byte-compile-macro-environment)) | |
2861 (cond ((not (consp form)) | |
27824 | 2862 (cond ((or (not (symbolp form)) (byte-compile-const-symbol-p form)) |
58377
01886d0fea34
(byte-compile-form): Move the calls to byte-compile-set-symbol-position,
Richard M. Stallman <rms@gnu.org>
parents:
58154
diff
changeset
|
2863 (when (symbolp form) |
01886d0fea34
(byte-compile-form): Move the calls to byte-compile-set-symbol-position,
Richard M. Stallman <rms@gnu.org>
parents:
58154
diff
changeset
|
2864 (byte-compile-set-symbol-position form)) |
757 | 2865 (byte-compile-constant form)) |
2866 ((and for-effect byte-compile-delete-errors) | |
58377
01886d0fea34
(byte-compile-form): Move the calls to byte-compile-set-symbol-position,
Richard M. Stallman <rms@gnu.org>
parents:
58154
diff
changeset
|
2867 (when (symbolp form) |
01886d0fea34
(byte-compile-form): Move the calls to byte-compile-set-symbol-position,
Richard M. Stallman <rms@gnu.org>
parents:
58154
diff
changeset
|
2868 (byte-compile-set-symbol-position form)) |
757 | 2869 (setq for-effect nil)) |
2870 (t (byte-compile-variable-ref 'byte-varref form)))) | |
2871 ((symbolp (car form)) | |
2872 (let* ((fn (car form)) | |
2873 (handler (get fn 'byte-compile))) | |
45558
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
2874 (when (byte-compile-const-symbol-p fn) |
56082
36284d653673
Put `...' around symbols in warning messages.
Richard M. Stallman <rms@gnu.org>
parents:
55694
diff
changeset
|
2875 (byte-compile-warn "`%s' called as a function" fn)) |
85730
a1e136978a9a
(byte-compile-warnings): Document `not'.
Glenn Morris <rgm@gnu.org>
parents:
85657
diff
changeset
|
2876 (and (byte-compile-warning-enabled-p 'interactive-only) |
62319
150380a7c3d6
(byte-compile-nogroup-warn): New function.
Richard M. Stallman <rms@gnu.org>
parents:
61966
diff
changeset
|
2877 (memq fn byte-compile-interactive-only-functions) |
57881
f57a9010e865
(byte-compile-warning-types): Add interactive-only.
Richard M. Stallman <rms@gnu.org>
parents:
57518
diff
changeset
|
2878 (byte-compile-warn "`%s' used from Lisp code\n\ |
f57a9010e865
(byte-compile-warning-types): Add interactive-only.
Richard M. Stallman <rms@gnu.org>
parents:
57518
diff
changeset
|
2879 That command is designed for interactive use only" fn)) |
757 | 2880 (if (and handler |
69872
f60a24914ee2
(byte-compile-form): Only call cl-byte-compile-compiler-macro if it exists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68167
diff
changeset
|
2881 ;; Make sure that function exists. This is important |
f60a24914ee2
(byte-compile-form): Only call cl-byte-compile-compiler-macro if it exists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68167
diff
changeset
|
2882 ;; for CL compiler macros since the symbol may be |
f60a24914ee2
(byte-compile-form): Only call cl-byte-compile-compiler-macro if it exists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68167
diff
changeset
|
2883 ;; `cl-byte-compile-compiler-macro' but if CL isn't |
f60a24914ee2
(byte-compile-form): Only call cl-byte-compile-compiler-macro if it exists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68167
diff
changeset
|
2884 ;; loaded, this function doesn't exist. |
f60a24914ee2
(byte-compile-form): Only call cl-byte-compile-compiler-macro if it exists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68167
diff
changeset
|
2885 (or (not (memq handler '(cl-byte-compile-compiler-macro))) |
71674
c64592812a59
(byte-compile-form): The `byte-compile'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70674
diff
changeset
|
2886 (functionp handler)) |
69872
f60a24914ee2
(byte-compile-form): Only call cl-byte-compile-compiler-macro if it exists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68167
diff
changeset
|
2887 (not (and (byte-compile-version-cond |
f60a24914ee2
(byte-compile-form): Only call cl-byte-compile-compiler-macro if it exists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68167
diff
changeset
|
2888 byte-compile-compatibility) |
f60a24914ee2
(byte-compile-form): Only call cl-byte-compile-compiler-macro if it exists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68167
diff
changeset
|
2889 (get (get fn 'byte-opcode) 'emacs19-opcode)))) |
66317
3f882faaa9ae
(byte-compile-lambda): Add parameter add-lambda.
Lars Hansen <larsh@soem.dk>
parents:
64751
diff
changeset
|
2890 (funcall handler form) |
85730
a1e136978a9a
(byte-compile-warnings): Document `not'.
Glenn Morris <rgm@gnu.org>
parents:
85657
diff
changeset
|
2891 (when (byte-compile-warning-enabled-p 'callargs) |
62319
150380a7c3d6
(byte-compile-nogroup-warn): New function.
Richard M. Stallman <rms@gnu.org>
parents:
61966
diff
changeset
|
2892 (if (memq fn '(custom-declare-group custom-declare-variable custom-declare-face)) |
150380a7c3d6
(byte-compile-nogroup-warn): New function.
Richard M. Stallman <rms@gnu.org>
parents:
61966
diff
changeset
|
2893 (byte-compile-nogroup-warn form)) |
150380a7c3d6
(byte-compile-nogroup-warn): New function.
Richard M. Stallman <rms@gnu.org>
parents:
61966
diff
changeset
|
2894 (byte-compile-callargs-warn form)) |
46136
79f132657570
(byte-compile-warning-types):
Richard M. Stallman <rms@gnu.org>
parents:
46050
diff
changeset
|
2895 (byte-compile-normal-call form)) |
85730
a1e136978a9a
(byte-compile-warnings): Document `not'.
Glenn Morris <rgm@gnu.org>
parents:
85657
diff
changeset
|
2896 (if (byte-compile-warning-enabled-p 'cl-functions) |
46136
79f132657570
(byte-compile-warning-types):
Richard M. Stallman <rms@gnu.org>
parents:
46050
diff
changeset
|
2897 (byte-compile-cl-warn form)))) |
1819
df06a60f3362
* disass.el (disassemble): Add autoload cookie for this.
Jim Blandy <jimb@redhat.com>
parents:
1604
diff
changeset
|
2898 ((and (or (byte-code-function-p (car form)) |
757 | 2899 (eq (car-safe (car form)) 'lambda)) |
2900 ;; if the form comes out the same way it went in, that's | |
2901 ;; because it was malformed, and we couldn't unfold it. | |
2902 (not (eq form (setq form (byte-compile-unfold-lambda form))))) | |
2903 (byte-compile-form form for-effect) | |
2904 (setq for-effect nil)) | |
2905 ((byte-compile-normal-call form))) | |
2906 (if for-effect | |
2907 (byte-compile-discard))) | |
2908 | |
2909 (defun byte-compile-normal-call (form) | |
2910 (if byte-compile-generate-call-tree | |
2911 (byte-compile-annotate-call-tree form)) | |
84746 | 2912 (when (and for-effect (eq (car form) 'mapcar) |
85730
a1e136978a9a
(byte-compile-warnings): Document `not'.
Glenn Morris <rgm@gnu.org>
parents:
85657
diff
changeset
|
2913 (byte-compile-warning-enabled-p 'mapcar)) |
84736
247a13281cd8
Markus Triska <markus.triska at gmx.at>
Glenn Morris <rgm@gnu.org>
parents:
84371
diff
changeset
|
2914 (byte-compile-set-symbol-position 'mapcar) |
247a13281cd8
Markus Triska <markus.triska at gmx.at>
Glenn Morris <rgm@gnu.org>
parents:
84371
diff
changeset
|
2915 (byte-compile-warn |
247a13281cd8
Markus Triska <markus.triska at gmx.at>
Glenn Morris <rgm@gnu.org>
parents:
84371
diff
changeset
|
2916 "`mapcar' called for effect; use `mapc' or `dolist' instead")) |
757 | 2917 (byte-compile-push-constant (car form)) |
29239
86949998e6fd
(byte-compile-callargs-warn): Use subr-arity to check primitives.
Dave Love <fx@gnu.org>
parents:
28441
diff
changeset
|
2918 (mapc 'byte-compile-form (cdr form)) ; wasteful, but faster. |
757 | 2919 (byte-compile-out 'byte-call (length (cdr form)))) |
2920 | |
2921 (defun byte-compile-variable-ref (base-op var) | |
45558
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
2922 (when (symbolp var) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
2923 (byte-compile-set-symbol-position var)) |
50570
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
2924 (if (or (not (symbolp var)) |
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
2925 (byte-compile-const-symbol-p var (not (eq base-op 'byte-varref)))) |
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
2926 (byte-compile-warn |
56082
36284d653673
Put `...' around symbols in warning messages.
Richard M. Stallman <rms@gnu.org>
parents:
55694
diff
changeset
|
2927 (cond ((eq base-op 'byte-varbind) "attempt to let-bind %s `%s'") |
36284d653673
Put `...' around symbols in warning messages.
Richard M. Stallman <rms@gnu.org>
parents:
55694
diff
changeset
|
2928 ((eq base-op 'byte-varset) "variable assignment to %s `%s'") |
36284d653673
Put `...' around symbols in warning messages.
Richard M. Stallman <rms@gnu.org>
parents:
55694
diff
changeset
|
2929 (t "variable reference to %s `%s'")) |
50570
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
2930 (if (symbolp var) "constant" "nonvariable") |
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
2931 (prin1-to-string var)) |
94355
b5f8ef4e3358
(byte-compile-warn-obsolete): New function.
Glenn Morris <rgm@gnu.org>
parents:
93457
diff
changeset
|
2932 (and (get var 'byte-obsolete-variable) |
b5f8ef4e3358
(byte-compile-warn-obsolete): New function.
Glenn Morris <rgm@gnu.org>
parents:
93457
diff
changeset
|
2933 (not (eq var byte-compile-not-obsolete-var)) |
b5f8ef4e3358
(byte-compile-warn-obsolete): New function.
Glenn Morris <rgm@gnu.org>
parents:
93457
diff
changeset
|
2934 (byte-compile-warn-obsolete var)) |
85730
a1e136978a9a
(byte-compile-warnings): Document `not'.
Glenn Morris <rgm@gnu.org>
parents:
85657
diff
changeset
|
2935 (if (byte-compile-warning-enabled-p 'free-vars) |
757 | 2936 (if (eq base-op 'byte-varbind) |
50570
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
2937 (push var byte-compile-bound-variables) |
757 | 2938 (or (boundp var) |
2939 (memq var byte-compile-bound-variables) | |
2940 (if (eq base-op 'byte-varset) | |
2941 (or (memq var byte-compile-free-assignments) | |
2942 (progn | |
56082
36284d653673
Put `...' around symbols in warning messages.
Richard M. Stallman <rms@gnu.org>
parents:
55694
diff
changeset
|
2943 (byte-compile-warn "assignment to free variable `%s'" var) |
50570
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
2944 (push var byte-compile-free-assignments))) |
757 | 2945 (or (memq var byte-compile-free-references) |
2946 (progn | |
56082
36284d653673
Put `...' around symbols in warning messages.
Richard M. Stallman <rms@gnu.org>
parents:
55694
diff
changeset
|
2947 (byte-compile-warn "reference to free variable `%s'" var) |
50570
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
2948 (push var byte-compile-free-references)))))))) |
757 | 2949 (let ((tmp (assq var byte-compile-variables))) |
50570
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
2950 (unless tmp |
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
2951 (setq tmp (list var)) |
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
2952 (push tmp byte-compile-variables)) |
757 | 2953 (byte-compile-out base-op tmp))) |
2954 | |
2955 (defmacro byte-compile-get-constant (const) | |
27824 | 2956 `(or (if (stringp ,const) |
74285
bdb0d9c34bd4
(byte-compile-get-constant):
Richard M. Stallman <rms@gnu.org>
parents:
74077
diff
changeset
|
2957 ;; In a string constant, treat properties as significant. |
bdb0d9c34bd4
(byte-compile-get-constant):
Richard M. Stallman <rms@gnu.org>
parents:
74077
diff
changeset
|
2958 (let (result) |
bdb0d9c34bd4
(byte-compile-get-constant):
Richard M. Stallman <rms@gnu.org>
parents:
74077
diff
changeset
|
2959 (dolist (elt byte-compile-constants) |
bdb0d9c34bd4
(byte-compile-get-constant):
Richard M. Stallman <rms@gnu.org>
parents:
74077
diff
changeset
|
2960 (if (equal-including-properties (car elt) ,const) |
bdb0d9c34bd4
(byte-compile-get-constant):
Richard M. Stallman <rms@gnu.org>
parents:
74077
diff
changeset
|
2961 (setq result elt))) |
bdb0d9c34bd4
(byte-compile-get-constant):
Richard M. Stallman <rms@gnu.org>
parents:
74077
diff
changeset
|
2962 result) |
27824 | 2963 (assq ,const byte-compile-constants)) |
2964 (car (setq byte-compile-constants | |
2965 (cons (list ,const) byte-compile-constants))))) | |
757 | 2966 |
2967 ;; Use this when the value of a form is a constant. This obeys for-effect. | |
2968 (defun byte-compile-constant (const) | |
2969 (if for-effect | |
2970 (setq for-effect nil) | |
45558
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
2971 (when (symbolp const) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
2972 (byte-compile-set-symbol-position const)) |
757 | 2973 (byte-compile-out 'byte-constant (byte-compile-get-constant const)))) |
2974 | |
2975 ;; Use this for a constant that is not the value of its containing form. | |
2976 ;; This ignores for-effect. | |
2977 (defun byte-compile-push-constant (const) | |
2978 (let ((for-effect nil)) | |
2979 (inline (byte-compile-constant const)))) | |
2980 | |
2981 | |
2982 ;; Compile those primitive ordinary functions | |
2983 ;; which have special byte codes just for speed. | |
2984 | |
2985 (defmacro byte-defop-compiler (function &optional compile-handler) | |
2986 ;; add a compiler-form for FUNCTION. | |
2987 ;; If function is a symbol, then the variable "byte-SYMBOL" must name | |
2988 ;; the opcode to be used. If function is a list, the first element | |
2989 ;; is the function and the second element is the bytecode-symbol. | |
51289
ba101d1e9521
(byte-compile-no-warnings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
50837
diff
changeset
|
2990 ;; The second element may be nil, meaning there is no opcode. |
757 | 2991 ;; COMPILE-HANDLER is the function to use to compile this byte-op, or |
2992 ;; may be the abbreviations 0, 1, 2, 3, 0-1, or 1-2. | |
2993 ;; If it is nil, then the handler is "byte-compile-SYMBOL." | |
2994 (let (opcode) | |
2995 (if (symbolp function) | |
2996 (setq opcode (intern (concat "byte-" (symbol-name function)))) | |
2997 (setq opcode (car (cdr function)) | |
2998 function (car function))) | |
2999 (let ((fnform | |
3000 (list 'put (list 'quote function) ''byte-compile | |
3001 (list 'quote | |
3002 (or (cdr (assq compile-handler | |
3003 '((0 . byte-compile-no-args) | |
3004 (1 . byte-compile-one-arg) | |
3005 (2 . byte-compile-two-args) | |
3006 (3 . byte-compile-three-args) | |
3007 (0-1 . byte-compile-zero-or-one-arg) | |
3008 (1-2 . byte-compile-one-or-two-args) | |
3009 (2-3 . byte-compile-two-or-three-args) | |
3010 ))) | |
3011 compile-handler | |
3012 (intern (concat "byte-compile-" | |
3013 (symbol-name function)))))))) | |
3014 (if opcode | |
3015 (list 'progn fnform | |
3016 (list 'put (list 'quote function) | |
3017 ''byte-opcode (list 'quote opcode)) | |
3018 (list 'put (list 'quote opcode) | |
3019 ''byte-opcode-invert (list 'quote function))) | |
3020 fnform)))) | |
3021 | |
3022 (defmacro byte-defop-compiler19 (function &optional compile-handler) | |
3023 ;; Just like byte-defop-compiler, but defines an opcode that will only | |
3653
974055b516d9
* bytecomp.el: Bring it up to version 2.10 of the
Jim Blandy <jimb@redhat.com>
parents:
3591
diff
changeset
|
3024 ;; be used when byte-compile-compatibility is false. |
757 | 3025 (if (and (byte-compile-single-version) |
3653
974055b516d9
* bytecomp.el: Bring it up to version 2.10 of the
Jim Blandy <jimb@redhat.com>
parents:
3591
diff
changeset
|
3026 byte-compile-compatibility) |
958 | 3027 ;; #### instead of doing nothing, this should do some remprops, |
3028 ;; #### to protect against the case where a single-version compiler | |
3029 ;; #### is loaded into a world that has contained a multi-version one. | |
757 | 3030 nil |
3031 (list 'progn | |
3032 (list 'put | |
3033 (list 'quote | |
3034 (or (car (cdr-safe function)) | |
3035 (intern (concat "byte-" | |
3036 (symbol-name (or (car-safe function) function)))))) | |
3037 ''emacs19-opcode t) | |
3038 (list 'byte-defop-compiler function compile-handler)))) | |
3039 | |
3040 (defmacro byte-defop-compiler-1 (function &optional compile-handler) | |
3041 (list 'byte-defop-compiler (list function nil) compile-handler)) | |
3042 | |
3043 | |
3044 (put 'byte-call 'byte-opcode-invert 'funcall) | |
3045 (put 'byte-list1 'byte-opcode-invert 'list) | |
3046 (put 'byte-list2 'byte-opcode-invert 'list) | |
3047 (put 'byte-list3 'byte-opcode-invert 'list) | |
3048 (put 'byte-list4 'byte-opcode-invert 'list) | |
3049 (put 'byte-listN 'byte-opcode-invert 'list) | |
3050 (put 'byte-concat2 'byte-opcode-invert 'concat) | |
3051 (put 'byte-concat3 'byte-opcode-invert 'concat) | |
3052 (put 'byte-concat4 'byte-opcode-invert 'concat) | |
3053 (put 'byte-concatN 'byte-opcode-invert 'concat) | |
3054 (put 'byte-insertN 'byte-opcode-invert 'insert) | |
3055 | |
3056 (byte-defop-compiler point 0) | |
3057 ;;(byte-defop-compiler mark 0) ;; obsolete | |
3058 (byte-defop-compiler point-max 0) | |
3059 (byte-defop-compiler point-min 0) | |
3060 (byte-defop-compiler following-char 0) | |
3061 (byte-defop-compiler preceding-char 0) | |
3062 (byte-defop-compiler current-column 0) | |
3063 (byte-defop-compiler eolp 0) | |
3064 (byte-defop-compiler eobp 0) | |
3065 (byte-defop-compiler bolp 0) | |
3066 (byte-defop-compiler bobp 0) | |
3067 (byte-defop-compiler current-buffer 0) | |
3068 ;;(byte-defop-compiler read-char 0) ;; obsolete | |
3069 (byte-defop-compiler interactive-p 0) | |
3070 (byte-defop-compiler19 widen 0) | |
3071 (byte-defop-compiler19 end-of-line 0-1) | |
3072 (byte-defop-compiler19 forward-char 0-1) | |
3073 (byte-defop-compiler19 forward-line 0-1) | |
3074 (byte-defop-compiler symbolp 1) | |
3075 (byte-defop-compiler consp 1) | |
3076 (byte-defop-compiler stringp 1) | |
3077 (byte-defop-compiler listp 1) | |
3078 (byte-defop-compiler not 1) | |
3079 (byte-defop-compiler (null byte-not) 1) | |
3080 (byte-defop-compiler car 1) | |
3081 (byte-defop-compiler cdr 1) | |
3082 (byte-defop-compiler length 1) | |
3083 (byte-defop-compiler symbol-value 1) | |
3084 (byte-defop-compiler symbol-function 1) | |
3085 (byte-defop-compiler (1+ byte-add1) 1) | |
3086 (byte-defop-compiler (1- byte-sub1) 1) | |
3087 (byte-defop-compiler goto-char 1) | |
18722
3905119ebc75
(char-after): Allow 0 args.
Richard M. Stallman <rms@gnu.org>
parents:
18391
diff
changeset
|
3088 (byte-defop-compiler char-after 0-1) |
757 | 3089 (byte-defop-compiler set-buffer 1) |
3090 ;;(byte-defop-compiler set-mark 1) ;; obsolete | |
56657
7d44c5003aa7
(forward-word): Allow 0 args.
John Paul Wallington <jpw@pobox.com>
parents:
56082
diff
changeset
|
3091 (byte-defop-compiler19 forward-word 0-1) |
757 | 3092 (byte-defop-compiler19 char-syntax 1) |
3093 (byte-defop-compiler19 nreverse 1) | |
3094 (byte-defop-compiler19 car-safe 1) | |
3095 (byte-defop-compiler19 cdr-safe 1) | |
3096 (byte-defop-compiler19 numberp 1) | |
3097 (byte-defop-compiler19 integerp 1) | |
3098 (byte-defop-compiler19 skip-chars-forward 1-2) | |
3099 (byte-defop-compiler19 skip-chars-backward 1-2) | |
3100 (byte-defop-compiler eq 2) | |
3101 (byte-defop-compiler memq 2) | |
3102 (byte-defop-compiler cons 2) | |
3103 (byte-defop-compiler aref 2) | |
3104 (byte-defop-compiler set 2) | |
3105 (byte-defop-compiler (= byte-eqlsign) 2) | |
3106 (byte-defop-compiler (< byte-lss) 2) | |
3107 (byte-defop-compiler (> byte-gtr) 2) | |
3108 (byte-defop-compiler (<= byte-leq) 2) | |
3109 (byte-defop-compiler (>= byte-geq) 2) | |
3110 (byte-defop-compiler get 2) | |
3111 (byte-defop-compiler nth 2) | |
3112 (byte-defop-compiler substring 2-3) | |
958 | 3113 (byte-defop-compiler19 (move-marker byte-set-marker) 2-3) |
757 | 3114 (byte-defop-compiler19 set-marker 2-3) |
3115 (byte-defop-compiler19 match-beginning 1) | |
3116 (byte-defop-compiler19 match-end 1) | |
3117 (byte-defop-compiler19 upcase 1) | |
3118 (byte-defop-compiler19 downcase 1) | |
3119 (byte-defop-compiler19 string= 2) | |
3120 (byte-defop-compiler19 string< 2) | |
958 | 3121 (byte-defop-compiler19 (string-equal byte-string=) 2) |
3122 (byte-defop-compiler19 (string-lessp byte-string<) 2) | |
757 | 3123 (byte-defop-compiler19 equal 2) |
3124 (byte-defop-compiler19 nthcdr 2) | |
3125 (byte-defop-compiler19 elt 2) | |
3126 (byte-defop-compiler19 member 2) | |
3127 (byte-defop-compiler19 assq 2) | |
958 | 3128 (byte-defop-compiler19 (rplaca byte-setcar) 2) |
3129 (byte-defop-compiler19 (rplacd byte-setcdr) 2) | |
757 | 3130 (byte-defop-compiler19 setcar 2) |
3131 (byte-defop-compiler19 setcdr 2) | |
3132 (byte-defop-compiler19 buffer-substring 2) | |
3133 (byte-defop-compiler19 delete-region 2) | |
3134 (byte-defop-compiler19 narrow-to-region 2) | |
3135 (byte-defop-compiler19 (% byte-rem) 2) | |
3136 (byte-defop-compiler aset 3) | |
3137 | |
3138 (byte-defop-compiler max byte-compile-associative) | |
3139 (byte-defop-compiler min byte-compile-associative) | |
3140 (byte-defop-compiler (+ byte-plus) byte-compile-associative) | |
3141 (byte-defop-compiler19 (* byte-mult) byte-compile-associative) | |
3142 | |
3143 ;;####(byte-defop-compiler19 move-to-column 1) | |
3144 (byte-defop-compiler-1 interactive byte-compile-noop) | |
3145 | |
3146 | |
3147 (defun byte-compile-subr-wrong-args (form n) | |
45558
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
3148 (byte-compile-set-symbol-position (car form)) |
56082
36284d653673
Put `...' around symbols in warning messages.
Richard M. Stallman <rms@gnu.org>
parents:
55694
diff
changeset
|
3149 (byte-compile-warn "`%s' called with %d arg%s, but requires %s" |
757 | 3150 (car form) (length (cdr form)) |
3151 (if (= 1 (length (cdr form))) "" "s") n) | |
3152 ;; get run-time wrong-number-of-args error. | |
3153 (byte-compile-normal-call form)) | |
3154 | |
3155 (defun byte-compile-no-args (form) | |
3156 (if (not (= (length form) 1)) | |
3157 (byte-compile-subr-wrong-args form "none") | |
3158 (byte-compile-out (get (car form) 'byte-opcode) 0))) | |
3159 | |
3160 (defun byte-compile-one-arg (form) | |
3161 (if (not (= (length form) 2)) | |
3162 (byte-compile-subr-wrong-args form 1) | |
3163 (byte-compile-form (car (cdr form))) ;; Push the argument | |
3164 (byte-compile-out (get (car form) 'byte-opcode) 0))) | |
3165 | |
3166 (defun byte-compile-two-args (form) | |
3167 (if (not (= (length form) 3)) | |
3168 (byte-compile-subr-wrong-args form 2) | |
3169 (byte-compile-form (car (cdr form))) ;; Push the arguments | |
3170 (byte-compile-form (nth 2 form)) | |
3171 (byte-compile-out (get (car form) 'byte-opcode) 0))) | |
3172 | |
3173 (defun byte-compile-three-args (form) | |
3174 (if (not (= (length form) 4)) | |
3175 (byte-compile-subr-wrong-args form 3) | |
3176 (byte-compile-form (car (cdr form))) ;; Push the arguments | |
3177 (byte-compile-form (nth 2 form)) | |
3178 (byte-compile-form (nth 3 form)) | |
3179 (byte-compile-out (get (car form) 'byte-opcode) 0))) | |
3180 | |
3181 (defun byte-compile-zero-or-one-arg (form) | |
3182 (let ((len (length form))) | |
3183 (cond ((= len 1) (byte-compile-one-arg (append form '(nil)))) | |
3184 ((= len 2) (byte-compile-one-arg form)) | |
3185 (t (byte-compile-subr-wrong-args form "0-1"))))) | |
3186 | |
3187 (defun byte-compile-one-or-two-args (form) | |
3188 (let ((len (length form))) | |
3189 (cond ((= len 2) (byte-compile-two-args (append form '(nil)))) | |
3190 ((= len 3) (byte-compile-two-args form)) | |
3191 (t (byte-compile-subr-wrong-args form "1-2"))))) | |
3192 | |
3193 (defun byte-compile-two-or-three-args (form) | |
3194 (let ((len (length form))) | |
3195 (cond ((= len 3) (byte-compile-three-args (append form '(nil)))) | |
3196 ((= len 4) (byte-compile-three-args form)) | |
3197 (t (byte-compile-subr-wrong-args form "2-3"))))) | |
3198 | |
3199 (defun byte-compile-noop (form) | |
3200 (byte-compile-constant nil)) | |
3201 | |
3202 (defun byte-compile-discard () | |
3203 (byte-compile-out 'byte-discard 0)) | |
3204 | |
3205 | |
3206 ;; Compile a function that accepts one or more args and is right-associative. | |
13474
3e7f6fdc234d
(byte-compile-associative): Do operations left to right.
Richard M. Stallman <rms@gnu.org>
parents:
13403
diff
changeset
|
3207 ;; We do it by left-associativity so that the operations |
3e7f6fdc234d
(byte-compile-associative): Do operations left to right.
Richard M. Stallman <rms@gnu.org>
parents:
13403
diff
changeset
|
3208 ;; are done in the same order as in interpreted code. |
15972
b741b3129c1b
(byte-compile-associative): Treat one arg case like (+ x 0).
Richard M. Stallman <rms@gnu.org>
parents:
15954
diff
changeset
|
3209 ;; We treat the one-arg case, as in (+ x), like (+ x 0). |
b741b3129c1b
(byte-compile-associative): Treat one arg case like (+ x 0).
Richard M. Stallman <rms@gnu.org>
parents:
15954
diff
changeset
|
3210 ;; in order to convert markers to numbers, and trigger expected errors. |
757 | 3211 (defun byte-compile-associative (form) |
3212 (if (cdr form) | |
13474
3e7f6fdc234d
(byte-compile-associative): Do operations left to right.
Richard M. Stallman <rms@gnu.org>
parents:
13403
diff
changeset
|
3213 (let ((opcode (get (car form) 'byte-opcode)) |
3e7f6fdc234d
(byte-compile-associative): Do operations left to right.
Richard M. Stallman <rms@gnu.org>
parents:
13403
diff
changeset
|
3214 (args (copy-sequence (cdr form)))) |
3e7f6fdc234d
(byte-compile-associative): Do operations left to right.
Richard M. Stallman <rms@gnu.org>
parents:
13403
diff
changeset
|
3215 (byte-compile-form (car args)) |
3e7f6fdc234d
(byte-compile-associative): Do operations left to right.
Richard M. Stallman <rms@gnu.org>
parents:
13403
diff
changeset
|
3216 (setq args (cdr args)) |
15972
b741b3129c1b
(byte-compile-associative): Treat one arg case like (+ x 0).
Richard M. Stallman <rms@gnu.org>
parents:
15954
diff
changeset
|
3217 (or args (setq args '(0) |
b741b3129c1b
(byte-compile-associative): Treat one arg case like (+ x 0).
Richard M. Stallman <rms@gnu.org>
parents:
15954
diff
changeset
|
3218 opcode (get '+ 'byte-opcode))) |
50570
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
3219 (dolist (arg args) |
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
3220 (byte-compile-form arg) |
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
3221 (byte-compile-out opcode 0))) |
757 | 3222 (byte-compile-constant (eval form)))) |
3223 | |
3224 | |
3225 ;; more complicated compiler macros | |
3226 | |
77096
14feb20665af
Markus Triska <markus.triska at gmx.at>:
Glenn Morris <rgm@gnu.org>
parents:
76740
diff
changeset
|
3227 (byte-defop-compiler char-before) |
77119
8e8844e56964
Markus Triska <markus.triska at gmx.at>:
Glenn Morris <rgm@gnu.org>
parents:
77096
diff
changeset
|
3228 (byte-defop-compiler backward-char) |
8e8844e56964
Markus Triska <markus.triska at gmx.at>:
Glenn Morris <rgm@gnu.org>
parents:
77096
diff
changeset
|
3229 (byte-defop-compiler backward-word) |
757 | 3230 (byte-defop-compiler list) |
3231 (byte-defop-compiler concat) | |
3232 (byte-defop-compiler fset) | |
3233 (byte-defop-compiler (indent-to-column byte-indent-to) byte-compile-indent-to) | |
3234 (byte-defop-compiler indent-to) | |
3235 (byte-defop-compiler insert) | |
3236 (byte-defop-compiler-1 function byte-compile-function-form) | |
3237 (byte-defop-compiler-1 - byte-compile-minus) | |
3238 (byte-defop-compiler19 (/ byte-quo) byte-compile-quo) | |
3239 (byte-defop-compiler19 nconc) | |
3240 | |
77096
14feb20665af
Markus Triska <markus.triska at gmx.at>:
Glenn Morris <rgm@gnu.org>
parents:
76740
diff
changeset
|
3241 (defun byte-compile-char-before (form) |
14feb20665af
Markus Triska <markus.triska at gmx.at>:
Glenn Morris <rgm@gnu.org>
parents:
76740
diff
changeset
|
3242 (cond ((= 2 (length form)) |
77119
8e8844e56964
Markus Triska <markus.triska at gmx.at>:
Glenn Morris <rgm@gnu.org>
parents:
77096
diff
changeset
|
3243 (byte-compile-form (list 'char-after (if (numberp (nth 1 form)) |
8e8844e56964
Markus Triska <markus.triska at gmx.at>:
Glenn Morris <rgm@gnu.org>
parents:
77096
diff
changeset
|
3244 (1- (nth 1 form)) |
8e8844e56964
Markus Triska <markus.triska at gmx.at>:
Glenn Morris <rgm@gnu.org>
parents:
77096
diff
changeset
|
3245 `(1- ,(nth 1 form)))))) |
8e8844e56964
Markus Triska <markus.triska at gmx.at>:
Glenn Morris <rgm@gnu.org>
parents:
77096
diff
changeset
|
3246 ((= 1 (length form)) |
8e8844e56964
Markus Triska <markus.triska at gmx.at>:
Glenn Morris <rgm@gnu.org>
parents:
77096
diff
changeset
|
3247 (byte-compile-form '(char-after (1- (point))))) |
8e8844e56964
Markus Triska <markus.triska at gmx.at>:
Glenn Morris <rgm@gnu.org>
parents:
77096
diff
changeset
|
3248 (t (byte-compile-subr-wrong-args form "0-1")))) |
8e8844e56964
Markus Triska <markus.triska at gmx.at>:
Glenn Morris <rgm@gnu.org>
parents:
77096
diff
changeset
|
3249 |
8e8844e56964
Markus Triska <markus.triska at gmx.at>:
Glenn Morris <rgm@gnu.org>
parents:
77096
diff
changeset
|
3250 ;; backward-... ==> forward-... with negated argument. |
8e8844e56964
Markus Triska <markus.triska at gmx.at>:
Glenn Morris <rgm@gnu.org>
parents:
77096
diff
changeset
|
3251 (defun byte-compile-backward-char (form) |
8e8844e56964
Markus Triska <markus.triska at gmx.at>:
Glenn Morris <rgm@gnu.org>
parents:
77096
diff
changeset
|
3252 (cond ((= 2 (length form)) |
8e8844e56964
Markus Triska <markus.triska at gmx.at>:
Glenn Morris <rgm@gnu.org>
parents:
77096
diff
changeset
|
3253 (byte-compile-form (list 'forward-char (if (numberp (nth 1 form)) |
8e8844e56964
Markus Triska <markus.triska at gmx.at>:
Glenn Morris <rgm@gnu.org>
parents:
77096
diff
changeset
|
3254 (- (nth 1 form)) |
8e8844e56964
Markus Triska <markus.triska at gmx.at>:
Glenn Morris <rgm@gnu.org>
parents:
77096
diff
changeset
|
3255 `(- ,(nth 1 form)))))) |
8e8844e56964
Markus Triska <markus.triska at gmx.at>:
Glenn Morris <rgm@gnu.org>
parents:
77096
diff
changeset
|
3256 ((= 1 (length form)) |
8e8844e56964
Markus Triska <markus.triska at gmx.at>:
Glenn Morris <rgm@gnu.org>
parents:
77096
diff
changeset
|
3257 (byte-compile-form '(forward-char -1))) |
8e8844e56964
Markus Triska <markus.triska at gmx.at>:
Glenn Morris <rgm@gnu.org>
parents:
77096
diff
changeset
|
3258 (t (byte-compile-subr-wrong-args form "0-1")))) |
8e8844e56964
Markus Triska <markus.triska at gmx.at>:
Glenn Morris <rgm@gnu.org>
parents:
77096
diff
changeset
|
3259 |
8e8844e56964
Markus Triska <markus.triska at gmx.at>:
Glenn Morris <rgm@gnu.org>
parents:
77096
diff
changeset
|
3260 (defun byte-compile-backward-word (form) |
8e8844e56964
Markus Triska <markus.triska at gmx.at>:
Glenn Morris <rgm@gnu.org>
parents:
77096
diff
changeset
|
3261 (cond ((= 2 (length form)) |
8e8844e56964
Markus Triska <markus.triska at gmx.at>:
Glenn Morris <rgm@gnu.org>
parents:
77096
diff
changeset
|
3262 (byte-compile-form (list 'forward-word (if (numberp (nth 1 form)) |
8e8844e56964
Markus Triska <markus.triska at gmx.at>:
Glenn Morris <rgm@gnu.org>
parents:
77096
diff
changeset
|
3263 (- (nth 1 form)) |
8e8844e56964
Markus Triska <markus.triska at gmx.at>:
Glenn Morris <rgm@gnu.org>
parents:
77096
diff
changeset
|
3264 `(- ,(nth 1 form)))))) |
8e8844e56964
Markus Triska <markus.triska at gmx.at>:
Glenn Morris <rgm@gnu.org>
parents:
77096
diff
changeset
|
3265 ((= 1 (length form)) |
8e8844e56964
Markus Triska <markus.triska at gmx.at>:
Glenn Morris <rgm@gnu.org>
parents:
77096
diff
changeset
|
3266 (byte-compile-form '(forward-word -1))) |
8e8844e56964
Markus Triska <markus.triska at gmx.at>:
Glenn Morris <rgm@gnu.org>
parents:
77096
diff
changeset
|
3267 (t (byte-compile-subr-wrong-args form "0-1")))) |
77096
14feb20665af
Markus Triska <markus.triska at gmx.at>:
Glenn Morris <rgm@gnu.org>
parents:
76740
diff
changeset
|
3268 |
757 | 3269 (defun byte-compile-list (form) |
3270 (let ((count (length (cdr form)))) | |
3271 (cond ((= count 0) | |
3272 (byte-compile-constant nil)) | |
3273 ((< count 5) | |
29239
86949998e6fd
(byte-compile-callargs-warn): Use subr-arity to check primitives.
Dave Love <fx@gnu.org>
parents:
28441
diff
changeset
|
3274 (mapc 'byte-compile-form (cdr form)) |
757 | 3275 (byte-compile-out |
3276 (aref [byte-list1 byte-list2 byte-list3 byte-list4] (1- count)) 0)) | |
3653
974055b516d9
* bytecomp.el: Bring it up to version 2.10 of the
Jim Blandy <jimb@redhat.com>
parents:
3591
diff
changeset
|
3277 ((and (< count 256) (not (byte-compile-version-cond |
974055b516d9
* bytecomp.el: Bring it up to version 2.10 of the
Jim Blandy <jimb@redhat.com>
parents:
3591
diff
changeset
|
3278 byte-compile-compatibility))) |
29239
86949998e6fd
(byte-compile-callargs-warn): Use subr-arity to check primitives.
Dave Love <fx@gnu.org>
parents:
28441
diff
changeset
|
3279 (mapc 'byte-compile-form (cdr form)) |
757 | 3280 (byte-compile-out 'byte-listN count)) |
3281 (t (byte-compile-normal-call form))))) | |
3282 | |
3283 (defun byte-compile-concat (form) | |
3284 (let ((count (length (cdr form)))) | |
3285 (cond ((and (< 1 count) (< count 5)) | |
29239
86949998e6fd
(byte-compile-callargs-warn): Use subr-arity to check primitives.
Dave Love <fx@gnu.org>
parents:
28441
diff
changeset
|
3286 (mapc 'byte-compile-form (cdr form)) |
757 | 3287 (byte-compile-out |
3288 (aref [byte-concat2 byte-concat3 byte-concat4] (- count 2)) | |
3289 0)) | |
3290 ;; Concat of one arg is not a no-op if arg is not a string. | |
3291 ((= count 0) | |
3292 (byte-compile-form "")) | |
3653
974055b516d9
* bytecomp.el: Bring it up to version 2.10 of the
Jim Blandy <jimb@redhat.com>
parents:
3591
diff
changeset
|
3293 ((and (< count 256) (not (byte-compile-version-cond |
974055b516d9
* bytecomp.el: Bring it up to version 2.10 of the
Jim Blandy <jimb@redhat.com>
parents:
3591
diff
changeset
|
3294 byte-compile-compatibility))) |
29239
86949998e6fd
(byte-compile-callargs-warn): Use subr-arity to check primitives.
Dave Love <fx@gnu.org>
parents:
28441
diff
changeset
|
3295 (mapc 'byte-compile-form (cdr form)) |
757 | 3296 (byte-compile-out 'byte-concatN count)) |
3297 ((byte-compile-normal-call form))))) | |
3298 | |
3299 (defun byte-compile-minus (form) | |
3300 (if (null (setq form (cdr form))) | |
3301 (byte-compile-constant 0) | |
3302 (byte-compile-form (car form)) | |
3303 (if (cdr form) | |
3304 (while (setq form (cdr form)) | |
3305 (byte-compile-form (car form)) | |
3306 (byte-compile-out 'byte-diff 0)) | |
3307 (byte-compile-out 'byte-negate 0)))) | |
3308 | |
3309 (defun byte-compile-quo (form) | |
3310 (let ((len (length form))) | |
3311 (cond ((<= len 2) | |
3312 (byte-compile-subr-wrong-args form "2 or more")) | |
3313 (t | |
3314 (byte-compile-form (car (setq form (cdr form)))) | |
3315 (while (setq form (cdr form)) | |
3316 (byte-compile-form (car form)) | |
3317 (byte-compile-out 'byte-quo 0)))))) | |
3318 | |
3319 (defun byte-compile-nconc (form) | |
3320 (let ((len (length form))) | |
3321 (cond ((= len 1) | |
3322 (byte-compile-constant nil)) | |
3323 ((= len 2) | |
3324 ;; nconc of one arg is a noop, even if that arg isn't a list. | |
3325 (byte-compile-form (nth 1 form))) | |
3326 (t | |
3327 (byte-compile-form (car (setq form (cdr form)))) | |
3328 (while (setq form (cdr form)) | |
3329 (byte-compile-form (car form)) | |
3330 (byte-compile-out 'byte-nconc 0)))))) | |
3331 | |
3332 (defun byte-compile-fset (form) | |
3333 ;; warn about forms like (fset 'foo '(lambda () ...)) | |
3334 ;; (where the lambda expression is non-trivial...) | |
3335 (let ((fn (nth 2 form)) | |
3336 body) | |
3337 (if (and (eq (car-safe fn) 'quote) | |
3338 (eq (car-safe (setq fn (nth 1 fn))) 'lambda)) | |
3339 (progn | |
3340 (setq body (cdr (cdr fn))) | |
3341 (if (stringp (car body)) (setq body (cdr body))) | |
3342 (if (eq 'interactive (car-safe (car body))) (setq body (cdr body))) | |
3343 (if (and (consp (car body)) | |
3344 (not (eq 'byte-code (car (car body))))) | |
3345 (byte-compile-warn | |
56082
36284d653673
Put `...' around symbols in warning messages.
Richard M. Stallman <rms@gnu.org>
parents:
55694
diff
changeset
|
3346 "A quoted lambda form is the second argument of `fset'. This is probably |
757 | 3347 not what you want, as that lambda cannot be compiled. Consider using |
3348 the syntax (function (lambda (...) ...)) instead."))))) | |
3349 (byte-compile-two-args form)) | |
3350 | |
3351 (defun byte-compile-funarg (form) | |
3352 ;; (mapcar '(lambda (x) ..) ..) ==> (mapcar (function (lambda (x) ..)) ..) | |
3591
507f64624555
Apply typo patches from Paul Eggert.
Jim Blandy <jimb@redhat.com>
parents:
3455
diff
changeset
|
3353 ;; for cases where it's guaranteed that first arg will be used as a lambda. |
757 | 3354 (byte-compile-normal-call |
3355 (let ((fn (nth 1 form))) | |
3356 (if (and (eq (car-safe fn) 'quote) | |
3357 (eq (car-safe (nth 1 fn)) 'lambda)) | |
3358 (cons (car form) | |
3359 (cons (cons 'function (cdr fn)) | |
3360 (cdr (cdr form)))) | |
3361 form)))) | |
3362 | |
15953
38a50022d610
(byte-compile-funarg-2): New function,
Richard M. Stallman <rms@gnu.org>
parents:
15930
diff
changeset
|
3363 (defun byte-compile-funarg-2 (form) |
38a50022d610
(byte-compile-funarg-2): New function,
Richard M. Stallman <rms@gnu.org>
parents:
15930
diff
changeset
|
3364 ;; (sort ... '(lambda (x) ..)) ==> (sort ... (function (lambda (x) ..))) |
38a50022d610
(byte-compile-funarg-2): New function,
Richard M. Stallman <rms@gnu.org>
parents:
15930
diff
changeset
|
3365 ;; for cases where it's guaranteed that second arg will be used as a lambda. |
38a50022d610
(byte-compile-funarg-2): New function,
Richard M. Stallman <rms@gnu.org>
parents:
15930
diff
changeset
|
3366 (byte-compile-normal-call |
38a50022d610
(byte-compile-funarg-2): New function,
Richard M. Stallman <rms@gnu.org>
parents:
15930
diff
changeset
|
3367 (let ((fn (nth 2 form))) |
38a50022d610
(byte-compile-funarg-2): New function,
Richard M. Stallman <rms@gnu.org>
parents:
15930
diff
changeset
|
3368 (if (and (eq (car-safe fn) 'quote) |
38a50022d610
(byte-compile-funarg-2): New function,
Richard M. Stallman <rms@gnu.org>
parents:
15930
diff
changeset
|
3369 (eq (car-safe (nth 1 fn)) 'lambda)) |
38a50022d610
(byte-compile-funarg-2): New function,
Richard M. Stallman <rms@gnu.org>
parents:
15930
diff
changeset
|
3370 (cons (car form) |
38a50022d610
(byte-compile-funarg-2): New function,
Richard M. Stallman <rms@gnu.org>
parents:
15930
diff
changeset
|
3371 (cons (nth 1 form) |
38a50022d610
(byte-compile-funarg-2): New function,
Richard M. Stallman <rms@gnu.org>
parents:
15930
diff
changeset
|
3372 (cons (cons 'function (cdr fn)) |
38a50022d610
(byte-compile-funarg-2): New function,
Richard M. Stallman <rms@gnu.org>
parents:
15930
diff
changeset
|
3373 (cdr (cdr (cdr form)))))) |
38a50022d610
(byte-compile-funarg-2): New function,
Richard M. Stallman <rms@gnu.org>
parents:
15930
diff
changeset
|
3374 form)))) |
38a50022d610
(byte-compile-funarg-2): New function,
Richard M. Stallman <rms@gnu.org>
parents:
15930
diff
changeset
|
3375 |
757 | 3376 ;; (function foo) must compile like 'foo, not like (symbol-function 'foo). |
3377 ;; Otherwise it will be incompatible with the interpreter, | |
3378 ;; and (funcall (function foo)) will lose with autoloads. | |
3379 | |
3380 (defun byte-compile-function-form (form) | |
3381 (byte-compile-constant | |
3382 (cond ((symbolp (nth 1 form)) | |
3383 (nth 1 form)) | |
3384 ;; If we're not allowed to use #[] syntax, then output a form like | |
3385 ;; '(lambda (..) (byte-code ..)) instead of a call to make-byte-code. | |
3386 ;; In this situation, calling make-byte-code at run-time will usually | |
3387 ;; be less efficient than processing a call to byte-code. | |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
3388 ((byte-compile-version-cond byte-compile-compatibility) |
757 | 3389 (byte-compile-byte-code-unmake (byte-compile-lambda (nth 1 form)))) |
3390 ((byte-compile-lambda (nth 1 form)))))) | |
3391 | |
3392 (defun byte-compile-indent-to (form) | |
3393 (let ((len (length form))) | |
3394 (cond ((= len 2) | |
3395 (byte-compile-form (car (cdr form))) | |
3396 (byte-compile-out 'byte-indent-to 0)) | |
3397 ((= len 3) | |
3398 ;; no opcode for 2-arg case. | |
3399 (byte-compile-normal-call form)) | |
3400 (t | |
3401 (byte-compile-subr-wrong-args form "1-2"))))) | |
3402 | |
3403 (defun byte-compile-insert (form) | |
3404 (cond ((null (cdr form)) | |
3405 (byte-compile-constant nil)) | |
3653
974055b516d9
* bytecomp.el: Bring it up to version 2.10 of the
Jim Blandy <jimb@redhat.com>
parents:
3591
diff
changeset
|
3406 ((and (not (byte-compile-version-cond |
974055b516d9
* bytecomp.el: Bring it up to version 2.10 of the
Jim Blandy <jimb@redhat.com>
parents:
3591
diff
changeset
|
3407 byte-compile-compatibility)) |
757 | 3408 (<= (length form) 256)) |
29239
86949998e6fd
(byte-compile-callargs-warn): Use subr-arity to check primitives.
Dave Love <fx@gnu.org>
parents:
28441
diff
changeset
|
3409 (mapc 'byte-compile-form (cdr form)) |
757 | 3410 (if (cdr (cdr form)) |
3411 (byte-compile-out 'byte-insertN (length (cdr form))) | |
3412 (byte-compile-out 'byte-insert 0))) | |
3413 ((memq t (mapcar 'consp (cdr (cdr form)))) | |
3414 (byte-compile-normal-call form)) | |
3415 ;; We can split it; there is no function call after inserting 1st arg. | |
3416 (t | |
3417 (while (setq form (cdr form)) | |
3418 (byte-compile-form (car form)) | |
3419 (byte-compile-out 'byte-insert 0) | |
3420 (if (cdr form) | |
3421 (byte-compile-discard)))))) | |
3422 | |
3423 | |
3424 (byte-defop-compiler-1 setq) | |
3425 (byte-defop-compiler-1 setq-default) | |
3426 (byte-defop-compiler-1 quote) | |
3427 (byte-defop-compiler-1 quote-form) | |
3428 | |
3429 (defun byte-compile-setq (form) | |
3430 (let ((args (cdr form))) | |
3431 (if args | |
3432 (while args | |
3433 (byte-compile-form (car (cdr args))) | |
3434 (or for-effect (cdr (cdr args)) | |
3435 (byte-compile-out 'byte-dup 0)) | |
3436 (byte-compile-variable-ref 'byte-varset (car args)) | |
3437 (setq args (cdr (cdr args)))) | |
3438 ;; (setq), with no arguments. | |
3439 (byte-compile-form nil for-effect)) | |
3440 (setq for-effect nil))) | |
3441 | |
3442 (defun byte-compile-setq-default (form) | |
4049
7908fc6e4fb9
(byte-compile-setq-default):
Richard M. Stallman <rms@gnu.org>
parents:
4013
diff
changeset
|
3443 (let ((args (cdr form)) |
7908fc6e4fb9
(byte-compile-setq-default):
Richard M. Stallman <rms@gnu.org>
parents:
4013
diff
changeset
|
3444 setters) |
7908fc6e4fb9
(byte-compile-setq-default):
Richard M. Stallman <rms@gnu.org>
parents:
4013
diff
changeset
|
3445 (while args |
7908fc6e4fb9
(byte-compile-setq-default):
Richard M. Stallman <rms@gnu.org>
parents:
4013
diff
changeset
|
3446 (setq setters |
7908fc6e4fb9
(byte-compile-setq-default):
Richard M. Stallman <rms@gnu.org>
parents:
4013
diff
changeset
|
3447 (cons (list 'set-default (list 'quote (car args)) (car (cdr args))) |
7908fc6e4fb9
(byte-compile-setq-default):
Richard M. Stallman <rms@gnu.org>
parents:
4013
diff
changeset
|
3448 setters)) |
7908fc6e4fb9
(byte-compile-setq-default):
Richard M. Stallman <rms@gnu.org>
parents:
4013
diff
changeset
|
3449 (setq args (cdr (cdr args)))) |
7908fc6e4fb9
(byte-compile-setq-default):
Richard M. Stallman <rms@gnu.org>
parents:
4013
diff
changeset
|
3450 (byte-compile-form (cons 'progn (nreverse setters))))) |
757 | 3451 |
3452 (defun byte-compile-quote (form) | |
3453 (byte-compile-constant (car (cdr form)))) | |
3454 | |
3455 (defun byte-compile-quote-form (form) | |
3456 (byte-compile-constant (byte-compile-top-level (nth 1 form)))) | |
3457 | |
3458 | |
3459 ;;; control structures | |
3460 | |
3461 (defun byte-compile-body (body &optional for-effect) | |
3462 (while (cdr body) | |
3463 (byte-compile-form (car body) t) | |
3464 (setq body (cdr body))) | |
3465 (byte-compile-form (car body) for-effect)) | |
3466 | |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
3467 (defsubst byte-compile-body-do-effect (body) |
757 | 3468 (byte-compile-body body for-effect) |
3469 (setq for-effect nil)) | |
3470 | |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
3471 (defsubst byte-compile-form-do-effect (form) |
757 | 3472 (byte-compile-form form for-effect) |
3473 (setq for-effect nil)) | |
3474 | |
3475 (byte-defop-compiler-1 inline byte-compile-progn) | |
3476 (byte-defop-compiler-1 progn) | |
3477 (byte-defop-compiler-1 prog1) | |
3478 (byte-defop-compiler-1 prog2) | |
3479 (byte-defop-compiler-1 if) | |
3480 (byte-defop-compiler-1 cond) | |
3481 (byte-defop-compiler-1 and) | |
3482 (byte-defop-compiler-1 or) | |
3483 (byte-defop-compiler-1 while) | |
3484 (byte-defop-compiler-1 funcall) | |
3485 (byte-defop-compiler-1 apply byte-compile-funarg) | |
3486 (byte-defop-compiler-1 mapcar byte-compile-funarg) | |
3487 (byte-defop-compiler-1 mapatoms byte-compile-funarg) | |
3488 (byte-defop-compiler-1 mapconcat byte-compile-funarg) | |
31211 | 3489 (byte-defop-compiler-1 mapc byte-compile-funarg) |
48468 | 3490 (byte-defop-compiler-1 maphash byte-compile-funarg) |
3491 (byte-defop-compiler-1 map-char-table byte-compile-funarg) | |
88777 | 3492 (byte-defop-compiler-1 map-char-table byte-compile-funarg-2) |
3493 ;; map-charset-chars should be funarg but has optional third arg | |
15953
38a50022d610
(byte-compile-funarg-2): New function,
Richard M. Stallman <rms@gnu.org>
parents:
15930
diff
changeset
|
3494 (byte-defop-compiler-1 sort byte-compile-funarg-2) |
757 | 3495 (byte-defop-compiler-1 let) |
3496 (byte-defop-compiler-1 let*) | |
3497 | |
3498 (defun byte-compile-progn (form) | |
3499 (byte-compile-body-do-effect (cdr form))) | |
3500 | |
3501 (defun byte-compile-prog1 (form) | |
3502 (byte-compile-form-do-effect (car (cdr form))) | |
3503 (byte-compile-body (cdr (cdr form)) t)) | |
3504 | |
3505 (defun byte-compile-prog2 (form) | |
3506 (byte-compile-form (nth 1 form) t) | |
3507 (byte-compile-form-do-effect (nth 2 form)) | |
3508 (byte-compile-body (cdr (cdr (cdr form))) t)) | |
3509 | |
3510 (defmacro byte-compile-goto-if (cond discard tag) | |
27824 | 3511 `(byte-compile-goto |
3512 (if ,cond | |
3513 (if ,discard 'byte-goto-if-not-nil 'byte-goto-if-not-nil-else-pop) | |
3514 (if ,discard 'byte-goto-if-nil 'byte-goto-if-nil-else-pop)) | |
3515 ,tag)) | |
757 | 3516 |
86003
e33327200372
* emacs-lisp/byte-opt.el (byte-optimize-featurep): Optimize
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85989
diff
changeset
|
3517 ;; Return the list of items in CONDITION-PARAM that match PRED-LIST. |
e33327200372
* emacs-lisp/byte-opt.el (byte-optimize-featurep): Optimize
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85989
diff
changeset
|
3518 ;; Only return items that are not in ONLY-IF-NOT-PRESENT. |
86452
ff400c9a8768
(batch-byte-recompile-directory): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
86336
diff
changeset
|
3519 (defun byte-compile-find-bound-condition (condition-param |
ff400c9a8768
(batch-byte-recompile-directory): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
86336
diff
changeset
|
3520 pred-list |
86003
e33327200372
* emacs-lisp/byte-opt.el (byte-optimize-featurep): Optimize
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85989
diff
changeset
|
3521 &optional only-if-not-present) |
e33327200372
* emacs-lisp/byte-opt.el (byte-optimize-featurep): Optimize
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85989
diff
changeset
|
3522 (let ((result nil) |
e33327200372
* emacs-lisp/byte-opt.el (byte-optimize-featurep): Optimize
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85989
diff
changeset
|
3523 (nth-one nil) |
86452
ff400c9a8768
(batch-byte-recompile-directory): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
86336
diff
changeset
|
3524 (cond-list |
86003
e33327200372
* emacs-lisp/byte-opt.el (byte-optimize-featurep): Optimize
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85989
diff
changeset
|
3525 (if (memq (car-safe condition-param) pred-list) |
e33327200372
* emacs-lisp/byte-opt.el (byte-optimize-featurep): Optimize
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85989
diff
changeset
|
3526 ;; The condition appears by itself. |
e33327200372
* emacs-lisp/byte-opt.el (byte-optimize-featurep): Optimize
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85989
diff
changeset
|
3527 (list condition-param) |
e33327200372
* emacs-lisp/byte-opt.el (byte-optimize-featurep): Optimize
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85989
diff
changeset
|
3528 ;; If the condition is an `and', look for matches among the |
e33327200372
* emacs-lisp/byte-opt.el (byte-optimize-featurep): Optimize
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85989
diff
changeset
|
3529 ;; `and' arguments. |
e33327200372
* emacs-lisp/byte-opt.el (byte-optimize-featurep): Optimize
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85989
diff
changeset
|
3530 (when (eq 'and (car-safe condition-param)) |
e33327200372
* emacs-lisp/byte-opt.el (byte-optimize-featurep): Optimize
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85989
diff
changeset
|
3531 (cdr condition-param))))) |
86452
ff400c9a8768
(batch-byte-recompile-directory): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
86336
diff
changeset
|
3532 |
86003
e33327200372
* emacs-lisp/byte-opt.el (byte-optimize-featurep): Optimize
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85989
diff
changeset
|
3533 (dolist (crt cond-list) |
e33327200372
* emacs-lisp/byte-opt.el (byte-optimize-featurep): Optimize
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85989
diff
changeset
|
3534 (when (and (memq (car-safe crt) pred-list) |
e33327200372
* emacs-lisp/byte-opt.el (byte-optimize-featurep): Optimize
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85989
diff
changeset
|
3535 (eq 'quote (car-safe (setq nth-one (nth 1 crt)))) |
e33327200372
* emacs-lisp/byte-opt.el (byte-optimize-featurep): Optimize
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85989
diff
changeset
|
3536 ;; Ignore if the symbol is already on the unresolved |
e33327200372
* emacs-lisp/byte-opt.el (byte-optimize-featurep): Optimize
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85989
diff
changeset
|
3537 ;; list. |
e33327200372
* emacs-lisp/byte-opt.el (byte-optimize-featurep): Optimize
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85989
diff
changeset
|
3538 (not (assq (nth 1 nth-one) ; the relevant symbol |
e33327200372
* emacs-lisp/byte-opt.el (byte-optimize-featurep): Optimize
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85989
diff
changeset
|
3539 only-if-not-present))) |
e33327200372
* emacs-lisp/byte-opt.el (byte-optimize-featurep): Optimize
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85989
diff
changeset
|
3540 (push (nth 1 (nth 1 crt)) result))) |
e33327200372
* emacs-lisp/byte-opt.el (byte-optimize-featurep): Optimize
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85989
diff
changeset
|
3541 result)) |
e33327200372
* emacs-lisp/byte-opt.el (byte-optimize-featurep): Optimize
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85989
diff
changeset
|
3542 |
53753
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
3543 (defmacro byte-compile-maybe-guarded (condition &rest body) |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
3544 "Execute forms in BODY, potentially guarded by CONDITION. |
64179
09328bd431d2
(byte-compile-maybe-guarded): Check for (featurep 'xemacs) and turn
Richard M. Stallman <rms@gnu.org>
parents:
64085
diff
changeset
|
3545 CONDITION is a variable whose value is a test in an `if' or `cond'. |
09328bd431d2
(byte-compile-maybe-guarded): Check for (featurep 'xemacs) and turn
Richard M. Stallman <rms@gnu.org>
parents:
64085
diff
changeset
|
3546 BODY is the code to compile first arm of the if or the body of the |
64405
9fcfa0b883d4
(byte-compile-maybe-guarded): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
64397
diff
changeset
|
3547 cond clause. If CONDITION's value is of the form (fboundp 'foo) |
64397
876aa7f08950
(byte-compile-maybe-guarded): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
64393
diff
changeset
|
3548 or (boundp 'foo), the relevant warnings from BODY about foo's |
64179
09328bd431d2
(byte-compile-maybe-guarded): Check for (featurep 'xemacs) and turn
Richard M. Stallman <rms@gnu.org>
parents:
64085
diff
changeset
|
3549 being undefined will be suppressed. |
09328bd431d2
(byte-compile-maybe-guarded): Check for (featurep 'xemacs) and turn
Richard M. Stallman <rms@gnu.org>
parents:
64085
diff
changeset
|
3550 |
64405
9fcfa0b883d4
(byte-compile-maybe-guarded): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
64397
diff
changeset
|
3551 If CONDITION's value is (not (featurep 'emacs)) or (featurep 'xemacs), |
64397
876aa7f08950
(byte-compile-maybe-guarded): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
64393
diff
changeset
|
3552 that suppresses all warnings during execution of BODY." |
53753
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
3553 (declare (indent 1) (debug t)) |
86452
ff400c9a8768
(batch-byte-recompile-directory): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
86336
diff
changeset
|
3554 `(let* ((fbound-list (byte-compile-find-bound-condition |
ff400c9a8768
(batch-byte-recompile-directory): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
86336
diff
changeset
|
3555 ,condition (list 'fboundp) |
86003
e33327200372
* emacs-lisp/byte-opt.el (byte-optimize-featurep): Optimize
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85989
diff
changeset
|
3556 byte-compile-unresolved-functions)) |
86452
ff400c9a8768
(batch-byte-recompile-directory): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
86336
diff
changeset
|
3557 (bound-list (byte-compile-find-bound-condition |
86003
e33327200372
* emacs-lisp/byte-opt.el (byte-optimize-featurep): Optimize
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85989
diff
changeset
|
3558 ,condition (list 'boundp 'default-boundp))) |
74077
1080f62d73e3
(byte-compile-if): Revert last change.
Chong Yidong <cyd@stupidchicken.com>
parents:
74061
diff
changeset
|
3559 ;; Maybe add to the bound list. |
1080f62d73e3
(byte-compile-if): Revert last change.
Chong Yidong <cyd@stupidchicken.com>
parents:
74061
diff
changeset
|
3560 (byte-compile-bound-variables |
86003
e33327200372
* emacs-lisp/byte-opt.el (byte-optimize-featurep): Optimize
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85989
diff
changeset
|
3561 (if bound-list |
e33327200372
* emacs-lisp/byte-opt.el (byte-optimize-featurep): Optimize
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85989
diff
changeset
|
3562 (append bound-list byte-compile-bound-variables) |
92427
31b671bf1dfc
(byte-compile-maybe-guarded):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92388
diff
changeset
|
3563 byte-compile-bound-variables))) |
64179
09328bd431d2
(byte-compile-maybe-guarded): Check for (featurep 'xemacs) and turn
Richard M. Stallman <rms@gnu.org>
parents:
64085
diff
changeset
|
3564 (unwind-protect |
09328bd431d2
(byte-compile-maybe-guarded): Check for (featurep 'xemacs) and turn
Richard M. Stallman <rms@gnu.org>
parents:
64085
diff
changeset
|
3565 (progn ,@body) |
09328bd431d2
(byte-compile-maybe-guarded): Check for (featurep 'xemacs) and turn
Richard M. Stallman <rms@gnu.org>
parents:
64085
diff
changeset
|
3566 ;; Maybe remove the function symbol from the unresolved list. |
86003
e33327200372
* emacs-lisp/byte-opt.el (byte-optimize-featurep): Optimize
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85989
diff
changeset
|
3567 (dolist (fbound fbound-list) |
e33327200372
* emacs-lisp/byte-opt.el (byte-optimize-featurep): Optimize
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85989
diff
changeset
|
3568 (when fbound |
74077
1080f62d73e3
(byte-compile-if): Revert last change.
Chong Yidong <cyd@stupidchicken.com>
parents:
74061
diff
changeset
|
3569 (setq byte-compile-unresolved-functions |
1080f62d73e3
(byte-compile-if): Revert last change.
Chong Yidong <cyd@stupidchicken.com>
parents:
74061
diff
changeset
|
3570 (delq (assq fbound byte-compile-unresolved-functions) |
86003
e33327200372
* emacs-lisp/byte-opt.el (byte-optimize-featurep): Optimize
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85989
diff
changeset
|
3571 byte-compile-unresolved-functions))))))) |
53753
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
3572 |
757 | 3573 (defun byte-compile-if (form) |
3574 (byte-compile-form (car (cdr form))) | |
48822
162c286faa11
(byte-compile-if): Suppress warnings from
Dave Love <fx@gnu.org>
parents:
48719
diff
changeset
|
3575 ;; Check whether we have `(if (fboundp ...' or `(if (boundp ...' |
162c286faa11
(byte-compile-if): Suppress warnings from
Dave Love <fx@gnu.org>
parents:
48719
diff
changeset
|
3576 ;; and avoid warnings about the relevent symbols in the consequent. |
53753
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
3577 (let ((clause (nth 1 form)) |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
3578 (donetag (byte-compile-make-tag))) |
48822
162c286faa11
(byte-compile-if): Suppress warnings from
Dave Love <fx@gnu.org>
parents:
48719
diff
changeset
|
3579 (if (null (nthcdr 3 form)) |
162c286faa11
(byte-compile-if): Suppress warnings from
Dave Love <fx@gnu.org>
parents:
48719
diff
changeset
|
3580 ;; No else-forms |
162c286faa11
(byte-compile-if): Suppress warnings from
Dave Love <fx@gnu.org>
parents:
48719
diff
changeset
|
3581 (progn |
162c286faa11
(byte-compile-if): Suppress warnings from
Dave Love <fx@gnu.org>
parents:
48719
diff
changeset
|
3582 (byte-compile-goto-if nil for-effect donetag) |
53753
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
3583 (byte-compile-maybe-guarded clause |
48822
162c286faa11
(byte-compile-if): Suppress warnings from
Dave Love <fx@gnu.org>
parents:
48719
diff
changeset
|
3584 (byte-compile-form (nth 2 form) for-effect)) |
162c286faa11
(byte-compile-if): Suppress warnings from
Dave Love <fx@gnu.org>
parents:
48719
diff
changeset
|
3585 (byte-compile-out-tag donetag)) |
162c286faa11
(byte-compile-if): Suppress warnings from
Dave Love <fx@gnu.org>
parents:
48719
diff
changeset
|
3586 (let ((elsetag (byte-compile-make-tag))) |
162c286faa11
(byte-compile-if): Suppress warnings from
Dave Love <fx@gnu.org>
parents:
48719
diff
changeset
|
3587 (byte-compile-goto 'byte-goto-if-nil elsetag) |
53753
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
3588 (byte-compile-maybe-guarded clause |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
3589 (byte-compile-form (nth 2 form) for-effect)) |
48822
162c286faa11
(byte-compile-if): Suppress warnings from
Dave Love <fx@gnu.org>
parents:
48719
diff
changeset
|
3590 (byte-compile-goto 'byte-goto donetag) |
162c286faa11
(byte-compile-if): Suppress warnings from
Dave Love <fx@gnu.org>
parents:
48719
diff
changeset
|
3591 (byte-compile-out-tag elsetag) |
64393
47148916c99b
(byte-compile-if): Guard the else-clause too.
Richard M. Stallman <rms@gnu.org>
parents:
64389
diff
changeset
|
3592 (byte-compile-maybe-guarded (list 'not clause) |
47148916c99b
(byte-compile-if): Guard the else-clause too.
Richard M. Stallman <rms@gnu.org>
parents:
64389
diff
changeset
|
3593 (byte-compile-body (cdr (cdr (cdr form))) for-effect)) |
48822
162c286faa11
(byte-compile-if): Suppress warnings from
Dave Love <fx@gnu.org>
parents:
48719
diff
changeset
|
3594 (byte-compile-out-tag donetag)))) |
757 | 3595 (setq for-effect nil)) |
3596 | |
3597 (defun byte-compile-cond (clauses) | |
3598 (let ((donetag (byte-compile-make-tag)) | |
3599 nexttag clause) | |
3600 (while (setq clauses (cdr clauses)) | |
3601 (setq clause (car clauses)) | |
3602 (cond ((or (eq (car clause) t) | |
3603 (and (eq (car-safe (car clause)) 'quote) | |
3604 (car-safe (cdr-safe (car clause))))) | |
3605 ;; Unconditional clause | |
3606 (setq clause (cons t clause) | |
3607 clauses nil)) | |
3608 ((cdr clauses) | |
3609 (byte-compile-form (car clause)) | |
3610 (if (null (cdr clause)) | |
3611 ;; First clause is a singleton. | |
3612 (byte-compile-goto-if t for-effect donetag) | |
64179
09328bd431d2
(byte-compile-maybe-guarded): Check for (featurep 'xemacs) and turn
Richard M. Stallman <rms@gnu.org>
parents:
64085
diff
changeset
|
3613 (setq nexttag (byte-compile-make-tag)) |
09328bd431d2
(byte-compile-maybe-guarded): Check for (featurep 'xemacs) and turn
Richard M. Stallman <rms@gnu.org>
parents:
64085
diff
changeset
|
3614 (byte-compile-goto 'byte-goto-if-nil nexttag) |
09328bd431d2
(byte-compile-maybe-guarded): Check for (featurep 'xemacs) and turn
Richard M. Stallman <rms@gnu.org>
parents:
64085
diff
changeset
|
3615 (byte-compile-maybe-guarded (car clause) |
09328bd431d2
(byte-compile-maybe-guarded): Check for (featurep 'xemacs) and turn
Richard M. Stallman <rms@gnu.org>
parents:
64085
diff
changeset
|
3616 (byte-compile-body (cdr clause) for-effect)) |
09328bd431d2
(byte-compile-maybe-guarded): Check for (featurep 'xemacs) and turn
Richard M. Stallman <rms@gnu.org>
parents:
64085
diff
changeset
|
3617 (byte-compile-goto 'byte-goto donetag) |
09328bd431d2
(byte-compile-maybe-guarded): Check for (featurep 'xemacs) and turn
Richard M. Stallman <rms@gnu.org>
parents:
64085
diff
changeset
|
3618 (byte-compile-out-tag nexttag))))) |
757 | 3619 ;; Last clause |
54790
12b895a7fee2
(byte-compile-cond): Fix last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54770
diff
changeset
|
3620 (let ((guard (car clause))) |
12b895a7fee2
(byte-compile-cond): Fix last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54770
diff
changeset
|
3621 (and (cdr clause) (not (eq guard t)) |
12b895a7fee2
(byte-compile-cond): Fix last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54770
diff
changeset
|
3622 (progn (byte-compile-form guard) |
12b895a7fee2
(byte-compile-cond): Fix last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54770
diff
changeset
|
3623 (byte-compile-goto-if nil for-effect donetag) |
12b895a7fee2
(byte-compile-cond): Fix last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54770
diff
changeset
|
3624 (setq clause (cdr clause)))) |
12b895a7fee2
(byte-compile-cond): Fix last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54770
diff
changeset
|
3625 (byte-compile-maybe-guarded guard |
12b895a7fee2
(byte-compile-cond): Fix last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54770
diff
changeset
|
3626 (byte-compile-body-do-effect clause))) |
757 | 3627 (byte-compile-out-tag donetag))) |
3628 | |
3629 (defun byte-compile-and (form) | |
3630 (let ((failtag (byte-compile-make-tag)) | |
3631 (args (cdr form))) | |
3632 (if (null args) | |
3633 (byte-compile-form-do-effect t) | |
64385
3b6714810ffc
(byte-compile-and-recursion): New function.
Richard M. Stallman <rms@gnu.org>
parents:
64179
diff
changeset
|
3634 (byte-compile-and-recursion args failtag)))) |
3b6714810ffc
(byte-compile-and-recursion): New function.
Richard M. Stallman <rms@gnu.org>
parents:
64179
diff
changeset
|
3635 |
64389
95851e91d5ef
(byte-compile-or-recursion): New function.
Richard M. Stallman <rms@gnu.org>
parents:
64385
diff
changeset
|
3636 ;; Handle compilation of a nontrivial `and' call. |
64385
3b6714810ffc
(byte-compile-and-recursion): New function.
Richard M. Stallman <rms@gnu.org>
parents:
64179
diff
changeset
|
3637 ;; We use tail recursion so we can use byte-compile-maybe-guarded. |
3b6714810ffc
(byte-compile-and-recursion): New function.
Richard M. Stallman <rms@gnu.org>
parents:
64179
diff
changeset
|
3638 (defun byte-compile-and-recursion (rest failtag) |
3b6714810ffc
(byte-compile-and-recursion): New function.
Richard M. Stallman <rms@gnu.org>
parents:
64179
diff
changeset
|
3639 (if (cdr rest) |
3b6714810ffc
(byte-compile-and-recursion): New function.
Richard M. Stallman <rms@gnu.org>
parents:
64179
diff
changeset
|
3640 (progn |
3b6714810ffc
(byte-compile-and-recursion): New function.
Richard M. Stallman <rms@gnu.org>
parents:
64179
diff
changeset
|
3641 (byte-compile-form (car rest)) |
757 | 3642 (byte-compile-goto-if nil for-effect failtag) |
64385
3b6714810ffc
(byte-compile-and-recursion): New function.
Richard M. Stallman <rms@gnu.org>
parents:
64179
diff
changeset
|
3643 (byte-compile-maybe-guarded (car rest) |
3b6714810ffc
(byte-compile-and-recursion): New function.
Richard M. Stallman <rms@gnu.org>
parents:
64179
diff
changeset
|
3644 (byte-compile-and-recursion (cdr rest) failtag))) |
3b6714810ffc
(byte-compile-and-recursion): New function.
Richard M. Stallman <rms@gnu.org>
parents:
64179
diff
changeset
|
3645 (byte-compile-form-do-effect (car rest)) |
3b6714810ffc
(byte-compile-and-recursion): New function.
Richard M. Stallman <rms@gnu.org>
parents:
64179
diff
changeset
|
3646 (byte-compile-out-tag failtag))) |
757 | 3647 |
3648 (defun byte-compile-or (form) | |
3649 (let ((wintag (byte-compile-make-tag)) | |
3650 (args (cdr form))) | |
3651 (if (null args) | |
3652 (byte-compile-form-do-effect nil) | |
64389
95851e91d5ef
(byte-compile-or-recursion): New function.
Richard M. Stallman <rms@gnu.org>
parents:
64385
diff
changeset
|
3653 (byte-compile-or-recursion args wintag)))) |
95851e91d5ef
(byte-compile-or-recursion): New function.
Richard M. Stallman <rms@gnu.org>
parents:
64385
diff
changeset
|
3654 |
95851e91d5ef
(byte-compile-or-recursion): New function.
Richard M. Stallman <rms@gnu.org>
parents:
64385
diff
changeset
|
3655 ;; Handle compilation of a nontrivial `or' call. |
95851e91d5ef
(byte-compile-or-recursion): New function.
Richard M. Stallman <rms@gnu.org>
parents:
64385
diff
changeset
|
3656 ;; We use tail recursion so we can use byte-compile-maybe-guarded. |
95851e91d5ef
(byte-compile-or-recursion): New function.
Richard M. Stallman <rms@gnu.org>
parents:
64385
diff
changeset
|
3657 (defun byte-compile-or-recursion (rest wintag) |
95851e91d5ef
(byte-compile-or-recursion): New function.
Richard M. Stallman <rms@gnu.org>
parents:
64385
diff
changeset
|
3658 (if (cdr rest) |
95851e91d5ef
(byte-compile-or-recursion): New function.
Richard M. Stallman <rms@gnu.org>
parents:
64385
diff
changeset
|
3659 (progn |
95851e91d5ef
(byte-compile-or-recursion): New function.
Richard M. Stallman <rms@gnu.org>
parents:
64385
diff
changeset
|
3660 (byte-compile-form (car rest)) |
757 | 3661 (byte-compile-goto-if t for-effect wintag) |
64389
95851e91d5ef
(byte-compile-or-recursion): New function.
Richard M. Stallman <rms@gnu.org>
parents:
64385
diff
changeset
|
3662 (byte-compile-maybe-guarded (list 'not (car rest)) |
95851e91d5ef
(byte-compile-or-recursion): New function.
Richard M. Stallman <rms@gnu.org>
parents:
64385
diff
changeset
|
3663 (byte-compile-or-recursion (cdr rest) wintag))) |
95851e91d5ef
(byte-compile-or-recursion): New function.
Richard M. Stallman <rms@gnu.org>
parents:
64385
diff
changeset
|
3664 (byte-compile-form-do-effect (car rest)) |
95851e91d5ef
(byte-compile-or-recursion): New function.
Richard M. Stallman <rms@gnu.org>
parents:
64385
diff
changeset
|
3665 (byte-compile-out-tag wintag))) |
757 | 3666 |
3667 (defun byte-compile-while (form) | |
3668 (let ((endtag (byte-compile-make-tag)) | |
3669 (looptag (byte-compile-make-tag))) | |
3670 (byte-compile-out-tag looptag) | |
3671 (byte-compile-form (car (cdr form))) | |
3672 (byte-compile-goto-if nil for-effect endtag) | |
3673 (byte-compile-body (cdr (cdr form)) t) | |
3674 (byte-compile-goto 'byte-goto looptag) | |
3675 (byte-compile-out-tag endtag) | |
3676 (setq for-effect nil))) | |
3677 | |
3678 (defun byte-compile-funcall (form) | |
29239
86949998e6fd
(byte-compile-callargs-warn): Use subr-arity to check primitives.
Dave Love <fx@gnu.org>
parents:
28441
diff
changeset
|
3679 (mapc 'byte-compile-form (cdr form)) |
757 | 3680 (byte-compile-out 'byte-call (length (cdr (cdr form))))) |
3681 | |
3682 | |
3683 (defun byte-compile-let (form) | |
3684 ;; First compute the binding values in the old scope. | |
3685 (let ((varlist (car (cdr form)))) | |
50570
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
3686 (dolist (var varlist) |
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
3687 (if (consp var) |
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
3688 (byte-compile-form (car (cdr var))) |
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
3689 (byte-compile-push-constant nil)))) |
757 | 3690 (let ((byte-compile-bound-variables byte-compile-bound-variables) ;new scope |
3691 (varlist (reverse (car (cdr form))))) | |
50570
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
3692 (dolist (var varlist) |
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
3693 (byte-compile-variable-ref 'byte-varbind (if (consp var) (car var) var))) |
757 | 3694 (byte-compile-body-do-effect (cdr (cdr form))) |
3695 (byte-compile-out 'byte-unbind (length (car (cdr form)))))) | |
3696 | |
3697 (defun byte-compile-let* (form) | |
3698 (let ((byte-compile-bound-variables byte-compile-bound-variables) ;new scope | |
3699 (varlist (copy-sequence (car (cdr form))))) | |
50570
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
3700 (dolist (var varlist) |
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
3701 (if (atom var) |
757 | 3702 (byte-compile-push-constant nil) |
50570
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
3703 (byte-compile-form (car (cdr var))) |
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
3704 (setq var (car var))) |
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
3705 (byte-compile-variable-ref 'byte-varbind var)) |
757 | 3706 (byte-compile-body-do-effect (cdr (cdr form))) |
3707 (byte-compile-out 'byte-unbind (length (car (cdr form)))))) | |
3708 | |
3709 | |
3710 (byte-defop-compiler-1 /= byte-compile-negated) | |
3711 (byte-defop-compiler-1 atom byte-compile-negated) | |
3712 (byte-defop-compiler-1 nlistp byte-compile-negated) | |
3713 | |
3714 (put '/= 'byte-compile-negated-op '=) | |
3715 (put 'atom 'byte-compile-negated-op 'consp) | |
3716 (put 'nlistp 'byte-compile-negated-op 'listp) | |
3717 | |
3718 (defun byte-compile-negated (form) | |
3719 (byte-compile-form-do-effect (byte-compile-negation-optimizer form))) | |
3720 | |
3721 ;; Even when optimization is off, /= is optimized to (not (= ...)). | |
3722 (defun byte-compile-negation-optimizer (form) | |
3723 ;; an optimizer for forms where <form1> is less efficient than (not <form2>) | |
45558
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
3724 (byte-compile-set-symbol-position (car form)) |
757 | 3725 (list 'not |
3726 (cons (or (get (car form) 'byte-compile-negated-op) | |
3727 (error | |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
3728 "Compiler error: `%s' has no `byte-compile-negated-op' property" |
757 | 3729 (car form))) |
3730 (cdr form)))) | |
3731 | |
3732 ;;; other tricky macro-like special-forms | |
3733 | |
3734 (byte-defop-compiler-1 catch) | |
3735 (byte-defop-compiler-1 unwind-protect) | |
3736 (byte-defop-compiler-1 condition-case) | |
3737 (byte-defop-compiler-1 save-excursion) | |
16274
e9819849c533
(save-current-buffer): Compile it like save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
16232
diff
changeset
|
3738 (byte-defop-compiler-1 save-current-buffer) |
757 | 3739 (byte-defop-compiler-1 save-restriction) |
3740 (byte-defop-compiler-1 save-window-excursion) | |
3741 (byte-defop-compiler-1 with-output-to-temp-buffer) | |
2798
e2f296263868
(byte-compile-track-mouse): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2735
diff
changeset
|
3742 (byte-defop-compiler-1 track-mouse) |
757 | 3743 |
3744 (defun byte-compile-catch (form) | |
3745 (byte-compile-form (car (cdr form))) | |
3746 (byte-compile-push-constant | |
3747 (byte-compile-top-level (cons 'progn (cdr (cdr form))) for-effect)) | |
3748 (byte-compile-out 'byte-catch 0)) | |
3749 | |
3750 (defun byte-compile-unwind-protect (form) | |
3751 (byte-compile-push-constant | |
3752 (byte-compile-top-level-body (cdr (cdr form)) t)) | |
3753 (byte-compile-out 'byte-unwind-protect 0) | |
3754 (byte-compile-form-do-effect (car (cdr form))) | |
3755 (byte-compile-out 'byte-unbind 1)) | |
3756 | |
2798
e2f296263868
(byte-compile-track-mouse): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2735
diff
changeset
|
3757 (defun byte-compile-track-mouse (form) |
6293
649c8a929063
(byte-compile-track-mouse): Undo previous change,
Richard M. Stallman <rms@gnu.org>
parents:
6217
diff
changeset
|
3758 (byte-compile-form |
50570
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
3759 `(funcall '(lambda nil |
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
3760 (track-mouse ,@(byte-compile-top-level-body (cdr form))))))) |
2798
e2f296263868
(byte-compile-track-mouse): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2735
diff
changeset
|
3761 |
757 | 3762 (defun byte-compile-condition-case (form) |
3763 (let* ((var (nth 1 form)) | |
3764 (byte-compile-bound-variables | |
3765 (if var (cons var byte-compile-bound-variables) | |
3766 byte-compile-bound-variables))) | |
45558
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
3767 (byte-compile-set-symbol-position 'condition-case) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
3768 (unless (symbolp var) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
3769 (byte-compile-warn |
56082
36284d653673
Put `...' around symbols in warning messages.
Richard M. Stallman <rms@gnu.org>
parents:
55694
diff
changeset
|
3770 "`%s' is not a variable-name or nil (in condition-case)" var)) |
757 | 3771 (byte-compile-push-constant var) |
3772 (byte-compile-push-constant (byte-compile-top-level | |
3773 (nth 2 form) for-effect)) | |
3774 (let ((clauses (cdr (cdr (cdr form)))) | |
3775 compiled-clauses) | |
3776 (while clauses | |
3653
974055b516d9
* bytecomp.el: Bring it up to version 2.10 of the
Jim Blandy <jimb@redhat.com>
parents:
3591
diff
changeset
|
3777 (let* ((clause (car clauses)) |
974055b516d9
* bytecomp.el: Bring it up to version 2.10 of the
Jim Blandy <jimb@redhat.com>
parents:
3591
diff
changeset
|
3778 (condition (car clause))) |
5562
2b3d2ea74ce1
(byte-compile-condition-case): Disable warning about
Richard M. Stallman <rms@gnu.org>
parents:
5454
diff
changeset
|
3779 (cond ((not (or (symbolp condition) |
2b3d2ea74ce1
(byte-compile-condition-case): Disable warning about
Richard M. Stallman <rms@gnu.org>
parents:
5454
diff
changeset
|
3780 (and (listp condition) |
2b3d2ea74ce1
(byte-compile-condition-case): Disable warning about
Richard M. Stallman <rms@gnu.org>
parents:
5454
diff
changeset
|
3781 (let ((syms condition) (ok t)) |
2b3d2ea74ce1
(byte-compile-condition-case): Disable warning about
Richard M. Stallman <rms@gnu.org>
parents:
5454
diff
changeset
|
3782 (while syms |
2b3d2ea74ce1
(byte-compile-condition-case): Disable warning about
Richard M. Stallman <rms@gnu.org>
parents:
5454
diff
changeset
|
3783 (if (not (symbolp (car syms))) |
2b3d2ea74ce1
(byte-compile-condition-case): Disable warning about
Richard M. Stallman <rms@gnu.org>
parents:
5454
diff
changeset
|
3784 (setq ok nil)) |
2b3d2ea74ce1
(byte-compile-condition-case): Disable warning about
Richard M. Stallman <rms@gnu.org>
parents:
5454
diff
changeset
|
3785 (setq syms (cdr syms))) |
2b3d2ea74ce1
(byte-compile-condition-case): Disable warning about
Richard M. Stallman <rms@gnu.org>
parents:
5454
diff
changeset
|
3786 ok)))) |
3653
974055b516d9
* bytecomp.el: Bring it up to version 2.10 of the
Jim Blandy <jimb@redhat.com>
parents:
3591
diff
changeset
|
3787 (byte-compile-warn |
56082
36284d653673
Put `...' around symbols in warning messages.
Richard M. Stallman <rms@gnu.org>
parents:
55694
diff
changeset
|
3788 "`%s' is not a condition name or list of such (in condition-case)" |
3653
974055b516d9
* bytecomp.el: Bring it up to version 2.10 of the
Jim Blandy <jimb@redhat.com>
parents:
3591
diff
changeset
|
3789 (prin1-to-string condition))) |
5562
2b3d2ea74ce1
(byte-compile-condition-case): Disable warning about
Richard M. Stallman <rms@gnu.org>
parents:
5454
diff
changeset
|
3790 ;; ((not (or (eq condition 't) |
2b3d2ea74ce1
(byte-compile-condition-case): Disable warning about
Richard M. Stallman <rms@gnu.org>
parents:
5454
diff
changeset
|
3791 ;; (and (stringp (get condition 'error-message)) |
2b3d2ea74ce1
(byte-compile-condition-case): Disable warning about
Richard M. Stallman <rms@gnu.org>
parents:
5454
diff
changeset
|
3792 ;; (consp (get condition 'error-conditions))))) |
2b3d2ea74ce1
(byte-compile-condition-case): Disable warning about
Richard M. Stallman <rms@gnu.org>
parents:
5454
diff
changeset
|
3793 ;; (byte-compile-warn |
56082
36284d653673
Put `...' around symbols in warning messages.
Richard M. Stallman <rms@gnu.org>
parents:
55694
diff
changeset
|
3794 ;; "`%s' is not a known condition name (in condition-case)" |
5562
2b3d2ea74ce1
(byte-compile-condition-case): Disable warning about
Richard M. Stallman <rms@gnu.org>
parents:
5454
diff
changeset
|
3795 ;; condition)) |
2b3d2ea74ce1
(byte-compile-condition-case): Disable warning about
Richard M. Stallman <rms@gnu.org>
parents:
5454
diff
changeset
|
3796 ) |
757 | 3797 (setq compiled-clauses |
3653
974055b516d9
* bytecomp.el: Bring it up to version 2.10 of the
Jim Blandy <jimb@redhat.com>
parents:
3591
diff
changeset
|
3798 (cons (cons condition |
757 | 3799 (byte-compile-top-level-body |
3800 (cdr clause) for-effect)) | |
3801 compiled-clauses))) | |
3802 (setq clauses (cdr clauses))) | |
3803 (byte-compile-push-constant (nreverse compiled-clauses))) | |
3804 (byte-compile-out 'byte-condition-case 0))) | |
3805 | |
3806 | |
3807 (defun byte-compile-save-excursion (form) | |
3808 (byte-compile-out 'byte-save-excursion 0) | |
3809 (byte-compile-body-do-effect (cdr form)) | |
3810 (byte-compile-out 'byte-unbind 1)) | |
3811 | |
3812 (defun byte-compile-save-restriction (form) | |
3813 (byte-compile-out 'byte-save-restriction 0) | |
3814 (byte-compile-body-do-effect (cdr form)) | |
3815 (byte-compile-out 'byte-unbind 1)) | |
3816 | |
16274
e9819849c533
(save-current-buffer): Compile it like save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
16232
diff
changeset
|
3817 (defun byte-compile-save-current-buffer (form) |
e9819849c533
(save-current-buffer): Compile it like save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
16232
diff
changeset
|
3818 (byte-compile-out 'byte-save-current-buffer 0) |
e9819849c533
(save-current-buffer): Compile it like save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
16232
diff
changeset
|
3819 (byte-compile-body-do-effect (cdr form)) |
e9819849c533
(save-current-buffer): Compile it like save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
16232
diff
changeset
|
3820 (byte-compile-out 'byte-unbind 1)) |
e9819849c533
(save-current-buffer): Compile it like save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
16232
diff
changeset
|
3821 |
757 | 3822 (defun byte-compile-save-window-excursion (form) |
3823 (byte-compile-push-constant | |
3824 (byte-compile-top-level-body (cdr form) for-effect)) | |
3825 (byte-compile-out 'byte-save-window-excursion 0)) | |
3826 | |
3827 (defun byte-compile-with-output-to-temp-buffer (form) | |
3828 (byte-compile-form (car (cdr form))) | |
3829 (byte-compile-out 'byte-temp-output-buffer-setup 0) | |
3830 (byte-compile-body (cdr (cdr form))) | |
3831 (byte-compile-out 'byte-temp-output-buffer-show 0)) | |
3832 | |
3833 ;;; top-level forms elsewhere | |
3834 | |
3835 (byte-defop-compiler-1 defun) | |
3836 (byte-defop-compiler-1 defmacro) | |
3837 (byte-defop-compiler-1 defvar) | |
3838 (byte-defop-compiler-1 defconst byte-compile-defvar) | |
3839 (byte-defop-compiler-1 autoload) | |
3840 (byte-defop-compiler-1 lambda byte-compile-lambda-form) | |
3841 | |
3842 (defun byte-compile-defun (form) | |
3843 ;; This is not used for file-level defuns with doc strings. | |
45558
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
3844 (if (symbolp (car form)) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
3845 (byte-compile-set-symbol-position (car form)) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
3846 (byte-compile-set-symbol-position 'defun) |
39827
d9f8c7370b3a
(byte-compile-check-lambda-list): New
Gerd Moellmann <gerd@gnu.org>
parents:
39769
diff
changeset
|
3847 (error "defun name must be a symbol, not %s" (car form))) |
50680
ae1e2c38d746
(byte-compile-defun): Generate and compile a defalias form,
Richard M. Stallman <rms@gnu.org>
parents:
50658
diff
changeset
|
3848 (if (byte-compile-version-cond byte-compile-compatibility) |
ae1e2c38d746
(byte-compile-defun): Generate and compile a defalias form,
Richard M. Stallman <rms@gnu.org>
parents:
50658
diff
changeset
|
3849 (progn |
ae1e2c38d746
(byte-compile-defun): Generate and compile a defalias form,
Richard M. Stallman <rms@gnu.org>
parents:
50658
diff
changeset
|
3850 (byte-compile-two-args ; Use this to avoid byte-compile-fset's warning. |
ae1e2c38d746
(byte-compile-defun): Generate and compile a defalias form,
Richard M. Stallman <rms@gnu.org>
parents:
50658
diff
changeset
|
3851 (list 'fset |
ae1e2c38d746
(byte-compile-defun): Generate and compile a defalias form,
Richard M. Stallman <rms@gnu.org>
parents:
50658
diff
changeset
|
3852 (list 'quote (nth 1 form)) |
ae1e2c38d746
(byte-compile-defun): Generate and compile a defalias form,
Richard M. Stallman <rms@gnu.org>
parents:
50658
diff
changeset
|
3853 (byte-compile-byte-code-maker |
66317
3f882faaa9ae
(byte-compile-lambda): Add parameter add-lambda.
Lars Hansen <larsh@soem.dk>
parents:
64751
diff
changeset
|
3854 (byte-compile-lambda (cdr (cdr form)) t)))) |
50680
ae1e2c38d746
(byte-compile-defun): Generate and compile a defalias form,
Richard M. Stallman <rms@gnu.org>
parents:
50658
diff
changeset
|
3855 (byte-compile-discard)) |
50681 | 3856 ;; We prefer to generate a defalias form so it will record the function |
50682 | 3857 ;; definition just like interpreting a defun. |
50680
ae1e2c38d746
(byte-compile-defun): Generate and compile a defalias form,
Richard M. Stallman <rms@gnu.org>
parents:
50658
diff
changeset
|
3858 (byte-compile-form |
ae1e2c38d746
(byte-compile-defun): Generate and compile a defalias form,
Richard M. Stallman <rms@gnu.org>
parents:
50658
diff
changeset
|
3859 (list 'defalias |
ae1e2c38d746
(byte-compile-defun): Generate and compile a defalias form,
Richard M. Stallman <rms@gnu.org>
parents:
50658
diff
changeset
|
3860 (list 'quote (nth 1 form)) |
ae1e2c38d746
(byte-compile-defun): Generate and compile a defalias form,
Richard M. Stallman <rms@gnu.org>
parents:
50658
diff
changeset
|
3861 (byte-compile-byte-code-maker |
66317
3f882faaa9ae
(byte-compile-lambda): Add parameter add-lambda.
Lars Hansen <larsh@soem.dk>
parents:
64751
diff
changeset
|
3862 (byte-compile-lambda (cdr (cdr form)) t))) |
50680
ae1e2c38d746
(byte-compile-defun): Generate and compile a defalias form,
Richard M. Stallman <rms@gnu.org>
parents:
50658
diff
changeset
|
3863 t)) |
757 | 3864 (byte-compile-constant (nth 1 form))) |
3865 | |
3866 (defun byte-compile-defmacro (form) | |
3867 ;; This is not used for file-level defmacros with doc strings. | |
3868 (byte-compile-body-do-effect | |
3869 (list (list 'fset (list 'quote (nth 1 form)) | |
3870 (let ((code (byte-compile-byte-code-maker | |
66317
3f882faaa9ae
(byte-compile-lambda): Add parameter add-lambda.
Lars Hansen <larsh@soem.dk>
parents:
64751
diff
changeset
|
3871 (byte-compile-lambda (cdr (cdr form)) t)))) |
757 | 3872 (if (eq (car-safe code) 'make-byte-code) |
3873 (list 'cons ''macro code) | |
3874 (list 'quote (cons 'macro (eval code)))))) | |
3875 (list 'quote (nth 1 form))))) | |
3876 | |
3877 (defun byte-compile-defvar (form) | |
3878 ;; This is not used for file-level defvar/consts with doc strings. | |
31882
02bf229fa2be
(byte-compile-defvar-or-defconst): Only cons onto
Gerd Moellmann <gerd@gnu.org>
parents:
31552
diff
changeset
|
3879 (let ((fun (nth 0 form)) |
02bf229fa2be
(byte-compile-defvar-or-defconst): Only cons onto
Gerd Moellmann <gerd@gnu.org>
parents:
31552
diff
changeset
|
3880 (var (nth 1 form)) |
757 | 3881 (value (nth 2 form)) |
3882 (string (nth 3 form))) | |
45558
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
3883 (byte-compile-set-symbol-position fun) |
50570
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
3884 (when (or (> (length form) 4) |
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
3885 (and (eq fun 'defconst) (null (cddr form)))) |
50658
94bb873a9f0d
(byte-compile-defvar): Improve message.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50639
diff
changeset
|
3886 (let ((ncall (length (cdr form)))) |
94bb873a9f0d
(byte-compile-defvar): Improve message.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50639
diff
changeset
|
3887 (byte-compile-warn |
56082
36284d653673
Put `...' around symbols in warning messages.
Richard M. Stallman <rms@gnu.org>
parents:
55694
diff
changeset
|
3888 "`%s' called with %d argument%s, but %s %s" |
50658
94bb873a9f0d
(byte-compile-defvar): Improve message.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50639
diff
changeset
|
3889 fun ncall |
94bb873a9f0d
(byte-compile-defvar): Improve message.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50639
diff
changeset
|
3890 (if (= 1 ncall) "" "s") |
94bb873a9f0d
(byte-compile-defvar): Improve message.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50639
diff
changeset
|
3891 (if (< ncall 2) "requires" "accepts only") |
94bb873a9f0d
(byte-compile-defvar): Improve message.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50639
diff
changeset
|
3892 "2-3"))) |
85730
a1e136978a9a
(byte-compile-warnings): Document `not'.
Glenn Morris <rgm@gnu.org>
parents:
85657
diff
changeset
|
3893 (when (byte-compile-warning-enabled-p 'free-vars) |
50573
e80e4ccf1bfc
(byte-compile-file-form-defvar, byte-compile-defvar):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50570
diff
changeset
|
3894 (push var byte-compile-bound-variables) |
50570
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
3895 (if (eq fun 'defconst) |
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
3896 (push var byte-compile-const-variables))) |
757 | 3897 (byte-compile-body-do-effect |
31882
02bf229fa2be
(byte-compile-defvar-or-defconst): Only cons onto
Gerd Moellmann <gerd@gnu.org>
parents:
31552
diff
changeset
|
3898 (list |
02bf229fa2be
(byte-compile-defvar-or-defconst): Only cons onto
Gerd Moellmann <gerd@gnu.org>
parents:
31552
diff
changeset
|
3899 ;; Put the defined variable in this library's load-history entry |
02bf229fa2be
(byte-compile-defvar-or-defconst): Only cons onto
Gerd Moellmann <gerd@gnu.org>
parents:
31552
diff
changeset
|
3900 ;; just as a real defvar would, but only in top-level forms. |
39561
0881eab13b7a
(byte-recompile-directory): Make sure the file is readable.
Gerd Moellmann <gerd@gnu.org>
parents:
38895
diff
changeset
|
3901 (when (and (cddr form) (null byte-compile-current-form)) |
31882
02bf229fa2be
(byte-compile-defvar-or-defconst): Only cons onto
Gerd Moellmann <gerd@gnu.org>
parents:
31552
diff
changeset
|
3902 `(push ',var current-load-list)) |
02bf229fa2be
(byte-compile-defvar-or-defconst): Only cons onto
Gerd Moellmann <gerd@gnu.org>
parents:
31552
diff
changeset
|
3903 (when (> (length form) 3) |
02bf229fa2be
(byte-compile-defvar-or-defconst): Only cons onto
Gerd Moellmann <gerd@gnu.org>
parents:
31552
diff
changeset
|
3904 (when (and string (not (stringp string))) |
56082
36284d653673
Put `...' around symbols in warning messages.
Richard M. Stallman <rms@gnu.org>
parents:
55694
diff
changeset
|
3905 (byte-compile-warn "third arg to `%s %s' is not a string: %s" |
31882
02bf229fa2be
(byte-compile-defvar-or-defconst): Only cons onto
Gerd Moellmann <gerd@gnu.org>
parents:
31552
diff
changeset
|
3906 fun var string)) |
02bf229fa2be
(byte-compile-defvar-or-defconst): Only cons onto
Gerd Moellmann <gerd@gnu.org>
parents:
31552
diff
changeset
|
3907 `(put ',var 'variable-documentation ,string)) |
41176
2d63191afacd
(byte-compile-call-tree, byte-code-vector)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40451
diff
changeset
|
3908 (if (cddr form) ; `value' provided |
52133
4c112142c56f
(byte-compile-not-obsolete-var): New var.
Richard M. Stallman <rms@gnu.org>
parents:
51737
diff
changeset
|
3909 (let ((byte-compile-not-obsolete-var var)) |
4c112142c56f
(byte-compile-not-obsolete-var): New var.
Richard M. Stallman <rms@gnu.org>
parents:
51737
diff
changeset
|
3910 (if (eq fun 'defconst) |
4c112142c56f
(byte-compile-not-obsolete-var): New var.
Richard M. Stallman <rms@gnu.org>
parents:
51737
diff
changeset
|
3911 ;; `defconst' sets `var' unconditionally. |
4c112142c56f
(byte-compile-not-obsolete-var): New var.
Richard M. Stallman <rms@gnu.org>
parents:
51737
diff
changeset
|
3912 (let ((tmp (make-symbol "defconst-tmp-var"))) |
4c112142c56f
(byte-compile-not-obsolete-var): New var.
Richard M. Stallman <rms@gnu.org>
parents:
51737
diff
changeset
|
3913 `(funcall '(lambda (,tmp) (defconst ,var ,tmp)) |
4c112142c56f
(byte-compile-not-obsolete-var): New var.
Richard M. Stallman <rms@gnu.org>
parents:
51737
diff
changeset
|
3914 ,value)) |
4c112142c56f
(byte-compile-not-obsolete-var): New var.
Richard M. Stallman <rms@gnu.org>
parents:
51737
diff
changeset
|
3915 ;; `defvar' sets `var' only when unbound. |
4c112142c56f
(byte-compile-not-obsolete-var): New var.
Richard M. Stallman <rms@gnu.org>
parents:
51737
diff
changeset
|
3916 `(if (not (default-boundp ',var)) (setq-default ,var ,value)))) |
50570
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
3917 (when (eq fun 'defconst) |
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
3918 ;; This will signal an appropriate error at runtime. |
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
3919 `(eval ',form))) |
31882
02bf229fa2be
(byte-compile-defvar-or-defconst): Only cons onto
Gerd Moellmann <gerd@gnu.org>
parents:
31552
diff
changeset
|
3920 `',var)))) |
757 | 3921 |
3922 (defun byte-compile-autoload (form) | |
45558
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
3923 (byte-compile-set-symbol-position 'autoload) |
757 | 3924 (and (byte-compile-constp (nth 1 form)) |
3925 (byte-compile-constp (nth 5 form)) | |
3926 (eval (nth 5 form)) ; macro-p | |
3927 (not (fboundp (eval (nth 1 form)))) | |
3928 (byte-compile-warn | |
28402 | 3929 "The compiler ignores `autoload' except at top level. You should |
757 | 3930 probably put the autoload of the macro `%s' at top-level." |
3931 (eval (nth 1 form)))) | |
3932 (byte-compile-normal-call form)) | |
3933 | |
28402 | 3934 ;; Lambdas in valid places are handled as special cases by various code. |
757 | 3935 ;; The ones that remain are errors. |
3936 (defun byte-compile-lambda-form (form) | |
45558
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
3937 (byte-compile-set-symbol-position 'lambda) |
757 | 3938 (error "`lambda' used as function name is invalid")) |
3939 | |
8086
9f6348616e4d
(byte-compile-callargs-warn): Handle function defnition
Richard M. Stallman <rms@gnu.org>
parents:
7298
diff
changeset
|
3940 ;; Compile normally, but deal with warnings for the function being defined. |
58154 | 3941 (put 'defalias 'byte-hunk-handler 'byte-compile-file-form-defalias) |
3942 (defun byte-compile-file-form-defalias (form) | |
8086
9f6348616e4d
(byte-compile-callargs-warn): Handle function defnition
Richard M. Stallman <rms@gnu.org>
parents:
7298
diff
changeset
|
3943 (if (and (consp (cdr form)) (consp (nth 1 form)) |
9f6348616e4d
(byte-compile-callargs-warn): Handle function defnition
Richard M. Stallman <rms@gnu.org>
parents:
7298
diff
changeset
|
3944 (eq (car (nth 1 form)) 'quote) |
9f6348616e4d
(byte-compile-callargs-warn): Handle function defnition
Richard M. Stallman <rms@gnu.org>
parents:
7298
diff
changeset
|
3945 (consp (cdr (nth 1 form))) |
58073
9412413950a3
(byte-compile-defalias):
Richard M. Stallman <rms@gnu.org>
parents:
57881
diff
changeset
|
3946 (symbolp (nth 1 (nth 1 form)))) |
9412413950a3
(byte-compile-defalias):
Richard M. Stallman <rms@gnu.org>
parents:
57881
diff
changeset
|
3947 (let ((constant |
9412413950a3
(byte-compile-defalias):
Richard M. Stallman <rms@gnu.org>
parents:
57881
diff
changeset
|
3948 (and (consp (nthcdr 2 form)) |
9412413950a3
(byte-compile-defalias):
Richard M. Stallman <rms@gnu.org>
parents:
57881
diff
changeset
|
3949 (consp (nth 2 form)) |
9412413950a3
(byte-compile-defalias):
Richard M. Stallman <rms@gnu.org>
parents:
57881
diff
changeset
|
3950 (eq (car (nth 2 form)) 'quote) |
9412413950a3
(byte-compile-defalias):
Richard M. Stallman <rms@gnu.org>
parents:
57881
diff
changeset
|
3951 (consp (cdr (nth 2 form))) |
9412413950a3
(byte-compile-defalias):
Richard M. Stallman <rms@gnu.org>
parents:
57881
diff
changeset
|
3952 (symbolp (nth 1 (nth 2 form)))))) |
50570
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
3953 (byte-compile-defalias-warn (nth 1 (nth 1 form))) |
58154 | 3954 (push (cons (nth 1 (nth 1 form)) |
3955 (if constant (nth 1 (nth 2 form)) t)) | |
3956 byte-compile-function-environment))) | |
68001
8e733b93ffdc
(byte-compile-file-form-defalias):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66317
diff
changeset
|
3957 ;; We used to jus do: (byte-compile-normal-call form) |
8e733b93ffdc
(byte-compile-file-form-defalias):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66317
diff
changeset
|
3958 ;; But it turns out that this fails to optimize the code. |
8e733b93ffdc
(byte-compile-file-form-defalias):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66317
diff
changeset
|
3959 ;; So instead we now do the same as what other byte-hunk-handlers do, |
8e733b93ffdc
(byte-compile-file-form-defalias):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66317
diff
changeset
|
3960 ;; which is to call back byte-compile-file-form and then return nil. |
8e733b93ffdc
(byte-compile-file-form-defalias):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66317
diff
changeset
|
3961 ;; Except that we can't just call byte-compile-file-form since it would |
8e733b93ffdc
(byte-compile-file-form-defalias):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66317
diff
changeset
|
3962 ;; call us right back. |
8e733b93ffdc
(byte-compile-file-form-defalias):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66317
diff
changeset
|
3963 (byte-compile-keep-pending form) |
8e733b93ffdc
(byte-compile-file-form-defalias):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66317
diff
changeset
|
3964 ;; Return nil so the form is not output twice. |
8e733b93ffdc
(byte-compile-file-form-defalias):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66317
diff
changeset
|
3965 nil) |
8086
9f6348616e4d
(byte-compile-callargs-warn): Handle function defnition
Richard M. Stallman <rms@gnu.org>
parents:
7298
diff
changeset
|
3966 |
9f6348616e4d
(byte-compile-callargs-warn): Handle function defnition
Richard M. Stallman <rms@gnu.org>
parents:
7298
diff
changeset
|
3967 ;; Turn off warnings about prior calls to the function being defalias'd. |
9f6348616e4d
(byte-compile-callargs-warn): Handle function defnition
Richard M. Stallman <rms@gnu.org>
parents:
7298
diff
changeset
|
3968 ;; This could be smarter and compare those calls with |
9f6348616e4d
(byte-compile-callargs-warn): Handle function defnition
Richard M. Stallman <rms@gnu.org>
parents:
7298
diff
changeset
|
3969 ;; the function it is being aliased to. |
50570
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
3970 (defun byte-compile-defalias-warn (new) |
8086
9f6348616e4d
(byte-compile-callargs-warn): Handle function defnition
Richard M. Stallman <rms@gnu.org>
parents:
7298
diff
changeset
|
3971 (let ((calls (assq new byte-compile-unresolved-functions))) |
9f6348616e4d
(byte-compile-callargs-warn): Handle function defnition
Richard M. Stallman <rms@gnu.org>
parents:
7298
diff
changeset
|
3972 (if calls |
9f6348616e4d
(byte-compile-callargs-warn): Handle function defnition
Richard M. Stallman <rms@gnu.org>
parents:
7298
diff
changeset
|
3973 (setq byte-compile-unresolved-functions |
9f6348616e4d
(byte-compile-callargs-warn): Handle function defnition
Richard M. Stallman <rms@gnu.org>
parents:
7298
diff
changeset
|
3974 (delq calls byte-compile-unresolved-functions))))) |
51289
ba101d1e9521
(byte-compile-no-warnings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
50837
diff
changeset
|
3975 |
ba101d1e9521
(byte-compile-no-warnings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
50837
diff
changeset
|
3976 (byte-defop-compiler-1 with-no-warnings byte-compile-no-warnings) |
ba101d1e9521
(byte-compile-no-warnings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
50837
diff
changeset
|
3977 (defun byte-compile-no-warnings (form) |
ba101d1e9521
(byte-compile-no-warnings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
50837
diff
changeset
|
3978 (let (byte-compile-warnings) |
55043 | 3979 (byte-compile-form (cons 'progn (cdr form))))) |
64681
12ea7ab25f7c
(byte-compile-make-variable-buffer-local)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64405
diff
changeset
|
3980 |
12ea7ab25f7c
(byte-compile-make-variable-buffer-local)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64405
diff
changeset
|
3981 ;; Warn about misuses of make-variable-buffer-local. |
12ea7ab25f7c
(byte-compile-make-variable-buffer-local)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64405
diff
changeset
|
3982 (byte-defop-compiler-1 make-variable-buffer-local byte-compile-make-variable-buffer-local) |
12ea7ab25f7c
(byte-compile-make-variable-buffer-local)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64405
diff
changeset
|
3983 (defun byte-compile-make-variable-buffer-local (form) |
81217
908a902d5545
(byte-compile-warnings): Add new option `make-local'.
Glenn Morris <rgm@gnu.org>
parents:
77119
diff
changeset
|
3984 (if (and (eq (car-safe (car-safe (cdr-safe form))) 'quote) |
85730
a1e136978a9a
(byte-compile-warnings): Document `not'.
Glenn Morris <rgm@gnu.org>
parents:
85657
diff
changeset
|
3985 (byte-compile-warning-enabled-p 'make-local)) |
64681
12ea7ab25f7c
(byte-compile-make-variable-buffer-local)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64405
diff
changeset
|
3986 (byte-compile-warn |
12ea7ab25f7c
(byte-compile-make-variable-buffer-local)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64405
diff
changeset
|
3987 "`make-variable-buffer-local' should be called at toplevel")) |
12ea7ab25f7c
(byte-compile-make-variable-buffer-local)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64405
diff
changeset
|
3988 (byte-compile-normal-call form)) |
12ea7ab25f7c
(byte-compile-make-variable-buffer-local)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64405
diff
changeset
|
3989 (put 'make-variable-buffer-local |
12ea7ab25f7c
(byte-compile-make-variable-buffer-local)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64405
diff
changeset
|
3990 'byte-hunk-handler 'byte-compile-form-make-variable-buffer-local) |
12ea7ab25f7c
(byte-compile-make-variable-buffer-local)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64405
diff
changeset
|
3991 (defun byte-compile-form-make-variable-buffer-local (form) |
12ea7ab25f7c
(byte-compile-make-variable-buffer-local)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64405
diff
changeset
|
3992 (byte-compile-keep-pending form 'byte-compile-normal-call)) |
12ea7ab25f7c
(byte-compile-make-variable-buffer-local)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64405
diff
changeset
|
3993 |
757 | 3994 |
3995 ;;; tags | |
3996 | |
3997 ;; Note: Most operations will strip off the 'TAG, but it speeds up | |
3998 ;; optimization to have the 'TAG as a part of the tag. | |
3999 ;; Tags will be (TAG . (tag-number . stack-depth)). | |
4000 (defun byte-compile-make-tag () | |
4001 (list 'TAG (setq byte-compile-tag-number (1+ byte-compile-tag-number)))) | |
4002 | |
4003 | |
4004 (defun byte-compile-out-tag (tag) | |
4005 (setq byte-compile-output (cons tag byte-compile-output)) | |
4006 (if (cdr (cdr tag)) | |
4007 (progn | |
4008 ;; ## remove this someday | |
4009 (and byte-compile-depth | |
4010 (not (= (cdr (cdr tag)) byte-compile-depth)) | |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
4011 (error "Compiler bug: depth conflict at tag %d" (car (cdr tag)))) |
757 | 4012 (setq byte-compile-depth (cdr (cdr tag)))) |
4013 (setcdr (cdr tag) byte-compile-depth))) | |
4014 | |
4015 (defun byte-compile-goto (opcode tag) | |
50570
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
4016 (push (cons opcode tag) byte-compile-output) |
757 | 4017 (setcdr (cdr tag) (if (memq opcode byte-goto-always-pop-ops) |
4018 (1- byte-compile-depth) | |
4019 byte-compile-depth)) | |
4020 (setq byte-compile-depth (and (not (eq opcode 'byte-goto)) | |
4021 (1- byte-compile-depth)))) | |
4022 | |
4023 (defun byte-compile-out (opcode offset) | |
50570
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
4024 (push (cons opcode offset) byte-compile-output) |
757 | 4025 (cond ((eq opcode 'byte-call) |
4026 (setq byte-compile-depth (- byte-compile-depth offset))) | |
4027 ((eq opcode 'byte-return) | |
4028 ;; This is actually an unnecessary case, because there should be | |
4029 ;; no more opcodes behind byte-return. | |
4030 (setq byte-compile-depth nil)) | |
4031 (t | |
4032 (setq byte-compile-depth (+ byte-compile-depth | |
4033 (or (aref byte-stack+-info | |
4034 (symbol-value opcode)) | |
4035 (- (1- offset)))) | |
4036 byte-compile-maxdepth (max byte-compile-depth | |
4037 byte-compile-maxdepth)))) | |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
4038 ;;(if (< byte-compile-depth 0) (error "Compiler error: stack underflow")) |
757 | 4039 ) |
4040 | |
4041 | |
4042 ;;; call tree stuff | |
4043 | |
4044 (defun byte-compile-annotate-call-tree (form) | |
4045 (let (entry) | |
4046 ;; annotate the current call | |
4047 (if (setq entry (assq (car form) byte-compile-call-tree)) | |
4048 (or (memq byte-compile-current-form (nth 1 entry)) ;callers | |
4049 (setcar (cdr entry) | |
4050 (cons byte-compile-current-form (nth 1 entry)))) | |
4051 (setq byte-compile-call-tree | |
4052 (cons (list (car form) (list byte-compile-current-form) nil) | |
4053 byte-compile-call-tree))) | |
4054 ;; annotate the current function | |
4055 (if (setq entry (assq byte-compile-current-form byte-compile-call-tree)) | |
4056 (or (memq (car form) (nth 2 entry)) ;called | |
4057 (setcar (cdr (cdr entry)) | |
4058 (cons (car form) (nth 2 entry)))) | |
4059 (setq byte-compile-call-tree | |
4060 (cons (list byte-compile-current-form nil (list (car form))) | |
4061 byte-compile-call-tree))) | |
4062 )) | |
4063 | |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
4064 ;; Renamed from byte-compile-report-call-tree |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
4065 ;; to avoid interfering with completion of byte-compile-file. |
819
5bbabfcef929
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
784
diff
changeset
|
4066 ;;;###autoload |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
4067 (defun display-call-tree (&optional filename) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
4068 "Display a call graph of a specified file. |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
4069 This lists which functions have been called, what functions called |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
4070 them, and what functions they call. The list includes all functions |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
4071 whose definitions have been compiled in this Emacs session, as well as |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
4072 all functions called by those functions. |
757 | 4073 |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
4074 The call graph does not include macros, inline functions, or |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
4075 primitives that the byte-code interpreter knows about directly \(eq, |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
4076 cons, etc.\). |
757 | 4077 |
4078 The call tree also lists those functions which are not known to be called | |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
4079 \(that is, to which no calls have been compiled\), and which cannot be |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
4080 invoked interactively." |
757 | 4081 (interactive) |
4082 (message "Generating call tree...") | |
4083 (with-output-to-temp-buffer "*Call-Tree*" | |
4084 (set-buffer "*Call-Tree*") | |
4085 (erase-buffer) | |
10687
1bd70186f894
(byte-compile-file-form-defmumble, display-call-tree): Print ellipsis earlier,
Karl Heuer <kwzh@gnu.org>
parents:
10514
diff
changeset
|
4086 (message "Generating call tree... (sorting on %s)" |
757 | 4087 byte-compile-call-tree-sort) |
4088 (insert "Call tree for " | |
4089 (cond ((null byte-compile-current-file) (or filename "???")) | |
4090 ((stringp byte-compile-current-file) | |
4091 byte-compile-current-file) | |
4092 (t (buffer-name byte-compile-current-file))) | |
4093 " sorted on " | |
4094 (prin1-to-string byte-compile-call-tree-sort) | |
4095 ":\n\n") | |
4096 (if byte-compile-call-tree-sort | |
4097 (setq byte-compile-call-tree | |
4098 (sort byte-compile-call-tree | |
4099 (cond ((eq byte-compile-call-tree-sort 'callers) | |
4100 (function (lambda (x y) (< (length (nth 1 x)) | |
4101 (length (nth 1 y)))))) | |
4102 ((eq byte-compile-call-tree-sort 'calls) | |
4103 (function (lambda (x y) (< (length (nth 2 x)) | |
4104 (length (nth 2 y)))))) | |
4105 ((eq byte-compile-call-tree-sort 'calls+callers) | |
4106 (function (lambda (x y) (< (+ (length (nth 1 x)) | |
4107 (length (nth 2 x))) | |
4108 (+ (length (nth 1 y)) | |
4109 (length (nth 2 y))))))) | |
4110 ((eq byte-compile-call-tree-sort 'name) | |
4111 (function (lambda (x y) (string< (car x) | |
4112 (car y))))) | |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
4113 (t (error "`byte-compile-call-tree-sort': `%s' - unknown sort mode" |
757 | 4114 byte-compile-call-tree-sort)))))) |
4115 (message "Generating call tree...") | |
4116 (let ((rest byte-compile-call-tree) | |
4117 (b (current-buffer)) | |
4118 f p | |
4119 callers calls) | |
4120 (while rest | |
4121 (prin1 (car (car rest)) b) | |
4122 (setq callers (nth 1 (car rest)) | |
4123 calls (nth 2 (car rest))) | |
4124 (insert "\t" | |
4125 (cond ((not (fboundp (setq f (car (car rest))))) | |
4126 (if (null f) | |
4127 " <top level>";; shouldn't insert nil then, actually -sk | |
4128 " <not defined>")) | |
4129 ((subrp (setq f (symbol-function f))) | |
4130 " <subr>") | |
4131 ((symbolp f) | |
4132 (format " ==> %s" f)) | |
1819
df06a60f3362
* disass.el (disassemble): Add autoload cookie for this.
Jim Blandy <jimb@redhat.com>
parents:
1604
diff
changeset
|
4133 ((byte-code-function-p f) |
757 | 4134 "<compiled function>") |
4135 ((not (consp f)) | |
4136 "<malformed function>") | |
4137 ((eq 'macro (car f)) | |
1819
df06a60f3362
* disass.el (disassemble): Add autoload cookie for this.
Jim Blandy <jimb@redhat.com>
parents:
1604
diff
changeset
|
4138 (if (or (byte-code-function-p (cdr f)) |
757 | 4139 (assq 'byte-code (cdr (cdr (cdr f))))) |
4140 " <compiled macro>" | |
4141 " <macro>")) | |
4142 ((assq 'byte-code (cdr (cdr f))) | |
4143 "<compiled lambda>") | |
4144 ((eq 'lambda (car f)) | |
4145 "<function>") | |
4146 (t "???")) | |
4147 (format " (%d callers + %d calls = %d)" | |
4148 ;; Does the optimizer eliminate common subexpressions?-sk | |
4149 (length callers) | |
4150 (length calls) | |
4151 (+ (length callers) (length calls))) | |
4152 "\n") | |
4153 (if callers | |
4154 (progn | |
4155 (insert " called by:\n") | |
4156 (setq p (point)) | |
4157 (insert " " (if (car callers) | |
4158 (mapconcat 'symbol-name callers ", ") | |
4159 "<top level>")) | |
4160 (let ((fill-prefix " ")) | |
57004
e9a116c0f176
(byte-compile-generate-call-tree): Doc fix.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56657
diff
changeset
|
4161 (fill-region-as-paragraph p (point))) |
e9a116c0f176
(byte-compile-generate-call-tree): Doc fix.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56657
diff
changeset
|
4162 (unless (= 0 (current-column)) |
e9a116c0f176
(byte-compile-generate-call-tree): Doc fix.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56657
diff
changeset
|
4163 (insert "\n")))) |
757 | 4164 (if calls |
4165 (progn | |
4166 (insert " calls:\n") | |
4167 (setq p (point)) | |
4168 (insert " " (mapconcat 'symbol-name calls ", ")) | |
4169 (let ((fill-prefix " ")) | |
57004
e9a116c0f176
(byte-compile-generate-call-tree): Doc fix.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56657
diff
changeset
|
4170 (fill-region-as-paragraph p (point))) |
e9a116c0f176
(byte-compile-generate-call-tree): Doc fix.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56657
diff
changeset
|
4171 (unless (= 0 (current-column)) |
e9a116c0f176
(byte-compile-generate-call-tree): Doc fix.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56657
diff
changeset
|
4172 (insert "\n")))) |
757 | 4173 (setq rest (cdr rest))) |
4174 | |
4175 (message "Generating call tree...(finding uncalled functions...)") | |
4176 (setq rest byte-compile-call-tree) | |
4177 (let ((uncalled nil)) | |
4178 (while rest | |
4179 (or (nth 1 (car rest)) | |
4180 (null (setq f (car (car rest)))) | |
58073
9412413950a3
(byte-compile-defalias):
Richard M. Stallman <rms@gnu.org>
parents:
57881
diff
changeset
|
4181 (functionp (byte-compile-fdefinition f t)) |
757 | 4182 (commandp (byte-compile-fdefinition f nil)) |
4183 (setq uncalled (cons f uncalled))) | |
4184 (setq rest (cdr rest))) | |
4185 (if uncalled | |
4186 (let ((fill-prefix " ")) | |
4187 (insert "Noninteractive functions not known to be called:\n ") | |
4188 (setq p (point)) | |
4189 (insert (mapconcat 'symbol-name (nreverse uncalled) ", ")) | |
4190 (fill-region-as-paragraph p (point))))) | |
4191 ) | |
4192 (message "Generating call tree...done.") | |
4193 )) | |
4194 | |
4195 | |
44103
f93538d76117
(batch-byte-compile-if-not-done): Add autoload cookie.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43027
diff
changeset
|
4196 ;;;###autoload |
43027
4c6cdfeb929c
(batch-byte-compile): New arg noforce.
Richard M. Stallman <rms@gnu.org>
parents:
41176
diff
changeset
|
4197 (defun batch-byte-compile-if-not-done () |
4c6cdfeb929c
(batch-byte-compile): New arg noforce.
Richard M. Stallman <rms@gnu.org>
parents:
41176
diff
changeset
|
4198 "Like `byte-compile-file' but doesn't recompile if already up to date. |
4c6cdfeb929c
(batch-byte-compile): New arg noforce.
Richard M. Stallman <rms@gnu.org>
parents:
41176
diff
changeset
|
4199 Use this from the command line, with `-batch'; |
4c6cdfeb929c
(batch-byte-compile): New arg noforce.
Richard M. Stallman <rms@gnu.org>
parents:
41176
diff
changeset
|
4200 it won't work in an interactive Emacs." |
4c6cdfeb929c
(batch-byte-compile): New arg noforce.
Richard M. Stallman <rms@gnu.org>
parents:
41176
diff
changeset
|
4201 (batch-byte-compile t)) |
4c6cdfeb929c
(batch-byte-compile): New arg noforce.
Richard M. Stallman <rms@gnu.org>
parents:
41176
diff
changeset
|
4202 |
757 | 4203 ;;; by crl@newton.purdue.edu |
4204 ;;; Only works noninteractively. | |
819
5bbabfcef929
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
784
diff
changeset
|
4205 ;;;###autoload |
43027
4c6cdfeb929c
(batch-byte-compile): New arg noforce.
Richard M. Stallman <rms@gnu.org>
parents:
41176
diff
changeset
|
4206 (defun batch-byte-compile (&optional noforce) |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
4207 "Run `byte-compile-file' on the files remaining on the command line. |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
4208 Use this from the command line, with `-batch'; |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
4209 it won't work in an interactive Emacs. |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
4210 Each file is processed even if an error occurred previously. |
43027
4c6cdfeb929c
(batch-byte-compile): New arg noforce.
Richard M. Stallman <rms@gnu.org>
parents:
41176
diff
changeset
|
4211 For example, invoke \"emacs -batch -f batch-byte-compile $emacs/ ~/*.el\". |
4c6cdfeb929c
(batch-byte-compile): New arg noforce.
Richard M. Stallman <rms@gnu.org>
parents:
41176
diff
changeset
|
4212 If NOFORCE is non-nil, don't recompile a file that seems to be |
4c6cdfeb929c
(batch-byte-compile): New arg noforce.
Richard M. Stallman <rms@gnu.org>
parents:
41176
diff
changeset
|
4213 already up-to-date." |
757 | 4214 ;; command-line-args-left is what is left of the command line (from startup.el) |
4215 (defvar command-line-args-left) ;Avoid 'free variable' warning | |
4216 (if (not noninteractive) | |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
4217 (error "`batch-byte-compile' is to be used only with -batch")) |
757 | 4218 (let ((error nil)) |
4219 (while command-line-args-left | |
4220 (if (file-directory-p (expand-file-name (car command-line-args-left))) | |
43027
4c6cdfeb929c
(batch-byte-compile): New arg noforce.
Richard M. Stallman <rms@gnu.org>
parents:
41176
diff
changeset
|
4221 ;; Directory as argument. |
92388 | 4222 (let ((bytecomp-files (directory-files (car command-line-args-left))) |
4223 bytecomp-source bytecomp-dest) | |
4224 (dolist (bytecomp-file bytecomp-files) | |
4225 (if (and (string-match emacs-lisp-file-regexp bytecomp-file) | |
4226 (not (auto-save-file-name-p bytecomp-file)) | |
4227 (setq bytecomp-source | |
4228 (expand-file-name bytecomp-file | |
4229 (car command-line-args-left))) | |
4230 (setq bytecomp-dest (byte-compile-dest-file | |
4231 bytecomp-source)) | |
4232 (file-exists-p bytecomp-dest) | |
4233 (file-newer-than-file-p bytecomp-source bytecomp-dest)) | |
4234 (if (null (batch-byte-compile-file bytecomp-source)) | |
40451
9c7e47dd60be
(byte-recompile-directory): Report numbers of files skipped and failed too.
Sam Steingold <sds@gnu.org>
parents:
40035
diff
changeset
|
4235 (setq error t))))) |
43027
4c6cdfeb929c
(batch-byte-compile): New arg noforce.
Richard M. Stallman <rms@gnu.org>
parents:
41176
diff
changeset
|
4236 ;; Specific file argument |
4c6cdfeb929c
(batch-byte-compile): New arg noforce.
Richard M. Stallman <rms@gnu.org>
parents:
41176
diff
changeset
|
4237 (if (or (not noforce) |
92388 | 4238 (let* ((bytecomp-source (car command-line-args-left)) |
4239 (bytecomp-dest (byte-compile-dest-file bytecomp-source))) | |
4240 (or (not (file-exists-p bytecomp-dest)) | |
4241 (file-newer-than-file-p bytecomp-source bytecomp-dest)))) | |
43027
4c6cdfeb929c
(batch-byte-compile): New arg noforce.
Richard M. Stallman <rms@gnu.org>
parents:
41176
diff
changeset
|
4242 (if (null (batch-byte-compile-file (car command-line-args-left))) |
4c6cdfeb929c
(batch-byte-compile): New arg noforce.
Richard M. Stallman <rms@gnu.org>
parents:
41176
diff
changeset
|
4243 (setq error t)))) |
757 | 4244 (setq command-line-args-left (cdr command-line-args-left))) |
4245 (kill-emacs (if error 1 0)))) | |
4246 | |
92388 | 4247 (defun batch-byte-compile-file (bytecomp-file) |
54890
ab70a3ddd144
(batch-byte-compile-file): Give a backtrace if requested.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54790
diff
changeset
|
4248 (if debug-on-error |
92388 | 4249 (byte-compile-file bytecomp-file) |
54890
ab70a3ddd144
(batch-byte-compile-file): Give a backtrace if requested.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54790
diff
changeset
|
4250 (condition-case err |
92388 | 4251 (byte-compile-file bytecomp-file) |
54890
ab70a3ddd144
(batch-byte-compile-file): Give a backtrace if requested.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54790
diff
changeset
|
4252 (file-error |
ab70a3ddd144
(batch-byte-compile-file): Give a backtrace if requested.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54790
diff
changeset
|
4253 (message (if (cdr err) |
ab70a3ddd144
(batch-byte-compile-file): Give a backtrace if requested.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54790
diff
changeset
|
4254 ">>Error occurred processing %s: %s (%s)" |
45572
26228dbfd782
(batch-byte-compile-file): Delete the output file if we get a file-error.
Richard M. Stallman <rms@gnu.org>
parents:
45558
diff
changeset
|
4255 ">>Error occurred processing %s: %s") |
92388 | 4256 bytecomp-file |
54890
ab70a3ddd144
(batch-byte-compile-file): Give a backtrace if requested.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54790
diff
changeset
|
4257 (get (car err) 'error-message) |
ab70a3ddd144
(batch-byte-compile-file): Give a backtrace if requested.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54790
diff
changeset
|
4258 (prin1-to-string (cdr err))) |
92388 | 4259 (let ((bytecomp-destfile (byte-compile-dest-file bytecomp-file))) |
4260 (if (file-exists-p bytecomp-destfile) | |
4261 (delete-file bytecomp-destfile))) | |
54890
ab70a3ddd144
(batch-byte-compile-file): Give a backtrace if requested.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54790
diff
changeset
|
4262 nil) |
ab70a3ddd144
(batch-byte-compile-file): Give a backtrace if requested.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54790
diff
changeset
|
4263 (error |
ab70a3ddd144
(batch-byte-compile-file): Give a backtrace if requested.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54790
diff
changeset
|
4264 (message (if (cdr err) |
ab70a3ddd144
(batch-byte-compile-file): Give a backtrace if requested.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54790
diff
changeset
|
4265 ">>Error occurred processing %s: %s (%s)" |
757 | 4266 ">>Error occurred processing %s: %s") |
92388 | 4267 bytecomp-file |
54890
ab70a3ddd144
(batch-byte-compile-file): Give a backtrace if requested.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54790
diff
changeset
|
4268 (get (car err) 'error-message) |
ab70a3ddd144
(batch-byte-compile-file): Give a backtrace if requested.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54790
diff
changeset
|
4269 (prin1-to-string (cdr err))) |
ab70a3ddd144
(batch-byte-compile-file): Give a backtrace if requested.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54790
diff
changeset
|
4270 nil)))) |
757 | 4271 |
5283
f48e54cb9b01
(byte-compile-dest-file): If FILENAME is not recognized, append .elc to it.
Richard M. Stallman <rms@gnu.org>
parents:
4556
diff
changeset
|
4272 ;;;###autoload |
55077
6635869bd341
(batch-byte-recompile-directory): Add byte-recompile-directory's opt `arg'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55043
diff
changeset
|
4273 (defun batch-byte-recompile-directory (&optional arg) |
47344
0b6b707c1e14
(byte-compile-file): Don't switch buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47332
diff
changeset
|
4274 "Run `byte-recompile-directory' on the dirs remaining on the command line. |
3718
37a8a7489fc5
(byte-compile-file): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
3653
diff
changeset
|
4275 Must be used only with `-batch', and kills Emacs on completion. |
68167
9681817a2fa5
(batch-byte-recompile-directory): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
68001
diff
changeset
|
4276 For example, invoke `emacs -batch -f batch-byte-recompile-directory .'. |
9681817a2fa5
(batch-byte-recompile-directory): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
68001
diff
changeset
|
4277 |
9681817a2fa5
(batch-byte-recompile-directory): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
68001
diff
changeset
|
4278 Optional argument ARG is passed as second argument ARG to |
79488
b8e6a2408b6d
(batch-byte-recompile-directory): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
79231
diff
changeset
|
4279 `byte-recompile-directory'; see there for its possible values |
68167
9681817a2fa5
(batch-byte-recompile-directory): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
68001
diff
changeset
|
4280 and corresponding effects." |
3653
974055b516d9
* bytecomp.el: Bring it up to version 2.10 of the
Jim Blandy <jimb@redhat.com>
parents:
3591
diff
changeset
|
4281 ;; command-line-args-left is what is left of the command line (startup.el) |
974055b516d9
* bytecomp.el: Bring it up to version 2.10 of the
Jim Blandy <jimb@redhat.com>
parents:
3591
diff
changeset
|
4282 (defvar command-line-args-left) ;Avoid 'free variable' warning |
974055b516d9
* bytecomp.el: Bring it up to version 2.10 of the
Jim Blandy <jimb@redhat.com>
parents:
3591
diff
changeset
|
4283 (if (not noninteractive) |
974055b516d9
* bytecomp.el: Bring it up to version 2.10 of the
Jim Blandy <jimb@redhat.com>
parents:
3591
diff
changeset
|
4284 (error "batch-byte-recompile-directory is to be used only with -batch")) |
974055b516d9
* bytecomp.el: Bring it up to version 2.10 of the
Jim Blandy <jimb@redhat.com>
parents:
3591
diff
changeset
|
4285 (or command-line-args-left |
974055b516d9
* bytecomp.el: Bring it up to version 2.10 of the
Jim Blandy <jimb@redhat.com>
parents:
3591
diff
changeset
|
4286 (setq command-line-args-left '("."))) |
974055b516d9
* bytecomp.el: Bring it up to version 2.10 of the
Jim Blandy <jimb@redhat.com>
parents:
3591
diff
changeset
|
4287 (while command-line-args-left |
55077
6635869bd341
(batch-byte-recompile-directory): Add byte-recompile-directory's opt `arg'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55043
diff
changeset
|
4288 (byte-recompile-directory (car command-line-args-left) arg) |
3653
974055b516d9
* bytecomp.el: Bring it up to version 2.10 of the
Jim Blandy <jimb@redhat.com>
parents:
3591
diff
changeset
|
4289 (setq command-line-args-left (cdr command-line-args-left))) |
974055b516d9
* bytecomp.el: Bring it up to version 2.10 of the
Jim Blandy <jimb@redhat.com>
parents:
3591
diff
changeset
|
4290 (kill-emacs 0)) |
974055b516d9
* bytecomp.el: Bring it up to version 2.10 of the
Jim Blandy <jimb@redhat.com>
parents:
3591
diff
changeset
|
4291 |
757 | 4292 (provide 'byte-compile) |
5341
2f4fab6070b8
Provide bytecomp as well as byte-compile.
Richard M. Stallman <rms@gnu.org>
parents:
5283
diff
changeset
|
4293 (provide 'bytecomp) |
757 | 4294 |
4295 | |
4296 ;;; report metering (see the hacks in bytecode.c) | |
4297 | |
51737
10cd0bec4a7f
(byte-compile-defvar): Check and set the default value of the variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51289
diff
changeset
|
4298 (defvar byte-code-meter) |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
4299 (defun byte-compile-report-ops () |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
4300 (with-output-to-temp-buffer "*Meter*" |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
4301 (set-buffer "*Meter*") |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
4302 (let ((i 0) n op off) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
4303 (while (< i 256) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
4304 (setq n (aref (aref byte-code-meter 0) i) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
4305 off nil) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
4306 (if t ;(not (zerop n)) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
4307 (progn |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
4308 (setq op i) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
4309 (setq off nil) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
4310 (cond ((< op byte-nth) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
4311 (setq off (logand op 7)) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
4312 (setq op (logand op 248))) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
4313 ((>= op byte-constant) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
4314 (setq off (- op byte-constant) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
4315 op byte-constant))) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
4316 (setq op (aref byte-code-vector op)) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
4317 (insert (format "%-4d" i)) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
4318 (insert (symbol-name op)) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
4319 (if off (insert " [" (int-to-string off) "]")) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
4320 (indent-to 40) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
4321 (insert (int-to-string n) "\n"))) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
4322 (setq i (1+ i)))))) |
757 | 4323 |
4324 ;; To avoid "lisp nesting exceeds max-lisp-eval-depth" when bytecomp compiles | |
4325 ;; itself, compile some of its most used recursive functions (at load time). | |
4326 ;; | |
4327 (eval-when-compile | |
12511
93a7cb2eefcc
Made executing-macro, before-change-function, after-change-function and font-lock-doc-string-face obsolete.
Simon Marshall <simon@gnu.org>
parents:
12487
diff
changeset
|
4328 (or (byte-code-function-p (symbol-function 'byte-compile-form)) |
93a7cb2eefcc
Made executing-macro, before-change-function, after-change-function and font-lock-doc-string-face obsolete.
Simon Marshall <simon@gnu.org>
parents:
12487
diff
changeset
|
4329 (assq 'byte-code (symbol-function 'byte-compile-form)) |
93a7cb2eefcc
Made executing-macro, before-change-function, after-change-function and font-lock-doc-string-face obsolete.
Simon Marshall <simon@gnu.org>
parents:
12487
diff
changeset
|
4330 (let ((byte-optimize nil) ; do it fast |
93a7cb2eefcc
Made executing-macro, before-change-function, after-change-function and font-lock-doc-string-face obsolete.
Simon Marshall <simon@gnu.org>
parents:
12487
diff
changeset
|
4331 (byte-compile-warnings nil)) |
84746 | 4332 (mapc (lambda (x) |
4333 (or noninteractive (message "compiling %s..." x)) | |
4334 (byte-compile x) | |
4335 (or noninteractive (message "compiling %s...done" x))) | |
4336 '(byte-compile-normal-call | |
4337 byte-compile-form | |
4338 byte-compile-body | |
4339 ;; Inserted some more than necessary, to speed it up. | |
4340 byte-compile-top-level | |
4341 byte-compile-out-toplevel | |
4342 byte-compile-constant | |
4343 byte-compile-variable-ref)))) | |
12511
93a7cb2eefcc
Made executing-macro, before-change-function, after-change-function and font-lock-doc-string-face obsolete.
Simon Marshall <simon@gnu.org>
parents:
12487
diff
changeset
|
4344 nil) |
819
5bbabfcef929
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
784
diff
changeset
|
4345 |
27584 | 4346 (run-hooks 'bytecomp-load-hook) |
4347 | |
58154 | 4348 ;; arch-tag: 9c97b0f0-8745-4571-bfc3-8dceb677292a |
819
5bbabfcef929
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
784
diff
changeset
|
4349 ;;; bytecomp.el ends here |