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