Mercurial > emacs
annotate lisp/emacs-lisp/bytecomp.el @ 57709:fd2c192afcd3
(describe-key): Describe both down-event and up-event
for a mouse click.
author | Kim F. Storm <storm@cua.dk> |
---|---|
date | Tue, 26 Oct 2004 12:59:44 +0000 |
parents | 25bf13fe1c10 |
children | f57a9010e865 0fc4928cc48e f3ec05478165 |
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 |
54497
acd845de0416
(byte-recompile-directory): Ignore hidden dir.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54374
diff
changeset
|
3 ;; Copyright (C) 1985,86,87,92,94,1998,2000,01,02,03,2004 |
27824 | 4 ;; 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 | |
13 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
14 ;; it under the terms of the GNU General Public License as published by | |
819
5bbabfcef929
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
784
diff
changeset
|
15 ;; the Free Software Foundation; either version 2, or (at your option) |
757 | 16 ;; any later version. |
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 | |
14169 | 24 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
25 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
26 ;; Boston, MA 02111-1307, USA. | |
757 | 27 |
2307
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2299
diff
changeset
|
28 ;;; Commentary: |
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2299
diff
changeset
|
29 |
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2299
diff
changeset
|
30 ;; 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
|
31 ;; 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
|
32 ;; faster. [`LAP' == `Lisp Assembly Program'.] |
2307
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2299
diff
changeset
|
33 ;; 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
|
34 |
819
5bbabfcef929
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
784
diff
changeset
|
35 ;;; Code: |
5bbabfcef929
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
784
diff
changeset
|
36 |
14169 | 37 ;; ======================================================================== |
38 ;; Entry points: | |
39 ;; byte-recompile-directory, byte-compile-file, | |
40 ;; batch-byte-compile, batch-byte-recompile-directory, | |
41 ;; byte-compile, compile-defun, | |
42 ;; display-call-tree | |
43 ;; (byte-compile-buffer and byte-compile-and-load-file were turned off | |
44 ;; because they are not terribly useful and get in the way of completion.) | |
757 | 45 |
14169 | 46 ;; This version of the byte compiler has the following improvements: |
47 ;; + optimization of compiled code: | |
48 ;; - removal of unreachable code; | |
49 ;; - removal of calls to side-effectless functions whose return-value | |
50 ;; is unused; | |
51 ;; - compile-time evaluation of safe constant forms, such as (consp nil) | |
52 ;; and (ash 1 6); | |
53 ;; - open-coding of literal lambdas; | |
54 ;; - peephole optimization of emitted code; | |
55 ;; - trivial functions are left uncompiled for speed. | |
56 ;; + support for inline functions; | |
57 ;; + compile-time evaluation of arbitrary expressions; | |
58 ;; + compile-time warning messages for: | |
59 ;; - functions being redefined with incompatible arglists; | |
60 ;; - functions being redefined as macros, or vice-versa; | |
61 ;; - functions or macros defined multiple times in the same file; | |
62 ;; - functions being called with the incorrect number of arguments; | |
28402 | 63 ;; - functions being called which are not defined globally, in the |
14169 | 64 ;; file, or as autoloads; |
65 ;; - assignment and reference of undeclared free variables; | |
66 ;; - various syntax errors; | |
67 ;; + correct compilation of nested defuns, defmacros, defvars and defsubsts; | |
68 ;; + correct compilation of top-level uses of macros; | |
69 ;; + the ability to generate a histogram of functions called. | |
757 | 70 |
14169 | 71 ;; User customization variables: |
72 ;; | |
73 ;; 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
|
74 ;; compiled in the echo area; |
28402 | 75 ;; byte-optimize Whether to do optimizations; this may be |
14169 | 76 ;; t, nil, 'source, or 'byte; |
28402 | 77 ;; byte-optimize-log Whether to report (in excruciating detail) |
14169 | 78 ;; exactly which optimizations have been made. |
79 ;; This may be t, nil, 'source, or 'byte; | |
80 ;; byte-compile-error-on-warn Whether to stop compilation when a warning is | |
81 ;; produced; | |
82 ;; byte-compile-delete-errors Whether the optimizer may delete calls or | |
83 ;; variable references that are side-effect-free | |
84 ;; except that they may return an error. | |
85 ;; byte-compile-generate-call-tree Whether to generate a histogram of | |
28402 | 86 ;; function calls. This can be useful for |
14169 | 87 ;; finding unused functions, as well as simple |
88 ;; performance metering. | |
89 ;; byte-compile-warnings List of warnings to issue, or t. May contain | |
49821 | 90 ;; `free-vars' (references to variables not in the |
91 ;; current lexical scope) | |
92 ;; `unresolved' (calls to unknown functions) | |
93 ;; `callargs' (lambda calls with args that don't | |
94 ;; match the lambda's definition) | |
95 ;; `redefine' (function cell redefined from | |
96 ;; a macro to a lambda or vice versa, | |
97 ;; or redefined to take other args) | |
98 ;; `obsolete' (obsolete variables and functions) | |
99 ;; `noruntime' (calls to functions only defined | |
100 ;; within `eval-when-compile') | |
14169 | 101 ;; byte-compile-compatibility Whether the compiler should |
102 ;; generate .elc files which can be loaded into | |
103 ;; generic emacs 18. | |
104 ;; emacs-lisp-file-regexp Regexp for the extension of source-files; | |
105 ;; see also the function byte-compile-dest-file. | |
757 | 106 |
14169 | 107 ;; New Features: |
108 ;; | |
109 ;; o The form `defsubst' is just like `defun', except that the function | |
110 ;; generated will be open-coded in compiled code which uses it. This | |
111 ;; means that no function call will be generated, it will simply be | |
112 ;; spliced in. Lisp functions calls are very slow, so this can be a | |
113 ;; big win. | |
114 ;; | |
115 ;; You can generally accomplish the same thing with `defmacro', but in | |
116 ;; that case, the defined procedure can't be used as an argument to | |
117 ;; mapcar, etc. | |
118 ;; | |
119 ;; o You can also open-code one particular call to a function without | |
120 ;; open-coding all calls. Use the 'inline' form to do this, like so: | |
121 ;; | |
122 ;; (inline (foo 1 2 3)) ;; `foo' will be open-coded | |
123 ;; or... | |
28402 | 124 ;; (inline ;; `foo' and `baz' will be |
14169 | 125 ;; (foo 1 2 3 (bar 5)) ;; open-coded, but `bar' will not. |
126 ;; (baz 0)) | |
127 ;; | |
128 ;; 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
|
129 ;; in without having to load that file before compiling it. The |
14169 | 130 ;; byte-compiler has been modified to remember function definitions in |
131 ;; the compilation environment in the same way that it remembers macro | |
132 ;; definitions. | |
133 ;; | |
134 ;; o Forms like ((lambda ...) ...) are open-coded. | |
135 ;; | |
136 ;; o The form `eval-when-compile' is like progn, except that the body | |
137 ;; is evaluated at compile-time. When it appears at top-level, this | |
138 ;; is analogous to the Common Lisp idiom (eval-when (compile) ...). | |
139 ;; When it does not appear at top-level, it is similar to the | |
140 ;; Common Lisp #. reader macro (but not in interpreted code). | |
141 ;; | |
142 ;; o The form `eval-and-compile' is similar to eval-when-compile, but | |
143 ;; the whole form is evalled both at compile-time and at run-time. | |
144 ;; | |
145 ;; o The command compile-defun is analogous to eval-defun. | |
146 ;; | |
28402 | 147 ;; o If you run byte-compile-file on a filename which is visited in a |
14169 | 148 ;; buffer, and that buffer is modified, you are asked whether you want |
149 ;; to save the buffer before compiling. | |
150 ;; | |
151 ;; o byte-compiled files now start with the string `;ELC'. | |
152 ;; Some versions of `file' can be customized to recognize that. | |
757 | 153 |
1604
25173c1db5a6
* bytecomp.el: Declare unread-command-char an obsolete variable.
Jim Blandy <jimb@redhat.com>
parents:
1532
diff
changeset
|
154 (require 'backquote) |
25173c1db5a6
* bytecomp.el: Declare unread-command-char an obsolete variable.
Jim Blandy <jimb@redhat.com>
parents:
1532
diff
changeset
|
155 |
757 | 156 (or (fboundp 'defsubst) |
157 ;; 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
|
158 (load "byte-run")) |
757 | 159 |
39561
0881eab13b7a
(byte-recompile-directory): Make sure the file is readable.
Gerd Moellmann <gerd@gnu.org>
parents:
38895
diff
changeset
|
160 ;; 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
|
161 ;; 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
|
162 (defmacro byte-compile-single-version () nil) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
163 (defmacro byte-compile-version-cond (cond) cond) |
757 | 164 |
39561
0881eab13b7a
(byte-recompile-directory): Make sure the file is readable.
Gerd Moellmann <gerd@gnu.org>
parents:
38895
diff
changeset
|
165 ;; 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
|
166 ;; (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
|
167 ;; (string-lessp emacs-version "19")) |
0881eab13b7a
(byte-recompile-directory): Make sure the file is readable.
Gerd Moellmann <gerd@gnu.org>
parents:
38895
diff
changeset
|
168 ;; 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
|
169 ;; normal emacs version numbering convention. |
757 | 170 |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
171 ;; (if (byte-compile-version-cond |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
172 ;; (or (and (boundp 'epoch::version) epoch::version) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
173 ;; (string-lessp emacs-version "19"))) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
174 ;; (progn |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
175 ;; ;; emacs-18 compatibility. |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
176 ;; (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
|
177 ;; |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
178 ;; (if (byte-compile-single-version) |
1819
df06a60f3362
* disass.el (disassemble): Add autoload cookie for this.
Jim Blandy <jimb@redhat.com>
parents:
1604
diff
changeset
|
179 ;; (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
|
180 ;; (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
|
181 ;; |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
182 ;; (or (and (fboundp 'member) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
183 ;; ;; avoid using someone else's possibly bogus definition of this. |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
184 ;; (subrp (symbol-function 'member))) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
185 ;; (defun member (elt list) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
186 ;; "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
|
187 ;; (while (and list (not (equal elt (car list)))) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
188 ;; (setq list (cdr list))) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
189 ;; list)))) |
757 | 190 |
191 | |
20779 | 192 (defgroup bytecomp nil |
193 "Emacs Lisp byte-compiler" | |
194 :group 'lisp) | |
195 | |
196 (defcustom emacs-lisp-file-regexp (if (eq system-type 'vax-vms) | |
197 "\\.EL\\(;[0-9]+\\)?$" | |
198 "\\.el$") | |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
199 "*Regexp which matches Emacs Lisp source files. |
20779 | 200 You may want to redefine the function `byte-compile-dest-file' |
201 if you change this variable." | |
202 :group 'bytecomp | |
203 :type 'regexp) | |
757 | 204 |
12928
5c76c36717cb
(byte-compiler-base-file-name): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12823
diff
changeset
|
205 ;; 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
|
206 ;; 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
|
207 ;; through to the output file name. |
5c76c36717cb
(byte-compiler-base-file-name): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12823
diff
changeset
|
208 (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
|
209 (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
|
210 'byte-compiler-base-file-name))) |
5c76c36717cb
(byte-compiler-base-file-name): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12823
diff
changeset
|
211 (if handler |
5c76c36717cb
(byte-compiler-base-file-name): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12823
diff
changeset
|
212 (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
|
213 filename))) |
5c76c36717cb
(byte-compiler-base-file-name): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12823
diff
changeset
|
214 |
757 | 215 (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
|
216 ;; The user may want to redefine this along with emacs-lisp-file-regexp, |
757 | 217 ;; so only define it if it is undefined. |
218 (defun byte-compile-dest-file (filename) | |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
219 "Convert an Emacs Lisp source file name to a compiled file name." |
12928
5c76c36717cb
(byte-compiler-base-file-name): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12823
diff
changeset
|
220 (setq filename (byte-compiler-base-file-name filename)) |
757 | 221 (setq filename (file-name-sans-versions filename)) |
222 (cond ((eq system-type 'vax-vms) | |
23054 | 223 (concat (substring filename 0 (string-match ";" filename)) "c")) |
224 ((string-match emacs-lisp-file-regexp filename) | |
225 (concat (substring filename 0 (match-beginning 0)) ".elc")) | |
226 (t (concat filename ".elc"))))) | |
757 | 227 |
228 ;; 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
|
229 (autoload 'byte-compile-inline-expand "byte-opt") |
757 | 230 |
231 ;; This is the entrypoint to the lapcode optimizer pass1. | |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
232 (autoload 'byte-optimize-form "byte-opt") |
757 | 233 ;; This is the entrypoint to the lapcode optimizer pass2. |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
234 (autoload 'byte-optimize-lapcode "byte-opt") |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
235 (autoload 'byte-compile-unfold-lambda "byte-opt") |
757 | 236 |
1819
df06a60f3362
* disass.el (disassemble): Add autoload cookie for this.
Jim Blandy <jimb@redhat.com>
parents:
1604
diff
changeset
|
237 ;; 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
|
238 ;; 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
|
239 ;; 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
|
240 ;; thing to do. |
df06a60f3362
* disass.el (disassemble): Add autoload cookie for this.
Jim Blandy <jimb@redhat.com>
parents:
1604
diff
changeset
|
241 (autoload 'byte-decompile-bytecode "byte-opt") |
df06a60f3362
* disass.el (disassemble): Add autoload cookie for this.
Jim Blandy <jimb@redhat.com>
parents:
1604
diff
changeset
|
242 |
20779 | 243 (defcustom byte-compile-verbose |
757 | 244 (and (not noninteractive) (> baud-rate search-slow-speed)) |
20779 | 245 "*Non-nil means print messages describing progress of byte-compiler." |
246 :group 'bytecomp | |
247 :type 'boolean) | |
757 | 248 |
20779 | 249 (defcustom byte-compile-compatibility nil |
53753
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
250 "*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
|
251 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
|
252 facilities that have been added more recently." |
20779 | 253 :group 'bytecomp |
254 :type 'boolean) | |
757 | 255 |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
256 ;; (defvar byte-compile-generate-emacs19-bytecodes |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
257 ;; (not (or (and (boundp 'epoch::version) epoch::version) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
258 ;; (string-lessp emacs-version "19"))) |
28402 | 259 ;; "*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
|
260 ;; 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
|
261 ;; this way can never be run in Emacs 18, and may even cause it to crash.") |
757 | 262 |
20779 | 263 (defcustom byte-optimize t |
1129 | 264 "*Enables optimization in the byte compiler. |
265 nil means don't do any optimization. | |
266 t means do all optimizations. | |
267 `source' means do source-level optimizations only. | |
20779 | 268 `byte' means do code-level optimizations only." |
269 :group 'bytecomp | |
270 :type '(choice (const :tag "none" nil) | |
271 (const :tag "all" t) | |
272 (const :tag "source-level" source) | |
273 (const :tag "byte-level" byte))) | |
757 | 274 |
47318
1a358c4f4b8b
(byte-compile-delete-errors): Default to nil.
Richard M. Stallman <rms@gnu.org>
parents:
47110
diff
changeset
|
275 (defcustom byte-compile-delete-errors nil |
1129 | 276 "*If non-nil, the optimizer may delete forms that may signal an error. |
20779 | 277 This includes variable references and calls to functions such as `car'." |
278 :group 'bytecomp | |
279 :type 'boolean) | |
757 | 280 |
10235
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
281 (defvar byte-compile-dynamic nil |
20779 | 282 "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
|
283 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
|
284 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
|
285 function is called. |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
286 |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
287 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
|
288 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
|
289 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
|
290 |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
291 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
|
292 the functions you loaded will not be able to run.") |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
293 |
20779 | 294 (defcustom byte-compile-dynamic-docstrings t |
10235
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
295 "*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
|
296 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
|
297 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
|
298 are actually needed. |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
299 |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
300 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
|
301 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
|
302 |
11848
1a50b9d542ce
(byte-compile-dynamic-docstrings): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
11819
diff
changeset
|
303 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
|
304 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
|
305 -*-byte-compile-dynamic-docstrings:nil;-*- |
1a50b9d542ce
(byte-compile-dynamic-docstrings): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
11819
diff
changeset
|
306 You can also set the variable globally. |
1a50b9d542ce
(byte-compile-dynamic-docstrings): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
11819
diff
changeset
|
307 |
20779 | 308 This option is enabled by default because it reduces Emacs memory usage." |
309 :group 'bytecomp | |
310 :type 'boolean) | |
10235
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
311 |
20779 | 312 (defcustom byte-optimize-log nil |
757 | 313 "*If true, the byte-compiler will log its optimizations into *Compile-Log*. |
314 If this is 'source, then only source-level optimizations will be logged. | |
20779 | 315 If it is 'byte, then only byte-level optimizations will be logged." |
316 :group 'bytecomp | |
317 :type '(choice (const :tag "none" nil) | |
318 (const :tag "all" t) | |
319 (const :tag "source-level" source) | |
320 (const :tag "byte-level" byte))) | |
757 | 321 |
20779 | 322 (defcustom byte-compile-error-on-warn nil |
323 "*If true, the byte-compiler reports warnings with `error'." | |
324 :group 'bytecomp | |
325 :type 'boolean) | |
757 | 326 |
10256
83d56dd99a40
(byte-compile-warning-types): Add obsolete.
Richard M. Stallman <rms@gnu.org>
parents:
10235
diff
changeset
|
327 (defconst byte-compile-warning-types |
46136
79f132657570
(byte-compile-warning-types):
Richard M. Stallman <rms@gnu.org>
parents:
46050
diff
changeset
|
328 '(redefine callargs free-vars unresolved obsolete noruntime cl-functions) |
79f132657570
(byte-compile-warning-types):
Richard M. Stallman <rms@gnu.org>
parents:
46050
diff
changeset
|
329 "The list of warning types used when `byte-compile-warnings' is t.") |
20779 | 330 (defcustom byte-compile-warnings t |
757 | 331 "*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
|
332 |
958 | 333 Elements of the list may be be: |
334 | |
335 free-vars references to variables not in the current lexical scope. | |
336 unresolved calls to unknown functions. | |
337 callargs lambda calls with args that don't match the definition. | |
338 redefine function cell redefined from a macro to a lambda or vice | |
339 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
|
340 obsolete obsolete variables and functions. |
79f132657570
(byte-compile-warning-types):
Richard M. Stallman <rms@gnu.org>
parents:
46050
diff
changeset
|
341 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
|
342 defined only under `eval-when-compile'). |
47912 | 343 cl-functions calls to runtime functions from the CL package (as |
46136
79f132657570
(byte-compile-warning-types):
Richard M. Stallman <rms@gnu.org>
parents:
46050
diff
changeset
|
344 distinguished from macros and aliases)." |
20779 | 345 :group 'bytecomp |
46136
79f132657570
(byte-compile-warning-types):
Richard M. Stallman <rms@gnu.org>
parents:
46050
diff
changeset
|
346 :type `(choice (const :tag "All" t) |
21510
daf7dfe93205
(byte-compile-warnings): Fix customize
Andreas Schwab <schwab@suse.de>
parents:
20847
diff
changeset
|
347 (set :menu-tag "Some" |
daf7dfe93205
(byte-compile-warnings): Fix customize
Andreas Schwab <schwab@suse.de>
parents:
20847
diff
changeset
|
348 (const free-vars) (const unresolved) |
46136
79f132657570
(byte-compile-warning-types):
Richard M. Stallman <rms@gnu.org>
parents:
46050
diff
changeset
|
349 (const callargs) (const redefine) |
79f132657570
(byte-compile-warning-types):
Richard M. Stallman <rms@gnu.org>
parents:
46050
diff
changeset
|
350 (const obsolete) (const noruntime) (const cl-functions)))) |
757 | 351 |
52133
4c112142c56f
(byte-compile-not-obsolete-var): New var.
Richard M. Stallman <rms@gnu.org>
parents:
51737
diff
changeset
|
352 (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
|
353 "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
|
354 |
20779 | 355 (defcustom byte-compile-generate-call-tree nil |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
356 "*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
|
357 This records which functions were called and from where. |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
358 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
|
359 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
|
360 the graph. |
757 | 361 |
362 The call tree only lists functions called, not macros used. Those functions | |
363 which the byte-code interpreter knows about directly (eq, cons, etc.) are | |
364 not reported. | |
365 | |
366 The call tree also lists those functions which are not known to be called | |
10372 | 367 \(that is, to which no calls have been compiled). Functions which can be |
20779 | 368 invoked interactively are excluded from this list." |
369 :group 'bytecomp | |
370 :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
|
371 (other :tag "Ask" lambda))) |
757 | 372 |
41176
2d63191afacd
(byte-compile-call-tree, byte-code-vector)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40451
diff
changeset
|
373 (defvar byte-compile-call-tree nil "Alist of functions and their call tree. |
757 | 374 Each element looks like |
375 | |
376 \(FUNCTION CALLERS CALLS\) | |
377 | |
378 where CALLERS is a list of functions that call FUNCTION, and CALLS | |
379 is a list of functions for which calls were generated while compiling | |
380 FUNCTION.") | |
381 | |
20779 | 382 (defcustom byte-compile-call-tree-sort 'name |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
383 "*If non-nil, sort the call tree. |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
384 The values `name', `callers', `calls', `calls+callers' |
20779 | 385 specify different fields to sort on." |
386 :group 'bytecomp | |
387 :type '(choice (const name) (const callers) (const calls) | |
388 (const calls+callers) (const nil))) | |
757 | 389 |
45558
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
390 (defvar byte-compile-debug nil) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
391 |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
392 ;; (defvar byte-compile-overwrite-file t |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
393 ;; "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
|
394 ;; 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
|
395 ;; existing .elc files will simply be overwritten, and the existing modes |
28402 | 396 ;; 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
|
397 ;; 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
|
398 ;; which the link points to being overwritten.") |
757 | 399 |
400 (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
|
401 "List of all constants encountered during compilation of this form.") |
757 | 402 (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
|
403 "List of all variables encountered during compilation of this form.") |
757 | 404 (defvar byte-compile-bound-variables nil |
26922
6fdf1f6c23a0
(byte-compile-bound-variables): Doc fix.
Dave Love <fx@gnu.org>
parents:
25636
diff
changeset
|
405 "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
|
406 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
|
407 (defvar byte-compile-const-variables nil |
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
408 "List of variables declared as constants during compilation of this file.") |
757 | 409 (defvar byte-compile-free-references) |
410 (defvar byte-compile-free-assignments) | |
411 | |
1129 | 412 (defvar byte-compiler-error-flag) |
413 | |
757 | 414 (defconst byte-compile-initial-macro-environment |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
415 '( |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
416 ;; (byte-compiler-options . (lambda (&rest forms) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
417 ;; (apply 'byte-compiler-options-handler forms))) |
757 | 418 (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
|
419 (list 'quote |
8082575fec24
(byte-compile-warning-types, byte-compile-warnings): New warning `noruntime'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27824
diff
changeset
|
420 (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
|
421 (cons 'progn body)))))) |
757 | 422 (eval-and-compile . (lambda (&rest body) |
46136
79f132657570
(byte-compile-warning-types):
Richard M. Stallman <rms@gnu.org>
parents:
46050
diff
changeset
|
423 (byte-compile-eval-before-compile (cons 'progn body)) |
757 | 424 (cons 'progn body)))) |
425 "The default macro-environment passed to macroexpand by the compiler. | |
426 Placing a macro here will cause a macro to have different semantics when | |
427 expanded by the compiler as when expanded by the interpreter.") | |
428 | |
429 (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
|
430 "Alist of macros defined in the file being compiled. |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
431 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
|
432 \(MACRONAME . nil) when a macro is redefined as a function.") |
757 | 433 |
434 (defvar byte-compile-function-environment nil | |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
435 "Alist of functions defined in the file being compiled. |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
436 This is so we can inline them when necessary. |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
437 Each element looks like (FUNCTIONNAME . DEFINITION). It is |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
438 \(FUNCTIONNAME . nil) when a function is redefined as a macro.") |
757 | 439 |
440 (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
|
441 "Alist of undefined functions to which calls have been compiled. |
8082575fec24
(byte-compile-warning-types, byte-compile-warnings): New warning `noruntime'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27824
diff
changeset
|
442 Used for warnings when the function is not known to be defined or is later |
8082575fec24
(byte-compile-warning-types, byte-compile-warnings): New warning `noruntime'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27824
diff
changeset
|
443 defined with incorrect args.") |
757 | 444 |
53753
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
445 (defvar byte-compile-noruntime-functions nil |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
446 "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
|
447 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
|
448 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
|
449 |
757 | 450 (defvar byte-compile-tag-number 0) |
451 (defvar byte-compile-output nil | |
452 "Alist describing contents to put in byte code string. | |
453 Each element is (INDEX . VALUE)") | |
454 (defvar byte-compile-depth 0 "Current depth of execution stack.") | |
455 (defvar byte-compile-maxdepth 0 "Maximum depth of execution stack.") | |
456 | |
457 | |
458 ;;; The byte codes; this information is duplicated in bytecomp.c | |
459 | |
41176
2d63191afacd
(byte-compile-call-tree, byte-code-vector)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40451
diff
changeset
|
460 (defvar byte-code-vector nil |
757 | 461 "An array containing byte-code names indexed by byte-code values.") |
462 | |
41176
2d63191afacd
(byte-compile-call-tree, byte-code-vector)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40451
diff
changeset
|
463 (defvar byte-stack+-info nil |
757 | 464 "An array with the stack adjustment for each byte-code.") |
465 | |
466 (defmacro byte-defop (opcode stack-adjust opname &optional docstring) | |
467 ;; This is a speed-hack for building the byte-code-vector at compile-time. | |
468 ;; We fill in the vector at macroexpand-time, and then after the last call | |
469 ;; to byte-defop, we write the vector out as a constant instead of writing | |
470 ;; out a bunch of calls to aset. | |
471 ;; Actually, we don't fill in the vector itself, because that could make | |
472 ;; it problematic to compile big changes to this compiler; we store the | |
473 ;; values on its plist, and remove them later in -extrude. | |
474 (let ((v1 (or (get 'byte-code-vector 'tmp-compile-time-value) | |
475 (put 'byte-code-vector 'tmp-compile-time-value | |
476 (make-vector 256 nil)))) | |
477 (v2 (or (get 'byte-stack+-info 'tmp-compile-time-value) | |
478 (put 'byte-stack+-info 'tmp-compile-time-value | |
479 (make-vector 256 nil))))) | |
480 (aset v1 opcode opname) | |
481 (aset v2 opcode stack-adjust)) | |
482 (if docstring | |
483 (list 'defconst opname opcode (concat "Byte code opcode " docstring ".")) | |
484 (list 'defconst opname opcode))) | |
485 | |
486 (defmacro byte-extrude-byte-code-vectors () | |
487 (prog1 (list 'setq 'byte-code-vector | |
488 (get 'byte-code-vector 'tmp-compile-time-value) | |
489 'byte-stack+-info | |
490 (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
|
491 (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
|
492 (put 'byte-stack+-info 'tmp-compile-time-value nil))) |
757 | 493 |
494 | |
495 ;; unused: 0-7 | |
496 | |
497 ;; These opcodes are special in that they pack their argument into the | |
498 ;; opcode word. | |
499 ;; | |
500 (byte-defop 8 1 byte-varref "for variable reference") | |
501 (byte-defop 16 -1 byte-varset "for setting a variable") | |
502 (byte-defop 24 -1 byte-varbind "for binding a variable") | |
503 (byte-defop 32 0 byte-call "for calling a function") | |
504 (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
|
505 ;; codes 8-47 are consumed by the preceding opcodes |
757 | 506 |
507 ;; unused: 48-55 | |
508 | |
509 (byte-defop 56 -1 byte-nth) | |
510 (byte-defop 57 0 byte-symbolp) | |
511 (byte-defop 58 0 byte-consp) | |
512 (byte-defop 59 0 byte-stringp) | |
513 (byte-defop 60 0 byte-listp) | |
514 (byte-defop 61 -1 byte-eq) | |
515 (byte-defop 62 -1 byte-memq) | |
516 (byte-defop 63 0 byte-not) | |
517 (byte-defop 64 0 byte-car) | |
518 (byte-defop 65 0 byte-cdr) | |
519 (byte-defop 66 -1 byte-cons) | |
520 (byte-defop 67 0 byte-list1) | |
521 (byte-defop 68 -1 byte-list2) | |
522 (byte-defop 69 -2 byte-list3) | |
523 (byte-defop 70 -3 byte-list4) | |
524 (byte-defop 71 0 byte-length) | |
525 (byte-defop 72 -1 byte-aref) | |
526 (byte-defop 73 -2 byte-aset) | |
527 (byte-defop 74 0 byte-symbol-value) | |
528 (byte-defop 75 0 byte-symbol-function) ; this was commented out | |
529 (byte-defop 76 -1 byte-set) | |
530 (byte-defop 77 -1 byte-fset) ; this was commented out | |
531 (byte-defop 78 -1 byte-get) | |
532 (byte-defop 79 -2 byte-substring) | |
533 (byte-defop 80 -1 byte-concat2) | |
534 (byte-defop 81 -2 byte-concat3) | |
535 (byte-defop 82 -3 byte-concat4) | |
536 (byte-defop 83 0 byte-sub1) | |
537 (byte-defop 84 0 byte-add1) | |
538 (byte-defop 85 -1 byte-eqlsign) | |
539 (byte-defop 86 -1 byte-gtr) | |
540 (byte-defop 87 -1 byte-lss) | |
541 (byte-defop 88 -1 byte-leq) | |
542 (byte-defop 89 -1 byte-geq) | |
543 (byte-defop 90 -1 byte-diff) | |
544 (byte-defop 91 0 byte-negate) | |
545 (byte-defop 92 -1 byte-plus) | |
546 (byte-defop 93 -1 byte-max) | |
547 (byte-defop 94 -1 byte-min) | |
548 (byte-defop 95 -1 byte-mult) ; v19 only | |
549 (byte-defop 96 1 byte-point) | |
550 (byte-defop 98 0 byte-goto-char) | |
551 (byte-defop 99 0 byte-insert) | |
552 (byte-defop 100 1 byte-point-max) | |
553 (byte-defop 101 1 byte-point-min) | |
554 (byte-defop 102 0 byte-char-after) | |
555 (byte-defop 103 1 byte-following-char) | |
556 (byte-defop 104 1 byte-preceding-char) | |
557 (byte-defop 105 1 byte-current-column) | |
558 (byte-defop 106 0 byte-indent-to) | |
559 (byte-defop 107 0 byte-scan-buffer-OBSOLETE) ; no longer generated as of v18 | |
560 (byte-defop 108 1 byte-eolp) | |
561 (byte-defop 109 1 byte-eobp) | |
562 (byte-defop 110 1 byte-bolp) | |
563 (byte-defop 111 1 byte-bobp) | |
564 (byte-defop 112 1 byte-current-buffer) | |
565 (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
|
566 (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
|
567 "To make a binding to record the current buffer") |
757 | 568 (byte-defop 115 0 byte-set-mark-OBSOLETE) |
569 (byte-defop 116 1 byte-interactive-p) | |
570 | |
571 ;; These ops are new to v19 | |
572 (byte-defop 117 0 byte-forward-char) | |
573 (byte-defop 118 0 byte-forward-word) | |
574 (byte-defop 119 -1 byte-skip-chars-forward) | |
575 (byte-defop 120 -1 byte-skip-chars-backward) | |
576 (byte-defop 121 0 byte-forward-line) | |
577 (byte-defop 122 0 byte-char-syntax) | |
578 (byte-defop 123 -1 byte-buffer-substring) | |
579 (byte-defop 124 -1 byte-delete-region) | |
580 (byte-defop 125 -1 byte-narrow-to-region) | |
581 (byte-defop 126 1 byte-widen) | |
582 (byte-defop 127 0 byte-end-of-line) | |
583 | |
584 ;; unused: 128 | |
585 | |
586 ;; These store their argument in the next two bytes | |
587 (byte-defop 129 1 byte-constant2 | |
588 "for reference to a constant with vector index >= byte-constant-limit") | |
589 (byte-defop 130 0 byte-goto "for unconditional jump") | |
590 (byte-defop 131 -1 byte-goto-if-nil "to pop value and jump if it's nil") | |
591 (byte-defop 132 -1 byte-goto-if-not-nil "to pop value and jump if it's not nil") | |
592 (byte-defop 133 -1 byte-goto-if-nil-else-pop | |
28402 | 593 "to examine top-of-stack, jump and don't pop it if it's nil, |
757 | 594 otherwise pop it") |
595 (byte-defop 134 -1 byte-goto-if-not-nil-else-pop | |
28402 | 596 "to examine top-of-stack, jump and don't pop it if it's non nil, |
757 | 597 otherwise pop it") |
598 | |
599 (byte-defop 135 -1 byte-return "to pop a value and return it from `byte-code'") | |
600 (byte-defop 136 -1 byte-discard "to discard one value from stack") | |
601 (byte-defop 137 1 byte-dup "to duplicate the top of the stack") | |
602 | |
603 (byte-defop 138 0 byte-save-excursion | |
604 "to make a binding to record the buffer, point and mark") | |
605 (byte-defop 139 0 byte-save-window-excursion | |
606 "to make a binding to record entire window configuration") | |
607 (byte-defop 140 0 byte-save-restriction | |
608 "to make a binding to record the current buffer clipping restrictions") | |
609 (byte-defop 141 -1 byte-catch | |
610 "for catch. Takes, on stack, the tag and an expression for the body") | |
611 (byte-defop 142 -1 byte-unwind-protect | |
612 "for unwind-protect. Takes, on stack, an expression for the unwind-action") | |
613 | |
28402 | 614 ;; 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
|
615 ;; an expression for the body, and a list of clauses. |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
616 (byte-defop 143 -2 byte-condition-case) |
757 | 617 |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
618 ;; For entry to with-output-to-temp-buffer. |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
619 ;; Takes, on stack, the buffer name. |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
620 ;; Binds standard-output and does some other things. |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
621 ;; 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
|
622 (byte-defop 144 0 byte-temp-output-buffer-setup) |
757 | 623 |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
624 ;; For exit from with-output-to-temp-buffer. |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
625 ;; 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
|
626 ;; Pops them both, then pushes the value back on. |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
627 ;; Unbinds standard-output and makes the temp buffer visible. |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
628 (byte-defop 145 -1 byte-temp-output-buffer-show) |
757 | 629 |
630 ;; these ops are new to v19 | |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
631 |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
632 ;; 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
|
633 ;; 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
|
634 (byte-defop 146 0 byte-unbind-all) |
757 | 635 |
636 ;; these ops are new to v19 | |
637 (byte-defop 147 -2 byte-set-marker) | |
638 (byte-defop 148 0 byte-match-beginning) | |
639 (byte-defop 149 0 byte-match-end) | |
640 (byte-defop 150 0 byte-upcase) | |
641 (byte-defop 151 0 byte-downcase) | |
642 (byte-defop 152 -1 byte-string=) | |
643 (byte-defop 153 -1 byte-string<) | |
644 (byte-defop 154 -1 byte-equal) | |
645 (byte-defop 155 -1 byte-nthcdr) | |
646 (byte-defop 156 -1 byte-elt) | |
647 (byte-defop 157 -1 byte-member) | |
648 (byte-defop 158 -1 byte-assq) | |
649 (byte-defop 159 0 byte-nreverse) | |
650 (byte-defop 160 -1 byte-setcar) | |
651 (byte-defop 161 -1 byte-setcdr) | |
652 (byte-defop 162 0 byte-car-safe) | |
653 (byte-defop 163 0 byte-cdr-safe) | |
654 (byte-defop 164 -1 byte-nconc) | |
655 (byte-defop 165 -1 byte-quo) | |
656 (byte-defop 166 -1 byte-rem) | |
657 (byte-defop 167 0 byte-numberp) | |
658 (byte-defop 168 0 byte-integerp) | |
659 | |
848 | 660 ;; unused: 169-174 |
757 | 661 (byte-defop 175 nil byte-listN) |
662 (byte-defop 176 nil byte-concatN) | |
663 (byte-defop 177 nil byte-insertN) | |
664 | |
665 ;; unused: 178-191 | |
666 | |
667 (byte-defop 192 1 byte-constant "for reference to a constant") | |
668 ;; codes 193-255 are consumed by byte-constant. | |
669 (defconst byte-constant-limit 64 | |
670 "Exclusive maximum index usable in the `byte-constant' opcode.") | |
671 | |
672 (defconst byte-goto-ops '(byte-goto byte-goto-if-nil byte-goto-if-not-nil | |
673 byte-goto-if-nil-else-pop | |
674 byte-goto-if-not-nil-else-pop) | |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
675 "List of byte-codes whose offset is a pc.") |
757 | 676 |
677 (defconst byte-goto-always-pop-ops '(byte-goto-if-nil byte-goto-if-not-nil)) | |
678 | |
679 (byte-extrude-byte-code-vectors) | |
680 | |
681 ;;; lapcode generator | |
39561
0881eab13b7a
(byte-recompile-directory): Make sure the file is readable.
Gerd Moellmann <gerd@gnu.org>
parents:
38895
diff
changeset
|
682 ;; |
0881eab13b7a
(byte-recompile-directory): Make sure the file is readable.
Gerd Moellmann <gerd@gnu.org>
parents:
38895
diff
changeset
|
683 ;; 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
|
684 ;; 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
|
685 ;; on lapcode than on bytecode. |
0881eab13b7a
(byte-recompile-directory): Make sure the file is readable.
Gerd Moellmann <gerd@gnu.org>
parents:
38895
diff
changeset
|
686 ;; |
0881eab13b7a
(byte-recompile-directory): Make sure the file is readable.
Gerd Moellmann <gerd@gnu.org>
parents:
38895
diff
changeset
|
687 ;; 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
|
688 ;; 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
|
689 ;; 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
|
690 ;; |
0881eab13b7a
(byte-recompile-directory): Make sure the file is readable.
Gerd Moellmann <gerd@gnu.org>
parents:
38895
diff
changeset
|
691 ;; 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
|
692 ;; 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
|
693 ;; 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
|
694 ;; parameter for some goto op. |
0881eab13b7a
(byte-recompile-directory): Make sure the file is readable.
Gerd Moellmann <gerd@gnu.org>
parents:
38895
diff
changeset
|
695 ;; |
0881eab13b7a
(byte-recompile-directory): Make sure the file is readable.
Gerd Moellmann <gerd@gnu.org>
parents:
38895
diff
changeset
|
696 ;; 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
|
697 ;; 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
|
698 ;; |
0881eab13b7a
(byte-recompile-directory): Make sure the file is readable.
Gerd Moellmann <gerd@gnu.org>
parents:
38895
diff
changeset
|
699 ;; 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
|
700 ;; 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
|
701 ;; 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
|
702 ;; 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
|
703 ;; 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
|
704 ;; 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
|
705 ;; compacted byte-code. |
0881eab13b7a
(byte-recompile-directory): Make sure the file is readable.
Gerd Moellmann <gerd@gnu.org>
parents:
38895
diff
changeset
|
706 ;; |
0881eab13b7a
(byte-recompile-directory): Make sure the file is readable.
Gerd Moellmann <gerd@gnu.org>
parents:
38895
diff
changeset
|
707 ;; 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
|
708 ;; 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
|
709 ;; 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
|
710 ;; Also, this lets us notice references to free variables. |
757 | 711 |
712 (defun byte-compile-lapcode (lap) | |
713 "Turns lapcode into bytecode. The lapcode is destroyed." | |
714 ;; Lapcode modifications: changes the ID of a tag to be the tag's PC. | |
715 (let ((pc 0) ; Program counter | |
716 op off ; Operation & offset | |
717 (bytes '()) ; Put the output bytes here | |
50570
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
718 (patchlist nil)) ; List of tags and goto's to patch |
757 | 719 (while lap |
720 (setq op (car (car lap)) | |
721 off (cdr (car lap))) | |
722 (cond ((not (symbolp op)) | |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
723 (error "Non-symbolic opcode `%s'" op)) |
757 | 724 ((eq op 'TAG) |
725 (setcar off pc) | |
726 (setq patchlist (cons off patchlist))) | |
727 ((memq op byte-goto-ops) | |
728 (setq pc (+ pc 3)) | |
729 (setq bytes (cons (cons pc (cdr off)) | |
730 (cons nil | |
731 (cons (symbol-value op) bytes)))) | |
732 (setq patchlist (cons bytes patchlist))) | |
733 (t | |
734 (setq bytes | |
735 (cond ((cond ((consp off) | |
736 ;; Variable or constant reference | |
737 (setq off (cdr off)) | |
738 (eq op 'byte-constant))) | |
739 (cond ((< off byte-constant-limit) | |
740 (setq pc (1+ pc)) | |
741 (cons (+ byte-constant off) bytes)) | |
742 (t | |
743 (setq pc (+ 3 pc)) | |
744 (cons (lsh off -8) | |
745 (cons (logand off 255) | |
746 (cons byte-constant2 bytes)))))) | |
747 ((<= byte-listN (symbol-value op)) | |
748 (setq pc (+ 2 pc)) | |
749 (cons off (cons (symbol-value op) bytes))) | |
750 ((< off 6) | |
751 (setq pc (1+ pc)) | |
752 (cons (+ (symbol-value op) off) bytes)) | |
753 ((< off 256) | |
754 (setq pc (+ 2 pc)) | |
755 (cons off (cons (+ (symbol-value op) 6) bytes))) | |
756 (t | |
757 (setq pc (+ 3 pc)) | |
758 (cons (lsh off -8) | |
759 (cons (logand off 255) | |
760 (cons (+ (symbol-value op) 7) | |
761 bytes)))))))) | |
762 (setq lap (cdr lap))) | |
763 ;;(if (not (= pc (length bytes))) | |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
764 ;; (error "Compiler error: pc mismatch - %s %s" pc (length bytes))) |
757 | 765 ;; Patch PC into jumps |
766 (let (bytes) | |
767 (while patchlist | |
768 (setq bytes (car patchlist)) | |
769 (cond ((atom (car bytes))) ; Tag | |
770 (t ; Absolute jump | |
771 (setq pc (car (cdr (car bytes)))) ; Pick PC from tag | |
772 (setcar (cdr bytes) (logand pc 255)) | |
773 (setcar bytes (lsh pc -8)))) | |
774 (setq patchlist (cdr patchlist)))) | |
775 (concat (nreverse bytes)))) | |
776 | |
777 | |
28295
8082575fec24
(byte-compile-warning-types, byte-compile-warnings): New warning `noruntime'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27824
diff
changeset
|
778 ;;; compile-time evaluation |
8082575fec24
(byte-compile-warning-types, byte-compile-warnings): New warning `noruntime'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27824
diff
changeset
|
779 |
28336
49b7af1b8e1b
(byte-compile-eval): Fix and reenable the code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28305
diff
changeset
|
780 (defun byte-compile-eval (form) |
49b7af1b8e1b
(byte-compile-eval): Fix and reenable the code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28305
diff
changeset
|
781 "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
|
782 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
|
783 (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
|
784 (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
|
785 (prog1 (eval form) |
49b7af1b8e1b
(byte-compile-eval): Fix and reenable the code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28305
diff
changeset
|
786 (when (memq 'noruntime byte-compile-warnings) |
28295
8082575fec24
(byte-compile-warning-types, byte-compile-warnings): New warning `noruntime'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27824
diff
changeset
|
787 (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
|
788 (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
|
789 ;; 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
|
790 ;; 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
|
791 (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
|
792 (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
|
793 old-autoloads) |
28336
49b7af1b8e1b
(byte-compile-eval): Fix and reenable the code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28305
diff
changeset
|
794 ;; 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
|
795 (unless (or (assoc (car xs) hist-orig) |
25bf13fe1c10
(byte-compile-eval): Don't process
Richard M. Stallman <rms@gnu.org>
parents:
57004
diff
changeset
|
796 (equal (car xs) "cl")) |
28336
49b7af1b8e1b
(byte-compile-eval): Fix and reenable the code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28305
diff
changeset
|
797 (dolist (s xs) |
49b7af1b8e1b
(byte-compile-eval): Fix and reenable the code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28305
diff
changeset
|
798 (cond |
48719
0cc3c6bc6da0
(byte-compile-eval): Handle (t . SYMBOL) elements in load-history.
Richard M. Stallman <rms@gnu.org>
parents:
48468
diff
changeset
|
799 ((symbolp s) |
0cc3c6bc6da0
(byte-compile-eval): Handle (t . SYMBOL) elements in load-history.
Richard M. Stallman <rms@gnu.org>
parents:
48468
diff
changeset
|
800 (unless (memq s old-autoloads) |
53753
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
801 (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
|
802 ((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
|
803 (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
|
804 ((and (consp s) (eq 'autoload (car s))) |
53753
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
805 (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
|
806 ;; 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
|
807 (let (old-autoloads) |
0cc3c6bc6da0
(byte-compile-eval): Handle (t . SYMBOL) elements in load-history.
Richard M. Stallman <rms@gnu.org>
parents:
48468
diff
changeset
|
808 (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
|
809 (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
|
810 (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
|
811 (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
|
812 (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
|
813 (push (cdr s) old-autoloads))))))) |
25bf13fe1c10
(byte-compile-eval): Don't process
Richard M. Stallman <rms@gnu.org>
parents:
57004
diff
changeset
|
814 (when (memq 'cl-functions byte-compile-warnings) |
25bf13fe1c10
(byte-compile-eval): Don't process
Richard M. Stallman <rms@gnu.org>
parents:
57004
diff
changeset
|
815 (let ((hist-new load-history) |
25bf13fe1c10
(byte-compile-eval): Don't process
Richard M. Stallman <rms@gnu.org>
parents:
57004
diff
changeset
|
816 (hist-nil-new current-load-list)) |
25bf13fe1c10
(byte-compile-eval): Don't process
Richard M. Stallman <rms@gnu.org>
parents:
57004
diff
changeset
|
817 ;; 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
|
818 ;; and mark all the functions defined therein. |
25bf13fe1c10
(byte-compile-eval): Don't process
Richard M. Stallman <rms@gnu.org>
parents:
57004
diff
changeset
|
819 (while (and hist-new (not (eq hist-new hist-orig))) |
25bf13fe1c10
(byte-compile-eval): Don't process
Richard M. Stallman <rms@gnu.org>
parents:
57004
diff
changeset
|
820 (let ((xs (pop hist-new)) |
25bf13fe1c10
(byte-compile-eval): Don't process
Richard M. Stallman <rms@gnu.org>
parents:
57004
diff
changeset
|
821 old-autoloads) |
25bf13fe1c10
(byte-compile-eval): Don't process
Richard M. Stallman <rms@gnu.org>
parents:
57004
diff
changeset
|
822 ;; 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
|
823 (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
|
824 (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
|
825 |
46136
79f132657570
(byte-compile-warning-types):
Richard M. Stallman <rms@gnu.org>
parents:
46050
diff
changeset
|
826 (defun byte-compile-eval-before-compile (form) |
79f132657570
(byte-compile-warning-types):
Richard M. Stallman <rms@gnu.org>
parents:
46050
diff
changeset
|
827 "Evaluate FORM for `eval-and-compile'." |
79f132657570
(byte-compile-warning-types):
Richard M. Stallman <rms@gnu.org>
parents:
46050
diff
changeset
|
828 (let ((hist-nil-orig current-load-list)) |
79f132657570
(byte-compile-warning-types):
Richard M. Stallman <rms@gnu.org>
parents:
46050
diff
changeset
|
829 (prog1 (eval form) |
79f132657570
(byte-compile-warning-types):
Richard M. Stallman <rms@gnu.org>
parents:
46050
diff
changeset
|
830 ;; (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
|
831 (let ((tem current-load-list)) |
79f132657570
(byte-compile-warning-types):
Richard M. Stallman <rms@gnu.org>
parents:
46050
diff
changeset
|
832 (while (not (eq tem hist-nil-orig)) |
79f132657570
(byte-compile-warning-types):
Richard M. Stallman <rms@gnu.org>
parents:
46050
diff
changeset
|
833 (when (equal (car tem) '(require . cl)) |
79f132657570
(byte-compile-warning-types):
Richard M. Stallman <rms@gnu.org>
parents:
46050
diff
changeset
|
834 (setq byte-compile-warnings |
79f132657570
(byte-compile-warning-types):
Richard M. Stallman <rms@gnu.org>
parents:
46050
diff
changeset
|
835 (remq 'cl-functions byte-compile-warnings))) |
79f132657570
(byte-compile-warning-types):
Richard M. Stallman <rms@gnu.org>
parents:
46050
diff
changeset
|
836 (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
|
837 |
757 | 838 ;;; byte compiler messages |
839 | |
10235
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
840 (defvar byte-compile-current-form nil) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
841 (defvar byte-compile-dest-file nil) |
33352
bd48e8729dbb
(byte-compiling-files-p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
33348
diff
changeset
|
842 (defvar byte-compile-current-file nil) |
45558
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
843 (defvar byte-compile-current-buffer nil) |
33348
af3d766a1234
(byte-compile-current-file): Don't bind
Gerd Moellmann <gerd@gnu.org>
parents:
32765
diff
changeset
|
844 |
46576 | 845 ;; Log something that isn't a warning. |
757 | 846 (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
|
847 `(and |
62803bbfc576
(byte-compile-log): Use backquotes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55077
diff
changeset
|
848 byte-optimize |
62803bbfc576
(byte-compile-log): Use backquotes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55077
diff
changeset
|
849 (memq byte-optimize-log '(t source)) |
62803bbfc576
(byte-compile-log): Use backquotes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55077
diff
changeset
|
850 (let ((print-escape-newlines t) |
62803bbfc576
(byte-compile-log): Use backquotes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55077
diff
changeset
|
851 (print-level 4) |
62803bbfc576
(byte-compile-log): Use backquotes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55077
diff
changeset
|
852 (print-length 4)) |
62803bbfc576
(byte-compile-log): Use backquotes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55077
diff
changeset
|
853 (byte-compile-log-1 |
62803bbfc576
(byte-compile-log): Use backquotes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55077
diff
changeset
|
854 (format |
62803bbfc576
(byte-compile-log): Use backquotes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55077
diff
changeset
|
855 ,format-string |
62803bbfc576
(byte-compile-log): Use backquotes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55077
diff
changeset
|
856 ,@(mapcar |
62803bbfc576
(byte-compile-log): Use backquotes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55077
diff
changeset
|
857 (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
|
858 args)))))) |
757 | 859 |
46576 | 860 ;; Log something that isn't a warning. |
861 (defun byte-compile-log-1 (string) | |
55694
62803bbfc576
(byte-compile-log): Use backquotes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55077
diff
changeset
|
862 (with-current-buffer "*Compile-Log*" |
57518
25bf13fe1c10
(byte-compile-eval): Don't process
Richard M. Stallman <rms@gnu.org>
parents:
57004
diff
changeset
|
863 (let ((inhibit-read-only t)) |
25bf13fe1c10
(byte-compile-eval): Don't process
Richard M. Stallman <rms@gnu.org>
parents:
57004
diff
changeset
|
864 (goto-char (point-max)) |
25bf13fe1c10
(byte-compile-eval): Don't process
Richard M. Stallman <rms@gnu.org>
parents:
57004
diff
changeset
|
865 (byte-compile-warning-prefix nil nil) |
25bf13fe1c10
(byte-compile-eval): Don't process
Richard M. Stallman <rms@gnu.org>
parents:
57004
diff
changeset
|
866 (cond (noninteractive |
25bf13fe1c10
(byte-compile-eval): Don't process
Richard M. Stallman <rms@gnu.org>
parents:
57004
diff
changeset
|
867 (message " %s" string)) |
25bf13fe1c10
(byte-compile-eval): Don't process
Richard M. Stallman <rms@gnu.org>
parents:
57004
diff
changeset
|
868 (t |
25bf13fe1c10
(byte-compile-eval): Don't process
Richard M. Stallman <rms@gnu.org>
parents:
57004
diff
changeset
|
869 (insert (format "%s\n" string))))))) |
757 | 870 |
45558
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
871 (defvar byte-compile-read-position nil |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
872 "Character position we began the last `read' from.") |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
873 (defvar byte-compile-last-position nil |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
874 "Last known character position in the input.") |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
875 |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
876 ;; 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
|
877 (defsubst byte-compile-delete-first (elt list) |
45558
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
878 (if (eq (car list) elt) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
879 (cdr list) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
880 (let ((total list)) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
881 (while (and (cdr list) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
882 (not (eq (cadr list) elt))) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
883 (setq list (cdr list))) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
884 (when (cdr list) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
885 (setcdr list (cddr list))) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
886 total))) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
887 |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
888 ;; 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
|
889 ;; `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
|
890 ;; function definition (`defun') we remove `defun' from |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
891 ;; `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
|
892 ;; 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
|
893 ;; 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
|
894 ;; 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
|
895 ;; assume we've already passed that point, and look for the next |
47912 | 896 ;; occurrence of the symbol. |
897 ;; 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
|
898 ;; 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
|
899 (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
|
900 (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
|
901 (let (last entry) |
45558
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
902 (while (progn |
46690
68c134e00c87
(byte-compile-set-symbol-position): Don't recompute `entry' on each iteration.
Richard M. Stallman <rms@gnu.org>
parents:
46657
diff
changeset
|
903 (setq last byte-compile-last-position |
68c134e00c87
(byte-compile-set-symbol-position): Don't recompute `entry' on each iteration.
Richard M. Stallman <rms@gnu.org>
parents:
46657
diff
changeset
|
904 entry (assq sym read-symbol-positions-list)) |
68c134e00c87
(byte-compile-set-symbol-position): Don't recompute `entry' on each iteration.
Richard M. Stallman <rms@gnu.org>
parents:
46657
diff
changeset
|
905 (when entry |
68c134e00c87
(byte-compile-set-symbol-position): Don't recompute `entry' on each iteration.
Richard M. Stallman <rms@gnu.org>
parents:
46657
diff
changeset
|
906 (setq byte-compile-last-position |
68c134e00c87
(byte-compile-set-symbol-position): Don't recompute `entry' on each iteration.
Richard M. Stallman <rms@gnu.org>
parents:
46657
diff
changeset
|
907 (+ byte-compile-read-position (cdr entry)) |
68c134e00c87
(byte-compile-set-symbol-position): Don't recompute `entry' on each iteration.
Richard M. Stallman <rms@gnu.org>
parents:
46657
diff
changeset
|
908 read-symbol-positions-list |
68c134e00c87
(byte-compile-set-symbol-position): Don't recompute `entry' on each iteration.
Richard M. Stallman <rms@gnu.org>
parents:
46657
diff
changeset
|
909 (byte-compile-delete-first |
68c134e00c87
(byte-compile-set-symbol-position): Don't recompute `entry' on each iteration.
Richard M. Stallman <rms@gnu.org>
parents:
46657
diff
changeset
|
910 entry read-symbol-positions-list))) |
45558
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
911 (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
|
912 (> last byte-compile-last-position))))))) |
39769
3bea53c3ecea
(byte-compile-display-log-head-p): New
Gerd Moellmann <gerd@gnu.org>
parents:
39657
diff
changeset
|
913 |
46576 | 914 (defvar byte-compile-last-warned-form nil) |
915 (defvar byte-compile-last-logged-file nil) | |
916 | |
917 ;; 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
|
918 ;; It is always called with the warnings buffer current. |
46576 | 919 (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
|
920 (let* ((inhibit-read-only t) |
25bf13fe1c10
(byte-compile-eval): Don't process
Richard M. Stallman <rms@gnu.org>
parents:
57004
diff
changeset
|
921 (dir default-directory) |
47110
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
922 (file (cond ((stringp byte-compile-current-file) |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
923 (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
|
924 ((bufferp byte-compile-current-file) |
40035
2b16a80692ef
Put the *Compile-Log* buffer in `compilation-mode'.
Sam Steingold <sds@gnu.org>
parents:
39852
diff
changeset
|
925 (format "Buffer %s:" |
39769
3bea53c3ecea
(byte-compile-display-log-head-p): New
Gerd Moellmann <gerd@gnu.org>
parents:
39657
diff
changeset
|
926 (buffer-name byte-compile-current-file))) |
3bea53c3ecea
(byte-compile-display-log-head-p): New
Gerd Moellmann <gerd@gnu.org>
parents:
39657
diff
changeset
|
927 (t ""))) |
40035
2b16a80692ef
Put the *Compile-Log* buffer in `compilation-mode'.
Sam Steingold <sds@gnu.org>
parents:
39852
diff
changeset
|
928 (pos (if (and byte-compile-current-file |
45558
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
929 (integerp byte-compile-read-position)) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
930 (with-current-buffer byte-compile-current-buffer |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
931 (format "%d:%d:" (count-lines (point-min) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
932 byte-compile-last-position) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
933 (save-excursion |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
934 (goto-char byte-compile-last-position) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
935 (1+ (current-column))))) |
39769
3bea53c3ecea
(byte-compile-display-log-head-p): New
Gerd Moellmann <gerd@gnu.org>
parents:
39657
diff
changeset
|
936 "")) |
47110
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
937 (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
|
938 (or byte-compile-current-form "toplevel form")))) |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
939 (when (or (and byte-compile-current-file |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
940 (not (equal byte-compile-current-file |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
941 byte-compile-last-logged-file))) |
52534
c8dcd0a4adb3
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
942 (and byte-compile-current-form |
47110
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
943 (not (eq byte-compile-current-form |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
944 byte-compile-last-warned-form)))) |
46576 | 945 (insert (format "\nIn %s:\n" form))) |
47110
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
946 (when level |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
947 (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
|
948 (setq byte-compile-last-logged-file byte-compile-current-file |
46576 | 949 byte-compile-last-warned-form byte-compile-current-form) |
950 entry) | |
757 | 951 |
47110
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
952 ;; 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
|
953 ;; to tell inner calls to displaying-byte-compile-warnings |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
954 ;; not to bind warning-series. |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
955 (defun byte-compile-warning-series (&rest ignore) |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
956 nil) |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
957 |
11323
5f75d3e225c1
(byte-compile-log-file): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11253
diff
changeset
|
958 ;; Log the start of a file in *Compile-Log*, and mark it as done. |
46576 | 959 ;; 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
|
960 ;; But do nothing in batch mode. |
5f75d3e225c1
(byte-compile-log-file): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11253
diff
changeset
|
961 (defun byte-compile-log-file () |
47110
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
962 (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
|
963 (not noninteractive) |
11323
5f75d3e225c1
(byte-compile-log-file): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11253
diff
changeset
|
964 (save-excursion |
50639
c3ba923eb0e9
(byte-compile-log-file, (byte-recompile-directory): Don't use
Richard M. Stallman <rms@gnu.org>
parents:
50618
diff
changeset
|
965 (set-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
|
966 (goto-char (point-max)) |
57518
25bf13fe1c10
(byte-compile-eval): Don't process
Richard M. Stallman <rms@gnu.org>
parents:
57004
diff
changeset
|
967 (let* ((inhibit-read-only t) |
25bf13fe1c10
(byte-compile-eval): Don't process
Richard M. Stallman <rms@gnu.org>
parents:
57004
diff
changeset
|
968 (dir (and byte-compile-current-file |
47110
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
969 (file-name-directory byte-compile-current-file))) |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
970 (was-same (equal default-directory dir)) |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
971 pt) |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
972 (when dir |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
973 (unless was-same |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
974 (insert (format "Leaving directory `%s'\n" default-directory)))) |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
975 (unless (bolp) |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
976 (insert "\n")) |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
977 (setq pt (point-marker)) |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
978 (if byte-compile-current-file |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
979 (insert "\f\nCompiling " |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
980 (if (stringp byte-compile-current-file) |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
981 (concat "file " byte-compile-current-file) |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
982 (concat "buffer " (buffer-name byte-compile-current-file))) |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
983 " at " (current-time-string) "\n") |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
984 (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
|
985 (when dir |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
986 (setq default-directory dir) |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
987 (unless was-same |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
988 (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
|
989 (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
|
990 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
|
991 ;; Do this after setting default-directory. |
c3ba923eb0e9
(byte-compile-log-file, (byte-recompile-directory): Don't use
Richard M. Stallman <rms@gnu.org>
parents:
50618
diff
changeset
|
992 (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
|
993 (compilation-mode)) |
55694
62803bbfc576
(byte-compile-log): Use backquotes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55077
diff
changeset
|
994 (compilation-forget-errors) |
46576 | 995 pt)))) |
996 | |
997 ;; Log a message STRING in *Compile-Log*. | |
998 ;; Also log the current function and file if not already done. | |
999 (defun byte-compile-log-warning (string &optional fill level) | |
1000 (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
|
1001 (warning-type-format "") |
57518
25bf13fe1c10
(byte-compile-eval): Don't process
Richard M. Stallman <rms@gnu.org>
parents:
57004
diff
changeset
|
1002 (warning-fill-prefix (if fill " ")) |
25bf13fe1c10
(byte-compile-eval): Don't process
Richard M. Stallman <rms@gnu.org>
parents:
57004
diff
changeset
|
1003 (inhibit-read-only t)) |
46576 | 1004 (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
|
1005 |
757 | 1006 (defun byte-compile-warn (format &rest args) |
46576 | 1007 "Issue a byte compiler warning; use (format FORMAT ARGS...) for message." |
757 | 1008 (setq format (apply 'format format args)) |
1009 (if byte-compile-error-on-warn | |
1010 (error "%s" format) ; byte-compile-file catches and logs it | |
46576 | 1011 (byte-compile-log-warning format t :warning))) |
1012 | |
922 | 1013 (defun byte-compile-report-error (error-info) |
46576 | 1014 "Report Lisp error in compilation. ERROR-INFO is the error data." |
1129 | 1015 (setq byte-compiler-error-flag t) |
46576 | 1016 (byte-compile-log-warning |
1017 (error-message-string error-info) | |
1018 nil :error)) | |
922 | 1019 |
757 | 1020 ;;; Used by make-obsolete. |
1021 (defun byte-compile-obsolete (form) | |
29352
fa490904bee0
* byte-run.el (make-obsolete, make-obsolete-variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29239
diff
changeset
|
1022 (let* ((new (get (car form) 'byte-obsolete-info)) |
fa490904bee0
* byte-run.el (make-obsolete, make-obsolete-variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29239
diff
changeset
|
1023 (handler (nth 1 new)) |
fa490904bee0
* byte-run.el (make-obsolete, make-obsolete-variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29239
diff
changeset
|
1024 (when (nth 2 new))) |
45558
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1025 (byte-compile-set-symbol-position (car form)) |
12487
b657158dd5c9
(byte-compile-obsolete): Do the funcall to compile
Richard M. Stallman <rms@gnu.org>
parents:
11928
diff
changeset
|
1026 (if (memq 'obsolete byte-compile-warnings) |
56082
36284d653673
Put `...' around symbols in warning messages.
Richard M. Stallman <rms@gnu.org>
parents:
55694
diff
changeset
|
1027 (byte-compile-warn "`%s' is an obsolete function%s; %s" (car form) |
29352
fa490904bee0
* byte-run.el (make-obsolete, make-obsolete-variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29239
diff
changeset
|
1028 (if when (concat " since " when) "") |
10256
83d56dd99a40
(byte-compile-warning-types): Add obsolete.
Richard M. Stallman <rms@gnu.org>
parents:
10235
diff
changeset
|
1029 (if (stringp (car new)) |
83d56dd99a40
(byte-compile-warning-types): Add obsolete.
Richard M. Stallman <rms@gnu.org>
parents:
10235
diff
changeset
|
1030 (car new) |
56082
36284d653673
Put `...' around symbols in warning messages.
Richard M. Stallman <rms@gnu.org>
parents:
55694
diff
changeset
|
1031 (format "use `%s' instead." (car new))))) |
29352
fa490904bee0
* byte-run.el (make-obsolete, make-obsolete-variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29239
diff
changeset
|
1032 (funcall (or handler 'byte-compile-normal-call) form))) |
757 | 1033 |
1034 ;; Compiler options | |
1035 | |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1036 ;; (defvar byte-compiler-valid-options |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1037 ;; '((optimize byte-optimize (t nil source byte) val) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1038 ;; (file-format byte-compile-compatibility (emacs18 emacs19) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1039 ;; (eq val 'emacs18)) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1040 ;; ;; (new-bytecodes byte-compile-generate-emacs19-bytecodes (t nil) val) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1041 ;; (delete-errors byte-compile-delete-errors (t nil) val) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1042 ;; (verbose byte-compile-verbose (t nil) val) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1043 ;; (warnings byte-compile-warnings ((callargs redefine free-vars unresolved)) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1044 ;; val))) |
757 | 1045 |
1046 ;; Inhibit v18/v19 selectors if the version is hardcoded. | |
28402 | 1047 ;; #### This should print a warning if the user tries to change something |
757 | 1048 ;; 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
|
1049 ;; (cond |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1050 ;; ((byte-compile-single-version) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1051 ;; (setcar (cdr (cdr (assq 'new-bytecodes byte-compiler-valid-options))) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1052 ;; (list (byte-compile-version-cond |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1053 ;; byte-compile-generate-emacs19-bytecodes))) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1054 ;; (setcar (cdr (cdr (assq 'file-format byte-compiler-valid-options))) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1055 ;; (if (byte-compile-version-cond byte-compile-compatibility) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1056 ;; '(emacs18) '(emacs19))))) |
757 | 1057 |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1058 ;; (defun byte-compiler-options-handler (&rest args) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1059 ;; (let (key val desc choices) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1060 ;; (while args |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1061 ;; (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
|
1062 ;; (error "Malformed byte-compiler option `%s'" (car args))) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1063 ;; (setq key (car (car args)) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1064 ;; val (car (cdr (car args))) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1065 ;; desc (assq key byte-compiler-valid-options)) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1066 ;; (or desc |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1067 ;; (error "Unknown byte-compiler option `%s'" key)) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1068 ;; (setq choices (nth 2 desc)) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1069 ;; (if (consp (car choices)) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1070 ;; (let (this |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1071 ;; (handler 'cons) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1072 ;; (ret (and (memq (car val) '(+ -)) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1073 ;; (copy-sequence (if (eq t (symbol-value (nth 1 desc))) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1074 ;; choices |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1075 ;; (symbol-value (nth 1 desc))))))) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1076 ;; (setq choices (car choices)) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1077 ;; (while val |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1078 ;; (setq this (car val)) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1079 ;; (cond ((memq this choices) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1080 ;; (setq ret (funcall handler this ret))) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1081 ;; ((eq this '+) (setq handler 'cons)) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1082 ;; ((eq this '-) (setq handler 'delq)) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1083 ;; ((error "`%s' only accepts %s" key choices))) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1084 ;; (setq val (cdr val))) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1085 ;; (set (nth 1 desc) ret)) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1086 ;; (or (memq val choices) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1087 ;; (error "`%s' must be one of `%s'" key choices)) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1088 ;; (set (nth 1 desc) (eval (nth 3 desc)))) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1089 ;; (setq args (cdr args))) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1090 ;; nil)) |
757 | 1091 |
1092 ;;; sanity-checking arglists | |
1093 | |
1094 (defun byte-compile-fdefinition (name macro-p) | |
1095 (let* ((list (if macro-p | |
1096 byte-compile-macro-environment | |
8086
9f6348616e4d
(byte-compile-callargs-warn): Handle function defnition
Richard M. Stallman <rms@gnu.org>
parents:
7298
diff
changeset
|
1097 byte-compile-function-environment)) |
757 | 1098 (env (cdr (assq name list)))) |
1099 (or env | |
1100 (let ((fn name)) | |
1101 (while (and (symbolp fn) | |
1102 (fboundp fn) | |
1103 (or (symbolp (symbol-function fn)) | |
1104 (consp (symbol-function fn)) | |
1105 (and (not macro-p) | |
1819
df06a60f3362
* disass.el (disassemble): Add autoload cookie for this.
Jim Blandy <jimb@redhat.com>
parents:
1604
diff
changeset
|
1106 (byte-code-function-p (symbol-function fn))))) |
757 | 1107 (setq fn (symbol-function fn))) |
1819
df06a60f3362
* disass.el (disassemble): Add autoload cookie for this.
Jim Blandy <jimb@redhat.com>
parents:
1604
diff
changeset
|
1108 (if (and (not macro-p) (byte-code-function-p fn)) |
757 | 1109 fn |
1110 (and (consp fn) | |
1111 (if (eq 'macro (car fn)) | |
1112 (cdr fn) | |
1113 (if macro-p | |
1114 nil | |
1115 (if (eq 'autoload (car fn)) | |
1116 nil | |
1117 fn))))))))) | |
1118 | |
1119 (defun byte-compile-arglist-signature (arglist) | |
1120 (let ((args 0) | |
1121 opts | |
1122 restp) | |
1123 (while arglist | |
1124 (cond ((eq (car arglist) '&optional) | |
1125 (or opts (setq opts 0))) | |
1126 ((eq (car arglist) '&rest) | |
1127 (if (cdr arglist) | |
1128 (setq restp t | |
1129 arglist nil))) | |
1130 (t | |
1131 (if opts | |
1132 (setq opts (1+ opts)) | |
1133 (setq args (1+ args))))) | |
1134 (setq arglist (cdr arglist))) | |
1135 (cons args (if restp nil (if opts (+ args opts) args))))) | |
1136 | |
1137 | |
1138 (defun byte-compile-arglist-signatures-congruent-p (old new) | |
1139 (not (or | |
1140 (> (car new) (car old)) ; requires more args now | |
14040 | 1141 (and (null (cdr old)) ; took rest-args, doesn't any more |
757 | 1142 (cdr new)) |
1143 (and (cdr new) (cdr old) ; can't take as many args now | |
1144 (< (cdr new) (cdr old))) | |
1145 ))) | |
1146 | |
1147 (defun byte-compile-arglist-signature-string (signature) | |
1148 (cond ((null (cdr signature)) | |
1149 (format "%d+" (car signature))) | |
1150 ((= (car signature) (cdr signature)) | |
1151 (format "%d" (car signature))) | |
1152 (t (format "%d-%d" (car signature) (cdr signature))))) | |
1153 | |
1154 | |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1155 ;; Warn if the form is calling a function with the wrong number of arguments. |
757 | 1156 (defun byte-compile-callargs-warn (form) |
1157 (let* ((def (or (byte-compile-fdefinition (car form) nil) | |
1158 (byte-compile-fdefinition (car form) t))) | |
29239
86949998e6fd
(byte-compile-callargs-warn): Use subr-arity to check primitives.
Dave Love <fx@gnu.org>
parents:
28441
diff
changeset
|
1159 (sig (if def |
86949998e6fd
(byte-compile-callargs-warn): Use subr-arity to check primitives.
Dave Love <fx@gnu.org>
parents:
28441
diff
changeset
|
1160 (byte-compile-arglist-signature |
86949998e6fd
(byte-compile-callargs-warn): Use subr-arity to check primitives.
Dave Love <fx@gnu.org>
parents:
28441
diff
changeset
|
1161 (if (eq 'lambda (car-safe def)) |
86949998e6fd
(byte-compile-callargs-warn): Use subr-arity to check primitives.
Dave Love <fx@gnu.org>
parents:
28441
diff
changeset
|
1162 (nth 1 def) |
86949998e6fd
(byte-compile-callargs-warn): Use subr-arity to check primitives.
Dave Love <fx@gnu.org>
parents:
28441
diff
changeset
|
1163 (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
|
1164 (aref def 0) |
86949998e6fd
(byte-compile-callargs-warn): Use subr-arity to check primitives.
Dave Love <fx@gnu.org>
parents:
28441
diff
changeset
|
1165 '(&rest def)))) |
86949998e6fd
(byte-compile-callargs-warn): Use subr-arity to check primitives.
Dave Love <fx@gnu.org>
parents:
28441
diff
changeset
|
1166 (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
|
1167 (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
|
1168 (subr-arity (symbol-function (car form)))))) |
757 | 1169 (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
|
1170 ;; 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
|
1171 (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
|
1172 (not (numberp (cdr sig)))) |
86949998e6fd
(byte-compile-callargs-warn): Use subr-arity to check primitives.
Dave Love <fx@gnu.org>
parents:
28441
diff
changeset
|
1173 (setcdr sig nil)) |
757 | 1174 (if sig |
45558
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1175 (when (or (< ncall (car sig)) |
757 | 1176 (and (cdr sig) (> ncall (cdr sig)))) |
45558
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1177 (byte-compile-set-symbol-position (car form)) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1178 (byte-compile-warn |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1179 "%s called with %d argument%s, but %s %s" |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1180 (car form) ncall |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1181 (if (= 1 ncall) "" "s") |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1182 (if (< ncall (car sig)) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1183 "requires" |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1184 "accepts only") |
46003
503e1f14ba3d
(byte-compile-callargs-warn):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45842
diff
changeset
|
1185 (byte-compile-arglist-signature-string sig)))) |
53753
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
1186 (byte-compile-format-warn form) |
46003
503e1f14ba3d
(byte-compile-callargs-warn):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45842
diff
changeset
|
1187 ;; 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
|
1188 ;; and/or remember its arity if it's unknown. |
503e1f14ba3d
(byte-compile-callargs-warn):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45842
diff
changeset
|
1189 (or (and (or sig (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
|
1190 (not (memq (car form) byte-compile-noruntime-functions))) |
46003
503e1f14ba3d
(byte-compile-callargs-warn):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45842
diff
changeset
|
1191 (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
|
1192 ; with recursion. |
503e1f14ba3d
(byte-compile-callargs-warn):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45842
diff
changeset
|
1193 ;; It's a currently-undefined function. |
503e1f14ba3d
(byte-compile-callargs-warn):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45842
diff
changeset
|
1194 ;; Remember number of args in call. |
503e1f14ba3d
(byte-compile-callargs-warn):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45842
diff
changeset
|
1195 (let ((cons (assq (car form) byte-compile-unresolved-functions)) |
503e1f14ba3d
(byte-compile-callargs-warn):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45842
diff
changeset
|
1196 (n (length (cdr form)))) |
503e1f14ba3d
(byte-compile-callargs-warn):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45842
diff
changeset
|
1197 (if cons |
503e1f14ba3d
(byte-compile-callargs-warn):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45842
diff
changeset
|
1198 (or (memq n (cdr cons)) |
503e1f14ba3d
(byte-compile-callargs-warn):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45842
diff
changeset
|
1199 (setcdr cons (cons n (cdr cons)))) |
503e1f14ba3d
(byte-compile-callargs-warn):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45842
diff
changeset
|
1200 (setq byte-compile-unresolved-functions |
503e1f14ba3d
(byte-compile-callargs-warn):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45842
diff
changeset
|
1201 (cons (list (car form) n) |
503e1f14ba3d
(byte-compile-callargs-warn):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45842
diff
changeset
|
1202 byte-compile-unresolved-functions))))))) |
757 | 1203 |
53753
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
1204 (defun byte-compile-format-warn (form) |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
1205 "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
|
1206 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
|
1207 `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
|
1208 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
|
1209 extra args." |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
1210 (when (and (symbolp (car form)) |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
1211 (stringp (nth 1 form)) |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
1212 (get (car form) 'byte-compile-format-like)) |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
1213 (let ((nfields (with-temp-buffer |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
1214 (insert (nth 1 form)) |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
1215 (goto-char 1) |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
1216 (let ((n 0)) |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
1217 (while (re-search-forward "%." nil t) |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
1218 (unless (eq ?% (char-after (1+ (match-beginning 0)))) |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
1219 (setq n (1+ n)))) |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
1220 n))) |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
1221 (nargs (- (length form) 2))) |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
1222 (unless (= nargs nfields) |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
1223 (byte-compile-warn |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
1224 "`%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
|
1225 nargs nfields))))) |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
1226 |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
1227 (dolist (elt '(format message error)) |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
1228 (put elt 'byte-compile-format-like t)) |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
1229 |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1230 ;; 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
|
1231 ;; number of arguments. |
757 | 1232 (defun byte-compile-arglist-warn (form macrop) |
1233 (let ((old (byte-compile-fdefinition (nth 1 form) macrop))) | |
1234 (if old | |
1235 (let ((sig1 (byte-compile-arglist-signature | |
1236 (if (eq 'lambda (car-safe old)) | |
1237 (nth 1 old) | |
10235
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1238 (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
|
1239 (aref old 0) |
9f6348616e4d
(byte-compile-callargs-warn): Handle function defnition
Richard M. Stallman <rms@gnu.org>
parents:
7298
diff
changeset
|
1240 '(&rest def))))) |
757 | 1241 (sig2 (byte-compile-arglist-signature (nth 2 form)))) |
45558
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1242 (unless (byte-compile-arglist-signatures-congruent-p sig1 sig2) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1243 (byte-compile-set-symbol-position (nth 1 form)) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1244 (byte-compile-warn |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1245 "%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
|
1246 (if (eq (car form) 'defun) "function" "macro") |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1247 (nth 1 form) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1248 (byte-compile-arglist-signature-string sig1) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1249 (if (equal sig1 '(1 . 1)) "argument" "arguments") |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1250 (byte-compile-arglist-signature-string sig2)))) |
757 | 1251 ;; This is the first definition. See if previous calls are compatible. |
1252 (let ((calls (assq (nth 1 form) byte-compile-unresolved-functions)) | |
1253 nums sig min max) | |
1254 (if calls | |
1255 (progn | |
1256 (setq sig (byte-compile-arglist-signature (nth 2 form)) | |
1257 nums (sort (copy-sequence (cdr calls)) (function <)) | |
1258 min (car nums) | |
1259 max (car (nreverse nums))) | |
45558
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1260 (when (or (< min (car sig)) |
757 | 1261 (and (cdr sig) (> max (cdr sig)))) |
45558
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1262 (byte-compile-set-symbol-position (nth 1 form)) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1263 (byte-compile-warn |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1264 "%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
|
1265 (nth 1 form) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1266 (byte-compile-arglist-signature-string sig) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1267 (if (equal sig '(1 . 1)) " arg" " args") |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1268 (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
|
1269 |
757 | 1270 (setq byte-compile-unresolved-functions |
1271 (delq calls byte-compile-unresolved-functions))))) | |
1272 ))) | |
1273 | |
46657
04d87f195cd1
(byte-compile-cl-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
46576
diff
changeset
|
1274 (defvar byte-compile-cl-functions nil |
04d87f195cd1
(byte-compile-cl-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
46576
diff
changeset
|
1275 "List of functions defined in CL.") |
04d87f195cd1
(byte-compile-cl-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
46576
diff
changeset
|
1276 |
04d87f195cd1
(byte-compile-cl-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
46576
diff
changeset
|
1277 (defun byte-compile-find-cl-functions () |
04d87f195cd1
(byte-compile-cl-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
46576
diff
changeset
|
1278 (unless byte-compile-cl-functions |
04d87f195cd1
(byte-compile-cl-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
46576
diff
changeset
|
1279 (dolist (elt load-history) |
46763
4dff8f2c0a4e
(byte-compile-find-cl-functions):
Richard M. Stallman <rms@gnu.org>
parents:
46690
diff
changeset
|
1280 (when (and (stringp (car elt)) |
4dff8f2c0a4e
(byte-compile-find-cl-functions):
Richard M. Stallman <rms@gnu.org>
parents:
46690
diff
changeset
|
1281 (string-match "^cl\\>" (car elt))) |
46657
04d87f195cd1
(byte-compile-cl-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
46576
diff
changeset
|
1282 (setq byte-compile-cl-functions |
04d87f195cd1
(byte-compile-cl-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
46576
diff
changeset
|
1283 (append byte-compile-cl-functions |
04d87f195cd1
(byte-compile-cl-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
46576
diff
changeset
|
1284 (cdr elt))))) |
04d87f195cd1
(byte-compile-cl-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
46576
diff
changeset
|
1285 (let ((tail byte-compile-cl-functions)) |
04d87f195cd1
(byte-compile-cl-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
46576
diff
changeset
|
1286 (while tail |
04d87f195cd1
(byte-compile-cl-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
46576
diff
changeset
|
1287 (if (and (consp (car tail)) |
04d87f195cd1
(byte-compile-cl-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
46576
diff
changeset
|
1288 (eq (car (car tail)) 'autoload)) |
04d87f195cd1
(byte-compile-cl-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
46576
diff
changeset
|
1289 (setcar tail (cdr (car tail)))) |
04d87f195cd1
(byte-compile-cl-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
46576
diff
changeset
|
1290 (setq tail (cdr tail)))))) |
04d87f195cd1
(byte-compile-cl-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
46576
diff
changeset
|
1291 |
46136
79f132657570
(byte-compile-warning-types):
Richard M. Stallman <rms@gnu.org>
parents:
46050
diff
changeset
|
1292 (defun byte-compile-cl-warn (form) |
79f132657570
(byte-compile-warning-types):
Richard M. Stallman <rms@gnu.org>
parents:
46050
diff
changeset
|
1293 "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
|
1294 (let ((func (car-safe form))) |
04d87f195cd1
(byte-compile-cl-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
46576
diff
changeset
|
1295 (if (and byte-compile-cl-functions |
04d87f195cd1
(byte-compile-cl-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
46576
diff
changeset
|
1296 (memq func byte-compile-cl-functions) |
53753
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
1297 ;; 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
|
1298 ;; 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
|
1299 ;; avoid hardwiring the list. |
79f132657570
(byte-compile-warning-types):
Richard M. Stallman <rms@gnu.org>
parents:
46050
diff
changeset
|
1300 (not (memq func |
46568
a9a03aa7ba8a
(byte-compile-cl-warn): Delete `values'
Richard M. Stallman <rms@gnu.org>
parents:
46536
diff
changeset
|
1301 '(cl-block-wrapper cl-block-throw |
a9a03aa7ba8a
(byte-compile-cl-warn): Delete `values'
Richard M. Stallman <rms@gnu.org>
parents:
46536
diff
changeset
|
1302 multiple-value-call nth-value |
46657
04d87f195cd1
(byte-compile-cl-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
46576
diff
changeset
|
1303 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
|
1304 ;; 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
|
1305 ;; 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
|
1306 ;; 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
|
1307 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
|
1308 ;; These would sometimes be warned about |
747c4a00be3e
(byte-compile-log-file): Use \f.
Richard M. Stallman <rms@gnu.org>
parents:
46763
diff
changeset
|
1309 ;; but such warnings are never useful, |
747c4a00be3e
(byte-compile-log-file): Use \f.
Richard M. Stallman <rms@gnu.org>
parents:
46763
diff
changeset
|
1310 ;; so don't warn about them. |
50727
bd043e09b74c
(byte-compile-cl-warn): Avoid cl warnings
Dave Love <fx@gnu.org>
parents:
50682
diff
changeset
|
1311 macroexpand cl-macroexpand-all |
bd043e09b74c
(byte-compile-cl-warn): Avoid cl warnings
Dave Love <fx@gnu.org>
parents:
50682
diff
changeset
|
1312 cl-compiling-file))) |
bd043e09b74c
(byte-compile-cl-warn): Avoid cl warnings
Dave Love <fx@gnu.org>
parents:
50682
diff
changeset
|
1313 ;; 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
|
1314 ;; 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
|
1315 ;; 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
|
1316 ;; here than caaar and friends. |
bd043e09b74c
(byte-compile-cl-warn): Avoid cl warnings
Dave Love <fx@gnu.org>
parents:
50682
diff
changeset
|
1317 (not (and (eq (get func 'byte-compile) |
bd043e09b74c
(byte-compile-cl-warn): Avoid cl warnings
Dave Love <fx@gnu.org>
parents:
50682
diff
changeset
|
1318 'cl-byte-compile-compiler-macro) |
50729
680d6365cfea
(byte-compile-cl-warn): Use `string-match'.
John Paul Wallington <jpw@pobox.com>
parents:
50727
diff
changeset
|
1319 (string-match "\\`c[ad]+r\\'" (symbol-name func))))) |
46136
79f132657570
(byte-compile-warning-types):
Richard M. Stallman <rms@gnu.org>
parents:
46050
diff
changeset
|
1320 (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
|
1321 func))) |
79f132657570
(byte-compile-warning-types):
Richard M. Stallman <rms@gnu.org>
parents:
46050
diff
changeset
|
1322 form) |
79f132657570
(byte-compile-warning-types):
Richard M. Stallman <rms@gnu.org>
parents:
46050
diff
changeset
|
1323 |
28295
8082575fec24
(byte-compile-warning-types, byte-compile-warnings): New warning `noruntime'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27824
diff
changeset
|
1324 (defun byte-compile-print-syms (str1 strn syms) |
45558
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1325 (when syms |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1326 (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
|
1327 (cond ((and (cdr syms) (not noninteractive)) |
3bea53c3ecea
(byte-compile-display-log-head-p): New
Gerd Moellmann <gerd@gnu.org>
parents:
39657
diff
changeset
|
1328 (let* ((str strn) |
3bea53c3ecea
(byte-compile-display-log-head-p): New
Gerd Moellmann <gerd@gnu.org>
parents:
39657
diff
changeset
|
1329 (L (length str)) |
3bea53c3ecea
(byte-compile-display-log-head-p): New
Gerd Moellmann <gerd@gnu.org>
parents:
39657
diff
changeset
|
1330 s) |
3bea53c3ecea
(byte-compile-display-log-head-p): New
Gerd Moellmann <gerd@gnu.org>
parents:
39657
diff
changeset
|
1331 (while syms |
3bea53c3ecea
(byte-compile-display-log-head-p): New
Gerd Moellmann <gerd@gnu.org>
parents:
39657
diff
changeset
|
1332 (setq s (symbol-name (pop syms)) |
3bea53c3ecea
(byte-compile-display-log-head-p): New
Gerd Moellmann <gerd@gnu.org>
parents:
39657
diff
changeset
|
1333 L (+ L (length s) 2)) |
3bea53c3ecea
(byte-compile-display-log-head-p): New
Gerd Moellmann <gerd@gnu.org>
parents:
39657
diff
changeset
|
1334 (if (< L (1- fill-column)) |
3bea53c3ecea
(byte-compile-display-log-head-p): New
Gerd Moellmann <gerd@gnu.org>
parents:
39657
diff
changeset
|
1335 (setq str (concat str " " s (and syms ","))) |
3bea53c3ecea
(byte-compile-display-log-head-p): New
Gerd Moellmann <gerd@gnu.org>
parents:
39657
diff
changeset
|
1336 (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
|
1337 L (+ (length s) 4)))) |
3bea53c3ecea
(byte-compile-display-log-head-p): New
Gerd Moellmann <gerd@gnu.org>
parents:
39657
diff
changeset
|
1338 (byte-compile-warn "%s" str))) |
3bea53c3ecea
(byte-compile-display-log-head-p): New
Gerd Moellmann <gerd@gnu.org>
parents:
39657
diff
changeset
|
1339 ((cdr syms) |
40035
2b16a80692ef
Put the *Compile-Log* buffer in `compilation-mode'.
Sam Steingold <sds@gnu.org>
parents:
39852
diff
changeset
|
1340 (byte-compile-warn "%s %s" |
39769
3bea53c3ecea
(byte-compile-display-log-head-p): New
Gerd Moellmann <gerd@gnu.org>
parents:
39657
diff
changeset
|
1341 strn |
3bea53c3ecea
(byte-compile-display-log-head-p): New
Gerd Moellmann <gerd@gnu.org>
parents:
39657
diff
changeset
|
1342 (mapconcat #'symbol-name syms ", "))) |
3bea53c3ecea
(byte-compile-display-log-head-p): New
Gerd Moellmann <gerd@gnu.org>
parents:
39657
diff
changeset
|
1343 |
3bea53c3ecea
(byte-compile-display-log-head-p): New
Gerd Moellmann <gerd@gnu.org>
parents:
39657
diff
changeset
|
1344 (syms |
3bea53c3ecea
(byte-compile-display-log-head-p): New
Gerd Moellmann <gerd@gnu.org>
parents:
39657
diff
changeset
|
1345 (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
|
1346 |
40035
2b16a80692ef
Put the *Compile-Log* buffer in `compilation-mode'.
Sam Steingold <sds@gnu.org>
parents:
39852
diff
changeset
|
1347 ;; 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
|
1348 ;; defined, issue a warning enumerating them. |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1349 ;; `unresolved' in the list `byte-compile-warnings' disables this. |
757 | 1350 (defun byte-compile-warn-about-unresolved-functions () |
28295
8082575fec24
(byte-compile-warning-types, byte-compile-warnings): New warning `noruntime'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27824
diff
changeset
|
1351 (when (memq 'unresolved byte-compile-warnings) |
39769
3bea53c3ecea
(byte-compile-display-log-head-p): New
Gerd Moellmann <gerd@gnu.org>
parents:
39657
diff
changeset
|
1352 (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
|
1353 (noruntime nil) |
8082575fec24
(byte-compile-warning-types, byte-compile-warnings): New warning `noruntime'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27824
diff
changeset
|
1354 (unresolved nil)) |
8082575fec24
(byte-compile-warning-types, byte-compile-warnings): New warning `noruntime'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27824
diff
changeset
|
1355 ;; 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
|
1356 ;; 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
|
1357 (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
|
1358 (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
|
1359 (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
|
1360 ;; 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
|
1361 (byte-compile-print-syms |
39769
3bea53c3ecea
(byte-compile-display-log-head-p): New
Gerd Moellmann <gerd@gnu.org>
parents:
39657
diff
changeset
|
1362 "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
|
1363 "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
|
1364 noruntime) |
8082575fec24
(byte-compile-warning-types, byte-compile-warnings): New warning `noruntime'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27824
diff
changeset
|
1365 ;; 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
|
1366 (byte-compile-print-syms |
39769
3bea53c3ecea
(byte-compile-display-log-head-p): New
Gerd Moellmann <gerd@gnu.org>
parents:
39657
diff
changeset
|
1367 "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
|
1368 "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
|
1369 unresolved))) |
757 | 1370 nil) |
1371 | |
1372 | |
50618
ebecc2b80af6
(byte-compile-const-symbol-p): Rename arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50573
diff
changeset
|
1373 (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
|
1374 "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
|
1375 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
|
1376 symbol itself." |
27824 | 1377 (or (memq symbol '(nil t)) |
50570
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
1378 (keywordp symbol) |
50618
ebecc2b80af6
(byte-compile-const-symbol-p): Rename arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50573
diff
changeset
|
1379 (if any-value (memq symbol byte-compile-const-variables)))) |
27824 | 1380 |
757 | 1381 (defmacro byte-compile-constp (form) |
28402 | 1382 "Return non-nil if FORM is a constant." |
27824 | 1383 `(cond ((consp ,form) (eq (car ,form) 'quote)) |
1384 ((not (symbolp ,form))) | |
1385 ((byte-compile-const-symbol-p ,form)))) | |
757 | 1386 |
1387 (defmacro byte-compile-close-variables (&rest body) | |
1388 (cons 'let | |
1389 (cons '(;; | |
1390 ;; Close over these variables to encapsulate the | |
1391 ;; compilation state | |
1392 ;; | |
1393 (byte-compile-macro-environment | |
1394 ;; Copy it because the compiler may patch into the | |
1395 ;; macroenvironment. | |
1396 (copy-alist byte-compile-initial-macro-environment)) | |
1397 (byte-compile-function-environment nil) | |
1398 (byte-compile-bound-variables nil) | |
50570
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
1399 (byte-compile-const-variables nil) |
757 | 1400 (byte-compile-free-references nil) |
1401 (byte-compile-free-assignments nil) | |
1402 ;; | |
1403 ;; Close over these variables so that `byte-compiler-options' | |
1404 ;; can change them on a per-file basis. | |
1405 ;; | |
1406 (byte-compile-verbose byte-compile-verbose) | |
1407 (byte-optimize byte-optimize) | |
10235
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1408 (byte-compile-compatibility byte-compile-compatibility) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1409 (byte-compile-dynamic byte-compile-dynamic) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1410 (byte-compile-dynamic-docstrings |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1411 byte-compile-dynamic-docstrings) |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1412 ;; (byte-compile-generate-emacs19-bytecodes |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1413 ;; byte-compile-generate-emacs19-bytecodes) |
757 | 1414 (byte-compile-warnings (if (eq byte-compile-warnings t) |
1415 byte-compile-warning-types | |
1416 byte-compile-warnings)) | |
1417 ) | |
1418 body))) | |
1419 | |
1420 (defmacro displaying-byte-compile-warnings (&rest body) | |
47110
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1421 `(let* ((--displaying-byte-compile-warnings-fn (lambda () ,@body)) |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1422 (warning-series-started |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1423 (and (markerp warning-series) |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1424 (eq (marker-buffer warning-series) |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1425 (get-buffer "*Compile-Log*"))))) |
46657
04d87f195cd1
(byte-compile-cl-functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
46576
diff
changeset
|
1426 (byte-compile-find-cl-functions) |
47110
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1427 (if (or (eq warning-series 'byte-compile-warning-series) |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1428 warning-series-started) |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1429 ;; warning-series does come from compilation, |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1430 ;; 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
|
1431 (let (tem) |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1432 ;; Log the file name. Record position of that text. |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1433 (setq tem (byte-compile-log-file)) |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1434 (unless warning-series-started |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1435 (setq warning-series (or tem 'byte-compile-warning-series))) |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1436 (if byte-compile-debug |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1437 (funcall --displaying-byte-compile-warnings-fn) |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1438 (condition-case error-info |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1439 (funcall --displaying-byte-compile-warnings-fn) |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1440 (error (byte-compile-report-error error-info))))) |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1441 ;; 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
|
1442 (let ((warning-series |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1443 ;; Log the file name. Record position of that text. |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1444 (or (byte-compile-log-file) 'byte-compile-warning-series))) |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1445 (if byte-compile-debug |
46576 | 1446 (funcall --displaying-byte-compile-warnings-fn) |
47110
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1447 (condition-case error-info |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1448 (funcall --displaying-byte-compile-warnings-fn) |
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1449 (error (byte-compile-report-error error-info)))))))) |
757 | 1450 |
819
5bbabfcef929
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
784
diff
changeset
|
1451 ;;;###autoload |
13338
0f082123d484
(byte-recompile-directory): New arg FORCE.
Richard M. Stallman <rms@gnu.org>
parents:
13138
diff
changeset
|
1452 (defun byte-force-recompile (directory) |
0f082123d484
(byte-recompile-directory): New arg FORCE.
Richard M. Stallman <rms@gnu.org>
parents:
13138
diff
changeset
|
1453 "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
|
1454 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
|
1455 (interactive "DByte force recompile (directory): ") |
13338
0f082123d484
(byte-recompile-directory): New arg FORCE.
Richard M. Stallman <rms@gnu.org>
parents:
13138
diff
changeset
|
1456 (byte-recompile-directory directory nil t)) |
0f082123d484
(byte-recompile-directory): New arg FORCE.
Richard M. Stallman <rms@gnu.org>
parents:
13138
diff
changeset
|
1457 |
0f082123d484
(byte-recompile-directory): New arg FORCE.
Richard M. Stallman <rms@gnu.org>
parents:
13138
diff
changeset
|
1458 ;;;###autoload |
0f082123d484
(byte-recompile-directory): New arg FORCE.
Richard M. Stallman <rms@gnu.org>
parents:
13138
diff
changeset
|
1459 (defun byte-recompile-directory (directory &optional arg force) |
757 | 1460 "Recompile every `.el' file in DIRECTORY that needs recompilation. |
1461 This is if a `.elc' file exists but is older than the `.el' file. | |
4316
667b32d2c02c
(byte-recompile-directory): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
4129
diff
changeset
|
1462 Files in subdirectories of DIRECTORY are processed also. |
757 | 1463 |
45842
288c321d3282
(byte-recompile-directory): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
45572
diff
changeset
|
1464 If the `.elc' file does not exist, normally this function *does not* |
288c321d3282
(byte-recompile-directory): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
45572
diff
changeset
|
1465 compile the corresponding `.el' file. However, |
288c321d3282
(byte-recompile-directory): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
45572
diff
changeset
|
1466 if ARG (the prefix argument) is 0, that means do compile all those files. |
288c321d3282
(byte-recompile-directory): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
45572
diff
changeset
|
1467 A nonzero ARG means ask the user, for each such `.el' file, |
288c321d3282
(byte-recompile-directory): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
45572
diff
changeset
|
1468 whether to compile it. |
288c321d3282
(byte-recompile-directory): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
45572
diff
changeset
|
1469 |
288c321d3282
(byte-recompile-directory): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
45572
diff
changeset
|
1470 A nonzero ARG also means ask about each subdirectory before scanning it. |
13338
0f082123d484
(byte-recompile-directory): New arg FORCE.
Richard M. Stallman <rms@gnu.org>
parents:
13138
diff
changeset
|
1471 |
0f082123d484
(byte-recompile-directory): New arg FORCE.
Richard M. Stallman <rms@gnu.org>
parents:
13138
diff
changeset
|
1472 If the third argument FORCE is non-nil, |
0f082123d484
(byte-recompile-directory): New arg FORCE.
Richard M. Stallman <rms@gnu.org>
parents:
13138
diff
changeset
|
1473 recompile every `.el' file that already has a `.elc' file." |
757 | 1474 (interactive "DByte recompile directory: \nP") |
2735
6489c9da34b9
(byte-recompile-directory): If ARG is non-nil, set it to its prefix
Roland McGrath <roland@gnu.org>
parents:
2626
diff
changeset
|
1475 (if arg |
6489c9da34b9
(byte-recompile-directory): If ARG is non-nil, set it to its prefix
Roland McGrath <roland@gnu.org>
parents:
2626
diff
changeset
|
1476 (setq arg (prefix-numeric-value arg))) |
3653
974055b516d9
* bytecomp.el: Bring it up to version 2.10 of the
Jim Blandy <jimb@redhat.com>
parents:
3591
diff
changeset
|
1477 (if noninteractive |
974055b516d9
* bytecomp.el: Bring it up to version 2.10 of the
Jim Blandy <jimb@redhat.com>
parents:
3591
diff
changeset
|
1478 nil |
974055b516d9
* bytecomp.el: Bring it up to version 2.10 of the
Jim Blandy <jimb@redhat.com>
parents:
3591
diff
changeset
|
1479 (save-some-buffers) |
11590
97a90e900ce7
(byte-recompile-directory): Use force-mode-line-update.
Karl Heuer <kwzh@gnu.org>
parents:
11432
diff
changeset
|
1480 (force-mode-line-update)) |
47332
96475604480c
(byte-recompile-directory): Set and then bind default-directory.
Richard M. Stallman <rms@gnu.org>
parents:
47318
diff
changeset
|
1481 (save-current-buffer |
50639
c3ba923eb0e9
(byte-compile-log-file, (byte-recompile-directory): Don't use
Richard M. Stallman <rms@gnu.org>
parents:
50618
diff
changeset
|
1482 (set-buffer (get-buffer-create "*Compile-Log*")) |
50570
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
1483 (setq default-directory (expand-file-name directory)) |
50639
c3ba923eb0e9
(byte-compile-log-file, (byte-recompile-directory): Don't use
Richard M. Stallman <rms@gnu.org>
parents:
50618
diff
changeset
|
1484 ;; 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
|
1485 (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
|
1486 (compilation-mode)) |
47332
96475604480c
(byte-recompile-directory): Set and then bind default-directory.
Richard M. Stallman <rms@gnu.org>
parents:
47318
diff
changeset
|
1487 (let ((directories (list (expand-file-name directory))) |
96475604480c
(byte-recompile-directory): Set and then bind default-directory.
Richard M. Stallman <rms@gnu.org>
parents:
47318
diff
changeset
|
1488 (default-directory default-directory) |
96475604480c
(byte-recompile-directory): Set and then bind default-directory.
Richard M. Stallman <rms@gnu.org>
parents:
47318
diff
changeset
|
1489 (skip-count 0) |
96475604480c
(byte-recompile-directory): Set and then bind default-directory.
Richard M. Stallman <rms@gnu.org>
parents:
47318
diff
changeset
|
1490 (fail-count 0) |
96475604480c
(byte-recompile-directory): Set and then bind default-directory.
Richard M. Stallman <rms@gnu.org>
parents:
47318
diff
changeset
|
1491 (file-count 0) |
96475604480c
(byte-recompile-directory): Set and then bind default-directory.
Richard M. Stallman <rms@gnu.org>
parents:
47318
diff
changeset
|
1492 (dir-count 0) |
96475604480c
(byte-recompile-directory): Set and then bind default-directory.
Richard M. Stallman <rms@gnu.org>
parents:
47318
diff
changeset
|
1493 last-dir) |
96475604480c
(byte-recompile-directory): Set and then bind default-directory.
Richard M. Stallman <rms@gnu.org>
parents:
47318
diff
changeset
|
1494 (displaying-byte-compile-warnings |
96475604480c
(byte-recompile-directory): Set and then bind default-directory.
Richard M. Stallman <rms@gnu.org>
parents:
47318
diff
changeset
|
1495 (while directories |
96475604480c
(byte-recompile-directory): Set and then bind default-directory.
Richard M. Stallman <rms@gnu.org>
parents:
47318
diff
changeset
|
1496 (setq directory (car directories)) |
96475604480c
(byte-recompile-directory): Set and then bind default-directory.
Richard M. Stallman <rms@gnu.org>
parents:
47318
diff
changeset
|
1497 (message "Checking %s..." directory) |
96475604480c
(byte-recompile-directory): Set and then bind default-directory.
Richard M. Stallman <rms@gnu.org>
parents:
47318
diff
changeset
|
1498 (let ((files (directory-files directory)) |
96475604480c
(byte-recompile-directory): Set and then bind default-directory.
Richard M. Stallman <rms@gnu.org>
parents:
47318
diff
changeset
|
1499 source dest) |
96475604480c
(byte-recompile-directory): Set and then bind default-directory.
Richard M. Stallman <rms@gnu.org>
parents:
47318
diff
changeset
|
1500 (dolist (file files) |
96475604480c
(byte-recompile-directory): Set and then bind default-directory.
Richard M. Stallman <rms@gnu.org>
parents:
47318
diff
changeset
|
1501 (setq source (expand-file-name file directory)) |
54497
acd845de0416
(byte-recompile-directory): Ignore hidden dir.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54374
diff
changeset
|
1502 (if (and (not (member file '("RCS" "CVS"))) |
acd845de0416
(byte-recompile-directory): Ignore hidden dir.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54374
diff
changeset
|
1503 (not (eq ?\. (aref file 0))) |
47332
96475604480c
(byte-recompile-directory): Set and then bind default-directory.
Richard M. Stallman <rms@gnu.org>
parents:
47318
diff
changeset
|
1504 (file-directory-p source) |
96475604480c
(byte-recompile-directory): Set and then bind default-directory.
Richard M. Stallman <rms@gnu.org>
parents:
47318
diff
changeset
|
1505 (not (file-symlink-p source))) |
96475604480c
(byte-recompile-directory): Set and then bind default-directory.
Richard M. Stallman <rms@gnu.org>
parents:
47318
diff
changeset
|
1506 ;; This file is a subdirectory. Handle them differently. |
96475604480c
(byte-recompile-directory): Set and then bind default-directory.
Richard M. Stallman <rms@gnu.org>
parents:
47318
diff
changeset
|
1507 (when (or (null arg) |
96475604480c
(byte-recompile-directory): Set and then bind default-directory.
Richard M. Stallman <rms@gnu.org>
parents:
47318
diff
changeset
|
1508 (eq 0 arg) |
96475604480c
(byte-recompile-directory): Set and then bind default-directory.
Richard M. Stallman <rms@gnu.org>
parents:
47318
diff
changeset
|
1509 (y-or-n-p (concat "Check " source "? "))) |
96475604480c
(byte-recompile-directory): Set and then bind default-directory.
Richard M. Stallman <rms@gnu.org>
parents:
47318
diff
changeset
|
1510 (setq directories |
96475604480c
(byte-recompile-directory): Set and then bind default-directory.
Richard M. Stallman <rms@gnu.org>
parents:
47318
diff
changeset
|
1511 (nconc directories (list source)))) |
96475604480c
(byte-recompile-directory): Set and then bind default-directory.
Richard M. Stallman <rms@gnu.org>
parents:
47318
diff
changeset
|
1512 ;; It is an ordinary file. Decide whether to compile it. |
96475604480c
(byte-recompile-directory): Set and then bind default-directory.
Richard M. Stallman <rms@gnu.org>
parents:
47318
diff
changeset
|
1513 (if (and (string-match emacs-lisp-file-regexp source) |
96475604480c
(byte-recompile-directory): Set and then bind default-directory.
Richard M. Stallman <rms@gnu.org>
parents:
47318
diff
changeset
|
1514 (file-readable-p source) |
96475604480c
(byte-recompile-directory): Set and then bind default-directory.
Richard M. Stallman <rms@gnu.org>
parents:
47318
diff
changeset
|
1515 (not (auto-save-file-name-p source)) |
96475604480c
(byte-recompile-directory): Set and then bind default-directory.
Richard M. Stallman <rms@gnu.org>
parents:
47318
diff
changeset
|
1516 (setq dest (byte-compile-dest-file source)) |
96475604480c
(byte-recompile-directory): Set and then bind default-directory.
Richard M. Stallman <rms@gnu.org>
parents:
47318
diff
changeset
|
1517 (if (file-exists-p dest) |
96475604480c
(byte-recompile-directory): Set and then bind default-directory.
Richard M. Stallman <rms@gnu.org>
parents:
47318
diff
changeset
|
1518 ;; File was already compiled. |
96475604480c
(byte-recompile-directory): Set and then bind default-directory.
Richard M. Stallman <rms@gnu.org>
parents:
47318
diff
changeset
|
1519 (or force (file-newer-than-file-p source dest)) |
96475604480c
(byte-recompile-directory): Set and then bind default-directory.
Richard M. Stallman <rms@gnu.org>
parents:
47318
diff
changeset
|
1520 ;; No compiled file exists yet. |
96475604480c
(byte-recompile-directory): Set and then bind default-directory.
Richard M. Stallman <rms@gnu.org>
parents:
47318
diff
changeset
|
1521 (and arg |
96475604480c
(byte-recompile-directory): Set and then bind default-directory.
Richard M. Stallman <rms@gnu.org>
parents:
47318
diff
changeset
|
1522 (or (eq 0 arg) |
96475604480c
(byte-recompile-directory): Set and then bind default-directory.
Richard M. Stallman <rms@gnu.org>
parents:
47318
diff
changeset
|
1523 (y-or-n-p (concat "Compile " source "? ")))))) |
96475604480c
(byte-recompile-directory): Set and then bind default-directory.
Richard M. Stallman <rms@gnu.org>
parents:
47318
diff
changeset
|
1524 (progn (if (and noninteractive (not byte-compile-verbose)) |
96475604480c
(byte-recompile-directory): Set and then bind default-directory.
Richard M. Stallman <rms@gnu.org>
parents:
47318
diff
changeset
|
1525 (message "Compiling %s..." source)) |
96475604480c
(byte-recompile-directory): Set and then bind default-directory.
Richard M. Stallman <rms@gnu.org>
parents:
47318
diff
changeset
|
1526 (let ((res (byte-compile-file source))) |
96475604480c
(byte-recompile-directory): Set and then bind default-directory.
Richard M. Stallman <rms@gnu.org>
parents:
47318
diff
changeset
|
1527 (cond ((eq res 'no-byte-compile) |
96475604480c
(byte-recompile-directory): Set and then bind default-directory.
Richard M. Stallman <rms@gnu.org>
parents:
47318
diff
changeset
|
1528 (setq skip-count (1+ skip-count))) |
96475604480c
(byte-recompile-directory): Set and then bind default-directory.
Richard M. Stallman <rms@gnu.org>
parents:
47318
diff
changeset
|
1529 ((eq res t) |
96475604480c
(byte-recompile-directory): Set and then bind default-directory.
Richard M. Stallman <rms@gnu.org>
parents:
47318
diff
changeset
|
1530 (setq file-count (1+ file-count))) |
96475604480c
(byte-recompile-directory): Set and then bind default-directory.
Richard M. Stallman <rms@gnu.org>
parents:
47318
diff
changeset
|
1531 ((eq res nil) |
96475604480c
(byte-recompile-directory): Set and then bind default-directory.
Richard M. Stallman <rms@gnu.org>
parents:
47318
diff
changeset
|
1532 (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
|
1533 (or noninteractive |
96475604480c
(byte-recompile-directory): Set and then bind default-directory.
Richard M. Stallman <rms@gnu.org>
parents:
47318
diff
changeset
|
1534 (message "Checking %s..." directory)) |
96475604480c
(byte-recompile-directory): Set and then bind default-directory.
Richard M. Stallman <rms@gnu.org>
parents:
47318
diff
changeset
|
1535 (if (not (eq last-dir directory)) |
96475604480c
(byte-recompile-directory): Set and then bind default-directory.
Richard M. Stallman <rms@gnu.org>
parents:
47318
diff
changeset
|
1536 (setq last-dir directory |
96475604480c
(byte-recompile-directory): Set and then bind default-directory.
Richard M. Stallman <rms@gnu.org>
parents:
47318
diff
changeset
|
1537 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
|
1538 ))))) |
96475604480c
(byte-recompile-directory): Set and then bind default-directory.
Richard M. Stallman <rms@gnu.org>
parents:
47318
diff
changeset
|
1539 (setq directories (cdr directories)))) |
96475604480c
(byte-recompile-directory): Set and then bind default-directory.
Richard M. Stallman <rms@gnu.org>
parents:
47318
diff
changeset
|
1540 (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
|
1541 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
|
1542 (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
|
1543 (if (> skip-count 0) (format ", %d skipped" skip-count) "") |
96475604480c
(byte-recompile-directory): Set and then bind default-directory.
Richard M. Stallman <rms@gnu.org>
parents:
47318
diff
changeset
|
1544 (if (> dir-count 1) (format " in %d directories" dir-count) ""))))) |
757 | 1545 |
41176
2d63191afacd
(byte-compile-call-tree, byte-code-vector)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40451
diff
changeset
|
1546 (defvar no-byte-compile nil |
2d63191afacd
(byte-compile-call-tree, byte-code-vector)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40451
diff
changeset
|
1547 "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
|
1548 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
|
1549 |
2d63191afacd
(byte-compile-call-tree, byte-code-vector)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40451
diff
changeset
|
1550 ;; Local Variables:\n;; no-byte-compile: t\n;; End: ") |
2d63191afacd
(byte-compile-call-tree, byte-code-vector)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40451
diff
changeset
|
1551 |
819
5bbabfcef929
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
784
diff
changeset
|
1552 ;;;###autoload |
757 | 1553 (defun byte-compile-file (filename &optional load) |
1554 "Compile a file of Lisp code named FILENAME into a file of byte code. | |
1555 The output file's name is made by appending `c' to the end of FILENAME. | |
39561
0881eab13b7a
(byte-recompile-directory): Make sure the file is readable.
Gerd Moellmann <gerd@gnu.org>
parents:
38895
diff
changeset
|
1556 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
|
1557 The value is non-nil if there were no errors, nil if errors." |
757 | 1558 ;; (interactive "fByte compile file: \nP") |
1559 (interactive | |
1560 (let ((file buffer-file-name) | |
1561 (file-name nil) | |
1562 (file-dir nil)) | |
1563 (and file | |
1564 (eq (cdr (assq 'major-mode (buffer-local-variables))) | |
1565 'emacs-lisp-mode) | |
1566 (setq file-name (file-name-nondirectory file) | |
1567 file-dir (file-name-directory file))) | |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1568 (list (read-file-name (if current-prefix-arg |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1569 "Byte compile and load file: " |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1570 "Byte compile file: ") |
3718
37a8a7489fc5
(byte-compile-file): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
3653
diff
changeset
|
1571 file-dir file-name nil) |
819
5bbabfcef929
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
784
diff
changeset
|
1572 current-prefix-arg))) |
757 | 1573 ;; Expand now so we get the current buffer's defaults |
1574 (setq filename (expand-file-name filename)) | |
1575 | |
1576 ;; If we're compiling a file that's in a buffer and is modified, offer | |
1577 ;; to save it first. | |
1578 (or noninteractive | |
1579 (let ((b (get-file-buffer (expand-file-name filename)))) | |
1580 (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
|
1581 (y-or-n-p (format "Save buffer %s first? " (buffer-name b)))) |
757 | 1582 (save-excursion (set-buffer b) (save-buffer))))) |
1583 | |
47110
ce17d4a1d32e
(byte-compile-warning-prefix):
Richard M. Stallman <rms@gnu.org>
parents:
47107
diff
changeset
|
1584 ;; 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
|
1585 (setq byte-compile-last-logged-file nil) |
6554
5f8effa94d20
(byte-compile-file): Use whole file name for errors.
Richard M. Stallman <rms@gnu.org>
parents:
6293
diff
changeset
|
1586 (let ((byte-compile-current-file filename) |
22689
2d69ba7d76f4
(byte-compile-file): Bind set-auto-coding-for-load to t.
Richard M. Stallman <rms@gnu.org>
parents:
22578
diff
changeset
|
1587 (set-auto-coding-for-load t) |
10235
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1588 target-file input-buffer output-buffer |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1589 byte-compile-dest-file) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1590 (setq target-file (byte-compile-dest-file filename)) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1591 (setq byte-compile-dest-file target-file) |
757 | 1592 (save-excursion |
1129 | 1593 (setq input-buffer (get-buffer-create " *Compiler Input*")) |
1594 (set-buffer input-buffer) | |
757 | 1595 (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
|
1596 (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
|
1597 ;; 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
|
1598 ;; 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
|
1599 (set-buffer-multibyte t) |
757 | 1600 (insert-file-contents filename) |
50837
1bd0d75dbaa9
(byte-compile-file): Fix comment
Kenichi Handa <handa@m17n.org>
parents:
50729
diff
changeset
|
1601 ;; 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
|
1602 ;; 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
|
1603 (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
|
1604 (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
|
1605 ;; 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
|
1606 ;; 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
|
1607 (set-buffer-multibyte nil)) |
757 | 1608 ;; Run hooks including the uncompression hook. |
1609 ;; If they change the file name, then change it for the output also. | |
10235
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1610 (let ((buffer-file-name filename) |
10836
3c9b3505feef
(byte-compile-file): Bind default-major-mode to avoid randomness.
Richard M. Stallman <rms@gnu.org>
parents:
10696
diff
changeset
|
1611 (default-major-mode 'emacs-lisp-mode) |
10235
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1612 (enable-local-eval nil)) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1613 (normal-mode) |
16788
ffb387a3d054
(byte-compile-file): Set default-directory in compiler input buffer.
Richard M. Stallman <rms@gnu.org>
parents:
16666
diff
changeset
|
1614 (setq filename buffer-file-name)) |
ffb387a3d054
(byte-compile-file): Set default-directory in compiler input buffer.
Richard M. Stallman <rms@gnu.org>
parents:
16666
diff
changeset
|
1615 ;; Set the default directory, in case an eval-when-compile uses it. |
ffb387a3d054
(byte-compile-file): Set default-directory in compiler input buffer.
Richard M. Stallman <rms@gnu.org>
parents:
16666
diff
changeset
|
1616 (setq default-directory (file-name-directory filename))) |
39561
0881eab13b7a
(byte-recompile-directory): Make sure the file is readable.
Gerd Moellmann <gerd@gnu.org>
parents:
38895
diff
changeset
|
1617 ;; 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
|
1618 ;; compile this file. |
41176
2d63191afacd
(byte-compile-call-tree, byte-code-vector)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40451
diff
changeset
|
1619 (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
|
1620 (progn |
54497
acd845de0416
(byte-recompile-directory): Ignore hidden dir.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54374
diff
changeset
|
1621 ;; (message "%s not compiled because of `no-byte-compile: %s'" |
acd845de0416
(byte-recompile-directory): Ignore hidden dir.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54374
diff
changeset
|
1622 ;; (file-relative-name filename) |
acd845de0416
(byte-recompile-directory): Ignore hidden dir.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54374
diff
changeset
|
1623 ;; (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
|
1624 (when (file-exists-p target-file) |
acd845de0416
(byte-recompile-directory): Ignore hidden dir.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54374
diff
changeset
|
1625 (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
|
1626 (file-relative-name target-file) |
acd845de0416
(byte-recompile-directory): Ignore hidden dir.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54374
diff
changeset
|
1627 (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
|
1628 (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
|
1629 ;; 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
|
1630 'no-byte-compile) |
45558
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1631 (when byte-compile-verbose |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1632 (message "Compiling %s..." 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
|
1633 (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
|
1634 ;; 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
|
1635 ;; 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
|
1636 ;; 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
|
1637 (setq output-buffer |
0b6b707c1e14
(byte-compile-file): Don't switch buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47332
diff
changeset
|
1638 (save-current-buffer |
0b6b707c1e14
(byte-compile-file): Don't switch buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47332
diff
changeset
|
1639 (byte-compile-from-buffer input-buffer 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
|
1640 (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
|
1641 nil |
45558
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1642 (when byte-compile-verbose |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1643 (message "Compiling %s...done" 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
|
1644 (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
|
1645 (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
|
1646 (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
|
1647 (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
|
1648 (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
|
1649 (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
|
1650 ;; 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
|
1651 (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
|
1652 (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
|
1653 (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
|
1654 (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
|
1655 ;; 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
|
1656 ;; 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
|
1657 ;; 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
|
1658 ;; 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
|
1659 ;; 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
|
1660 (delete-file target-file)) |
46003
503e1f14ba3d
(byte-compile-callargs-warn):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45842
diff
changeset
|
1661 (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
|
1662 ;; 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
|
1663 (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
|
1664 (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
|
1665 (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
|
1666 "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
|
1667 "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
|
1668 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
|
1669 (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
|
1670 (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
|
1671 (or (eq t 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
|
1672 (y-or-n-p (format "Report call tree for %s? " filename)))) |
ea9e28db82d5
(byte-compile-file): Return success when the file says no-byte-compile.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39561
diff
changeset
|
1673 (save-excursion |
ea9e28db82d5
(byte-compile-file): Return success when the file says no-byte-compile.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39561
diff
changeset
|
1674 (display-call-tree filename))) |
ea9e28db82d5
(byte-compile-file): Return success when the file says no-byte-compile.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39561
diff
changeset
|
1675 (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
|
1676 (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
|
1677 t)))) |
757 | 1678 |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1679 ;;(defun byte-compile-and-load-file (&optional filename) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1680 ;; "Compile a file of Lisp code named FILENAME into a file of byte code, |
28402 | 1681 ;;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
|
1682 ;;the end of FILENAME." |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1683 ;; (interactive) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1684 ;; (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
|
1685 ;; (byte-compile-file filename t) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1686 ;; (let ((current-prefix-arg '(4))) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1687 ;; (call-interactively 'byte-compile-file)))) |
757 | 1688 |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1689 ;;(defun byte-compile-buffer (&optional buffer) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1690 ;; "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
|
1691 ;; (interactive "bByte compile buffer: ") |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1692 ;; (setq buffer (if buffer (get-buffer buffer) (current-buffer))) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1693 ;; (message "Compiling %s..." (buffer-name buffer)) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1694 ;; (let* ((filename (or (buffer-file-name buffer) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1695 ;; (concat "#<buffer " (buffer-name buffer) ">"))) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1696 ;; (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
|
1697 ;; (byte-compile-from-buffer buffer nil)) |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1698 ;; (message "Compiling %s...done" (buffer-name buffer)) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1699 ;; t) |
757 | 1700 |
1701 ;;; compiling a single function | |
819
5bbabfcef929
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
784
diff
changeset
|
1702 ;;;###autoload |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1703 (defun compile-defun (&optional arg) |
757 | 1704 "Compile and evaluate the current top-level form. |
53573
3a95b6e83d47
(compile-defun): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52568
diff
changeset
|
1705 Print the result in the echo area. |
757 | 1706 With argument, insert value in current buffer after the form." |
1707 (interactive "P") | |
1708 (save-excursion | |
1709 (end-of-defun) | |
1710 (beginning-of-defun) | |
1711 (let* ((byte-compile-current-file nil) | |
45558
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1712 (byte-compile-current-buffer (current-buffer)) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1713 (byte-compile-read-position (point)) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1714 (byte-compile-last-position byte-compile-read-position) |
757 | 1715 (byte-compile-last-warned-form 'nothing) |
45558
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1716 (value (eval |
46568
a9a03aa7ba8a
(byte-compile-cl-warn): Delete `values'
Richard M. Stallman <rms@gnu.org>
parents:
46536
diff
changeset
|
1717 (let ((read-with-symbol-positions (current-buffer)) |
45558
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1718 (read-symbol-positions-list nil)) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1719 (displaying-byte-compile-warnings |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1720 (byte-compile-sexp (read (current-buffer)))))))) |
757 | 1721 (cond (arg |
1722 (message "Compiling from buffer... done.") | |
1723 (prin1 value (current-buffer)) | |
1724 (insert "\n")) | |
1725 ((message "%s" (prin1-to-string value))))))) | |
1726 | |
1727 | |
6193
74fcc9007c39
(byte-compile-insert-header): Take a filename argument.
Richard M. Stallman <rms@gnu.org>
parents:
6081
diff
changeset
|
1728 (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
|
1729 ;; 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
|
1730 (let (outbuffer |
45558
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1731 (byte-compile-current-buffer inbuffer) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1732 (byte-compile-read-position nil) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1733 (byte-compile-last-position nil) |
10235
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1734 ;; 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
|
1735 (float-output-format nil) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1736 (case-fold-search nil) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1737 (print-length nil) |
13138
2a0ef3a2ccc3
(byte-compile-from-buffer): Bind print-level.
Richard M. Stallman <rms@gnu.org>
parents:
12928
diff
changeset
|
1738 (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
|
1739 ;; 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
|
1740 ;; and put the output into a file. |
45558
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1741 ;; (edebug-all-defs nil) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1742 ;; (edebug-all-forms nil) |
10235
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1743 ;; Simulate entry to byte-compile-top-level |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1744 (byte-compile-constants nil) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1745 (byte-compile-variables nil) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1746 (byte-compile-tag-number 0) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1747 (byte-compile-depth 0) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1748 (byte-compile-maxdepth 0) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1749 (byte-compile-output nil) |
45558
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1750 ;; This allows us to get the positions of symbols read; it's |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1751 ;; new in Emacs 21.4. |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1752 (read-with-symbol-positions inbuffer) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1753 (read-symbol-positions-list nil) |
10235
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1754 ;; #### This is bound in b-c-close-variables. |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1755 ;; (byte-compile-warnings (if (eq byte-compile-warnings t) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1756 ;; byte-compile-warning-types |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1757 ;; byte-compile-warnings)) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1758 ) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1759 (byte-compile-close-variables |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1760 (save-excursion |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1761 (setq outbuffer |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1762 (set-buffer (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
|
1763 (set-buffer-multibyte t) |
10235
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1764 (erase-buffer) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1765 ;; (emacs-lisp-mode) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1766 (setq case-fold-search nil) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1767 ;; 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
|
1768 ;; write files containing binary information specially. |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1769 ;; 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
|
1770 ;; 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
|
1771 ;; 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
|
1772 ;; need to be written carefully. |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1773 (setq overwrite-mode 'overwrite-mode-binary)) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1774 (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
|
1775 (and filename (byte-compile-insert-header filename inbuffer outbuffer)) |
10235
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1776 (save-excursion |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1777 (set-buffer inbuffer) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1778 (goto-char 1) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1779 |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1780 ;; Compile the forms from the input buffer. |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1781 (while (progn |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1782 (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
|
1783 (looking-at ";")) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1784 (forward-line 1)) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1785 (not (eobp))) |
45558
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1786 (setq byte-compile-read-position (point) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1787 byte-compile-last-position byte-compile-read-position) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1788 (let ((form (read inbuffer))) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
1789 (byte-compile-file-form form))) |
10235
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1790 ;; Compile pending forms at end of file. |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1791 (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
|
1792 ;; 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
|
1793 ;; 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
|
1794 (setq byte-compile-last-position (point-max)) |
10235
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1795 (byte-compile-warn-about-unresolved-functions) |
14040 | 1796 ;; Should we always do this? When calling multiple files, it |
10235
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1797 ;; would be useful to delay this warning until all have |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1798 ;; been compiled. |
22136
bc8c7f59c064
(byte-compile-insert-header): Do not look for multibyte characters here.
Richard M. Stallman <rms@gnu.org>
parents:
22050
diff
changeset
|
1799 (setq byte-compile-unresolved-functions nil)) |
bc8c7f59c064
(byte-compile-insert-header): Do not look for multibyte characters here.
Richard M. Stallman <rms@gnu.org>
parents:
22050
diff
changeset
|
1800 ;; 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
|
1801 ;; 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
|
1802 (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
|
1803 outbuffer)) |
757 | 1804 |
22136
bc8c7f59c064
(byte-compile-insert-header): Do not look for multibyte characters here.
Richard M. Stallman <rms@gnu.org>
parents:
22050
diff
changeset
|
1805 (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
|
1806 (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
|
1807 ;; 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
|
1808 (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
|
1809 (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
|
1810 (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
|
1811 (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
|
1812 ;; 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
|
1813 (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
|
1814 (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
|
1815 (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
|
1816 ;; 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
|
1817 (search-forward ";;;;;;;;;;") |
bc8c7f59c064
(byte-compile-insert-header): Do not look for multibyte characters here.
Richard M. Stallman <rms@gnu.org>
parents:
22050
diff
changeset
|
1818 (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
|
1819 |
bc8c7f59c064
(byte-compile-insert-header): Do not look for multibyte characters here.
Richard M. Stallman <rms@gnu.org>
parents:
22050
diff
changeset
|
1820 (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
|
1821 (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
|
1822 delta) |
bc8c7f59c064
(byte-compile-insert-header): Do not look for multibyte characters here.
Richard M. Stallman <rms@gnu.org>
parents:
22050
diff
changeset
|
1823 (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
|
1824 (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
|
1825 (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
|
1826 (point))) |
bc8c7f59c064
(byte-compile-insert-header): Do not look for multibyte characters here.
Richard M. Stallman <rms@gnu.org>
parents:
22050
diff
changeset
|
1827 (insert ";;; This file contains multibyte non-ASCII characters\n" |
bc8c7f59c064
(byte-compile-insert-header): Do not look for multibyte characters here.
Richard M. Stallman <rms@gnu.org>
parents:
22050
diff
changeset
|
1828 ";;; and therefore cannot be loaded into Emacs 19.\n") |
bc8c7f59c064
(byte-compile-insert-header): Do not look for multibyte characters here.
Richard M. Stallman <rms@gnu.org>
parents:
22050
diff
changeset
|
1829 ;; Replace "19" or "19.29" with "20", twice. |
bc8c7f59c064
(byte-compile-insert-header): Do not look for multibyte characters here.
Richard M. Stallman <rms@gnu.org>
parents:
22050
diff
changeset
|
1830 (re-search-forward "19\\(\\.[0-9]+\\)") |
bc8c7f59c064
(byte-compile-insert-header): Do not look for multibyte characters here.
Richard M. Stallman <rms@gnu.org>
parents:
22050
diff
changeset
|
1831 (replace-match "20") |
bc8c7f59c064
(byte-compile-insert-header): Do not look for multibyte characters here.
Richard M. Stallman <rms@gnu.org>
parents:
22050
diff
changeset
|
1832 (re-search-forward "19\\(\\.[0-9]+\\)") |
bc8c7f59c064
(byte-compile-insert-header): Do not look for multibyte characters here.
Richard M. Stallman <rms@gnu.org>
parents:
22050
diff
changeset
|
1833 (replace-match "20") |
bc8c7f59c064
(byte-compile-insert-header): Do not look for multibyte characters here.
Richard M. Stallman <rms@gnu.org>
parents:
22050
diff
changeset
|
1834 ;; 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
|
1835 ;; 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
|
1836 (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
|
1837 (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
|
1838 (widen) |
bc8c7f59c064
(byte-compile-insert-header): Do not look for multibyte characters here.
Richard M. Stallman <rms@gnu.org>
parents:
22050
diff
changeset
|
1839 (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
|
1840 |
12823
c1fcd8660aba
(byte-compile-insert-header): Use 19.29, not 19.28.90
Richard M. Stallman <rms@gnu.org>
parents:
12794
diff
changeset
|
1841 (defun byte-compile-insert-header (filename inbuffer outbuffer) |
c1fcd8660aba
(byte-compile-insert-header): Use 19.29, not 19.28.90
Richard M. Stallman <rms@gnu.org>
parents:
12794
diff
changeset
|
1842 (set-buffer inbuffer) |
15925
278440a92757
(byte-compile-insert-header): Clean up syntax
Richard M. Stallman <rms@gnu.org>
parents:
14766
diff
changeset
|
1843 (let ((dynamic-docstrings byte-compile-dynamic-docstrings) |
22136
bc8c7f59c064
(byte-compile-insert-header): Do not look for multibyte characters here.
Richard M. Stallman <rms@gnu.org>
parents:
22050
diff
changeset
|
1844 (dynamic byte-compile-dynamic)) |
12823
c1fcd8660aba
(byte-compile-insert-header): Use 19.29, not 19.28.90
Richard M. Stallman <rms@gnu.org>
parents:
12794
diff
changeset
|
1845 (set-buffer outbuffer) |
c1fcd8660aba
(byte-compile-insert-header): Use 19.29, not 19.28.90
Richard M. Stallman <rms@gnu.org>
parents:
12794
diff
changeset
|
1846 (goto-char 1) |
22047
678a1ed22116
(byte-compile-from-buffer):
Richard M. Stallman <rms@gnu.org>
parents:
22015
diff
changeset
|
1847 ;; The magic number of .elc files is ";ELC", or 0x3B454C43. After |
678a1ed22116
(byte-compile-from-buffer):
Richard M. Stallman <rms@gnu.org>
parents:
22015
diff
changeset
|
1848 ;; that is the file-format version number (18, 19 or 20) as a |
678a1ed22116
(byte-compile-from-buffer):
Richard M. Stallman <rms@gnu.org>
parents:
22015
diff
changeset
|
1849 ;; byte, followed by some nulls. The primary motivation for doing |
678a1ed22116
(byte-compile-from-buffer):
Richard M. Stallman <rms@gnu.org>
parents:
22015
diff
changeset
|
1850 ;; this is to get some binary characters up in the first line of |
678a1ed22116
(byte-compile-from-buffer):
Richard M. Stallman <rms@gnu.org>
parents:
22015
diff
changeset
|
1851 ;; the file so that `diff' will simply say "Binary files differ" |
678a1ed22116
(byte-compile-from-buffer):
Richard M. Stallman <rms@gnu.org>
parents:
22015
diff
changeset
|
1852 ;; instead of actually doing a diff of two .elc files. An extra |
678a1ed22116
(byte-compile-from-buffer):
Richard M. Stallman <rms@gnu.org>
parents:
22015
diff
changeset
|
1853 ;; benefit is that you can add this to /etc/magic: |
678a1ed22116
(byte-compile-from-buffer):
Richard M. Stallman <rms@gnu.org>
parents:
22015
diff
changeset
|
1854 |
12823
c1fcd8660aba
(byte-compile-insert-header): Use 19.29, not 19.28.90
Richard M. Stallman <rms@gnu.org>
parents:
12794
diff
changeset
|
1855 ;; 0 string ;ELC GNU Emacs Lisp compiled file, |
c1fcd8660aba
(byte-compile-insert-header): Use 19.29, not 19.28.90
Richard M. Stallman <rms@gnu.org>
parents:
12794
diff
changeset
|
1856 ;; >4 byte x version %d |
22047
678a1ed22116
(byte-compile-from-buffer):
Richard M. Stallman <rms@gnu.org>
parents:
22015
diff
changeset
|
1857 |
12823
c1fcd8660aba
(byte-compile-insert-header): Use 19.29, not 19.28.90
Richard M. Stallman <rms@gnu.org>
parents:
12794
diff
changeset
|
1858 (insert |
c1fcd8660aba
(byte-compile-insert-header): Use 19.29, not 19.28.90
Richard M. Stallman <rms@gnu.org>
parents:
12794
diff
changeset
|
1859 ";ELC" |
22047
678a1ed22116
(byte-compile-from-buffer):
Richard M. Stallman <rms@gnu.org>
parents:
22015
diff
changeset
|
1860 (if (byte-compile-version-cond byte-compile-compatibility) 18 20) |
12823
c1fcd8660aba
(byte-compile-insert-header): Use 19.29, not 19.28.90
Richard M. Stallman <rms@gnu.org>
parents:
12794
diff
changeset
|
1861 "\000\000\000\n" |
c1fcd8660aba
(byte-compile-insert-header): Use 19.29, not 19.28.90
Richard M. Stallman <rms@gnu.org>
parents:
12794
diff
changeset
|
1862 ) |
15925
278440a92757
(byte-compile-insert-header): Clean up syntax
Richard M. Stallman <rms@gnu.org>
parents:
14766
diff
changeset
|
1863 (insert ";;; Compiled by " |
12823
c1fcd8660aba
(byte-compile-insert-header): Use 19.29, not 19.28.90
Richard M. Stallman <rms@gnu.org>
parents:
12794
diff
changeset
|
1864 (or (and (boundp 'user-mail-address) user-mail-address) |
c1fcd8660aba
(byte-compile-insert-header): Use 19.29, not 19.28.90
Richard M. Stallman <rms@gnu.org>
parents:
12794
diff
changeset
|
1865 (concat (user-login-name) "@" (system-name))) |
c1fcd8660aba
(byte-compile-insert-header): Use 19.29, not 19.28.90
Richard M. Stallman <rms@gnu.org>
parents:
12794
diff
changeset
|
1866 " on " |
c1fcd8660aba
(byte-compile-insert-header): Use 19.29, not 19.28.90
Richard M. Stallman <rms@gnu.org>
parents:
12794
diff
changeset
|
1867 (current-time-string) "\n;;; from file " filename "\n") |
15925
278440a92757
(byte-compile-insert-header): Clean up syntax
Richard M. Stallman <rms@gnu.org>
parents:
14766
diff
changeset
|
1868 (insert ";;; in Emacs version " emacs-version "\n") |
54770
e8824c4f5f7e
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-196
Miles Bader <miles@gnu.org>
parents:
54497
diff
changeset
|
1869 (insert ";;; " |
12823
c1fcd8660aba
(byte-compile-insert-header): Use 19.29, not 19.28.90
Richard M. Stallman <rms@gnu.org>
parents:
12794
diff
changeset
|
1870 (cond |
15925
278440a92757
(byte-compile-insert-header): Clean up syntax
Richard M. Stallman <rms@gnu.org>
parents:
14766
diff
changeset
|
1871 ((eq byte-optimize 'source) "with source-level optimization only") |
278440a92757
(byte-compile-insert-header): Clean up syntax
Richard M. Stallman <rms@gnu.org>
parents:
14766
diff
changeset
|
1872 ((eq byte-optimize 'byte) "with byte-level optimization only") |
278440a92757
(byte-compile-insert-header): Clean up syntax
Richard M. Stallman <rms@gnu.org>
parents:
14766
diff
changeset
|
1873 (byte-optimize "with all optimizations") |
278440a92757
(byte-compile-insert-header): Clean up syntax
Richard M. Stallman <rms@gnu.org>
parents:
14766
diff
changeset
|
1874 (t "without optimization")) |
12823
c1fcd8660aba
(byte-compile-insert-header): Use 19.29, not 19.28.90
Richard M. Stallman <rms@gnu.org>
parents:
12794
diff
changeset
|
1875 (if (byte-compile-version-cond byte-compile-compatibility) |
c1fcd8660aba
(byte-compile-insert-header): Use 19.29, not 19.28.90
Richard M. Stallman <rms@gnu.org>
parents:
12794
diff
changeset
|
1876 "; compiled with Emacs 18 compatibility.\n" |
c1fcd8660aba
(byte-compile-insert-header): Use 19.29, not 19.28.90
Richard M. Stallman <rms@gnu.org>
parents:
12794
diff
changeset
|
1877 ".\n")) |
15925
278440a92757
(byte-compile-insert-header): Clean up syntax
Richard M. Stallman <rms@gnu.org>
parents:
14766
diff
changeset
|
1878 (if dynamic |
278440a92757
(byte-compile-insert-header): Clean up syntax
Richard M. Stallman <rms@gnu.org>
parents:
14766
diff
changeset
|
1879 (insert ";;; Function definitions are lazy-loaded.\n")) |
22136
bc8c7f59c064
(byte-compile-insert-header): Do not look for multibyte characters here.
Richard M. Stallman <rms@gnu.org>
parents:
22050
diff
changeset
|
1880 (if (not (byte-compile-version-cond byte-compile-compatibility)) |
22047
678a1ed22116
(byte-compile-from-buffer):
Richard M. Stallman <rms@gnu.org>
parents:
22015
diff
changeset
|
1881 (let (intro-string minimum-version) |
678a1ed22116
(byte-compile-from-buffer):
Richard M. Stallman <rms@gnu.org>
parents:
22015
diff
changeset
|
1882 ;; Figure out which Emacs version to require, |
678a1ed22116
(byte-compile-from-buffer):
Richard M. Stallman <rms@gnu.org>
parents:
22015
diff
changeset
|
1883 ;; and what comment to use to explain why. |
22136
bc8c7f59c064
(byte-compile-insert-header): Do not look for multibyte characters here.
Richard M. Stallman <rms@gnu.org>
parents:
22050
diff
changeset
|
1884 ;; Note that this fails to take account of whether |
bc8c7f59c064
(byte-compile-insert-header): Do not look for multibyte characters here.
Richard M. Stallman <rms@gnu.org>
parents:
22050
diff
changeset
|
1885 ;; the buffer contains multibyte characters. We may have to |
bc8c7f59c064
(byte-compile-insert-header): Do not look for multibyte characters here.
Richard M. Stallman <rms@gnu.org>
parents:
22050
diff
changeset
|
1886 ;; compensate at the end in 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
|
1887 (if dynamic-docstrings |
22047
678a1ed22116
(byte-compile-from-buffer):
Richard M. Stallman <rms@gnu.org>
parents:
22015
diff
changeset
|
1888 (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
|
1889 ";;; 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
|
1890 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
|
1891 (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
|
1892 ";;; 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
|
1893 minimum-version "19")) |
22047
678a1ed22116
(byte-compile-from-buffer):
Richard M. Stallman <rms@gnu.org>
parents:
22015
diff
changeset
|
1894 ;; Now insert the comment and the error check. |
678a1ed22116
(byte-compile-from-buffer):
Richard M. Stallman <rms@gnu.org>
parents:
22015
diff
changeset
|
1895 (insert |
22136
bc8c7f59c064
(byte-compile-insert-header): Do not look for multibyte characters here.
Richard M. Stallman <rms@gnu.org>
parents:
22050
diff
changeset
|
1896 "\n" |
22047
678a1ed22116
(byte-compile-from-buffer):
Richard M. Stallman <rms@gnu.org>
parents:
22015
diff
changeset
|
1897 intro-string |
678a1ed22116
(byte-compile-from-buffer):
Richard M. Stallman <rms@gnu.org>
parents:
22015
diff
changeset
|
1898 ;; 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
|
1899 ;; 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
|
1900 "(if (and (boundp 'emacs-version)\n" |
22047
678a1ed22116
(byte-compile-from-buffer):
Richard M. Stallman <rms@gnu.org>
parents:
22015
diff
changeset
|
1901 ;; 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
|
1902 ;; don't try to check the version number. |
678a1ed22116
(byte-compile-from-buffer):
Richard M. Stallman <rms@gnu.org>
parents:
22015
diff
changeset
|
1903 "\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
|
1904 "\t (or (and (boundp 'epoch::version) epoch::version)\n" |
678a1ed22116
(byte-compile-from-buffer):
Richard M. Stallman <rms@gnu.org>
parents:
22015
diff
changeset
|
1905 (format "\t (string-lessp emacs-version \"%s\")))\n" |
678a1ed22116
(byte-compile-from-buffer):
Richard M. Stallman <rms@gnu.org>
parents:
22015
diff
changeset
|
1906 minimum-version) |
678a1ed22116
(byte-compile-from-buffer):
Richard M. Stallman <rms@gnu.org>
parents:
22015
diff
changeset
|
1907 " (error \"`" |
678a1ed22116
(byte-compile-from-buffer):
Richard M. Stallman <rms@gnu.org>
parents:
22015
diff
changeset
|
1908 ;; prin1-to-string is used to quote backslashes. |
678a1ed22116
(byte-compile-from-buffer):
Richard M. Stallman <rms@gnu.org>
parents:
22015
diff
changeset
|
1909 (substring (prin1-to-string (file-name-nondirectory filename)) |
678a1ed22116
(byte-compile-from-buffer):
Richard M. Stallman <rms@gnu.org>
parents:
22015
diff
changeset
|
1910 1 -1) |
678a1ed22116
(byte-compile-from-buffer):
Richard M. Stallman <rms@gnu.org>
parents:
22015
diff
changeset
|
1911 (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
|
1912 minimum-version) |
bc8c7f59c064
(byte-compile-insert-header): Do not look for multibyte characters here.
Richard M. Stallman <rms@gnu.org>
parents:
22050
diff
changeset
|
1913 ;; 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
|
1914 ;; 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
|
1915 ;; constant for the actual compiled code. |
bc8c7f59c064
(byte-compile-insert-header): Do not look for multibyte characters here.
Richard M. Stallman <rms@gnu.org>
parents:
22050
diff
changeset
|
1916 ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;\n\n")) |
22047
678a1ed22116
(byte-compile-from-buffer):
Richard M. Stallman <rms@gnu.org>
parents:
22015
diff
changeset
|
1917 ;; 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
|
1918 (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
|
1919 (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
|
1920 (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
|
1921 (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
|
1922 (insert "(or (boundp 'current-load-list) (setq current-load-list nil))\n" |
22047
678a1ed22116
(byte-compile-from-buffer):
Richard M. Stallman <rms@gnu.org>
parents:
22015
diff
changeset
|
1923 "\n")))) |
757 | 1924 |
1925 (defun byte-compile-output-file-form (form) | |
1926 ;; 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
|
1927 ;; 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
|
1928 ;; 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
|
1929 ;; 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
|
1930 ;; 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
|
1931 ;; it here. |
19637
baaf02a51ba2
(byte-compile-output-file-form): Handle custom-declare-variable.
Richard M. Stallman <rms@gnu.org>
parents:
18960
diff
changeset
|
1932 (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
|
1933 custom-declare-variable)) |
757 | 1934 (stringp (nth 3 form))) |
10235
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1935 (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
|
1936 (memq (car form) |
baaf02a51ba2
(byte-compile-output-file-form): Handle custom-declare-variable.
Richard M. Stallman <rms@gnu.org>
parents:
18960
diff
changeset
|
1937 '(autoload custom-declare-variable))) |
757 | 1938 (let ((print-escape-newlines t) |
12552
176c42cc7eeb
(byte-compile-output-file-form): Bind print-length
Karl Heuer <kwzh@gnu.org>
parents:
12511
diff
changeset
|
1939 (print-length nil) |
176c42cc7eeb
(byte-compile-output-file-form): Bind print-length
Karl Heuer <kwzh@gnu.org>
parents:
12511
diff
changeset
|
1940 (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
|
1941 (print-quoted t) |
d4b674c08fe1
(byte-compile-output-file-form): Bind print-quoted and print-gensym to t
Erik Naggum <erik@naggum.no>
parents:
16149
diff
changeset
|
1942 (print-gensym t)) |
757 | 1943 (princ "\n" outbuffer) |
1944 (prin1 form outbuffer) | |
1945 nil))) | |
1946 | |
50570
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
1947 (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
|
1948 |
10235
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1949 (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
|
1950 "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
|
1951 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
|
1952 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
|
1953 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
|
1954 of the function bytecode string. In that case, |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
1955 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
|
1956 together, for lazy loading. |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
1957 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
|
1958 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
|
1959 `autoload' and `custom-declare-variable' need that." |
12794
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
1960 ;; We need to examine byte-compile-dynamic-docstrings |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
1961 ;; 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
|
1962 (let ((dynamic-docstrings byte-compile-dynamic-docstrings)) |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
1963 (set-buffer |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
1964 (prog1 (current-buffer) |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
1965 (set-buffer outbuffer) |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
1966 (let (position) |
10235
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1967 |
12794
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
1968 ;; Insert the doc string, and make it a comment with #@LENGTH. |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
1969 (and (>= (nth 1 info) 0) |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
1970 dynamic-docstrings |
13791
1feec098c24d
(byte-compile-output-docform): Don't do dynamic doc
Karl Heuer <kwzh@gnu.org>
parents:
13474
diff
changeset
|
1971 (not byte-compile-compatibility) |
12794
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
1972 (progn |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
1973 ;; Make the doc string start at beginning of line |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
1974 ;; for make-docfile's sake. |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
1975 (insert "\n") |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
1976 (setq position |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
1977 (byte-compile-output-as-comment |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
1978 (nth (nth 1 info) form) nil)) |
46003
503e1f14ba3d
(byte-compile-callargs-warn):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45842
diff
changeset
|
1979 (setq position (- (position-bytes position) (point-min) -1)) |
12794
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
1980 ;; If the doc string starts with * (a user variable), |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
1981 ;; negate POSITION. |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
1982 (if (and (stringp (nth (nth 1 info) form)) |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
1983 (> (length (nth (nth 1 info) form)) 0) |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
1984 (eq (aref (nth (nth 1 info) form) 0) ?*)) |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
1985 (setq position (- position))))) |
10235
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1986 |
12794
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
1987 (if preface |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
1988 (progn |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
1989 (insert preface) |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
1990 (prin1 name outbuffer))) |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
1991 (insert (car info)) |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
1992 (let ((print-escape-newlines t) |
16159
d4b674c08fe1
(byte-compile-output-file-form): Bind print-quoted and print-gensym to t
Erik Naggum <erik@naggum.no>
parents:
16149
diff
changeset
|
1993 (print-quoted t) |
25636
ebc88533212e
(byte-compile-output-docform): Bind print-gensym-alist for compatibility,
Richard M. Stallman <rms@gnu.org>
parents:
25635
diff
changeset
|
1994 ;; For compatibility with code before print-circle, |
ebc88533212e
(byte-compile-output-docform): Bind print-gensym-alist for compatibility,
Richard M. Stallman <rms@gnu.org>
parents:
25635
diff
changeset
|
1995 ;; use a cons cell to say that we want |
ebc88533212e
(byte-compile-output-docform): Bind print-gensym-alist for compatibility,
Richard M. Stallman <rms@gnu.org>
parents:
25635
diff
changeset
|
1996 ;; print-gensym-alist not to be cleared |
ebc88533212e
(byte-compile-output-docform): Bind print-gensym-alist for compatibility,
Richard M. Stallman <rms@gnu.org>
parents:
25635
diff
changeset
|
1997 ;; between calls to print functions. |
ebc88533212e
(byte-compile-output-docform): Bind print-gensym-alist for compatibility,
Richard M. Stallman <rms@gnu.org>
parents:
25635
diff
changeset
|
1998 (print-gensym '(t)) |
50570
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
1999 print-gensym-alist ; was used before print-circle existed. |
25635
f39d91949fc4
(byte-compile-output-docform): Bind print-continuous-numbering and
Richard M. Stallman <rms@gnu.org>
parents:
24576
diff
changeset
|
2000 (print-continuous-numbering t) |
f39d91949fc4
(byte-compile-output-docform): Bind print-continuous-numbering and
Richard M. Stallman <rms@gnu.org>
parents:
24576
diff
changeset
|
2001 print-number-table |
12794
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
2002 (index 0)) |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
2003 (prin1 (car form) outbuffer) |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
2004 (while (setq form (cdr form)) |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
2005 (setq index (1+ index)) |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
2006 (insert " ") |
47531
e7f753af9ceb
(byte-compile-output-docform): Don't make the definition dynamic if it
Richard M. Stallman <rms@gnu.org>
parents:
47344
diff
changeset
|
2007 (cond ((and (numberp specindex) (= index specindex) |
e7f753af9ceb
(byte-compile-output-docform): Don't make the definition dynamic if it
Richard M. Stallman <rms@gnu.org>
parents:
47344
diff
changeset
|
2008 ;; Don't handle the definition dynamically |
e7f753af9ceb
(byte-compile-output-docform): Don't make the definition dynamic if it
Richard M. Stallman <rms@gnu.org>
parents:
47344
diff
changeset
|
2009 ;; if it refers (or might refer) |
e7f753af9ceb
(byte-compile-output-docform): Don't make the definition dynamic if it
Richard M. Stallman <rms@gnu.org>
parents:
47344
diff
changeset
|
2010 ;; to objects already output |
e7f753af9ceb
(byte-compile-output-docform): Don't make the definition dynamic if it
Richard M. Stallman <rms@gnu.org>
parents:
47344
diff
changeset
|
2011 ;; (for instance, gensyms in the arg list). |
e7f753af9ceb
(byte-compile-output-docform): Don't make the definition dynamic if it
Richard M. Stallman <rms@gnu.org>
parents:
47344
diff
changeset
|
2012 (let (non-nil) |
e7f753af9ceb
(byte-compile-output-docform): Don't make the definition dynamic if it
Richard M. Stallman <rms@gnu.org>
parents:
47344
diff
changeset
|
2013 (dotimes (i (length print-number-table)) |
e7f753af9ceb
(byte-compile-output-docform): Don't make the definition dynamic if it
Richard M. Stallman <rms@gnu.org>
parents:
47344
diff
changeset
|
2014 (if (aref print-number-table i) |
e7f753af9ceb
(byte-compile-output-docform): Don't make the definition dynamic if it
Richard M. Stallman <rms@gnu.org>
parents:
47344
diff
changeset
|
2015 (setq non-nil t))) |
e7f753af9ceb
(byte-compile-output-docform): Don't make the definition dynamic if it
Richard M. Stallman <rms@gnu.org>
parents:
47344
diff
changeset
|
2016 (not non-nil))) |
e7f753af9ceb
(byte-compile-output-docform): Don't make the definition dynamic if it
Richard M. Stallman <rms@gnu.org>
parents:
47344
diff
changeset
|
2017 ;; Output the byte code and constants specially |
e7f753af9ceb
(byte-compile-output-docform): Don't make the definition dynamic if it
Richard M. Stallman <rms@gnu.org>
parents:
47344
diff
changeset
|
2018 ;; for lazy dynamic loading. |
12794
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
2019 (let ((position |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
2020 (byte-compile-output-as-comment |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
2021 (cons (car form) (nth 1 form)) |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
2022 t))) |
46003
503e1f14ba3d
(byte-compile-callargs-warn):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45842
diff
changeset
|
2023 (setq position (- (position-bytes position) (point-min) -1)) |
12794
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
2024 (princ (format "(#$ . %d) nil" position) outbuffer) |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
2025 (setq form (cdr form)) |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
2026 (setq index (1+ index)))) |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
2027 ((= index (nth 1 info)) |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
2028 (if position |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
2029 (princ (format (if quoted "'(#$ . %d)" "(#$ . %d)") |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
2030 position) |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
2031 outbuffer) |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
2032 (let ((print-escape-newlines nil)) |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
2033 (goto-char (prog1 (1+ (point)) |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
2034 (prin1 (car form) outbuffer))) |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
2035 (insert "\\\n") |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
2036 (goto-char (point-max))))) |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
2037 (t |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
2038 (prin1 (car form) outbuffer))))) |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
2039 (insert (nth 2 info)))))) |
757 | 2040 nil) |
2041 | |
2042 (defun byte-compile-keep-pending (form &optional handler) | |
2043 (if (memq byte-optimize '(t source)) | |
2044 (setq form (byte-optimize-form form t))) | |
2045 (if handler | |
2046 (let ((for-effect t)) | |
2047 ;; To avoid consing up monstrously large forms at load time, we split | |
2048 ;; the output regularly. | |
3954
cac16b165691
(byte-compile-keep-pending): Handle fset like defalias.
Richard M. Stallman <rms@gnu.org>
parents:
3948
diff
changeset
|
2049 (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
|
2050 (nthcdr 300 byte-compile-output) |
757 | 2051 (byte-compile-flush-pending)) |
2052 (funcall handler form) | |
2053 (if for-effect | |
2054 (byte-compile-discard))) | |
2055 (byte-compile-form form t)) | |
2056 nil) | |
2057 | |
2058 (defun byte-compile-flush-pending () | |
2059 (if byte-compile-output | |
2060 (let ((form (byte-compile-out-toplevel t 'file))) | |
2061 (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
|
2062 (mapc 'byte-compile-output-file-form (cdr form))) |
757 | 2063 (form |
2064 (byte-compile-output-file-form form))) | |
2065 (setq byte-compile-constants nil | |
2066 byte-compile-variables nil | |
2067 byte-compile-depth 0 | |
2068 byte-compile-maxdepth 0 | |
2069 byte-compile-output nil)))) | |
2070 | |
2071 (defun byte-compile-file-form (form) | |
2072 (let ((byte-compile-current-form nil) ; close over this for warnings. | |
2073 handler) | |
2074 (cond | |
2075 ((not (consp form)) | |
2076 (byte-compile-keep-pending form)) | |
2077 ((and (symbolp (car form)) | |
2078 (setq handler (get (car form) 'byte-hunk-handler))) | |
2079 (cond ((setq form (funcall handler form)) | |
2080 (byte-compile-flush-pending) | |
2081 (byte-compile-output-file-form form)))) | |
2082 ((eq form (setq form (macroexpand form byte-compile-macro-environment))) | |
2083 (byte-compile-keep-pending form)) | |
2084 (t | |
2085 (byte-compile-file-form form))))) | |
2086 | |
2087 ;; Functions and variables with doc strings must be output separately, | |
2088 ;; so make-docfile can recognise them. Most other things can be output | |
2089 ;; as byte-code. | |
2090 | |
2091 (put 'defsubst 'byte-hunk-handler 'byte-compile-file-form-defsubst) | |
2092 (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
|
2093 (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
|
2094 (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
|
2095 (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
|
2096 (nth 1 form))) |
757 | 2097 (byte-compile-file-form |
2098 (macroexpand form byte-compile-macro-environment)) | |
2099 ;; Return nil so the form is not output twice. | |
2100 nil) | |
2101 | |
2102 (put 'autoload 'byte-hunk-handler 'byte-compile-file-form-autoload) | |
2103 (defun byte-compile-file-form-autoload (form) | |
2104 (and (let ((form form)) | |
2105 (while (if (setq form (cdr form)) (byte-compile-constp (car form)))) | |
2106 (null form)) ;Constants only | |
2107 (eval (nth 5 form)) ;Macro | |
2108 (eval form)) ;Define the autoload. | |
28402 | 2109 ;; 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
|
2110 (if (and (consp (nth 1 form)) |
28402 | 2111 (eq (car (nth 1 form)) 'quote) |
2112 (consp (cdr (nth 1 form))) | |
2113 (symbolp (nth 1 (nth 1 form)))) | |
2114 (add-to-list 'byte-compile-function-environment | |
2115 (cons (nth 1 (nth 1 form)) | |
37909
3d650ae7e609
(byte-compile-file-form-autoload): Use the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35145
diff
changeset
|
2116 (cons 'autoload (cdr (cdr form)))))) |
757 | 2117 (if (stringp (nth 3 form)) |
2118 form | |
2119 ;; No doc string, so we can compile this as a normal form. | |
2120 (byte-compile-keep-pending form 'byte-compile-normal-call))) | |
2121 | |
2122 (put 'defvar 'byte-hunk-handler 'byte-compile-file-form-defvar) | |
2123 (put 'defconst 'byte-hunk-handler 'byte-compile-file-form-defvar) | |
2124 (defun byte-compile-file-form-defvar (form) | |
2125 (if (null (nth 3 form)) | |
2126 ;; Since there is no doc string, we can compile this as a normal form, | |
2127 ;; and not do a file-boundary. | |
2128 (byte-compile-keep-pending form) | |
50570
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
2129 (when (memq 'free-vars byte-compile-warnings) |
50573
e80e4ccf1bfc
(byte-compile-file-form-defvar, byte-compile-defvar):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50570
diff
changeset
|
2130 (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
|
2131 (if (eq (car form) 'defconst) |
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
2132 (push (nth 1 form) byte-compile-const-variables))) |
757 | 2133 (cond ((consp (nth 2 form)) |
2134 (setq form (copy-sequence form)) | |
2135 (setcar (cdr (cdr form)) | |
2136 (byte-compile-top-level (nth 2 form) nil 'file)))) | |
2137 form)) | |
2138 | |
17704
00ed998f90d3
(byte-compile-file-form-custom-declare-variable): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17077
diff
changeset
|
2139 (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
|
2140 '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
|
2141 (defun byte-compile-file-form-custom-declare-variable (form) |
50570
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
2142 (when (memq 'free-vars byte-compile-warnings) |
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
2143 (push (nth 1 (nth 1 form)) byte-compile-bound-variables)) |
49440
3f0a84732a62
(byte-compile-file-form-custom-declare-variable):
Richard M. Stallman <rms@gnu.org>
parents:
48822
diff
changeset
|
2144 (let ((tail (nthcdr 4 form))) |
3f0a84732a62
(byte-compile-file-form-custom-declare-variable):
Richard M. Stallman <rms@gnu.org>
parents:
48822
diff
changeset
|
2145 (while tail |
3f0a84732a62
(byte-compile-file-form-custom-declare-variable):
Richard M. Stallman <rms@gnu.org>
parents:
48822
diff
changeset
|
2146 ;; If there are any (function (lambda ...)) expressions, compile |
3f0a84732a62
(byte-compile-file-form-custom-declare-variable):
Richard M. Stallman <rms@gnu.org>
parents:
48822
diff
changeset
|
2147 ;; those functions. |
3f0a84732a62
(byte-compile-file-form-custom-declare-variable):
Richard M. Stallman <rms@gnu.org>
parents:
48822
diff
changeset
|
2148 (if (and (consp (car tail)) |
3f0a84732a62
(byte-compile-file-form-custom-declare-variable):
Richard M. Stallman <rms@gnu.org>
parents:
48822
diff
changeset
|
2149 (eq (car (car tail)) 'function) |
3f0a84732a62
(byte-compile-file-form-custom-declare-variable):
Richard M. Stallman <rms@gnu.org>
parents:
48822
diff
changeset
|
2150 (consp (nth 1 (car tail)))) |
3f0a84732a62
(byte-compile-file-form-custom-declare-variable):
Richard M. Stallman <rms@gnu.org>
parents:
48822
diff
changeset
|
2151 (setcar tail (byte-compile-lambda (nth 1 (car tail)))) |
3f0a84732a62
(byte-compile-file-form-custom-declare-variable):
Richard M. Stallman <rms@gnu.org>
parents:
48822
diff
changeset
|
2152 ;; Likewise for a bare lambda. |
3f0a84732a62
(byte-compile-file-form-custom-declare-variable):
Richard M. Stallman <rms@gnu.org>
parents:
48822
diff
changeset
|
2153 (if (and (consp (car tail)) |
3f0a84732a62
(byte-compile-file-form-custom-declare-variable):
Richard M. Stallman <rms@gnu.org>
parents:
48822
diff
changeset
|
2154 (eq (car (car tail)) 'lambda)) |
3f0a84732a62
(byte-compile-file-form-custom-declare-variable):
Richard M. Stallman <rms@gnu.org>
parents:
48822
diff
changeset
|
2155 (setcar tail (byte-compile-lambda (car tail))))) |
3f0a84732a62
(byte-compile-file-form-custom-declare-variable):
Richard M. Stallman <rms@gnu.org>
parents:
48822
diff
changeset
|
2156 (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
|
2157 form) |
00ed998f90d3
(byte-compile-file-form-custom-declare-variable): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17077
diff
changeset
|
2158 |
57518
25bf13fe1c10
(byte-compile-eval): Don't process
Richard M. Stallman <rms@gnu.org>
parents:
57004
diff
changeset
|
2159 (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
|
2160 (defun byte-compile-file-form-require (form) |
25bf13fe1c10
(byte-compile-eval): Don't process
Richard M. Stallman <rms@gnu.org>
parents:
57004
diff
changeset
|
2161 (let ((old-load-list current-load-list) |
25bf13fe1c10
(byte-compile-eval): Don't process
Richard M. Stallman <rms@gnu.org>
parents:
57004
diff
changeset
|
2162 (args (mapcar 'eval (cdr form)))) |
25bf13fe1c10
(byte-compile-eval): Don't process
Richard M. Stallman <rms@gnu.org>
parents:
57004
diff
changeset
|
2163 (apply 'require args) |
25bf13fe1c10
(byte-compile-eval): Don't process
Richard M. Stallman <rms@gnu.org>
parents:
57004
diff
changeset
|
2164 ;; Detech (require 'cl) in a way that works even if cl is already loaded. |
25bf13fe1c10
(byte-compile-eval): Don't process
Richard M. Stallman <rms@gnu.org>
parents:
57004
diff
changeset
|
2165 (if (member (car args) '("cl" cl)) |
25bf13fe1c10
(byte-compile-eval): Don't process
Richard M. Stallman <rms@gnu.org>
parents:
57004
diff
changeset
|
2166 (setq byte-compile-warnings |
25bf13fe1c10
(byte-compile-eval): Don't process
Richard M. Stallman <rms@gnu.org>
parents:
57004
diff
changeset
|
2167 (remq 'cl-functions byte-compile-warnings)))) |
757 | 2168 (byte-compile-keep-pending form 'byte-compile-normal-call)) |
2169 | |
2170 (put 'progn 'byte-hunk-handler 'byte-compile-file-form-progn) | |
2171 (put 'prog1 'byte-hunk-handler 'byte-compile-file-form-progn) | |
2172 (put 'prog2 'byte-hunk-handler 'byte-compile-file-form-progn) | |
2173 (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
|
2174 (mapc 'byte-compile-file-form (cdr form)) |
757 | 2175 ;; Return nil so the forms are not output twice. |
2176 nil) | |
2177 | |
2178 ;; This handler is not necessary, but it makes the output from dont-compile | |
2179 ;; and similar macros cleaner. | |
2180 (put 'eval 'byte-hunk-handler 'byte-compile-file-form-eval) | |
2181 (defun byte-compile-file-form-eval (form) | |
2182 (if (eq (car-safe (nth 1 form)) 'quote) | |
2183 (nth 1 (nth 1 form)) | |
2184 (byte-compile-keep-pending form))) | |
2185 | |
2186 (put 'defun 'byte-hunk-handler 'byte-compile-file-form-defun) | |
2187 (defun byte-compile-file-form-defun (form) | |
2188 (byte-compile-file-form-defmumble form nil)) | |
2189 | |
2190 (put 'defmacro 'byte-hunk-handler 'byte-compile-file-form-defmacro) | |
2191 (defun byte-compile-file-form-defmacro (form) | |
2192 (byte-compile-file-form-defmumble form t)) | |
2193 | |
2194 (defun byte-compile-file-form-defmumble (form macrop) | |
2195 (let* ((name (car (cdr form))) | |
2196 (this-kind (if macrop 'byte-compile-macro-environment | |
2197 'byte-compile-function-environment)) | |
2198 (that-kind (if macrop 'byte-compile-function-environment | |
2199 'byte-compile-macro-environment)) | |
2200 (this-one (assq name (symbol-value this-kind))) | |
2201 (that-one (assq name (symbol-value that-kind))) | |
2202 (byte-compile-free-references nil) | |
2203 (byte-compile-free-assignments nil)) | |
45558
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
2204 (byte-compile-set-symbol-position name) |
757 | 2205 ;; When a function or macro is defined, add it to the call tree so that |
2206 ;; we can tell when functions are not used. | |
2207 (if byte-compile-generate-call-tree | |
2208 (or (assq name byte-compile-call-tree) | |
2209 (setq byte-compile-call-tree | |
2210 (cons (list name nil nil) byte-compile-call-tree)))) | |
2211 | |
2212 (setq byte-compile-current-form name) ; for warnings | |
2213 (if (memq 'redefine byte-compile-warnings) | |
2214 (byte-compile-arglist-warn form macrop)) | |
2215 (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
|
2216 (message "Compiling %s... (%s)" (or filename "") (nth 1 form))) |
757 | 2217 (cond (that-one |
2218 (if (and (memq 'redefine byte-compile-warnings) | |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
2219 ;; don't warn when compiling the stubs in byte-run... |
757 | 2220 (not (assq (nth 1 form) |
2221 byte-compile-initial-macro-environment))) | |
2222 (byte-compile-warn | |
56082
36284d653673
Put `...' around symbols in warning messages.
Richard M. Stallman <rms@gnu.org>
parents:
55694
diff
changeset
|
2223 "`%s' defined multiple times, as both function and macro" |
757 | 2224 (nth 1 form))) |
2225 (setcdr that-one nil)) | |
2226 (this-one | |
45558
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
2227 (when (and (memq 'redefine byte-compile-warnings) |
757 | 2228 ;; hack: don't warn when compiling the magic internal |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
2229 ;; byte-compiler macros in byte-run.el... |
757 | 2230 (not (assq (nth 1 form) |
2231 byte-compile-initial-macro-environment))) | |
56082
36284d653673
Put `...' around symbols in warning messages.
Richard M. Stallman <rms@gnu.org>
parents:
55694
diff
changeset
|
2232 (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
|
2233 (if macrop "macro" "function") |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
2234 (nth 1 form)))) |
757 | 2235 ((and (fboundp name) |
2236 (eq (car-safe (symbol-function name)) | |
2237 (if macrop 'lambda 'macro))) | |
45558
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
2238 (when (memq 'redefine byte-compile-warnings) |
56082
36284d653673
Put `...' around symbols in warning messages.
Richard M. Stallman <rms@gnu.org>
parents:
55694
diff
changeset
|
2239 (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
|
2240 (if macrop "function" "macro") |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
2241 (nth 1 form) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
2242 (if macrop "macro" "function"))) |
757 | 2243 ;; shadow existing definition |
2244 (set this-kind | |
2245 (cons (cons name nil) (symbol-value this-kind)))) | |
2246 ) | |
2247 (let ((body (nthcdr 3 form))) | |
45558
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
2248 (when (and (stringp (car body)) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
2249 (symbolp (car-safe (cdr-safe body))) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
2250 (car-safe (cdr-safe body)) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
2251 (stringp (car-safe (cdr-safe (cdr-safe body))))) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
2252 (byte-compile-set-symbol-position (nth 1 form)) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
2253 (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
|
2254 (nth 1 form)))) |
47912 | 2255 |
44130
a9c023f8b14b
(byte-compile-file-form-defmumble):
Gerd Moellmann <gerd@gnu.org>
parents:
44103
diff
changeset
|
2256 ;; Generate code for declarations in macro definitions. |
a9c023f8b14b
(byte-compile-file-form-defmumble):
Gerd Moellmann <gerd@gnu.org>
parents:
44103
diff
changeset
|
2257 ;; Remove declarations from the body of the macro definition. |
a9c023f8b14b
(byte-compile-file-form-defmumble):
Gerd Moellmann <gerd@gnu.org>
parents:
44103
diff
changeset
|
2258 (when macrop |
a9c023f8b14b
(byte-compile-file-form-defmumble):
Gerd Moellmann <gerd@gnu.org>
parents:
44103
diff
changeset
|
2259 (let ((tail (nthcdr 2 form))) |
a9c023f8b14b
(byte-compile-file-form-defmumble):
Gerd Moellmann <gerd@gnu.org>
parents:
44103
diff
changeset
|
2260 (when (stringp (car (cdr tail))) |
a9c023f8b14b
(byte-compile-file-form-defmumble):
Gerd Moellmann <gerd@gnu.org>
parents:
44103
diff
changeset
|
2261 (setq tail (cdr tail))) |
a9c023f8b14b
(byte-compile-file-form-defmumble):
Gerd Moellmann <gerd@gnu.org>
parents:
44103
diff
changeset
|
2262 (while (and (consp (car (cdr tail))) |
a9c023f8b14b
(byte-compile-file-form-defmumble):
Gerd Moellmann <gerd@gnu.org>
parents:
44103
diff
changeset
|
2263 (eq (car (car (cdr tail))) 'declare)) |
a9c023f8b14b
(byte-compile-file-form-defmumble):
Gerd Moellmann <gerd@gnu.org>
parents:
44103
diff
changeset
|
2264 (let ((declaration (car (cdr tail)))) |
a9c023f8b14b
(byte-compile-file-form-defmumble):
Gerd Moellmann <gerd@gnu.org>
parents:
44103
diff
changeset
|
2265 (setcdr tail (cdr (cdr tail))) |
a9c023f8b14b
(byte-compile-file-form-defmumble):
Gerd Moellmann <gerd@gnu.org>
parents:
44103
diff
changeset
|
2266 (princ `(if macro-declaration-function |
a9c023f8b14b
(byte-compile-file-form-defmumble):
Gerd Moellmann <gerd@gnu.org>
parents:
44103
diff
changeset
|
2267 (funcall macro-declaration-function |
a9c023f8b14b
(byte-compile-file-form-defmumble):
Gerd Moellmann <gerd@gnu.org>
parents:
44103
diff
changeset
|
2268 ',name ',declaration)) |
a9c023f8b14b
(byte-compile-file-form-defmumble):
Gerd Moellmann <gerd@gnu.org>
parents:
44103
diff
changeset
|
2269 outbuffer))))) |
47912 | 2270 |
757 | 2271 (let* ((new-one (byte-compile-lambda (cons 'lambda (nthcdr 2 form)))) |
2272 (code (byte-compile-byte-code-maker new-one))) | |
2273 (if this-one | |
2274 (setcdr this-one new-one) | |
2275 (set this-kind | |
2276 (cons (cons name new-one) (symbol-value this-kind)))) | |
2277 (if (and (stringp (nth 3 form)) | |
2278 (eq 'quote (car-safe code)) | |
2279 (eq 'lambda (car-safe (nth 1 code)))) | |
2280 (cons (car form) | |
2281 (cons name (cdr (nth 1 code)))) | |
10235
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2282 (byte-compile-flush-pending) |
757 | 2283 (if (not (stringp (nth 3 form))) |
10235
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2284 ;; 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
|
2285 ;; 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
|
2286 (byte-compile-output-docform |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2287 (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
|
2288 "\n(fset '" "\n(defalias '") |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2289 name |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2290 (cond ((atom code) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2291 (if macrop '(" '(macro . #[" -1 "])") '(" #[" -1 "]"))) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2292 ((eq (car code) 'quote) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2293 (setq code new-one) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2294 (if macrop '(" '(macro " -1 ")") '(" '(" -1 ")"))) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2295 ((if macrop '(" (cons 'macro (" -1 "))") '(" (" -1 ")")))) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2296 (append code nil) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2297 (and (atom code) byte-compile-dynamic |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2298 1) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2299 nil) |
757 | 2300 ;; 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
|
2301 ;; b-c-output-file-form analyze the defalias. |
757 | 2302 (byte-compile-output-docform |
10235
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2303 (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
|
2304 "\n(fset '" "\n(defalias '") |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2305 name |
757 | 2306 (cond ((atom code) |
2307 (if macrop '(" '(macro . #[" 4 "])") '(" #[" 4 "]"))) | |
2308 ((eq (car code) 'quote) | |
2309 (setq code new-one) | |
2310 (if macrop '(" '(macro " 2 ")") '(" '(" 2 ")"))) | |
2311 ((if macrop '(" (cons 'macro (" 5 "))") '(" (" 5 ")")))) | |
10235
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2312 (append code nil) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2313 (and (atom code) byte-compile-dynamic |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2314 1) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2315 nil)) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2316 (princ ")" outbuffer) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2317 nil)))) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2318 |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2319 ;; 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
|
2320 ;; 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
|
2321 ;; 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
|
2322 (defun byte-compile-output-as-comment (exp quoted) |
23135
99ab9c46504a
(byte-compile-output-as-comment):
Kenichi Handa <handa@m17n.org>
parents:
23054
diff
changeset
|
2323 (let ((position (point))) |
10235
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2324 (set-buffer |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2325 (prog1 (current-buffer) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2326 (set-buffer outbuffer) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2327 |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2328 ;; Insert EXP, and make it a comment with #@LENGTH. |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2329 (insert " ") |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2330 (if quoted |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2331 (prin1 exp outbuffer) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2332 (princ exp outbuffer)) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2333 (goto-char position) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2334 ;; Quote certain special characters as needed. |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2335 ;; get_doc_string in doc.c does the unquoting. |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2336 (while (search-forward "\^A" nil t) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2337 (replace-match "\^A\^A" t t)) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2338 (goto-char position) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2339 (while (search-forward "\000" nil t) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2340 (replace-match "\^A0" t t)) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2341 (goto-char position) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2342 (while (search-forward "\037" nil t) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2343 (replace-match "\^A_" t t)) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2344 (goto-char (point-max)) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2345 (insert "\037") |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2346 (goto-char position) |
23135
99ab9c46504a
(byte-compile-output-as-comment):
Kenichi Handa <handa@m17n.org>
parents:
23054
diff
changeset
|
2347 (insert "#@" (format "%d" (- (position-bytes (point-max)) |
99ab9c46504a
(byte-compile-output-as-comment):
Kenichi Handa <handa@m17n.org>
parents:
23054
diff
changeset
|
2348 (position-bytes position)))) |
10235
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2349 |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2350 ;; Save the file position of the object. |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2351 ;; Note we should add 1 to skip the space |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2352 ;; that we inserted before the actual doc string, |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2353 ;; and subtract 1 to convert from an 1-origin Emacs position |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2354 ;; to a file position; they cancel. |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2355 (setq position (point)) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2356 (goto-char (point-max)))) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2357 position)) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
2358 |
757 | 2359 |
2360 | |
819
5bbabfcef929
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
784
diff
changeset
|
2361 ;;;###autoload |
757 | 2362 (defun byte-compile (form) |
2363 "If FORM is a symbol, byte-compile its function definition. | |
2364 If FORM is a lambda or a macro, byte-compile it as a function." | |
2365 (displaying-byte-compile-warnings | |
2366 (byte-compile-close-variables | |
2367 (let* ((fun (if (symbolp form) | |
2368 (and (fboundp form) (symbol-function form)) | |
2369 form)) | |
2370 (macro (eq (car-safe fun) 'macro))) | |
2371 (if macro | |
2372 (setq fun (cdr fun))) | |
2373 (cond ((eq (car-safe fun) 'lambda) | |
2374 (setq fun (if macro | |
2375 (cons 'macro (byte-compile-lambda fun)) | |
2376 (byte-compile-lambda fun))) | |
2377 (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
|
2378 (defalias form fun) |
757 | 2379 fun))))))) |
2380 | |
2381 (defun byte-compile-sexp (sexp) | |
2382 "Compile and return SEXP." | |
2383 (displaying-byte-compile-warnings | |
2384 (byte-compile-close-variables | |
2385 (byte-compile-top-level sexp)))) | |
2386 | |
2387 ;; Given a function made by byte-compile-lambda, make a form which produces it. | |
2388 (defun byte-compile-byte-code-maker (fun) | |
2389 (cond | |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
2390 ((byte-compile-version-cond byte-compile-compatibility) |
757 | 2391 ;; Return (quote (lambda ...)). |
2392 (list 'quote (byte-compile-byte-code-unmake fun))) | |
2393 ;; ## atom is faster than compiled-func-p. | |
2394 ((atom fun) ; compiled function. | |
2395 ;; generate-emacs19-bytecodes must be on, otherwise byte-compile-lambda | |
2396 ;; would have produced a lambda. | |
16149
eb953f4baf7b
(byte-compile-out-toplevel): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
15972
diff
changeset
|
2397 fun) |
757 | 2398 ;; 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
|
2399 ;; function, or this is Emacs 18, or generate-emacs19-bytecodes is off. |
757 | 2400 ((let (tmp) |
2401 (if (and (setq tmp (assq 'byte-code (cdr-safe (cdr fun)))) | |
2402 (null (cdr (memq tmp fun)))) | |
2403 ;; Generate a make-byte-code call. | |
2404 (let* ((interactive (assq 'interactive (cdr (cdr fun))))) | |
2405 (nconc (list 'make-byte-code | |
2406 (list 'quote (nth 1 fun)) ;arglist | |
2407 (nth 1 tmp) ;bytes | |
2408 (nth 2 tmp) ;consts | |
2409 (nth 3 tmp)) ;depth | |
2410 (cond ((stringp (nth 2 fun)) | |
2411 (list (nth 2 fun))) ;doc | |
2412 (interactive | |
2413 (list nil))) | |
2414 (cond (interactive | |
2415 (list (if (or (null (nth 1 interactive)) | |
2416 (stringp (nth 1 interactive))) | |
2417 (nth 1 interactive) | |
2418 ;; Interactive spec is a list or a variable | |
2419 ;; (if it is correct). | |
2420 (list 'quote (nth 1 interactive)))))))) | |
2421 ;; a non-compiled function (probably trivial) | |
2422 (list 'quote fun)))))) | |
2423 | |
2424 ;; Turn a function into an ordinary lambda. Needed for v18 files. | |
2425 (defun byte-compile-byte-code-unmake (function) | |
2426 (if (consp function) | |
2427 function;;It already is a lambda. | |
2428 (setq function (append function nil)) ; turn it into a list | |
2429 (nconc (list 'lambda (nth 0 function)) | |
2430 (and (nth 4 function) (list (nth 4 function))) | |
2431 (if (nthcdr 5 function) | |
2432 (list (cons 'interactive (if (nth 5 function) | |
2433 (nthcdr 5 function))))) | |
2434 (list (list 'byte-code | |
2435 (nth 1 function) (nth 2 function) | |
2436 (nth 3 function)))))) | |
2437 | |
2438 | |
39827
d9f8c7370b3a
(byte-compile-check-lambda-list): New
Gerd Moellmann <gerd@gnu.org>
parents:
39769
diff
changeset
|
2439 (defun byte-compile-check-lambda-list (list) |
d9f8c7370b3a
(byte-compile-check-lambda-list): New
Gerd Moellmann <gerd@gnu.org>
parents:
39769
diff
changeset
|
2440 "Check lambda-list LIST for errors." |
d9f8c7370b3a
(byte-compile-check-lambda-list): New
Gerd Moellmann <gerd@gnu.org>
parents:
39769
diff
changeset
|
2441 (let (vars) |
d9f8c7370b3a
(byte-compile-check-lambda-list): New
Gerd Moellmann <gerd@gnu.org>
parents:
39769
diff
changeset
|
2442 (while list |
d9f8c7370b3a
(byte-compile-check-lambda-list): New
Gerd Moellmann <gerd@gnu.org>
parents:
39769
diff
changeset
|
2443 (let ((arg (car list))) |
45558
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
2444 (when (symbolp arg) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
2445 (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
|
2446 (cond ((or (not (symbolp arg)) |
50570
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
2447 (byte-compile-const-symbol-p arg t)) |
39827
d9f8c7370b3a
(byte-compile-check-lambda-list): New
Gerd Moellmann <gerd@gnu.org>
parents:
39769
diff
changeset
|
2448 (error "Invalid lambda variable %s" arg)) |
d9f8c7370b3a
(byte-compile-check-lambda-list): New
Gerd Moellmann <gerd@gnu.org>
parents:
39769
diff
changeset
|
2449 ((eq arg '&rest) |
d9f8c7370b3a
(byte-compile-check-lambda-list): New
Gerd Moellmann <gerd@gnu.org>
parents:
39769
diff
changeset
|
2450 (unless (cdr list) |
d9f8c7370b3a
(byte-compile-check-lambda-list): New
Gerd Moellmann <gerd@gnu.org>
parents:
39769
diff
changeset
|
2451 (error "&rest without variable name")) |
d9f8c7370b3a
(byte-compile-check-lambda-list): New
Gerd Moellmann <gerd@gnu.org>
parents:
39769
diff
changeset
|
2452 (when (cddr list) |
d9f8c7370b3a
(byte-compile-check-lambda-list): New
Gerd Moellmann <gerd@gnu.org>
parents:
39769
diff
changeset
|
2453 (error "Garbage following &rest VAR in lambda-list"))) |
d9f8c7370b3a
(byte-compile-check-lambda-list): New
Gerd Moellmann <gerd@gnu.org>
parents:
39769
diff
changeset
|
2454 ((eq arg '&optional) |
d9f8c7370b3a
(byte-compile-check-lambda-list): New
Gerd Moellmann <gerd@gnu.org>
parents:
39769
diff
changeset
|
2455 (unless (cdr list) |
d9f8c7370b3a
(byte-compile-check-lambda-list): New
Gerd Moellmann <gerd@gnu.org>
parents:
39769
diff
changeset
|
2456 (error "Variable name missing after &optional"))) |
d9f8c7370b3a
(byte-compile-check-lambda-list): New
Gerd Moellmann <gerd@gnu.org>
parents:
39769
diff
changeset
|
2457 ((memq arg vars) |
39852
00ea1715c90a
(byte-compile-check-lambda-list):
Gerd Moellmann <gerd@gnu.org>
parents:
39827
diff
changeset
|
2458 (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
|
2459 (t |
39827
d9f8c7370b3a
(byte-compile-check-lambda-list): New
Gerd Moellmann <gerd@gnu.org>
parents:
39769
diff
changeset
|
2460 (push arg vars)))) |
d9f8c7370b3a
(byte-compile-check-lambda-list): New
Gerd Moellmann <gerd@gnu.org>
parents:
39769
diff
changeset
|
2461 (setq list (cdr list))))) |
d9f8c7370b3a
(byte-compile-check-lambda-list): New
Gerd Moellmann <gerd@gnu.org>
parents:
39769
diff
changeset
|
2462 |
d9f8c7370b3a
(byte-compile-check-lambda-list): New
Gerd Moellmann <gerd@gnu.org>
parents:
39769
diff
changeset
|
2463 |
757 | 2464 ;; Byte-compile a lambda-expression and return a valid function. |
2465 ;; The value is usually a compiled function but may be the original | |
2466 ;; lambda-expression. | |
2467 (defun byte-compile-lambda (fun) | |
26922
6fdf1f6c23a0
(byte-compile-bound-variables): Doc fix.
Dave Love <fx@gnu.org>
parents:
25636
diff
changeset
|
2468 (unless (eq 'lambda (car-safe fun)) |
6fdf1f6c23a0
(byte-compile-bound-variables): Doc fix.
Dave Love <fx@gnu.org>
parents:
25636
diff
changeset
|
2469 (error "Not a lambda list: %S" fun)) |
45558
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
2470 (byte-compile-set-symbol-position 'lambda) |
39827
d9f8c7370b3a
(byte-compile-check-lambda-list): New
Gerd Moellmann <gerd@gnu.org>
parents:
39769
diff
changeset
|
2471 (byte-compile-check-lambda-list (nth 1 fun)) |
757 | 2472 (let* ((arglist (nth 1 fun)) |
2473 (byte-compile-bound-variables | |
2474 (nconc (and (memq 'free-vars byte-compile-warnings) | |
2475 (delq '&rest (delq '&optional (copy-sequence arglist)))) | |
2476 byte-compile-bound-variables)) | |
2477 (body (cdr (cdr fun))) | |
2478 (doc (if (stringp (car body)) | |
2479 (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
|
2480 ;; 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
|
2481 ;; 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
|
2482 (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
|
2483 (setq body (cdr body)))))) |
757 | 2484 (int (assq 'interactive body))) |
50570
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
2485 ;; Process the interactive spec. |
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
2486 (when int |
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
2487 (byte-compile-set-symbol-position 'interactive) |
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
2488 ;; 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
|
2489 (if (eq int (car body)) |
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
2490 (setq body (cdr body))) |
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
2491 (cond ((consp (cdr int)) |
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
2492 (if (cdr (cdr int)) |
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
2493 (byte-compile-warn "malformed interactive spec: %s" |
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
2494 (prin1-to-string int))) |
53753
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
2495 ;; 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
|
2496 ;; compile it, because `call-interactively' looks at the |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
2497 ;; 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
|
2498 ;; but don't use the result. |
50570
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
2499 (let ((form (nth 1 int))) |
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
2500 (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
|
2501 (while (consp (cdr form)) |
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
2502 (setq form (cdr form))) |
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
2503 (setq form (car form))) |
53753
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
2504 (if (eq (car-safe form) 'list) |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
2505 (byte-compile-top-level (nth 1 int)) |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
2506 (setq int (list 'interactive |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
2507 (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
|
2508 ((cdr int) |
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
2509 (byte-compile-warn "malformed interactive spec: %s" |
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
2510 (prin1-to-string int))))) |
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
2511 ;; Process the body. |
757 | 2512 (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
|
2513 ;; Build the actual byte-coded function. |
757 | 2514 (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
|
2515 (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
|
2516 byte-compile-compatibility))) |
757 | 2517 (apply 'make-byte-code |
2518 (append (list arglist) | |
2519 ;; byte-string, constants-vector, stack depth | |
2520 (cdr compiled) | |
2521 ;; optionally, the doc string. | |
2522 (if (or doc int) | |
2523 (list doc)) | |
2524 ;; optionally, the interactive spec. | |
2525 (if int | |
2526 (list (nth 1 int))))) | |
2527 (setq compiled | |
2528 (nconc (if int (list int)) | |
2529 (cond ((eq (car-safe compiled) 'progn) (cdr compiled)) | |
2530 (compiled (list compiled))))) | |
2531 (nconc (list 'lambda arglist) | |
2532 (if (or doc (stringp (car compiled))) | |
2533 (cons doc (cond (compiled) | |
2534 (body (list nil)))) | |
2535 compiled)))))) | |
2536 | |
2537 (defun byte-compile-constants-vector () | |
2538 ;; Builds the constants-vector from the current variables and constants. | |
2539 ;; This modifies the constants from (const . nil) to (const . offset). | |
2540 ;; To keep the byte-codes to look up the vector as short as possible: | |
2541 ;; First 6 elements are vars, as there are one-byte varref codes for those. | |
2542 ;; Next up to byte-constant-limit are constants, still with one-byte codes. | |
2543 ;; Next variables again, to get 2-byte codes for variable lookup. | |
2544 ;; The rest of the constants and variables need 3-byte byte-codes. | |
2545 (let* ((i -1) | |
2546 (rest (nreverse byte-compile-variables)) ; nreverse because the first | |
2547 (other (nreverse byte-compile-constants)) ; vars often are used most. | |
2548 ret tmp | |
2549 (limits '(5 ; Use the 1-byte varref codes, | |
2550 63 ; 1-constlim ; 1-byte byte-constant codes, | |
2551 255 ; 2-byte varref codes, | |
2552 65535)) ; 3-byte codes for the rest. | |
2553 limit) | |
2554 (while (or rest other) | |
2555 (setq limit (car limits)) | |
2556 (while (and rest (not (eq i limit))) | |
2557 (if (setq tmp (assq (car (car rest)) ret)) | |
2558 (setcdr (car rest) (cdr tmp)) | |
2559 (setcdr (car rest) (setq i (1+ i))) | |
2560 (setq ret (cons (car rest) ret))) | |
2561 (setq rest (cdr rest))) | |
2562 (setq limits (cdr limits) | |
2563 rest (prog1 other | |
2564 (setq other rest)))) | |
2565 (apply 'vector (nreverse (mapcar 'car ret))))) | |
2566 | |
2567 ;; Given an expression FORM, compile it and return an equivalent byte-code | |
2568 ;; expression (a call to the function byte-code). | |
2569 (defun byte-compile-top-level (form &optional for-effect output-type) | |
2570 ;; OUTPUT-TYPE advises about how form is expected to be used: | |
2571 ;; 'eval or nil -> a single form, | |
2572 ;; 'progn or t -> a list of forms, | |
2573 ;; 'lambda -> body of a lambda, | |
2574 ;; 'file -> used at file-level. | |
8446
0199ece40d91
(byte-compile-protect-from-advice): Macro deleted.
Richard M. Stallman <rms@gnu.org>
parents:
8115
diff
changeset
|
2575 (let ((byte-compile-constants nil) |
0199ece40d91
(byte-compile-protect-from-advice): Macro deleted.
Richard M. Stallman <rms@gnu.org>
parents:
8115
diff
changeset
|
2576 (byte-compile-variables nil) |
0199ece40d91
(byte-compile-protect-from-advice): Macro deleted.
Richard M. Stallman <rms@gnu.org>
parents:
8115
diff
changeset
|
2577 (byte-compile-tag-number 0) |
0199ece40d91
(byte-compile-protect-from-advice): Macro deleted.
Richard M. Stallman <rms@gnu.org>
parents:
8115
diff
changeset
|
2578 (byte-compile-depth 0) |
0199ece40d91
(byte-compile-protect-from-advice): Macro deleted.
Richard M. Stallman <rms@gnu.org>
parents:
8115
diff
changeset
|
2579 (byte-compile-maxdepth 0) |
0199ece40d91
(byte-compile-protect-from-advice): Macro deleted.
Richard M. Stallman <rms@gnu.org>
parents:
8115
diff
changeset
|
2580 (byte-compile-output nil)) |
6081
65adb7b035fd
(byte-compile-protect-from-advice): New macro that
Richard M. Stallman <rms@gnu.org>
parents:
6043
diff
changeset
|
2581 (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
|
2582 (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
|
2583 (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
|
2584 (setq form (nth 1 form))) |
65adb7b035fd
(byte-compile-protect-from-advice): New macro that
Richard M. Stallman <rms@gnu.org>
parents:
6043
diff
changeset
|
2585 (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
|
2586 (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
|
2587 (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
|
2588 (natnump (nth 3 form))) |
65adb7b035fd
(byte-compile-protect-from-advice): New macro that
Richard M. Stallman <rms@gnu.org>
parents:
6043
diff
changeset
|
2589 form |
65adb7b035fd
(byte-compile-protect-from-advice): New macro that
Richard M. Stallman <rms@gnu.org>
parents:
6043
diff
changeset
|
2590 (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
|
2591 (byte-compile-out-toplevel for-effect output-type)))) |
757 | 2592 |
2593 (defun byte-compile-out-toplevel (&optional for-effect output-type) | |
2594 (if for-effect | |
2595 ;; The stack is empty. Push a value to be returned from (byte-code ..). | |
2596 (if (eq (car (car byte-compile-output)) 'byte-discard) | |
2597 (setq byte-compile-output (cdr byte-compile-output)) | |
2598 (byte-compile-push-constant | |
2599 ;; Push any constant - preferably one which already is used, and | |
2600 ;; a number or symbol - ie not some big sequence. The return value | |
2601 ;; isn't returned, but it would be a shame if some textually large | |
2602 ;; constant was not optimized away because we chose to return it. | |
2603 (and (not (assq nil byte-compile-constants)) ; Nil is often there. | |
2604 (let ((tmp (reverse byte-compile-constants))) | |
46003
503e1f14ba3d
(byte-compile-callargs-warn):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45842
diff
changeset
|
2605 (while (and tmp (not (or (symbolp (caar tmp)) |
503e1f14ba3d
(byte-compile-callargs-warn):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45842
diff
changeset
|
2606 (numberp (caar tmp))))) |
757 | 2607 (setq tmp (cdr tmp))) |
46003
503e1f14ba3d
(byte-compile-callargs-warn):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45842
diff
changeset
|
2608 (caar tmp)))))) |
757 | 2609 (byte-compile-out 'byte-return 0) |
2610 (setq byte-compile-output (nreverse byte-compile-output)) | |
2611 (if (memq byte-optimize '(t byte)) | |
2612 (setq byte-compile-output | |
2613 (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
|
2614 |
757 | 2615 ;; Decompile trivial functions: |
2616 ;; only constants and variables, or a single funcall except in lambdas. | |
2617 ;; Except for Lisp_Compiled objects, forms like (foo "hi") | |
2618 ;; are still quicker than (byte-code "..." [foo "hi"] 2). | |
2619 ;; Note that even (quote foo) must be parsed just as any subr by the | |
2620 ;; interpreter, so quote should be compiled into byte-code in some contexts. | |
2621 ;; 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
|
2622 ;; 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
|
2623 ;; 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
|
2624 ;; 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
|
2625 ;; the Lisp_Compiled type, the compiled form is faster. |
757 | 2626 ;; eval -> atom, quote or (function atom atom atom) |
2627 ;; progn -> as <<same-as-eval>> or (progn <<same-as-eval>> atom) | |
2628 ;; file -> as progn, but takes both quotes and atoms, and longer forms. | |
2629 (let (rest | |
2630 (maycall (not (eq output-type 'lambda))) ; t if we may make a funcall. | |
2631 tmp body) | |
2632 (cond | |
2633 ;; #### 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
|
2634 ((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
|
2635 (nthcdr (if (eq output-type 'file) 50 8) byte-compile-output) |
757 | 2636 (assq 'TAG byte-compile-output) ; Not necessary, but speeds up a bit. |
2637 (not (setq tmp (assq 'byte-return byte-compile-output))) | |
2638 (progn | |
2639 (setq rest (nreverse | |
2640 (cdr (memq tmp (reverse byte-compile-output))))) | |
2641 (while (cond | |
2642 ((memq (car (car rest)) '(byte-varref byte-constant)) | |
2643 (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
|
2644 (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
|
2645 (or (consp tmp) |
eb953f4baf7b
(byte-compile-out-toplevel): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
15972
diff
changeset
|
2646 (and (symbolp tmp) |
27824 | 2647 (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
|
2648 (if maycall |
eb953f4baf7b
(byte-compile-out-toplevel): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
15972
diff
changeset
|
2649 (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
|
2650 (setq body (cons tmp body)))) |
757 | 2651 ((and maycall |
2652 ;; Allow a funcall if at most one atom follows it. | |
2653 (null (nthcdr 3 rest)) | |
2654 (setq tmp (get (car (car rest)) 'byte-opcode-invert)) | |
2655 (or (null (cdr rest)) | |
2656 (and (memq output-type '(file progn t)) | |
2657 (cdr (cdr rest)) | |
2658 (eq (car (nth 1 rest)) 'byte-discard) | |
2659 (progn (setq rest (cdr rest)) t)))) | |
2660 (setq maycall nil) ; Only allow one real function call. | |
2661 (setq body (nreverse body)) | |
2662 (setq body (list | |
2663 (if (and (eq tmp 'funcall) | |
2664 (eq (car-safe (car body)) 'quote)) | |
2665 (cons (nth 1 (car body)) (cdr body)) | |
2666 (cons tmp body)))) | |
2667 (or (eq output-type 'file) | |
2668 (not (delq nil (mapcar 'consp (cdr (car body)))))))) | |
2669 (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
|
2670 rest)) |
757 | 2671 (let ((byte-compile-vector (byte-compile-constants-vector))) |
2672 (list 'byte-code (byte-compile-lapcode byte-compile-output) | |
2673 byte-compile-vector byte-compile-maxdepth))) | |
2674 ;; it's a trivial function | |
2675 ((cdr body) (cons 'progn (nreverse body))) | |
2676 ((car body))))) | |
2677 | |
2678 ;; Given BODY, compile it and return a new body. | |
2679 (defun byte-compile-top-level-body (body &optional for-effect) | |
2680 (setq body (byte-compile-top-level (cons 'progn body) for-effect t)) | |
2681 (cond ((eq (car-safe body) 'progn) | |
2682 (cdr body)) | |
2683 (body | |
2684 (list body)))) | |
2685 | |
28402 | 2686 ;; This is the recursive entry point for compiling each subform of an |
757 | 2687 ;; expression. |
2688 ;; If for-effect is non-nil, byte-compile-form will output a byte-discard | |
2689 ;; before terminating (ie no value will be left on the stack). | |
2690 ;; A byte-compile handler may, when for-effect is non-nil, choose output code | |
2691 ;; which does not leave a value on the stack, and then set for-effect to nil | |
2692 ;; (to prevent byte-compile-form from outputting the byte-discard). | |
2693 ;; If a handler wants to call another handler, it should do so via | |
2694 ;; byte-compile-form, or take extreme care to handle for-effect correctly. | |
2695 ;; (Use byte-compile-form-do-effect to reset the for-effect flag too.) | |
2696 ;; | |
2697 (defun byte-compile-form (form &optional for-effect) | |
2698 (setq form (macroexpand form byte-compile-macro-environment)) | |
2699 (cond ((not (consp form)) | |
45558
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
2700 (when (symbolp form) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
2701 (byte-compile-set-symbol-position form)) |
27824 | 2702 (cond ((or (not (symbolp form)) (byte-compile-const-symbol-p form)) |
757 | 2703 (byte-compile-constant form)) |
2704 ((and for-effect byte-compile-delete-errors) | |
2705 (setq for-effect nil)) | |
2706 (t (byte-compile-variable-ref 'byte-varref form)))) | |
2707 ((symbolp (car form)) | |
2708 (let* ((fn (car form)) | |
2709 (handler (get fn 'byte-compile))) | |
45558
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
2710 (byte-compile-set-symbol-position fn) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
2711 (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
|
2712 (byte-compile-warn "`%s' called as a function" fn)) |
757 | 2713 (if (and handler |
3653
974055b516d9
* bytecomp.el: Bring it up to version 2.10 of the
Jim Blandy <jimb@redhat.com>
parents:
3591
diff
changeset
|
2714 (or (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
|
2715 byte-compile-compatibility)) |
757 | 2716 (not (get (get fn 'byte-opcode) 'emacs19-opcode)))) |
2717 (funcall handler form) | |
2718 (if (memq 'callargs byte-compile-warnings) | |
2719 (byte-compile-callargs-warn form)) | |
46136
79f132657570
(byte-compile-warning-types):
Richard M. Stallman <rms@gnu.org>
parents:
46050
diff
changeset
|
2720 (byte-compile-normal-call form)) |
79f132657570
(byte-compile-warning-types):
Richard M. Stallman <rms@gnu.org>
parents:
46050
diff
changeset
|
2721 (if (memq 'cl-functions byte-compile-warnings) |
79f132657570
(byte-compile-warning-types):
Richard M. Stallman <rms@gnu.org>
parents:
46050
diff
changeset
|
2722 (byte-compile-cl-warn form)))) |
1819
df06a60f3362
* disass.el (disassemble): Add autoload cookie for this.
Jim Blandy <jimb@redhat.com>
parents:
1604
diff
changeset
|
2723 ((and (or (byte-code-function-p (car form)) |
757 | 2724 (eq (car-safe (car form)) 'lambda)) |
2725 ;; if the form comes out the same way it went in, that's | |
2726 ;; because it was malformed, and we couldn't unfold it. | |
2727 (not (eq form (setq form (byte-compile-unfold-lambda form))))) | |
2728 (byte-compile-form form for-effect) | |
2729 (setq for-effect nil)) | |
2730 ((byte-compile-normal-call form))) | |
2731 (if for-effect | |
2732 (byte-compile-discard))) | |
2733 | |
2734 (defun byte-compile-normal-call (form) | |
2735 (if byte-compile-generate-call-tree | |
2736 (byte-compile-annotate-call-tree form)) | |
2737 (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
|
2738 (mapc 'byte-compile-form (cdr form)) ; wasteful, but faster. |
757 | 2739 (byte-compile-out 'byte-call (length (cdr form)))) |
2740 | |
2741 (defun byte-compile-variable-ref (base-op var) | |
45558
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
2742 (when (symbolp var) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
2743 (byte-compile-set-symbol-position var)) |
50570
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
2744 (if (or (not (symbolp var)) |
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
2745 (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
|
2746 (byte-compile-warn |
56082
36284d653673
Put `...' around symbols in warning messages.
Richard M. Stallman <rms@gnu.org>
parents:
55694
diff
changeset
|
2747 (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
|
2748 ((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
|
2749 (t "variable reference to %s `%s'")) |
50570
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
2750 (if (symbolp var) "constant" "nonvariable") |
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
2751 (prin1-to-string var)) |
10256
83d56dd99a40
(byte-compile-warning-types): Add obsolete.
Richard M. Stallman <rms@gnu.org>
parents:
10235
diff
changeset
|
2752 (if (and (get var 'byte-obsolete-variable) |
52133
4c112142c56f
(byte-compile-not-obsolete-var): New var.
Richard M. Stallman <rms@gnu.org>
parents:
51737
diff
changeset
|
2753 (memq 'obsolete byte-compile-warnings) |
4c112142c56f
(byte-compile-not-obsolete-var): New var.
Richard M. Stallman <rms@gnu.org>
parents:
51737
diff
changeset
|
2754 (not (eq var byte-compile-not-obsolete-var))) |
29352
fa490904bee0
* byte-run.el (make-obsolete, make-obsolete-variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29239
diff
changeset
|
2755 (let* ((ob (get var 'byte-obsolete-variable)) |
fa490904bee0
* byte-run.el (make-obsolete, make-obsolete-variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29239
diff
changeset
|
2756 (when (cdr ob))) |
56082
36284d653673
Put `...' around symbols in warning messages.
Richard M. Stallman <rms@gnu.org>
parents:
55694
diff
changeset
|
2757 (byte-compile-warn "`%s' is an obsolete variable%s; %s" var |
29352
fa490904bee0
* byte-run.el (make-obsolete, make-obsolete-variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29239
diff
changeset
|
2758 (if when (concat " since " when) "") |
fa490904bee0
* byte-run.el (make-obsolete, make-obsolete-variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29239
diff
changeset
|
2759 (if (stringp (car ob)) |
fa490904bee0
* byte-run.el (make-obsolete, make-obsolete-variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29239
diff
changeset
|
2760 (car ob) |
56082
36284d653673
Put `...' around symbols in warning messages.
Richard M. Stallman <rms@gnu.org>
parents:
55694
diff
changeset
|
2761 (format "use `%s' instead." (car ob)))))) |
757 | 2762 (if (memq 'free-vars byte-compile-warnings) |
2763 (if (eq base-op 'byte-varbind) | |
50570
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
2764 (push var byte-compile-bound-variables) |
757 | 2765 (or (boundp var) |
2766 (memq var byte-compile-bound-variables) | |
2767 (if (eq base-op 'byte-varset) | |
2768 (or (memq var byte-compile-free-assignments) | |
2769 (progn | |
56082
36284d653673
Put `...' around symbols in warning messages.
Richard M. Stallman <rms@gnu.org>
parents:
55694
diff
changeset
|
2770 (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
|
2771 (push var byte-compile-free-assignments))) |
757 | 2772 (or (memq var byte-compile-free-references) |
2773 (progn | |
56082
36284d653673
Put `...' around symbols in warning messages.
Richard M. Stallman <rms@gnu.org>
parents:
55694
diff
changeset
|
2774 (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
|
2775 (push var byte-compile-free-references)))))))) |
757 | 2776 (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
|
2777 (unless tmp |
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
2778 (setq tmp (list var)) |
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
2779 (push tmp byte-compile-variables)) |
757 | 2780 (byte-compile-out base-op tmp))) |
2781 | |
2782 (defmacro byte-compile-get-constant (const) | |
27824 | 2783 `(or (if (stringp ,const) |
54374
41530bace164
(byte-compile-get-constant): For strings, do compare text properties.
Richard M. Stallman <rms@gnu.org>
parents:
53753
diff
changeset
|
2784 (assoc-default ,const byte-compile-constants |
41530bace164
(byte-compile-get-constant): For strings, do compare text properties.
Richard M. Stallman <rms@gnu.org>
parents:
53753
diff
changeset
|
2785 'equal-including-properties nil) |
27824 | 2786 (assq ,const byte-compile-constants)) |
2787 (car (setq byte-compile-constants | |
2788 (cons (list ,const) byte-compile-constants))))) | |
757 | 2789 |
2790 ;; Use this when the value of a form is a constant. This obeys for-effect. | |
2791 (defun byte-compile-constant (const) | |
2792 (if for-effect | |
2793 (setq for-effect nil) | |
45558
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
2794 (when (symbolp const) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
2795 (byte-compile-set-symbol-position const)) |
757 | 2796 (byte-compile-out 'byte-constant (byte-compile-get-constant const)))) |
2797 | |
2798 ;; Use this for a constant that is not the value of its containing form. | |
2799 ;; This ignores for-effect. | |
2800 (defun byte-compile-push-constant (const) | |
2801 (let ((for-effect nil)) | |
2802 (inline (byte-compile-constant const)))) | |
2803 | |
2804 | |
2805 ;; Compile those primitive ordinary functions | |
2806 ;; which have special byte codes just for speed. | |
2807 | |
2808 (defmacro byte-defop-compiler (function &optional compile-handler) | |
2809 ;; add a compiler-form for FUNCTION. | |
2810 ;; If function is a symbol, then the variable "byte-SYMBOL" must name | |
2811 ;; the opcode to be used. If function is a list, the first element | |
2812 ;; 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
|
2813 ;; The second element may be nil, meaning there is no opcode. |
757 | 2814 ;; COMPILE-HANDLER is the function to use to compile this byte-op, or |
2815 ;; may be the abbreviations 0, 1, 2, 3, 0-1, or 1-2. | |
2816 ;; If it is nil, then the handler is "byte-compile-SYMBOL." | |
2817 (let (opcode) | |
2818 (if (symbolp function) | |
2819 (setq opcode (intern (concat "byte-" (symbol-name function)))) | |
2820 (setq opcode (car (cdr function)) | |
2821 function (car function))) | |
2822 (let ((fnform | |
2823 (list 'put (list 'quote function) ''byte-compile | |
2824 (list 'quote | |
2825 (or (cdr (assq compile-handler | |
2826 '((0 . byte-compile-no-args) | |
2827 (1 . byte-compile-one-arg) | |
2828 (2 . byte-compile-two-args) | |
2829 (3 . byte-compile-three-args) | |
2830 (0-1 . byte-compile-zero-or-one-arg) | |
2831 (1-2 . byte-compile-one-or-two-args) | |
2832 (2-3 . byte-compile-two-or-three-args) | |
2833 ))) | |
2834 compile-handler | |
2835 (intern (concat "byte-compile-" | |
2836 (symbol-name function)))))))) | |
2837 (if opcode | |
2838 (list 'progn fnform | |
2839 (list 'put (list 'quote function) | |
2840 ''byte-opcode (list 'quote opcode)) | |
2841 (list 'put (list 'quote opcode) | |
2842 ''byte-opcode-invert (list 'quote function))) | |
2843 fnform)))) | |
2844 | |
2845 (defmacro byte-defop-compiler19 (function &optional compile-handler) | |
2846 ;; 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
|
2847 ;; be used when byte-compile-compatibility is false. |
757 | 2848 (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
|
2849 byte-compile-compatibility) |
958 | 2850 ;; #### instead of doing nothing, this should do some remprops, |
2851 ;; #### to protect against the case where a single-version compiler | |
2852 ;; #### is loaded into a world that has contained a multi-version one. | |
757 | 2853 nil |
2854 (list 'progn | |
2855 (list 'put | |
2856 (list 'quote | |
2857 (or (car (cdr-safe function)) | |
2858 (intern (concat "byte-" | |
2859 (symbol-name (or (car-safe function) function)))))) | |
2860 ''emacs19-opcode t) | |
2861 (list 'byte-defop-compiler function compile-handler)))) | |
2862 | |
2863 (defmacro byte-defop-compiler-1 (function &optional compile-handler) | |
2864 (list 'byte-defop-compiler (list function nil) compile-handler)) | |
2865 | |
2866 | |
2867 (put 'byte-call 'byte-opcode-invert 'funcall) | |
2868 (put 'byte-list1 'byte-opcode-invert 'list) | |
2869 (put 'byte-list2 'byte-opcode-invert 'list) | |
2870 (put 'byte-list3 'byte-opcode-invert 'list) | |
2871 (put 'byte-list4 'byte-opcode-invert 'list) | |
2872 (put 'byte-listN 'byte-opcode-invert 'list) | |
2873 (put 'byte-concat2 'byte-opcode-invert 'concat) | |
2874 (put 'byte-concat3 'byte-opcode-invert 'concat) | |
2875 (put 'byte-concat4 'byte-opcode-invert 'concat) | |
2876 (put 'byte-concatN 'byte-opcode-invert 'concat) | |
2877 (put 'byte-insertN 'byte-opcode-invert 'insert) | |
2878 | |
2879 (byte-defop-compiler (dot byte-point) 0) | |
2880 (byte-defop-compiler (dot-max byte-point-max) 0) | |
2881 (byte-defop-compiler (dot-min byte-point-min) 0) | |
2882 (byte-defop-compiler point 0) | |
2883 ;;(byte-defop-compiler mark 0) ;; obsolete | |
2884 (byte-defop-compiler point-max 0) | |
2885 (byte-defop-compiler point-min 0) | |
2886 (byte-defop-compiler following-char 0) | |
2887 (byte-defop-compiler preceding-char 0) | |
2888 (byte-defop-compiler current-column 0) | |
2889 (byte-defop-compiler eolp 0) | |
2890 (byte-defop-compiler eobp 0) | |
2891 (byte-defop-compiler bolp 0) | |
2892 (byte-defop-compiler bobp 0) | |
2893 (byte-defop-compiler current-buffer 0) | |
2894 ;;(byte-defop-compiler read-char 0) ;; obsolete | |
2895 (byte-defop-compiler interactive-p 0) | |
2896 (byte-defop-compiler19 widen 0) | |
2897 (byte-defop-compiler19 end-of-line 0-1) | |
2898 (byte-defop-compiler19 forward-char 0-1) | |
2899 (byte-defop-compiler19 forward-line 0-1) | |
2900 (byte-defop-compiler symbolp 1) | |
2901 (byte-defop-compiler consp 1) | |
2902 (byte-defop-compiler stringp 1) | |
2903 (byte-defop-compiler listp 1) | |
2904 (byte-defop-compiler not 1) | |
2905 (byte-defop-compiler (null byte-not) 1) | |
2906 (byte-defop-compiler car 1) | |
2907 (byte-defop-compiler cdr 1) | |
2908 (byte-defop-compiler length 1) | |
2909 (byte-defop-compiler symbol-value 1) | |
2910 (byte-defop-compiler symbol-function 1) | |
2911 (byte-defop-compiler (1+ byte-add1) 1) | |
2912 (byte-defop-compiler (1- byte-sub1) 1) | |
2913 (byte-defop-compiler goto-char 1) | |
18722
3905119ebc75
(char-after): Allow 0 args.
Richard M. Stallman <rms@gnu.org>
parents:
18391
diff
changeset
|
2914 (byte-defop-compiler char-after 0-1) |
757 | 2915 (byte-defop-compiler set-buffer 1) |
2916 ;;(byte-defop-compiler set-mark 1) ;; obsolete | |
56657
7d44c5003aa7
(forward-word): Allow 0 args.
John Paul Wallington <jpw@pobox.com>
parents:
56082
diff
changeset
|
2917 (byte-defop-compiler19 forward-word 0-1) |
757 | 2918 (byte-defop-compiler19 char-syntax 1) |
2919 (byte-defop-compiler19 nreverse 1) | |
2920 (byte-defop-compiler19 car-safe 1) | |
2921 (byte-defop-compiler19 cdr-safe 1) | |
2922 (byte-defop-compiler19 numberp 1) | |
2923 (byte-defop-compiler19 integerp 1) | |
2924 (byte-defop-compiler19 skip-chars-forward 1-2) | |
2925 (byte-defop-compiler19 skip-chars-backward 1-2) | |
2926 (byte-defop-compiler eq 2) | |
2927 (byte-defop-compiler memq 2) | |
2928 (byte-defop-compiler cons 2) | |
2929 (byte-defop-compiler aref 2) | |
2930 (byte-defop-compiler set 2) | |
2931 (byte-defop-compiler (= byte-eqlsign) 2) | |
2932 (byte-defop-compiler (< byte-lss) 2) | |
2933 (byte-defop-compiler (> byte-gtr) 2) | |
2934 (byte-defop-compiler (<= byte-leq) 2) | |
2935 (byte-defop-compiler (>= byte-geq) 2) | |
2936 (byte-defop-compiler get 2) | |
2937 (byte-defop-compiler nth 2) | |
2938 (byte-defop-compiler substring 2-3) | |
958 | 2939 (byte-defop-compiler19 (move-marker byte-set-marker) 2-3) |
757 | 2940 (byte-defop-compiler19 set-marker 2-3) |
2941 (byte-defop-compiler19 match-beginning 1) | |
2942 (byte-defop-compiler19 match-end 1) | |
2943 (byte-defop-compiler19 upcase 1) | |
2944 (byte-defop-compiler19 downcase 1) | |
2945 (byte-defop-compiler19 string= 2) | |
2946 (byte-defop-compiler19 string< 2) | |
958 | 2947 (byte-defop-compiler19 (string-equal byte-string=) 2) |
2948 (byte-defop-compiler19 (string-lessp byte-string<) 2) | |
757 | 2949 (byte-defop-compiler19 equal 2) |
2950 (byte-defop-compiler19 nthcdr 2) | |
2951 (byte-defop-compiler19 elt 2) | |
2952 (byte-defop-compiler19 member 2) | |
2953 (byte-defop-compiler19 assq 2) | |
958 | 2954 (byte-defop-compiler19 (rplaca byte-setcar) 2) |
2955 (byte-defop-compiler19 (rplacd byte-setcdr) 2) | |
757 | 2956 (byte-defop-compiler19 setcar 2) |
2957 (byte-defop-compiler19 setcdr 2) | |
2958 (byte-defop-compiler19 buffer-substring 2) | |
2959 (byte-defop-compiler19 delete-region 2) | |
2960 (byte-defop-compiler19 narrow-to-region 2) | |
2961 (byte-defop-compiler19 (% byte-rem) 2) | |
2962 (byte-defop-compiler aset 3) | |
2963 | |
2964 (byte-defop-compiler max byte-compile-associative) | |
2965 (byte-defop-compiler min byte-compile-associative) | |
2966 (byte-defop-compiler (+ byte-plus) byte-compile-associative) | |
2967 (byte-defop-compiler19 (* byte-mult) byte-compile-associative) | |
2968 | |
2969 ;;####(byte-defop-compiler19 move-to-column 1) | |
2970 (byte-defop-compiler-1 interactive byte-compile-noop) | |
2971 | |
2972 | |
2973 (defun byte-compile-subr-wrong-args (form n) | |
45558
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
2974 (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
|
2975 (byte-compile-warn "`%s' called with %d arg%s, but requires %s" |
757 | 2976 (car form) (length (cdr form)) |
2977 (if (= 1 (length (cdr form))) "" "s") n) | |
2978 ;; get run-time wrong-number-of-args error. | |
2979 (byte-compile-normal-call form)) | |
2980 | |
2981 (defun byte-compile-no-args (form) | |
2982 (if (not (= (length form) 1)) | |
2983 (byte-compile-subr-wrong-args form "none") | |
2984 (byte-compile-out (get (car form) 'byte-opcode) 0))) | |
2985 | |
2986 (defun byte-compile-one-arg (form) | |
2987 (if (not (= (length form) 2)) | |
2988 (byte-compile-subr-wrong-args form 1) | |
2989 (byte-compile-form (car (cdr form))) ;; Push the argument | |
2990 (byte-compile-out (get (car form) 'byte-opcode) 0))) | |
2991 | |
2992 (defun byte-compile-two-args (form) | |
2993 (if (not (= (length form) 3)) | |
2994 (byte-compile-subr-wrong-args form 2) | |
2995 (byte-compile-form (car (cdr form))) ;; Push the arguments | |
2996 (byte-compile-form (nth 2 form)) | |
2997 (byte-compile-out (get (car form) 'byte-opcode) 0))) | |
2998 | |
2999 (defun byte-compile-three-args (form) | |
3000 (if (not (= (length form) 4)) | |
3001 (byte-compile-subr-wrong-args form 3) | |
3002 (byte-compile-form (car (cdr form))) ;; Push the arguments | |
3003 (byte-compile-form (nth 2 form)) | |
3004 (byte-compile-form (nth 3 form)) | |
3005 (byte-compile-out (get (car form) 'byte-opcode) 0))) | |
3006 | |
3007 (defun byte-compile-zero-or-one-arg (form) | |
3008 (let ((len (length form))) | |
3009 (cond ((= len 1) (byte-compile-one-arg (append form '(nil)))) | |
3010 ((= len 2) (byte-compile-one-arg form)) | |
3011 (t (byte-compile-subr-wrong-args form "0-1"))))) | |
3012 | |
3013 (defun byte-compile-one-or-two-args (form) | |
3014 (let ((len (length form))) | |
3015 (cond ((= len 2) (byte-compile-two-args (append form '(nil)))) | |
3016 ((= len 3) (byte-compile-two-args form)) | |
3017 (t (byte-compile-subr-wrong-args form "1-2"))))) | |
3018 | |
3019 (defun byte-compile-two-or-three-args (form) | |
3020 (let ((len (length form))) | |
3021 (cond ((= len 3) (byte-compile-three-args (append form '(nil)))) | |
3022 ((= len 4) (byte-compile-three-args form)) | |
3023 (t (byte-compile-subr-wrong-args form "2-3"))))) | |
3024 | |
3025 (defun byte-compile-noop (form) | |
3026 (byte-compile-constant nil)) | |
3027 | |
3028 (defun byte-compile-discard () | |
3029 (byte-compile-out 'byte-discard 0)) | |
3030 | |
3031 | |
3032 ;; 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
|
3033 ;; 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
|
3034 ;; 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
|
3035 ;; 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
|
3036 ;; in order to convert markers to numbers, and trigger expected errors. |
757 | 3037 (defun byte-compile-associative (form) |
3038 (if (cdr form) | |
13474
3e7f6fdc234d
(byte-compile-associative): Do operations left to right.
Richard M. Stallman <rms@gnu.org>
parents:
13403
diff
changeset
|
3039 (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
|
3040 (args (copy-sequence (cdr form)))) |
3e7f6fdc234d
(byte-compile-associative): Do operations left to right.
Richard M. Stallman <rms@gnu.org>
parents:
13403
diff
changeset
|
3041 (byte-compile-form (car args)) |
3e7f6fdc234d
(byte-compile-associative): Do operations left to right.
Richard M. Stallman <rms@gnu.org>
parents:
13403
diff
changeset
|
3042 (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
|
3043 (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
|
3044 opcode (get '+ 'byte-opcode))) |
50570
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
3045 (dolist (arg args) |
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
3046 (byte-compile-form arg) |
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
3047 (byte-compile-out opcode 0))) |
757 | 3048 (byte-compile-constant (eval form)))) |
3049 | |
3050 | |
3051 ;; more complicated compiler macros | |
3052 | |
3053 (byte-defop-compiler list) | |
3054 (byte-defop-compiler concat) | |
3055 (byte-defop-compiler fset) | |
3056 (byte-defop-compiler (indent-to-column byte-indent-to) byte-compile-indent-to) | |
3057 (byte-defop-compiler indent-to) | |
3058 (byte-defop-compiler insert) | |
3059 (byte-defop-compiler-1 function byte-compile-function-form) | |
3060 (byte-defop-compiler-1 - byte-compile-minus) | |
3061 (byte-defop-compiler19 (/ byte-quo) byte-compile-quo) | |
3062 (byte-defop-compiler19 nconc) | |
3063 | |
3064 (defun byte-compile-list (form) | |
3065 (let ((count (length (cdr form)))) | |
3066 (cond ((= count 0) | |
3067 (byte-compile-constant nil)) | |
3068 ((< count 5) | |
29239
86949998e6fd
(byte-compile-callargs-warn): Use subr-arity to check primitives.
Dave Love <fx@gnu.org>
parents:
28441
diff
changeset
|
3069 (mapc 'byte-compile-form (cdr form)) |
757 | 3070 (byte-compile-out |
3071 (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
|
3072 ((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
|
3073 byte-compile-compatibility))) |
29239
86949998e6fd
(byte-compile-callargs-warn): Use subr-arity to check primitives.
Dave Love <fx@gnu.org>
parents:
28441
diff
changeset
|
3074 (mapc 'byte-compile-form (cdr form)) |
757 | 3075 (byte-compile-out 'byte-listN count)) |
3076 (t (byte-compile-normal-call form))))) | |
3077 | |
3078 (defun byte-compile-concat (form) | |
3079 (let ((count (length (cdr form)))) | |
3080 (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
|
3081 (mapc 'byte-compile-form (cdr form)) |
757 | 3082 (byte-compile-out |
3083 (aref [byte-concat2 byte-concat3 byte-concat4] (- count 2)) | |
3084 0)) | |
3085 ;; Concat of one arg is not a no-op if arg is not a string. | |
3086 ((= count 0) | |
3087 (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
|
3088 ((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
|
3089 byte-compile-compatibility))) |
29239
86949998e6fd
(byte-compile-callargs-warn): Use subr-arity to check primitives.
Dave Love <fx@gnu.org>
parents:
28441
diff
changeset
|
3090 (mapc 'byte-compile-form (cdr form)) |
757 | 3091 (byte-compile-out 'byte-concatN count)) |
3092 ((byte-compile-normal-call form))))) | |
3093 | |
3094 (defun byte-compile-minus (form) | |
3095 (if (null (setq form (cdr form))) | |
3096 (byte-compile-constant 0) | |
3097 (byte-compile-form (car form)) | |
3098 (if (cdr form) | |
3099 (while (setq form (cdr form)) | |
3100 (byte-compile-form (car form)) | |
3101 (byte-compile-out 'byte-diff 0)) | |
3102 (byte-compile-out 'byte-negate 0)))) | |
3103 | |
3104 (defun byte-compile-quo (form) | |
3105 (let ((len (length form))) | |
3106 (cond ((<= len 2) | |
3107 (byte-compile-subr-wrong-args form "2 or more")) | |
3108 (t | |
3109 (byte-compile-form (car (setq form (cdr form)))) | |
3110 (while (setq form (cdr form)) | |
3111 (byte-compile-form (car form)) | |
3112 (byte-compile-out 'byte-quo 0)))))) | |
3113 | |
3114 (defun byte-compile-nconc (form) | |
3115 (let ((len (length form))) | |
3116 (cond ((= len 1) | |
3117 (byte-compile-constant nil)) | |
3118 ((= len 2) | |
3119 ;; nconc of one arg is a noop, even if that arg isn't a list. | |
3120 (byte-compile-form (nth 1 form))) | |
3121 (t | |
3122 (byte-compile-form (car (setq form (cdr form)))) | |
3123 (while (setq form (cdr form)) | |
3124 (byte-compile-form (car form)) | |
3125 (byte-compile-out 'byte-nconc 0)))))) | |
3126 | |
3127 (defun byte-compile-fset (form) | |
3128 ;; warn about forms like (fset 'foo '(lambda () ...)) | |
3129 ;; (where the lambda expression is non-trivial...) | |
3130 (let ((fn (nth 2 form)) | |
3131 body) | |
3132 (if (and (eq (car-safe fn) 'quote) | |
3133 (eq (car-safe (setq fn (nth 1 fn))) 'lambda)) | |
3134 (progn | |
3135 (setq body (cdr (cdr fn))) | |
3136 (if (stringp (car body)) (setq body (cdr body))) | |
3137 (if (eq 'interactive (car-safe (car body))) (setq body (cdr body))) | |
3138 (if (and (consp (car body)) | |
3139 (not (eq 'byte-code (car (car body))))) | |
3140 (byte-compile-warn | |
56082
36284d653673
Put `...' around symbols in warning messages.
Richard M. Stallman <rms@gnu.org>
parents:
55694
diff
changeset
|
3141 "A quoted lambda form is the second argument of `fset'. This is probably |
757 | 3142 not what you want, as that lambda cannot be compiled. Consider using |
3143 the syntax (function (lambda (...) ...)) instead."))))) | |
3144 (byte-compile-two-args form)) | |
3145 | |
3146 (defun byte-compile-funarg (form) | |
3147 ;; (mapcar '(lambda (x) ..) ..) ==> (mapcar (function (lambda (x) ..)) ..) | |
3591
507f64624555
Apply typo patches from Paul Eggert.
Jim Blandy <jimb@redhat.com>
parents:
3455
diff
changeset
|
3148 ;; for cases where it's guaranteed that first arg will be used as a lambda. |
757 | 3149 (byte-compile-normal-call |
3150 (let ((fn (nth 1 form))) | |
3151 (if (and (eq (car-safe fn) 'quote) | |
3152 (eq (car-safe (nth 1 fn)) 'lambda)) | |
3153 (cons (car form) | |
3154 (cons (cons 'function (cdr fn)) | |
3155 (cdr (cdr form)))) | |
3156 form)))) | |
3157 | |
15953
38a50022d610
(byte-compile-funarg-2): New function,
Richard M. Stallman <rms@gnu.org>
parents:
15930
diff
changeset
|
3158 (defun byte-compile-funarg-2 (form) |
38a50022d610
(byte-compile-funarg-2): New function,
Richard M. Stallman <rms@gnu.org>
parents:
15930
diff
changeset
|
3159 ;; (sort ... '(lambda (x) ..)) ==> (sort ... (function (lambda (x) ..))) |
38a50022d610
(byte-compile-funarg-2): New function,
Richard M. Stallman <rms@gnu.org>
parents:
15930
diff
changeset
|
3160 ;; 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
|
3161 (byte-compile-normal-call |
38a50022d610
(byte-compile-funarg-2): New function,
Richard M. Stallman <rms@gnu.org>
parents:
15930
diff
changeset
|
3162 (let ((fn (nth 2 form))) |
38a50022d610
(byte-compile-funarg-2): New function,
Richard M. Stallman <rms@gnu.org>
parents:
15930
diff
changeset
|
3163 (if (and (eq (car-safe fn) 'quote) |
38a50022d610
(byte-compile-funarg-2): New function,
Richard M. Stallman <rms@gnu.org>
parents:
15930
diff
changeset
|
3164 (eq (car-safe (nth 1 fn)) 'lambda)) |
38a50022d610
(byte-compile-funarg-2): New function,
Richard M. Stallman <rms@gnu.org>
parents:
15930
diff
changeset
|
3165 (cons (car form) |
38a50022d610
(byte-compile-funarg-2): New function,
Richard M. Stallman <rms@gnu.org>
parents:
15930
diff
changeset
|
3166 (cons (nth 1 form) |
38a50022d610
(byte-compile-funarg-2): New function,
Richard M. Stallman <rms@gnu.org>
parents:
15930
diff
changeset
|
3167 (cons (cons 'function (cdr fn)) |
38a50022d610
(byte-compile-funarg-2): New function,
Richard M. Stallman <rms@gnu.org>
parents:
15930
diff
changeset
|
3168 (cdr (cdr (cdr form)))))) |
38a50022d610
(byte-compile-funarg-2): New function,
Richard M. Stallman <rms@gnu.org>
parents:
15930
diff
changeset
|
3169 form)))) |
38a50022d610
(byte-compile-funarg-2): New function,
Richard M. Stallman <rms@gnu.org>
parents:
15930
diff
changeset
|
3170 |
757 | 3171 ;; (function foo) must compile like 'foo, not like (symbol-function 'foo). |
3172 ;; Otherwise it will be incompatible with the interpreter, | |
3173 ;; and (funcall (function foo)) will lose with autoloads. | |
3174 | |
3175 (defun byte-compile-function-form (form) | |
3176 (byte-compile-constant | |
3177 (cond ((symbolp (nth 1 form)) | |
3178 (nth 1 form)) | |
3179 ;; If we're not allowed to use #[] syntax, then output a form like | |
3180 ;; '(lambda (..) (byte-code ..)) instead of a call to make-byte-code. | |
3181 ;; In this situation, calling make-byte-code at run-time will usually | |
3182 ;; 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
|
3183 ((byte-compile-version-cond byte-compile-compatibility) |
757 | 3184 (byte-compile-byte-code-unmake (byte-compile-lambda (nth 1 form)))) |
3185 ((byte-compile-lambda (nth 1 form)))))) | |
3186 | |
3187 (defun byte-compile-indent-to (form) | |
3188 (let ((len (length form))) | |
3189 (cond ((= len 2) | |
3190 (byte-compile-form (car (cdr form))) | |
3191 (byte-compile-out 'byte-indent-to 0)) | |
3192 ((= len 3) | |
3193 ;; no opcode for 2-arg case. | |
3194 (byte-compile-normal-call form)) | |
3195 (t | |
3196 (byte-compile-subr-wrong-args form "1-2"))))) | |
3197 | |
3198 (defun byte-compile-insert (form) | |
3199 (cond ((null (cdr form)) | |
3200 (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
|
3201 ((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
|
3202 byte-compile-compatibility)) |
757 | 3203 (<= (length form) 256)) |
29239
86949998e6fd
(byte-compile-callargs-warn): Use subr-arity to check primitives.
Dave Love <fx@gnu.org>
parents:
28441
diff
changeset
|
3204 (mapc 'byte-compile-form (cdr form)) |
757 | 3205 (if (cdr (cdr form)) |
3206 (byte-compile-out 'byte-insertN (length (cdr form))) | |
3207 (byte-compile-out 'byte-insert 0))) | |
3208 ((memq t (mapcar 'consp (cdr (cdr form)))) | |
3209 (byte-compile-normal-call form)) | |
3210 ;; We can split it; there is no function call after inserting 1st arg. | |
3211 (t | |
3212 (while (setq form (cdr form)) | |
3213 (byte-compile-form (car form)) | |
3214 (byte-compile-out 'byte-insert 0) | |
3215 (if (cdr form) | |
3216 (byte-compile-discard)))))) | |
3217 | |
3218 | |
3219 (byte-defop-compiler-1 setq) | |
3220 (byte-defop-compiler-1 setq-default) | |
3221 (byte-defop-compiler-1 quote) | |
3222 (byte-defop-compiler-1 quote-form) | |
3223 | |
3224 (defun byte-compile-setq (form) | |
3225 (let ((args (cdr form))) | |
3226 (if args | |
3227 (while args | |
3228 (byte-compile-form (car (cdr args))) | |
3229 (or for-effect (cdr (cdr args)) | |
3230 (byte-compile-out 'byte-dup 0)) | |
3231 (byte-compile-variable-ref 'byte-varset (car args)) | |
3232 (setq args (cdr (cdr args)))) | |
3233 ;; (setq), with no arguments. | |
3234 (byte-compile-form nil for-effect)) | |
3235 (setq for-effect nil))) | |
3236 | |
3237 (defun byte-compile-setq-default (form) | |
4049
7908fc6e4fb9
(byte-compile-setq-default):
Richard M. Stallman <rms@gnu.org>
parents:
4013
diff
changeset
|
3238 (let ((args (cdr form)) |
7908fc6e4fb9
(byte-compile-setq-default):
Richard M. Stallman <rms@gnu.org>
parents:
4013
diff
changeset
|
3239 setters) |
7908fc6e4fb9
(byte-compile-setq-default):
Richard M. Stallman <rms@gnu.org>
parents:
4013
diff
changeset
|
3240 (while args |
7908fc6e4fb9
(byte-compile-setq-default):
Richard M. Stallman <rms@gnu.org>
parents:
4013
diff
changeset
|
3241 (setq setters |
7908fc6e4fb9
(byte-compile-setq-default):
Richard M. Stallman <rms@gnu.org>
parents:
4013
diff
changeset
|
3242 (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
|
3243 setters)) |
7908fc6e4fb9
(byte-compile-setq-default):
Richard M. Stallman <rms@gnu.org>
parents:
4013
diff
changeset
|
3244 (setq args (cdr (cdr args)))) |
7908fc6e4fb9
(byte-compile-setq-default):
Richard M. Stallman <rms@gnu.org>
parents:
4013
diff
changeset
|
3245 (byte-compile-form (cons 'progn (nreverse setters))))) |
757 | 3246 |
3247 (defun byte-compile-quote (form) | |
3248 (byte-compile-constant (car (cdr form)))) | |
3249 | |
3250 (defun byte-compile-quote-form (form) | |
3251 (byte-compile-constant (byte-compile-top-level (nth 1 form)))) | |
3252 | |
3253 | |
3254 ;;; control structures | |
3255 | |
3256 (defun byte-compile-body (body &optional for-effect) | |
3257 (while (cdr body) | |
3258 (byte-compile-form (car body) t) | |
3259 (setq body (cdr body))) | |
3260 (byte-compile-form (car body) for-effect)) | |
3261 | |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
3262 (defsubst byte-compile-body-do-effect (body) |
757 | 3263 (byte-compile-body body for-effect) |
3264 (setq for-effect nil)) | |
3265 | |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
3266 (defsubst byte-compile-form-do-effect (form) |
757 | 3267 (byte-compile-form form for-effect) |
3268 (setq for-effect nil)) | |
3269 | |
3270 (byte-defop-compiler-1 inline byte-compile-progn) | |
3271 (byte-defop-compiler-1 progn) | |
3272 (byte-defop-compiler-1 prog1) | |
3273 (byte-defop-compiler-1 prog2) | |
3274 (byte-defop-compiler-1 if) | |
3275 (byte-defop-compiler-1 cond) | |
3276 (byte-defop-compiler-1 and) | |
3277 (byte-defop-compiler-1 or) | |
3278 (byte-defop-compiler-1 while) | |
3279 (byte-defop-compiler-1 funcall) | |
3280 (byte-defop-compiler-1 apply byte-compile-funarg) | |
3281 (byte-defop-compiler-1 mapcar byte-compile-funarg) | |
3282 (byte-defop-compiler-1 mapatoms byte-compile-funarg) | |
3283 (byte-defop-compiler-1 mapconcat byte-compile-funarg) | |
31211 | 3284 (byte-defop-compiler-1 mapc byte-compile-funarg) |
48468 | 3285 (byte-defop-compiler-1 maphash byte-compile-funarg) |
3286 (byte-defop-compiler-1 map-char-table byte-compile-funarg) | |
15953
38a50022d610
(byte-compile-funarg-2): New function,
Richard M. Stallman <rms@gnu.org>
parents:
15930
diff
changeset
|
3287 (byte-defop-compiler-1 sort byte-compile-funarg-2) |
757 | 3288 (byte-defop-compiler-1 let) |
3289 (byte-defop-compiler-1 let*) | |
3290 | |
3291 (defun byte-compile-progn (form) | |
3292 (byte-compile-body-do-effect (cdr form))) | |
3293 | |
3294 (defun byte-compile-prog1 (form) | |
3295 (byte-compile-form-do-effect (car (cdr form))) | |
3296 (byte-compile-body (cdr (cdr form)) t)) | |
3297 | |
3298 (defun byte-compile-prog2 (form) | |
3299 (byte-compile-form (nth 1 form) t) | |
3300 (byte-compile-form-do-effect (nth 2 form)) | |
3301 (byte-compile-body (cdr (cdr (cdr form))) t)) | |
3302 | |
3303 (defmacro byte-compile-goto-if (cond discard tag) | |
27824 | 3304 `(byte-compile-goto |
3305 (if ,cond | |
3306 (if ,discard 'byte-goto-if-not-nil 'byte-goto-if-not-nil-else-pop) | |
3307 (if ,discard 'byte-goto-if-nil 'byte-goto-if-nil-else-pop)) | |
3308 ,tag)) | |
757 | 3309 |
53753
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
3310 (defmacro byte-compile-maybe-guarded (condition &rest body) |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
3311 "Execute forms in BODY, potentially guarded by CONDITION. |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
3312 CONDITION is the test in an `if' form or in a `cond' clause. |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
3313 BODY is to compile the first arm of the if or the body of the |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
3314 cond clause. If CONDITION is of the form `(foundp 'foo)' |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
3315 or `(boundp 'foo)', the relevant warnings from BODY about foo |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
3316 being undefined will be suppressed." |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
3317 (declare (indent 1) (debug t)) |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
3318 `(let* ((fbound |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
3319 (if (eq 'fboundp (car-safe ,condition)) |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
3320 (and (eq 'quote (car-safe (nth 1 ,condition))) |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
3321 ;; Ignore if the symbol is already on the |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
3322 ;; unresolved list. |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
3323 (not (assq (nth 1 (nth 1 ,condition)) ; the relevant symbol |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
3324 byte-compile-unresolved-functions)) |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
3325 (nth 1 (nth 1 ,condition))))) |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
3326 (bound (if (or (eq 'boundp (car-safe ,condition)) |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
3327 (eq 'default-boundp (car-safe ,condition))) |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
3328 (and (eq 'quote (car-safe (nth 1 ,condition))) |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
3329 (nth 1 (nth 1 ,condition))))) |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
3330 ;; Maybe add to the bound list. |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
3331 (byte-compile-bound-variables |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
3332 (if bound |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
3333 (cons bound byte-compile-bound-variables) |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
3334 byte-compile-bound-variables))) |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
3335 (progn ,@body) |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
3336 ;; Maybe remove the function symbol from the unresolved list. |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
3337 (if fbound |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
3338 (setq byte-compile-unresolved-functions |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
3339 (delq (assq fbound byte-compile-unresolved-functions) |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
3340 byte-compile-unresolved-functions))))) |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
3341 |
757 | 3342 (defun byte-compile-if (form) |
3343 (byte-compile-form (car (cdr form))) | |
48822
162c286faa11
(byte-compile-if): Suppress warnings from
Dave Love <fx@gnu.org>
parents:
48719
diff
changeset
|
3344 ;; 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
|
3345 ;; 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
|
3346 (let ((clause (nth 1 form)) |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
3347 (donetag (byte-compile-make-tag))) |
48822
162c286faa11
(byte-compile-if): Suppress warnings from
Dave Love <fx@gnu.org>
parents:
48719
diff
changeset
|
3348 (if (null (nthcdr 3 form)) |
162c286faa11
(byte-compile-if): Suppress warnings from
Dave Love <fx@gnu.org>
parents:
48719
diff
changeset
|
3349 ;; No else-forms |
162c286faa11
(byte-compile-if): Suppress warnings from
Dave Love <fx@gnu.org>
parents:
48719
diff
changeset
|
3350 (progn |
162c286faa11
(byte-compile-if): Suppress warnings from
Dave Love <fx@gnu.org>
parents:
48719
diff
changeset
|
3351 (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
|
3352 (byte-compile-maybe-guarded clause |
48822
162c286faa11
(byte-compile-if): Suppress warnings from
Dave Love <fx@gnu.org>
parents:
48719
diff
changeset
|
3353 (byte-compile-form (nth 2 form) for-effect)) |
162c286faa11
(byte-compile-if): Suppress warnings from
Dave Love <fx@gnu.org>
parents:
48719
diff
changeset
|
3354 (byte-compile-out-tag donetag)) |
162c286faa11
(byte-compile-if): Suppress warnings from
Dave Love <fx@gnu.org>
parents:
48719
diff
changeset
|
3355 (let ((elsetag (byte-compile-make-tag))) |
162c286faa11
(byte-compile-if): Suppress warnings from
Dave Love <fx@gnu.org>
parents:
48719
diff
changeset
|
3356 (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
|
3357 (byte-compile-maybe-guarded clause |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
3358 (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
|
3359 (byte-compile-goto 'byte-goto donetag) |
162c286faa11
(byte-compile-if): Suppress warnings from
Dave Love <fx@gnu.org>
parents:
48719
diff
changeset
|
3360 (byte-compile-out-tag elsetag) |
162c286faa11
(byte-compile-if): Suppress warnings from
Dave Love <fx@gnu.org>
parents:
48719
diff
changeset
|
3361 (byte-compile-body (cdr (cdr (cdr form))) for-effect) |
162c286faa11
(byte-compile-if): Suppress warnings from
Dave Love <fx@gnu.org>
parents:
48719
diff
changeset
|
3362 (byte-compile-out-tag donetag)))) |
757 | 3363 (setq for-effect nil)) |
3364 | |
3365 (defun byte-compile-cond (clauses) | |
3366 (let ((donetag (byte-compile-make-tag)) | |
3367 nexttag clause) | |
3368 (while (setq clauses (cdr clauses)) | |
3369 (setq clause (car clauses)) | |
3370 (cond ((or (eq (car clause) t) | |
3371 (and (eq (car-safe (car clause)) 'quote) | |
3372 (car-safe (cdr-safe (car clause))))) | |
3373 ;; Unconditional clause | |
3374 (setq clause (cons t clause) | |
3375 clauses nil)) | |
3376 ((cdr clauses) | |
3377 (byte-compile-form (car clause)) | |
3378 (if (null (cdr clause)) | |
3379 ;; First clause is a singleton. | |
3380 (byte-compile-goto-if t for-effect donetag) | |
53753
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
3381 (setq nexttag (byte-compile-make-tag)) |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
3382 (byte-compile-goto 'byte-goto-if-nil nexttag) |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
3383 (byte-compile-maybe-guarded (car clause) |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
3384 (byte-compile-body (cdr clause) for-effect)) |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
3385 (byte-compile-goto 'byte-goto donetag) |
93d749070205
(byte-compile-compatibility): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
53575
diff
changeset
|
3386 (byte-compile-out-tag nexttag))))) |
757 | 3387 ;; Last clause |
54790
12b895a7fee2
(byte-compile-cond): Fix last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54770
diff
changeset
|
3388 (let ((guard (car clause))) |
12b895a7fee2
(byte-compile-cond): Fix last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54770
diff
changeset
|
3389 (and (cdr clause) (not (eq guard t)) |
12b895a7fee2
(byte-compile-cond): Fix last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54770
diff
changeset
|
3390 (progn (byte-compile-form guard) |
12b895a7fee2
(byte-compile-cond): Fix last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54770
diff
changeset
|
3391 (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
|
3392 (setq clause (cdr clause)))) |
12b895a7fee2
(byte-compile-cond): Fix last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54770
diff
changeset
|
3393 (byte-compile-maybe-guarded guard |
12b895a7fee2
(byte-compile-cond): Fix last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54770
diff
changeset
|
3394 (byte-compile-body-do-effect clause))) |
757 | 3395 (byte-compile-out-tag donetag))) |
3396 | |
3397 (defun byte-compile-and (form) | |
3398 (let ((failtag (byte-compile-make-tag)) | |
3399 (args (cdr form))) | |
3400 (if (null args) | |
3401 (byte-compile-form-do-effect t) | |
3402 (while (cdr args) | |
3403 (byte-compile-form (car args)) | |
3404 (byte-compile-goto-if nil for-effect failtag) | |
3405 (setq args (cdr args))) | |
3406 (byte-compile-form-do-effect (car args)) | |
3407 (byte-compile-out-tag failtag)))) | |
3408 | |
3409 (defun byte-compile-or (form) | |
3410 (let ((wintag (byte-compile-make-tag)) | |
3411 (args (cdr form))) | |
3412 (if (null args) | |
3413 (byte-compile-form-do-effect nil) | |
3414 (while (cdr args) | |
3415 (byte-compile-form (car args)) | |
3416 (byte-compile-goto-if t for-effect wintag) | |
3417 (setq args (cdr args))) | |
3418 (byte-compile-form-do-effect (car args)) | |
3419 (byte-compile-out-tag wintag)))) | |
3420 | |
3421 (defun byte-compile-while (form) | |
3422 (let ((endtag (byte-compile-make-tag)) | |
3423 (looptag (byte-compile-make-tag))) | |
3424 (byte-compile-out-tag looptag) | |
3425 (byte-compile-form (car (cdr form))) | |
3426 (byte-compile-goto-if nil for-effect endtag) | |
3427 (byte-compile-body (cdr (cdr form)) t) | |
3428 (byte-compile-goto 'byte-goto looptag) | |
3429 (byte-compile-out-tag endtag) | |
3430 (setq for-effect nil))) | |
3431 | |
3432 (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
|
3433 (mapc 'byte-compile-form (cdr form)) |
757 | 3434 (byte-compile-out 'byte-call (length (cdr (cdr form))))) |
3435 | |
3436 | |
3437 (defun byte-compile-let (form) | |
3438 ;; First compute the binding values in the old scope. | |
3439 (let ((varlist (car (cdr form)))) | |
50570
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
3440 (dolist (var varlist) |
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
3441 (if (consp var) |
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
3442 (byte-compile-form (car (cdr var))) |
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
3443 (byte-compile-push-constant nil)))) |
757 | 3444 (let ((byte-compile-bound-variables byte-compile-bound-variables) ;new scope |
3445 (varlist (reverse (car (cdr form))))) | |
50570
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
3446 (dolist (var varlist) |
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
3447 (byte-compile-variable-ref 'byte-varbind (if (consp var) (car var) var))) |
757 | 3448 (byte-compile-body-do-effect (cdr (cdr form))) |
3449 (byte-compile-out 'byte-unbind (length (car (cdr form)))))) | |
3450 | |
3451 (defun byte-compile-let* (form) | |
3452 (let ((byte-compile-bound-variables byte-compile-bound-variables) ;new scope | |
3453 (varlist (copy-sequence (car (cdr form))))) | |
50570
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
3454 (dolist (var varlist) |
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
3455 (if (atom var) |
757 | 3456 (byte-compile-push-constant nil) |
50570
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
3457 (byte-compile-form (car (cdr var))) |
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
3458 (setq var (car var))) |
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
3459 (byte-compile-variable-ref 'byte-varbind var)) |
757 | 3460 (byte-compile-body-do-effect (cdr (cdr form))) |
3461 (byte-compile-out 'byte-unbind (length (car (cdr form)))))) | |
3462 | |
3463 | |
3464 (byte-defop-compiler-1 /= byte-compile-negated) | |
3465 (byte-defop-compiler-1 atom byte-compile-negated) | |
3466 (byte-defop-compiler-1 nlistp byte-compile-negated) | |
3467 | |
3468 (put '/= 'byte-compile-negated-op '=) | |
3469 (put 'atom 'byte-compile-negated-op 'consp) | |
3470 (put 'nlistp 'byte-compile-negated-op 'listp) | |
3471 | |
3472 (defun byte-compile-negated (form) | |
3473 (byte-compile-form-do-effect (byte-compile-negation-optimizer form))) | |
3474 | |
3475 ;; Even when optimization is off, /= is optimized to (not (= ...)). | |
3476 (defun byte-compile-negation-optimizer (form) | |
3477 ;; 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
|
3478 (byte-compile-set-symbol-position (car form)) |
757 | 3479 (list 'not |
3480 (cons (or (get (car form) 'byte-compile-negated-op) | |
3481 (error | |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
3482 "Compiler error: `%s' has no `byte-compile-negated-op' property" |
757 | 3483 (car form))) |
3484 (cdr form)))) | |
3485 | |
3486 ;;; other tricky macro-like special-forms | |
3487 | |
3488 (byte-defop-compiler-1 catch) | |
3489 (byte-defop-compiler-1 unwind-protect) | |
3490 (byte-defop-compiler-1 condition-case) | |
3491 (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
|
3492 (byte-defop-compiler-1 save-current-buffer) |
757 | 3493 (byte-defop-compiler-1 save-restriction) |
3494 (byte-defop-compiler-1 save-window-excursion) | |
3495 (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
|
3496 (byte-defop-compiler-1 track-mouse) |
757 | 3497 |
3498 (defun byte-compile-catch (form) | |
3499 (byte-compile-form (car (cdr form))) | |
3500 (byte-compile-push-constant | |
3501 (byte-compile-top-level (cons 'progn (cdr (cdr form))) for-effect)) | |
3502 (byte-compile-out 'byte-catch 0)) | |
3503 | |
3504 (defun byte-compile-unwind-protect (form) | |
3505 (byte-compile-push-constant | |
3506 (byte-compile-top-level-body (cdr (cdr form)) t)) | |
3507 (byte-compile-out 'byte-unwind-protect 0) | |
3508 (byte-compile-form-do-effect (car (cdr form))) | |
3509 (byte-compile-out 'byte-unbind 1)) | |
3510 | |
2798
e2f296263868
(byte-compile-track-mouse): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2735
diff
changeset
|
3511 (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
|
3512 (byte-compile-form |
50570
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
3513 `(funcall '(lambda nil |
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
3514 (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
|
3515 |
757 | 3516 (defun byte-compile-condition-case (form) |
3517 (let* ((var (nth 1 form)) | |
3518 (byte-compile-bound-variables | |
3519 (if var (cons var byte-compile-bound-variables) | |
3520 byte-compile-bound-variables))) | |
45558
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
3521 (byte-compile-set-symbol-position 'condition-case) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
3522 (unless (symbolp var) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
3523 (byte-compile-warn |
56082
36284d653673
Put `...' around symbols in warning messages.
Richard M. Stallman <rms@gnu.org>
parents:
55694
diff
changeset
|
3524 "`%s' is not a variable-name or nil (in condition-case)" var)) |
757 | 3525 (byte-compile-push-constant var) |
3526 (byte-compile-push-constant (byte-compile-top-level | |
3527 (nth 2 form) for-effect)) | |
3528 (let ((clauses (cdr (cdr (cdr form)))) | |
3529 compiled-clauses) | |
3530 (while clauses | |
3653
974055b516d9
* bytecomp.el: Bring it up to version 2.10 of the
Jim Blandy <jimb@redhat.com>
parents:
3591
diff
changeset
|
3531 (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
|
3532 (condition (car clause))) |
5562
2b3d2ea74ce1
(byte-compile-condition-case): Disable warning about
Richard M. Stallman <rms@gnu.org>
parents:
5454
diff
changeset
|
3533 (cond ((not (or (symbolp condition) |
2b3d2ea74ce1
(byte-compile-condition-case): Disable warning about
Richard M. Stallman <rms@gnu.org>
parents:
5454
diff
changeset
|
3534 (and (listp condition) |
2b3d2ea74ce1
(byte-compile-condition-case): Disable warning about
Richard M. Stallman <rms@gnu.org>
parents:
5454
diff
changeset
|
3535 (let ((syms condition) (ok t)) |
2b3d2ea74ce1
(byte-compile-condition-case): Disable warning about
Richard M. Stallman <rms@gnu.org>
parents:
5454
diff
changeset
|
3536 (while syms |
2b3d2ea74ce1
(byte-compile-condition-case): Disable warning about
Richard M. Stallman <rms@gnu.org>
parents:
5454
diff
changeset
|
3537 (if (not (symbolp (car syms))) |
2b3d2ea74ce1
(byte-compile-condition-case): Disable warning about
Richard M. Stallman <rms@gnu.org>
parents:
5454
diff
changeset
|
3538 (setq ok nil)) |
2b3d2ea74ce1
(byte-compile-condition-case): Disable warning about
Richard M. Stallman <rms@gnu.org>
parents:
5454
diff
changeset
|
3539 (setq syms (cdr syms))) |
2b3d2ea74ce1
(byte-compile-condition-case): Disable warning about
Richard M. Stallman <rms@gnu.org>
parents:
5454
diff
changeset
|
3540 ok)))) |
3653
974055b516d9
* bytecomp.el: Bring it up to version 2.10 of the
Jim Blandy <jimb@redhat.com>
parents:
3591
diff
changeset
|
3541 (byte-compile-warn |
56082
36284d653673
Put `...' around symbols in warning messages.
Richard M. Stallman <rms@gnu.org>
parents:
55694
diff
changeset
|
3542 "`%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
|
3543 (prin1-to-string condition))) |
5562
2b3d2ea74ce1
(byte-compile-condition-case): Disable warning about
Richard M. Stallman <rms@gnu.org>
parents:
5454
diff
changeset
|
3544 ;; ((not (or (eq condition 't) |
2b3d2ea74ce1
(byte-compile-condition-case): Disable warning about
Richard M. Stallman <rms@gnu.org>
parents:
5454
diff
changeset
|
3545 ;; (and (stringp (get condition 'error-message)) |
2b3d2ea74ce1
(byte-compile-condition-case): Disable warning about
Richard M. Stallman <rms@gnu.org>
parents:
5454
diff
changeset
|
3546 ;; (consp (get condition 'error-conditions))))) |
2b3d2ea74ce1
(byte-compile-condition-case): Disable warning about
Richard M. Stallman <rms@gnu.org>
parents:
5454
diff
changeset
|
3547 ;; (byte-compile-warn |
56082
36284d653673
Put `...' around symbols in warning messages.
Richard M. Stallman <rms@gnu.org>
parents:
55694
diff
changeset
|
3548 ;; "`%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
|
3549 ;; condition)) |
2b3d2ea74ce1
(byte-compile-condition-case): Disable warning about
Richard M. Stallman <rms@gnu.org>
parents:
5454
diff
changeset
|
3550 ) |
757 | 3551 (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
|
3552 (cons (cons condition |
757 | 3553 (byte-compile-top-level-body |
3554 (cdr clause) for-effect)) | |
3555 compiled-clauses))) | |
3556 (setq clauses (cdr clauses))) | |
3557 (byte-compile-push-constant (nreverse compiled-clauses))) | |
3558 (byte-compile-out 'byte-condition-case 0))) | |
3559 | |
3560 | |
3561 (defun byte-compile-save-excursion (form) | |
3562 (byte-compile-out 'byte-save-excursion 0) | |
3563 (byte-compile-body-do-effect (cdr form)) | |
3564 (byte-compile-out 'byte-unbind 1)) | |
3565 | |
3566 (defun byte-compile-save-restriction (form) | |
3567 (byte-compile-out 'byte-save-restriction 0) | |
3568 (byte-compile-body-do-effect (cdr form)) | |
3569 (byte-compile-out 'byte-unbind 1)) | |
3570 | |
16274
e9819849c533
(save-current-buffer): Compile it like save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
16232
diff
changeset
|
3571 (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
|
3572 (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
|
3573 (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
|
3574 (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
|
3575 |
757 | 3576 (defun byte-compile-save-window-excursion (form) |
3577 (byte-compile-push-constant | |
3578 (byte-compile-top-level-body (cdr form) for-effect)) | |
3579 (byte-compile-out 'byte-save-window-excursion 0)) | |
3580 | |
3581 (defun byte-compile-with-output-to-temp-buffer (form) | |
3582 (byte-compile-form (car (cdr form))) | |
3583 (byte-compile-out 'byte-temp-output-buffer-setup 0) | |
3584 (byte-compile-body (cdr (cdr form))) | |
3585 (byte-compile-out 'byte-temp-output-buffer-show 0)) | |
3586 | |
3587 ;;; top-level forms elsewhere | |
3588 | |
3589 (byte-defop-compiler-1 defun) | |
3590 (byte-defop-compiler-1 defmacro) | |
3591 (byte-defop-compiler-1 defvar) | |
3592 (byte-defop-compiler-1 defconst byte-compile-defvar) | |
3593 (byte-defop-compiler-1 autoload) | |
3594 (byte-defop-compiler-1 lambda byte-compile-lambda-form) | |
8086
9f6348616e4d
(byte-compile-callargs-warn): Handle function defnition
Richard M. Stallman <rms@gnu.org>
parents:
7298
diff
changeset
|
3595 (byte-defop-compiler-1 defalias) |
757 | 3596 |
3597 (defun byte-compile-defun (form) | |
3598 ;; 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
|
3599 (if (symbolp (car form)) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
3600 (byte-compile-set-symbol-position (car form)) |
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
3601 (byte-compile-set-symbol-position 'defun) |
39827
d9f8c7370b3a
(byte-compile-check-lambda-list): New
Gerd Moellmann <gerd@gnu.org>
parents:
39769
diff
changeset
|
3602 (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
|
3603 (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
|
3604 (progn |
ae1e2c38d746
(byte-compile-defun): Generate and compile a defalias form,
Richard M. Stallman <rms@gnu.org>
parents:
50658
diff
changeset
|
3605 (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
|
3606 (list 'fset |
ae1e2c38d746
(byte-compile-defun): Generate and compile a defalias form,
Richard M. Stallman <rms@gnu.org>
parents:
50658
diff
changeset
|
3607 (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
|
3608 (byte-compile-byte-code-maker |
ae1e2c38d746
(byte-compile-defun): Generate and compile a defalias form,
Richard M. Stallman <rms@gnu.org>
parents:
50658
diff
changeset
|
3609 (byte-compile-lambda (cons 'lambda (cdr (cdr form))))))) |
ae1e2c38d746
(byte-compile-defun): Generate and compile a defalias form,
Richard M. Stallman <rms@gnu.org>
parents:
50658
diff
changeset
|
3610 (byte-compile-discard)) |
50681 | 3611 ;; We prefer to generate a defalias form so it will record the function |
50682 | 3612 ;; 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
|
3613 (byte-compile-form |
ae1e2c38d746
(byte-compile-defun): Generate and compile a defalias form,
Richard M. Stallman <rms@gnu.org>
parents:
50658
diff
changeset
|
3614 (list 'defalias |
ae1e2c38d746
(byte-compile-defun): Generate and compile a defalias form,
Richard M. Stallman <rms@gnu.org>
parents:
50658
diff
changeset
|
3615 (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
|
3616 (byte-compile-byte-code-maker |
ae1e2c38d746
(byte-compile-defun): Generate and compile a defalias form,
Richard M. Stallman <rms@gnu.org>
parents:
50658
diff
changeset
|
3617 (byte-compile-lambda (cons 'lambda (cdr (cdr form)))))) |
ae1e2c38d746
(byte-compile-defun): Generate and compile a defalias form,
Richard M. Stallman <rms@gnu.org>
parents:
50658
diff
changeset
|
3618 t)) |
757 | 3619 (byte-compile-constant (nth 1 form))) |
3620 | |
3621 (defun byte-compile-defmacro (form) | |
3622 ;; This is not used for file-level defmacros with doc strings. | |
3623 (byte-compile-body-do-effect | |
3624 (list (list 'fset (list 'quote (nth 1 form)) | |
3625 (let ((code (byte-compile-byte-code-maker | |
3626 (byte-compile-lambda | |
3627 (cons 'lambda (cdr (cdr form))))))) | |
3628 (if (eq (car-safe code) 'make-byte-code) | |
3629 (list 'cons ''macro code) | |
3630 (list 'quote (cons 'macro (eval code)))))) | |
3631 (list 'quote (nth 1 form))))) | |
3632 | |
3633 (defun byte-compile-defvar (form) | |
3634 ;; 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
|
3635 (let ((fun (nth 0 form)) |
02bf229fa2be
(byte-compile-defvar-or-defconst): Only cons onto
Gerd Moellmann <gerd@gnu.org>
parents:
31552
diff
changeset
|
3636 (var (nth 1 form)) |
757 | 3637 (value (nth 2 form)) |
3638 (string (nth 3 form))) | |
45558
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
3639 (byte-compile-set-symbol-position fun) |
50570
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
3640 (when (or (> (length form) 4) |
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
3641 (and (eq fun 'defconst) (null (cddr form)))) |
50658
94bb873a9f0d
(byte-compile-defvar): Improve message.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50639
diff
changeset
|
3642 (let ((ncall (length (cdr form)))) |
94bb873a9f0d
(byte-compile-defvar): Improve message.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50639
diff
changeset
|
3643 (byte-compile-warn |
56082
36284d653673
Put `...' around symbols in warning messages.
Richard M. Stallman <rms@gnu.org>
parents:
55694
diff
changeset
|
3644 "`%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
|
3645 fun ncall |
94bb873a9f0d
(byte-compile-defvar): Improve message.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50639
diff
changeset
|
3646 (if (= 1 ncall) "" "s") |
94bb873a9f0d
(byte-compile-defvar): Improve message.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50639
diff
changeset
|
3647 (if (< ncall 2) "requires" "accepts only") |
94bb873a9f0d
(byte-compile-defvar): Improve message.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50639
diff
changeset
|
3648 "2-3"))) |
31882
02bf229fa2be
(byte-compile-defvar-or-defconst): Only cons onto
Gerd Moellmann <gerd@gnu.org>
parents:
31552
diff
changeset
|
3649 (when (memq 'free-vars byte-compile-warnings) |
50573
e80e4ccf1bfc
(byte-compile-file-form-defvar, byte-compile-defvar):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50570
diff
changeset
|
3650 (push var byte-compile-bound-variables) |
50570
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
3651 (if (eq fun 'defconst) |
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
3652 (push var byte-compile-const-variables))) |
757 | 3653 (byte-compile-body-do-effect |
31882
02bf229fa2be
(byte-compile-defvar-or-defconst): Only cons onto
Gerd Moellmann <gerd@gnu.org>
parents:
31552
diff
changeset
|
3654 (list |
02bf229fa2be
(byte-compile-defvar-or-defconst): Only cons onto
Gerd Moellmann <gerd@gnu.org>
parents:
31552
diff
changeset
|
3655 ;; 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
|
3656 ;; 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
|
3657 (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
|
3658 `(push ',var current-load-list)) |
02bf229fa2be
(byte-compile-defvar-or-defconst): Only cons onto
Gerd Moellmann <gerd@gnu.org>
parents:
31552
diff
changeset
|
3659 (when (> (length form) 3) |
02bf229fa2be
(byte-compile-defvar-or-defconst): Only cons onto
Gerd Moellmann <gerd@gnu.org>
parents:
31552
diff
changeset
|
3660 (when (and string (not (stringp string))) |
56082
36284d653673
Put `...' around symbols in warning messages.
Richard M. Stallman <rms@gnu.org>
parents:
55694
diff
changeset
|
3661 (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
|
3662 fun var string)) |
02bf229fa2be
(byte-compile-defvar-or-defconst): Only cons onto
Gerd Moellmann <gerd@gnu.org>
parents:
31552
diff
changeset
|
3663 `(put ',var 'variable-documentation ,string)) |
41176
2d63191afacd
(byte-compile-call-tree, byte-code-vector)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40451
diff
changeset
|
3664 (if (cddr form) ; `value' provided |
52133
4c112142c56f
(byte-compile-not-obsolete-var): New var.
Richard M. Stallman <rms@gnu.org>
parents:
51737
diff
changeset
|
3665 (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
|
3666 (if (eq fun 'defconst) |
4c112142c56f
(byte-compile-not-obsolete-var): New var.
Richard M. Stallman <rms@gnu.org>
parents:
51737
diff
changeset
|
3667 ;; `defconst' sets `var' unconditionally. |
4c112142c56f
(byte-compile-not-obsolete-var): New var.
Richard M. Stallman <rms@gnu.org>
parents:
51737
diff
changeset
|
3668 (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
|
3669 `(funcall '(lambda (,tmp) (defconst ,var ,tmp)) |
4c112142c56f
(byte-compile-not-obsolete-var): New var.
Richard M. Stallman <rms@gnu.org>
parents:
51737
diff
changeset
|
3670 ,value)) |
4c112142c56f
(byte-compile-not-obsolete-var): New var.
Richard M. Stallman <rms@gnu.org>
parents:
51737
diff
changeset
|
3671 ;; `defvar' sets `var' only when unbound. |
4c112142c56f
(byte-compile-not-obsolete-var): New var.
Richard M. Stallman <rms@gnu.org>
parents:
51737
diff
changeset
|
3672 `(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
|
3673 (when (eq fun 'defconst) |
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
3674 ;; 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
|
3675 `(eval ',form))) |
31882
02bf229fa2be
(byte-compile-defvar-or-defconst): Only cons onto
Gerd Moellmann <gerd@gnu.org>
parents:
31552
diff
changeset
|
3676 `',var)))) |
757 | 3677 |
3678 (defun byte-compile-autoload (form) | |
45558
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
3679 (byte-compile-set-symbol-position 'autoload) |
757 | 3680 (and (byte-compile-constp (nth 1 form)) |
3681 (byte-compile-constp (nth 5 form)) | |
3682 (eval (nth 5 form)) ; macro-p | |
3683 (not (fboundp (eval (nth 1 form)))) | |
3684 (byte-compile-warn | |
28402 | 3685 "The compiler ignores `autoload' except at top level. You should |
757 | 3686 probably put the autoload of the macro `%s' at top-level." |
3687 (eval (nth 1 form)))) | |
3688 (byte-compile-normal-call form)) | |
3689 | |
28402 | 3690 ;; Lambdas in valid places are handled as special cases by various code. |
757 | 3691 ;; The ones that remain are errors. |
3692 (defun byte-compile-lambda-form (form) | |
45558
483a39fc5666
(byte-compile-last-line): Deleted.
Colin Walters <walters@gnu.org>
parents:
44130
diff
changeset
|
3693 (byte-compile-set-symbol-position 'lambda) |
757 | 3694 (error "`lambda' used as function name is invalid")) |
3695 | |
8086
9f6348616e4d
(byte-compile-callargs-warn): Handle function defnition
Richard M. Stallman <rms@gnu.org>
parents:
7298
diff
changeset
|
3696 ;; Compile normally, but deal with warnings for the function being defined. |
9f6348616e4d
(byte-compile-callargs-warn): Handle function defnition
Richard M. Stallman <rms@gnu.org>
parents:
7298
diff
changeset
|
3697 (defun byte-compile-defalias (form) |
9f6348616e4d
(byte-compile-callargs-warn): Handle function defnition
Richard M. Stallman <rms@gnu.org>
parents:
7298
diff
changeset
|
3698 (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
|
3699 (eq (car (nth 1 form)) 'quote) |
9f6348616e4d
(byte-compile-callargs-warn): Handle function defnition
Richard M. Stallman <rms@gnu.org>
parents:
7298
diff
changeset
|
3700 (consp (cdr (nth 1 form))) |
9f6348616e4d
(byte-compile-callargs-warn): Handle function defnition
Richard M. Stallman <rms@gnu.org>
parents:
7298
diff
changeset
|
3701 (symbolp (nth 1 (nth 1 form))) |
9f6348616e4d
(byte-compile-callargs-warn): Handle function defnition
Richard M. Stallman <rms@gnu.org>
parents:
7298
diff
changeset
|
3702 (consp (nthcdr 2 form)) |
9f6348616e4d
(byte-compile-callargs-warn): Handle function defnition
Richard M. Stallman <rms@gnu.org>
parents:
7298
diff
changeset
|
3703 (consp (nth 2 form)) |
9f6348616e4d
(byte-compile-callargs-warn): Handle function defnition
Richard M. Stallman <rms@gnu.org>
parents:
7298
diff
changeset
|
3704 (eq (car (nth 2 form)) 'quote) |
9f6348616e4d
(byte-compile-callargs-warn): Handle function defnition
Richard M. Stallman <rms@gnu.org>
parents:
7298
diff
changeset
|
3705 (consp (cdr (nth 2 form))) |
9f6348616e4d
(byte-compile-callargs-warn): Handle function defnition
Richard M. Stallman <rms@gnu.org>
parents:
7298
diff
changeset
|
3706 (symbolp (nth 1 (nth 2 form)))) |
9f6348616e4d
(byte-compile-callargs-warn): Handle function defnition
Richard M. Stallman <rms@gnu.org>
parents:
7298
diff
changeset
|
3707 (progn |
50570
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
3708 (byte-compile-defalias-warn (nth 1 (nth 1 form))) |
8086
9f6348616e4d
(byte-compile-callargs-warn): Handle function defnition
Richard M. Stallman <rms@gnu.org>
parents:
7298
diff
changeset
|
3709 (setq byte-compile-function-environment |
9f6348616e4d
(byte-compile-callargs-warn): Handle function defnition
Richard M. Stallman <rms@gnu.org>
parents:
7298
diff
changeset
|
3710 (cons (cons (nth 1 (nth 1 form)) |
9f6348616e4d
(byte-compile-callargs-warn): Handle function defnition
Richard M. Stallman <rms@gnu.org>
parents:
7298
diff
changeset
|
3711 (nth 1 (nth 2 form))) |
9f6348616e4d
(byte-compile-callargs-warn): Handle function defnition
Richard M. Stallman <rms@gnu.org>
parents:
7298
diff
changeset
|
3712 byte-compile-function-environment)))) |
8115
e45d541e55cf
(byte-compile-defalias): Fix typo in prev change.
Richard M. Stallman <rms@gnu.org>
parents:
8086
diff
changeset
|
3713 (byte-compile-normal-call form)) |
8086
9f6348616e4d
(byte-compile-callargs-warn): Handle function defnition
Richard M. Stallman <rms@gnu.org>
parents:
7298
diff
changeset
|
3714 |
9f6348616e4d
(byte-compile-callargs-warn): Handle function defnition
Richard M. Stallman <rms@gnu.org>
parents:
7298
diff
changeset
|
3715 ;; 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
|
3716 ;; 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
|
3717 ;; 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
|
3718 (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
|
3719 (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
|
3720 (if calls |
9f6348616e4d
(byte-compile-callargs-warn): Handle function defnition
Richard M. Stallman <rms@gnu.org>
parents:
7298
diff
changeset
|
3721 (setq byte-compile-unresolved-functions |
9f6348616e4d
(byte-compile-callargs-warn): Handle function defnition
Richard M. Stallman <rms@gnu.org>
parents:
7298
diff
changeset
|
3722 (delq calls byte-compile-unresolved-functions))))) |
51289
ba101d1e9521
(byte-compile-no-warnings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
50837
diff
changeset
|
3723 |
ba101d1e9521
(byte-compile-no-warnings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
50837
diff
changeset
|
3724 (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
|
3725 (defun byte-compile-no-warnings (form) |
ba101d1e9521
(byte-compile-no-warnings): New function.
Richard M. Stallman <rms@gnu.org>
parents:
50837
diff
changeset
|
3726 (let (byte-compile-warnings) |
55043 | 3727 (byte-compile-form (cons 'progn (cdr form))))) |
757 | 3728 |
3729 ;;; tags | |
3730 | |
3731 ;; Note: Most operations will strip off the 'TAG, but it speeds up | |
3732 ;; optimization to have the 'TAG as a part of the tag. | |
3733 ;; Tags will be (TAG . (tag-number . stack-depth)). | |
3734 (defun byte-compile-make-tag () | |
3735 (list 'TAG (setq byte-compile-tag-number (1+ byte-compile-tag-number)))) | |
3736 | |
3737 | |
3738 (defun byte-compile-out-tag (tag) | |
3739 (setq byte-compile-output (cons tag byte-compile-output)) | |
3740 (if (cdr (cdr tag)) | |
3741 (progn | |
3742 ;; ## remove this someday | |
3743 (and byte-compile-depth | |
3744 (not (= (cdr (cdr tag)) byte-compile-depth)) | |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
3745 (error "Compiler bug: depth conflict at tag %d" (car (cdr tag)))) |
757 | 3746 (setq byte-compile-depth (cdr (cdr tag)))) |
3747 (setcdr (cdr tag) byte-compile-depth))) | |
3748 | |
3749 (defun byte-compile-goto (opcode tag) | |
50570
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
3750 (push (cons opcode tag) byte-compile-output) |
757 | 3751 (setcdr (cdr tag) (if (memq opcode byte-goto-always-pop-ops) |
3752 (1- byte-compile-depth) | |
3753 byte-compile-depth)) | |
3754 (setq byte-compile-depth (and (not (eq opcode 'byte-goto)) | |
3755 (1- byte-compile-depth)))) | |
3756 | |
3757 (defun byte-compile-out (opcode offset) | |
50570
80ed0fdbf171
Use push, with-current-buffer, dolist, ...
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49821
diff
changeset
|
3758 (push (cons opcode offset) byte-compile-output) |
757 | 3759 (cond ((eq opcode 'byte-call) |
3760 (setq byte-compile-depth (- byte-compile-depth offset))) | |
3761 ((eq opcode 'byte-return) | |
3762 ;; This is actually an unnecessary case, because there should be | |
3763 ;; no more opcodes behind byte-return. | |
3764 (setq byte-compile-depth nil)) | |
3765 (t | |
3766 (setq byte-compile-depth (+ byte-compile-depth | |
3767 (or (aref byte-stack+-info | |
3768 (symbol-value opcode)) | |
3769 (- (1- offset)))) | |
3770 byte-compile-maxdepth (max byte-compile-depth | |
3771 byte-compile-maxdepth)))) | |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
3772 ;;(if (< byte-compile-depth 0) (error "Compiler error: stack underflow")) |
757 | 3773 ) |
3774 | |
3775 | |
3776 ;;; call tree stuff | |
3777 | |
3778 (defun byte-compile-annotate-call-tree (form) | |
3779 (let (entry) | |
3780 ;; annotate the current call | |
3781 (if (setq entry (assq (car form) byte-compile-call-tree)) | |
3782 (or (memq byte-compile-current-form (nth 1 entry)) ;callers | |
3783 (setcar (cdr entry) | |
3784 (cons byte-compile-current-form (nth 1 entry)))) | |
3785 (setq byte-compile-call-tree | |
3786 (cons (list (car form) (list byte-compile-current-form) nil) | |
3787 byte-compile-call-tree))) | |
3788 ;; annotate the current function | |
3789 (if (setq entry (assq byte-compile-current-form byte-compile-call-tree)) | |
3790 (or (memq (car form) (nth 2 entry)) ;called | |
3791 (setcar (cdr (cdr entry)) | |
3792 (cons (car form) (nth 2 entry)))) | |
3793 (setq byte-compile-call-tree | |
3794 (cons (list byte-compile-current-form nil (list (car form))) | |
3795 byte-compile-call-tree))) | |
3796 )) | |
3797 | |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
3798 ;; Renamed from byte-compile-report-call-tree |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
3799 ;; to avoid interfering with completion of byte-compile-file. |
819
5bbabfcef929
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
784
diff
changeset
|
3800 ;;;###autoload |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
3801 (defun display-call-tree (&optional filename) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
3802 "Display a call graph of a specified file. |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
3803 This lists which functions have been called, what functions called |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
3804 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
|
3805 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
|
3806 all functions called by those functions. |
757 | 3807 |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
3808 The call graph does not include macros, inline functions, or |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
3809 primitives that the byte-code interpreter knows about directly \(eq, |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
3810 cons, etc.\). |
757 | 3811 |
3812 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
|
3813 \(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
|
3814 invoked interactively." |
757 | 3815 (interactive) |
3816 (message "Generating call tree...") | |
3817 (with-output-to-temp-buffer "*Call-Tree*" | |
3818 (set-buffer "*Call-Tree*") | |
3819 (erase-buffer) | |
10687
1bd70186f894
(byte-compile-file-form-defmumble, display-call-tree): Print ellipsis earlier,
Karl Heuer <kwzh@gnu.org>
parents:
10514
diff
changeset
|
3820 (message "Generating call tree... (sorting on %s)" |
757 | 3821 byte-compile-call-tree-sort) |
3822 (insert "Call tree for " | |
3823 (cond ((null byte-compile-current-file) (or filename "???")) | |
3824 ((stringp byte-compile-current-file) | |
3825 byte-compile-current-file) | |
3826 (t (buffer-name byte-compile-current-file))) | |
3827 " sorted on " | |
3828 (prin1-to-string byte-compile-call-tree-sort) | |
3829 ":\n\n") | |
3830 (if byte-compile-call-tree-sort | |
3831 (setq byte-compile-call-tree | |
3832 (sort byte-compile-call-tree | |
3833 (cond ((eq byte-compile-call-tree-sort 'callers) | |
3834 (function (lambda (x y) (< (length (nth 1 x)) | |
3835 (length (nth 1 y)))))) | |
3836 ((eq byte-compile-call-tree-sort 'calls) | |
3837 (function (lambda (x y) (< (length (nth 2 x)) | |
3838 (length (nth 2 y)))))) | |
3839 ((eq byte-compile-call-tree-sort 'calls+callers) | |
3840 (function (lambda (x y) (< (+ (length (nth 1 x)) | |
3841 (length (nth 2 x))) | |
3842 (+ (length (nth 1 y)) | |
3843 (length (nth 2 y))))))) | |
3844 ((eq byte-compile-call-tree-sort 'name) | |
3845 (function (lambda (x y) (string< (car x) | |
3846 (car y))))) | |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
3847 (t (error "`byte-compile-call-tree-sort': `%s' - unknown sort mode" |
757 | 3848 byte-compile-call-tree-sort)))))) |
3849 (message "Generating call tree...") | |
3850 (let ((rest byte-compile-call-tree) | |
3851 (b (current-buffer)) | |
3852 f p | |
3853 callers calls) | |
3854 (while rest | |
3855 (prin1 (car (car rest)) b) | |
3856 (setq callers (nth 1 (car rest)) | |
3857 calls (nth 2 (car rest))) | |
3858 (insert "\t" | |
3859 (cond ((not (fboundp (setq f (car (car rest))))) | |
3860 (if (null f) | |
3861 " <top level>";; shouldn't insert nil then, actually -sk | |
3862 " <not defined>")) | |
3863 ((subrp (setq f (symbol-function f))) | |
3864 " <subr>") | |
3865 ((symbolp f) | |
3866 (format " ==> %s" f)) | |
1819
df06a60f3362
* disass.el (disassemble): Add autoload cookie for this.
Jim Blandy <jimb@redhat.com>
parents:
1604
diff
changeset
|
3867 ((byte-code-function-p f) |
757 | 3868 "<compiled function>") |
3869 ((not (consp f)) | |
3870 "<malformed function>") | |
3871 ((eq 'macro (car f)) | |
1819
df06a60f3362
* disass.el (disassemble): Add autoload cookie for this.
Jim Blandy <jimb@redhat.com>
parents:
1604
diff
changeset
|
3872 (if (or (byte-code-function-p (cdr f)) |
757 | 3873 (assq 'byte-code (cdr (cdr (cdr f))))) |
3874 " <compiled macro>" | |
3875 " <macro>")) | |
3876 ((assq 'byte-code (cdr (cdr f))) | |
3877 "<compiled lambda>") | |
3878 ((eq 'lambda (car f)) | |
3879 "<function>") | |
3880 (t "???")) | |
3881 (format " (%d callers + %d calls = %d)" | |
3882 ;; Does the optimizer eliminate common subexpressions?-sk | |
3883 (length callers) | |
3884 (length calls) | |
3885 (+ (length callers) (length calls))) | |
3886 "\n") | |
3887 (if callers | |
3888 (progn | |
3889 (insert " called by:\n") | |
3890 (setq p (point)) | |
3891 (insert " " (if (car callers) | |
3892 (mapconcat 'symbol-name callers ", ") | |
3893 "<top level>")) | |
3894 (let ((fill-prefix " ")) | |
57004
e9a116c0f176
(byte-compile-generate-call-tree): Doc fix.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56657
diff
changeset
|
3895 (fill-region-as-paragraph p (point))) |
e9a116c0f176
(byte-compile-generate-call-tree): Doc fix.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56657
diff
changeset
|
3896 (unless (= 0 (current-column)) |
e9a116c0f176
(byte-compile-generate-call-tree): Doc fix.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56657
diff
changeset
|
3897 (insert "\n")))) |
757 | 3898 (if calls |
3899 (progn | |
3900 (insert " calls:\n") | |
3901 (setq p (point)) | |
3902 (insert " " (mapconcat 'symbol-name calls ", ")) | |
3903 (let ((fill-prefix " ")) | |
57004
e9a116c0f176
(byte-compile-generate-call-tree): Doc fix.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56657
diff
changeset
|
3904 (fill-region-as-paragraph p (point))) |
e9a116c0f176
(byte-compile-generate-call-tree): Doc fix.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56657
diff
changeset
|
3905 (unless (= 0 (current-column)) |
e9a116c0f176
(byte-compile-generate-call-tree): Doc fix.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56657
diff
changeset
|
3906 (insert "\n")))) |
757 | 3907 (setq rest (cdr rest))) |
3908 | |
3909 (message "Generating call tree...(finding uncalled functions...)") | |
3910 (setq rest byte-compile-call-tree) | |
3911 (let ((uncalled nil)) | |
3912 (while rest | |
3913 (or (nth 1 (car rest)) | |
3914 (null (setq f (car (car rest)))) | |
3915 (byte-compile-fdefinition f t) | |
3916 (commandp (byte-compile-fdefinition f nil)) | |
3917 (setq uncalled (cons f uncalled))) | |
3918 (setq rest (cdr rest))) | |
3919 (if uncalled | |
3920 (let ((fill-prefix " ")) | |
3921 (insert "Noninteractive functions not known to be called:\n ") | |
3922 (setq p (point)) | |
3923 (insert (mapconcat 'symbol-name (nreverse uncalled) ", ")) | |
3924 (fill-region-as-paragraph p (point))))) | |
3925 ) | |
3926 (message "Generating call tree...done.") | |
3927 )) | |
3928 | |
3929 | |
44103
f93538d76117
(batch-byte-compile-if-not-done): Add autoload cookie.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43027
diff
changeset
|
3930 ;;;###autoload |
43027
4c6cdfeb929c
(batch-byte-compile): New arg noforce.
Richard M. Stallman <rms@gnu.org>
parents:
41176
diff
changeset
|
3931 (defun batch-byte-compile-if-not-done () |
4c6cdfeb929c
(batch-byte-compile): New arg noforce.
Richard M. Stallman <rms@gnu.org>
parents:
41176
diff
changeset
|
3932 "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
|
3933 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
|
3934 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
|
3935 (batch-byte-compile t)) |
4c6cdfeb929c
(batch-byte-compile): New arg noforce.
Richard M. Stallman <rms@gnu.org>
parents:
41176
diff
changeset
|
3936 |
757 | 3937 ;;; by crl@newton.purdue.edu |
3938 ;;; Only works noninteractively. | |
819
5bbabfcef929
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
784
diff
changeset
|
3939 ;;;###autoload |
43027
4c6cdfeb929c
(batch-byte-compile): New arg noforce.
Richard M. Stallman <rms@gnu.org>
parents:
41176
diff
changeset
|
3940 (defun batch-byte-compile (&optional noforce) |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
3941 "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
|
3942 Use this from the command line, with `-batch'; |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
3943 it won't work in an interactive Emacs. |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
3944 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
|
3945 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
|
3946 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
|
3947 already up-to-date." |
757 | 3948 ;; command-line-args-left is what is left of the command line (from startup.el) |
3949 (defvar command-line-args-left) ;Avoid 'free variable' warning | |
3950 (if (not noninteractive) | |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
3951 (error "`batch-byte-compile' is to be used only with -batch")) |
757 | 3952 (let ((error nil)) |
3953 (while command-line-args-left | |
3954 (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
|
3955 ;; Directory as argument. |
757 | 3956 (let ((files (directory-files (car command-line-args-left))) |
3957 source dest) | |
40451
9c7e47dd60be
(byte-recompile-directory): Report numbers of files skipped and failed too.
Sam Steingold <sds@gnu.org>
parents:
40035
diff
changeset
|
3958 (dolist (file files) |
9c7e47dd60be
(byte-recompile-directory): Report numbers of files skipped and failed too.
Sam Steingold <sds@gnu.org>
parents:
40035
diff
changeset
|
3959 (if (and (string-match emacs-lisp-file-regexp file) |
9c7e47dd60be
(byte-recompile-directory): Report numbers of files skipped and failed too.
Sam Steingold <sds@gnu.org>
parents:
40035
diff
changeset
|
3960 (not (auto-save-file-name-p file)) |
9c7e47dd60be
(byte-recompile-directory): Report numbers of files skipped and failed too.
Sam Steingold <sds@gnu.org>
parents:
40035
diff
changeset
|
3961 (setq source (expand-file-name file |
757 | 3962 (car command-line-args-left))) |
3963 (setq dest (byte-compile-dest-file source)) | |
3964 (file-exists-p dest) | |
3965 (file-newer-than-file-p source dest)) | |
3966 (if (null (batch-byte-compile-file source)) | |
40451
9c7e47dd60be
(byte-recompile-directory): Report numbers of files skipped and failed too.
Sam Steingold <sds@gnu.org>
parents:
40035
diff
changeset
|
3967 (setq error t))))) |
43027
4c6cdfeb929c
(batch-byte-compile): New arg noforce.
Richard M. Stallman <rms@gnu.org>
parents:
41176
diff
changeset
|
3968 ;; Specific file argument |
4c6cdfeb929c
(batch-byte-compile): New arg noforce.
Richard M. Stallman <rms@gnu.org>
parents:
41176
diff
changeset
|
3969 (if (or (not noforce) |
4c6cdfeb929c
(batch-byte-compile): New arg noforce.
Richard M. Stallman <rms@gnu.org>
parents:
41176
diff
changeset
|
3970 (let* ((source (car command-line-args-left)) |
4c6cdfeb929c
(batch-byte-compile): New arg noforce.
Richard M. Stallman <rms@gnu.org>
parents:
41176
diff
changeset
|
3971 (dest (byte-compile-dest-file source))) |
4c6cdfeb929c
(batch-byte-compile): New arg noforce.
Richard M. Stallman <rms@gnu.org>
parents:
41176
diff
changeset
|
3972 (or (not (file-exists-p dest)) |
4c6cdfeb929c
(batch-byte-compile): New arg noforce.
Richard M. Stallman <rms@gnu.org>
parents:
41176
diff
changeset
|
3973 (file-newer-than-file-p source dest)))) |
4c6cdfeb929c
(batch-byte-compile): New arg noforce.
Richard M. Stallman <rms@gnu.org>
parents:
41176
diff
changeset
|
3974 (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
|
3975 (setq error t)))) |
757 | 3976 (setq command-line-args-left (cdr command-line-args-left))) |
3977 (kill-emacs (if error 1 0)))) | |
3978 | |
3979 (defun batch-byte-compile-file (file) | |
54890
ab70a3ddd144
(batch-byte-compile-file): Give a backtrace if requested.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54790
diff
changeset
|
3980 (if debug-on-error |
18391
1ff0bfd40508
(byte-compile-file): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
18266
diff
changeset
|
3981 (byte-compile-file file) |
54890
ab70a3ddd144
(batch-byte-compile-file): Give a backtrace if requested.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54790
diff
changeset
|
3982 (condition-case err |
ab70a3ddd144
(batch-byte-compile-file): Give a backtrace if requested.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54790
diff
changeset
|
3983 (byte-compile-file file) |
ab70a3ddd144
(batch-byte-compile-file): Give a backtrace if requested.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54790
diff
changeset
|
3984 (file-error |
ab70a3ddd144
(batch-byte-compile-file): Give a backtrace if requested.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54790
diff
changeset
|
3985 (message (if (cdr err) |
ab70a3ddd144
(batch-byte-compile-file): Give a backtrace if requested.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54790
diff
changeset
|
3986 ">>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
|
3987 ">>Error occurred processing %s: %s") |
54890
ab70a3ddd144
(batch-byte-compile-file): Give a backtrace if requested.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54790
diff
changeset
|
3988 file |
ab70a3ddd144
(batch-byte-compile-file): Give a backtrace if requested.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54790
diff
changeset
|
3989 (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
|
3990 (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
|
3991 (let ((destfile (byte-compile-dest-file file))) |
ab70a3ddd144
(batch-byte-compile-file): Give a backtrace if requested.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54790
diff
changeset
|
3992 (if (file-exists-p destfile) |
ab70a3ddd144
(batch-byte-compile-file): Give a backtrace if requested.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54790
diff
changeset
|
3993 (delete-file destfile))) |
ab70a3ddd144
(batch-byte-compile-file): Give a backtrace if requested.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54790
diff
changeset
|
3994 nil) |
ab70a3ddd144
(batch-byte-compile-file): Give a backtrace if requested.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54790
diff
changeset
|
3995 (error |
ab70a3ddd144
(batch-byte-compile-file): Give a backtrace if requested.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54790
diff
changeset
|
3996 (message (if (cdr err) |
ab70a3ddd144
(batch-byte-compile-file): Give a backtrace if requested.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54790
diff
changeset
|
3997 ">>Error occurred processing %s: %s (%s)" |
757 | 3998 ">>Error occurred processing %s: %s") |
54890
ab70a3ddd144
(batch-byte-compile-file): Give a backtrace if requested.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54790
diff
changeset
|
3999 file |
ab70a3ddd144
(batch-byte-compile-file): Give a backtrace if requested.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54790
diff
changeset
|
4000 (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
|
4001 (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
|
4002 nil)))) |
757 | 4003 |
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
|
4004 ;;;###autoload |
55077
6635869bd341
(batch-byte-recompile-directory): Add byte-recompile-directory's opt `arg'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55043
diff
changeset
|
4005 (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
|
4006 "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
|
4007 Must be used only with `-batch', and kills Emacs on completion. |
37a8a7489fc5
(byte-compile-file): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
3653
diff
changeset
|
4008 For example, invoke `emacs -batch -f batch-byte-recompile-directory .'." |
3653
974055b516d9
* bytecomp.el: Bring it up to version 2.10 of the
Jim Blandy <jimb@redhat.com>
parents:
3591
diff
changeset
|
4009 ;; 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
|
4010 (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
|
4011 (if (not noninteractive) |
974055b516d9
* bytecomp.el: Bring it up to version 2.10 of the
Jim Blandy <jimb@redhat.com>
parents:
3591
diff
changeset
|
4012 (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
|
4013 (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
|
4014 (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
|
4015 (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
|
4016 (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
|
4017 (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
|
4018 (kill-emacs 0)) |
974055b516d9
* bytecomp.el: Bring it up to version 2.10 of the
Jim Blandy <jimb@redhat.com>
parents:
3591
diff
changeset
|
4019 |
757 | 4020 |
29352
fa490904bee0
* byte-run.el (make-obsolete, make-obsolete-variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29239
diff
changeset
|
4021 (make-obsolete-variable 'auto-fill-hook 'auto-fill-function "before 19.15") |
fa490904bee0
* byte-run.el (make-obsolete, make-obsolete-variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29239
diff
changeset
|
4022 (make-obsolete-variable 'blink-paren-hook 'blink-paren-function "before 19.15") |
fa490904bee0
* byte-run.el (make-obsolete, make-obsolete-variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29239
diff
changeset
|
4023 (make-obsolete-variable 'lisp-indent-hook 'lisp-indent-function "before 19.15") |
958 | 4024 (make-obsolete-variable 'inhibit-local-variables |
29352
fa490904bee0
* byte-run.el (make-obsolete, make-obsolete-variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29239
diff
changeset
|
4025 "use enable-local-variables (with the reversed sense)." |
fa490904bee0
* byte-run.el (make-obsolete, make-obsolete-variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29239
diff
changeset
|
4026 "before 19.15") |
1819
df06a60f3362
* disass.el (disassemble): Add autoload cookie for this.
Jim Blandy <jimb@redhat.com>
parents:
1604
diff
changeset
|
4027 (make-obsolete-variable 'unread-command-event |
29352
fa490904bee0
* byte-run.el (make-obsolete, make-obsolete-variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29239
diff
changeset
|
4028 "use unread-command-events; which is a list of events rather than a single event." |
fa490904bee0
* byte-run.el (make-obsolete, make-obsolete-variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29239
diff
changeset
|
4029 "before 19.15") |
fa490904bee0
* byte-run.el (make-obsolete, make-obsolete-variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29239
diff
changeset
|
4030 (make-obsolete-variable 'suspend-hooks 'suspend-hook "before 19.15") |
fa490904bee0
* byte-run.el (make-obsolete, make-obsolete-variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29239
diff
changeset
|
4031 (make-obsolete-variable 'comment-indent-hook 'comment-indent-function "before 19.15") |
46050
9c0b15b35ce2
(baud-rate): Fix obsolescence declaration.
Juanma Barranquero <lekktu@gmail.com>
parents:
46003
diff
changeset
|
4032 (make-obsolete-variable 'meta-flag "use the set-input-mode function instead." "before 19.34") |
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
|
4033 (make-obsolete-variable 'before-change-function |
29352
fa490904bee0
* byte-run.el (make-obsolete, make-obsolete-variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29239
diff
changeset
|
4034 "use before-change-functions; which is a list of functions rather than a single function." |
fa490904bee0
* byte-run.el (make-obsolete, make-obsolete-variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29239
diff
changeset
|
4035 "before 19.34") |
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
|
4036 (make-obsolete-variable 'after-change-function |
29352
fa490904bee0
* byte-run.el (make-obsolete, make-obsolete-variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29239
diff
changeset
|
4037 "use after-change-functions; which is a list of functions rather than a single function." |
fa490904bee0
* byte-run.el (make-obsolete, make-obsolete-variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29239
diff
changeset
|
4038 "before 19.34") |
fa490904bee0
* byte-run.el (make-obsolete, make-obsolete-variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29239
diff
changeset
|
4039 (make-obsolete-variable 'font-lock-doc-string-face 'font-lock-string-face "before 19.34") |
757 | 4040 |
4041 (provide 'byte-compile) | |
5341
2f4fab6070b8
Provide bytecomp as well as byte-compile.
Richard M. Stallman <rms@gnu.org>
parents:
5283
diff
changeset
|
4042 (provide 'bytecomp) |
757 | 4043 |
4044 | |
4045 ;;; report metering (see the hacks in bytecode.c) | |
4046 | |
51737
10cd0bec4a7f
(byte-compile-defvar): Check and set the default value of the variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51289
diff
changeset
|
4047 (defvar byte-code-meter) |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
4048 (defun byte-compile-report-ops () |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
4049 (with-output-to-temp-buffer "*Meter*" |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
4050 (set-buffer "*Meter*") |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
4051 (let ((i 0) n op off) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
4052 (while (< i 256) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
4053 (setq n (aref (aref byte-code-meter 0) i) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
4054 off nil) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
4055 (if t ;(not (zerop n)) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
4056 (progn |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
4057 (setq op i) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
4058 (setq off nil) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
4059 (cond ((< op byte-nth) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
4060 (setq off (logand op 7)) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
4061 (setq op (logand op 248))) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
4062 ((>= op byte-constant) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
4063 (setq off (- op byte-constant) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
4064 op byte-constant))) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
4065 (setq op (aref byte-code-vector op)) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
4066 (insert (format "%-4d" i)) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
4067 (insert (symbol-name op)) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
4068 (if off (insert " [" (int-to-string off) "]")) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
4069 (indent-to 40) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
4070 (insert (int-to-string n) "\n"))) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
4071 (setq i (1+ i)))))) |
757 | 4072 |
4073 ;; To avoid "lisp nesting exceeds max-lisp-eval-depth" when bytecomp compiles | |
4074 ;; itself, compile some of its most used recursive functions (at load time). | |
4075 ;; | |
4076 (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
|
4077 (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
|
4078 (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
|
4079 (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
|
4080 (byte-compile-warnings nil)) |
37909
3d650ae7e609
(byte-compile-file-form-autoload): Use the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35145
diff
changeset
|
4081 (mapcar (lambda (x) |
3d650ae7e609
(byte-compile-file-form-autoload): Use the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35145
diff
changeset
|
4082 (or noninteractive (message "compiling %s..." x)) |
3d650ae7e609
(byte-compile-file-form-autoload): Use the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35145
diff
changeset
|
4083 (byte-compile x) |
3d650ae7e609
(byte-compile-file-form-autoload): Use the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35145
diff
changeset
|
4084 (or noninteractive (message "compiling %s...done" x))) |
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
|
4085 '(byte-compile-normal-call |
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
|
4086 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
|
4087 byte-compile-body |
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
|
4088 ;; Inserted some more than necessary, to speed it up. |
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
|
4089 byte-compile-top-level |
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
|
4090 byte-compile-out-toplevel |
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
|
4091 byte-compile-constant |
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
|
4092 byte-compile-variable-ref)))) |
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
|
4093 nil) |
819
5bbabfcef929
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
784
diff
changeset
|
4094 |
27584 | 4095 (run-hooks 'bytecomp-load-hook) |
4096 | |
52401 | 4097 ;;; arch-tag: 9c97b0f0-8745-4571-bfc3-8dceb677292a |
819
5bbabfcef929
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
784
diff
changeset
|
4098 ;;; bytecomp.el ends here |