Mercurial > emacs
annotate lisp/emacs-lisp/bytecomp.el @ 20330:f76b9c0ebc4b
(back_comment): Handle 2-char comment starts
when reaching the first of the pair.
author | Karl Heuer <kwzh@gnu.org> |
---|---|
date | Sun, 23 Nov 1997 02:18:34 +0000 |
parents | 1d135b4edfcb |
children | eb1c101c6732 |
rev | line source |
---|---|
819
5bbabfcef929
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
784
diff
changeset
|
1 ;;; bytecomp.el --- compilation of Lisp code into byte code. |
757 | 2 |
14169 | 3 ;; Copyright (C) 1985, 1986, 1987, 1992, 1994 Free Software Foundation, Inc. |
846
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
819
diff
changeset
|
4 |
819
5bbabfcef929
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
784
diff
changeset
|
5 ;; Author: Jamie Zawinski <jwz@lucid.com> |
5bbabfcef929
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
784
diff
changeset
|
6 ;; Hallvard Furuseth <hbf@ulrik.uio.no> |
5bbabfcef929
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
784
diff
changeset
|
7 ;; Keywords: internal |
5bbabfcef929
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
784
diff
changeset
|
8 |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
9 ;; Subsequently modified by RMS. |
757 | 10 |
3653
974055b516d9
* bytecomp.el: Bring it up to version 2.10 of the
Jim Blandy <jimb@redhat.com>
parents:
3591
diff
changeset
|
11 ;;; This version incorporates changes up to version 2.10 of the |
958 | 12 ;;; Zawinski-Furuseth compiler. |
19981
1d135b4edfcb
(displaying-byte-compile-warnings): Show
Karl Heuer <kwzh@gnu.org>
parents:
19637
diff
changeset
|
13 (defconst byte-compile-version "$Revision: 2.34 $") |
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 |
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2299
diff
changeset
|
35 ;; of p-code which takes up less space and can be interpreted faster. |
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2299
diff
changeset
|
36 ;; 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
|
37 |
819
5bbabfcef929
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
784
diff
changeset
|
38 ;;; Code: |
5bbabfcef929
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
784
diff
changeset
|
39 |
14169 | 40 ;; ======================================================================== |
41 ;; Entry points: | |
42 ;; byte-recompile-directory, byte-compile-file, | |
43 ;; batch-byte-compile, batch-byte-recompile-directory, | |
44 ;; byte-compile, compile-defun, | |
45 ;; display-call-tree | |
46 ;; (byte-compile-buffer and byte-compile-and-load-file were turned off | |
47 ;; because they are not terribly useful and get in the way of completion.) | |
757 | 48 |
14169 | 49 ;; This version of the byte compiler has the following improvements: |
50 ;; + optimization of compiled code: | |
51 ;; - removal of unreachable code; | |
52 ;; - removal of calls to side-effectless functions whose return-value | |
53 ;; is unused; | |
54 ;; - compile-time evaluation of safe constant forms, such as (consp nil) | |
55 ;; and (ash 1 6); | |
56 ;; - open-coding of literal lambdas; | |
57 ;; - peephole optimization of emitted code; | |
58 ;; - trivial functions are left uncompiled for speed. | |
59 ;; + support for inline functions; | |
60 ;; + compile-time evaluation of arbitrary expressions; | |
61 ;; + compile-time warning messages for: | |
62 ;; - functions being redefined with incompatible arglists; | |
63 ;; - functions being redefined as macros, or vice-versa; | |
64 ;; - functions or macros defined multiple times in the same file; | |
65 ;; - functions being called with the incorrect number of arguments; | |
66 ;; - functions being called which are not defined globally, in the | |
67 ;; file, or as autoloads; | |
68 ;; - assignment and reference of undeclared free variables; | |
69 ;; - various syntax errors; | |
70 ;; + correct compilation of nested defuns, defmacros, defvars and defsubsts; | |
71 ;; + correct compilation of top-level uses of macros; | |
72 ;; + the ability to generate a histogram of functions called. | |
757 | 73 |
14169 | 74 ;; User customization variables: |
75 ;; | |
76 ;; byte-compile-verbose Whether to report the function currently being | |
77 ;; compiled in the minibuffer; | |
78 ;; byte-optimize Whether to do optimizations; this may be | |
79 ;; t, nil, 'source, or 'byte; | |
80 ;; byte-optimize-log Whether to report (in excruciating detail) | |
81 ;; exactly which optimizations have been made. | |
82 ;; This may be t, nil, 'source, or 'byte; | |
83 ;; byte-compile-error-on-warn Whether to stop compilation when a warning is | |
84 ;; produced; | |
85 ;; byte-compile-delete-errors Whether the optimizer may delete calls or | |
86 ;; variable references that are side-effect-free | |
87 ;; except that they may return an error. | |
88 ;; byte-compile-generate-call-tree Whether to generate a histogram of | |
89 ;; function calls. This can be useful for | |
90 ;; finding unused functions, as well as simple | |
91 ;; performance metering. | |
92 ;; byte-compile-warnings List of warnings to issue, or t. May contain | |
93 ;; 'free-vars (references to variables not in the | |
94 ;; current lexical scope) | |
95 ;; 'unresolved (calls to unknown functions) | |
96 ;; 'callargs (lambda calls with args that don't | |
97 ;; match the lambda's definition) | |
98 ;; 'redefine (function cell redefined from | |
99 ;; a macro to a lambda or vice versa, | |
100 ;; or redefined to take other args) | |
101 ;; 'obsolete (obsolete variables and functions) | |
102 ;; byte-compile-compatibility Whether the compiler should | |
103 ;; generate .elc files which can be loaded into | |
104 ;; generic emacs 18. | |
105 ;; emacs-lisp-file-regexp Regexp for the extension of source-files; | |
106 ;; see also the function byte-compile-dest-file. | |
757 | 107 |
14169 | 108 ;; New Features: |
109 ;; | |
110 ;; o The form `defsubst' is just like `defun', except that the function | |
111 ;; generated will be open-coded in compiled code which uses it. This | |
112 ;; means that no function call will be generated, it will simply be | |
113 ;; spliced in. Lisp functions calls are very slow, so this can be a | |
114 ;; big win. | |
115 ;; | |
116 ;; You can generally accomplish the same thing with `defmacro', but in | |
117 ;; that case, the defined procedure can't be used as an argument to | |
118 ;; mapcar, etc. | |
119 ;; | |
120 ;; o You can also open-code one particular call to a function without | |
121 ;; open-coding all calls. Use the 'inline' form to do this, like so: | |
122 ;; | |
123 ;; (inline (foo 1 2 3)) ;; `foo' will be open-coded | |
124 ;; or... | |
125 ;; (inline ;; `foo' and `baz' will be | |
126 ;; (foo 1 2 3 (bar 5)) ;; open-coded, but `bar' will not. | |
127 ;; (baz 0)) | |
128 ;; | |
129 ;; o It is possible to open-code a function in the same file it is defined | |
130 ;; in without having to load that file before compiling it. the | |
131 ;; byte-compiler has been modified to remember function definitions in | |
132 ;; the compilation environment in the same way that it remembers macro | |
133 ;; definitions. | |
134 ;; | |
135 ;; o Forms like ((lambda ...) ...) are open-coded. | |
136 ;; | |
137 ;; o The form `eval-when-compile' is like progn, except that the body | |
138 ;; is evaluated at compile-time. When it appears at top-level, this | |
139 ;; is analogous to the Common Lisp idiom (eval-when (compile) ...). | |
140 ;; When it does not appear at top-level, it is similar to the | |
141 ;; Common Lisp #. reader macro (but not in interpreted code). | |
142 ;; | |
143 ;; o The form `eval-and-compile' is similar to eval-when-compile, but | |
144 ;; the whole form is evalled both at compile-time and at run-time. | |
145 ;; | |
146 ;; o The command compile-defun is analogous to eval-defun. | |
147 ;; | |
148 ;; o If you run byte-compile-file on a filename which is visited in a | |
149 ;; buffer, and that buffer is modified, you are asked whether you want | |
150 ;; to save the buffer before compiling. | |
151 ;; | |
152 ;; o byte-compiled files now start with the string `;ELC'. | |
153 ;; Some versions of `file' can be customized to recognize that. | |
757 | 154 |
1604
25173c1db5a6
* bytecomp.el: Declare unread-command-char an obsolete variable.
Jim Blandy <jimb@redhat.com>
parents:
1532
diff
changeset
|
155 (require 'backquote) |
25173c1db5a6
* bytecomp.el: Declare unread-command-char an obsolete variable.
Jim Blandy <jimb@redhat.com>
parents:
1532
diff
changeset
|
156 |
757 | 157 (or (fboundp 'defsubst) |
158 ;; This really ought to be loaded already! | |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
159 (load-library "byte-run")) |
757 | 160 |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
161 ;;; The feature of compiling in a specific target Emacs version |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
162 ;;; has been turned off because compile time options are a bad idea. |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
163 (defmacro byte-compile-single-version () nil) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
164 (defmacro byte-compile-version-cond (cond) cond) |
757 | 165 |
166 ;;; The crud you see scattered through this file of the form | |
167 ;;; (or (and (boundp 'epoch::version) epoch::version) | |
168 ;;; (string-lessp emacs-version "19")) | |
169 ;;; is because the Epoch folks couldn't be bothered to follow the | |
170 ;;; normal emacs version numbering convention. | |
171 | |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
172 ;; (if (byte-compile-version-cond |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
173 ;; (or (and (boundp 'epoch::version) epoch::version) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
174 ;; (string-lessp emacs-version "19"))) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
175 ;; (progn |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
176 ;; ;; emacs-18 compatibility. |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
177 ;; (defvar baud-rate (baud-rate)) ;Define baud-rate if it's undefined |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
178 ;; |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
179 ;; (if (byte-compile-single-version) |
1819
df06a60f3362
* disass.el (disassemble): Add autoload cookie for this.
Jim Blandy <jimb@redhat.com>
parents:
1604
diff
changeset
|
180 ;; (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
|
181 ;; (defun byte-code-function-p (x) "Emacs 18 doesn't have these." nil)) |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
182 ;; |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
183 ;; (or (and (fboundp 'member) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
184 ;; ;; avoid using someone else's possibly bogus definition of this. |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
185 ;; (subrp (symbol-function 'member))) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
186 ;; (defun member (elt list) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
187 ;; "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
|
188 ;; (while (and list (not (equal elt (car list)))) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
189 ;; (setq list (cdr list))) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
190 ;; list)))) |
757 | 191 |
192 | |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
193 (defvar emacs-lisp-file-regexp (if (eq system-type 'vax-vms) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
194 "\\.EL\\(;[0-9]+\\)?$" |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
195 "\\.el$") |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
196 "*Regexp which matches Emacs Lisp source files. |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
197 You may want to redefine `byte-compile-dest-file' if you change this.") |
757 | 198 |
12928
5c76c36717cb
(byte-compiler-base-file-name): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12823
diff
changeset
|
199 ;; 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
|
200 ;; 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
|
201 ;; through to the output file name. |
5c76c36717cb
(byte-compiler-base-file-name): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12823
diff
changeset
|
202 (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
|
203 (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
|
204 'byte-compiler-base-file-name))) |
5c76c36717cb
(byte-compiler-base-file-name): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12823
diff
changeset
|
205 (if handler |
5c76c36717cb
(byte-compiler-base-file-name): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12823
diff
changeset
|
206 (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
|
207 filename))) |
5c76c36717cb
(byte-compiler-base-file-name): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12823
diff
changeset
|
208 |
757 | 209 (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
|
210 ;; The user may want to redefine this along with emacs-lisp-file-regexp, |
757 | 211 ;; so only define it if it is undefined. |
212 (defun byte-compile-dest-file (filename) | |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
213 "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
|
214 (setq filename (byte-compiler-base-file-name filename)) |
757 | 215 (setq filename (file-name-sans-versions filename)) |
216 (cond ((eq system-type 'vax-vms) | |
12928
5c76c36717cb
(byte-compiler-base-file-name): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12823
diff
changeset
|
217 (concat (substring filename 0 (string-match ";" filename)) "c")) |
5c76c36717cb
(byte-compiler-base-file-name): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12823
diff
changeset
|
218 ((string-match emacs-lisp-file-regexp filename) |
5c76c36717cb
(byte-compiler-base-file-name): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12823
diff
changeset
|
219 (concat (substring filename 0 (match-beginning 0)) ".elc")) |
5c76c36717cb
(byte-compiler-base-file-name): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12823
diff
changeset
|
220 (t (concat filename ".elc"))))) |
757 | 221 |
222 ;; 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
|
223 (autoload 'byte-compile-inline-expand "byte-opt") |
757 | 224 |
225 ;; This is the entrypoint to the lapcode optimizer pass1. | |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
226 (autoload 'byte-optimize-form "byte-opt") |
757 | 227 ;; This is the entrypoint to the lapcode optimizer pass2. |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
228 (autoload 'byte-optimize-lapcode "byte-opt") |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
229 (autoload 'byte-compile-unfold-lambda "byte-opt") |
757 | 230 |
1819
df06a60f3362
* disass.el (disassemble): Add autoload cookie for this.
Jim Blandy <jimb@redhat.com>
parents:
1604
diff
changeset
|
231 ;; 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
|
232 ;; 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
|
233 ;; 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
|
234 ;; thing to do. |
df06a60f3362
* disass.el (disassemble): Add autoload cookie for this.
Jim Blandy <jimb@redhat.com>
parents:
1604
diff
changeset
|
235 (autoload 'byte-decompile-bytecode "byte-opt") |
df06a60f3362
* disass.el (disassemble): Add autoload cookie for this.
Jim Blandy <jimb@redhat.com>
parents:
1604
diff
changeset
|
236 |
757 | 237 (defvar byte-compile-verbose |
238 (and (not noninteractive) (> baud-rate search-slow-speed)) | |
239 "*Non-nil means print messages describing progress of byte-compiler.") | |
240 | |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
241 (defvar byte-compile-compatibility nil |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
242 "*Non-nil means generate output that can run in Emacs 18.") |
757 | 243 |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
244 ;; (defvar byte-compile-generate-emacs19-bytecodes |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
245 ;; (not (or (and (boundp 'epoch::version) epoch::version) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
246 ;; (string-lessp emacs-version "19"))) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
247 ;; "*If this is true, then the byte-compiler will generate bytecode which |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
248 ;; 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
|
249 ;; this way can never be run in Emacs 18, and may even cause it to crash.") |
757 | 250 |
251 (defvar byte-optimize t | |
1129 | 252 "*Enables optimization in the byte compiler. |
253 nil means don't do any optimization. | |
254 t means do all optimizations. | |
255 `source' means do source-level optimizations only. | |
256 `byte' means do code-level optimizations only.") | |
757 | 257 |
258 (defvar byte-compile-delete-errors t | |
1129 | 259 "*If non-nil, the optimizer may delete forms that may signal an error. |
260 This includes variable references and calls to functions such as `car'.") | |
757 | 261 |
10235
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
262 (defvar byte-compile-dynamic nil |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
263 "*If non-nil, compile function bodies so they load lazily. |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
264 They are hidden comments in the compiled file, and brought into core when the |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
265 function is called. |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
266 |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
267 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
|
268 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
|
269 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
|
270 |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
271 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
|
272 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
|
273 |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
274 (defvar byte-compile-dynamic-docstrings t |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
275 "*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
|
276 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
|
277 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
|
278 are actually needed. |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
279 |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
280 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
|
281 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
|
282 |
11848
1a50b9d542ce
(byte-compile-dynamic-docstrings): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
11819
diff
changeset
|
283 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
|
284 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
|
285 -*-byte-compile-dynamic-docstrings:nil;-*- |
1a50b9d542ce
(byte-compile-dynamic-docstrings): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
11819
diff
changeset
|
286 You can also set the variable globally. |
1a50b9d542ce
(byte-compile-dynamic-docstrings): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
11819
diff
changeset
|
287 |
10235
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
288 This option is enabled by default because it reduces Emacs memory usage.") |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
289 |
757 | 290 (defvar byte-optimize-log nil |
291 "*If true, the byte-compiler will log its optimizations into *Compile-Log*. | |
292 If this is 'source, then only source-level optimizations will be logged. | |
293 If it is 'byte, then only byte-level optimizations will be logged.") | |
294 | |
295 (defvar byte-compile-error-on-warn nil | |
1129 | 296 "*If true, the byte-compiler reports warnings with `error'.") |
757 | 297 |
10256
83d56dd99a40
(byte-compile-warning-types): Add obsolete.
Richard M. Stallman <rms@gnu.org>
parents:
10235
diff
changeset
|
298 (defconst byte-compile-warning-types |
83d56dd99a40
(byte-compile-warning-types): Add obsolete.
Richard M. Stallman <rms@gnu.org>
parents:
10235
diff
changeset
|
299 '(redefine callargs free-vars unresolved obsolete)) |
958 | 300 (defvar byte-compile-warnings t |
757 | 301 "*List of warnings that the byte-compiler should issue (t for all). |
958 | 302 Elements of the list may be be: |
303 | |
304 free-vars references to variables not in the current lexical scope. | |
305 unresolved calls to unknown functions. | |
306 callargs lambda calls with args that don't match the definition. | |
307 redefine function cell redefined from a macro to a lambda or vice | |
308 versa, or redefined to take a different number of arguments. | |
10256
83d56dd99a40
(byte-compile-warning-types): Add obsolete.
Richard M. Stallman <rms@gnu.org>
parents:
10235
diff
changeset
|
309 obsolete obsolete variables and functions. |
958 | 310 |
1129 | 311 See also the macro `byte-compiler-options'.") |
757 | 312 |
313 (defvar byte-compile-generate-call-tree nil | |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
314 "*Non-nil means collect call-graph information when compiling. |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
315 This records functions were called and from where. |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
316 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
|
317 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
|
318 the graph. |
757 | 319 |
320 The call tree only lists functions called, not macros used. Those functions | |
321 which the byte-code interpreter knows about directly (eq, cons, etc.) are | |
322 not reported. | |
323 | |
324 The call tree also lists those functions which are not known to be called | |
10372 | 325 \(that is, to which no calls have been compiled). Functions which can be |
757 | 326 invoked interactively are excluded from this list.") |
327 | |
328 (defconst byte-compile-call-tree nil "Alist of functions and their call tree. | |
329 Each element looks like | |
330 | |
331 \(FUNCTION CALLERS CALLS\) | |
332 | |
333 where CALLERS is a list of functions that call FUNCTION, and CALLS | |
334 is a list of functions for which calls were generated while compiling | |
335 FUNCTION.") | |
336 | |
337 (defvar byte-compile-call-tree-sort 'name | |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
338 "*If non-nil, sort the call tree. |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
339 The values `name', `callers', `calls', `calls+callers' |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
340 specify different fields to sort on.") |
757 | 341 |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
342 ;; (defvar byte-compile-overwrite-file t |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
343 ;; "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
|
344 ;; 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
|
345 ;; existing .elc files will simply be overwritten, and the existing modes |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
346 ;; will not be changed. If this variable is nil, then an .elc file which |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
347 ;; 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
|
348 ;; which the link points to being overwritten.") |
757 | 349 |
350 (defvar byte-compile-constants nil | |
351 "list of all constants encountered during compilation of this form") | |
352 (defvar byte-compile-variables nil | |
353 "list of all variables encountered during compilation of this form") | |
354 (defvar byte-compile-bound-variables nil | |
355 "list of variables bound in the context of the current form; this list | |
356 lives partly on the stack.") | |
357 (defvar byte-compile-free-references) | |
358 (defvar byte-compile-free-assignments) | |
359 | |
1129 | 360 (defvar byte-compiler-error-flag) |
361 | |
757 | 362 (defconst byte-compile-initial-macro-environment |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
363 '( |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
364 ;; (byte-compiler-options . (lambda (&rest forms) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
365 ;; (apply 'byte-compiler-options-handler forms))) |
757 | 366 (eval-when-compile . (lambda (&rest body) |
367 (list 'quote (eval (byte-compile-top-level | |
368 (cons 'progn body)))))) | |
369 (eval-and-compile . (lambda (&rest body) | |
370 (eval (cons 'progn body)) | |
371 (cons 'progn body)))) | |
372 "The default macro-environment passed to macroexpand by the compiler. | |
373 Placing a macro here will cause a macro to have different semantics when | |
374 expanded by the compiler as when expanded by the interpreter.") | |
375 | |
376 (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
|
377 "Alist of macros defined in the file being compiled. |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
378 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
|
379 \(MACRONAME . nil) when a macro is redefined as a function.") |
757 | 380 |
381 (defvar byte-compile-function-environment nil | |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
382 "Alist of functions defined in the file being compiled. |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
383 This is so we can inline them when necessary. |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
384 Each element looks like (FUNCTIONNAME . DEFINITION). It is |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
385 \(FUNCTIONNAME . nil) when a function is redefined as a macro.") |
757 | 386 |
387 (defvar byte-compile-unresolved-functions nil | |
388 "Alist of undefined functions to which calls have been compiled (used for | |
389 warnings when the function is later defined with incorrect args).") | |
390 | |
391 (defvar byte-compile-tag-number 0) | |
392 (defvar byte-compile-output nil | |
393 "Alist describing contents to put in byte code string. | |
394 Each element is (INDEX . VALUE)") | |
395 (defvar byte-compile-depth 0 "Current depth of execution stack.") | |
396 (defvar byte-compile-maxdepth 0 "Maximum depth of execution stack.") | |
397 | |
398 | |
399 ;;; The byte codes; this information is duplicated in bytecomp.c | |
400 | |
401 (defconst byte-code-vector nil | |
402 "An array containing byte-code names indexed by byte-code values.") | |
403 | |
404 (defconst byte-stack+-info nil | |
405 "An array with the stack adjustment for each byte-code.") | |
406 | |
407 (defmacro byte-defop (opcode stack-adjust opname &optional docstring) | |
408 ;; This is a speed-hack for building the byte-code-vector at compile-time. | |
409 ;; We fill in the vector at macroexpand-time, and then after the last call | |
410 ;; to byte-defop, we write the vector out as a constant instead of writing | |
411 ;; out a bunch of calls to aset. | |
412 ;; Actually, we don't fill in the vector itself, because that could make | |
413 ;; it problematic to compile big changes to this compiler; we store the | |
414 ;; values on its plist, and remove them later in -extrude. | |
415 (let ((v1 (or (get 'byte-code-vector 'tmp-compile-time-value) | |
416 (put 'byte-code-vector 'tmp-compile-time-value | |
417 (make-vector 256 nil)))) | |
418 (v2 (or (get 'byte-stack+-info 'tmp-compile-time-value) | |
419 (put 'byte-stack+-info 'tmp-compile-time-value | |
420 (make-vector 256 nil))))) | |
421 (aset v1 opcode opname) | |
422 (aset v2 opcode stack-adjust)) | |
423 (if docstring | |
424 (list 'defconst opname opcode (concat "Byte code opcode " docstring ".")) | |
425 (list 'defconst opname opcode))) | |
426 | |
427 (defmacro byte-extrude-byte-code-vectors () | |
428 (prog1 (list 'setq 'byte-code-vector | |
429 (get 'byte-code-vector 'tmp-compile-time-value) | |
430 'byte-stack+-info | |
431 (get 'byte-stack+-info 'tmp-compile-time-value)) | |
432 ;; emacs-18 has no REMPROP. | |
433 (put 'byte-code-vector 'tmp-compile-time-value nil) | |
434 (put 'byte-stack+-info 'tmp-compile-time-value nil))) | |
435 | |
436 | |
437 ;; unused: 0-7 | |
438 | |
439 ;; These opcodes are special in that they pack their argument into the | |
440 ;; opcode word. | |
441 ;; | |
442 (byte-defop 8 1 byte-varref "for variable reference") | |
443 (byte-defop 16 -1 byte-varset "for setting a variable") | |
444 (byte-defop 24 -1 byte-varbind "for binding a variable") | |
445 (byte-defop 32 0 byte-call "for calling a function") | |
446 (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
|
447 ;; codes 8-47 are consumed by the preceding opcodes |
757 | 448 |
449 ;; unused: 48-55 | |
450 | |
451 (byte-defop 56 -1 byte-nth) | |
452 (byte-defop 57 0 byte-symbolp) | |
453 (byte-defop 58 0 byte-consp) | |
454 (byte-defop 59 0 byte-stringp) | |
455 (byte-defop 60 0 byte-listp) | |
456 (byte-defop 61 -1 byte-eq) | |
457 (byte-defop 62 -1 byte-memq) | |
458 (byte-defop 63 0 byte-not) | |
459 (byte-defop 64 0 byte-car) | |
460 (byte-defop 65 0 byte-cdr) | |
461 (byte-defop 66 -1 byte-cons) | |
462 (byte-defop 67 0 byte-list1) | |
463 (byte-defop 68 -1 byte-list2) | |
464 (byte-defop 69 -2 byte-list3) | |
465 (byte-defop 70 -3 byte-list4) | |
466 (byte-defop 71 0 byte-length) | |
467 (byte-defop 72 -1 byte-aref) | |
468 (byte-defop 73 -2 byte-aset) | |
469 (byte-defop 74 0 byte-symbol-value) | |
470 (byte-defop 75 0 byte-symbol-function) ; this was commented out | |
471 (byte-defop 76 -1 byte-set) | |
472 (byte-defop 77 -1 byte-fset) ; this was commented out | |
473 (byte-defop 78 -1 byte-get) | |
474 (byte-defop 79 -2 byte-substring) | |
475 (byte-defop 80 -1 byte-concat2) | |
476 (byte-defop 81 -2 byte-concat3) | |
477 (byte-defop 82 -3 byte-concat4) | |
478 (byte-defop 83 0 byte-sub1) | |
479 (byte-defop 84 0 byte-add1) | |
480 (byte-defop 85 -1 byte-eqlsign) | |
481 (byte-defop 86 -1 byte-gtr) | |
482 (byte-defop 87 -1 byte-lss) | |
483 (byte-defop 88 -1 byte-leq) | |
484 (byte-defop 89 -1 byte-geq) | |
485 (byte-defop 90 -1 byte-diff) | |
486 (byte-defop 91 0 byte-negate) | |
487 (byte-defop 92 -1 byte-plus) | |
488 (byte-defop 93 -1 byte-max) | |
489 (byte-defop 94 -1 byte-min) | |
490 (byte-defop 95 -1 byte-mult) ; v19 only | |
491 (byte-defop 96 1 byte-point) | |
492 (byte-defop 98 0 byte-goto-char) | |
493 (byte-defop 99 0 byte-insert) | |
494 (byte-defop 100 1 byte-point-max) | |
495 (byte-defop 101 1 byte-point-min) | |
496 (byte-defop 102 0 byte-char-after) | |
497 (byte-defop 103 1 byte-following-char) | |
498 (byte-defop 104 1 byte-preceding-char) | |
499 (byte-defop 105 1 byte-current-column) | |
500 (byte-defop 106 0 byte-indent-to) | |
501 (byte-defop 107 0 byte-scan-buffer-OBSOLETE) ; no longer generated as of v18 | |
502 (byte-defop 108 1 byte-eolp) | |
503 (byte-defop 109 1 byte-eobp) | |
504 (byte-defop 110 1 byte-bolp) | |
505 (byte-defop 111 1 byte-bobp) | |
506 (byte-defop 112 1 byte-current-buffer) | |
507 (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
|
508 (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
|
509 "To make a binding to record the current buffer") |
757 | 510 (byte-defop 115 0 byte-set-mark-OBSOLETE) |
511 (byte-defop 116 1 byte-interactive-p) | |
512 | |
513 ;; These ops are new to v19 | |
514 (byte-defop 117 0 byte-forward-char) | |
515 (byte-defop 118 0 byte-forward-word) | |
516 (byte-defop 119 -1 byte-skip-chars-forward) | |
517 (byte-defop 120 -1 byte-skip-chars-backward) | |
518 (byte-defop 121 0 byte-forward-line) | |
519 (byte-defop 122 0 byte-char-syntax) | |
520 (byte-defop 123 -1 byte-buffer-substring) | |
521 (byte-defop 124 -1 byte-delete-region) | |
522 (byte-defop 125 -1 byte-narrow-to-region) | |
523 (byte-defop 126 1 byte-widen) | |
524 (byte-defop 127 0 byte-end-of-line) | |
525 | |
526 ;; unused: 128 | |
527 | |
528 ;; These store their argument in the next two bytes | |
529 (byte-defop 129 1 byte-constant2 | |
530 "for reference to a constant with vector index >= byte-constant-limit") | |
531 (byte-defop 130 0 byte-goto "for unconditional jump") | |
532 (byte-defop 131 -1 byte-goto-if-nil "to pop value and jump if it's nil") | |
533 (byte-defop 132 -1 byte-goto-if-not-nil "to pop value and jump if it's not nil") | |
534 (byte-defop 133 -1 byte-goto-if-nil-else-pop | |
535 "to examine top-of-stack, jump and don't pop it if it's nil, | |
536 otherwise pop it") | |
537 (byte-defop 134 -1 byte-goto-if-not-nil-else-pop | |
538 "to examine top-of-stack, jump and don't pop it if it's non nil, | |
539 otherwise pop it") | |
540 | |
541 (byte-defop 135 -1 byte-return "to pop a value and return it from `byte-code'") | |
542 (byte-defop 136 -1 byte-discard "to discard one value from stack") | |
543 (byte-defop 137 1 byte-dup "to duplicate the top of the stack") | |
544 | |
545 (byte-defop 138 0 byte-save-excursion | |
546 "to make a binding to record the buffer, point and mark") | |
547 (byte-defop 139 0 byte-save-window-excursion | |
548 "to make a binding to record entire window configuration") | |
549 (byte-defop 140 0 byte-save-restriction | |
550 "to make a binding to record the current buffer clipping restrictions") | |
551 (byte-defop 141 -1 byte-catch | |
552 "for catch. Takes, on stack, the tag and an expression for the body") | |
553 (byte-defop 142 -1 byte-unwind-protect | |
554 "for unwind-protect. Takes, on stack, an expression for the unwind-action") | |
555 | |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
556 ;; For condition-case. Takes, on stack, the variable to bind, |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
557 ;; an expression for the body, and a list of clauses. |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
558 (byte-defop 143 -2 byte-condition-case) |
757 | 559 |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
560 ;; For entry to with-output-to-temp-buffer. |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
561 ;; Takes, on stack, the buffer name. |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
562 ;; Binds standard-output and does some other things. |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
563 ;; 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
|
564 (byte-defop 144 0 byte-temp-output-buffer-setup) |
757 | 565 |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
566 ;; For exit from with-output-to-temp-buffer. |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
567 ;; 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
|
568 ;; Pops them both, then pushes the value back on. |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
569 ;; Unbinds standard-output and makes the temp buffer visible. |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
570 (byte-defop 145 -1 byte-temp-output-buffer-show) |
757 | 571 |
572 ;; these ops are new to v19 | |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
573 |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
574 ;; 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
|
575 ;; 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
|
576 (byte-defop 146 0 byte-unbind-all) |
757 | 577 |
578 ;; these ops are new to v19 | |
579 (byte-defop 147 -2 byte-set-marker) | |
580 (byte-defop 148 0 byte-match-beginning) | |
581 (byte-defop 149 0 byte-match-end) | |
582 (byte-defop 150 0 byte-upcase) | |
583 (byte-defop 151 0 byte-downcase) | |
584 (byte-defop 152 -1 byte-string=) | |
585 (byte-defop 153 -1 byte-string<) | |
586 (byte-defop 154 -1 byte-equal) | |
587 (byte-defop 155 -1 byte-nthcdr) | |
588 (byte-defop 156 -1 byte-elt) | |
589 (byte-defop 157 -1 byte-member) | |
590 (byte-defop 158 -1 byte-assq) | |
591 (byte-defop 159 0 byte-nreverse) | |
592 (byte-defop 160 -1 byte-setcar) | |
593 (byte-defop 161 -1 byte-setcdr) | |
594 (byte-defop 162 0 byte-car-safe) | |
595 (byte-defop 163 0 byte-cdr-safe) | |
596 (byte-defop 164 -1 byte-nconc) | |
597 (byte-defop 165 -1 byte-quo) | |
598 (byte-defop 166 -1 byte-rem) | |
599 (byte-defop 167 0 byte-numberp) | |
600 (byte-defop 168 0 byte-integerp) | |
601 | |
848 | 602 ;; unused: 169-174 |
757 | 603 (byte-defop 175 nil byte-listN) |
604 (byte-defop 176 nil byte-concatN) | |
605 (byte-defop 177 nil byte-insertN) | |
606 | |
607 ;; unused: 178-191 | |
608 | |
609 (byte-defop 192 1 byte-constant "for reference to a constant") | |
610 ;; codes 193-255 are consumed by byte-constant. | |
611 (defconst byte-constant-limit 64 | |
612 "Exclusive maximum index usable in the `byte-constant' opcode.") | |
613 | |
614 (defconst byte-goto-ops '(byte-goto byte-goto-if-nil byte-goto-if-not-nil | |
615 byte-goto-if-nil-else-pop | |
616 byte-goto-if-not-nil-else-pop) | |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
617 "List of byte-codes whose offset is a pc.") |
757 | 618 |
619 (defconst byte-goto-always-pop-ops '(byte-goto-if-nil byte-goto-if-not-nil)) | |
620 | |
621 (byte-extrude-byte-code-vectors) | |
622 | |
623 ;;; lapcode generator | |
624 ;;; | |
625 ;;; the byte-compiler now does source -> lapcode -> bytecode instead of | |
626 ;;; source -> bytecode, because it's a lot easier to make optimizations | |
627 ;;; on lapcode than on bytecode. | |
628 ;;; | |
629 ;;; Elements of the lapcode list are of the form (<instruction> . <parameter>) | |
630 ;;; where instruction is a symbol naming a byte-code instruction, | |
631 ;;; and parameter is an argument to that instruction, if any. | |
632 ;;; | |
633 ;;; The instruction can be the pseudo-op TAG, which means that this position | |
634 ;;; in the instruction stream is a target of a goto. (car PARAMETER) will be | |
635 ;;; the PC for this location, and the whole instruction "(TAG pc)" will be the | |
636 ;;; parameter for some goto op. | |
637 ;;; | |
638 ;;; If the operation is varbind, varref, varset or push-constant, then the | |
639 ;;; parameter is (variable/constant . index_in_constant_vector). | |
640 ;;; | |
641 ;;; First, the source code is macroexpanded and optimized in various ways. | |
642 ;;; Then the resultant code is compiled into lapcode. Another set of | |
643 ;;; optimizations are then run over the lapcode. Then the variables and | |
644 ;;; constants referenced by the lapcode are collected and placed in the | |
645 ;;; constants-vector. (This happens now so that variables referenced by dead | |
646 ;;; code don't consume space.) And finally, the lapcode is transformed into | |
647 ;;; compacted byte-code. | |
648 ;;; | |
649 ;;; A distinction is made between variables and constants because the variable- | |
650 ;;; referencing instructions are more sensitive to the variables being near the | |
651 ;;; front of the constants-vector than the constant-referencing instructions. | |
652 ;;; Also, this lets us notice references to free variables. | |
653 | |
654 (defun byte-compile-lapcode (lap) | |
655 "Turns lapcode into bytecode. The lapcode is destroyed." | |
656 ;; Lapcode modifications: changes the ID of a tag to be the tag's PC. | |
657 (let ((pc 0) ; Program counter | |
658 op off ; Operation & offset | |
659 (bytes '()) ; Put the output bytes here | |
660 (patchlist nil) ; List of tags and goto's to patch | |
661 rest rel tmp) | |
662 (while lap | |
663 (setq op (car (car lap)) | |
664 off (cdr (car lap))) | |
665 (cond ((not (symbolp op)) | |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
666 (error "Non-symbolic opcode `%s'" op)) |
757 | 667 ((eq op 'TAG) |
668 (setcar off pc) | |
669 (setq patchlist (cons off patchlist))) | |
670 ((memq op byte-goto-ops) | |
671 (setq pc (+ pc 3)) | |
672 (setq bytes (cons (cons pc (cdr off)) | |
673 (cons nil | |
674 (cons (symbol-value op) bytes)))) | |
675 (setq patchlist (cons bytes patchlist))) | |
676 (t | |
677 (setq bytes | |
678 (cond ((cond ((consp off) | |
679 ;; Variable or constant reference | |
680 (setq off (cdr off)) | |
681 (eq op 'byte-constant))) | |
682 (cond ((< off byte-constant-limit) | |
683 (setq pc (1+ pc)) | |
684 (cons (+ byte-constant off) bytes)) | |
685 (t | |
686 (setq pc (+ 3 pc)) | |
687 (cons (lsh off -8) | |
688 (cons (logand off 255) | |
689 (cons byte-constant2 bytes)))))) | |
690 ((<= byte-listN (symbol-value op)) | |
691 (setq pc (+ 2 pc)) | |
692 (cons off (cons (symbol-value op) bytes))) | |
693 ((< off 6) | |
694 (setq pc (1+ pc)) | |
695 (cons (+ (symbol-value op) off) bytes)) | |
696 ((< off 256) | |
697 (setq pc (+ 2 pc)) | |
698 (cons off (cons (+ (symbol-value op) 6) bytes))) | |
699 (t | |
700 (setq pc (+ 3 pc)) | |
701 (cons (lsh off -8) | |
702 (cons (logand off 255) | |
703 (cons (+ (symbol-value op) 7) | |
704 bytes)))))))) | |
705 (setq lap (cdr lap))) | |
706 ;;(if (not (= pc (length bytes))) | |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
707 ;; (error "Compiler error: pc mismatch - %s %s" pc (length bytes))) |
757 | 708 ;; Patch PC into jumps |
709 (let (bytes) | |
710 (while patchlist | |
711 (setq bytes (car patchlist)) | |
712 (cond ((atom (car bytes))) ; Tag | |
713 (t ; Absolute jump | |
714 (setq pc (car (cdr (car bytes)))) ; Pick PC from tag | |
715 (setcar (cdr bytes) (logand pc 255)) | |
716 (setcar bytes (lsh pc -8)))) | |
717 (setq patchlist (cdr patchlist)))) | |
718 (concat (nreverse bytes)))) | |
719 | |
720 | |
721 ;;; byte compiler messages | |
722 | |
10235
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
723 (defvar byte-compile-current-form nil) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
724 (defvar byte-compile-current-file nil) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
725 (defvar byte-compile-dest-file nil) |
757 | 726 |
727 (defmacro byte-compile-log (format-string &rest args) | |
728 (list 'and | |
729 'byte-optimize | |
730 '(memq byte-optimize-log '(t source)) | |
731 (list 'let '((print-escape-newlines t) | |
732 (print-level 4) | |
733 (print-length 4)) | |
734 (list 'byte-compile-log-1 | |
735 (cons 'format | |
736 (cons format-string | |
737 (mapcar | |
738 '(lambda (x) | |
739 (if (symbolp x) (list 'prin1-to-string x) x)) | |
740 args))))))) | |
741 | |
742 (defconst byte-compile-last-warned-form nil) | |
743 | |
11323
5f75d3e225c1
(byte-compile-log-file): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11253
diff
changeset
|
744 ;; Log a message STRING in *Compile-Log*. |
5f75d3e225c1
(byte-compile-log-file): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11253
diff
changeset
|
745 ;; Also log the current function and file if not already done. |
958 | 746 (defun byte-compile-log-1 (string &optional fill) |
757 | 747 (cond (noninteractive |
748 (if (or byte-compile-current-file | |
749 (and byte-compile-last-warned-form | |
750 (not (eq byte-compile-current-form | |
751 byte-compile-last-warned-form)))) | |
14412
75222e07921e
(byte-compile-log-1): Delete format call inside message.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
752 (message "While compiling %s%s:" |
75222e07921e
(byte-compile-log-1): Delete format call inside message.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
753 (or byte-compile-current-form "toplevel forms") |
75222e07921e
(byte-compile-log-1): Delete format call inside message.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
754 (if byte-compile-current-file |
75222e07921e
(byte-compile-log-1): Delete format call inside message.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
755 (if (stringp byte-compile-current-file) |
75222e07921e
(byte-compile-log-1): Delete format call inside message.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
756 (concat " in file " byte-compile-current-file) |
75222e07921e
(byte-compile-log-1): Delete format call inside message.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
757 (concat " in buffer " |
75222e07921e
(byte-compile-log-1): Delete format call inside message.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
758 (buffer-name byte-compile-current-file))) |
75222e07921e
(byte-compile-log-1): Delete format call inside message.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
759 ""))) |
757 | 760 (message " %s" string)) |
761 (t | |
762 (save-excursion | |
763 (set-buffer (get-buffer-create "*Compile-Log*")) | |
764 (goto-char (point-max)) | |
765 (cond ((or byte-compile-current-file | |
766 (and byte-compile-last-warned-form | |
767 (not (eq byte-compile-current-form | |
768 byte-compile-last-warned-form)))) | |
769 (if byte-compile-current-file | |
770 (insert "\n\^L\n" (current-time-string) "\n")) | |
771 (insert "While compiling " | |
772 (if byte-compile-current-form | |
773 (format "%s" byte-compile-current-form) | |
774 "toplevel forms")) | |
775 (if byte-compile-current-file | |
776 (if (stringp byte-compile-current-file) | |
777 (insert " in file " byte-compile-current-file) | |
778 (insert " in buffer " | |
779 (buffer-name byte-compile-current-file)))) | |
780 (insert ":\n"))) | |
958 | 781 (insert " " string "\n") |
782 (if (and fill (not (string-match "\n" string))) | |
783 (let ((fill-prefix " ") | |
784 (fill-column 78)) | |
785 (fill-paragraph nil))) | |
786 ))) | |
757 | 787 (setq byte-compile-current-file nil |
788 byte-compile-last-warned-form byte-compile-current-form)) | |
789 | |
11323
5f75d3e225c1
(byte-compile-log-file): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11253
diff
changeset
|
790 ;; Log the start of a file in *Compile-Log*, and mark it as done. |
5f75d3e225c1
(byte-compile-log-file): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11253
diff
changeset
|
791 ;; But do nothing in batch mode. |
5f75d3e225c1
(byte-compile-log-file): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11253
diff
changeset
|
792 (defun byte-compile-log-file () |
5f75d3e225c1
(byte-compile-log-file): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11253
diff
changeset
|
793 (and byte-compile-current-file (not noninteractive) |
5f75d3e225c1
(byte-compile-log-file): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11253
diff
changeset
|
794 (save-excursion |
5f75d3e225c1
(byte-compile-log-file): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11253
diff
changeset
|
795 (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
|
796 (goto-char (point-max)) |
11323
5f75d3e225c1
(byte-compile-log-file): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11253
diff
changeset
|
797 (insert "\n\^L\nCompiling " |
5f75d3e225c1
(byte-compile-log-file): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11253
diff
changeset
|
798 (if (stringp byte-compile-current-file) |
5f75d3e225c1
(byte-compile-log-file): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11253
diff
changeset
|
799 (concat "file " byte-compile-current-file) |
5f75d3e225c1
(byte-compile-log-file): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11253
diff
changeset
|
800 (concat "buffer " (buffer-name byte-compile-current-file))) |
5f75d3e225c1
(byte-compile-log-file): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11253
diff
changeset
|
801 " at " (current-time-string) "\n") |
5f75d3e225c1
(byte-compile-log-file): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11253
diff
changeset
|
802 (setq byte-compile-current-file nil)))) |
5f75d3e225c1
(byte-compile-log-file): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11253
diff
changeset
|
803 |
757 | 804 (defun byte-compile-warn (format &rest args) |
805 (setq format (apply 'format format args)) | |
806 (if byte-compile-error-on-warn | |
807 (error "%s" format) ; byte-compile-file catches and logs it | |
958 | 808 (byte-compile-log-1 (concat "** " format) t) |
819
5bbabfcef929
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
784
diff
changeset
|
809 ;;; It is useless to flash warnings too fast to be read. |
5bbabfcef929
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
784
diff
changeset
|
810 ;;; Besides, they will all be shown at the end. |
5bbabfcef929
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
784
diff
changeset
|
811 ;;; (or noninteractive ; already written on stdout. |
5bbabfcef929
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
784
diff
changeset
|
812 ;;; (message "Warning: %s" format)) |
5bbabfcef929
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
784
diff
changeset
|
813 )) |
757 | 814 |
922 | 815 ;;; This function should be used to report errors that have halted |
816 ;;; compilation of the current file. | |
817 (defun byte-compile-report-error (error-info) | |
1129 | 818 (setq byte-compiler-error-flag t) |
958 | 819 (byte-compile-log-1 |
820 (concat "!! " | |
821 (format (if (cdr error-info) "%s (%s)" "%s") | |
822 (get (car error-info) 'error-message) | |
823 (prin1-to-string (cdr error-info)))))) | |
922 | 824 |
757 | 825 ;;; Used by make-obsolete. |
826 (defun byte-compile-obsolete (form) | |
12487
b657158dd5c9
(byte-compile-obsolete): Do the funcall to compile
Richard M. Stallman <rms@gnu.org>
parents:
11928
diff
changeset
|
827 (let ((new (get (car form) 'byte-obsolete-info))) |
b657158dd5c9
(byte-compile-obsolete): Do the funcall to compile
Richard M. Stallman <rms@gnu.org>
parents:
11928
diff
changeset
|
828 (if (memq 'obsolete byte-compile-warnings) |
10256
83d56dd99a40
(byte-compile-warning-types): Add obsolete.
Richard M. Stallman <rms@gnu.org>
parents:
10235
diff
changeset
|
829 (byte-compile-warn "%s is an obsolete function; %s" (car form) |
83d56dd99a40
(byte-compile-warning-types): Add obsolete.
Richard M. Stallman <rms@gnu.org>
parents:
10235
diff
changeset
|
830 (if (stringp (car new)) |
83d56dd99a40
(byte-compile-warning-types): Add obsolete.
Richard M. Stallman <rms@gnu.org>
parents:
10235
diff
changeset
|
831 (car new) |
12487
b657158dd5c9
(byte-compile-obsolete): Do the funcall to compile
Richard M. Stallman <rms@gnu.org>
parents:
11928
diff
changeset
|
832 (format "use %s instead." (car new))))) |
b657158dd5c9
(byte-compile-obsolete): Do the funcall to compile
Richard M. Stallman <rms@gnu.org>
parents:
11928
diff
changeset
|
833 (funcall (or (cdr new) 'byte-compile-normal-call) form))) |
757 | 834 |
835 ;; Compiler options | |
836 | |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
837 ;; (defvar byte-compiler-valid-options |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
838 ;; '((optimize byte-optimize (t nil source byte) val) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
839 ;; (file-format byte-compile-compatibility (emacs18 emacs19) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
840 ;; (eq val 'emacs18)) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
841 ;; ;; (new-bytecodes byte-compile-generate-emacs19-bytecodes (t nil) val) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
842 ;; (delete-errors byte-compile-delete-errors (t nil) val) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
843 ;; (verbose byte-compile-verbose (t nil) val) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
844 ;; (warnings byte-compile-warnings ((callargs redefine free-vars unresolved)) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
845 ;; val))) |
757 | 846 |
847 ;; Inhibit v18/v19 selectors if the version is hardcoded. | |
848 ;; #### This should print a warning if the user tries to change something | |
849 ;; 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
|
850 ;; (cond |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
851 ;; ((byte-compile-single-version) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
852 ;; (setcar (cdr (cdr (assq 'new-bytecodes byte-compiler-valid-options))) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
853 ;; (list (byte-compile-version-cond |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
854 ;; byte-compile-generate-emacs19-bytecodes))) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
855 ;; (setcar (cdr (cdr (assq 'file-format byte-compiler-valid-options))) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
856 ;; (if (byte-compile-version-cond byte-compile-compatibility) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
857 ;; '(emacs18) '(emacs19))))) |
757 | 858 |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
859 ;; (defun byte-compiler-options-handler (&rest args) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
860 ;; (let (key val desc choices) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
861 ;; (while args |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
862 ;; (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
|
863 ;; (error "Malformed byte-compiler option `%s'" (car args))) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
864 ;; (setq key (car (car args)) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
865 ;; val (car (cdr (car args))) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
866 ;; desc (assq key byte-compiler-valid-options)) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
867 ;; (or desc |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
868 ;; (error "Unknown byte-compiler option `%s'" key)) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
869 ;; (setq choices (nth 2 desc)) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
870 ;; (if (consp (car choices)) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
871 ;; (let (this |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
872 ;; (handler 'cons) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
873 ;; (ret (and (memq (car val) '(+ -)) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
874 ;; (copy-sequence (if (eq t (symbol-value (nth 1 desc))) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
875 ;; choices |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
876 ;; (symbol-value (nth 1 desc))))))) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
877 ;; (setq choices (car choices)) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
878 ;; (while val |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
879 ;; (setq this (car val)) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
880 ;; (cond ((memq this choices) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
881 ;; (setq ret (funcall handler this ret))) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
882 ;; ((eq this '+) (setq handler 'cons)) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
883 ;; ((eq this '-) (setq handler 'delq)) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
884 ;; ((error "`%s' only accepts %s" key choices))) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
885 ;; (setq val (cdr val))) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
886 ;; (set (nth 1 desc) ret)) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
887 ;; (or (memq val choices) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
888 ;; (error "`%s' must be one of `%s'" key choices)) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
889 ;; (set (nth 1 desc) (eval (nth 3 desc)))) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
890 ;; (setq args (cdr args))) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
891 ;; nil)) |
757 | 892 |
893 ;;; sanity-checking arglists | |
894 | |
895 (defun byte-compile-fdefinition (name macro-p) | |
896 (let* ((list (if macro-p | |
897 byte-compile-macro-environment | |
8086
9f6348616e4d
(byte-compile-callargs-warn): Handle function defnition
Richard M. Stallman <rms@gnu.org>
parents:
7298
diff
changeset
|
898 byte-compile-function-environment)) |
757 | 899 (env (cdr (assq name list)))) |
900 (or env | |
901 (let ((fn name)) | |
902 (while (and (symbolp fn) | |
903 (fboundp fn) | |
904 (or (symbolp (symbol-function fn)) | |
905 (consp (symbol-function fn)) | |
906 (and (not macro-p) | |
1819
df06a60f3362
* disass.el (disassemble): Add autoload cookie for this.
Jim Blandy <jimb@redhat.com>
parents:
1604
diff
changeset
|
907 (byte-code-function-p (symbol-function fn))))) |
757 | 908 (setq fn (symbol-function fn))) |
1819
df06a60f3362
* disass.el (disassemble): Add autoload cookie for this.
Jim Blandy <jimb@redhat.com>
parents:
1604
diff
changeset
|
909 (if (and (not macro-p) (byte-code-function-p fn)) |
757 | 910 fn |
911 (and (consp fn) | |
912 (if (eq 'macro (car fn)) | |
913 (cdr fn) | |
914 (if macro-p | |
915 nil | |
916 (if (eq 'autoload (car fn)) | |
917 nil | |
918 fn))))))))) | |
919 | |
920 (defun byte-compile-arglist-signature (arglist) | |
921 (let ((args 0) | |
922 opts | |
923 restp) | |
924 (while arglist | |
925 (cond ((eq (car arglist) '&optional) | |
926 (or opts (setq opts 0))) | |
927 ((eq (car arglist) '&rest) | |
928 (if (cdr arglist) | |
929 (setq restp t | |
930 arglist nil))) | |
931 (t | |
932 (if opts | |
933 (setq opts (1+ opts)) | |
934 (setq args (1+ args))))) | |
935 (setq arglist (cdr arglist))) | |
936 (cons args (if restp nil (if opts (+ args opts) args))))) | |
937 | |
938 | |
939 (defun byte-compile-arglist-signatures-congruent-p (old new) | |
940 (not (or | |
941 (> (car new) (car old)) ; requires more args now | |
14040 | 942 (and (null (cdr old)) ; took rest-args, doesn't any more |
757 | 943 (cdr new)) |
944 (and (cdr new) (cdr old) ; can't take as many args now | |
945 (< (cdr new) (cdr old))) | |
946 ))) | |
947 | |
948 (defun byte-compile-arglist-signature-string (signature) | |
949 (cond ((null (cdr signature)) | |
950 (format "%d+" (car signature))) | |
951 ((= (car signature) (cdr signature)) | |
952 (format "%d" (car signature))) | |
953 (t (format "%d-%d" (car signature) (cdr signature))))) | |
954 | |
955 | |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
956 ;; Warn if the form is calling a function with the wrong number of arguments. |
757 | 957 (defun byte-compile-callargs-warn (form) |
958 (let* ((def (or (byte-compile-fdefinition (car form) nil) | |
959 (byte-compile-fdefinition (car form) t))) | |
960 (sig (and def (byte-compile-arglist-signature | |
961 (if (eq 'lambda (car-safe def)) | |
962 (nth 1 def) | |
10235
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
963 (if (byte-code-function-p def) |
8086
9f6348616e4d
(byte-compile-callargs-warn): Handle function defnition
Richard M. Stallman <rms@gnu.org>
parents:
7298
diff
changeset
|
964 (aref def 0) |
9f6348616e4d
(byte-compile-callargs-warn): Handle function defnition
Richard M. Stallman <rms@gnu.org>
parents:
7298
diff
changeset
|
965 '(&rest def)))))) |
757 | 966 (ncall (length (cdr form)))) |
967 (if sig | |
968 (if (or (< ncall (car sig)) | |
969 (and (cdr sig) (> ncall (cdr sig)))) | |
970 (byte-compile-warn | |
971 "%s called with %d argument%s, but %s %s" | |
972 (car form) ncall | |
973 (if (= 1 ncall) "" "s") | |
974 (if (< ncall (car sig)) | |
975 "requires" | |
976 "accepts only") | |
977 (byte-compile-arglist-signature-string sig))) | |
978 (or (fboundp (car form)) ; might be a subr or autoload. | |
979 (eq (car form) byte-compile-current-form) ; ## this doesn't work with recursion. | |
980 ;; It's a currently-undefined function. Remember number of args in call. | |
981 (let ((cons (assq (car form) byte-compile-unresolved-functions)) | |
982 (n (length (cdr form)))) | |
983 (if cons | |
984 (or (memq n (cdr cons)) | |
985 (setcdr cons (cons n (cdr cons)))) | |
986 (setq byte-compile-unresolved-functions | |
987 (cons (list (car form) n) | |
988 byte-compile-unresolved-functions)))))))) | |
989 | |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
990 ;; 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
|
991 ;; number of arguments. |
757 | 992 (defun byte-compile-arglist-warn (form macrop) |
993 (let ((old (byte-compile-fdefinition (nth 1 form) macrop))) | |
994 (if old | |
995 (let ((sig1 (byte-compile-arglist-signature | |
996 (if (eq 'lambda (car-safe old)) | |
997 (nth 1 old) | |
10235
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
998 (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
|
999 (aref old 0) |
9f6348616e4d
(byte-compile-callargs-warn): Handle function defnition
Richard M. Stallman <rms@gnu.org>
parents:
7298
diff
changeset
|
1000 '(&rest def))))) |
757 | 1001 (sig2 (byte-compile-arglist-signature (nth 2 form)))) |
1002 (or (byte-compile-arglist-signatures-congruent-p sig1 sig2) | |
1003 (byte-compile-warn "%s %s used to take %s %s, now takes %s" | |
1004 (if (eq (car form) 'defun) "function" "macro") | |
1005 (nth 1 form) | |
1006 (byte-compile-arglist-signature-string sig1) | |
1007 (if (equal sig1 '(1 . 1)) "argument" "arguments") | |
1008 (byte-compile-arglist-signature-string sig2)))) | |
1009 ;; This is the first definition. See if previous calls are compatible. | |
1010 (let ((calls (assq (nth 1 form) byte-compile-unresolved-functions)) | |
1011 nums sig min max) | |
1012 (if calls | |
1013 (progn | |
1014 (setq sig (byte-compile-arglist-signature (nth 2 form)) | |
1015 nums (sort (copy-sequence (cdr calls)) (function <)) | |
1016 min (car nums) | |
1017 max (car (nreverse nums))) | |
1018 (if (or (< min (car sig)) | |
1019 (and (cdr sig) (> max (cdr sig)))) | |
1020 (byte-compile-warn | |
1021 "%s being defined to take %s%s, but was previously called with %s" | |
1022 (nth 1 form) | |
1023 (byte-compile-arglist-signature-string sig) | |
1024 (if (equal sig '(1 . 1)) " arg" " args") | |
1025 (byte-compile-arglist-signature-string (cons min max)))) | |
1026 | |
1027 (setq byte-compile-unresolved-functions | |
1028 (delq calls byte-compile-unresolved-functions))))) | |
1029 ))) | |
1030 | |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1031 ;; If we have compiled any calls to functions which are not known to be |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1032 ;; defined, issue a warning enumerating them. |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1033 ;; `unresolved' in the list `byte-compile-warnings' disables this. |
757 | 1034 (defun byte-compile-warn-about-unresolved-functions () |
1035 (if (memq 'unresolved byte-compile-warnings) | |
1036 (let ((byte-compile-current-form "the end of the data")) | |
1037 (if (cdr byte-compile-unresolved-functions) | |
1038 (let* ((str "The following functions are not known to be defined: ") | |
1039 (L (length str)) | |
1040 (rest (reverse byte-compile-unresolved-functions)) | |
1041 s) | |
1042 (while rest | |
1043 (setq s (symbol-name (car (car rest))) | |
1044 L (+ L (length s) 2) | |
1045 rest (cdr rest)) | |
1046 (if (< L (1- fill-column)) | |
1047 (setq str (concat str " " s (and rest ","))) | |
1048 (setq str (concat str "\n " s (and rest ",")) | |
1049 L (+ (length s) 4)))) | |
1050 (byte-compile-warn "%s" str)) | |
1051 (if byte-compile-unresolved-functions | |
1052 (byte-compile-warn "the function %s is not known to be defined." | |
1053 (car (car byte-compile-unresolved-functions))))))) | |
1054 nil) | |
1055 | |
1056 | |
1057 (defmacro byte-compile-constp (form) | |
1058 ;; Returns non-nil if FORM is a constant. | |
1059 (` (cond ((consp (, form)) (eq (car (, form)) 'quote)) | |
1060 ((not (symbolp (, form)))) | |
1061 ((memq (, form) '(nil t)))))) | |
1062 | |
1063 (defmacro byte-compile-close-variables (&rest body) | |
1064 (cons 'let | |
1065 (cons '(;; | |
1066 ;; Close over these variables to encapsulate the | |
1067 ;; compilation state | |
1068 ;; | |
1069 (byte-compile-macro-environment | |
1070 ;; Copy it because the compiler may patch into the | |
1071 ;; macroenvironment. | |
1072 (copy-alist byte-compile-initial-macro-environment)) | |
1073 (byte-compile-function-environment nil) | |
1074 (byte-compile-bound-variables nil) | |
1075 (byte-compile-free-references nil) | |
1076 (byte-compile-free-assignments nil) | |
1077 ;; | |
1078 ;; Close over these variables so that `byte-compiler-options' | |
1079 ;; can change them on a per-file basis. | |
1080 ;; | |
1081 (byte-compile-verbose byte-compile-verbose) | |
1082 (byte-optimize byte-optimize) | |
10235
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1083 (byte-compile-compatibility byte-compile-compatibility) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1084 (byte-compile-dynamic byte-compile-dynamic) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1085 (byte-compile-dynamic-docstrings |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1086 byte-compile-dynamic-docstrings) |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1087 ;; (byte-compile-generate-emacs19-bytecodes |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1088 ;; byte-compile-generate-emacs19-bytecodes) |
757 | 1089 (byte-compile-warnings (if (eq byte-compile-warnings t) |
1090 byte-compile-warning-types | |
1091 byte-compile-warnings)) | |
1092 ) | |
1093 body))) | |
1094 | |
11323
5f75d3e225c1
(byte-compile-log-file): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11253
diff
changeset
|
1095 (defvar byte-compile-warnings-point-max nil) |
757 | 1096 (defmacro displaying-byte-compile-warnings (&rest body) |
1097 (list 'let | |
11323
5f75d3e225c1
(byte-compile-log-file): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11253
diff
changeset
|
1098 '((byte-compile-warnings-point-max byte-compile-warnings-point-max)) |
5f75d3e225c1
(byte-compile-log-file): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11253
diff
changeset
|
1099 ;; Log the file name. |
5f75d3e225c1
(byte-compile-log-file): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11253
diff
changeset
|
1100 '(byte-compile-log-file) |
5f75d3e225c1
(byte-compile-log-file): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11253
diff
changeset
|
1101 ;; Record how much is logged now. |
5f75d3e225c1
(byte-compile-log-file): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11253
diff
changeset
|
1102 ;; We will display the log buffer if anything more is logged |
5f75d3e225c1
(byte-compile-log-file): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11253
diff
changeset
|
1103 ;; before the end of BODY. |
5f75d3e225c1
(byte-compile-log-file): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11253
diff
changeset
|
1104 '(or byte-compile-warnings-point-max |
5f75d3e225c1
(byte-compile-log-file): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11253
diff
changeset
|
1105 (save-excursion |
5f75d3e225c1
(byte-compile-log-file): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11253
diff
changeset
|
1106 (set-buffer (get-buffer-create "*Compile-Log*")) |
5f75d3e225c1
(byte-compile-log-file): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11253
diff
changeset
|
1107 (setq byte-compile-warnings-point-max (point-max)))) |
922 | 1108 (list 'unwind-protect |
1109 (list 'condition-case 'error-info | |
1110 (cons 'progn body) | |
1111 '(error | |
1112 (byte-compile-report-error error-info))) | |
757 | 1113 '(save-excursion |
1114 ;; If there were compilation warnings, display them. | |
1115 (set-buffer "*Compile-Log*") | |
1116 (if (= byte-compile-warnings-point-max (point-max)) | |
1117 nil | |
1118 (select-window | |
1119 (prog1 (selected-window) | |
1120 (select-window (display-buffer (current-buffer))) | |
1121 (goto-char byte-compile-warnings-point-max) | |
19981
1d135b4edfcb
(displaying-byte-compile-warnings): Show
Karl Heuer <kwzh@gnu.org>
parents:
19637
diff
changeset
|
1122 (previous-line 1) |
1d135b4edfcb
(displaying-byte-compile-warnings): Show
Karl Heuer <kwzh@gnu.org>
parents:
19637
diff
changeset
|
1123 (recenter 0)))))))) |
757 | 1124 |
1125 | |
819
5bbabfcef929
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
784
diff
changeset
|
1126 ;;;###autoload |
13338
0f082123d484
(byte-recompile-directory): New arg FORCE.
Richard M. Stallman <rms@gnu.org>
parents:
13138
diff
changeset
|
1127 (defun byte-force-recompile (directory) |
0f082123d484
(byte-recompile-directory): New arg FORCE.
Richard M. Stallman <rms@gnu.org>
parents:
13138
diff
changeset
|
1128 "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
|
1129 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
|
1130 (interactive "DByte force recompile (directory): ") |
13338
0f082123d484
(byte-recompile-directory): New arg FORCE.
Richard M. Stallman <rms@gnu.org>
parents:
13138
diff
changeset
|
1131 (byte-recompile-directory directory nil t)) |
0f082123d484
(byte-recompile-directory): New arg FORCE.
Richard M. Stallman <rms@gnu.org>
parents:
13138
diff
changeset
|
1132 |
0f082123d484
(byte-recompile-directory): New arg FORCE.
Richard M. Stallman <rms@gnu.org>
parents:
13138
diff
changeset
|
1133 ;;;###autoload |
0f082123d484
(byte-recompile-directory): New arg FORCE.
Richard M. Stallman <rms@gnu.org>
parents:
13138
diff
changeset
|
1134 (defun byte-recompile-directory (directory &optional arg force) |
757 | 1135 "Recompile every `.el' file in DIRECTORY that needs recompilation. |
1136 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
|
1137 Files in subdirectories of DIRECTORY are processed also. |
757 | 1138 |
1139 If the `.elc' file does not exist, normally the `.el' file is *not* compiled. | |
1140 But a prefix argument (optional second arg) means ask user, | |
958 | 1141 for each such `.el' file, whether to compile it. Prefix argument 0 means |
4316
667b32d2c02c
(byte-recompile-directory): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
4129
diff
changeset
|
1142 don't ask and compile the file anyway. |
667b32d2c02c
(byte-recompile-directory): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
4129
diff
changeset
|
1143 |
13338
0f082123d484
(byte-recompile-directory): New arg FORCE.
Richard M. Stallman <rms@gnu.org>
parents:
13138
diff
changeset
|
1144 A nonzero prefix argument also means ask about each subdirectory. |
0f082123d484
(byte-recompile-directory): New arg FORCE.
Richard M. Stallman <rms@gnu.org>
parents:
13138
diff
changeset
|
1145 |
0f082123d484
(byte-recompile-directory): New arg FORCE.
Richard M. Stallman <rms@gnu.org>
parents:
13138
diff
changeset
|
1146 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
|
1147 recompile every `.el' file that already has a `.elc' file." |
757 | 1148 (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
|
1149 (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
|
1150 (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
|
1151 (if noninteractive |
974055b516d9
* bytecomp.el: Bring it up to version 2.10 of the
Jim Blandy <jimb@redhat.com>
parents:
3591
diff
changeset
|
1152 nil |
974055b516d9
* bytecomp.el: Bring it up to version 2.10 of the
Jim Blandy <jimb@redhat.com>
parents:
3591
diff
changeset
|
1153 (save-some-buffers) |
11590
97a90e900ce7
(byte-recompile-directory): Use force-mode-line-update.
Karl Heuer <kwzh@gnu.org>
parents:
11432
diff
changeset
|
1154 (force-mode-line-update)) |
958 | 1155 (let ((directories (list (expand-file-name directory))) |
1156 (file-count 0) | |
1157 (dir-count 0) | |
1158 last-dir) | |
1159 (displaying-byte-compile-warnings | |
1160 (while directories | |
1161 (setq directory (car directories)) | |
3653
974055b516d9
* bytecomp.el: Bring it up to version 2.10 of the
Jim Blandy <jimb@redhat.com>
parents:
3591
diff
changeset
|
1162 (or noninteractive (message "Checking %s..." directory)) |
958 | 1163 (let ((files (directory-files directory)) |
1164 source dest) | |
1165 (while files | |
1166 (setq source (expand-file-name (car files) directory)) | |
1167 (if (and (not (member (car files) '("." ".." "RCS" "CVS"))) | |
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
|
1168 (file-directory-p source) |
f48e54cb9b01
(byte-compile-dest-file): If FILENAME is not recognized, append .elc to it.
Richard M. Stallman <rms@gnu.org>
parents:
4556
diff
changeset
|
1169 (not (file-symlink-p source))) |
13338
0f082123d484
(byte-recompile-directory): New arg FORCE.
Richard M. Stallman <rms@gnu.org>
parents:
13138
diff
changeset
|
1170 ;; This file is a subdirectory. Handle them differently. |
958 | 1171 (if (or (null arg) |
2735
6489c9da34b9
(byte-recompile-directory): If ARG is non-nil, set it to its prefix
Roland McGrath <roland@gnu.org>
parents:
2626
diff
changeset
|
1172 (eq 0 arg) |
958 | 1173 (y-or-n-p (concat "Check " source "? "))) |
1174 (setq directories | |
1175 (nconc directories (list source)))) | |
13338
0f082123d484
(byte-recompile-directory): New arg FORCE.
Richard M. Stallman <rms@gnu.org>
parents:
13138
diff
changeset
|
1176 ;; It is an ordinary file. Decide whether to compile it. |
958 | 1177 (if (and (string-match emacs-lisp-file-regexp source) |
1178 (not (auto-save-file-name-p source)) | |
1179 (setq dest (byte-compile-dest-file source)) | |
1180 (if (file-exists-p dest) | |
13338
0f082123d484
(byte-recompile-directory): New arg FORCE.
Richard M. Stallman <rms@gnu.org>
parents:
13138
diff
changeset
|
1181 ;; File was already compiled. |
0f082123d484
(byte-recompile-directory): New arg FORCE.
Richard M. Stallman <rms@gnu.org>
parents:
13138
diff
changeset
|
1182 (or force (file-newer-than-file-p source dest)) |
0f082123d484
(byte-recompile-directory): New arg FORCE.
Richard M. Stallman <rms@gnu.org>
parents:
13138
diff
changeset
|
1183 ;; No compiled file exists yet. |
958 | 1184 (and arg |
2735
6489c9da34b9
(byte-recompile-directory): If ARG is non-nil, set it to its prefix
Roland McGrath <roland@gnu.org>
parents:
2626
diff
changeset
|
1185 (or (eq 0 arg) |
958 | 1186 (y-or-n-p (concat "Compile " source "? ")))))) |
3653
974055b516d9
* bytecomp.el: Bring it up to version 2.10 of the
Jim Blandy <jimb@redhat.com>
parents:
3591
diff
changeset
|
1187 (progn (if (and noninteractive (not byte-compile-verbose)) |
974055b516d9
* bytecomp.el: Bring it up to version 2.10 of the
Jim Blandy <jimb@redhat.com>
parents:
3591
diff
changeset
|
1188 (message "Compiling %s..." source)) |
974055b516d9
* bytecomp.el: Bring it up to version 2.10 of the
Jim Blandy <jimb@redhat.com>
parents:
3591
diff
changeset
|
1189 (byte-compile-file source) |
4411
cde0e3c3b642
(byte-recompile-directory): At end of compiling a file,
Richard M. Stallman <rms@gnu.org>
parents:
4316
diff
changeset
|
1190 (or noninteractive |
cde0e3c3b642
(byte-recompile-directory): At end of compiling a file,
Richard M. Stallman <rms@gnu.org>
parents:
4316
diff
changeset
|
1191 (message "Checking %s..." directory)) |
958 | 1192 (setq file-count (1+ file-count)) |
1193 (if (not (eq last-dir directory)) | |
1194 (setq last-dir directory | |
1195 dir-count (1+ dir-count))) | |
1196 ))) | |
1197 (setq files (cdr files)))) | |
1198 (setq directories (cdr directories)))) | |
1199 (message "Done (Total of %d file%s compiled%s)" | |
1200 file-count (if (= file-count 1) "" "s") | |
1201 (if (> dir-count 1) (format " in %d directories" dir-count) "")))) | |
757 | 1202 |
819
5bbabfcef929
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
784
diff
changeset
|
1203 ;;;###autoload |
757 | 1204 (defun byte-compile-file (filename &optional load) |
1205 "Compile a file of Lisp code named FILENAME into a file of byte code. | |
1206 The output file's name is made by appending `c' to the end of FILENAME. | |
18391
1ff0bfd40508
(byte-compile-file): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
18266
diff
changeset
|
1207 With prefix arg (noninteractively: 2nd arg), load the file after compiling. |
1ff0bfd40508
(byte-compile-file): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
18266
diff
changeset
|
1208 The value is t if there were no errors, nil if errors." |
757 | 1209 ;; (interactive "fByte compile file: \nP") |
1210 (interactive | |
1211 (let ((file buffer-file-name) | |
1212 (file-name nil) | |
1213 (file-dir nil)) | |
1214 (and file | |
1215 (eq (cdr (assq 'major-mode (buffer-local-variables))) | |
1216 'emacs-lisp-mode) | |
1217 (setq file-name (file-name-nondirectory file) | |
1218 file-dir (file-name-directory file))) | |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1219 (list (read-file-name (if current-prefix-arg |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1220 "Byte compile and load file: " |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1221 "Byte compile file: ") |
3718
37a8a7489fc5
(byte-compile-file): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
3653
diff
changeset
|
1222 file-dir file-name nil) |
819
5bbabfcef929
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
784
diff
changeset
|
1223 current-prefix-arg))) |
757 | 1224 ;; Expand now so we get the current buffer's defaults |
1225 (setq filename (expand-file-name filename)) | |
1226 | |
1227 ;; If we're compiling a file that's in a buffer and is modified, offer | |
1228 ;; to save it first. | |
1229 (or noninteractive | |
1230 (let ((b (get-file-buffer (expand-file-name filename)))) | |
1231 (if (and b (buffer-modified-p b) | |
1232 (y-or-n-p (format "save buffer %s first? " (buffer-name b)))) | |
1233 (save-excursion (set-buffer b) (save-buffer))))) | |
1234 | |
1235 (if byte-compile-verbose | |
1236 (message "Compiling %s..." filename)) | |
6554
5f8effa94d20
(byte-compile-file): Use whole file name for errors.
Richard M. Stallman <rms@gnu.org>
parents:
6293
diff
changeset
|
1237 (let ((byte-compile-current-file filename) |
10235
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1238 target-file input-buffer output-buffer |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1239 byte-compile-dest-file) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1240 (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
|
1241 (setq byte-compile-dest-file target-file) |
757 | 1242 (save-excursion |
1129 | 1243 (setq input-buffer (get-buffer-create " *Compiler Input*")) |
1244 (set-buffer input-buffer) | |
757 | 1245 (erase-buffer) |
1246 (insert-file-contents filename) | |
1247 ;; Run hooks including the uncompression hook. | |
1248 ;; 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
|
1249 (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
|
1250 (default-major-mode 'emacs-lisp-mode) |
10235
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1251 (enable-local-eval nil)) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1252 (normal-mode) |
16788
ffb387a3d054
(byte-compile-file): Set default-directory in compiler input buffer.
Richard M. Stallman <rms@gnu.org>
parents:
16666
diff
changeset
|
1253 (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
|
1254 ;; 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
|
1255 (setq default-directory (file-name-directory filename))) |
1129 | 1256 (setq byte-compiler-error-flag nil) |
1257 ;; It is important that input-buffer not be current at this call, | |
1258 ;; so that the value of point set in input-buffer | |
1259 ;; within byte-compile-from-buffer lingers in that buffer. | |
6193
74fcc9007c39
(byte-compile-insert-header): Take a filename argument.
Richard M. Stallman <rms@gnu.org>
parents:
6081
diff
changeset
|
1260 (setq output-buffer (byte-compile-from-buffer input-buffer filename)) |
2855
b858b91dff34
(byte-compile-file): Don't write output if error.
Richard M. Stallman <rms@gnu.org>
parents:
2853
diff
changeset
|
1261 (if byte-compiler-error-flag |
b858b91dff34
(byte-compile-file): Don't write output if error.
Richard M. Stallman <rms@gnu.org>
parents:
2853
diff
changeset
|
1262 nil |
10696
5cf8a7a41664
(byte-compile-file): Add "done" message.
Karl Heuer <kwzh@gnu.org>
parents:
10687
diff
changeset
|
1263 (if byte-compile-verbose |
5cf8a7a41664
(byte-compile-file): Add "done" message.
Karl Heuer <kwzh@gnu.org>
parents:
10687
diff
changeset
|
1264 (message "Compiling %s...done" filename)) |
2855
b858b91dff34
(byte-compile-file): Don't write output if error.
Richard M. Stallman <rms@gnu.org>
parents:
2853
diff
changeset
|
1265 (kill-buffer input-buffer) |
b858b91dff34
(byte-compile-file): Don't write output if error.
Richard M. Stallman <rms@gnu.org>
parents:
2853
diff
changeset
|
1266 (save-excursion |
b858b91dff34
(byte-compile-file): Don't write output if error.
Richard M. Stallman <rms@gnu.org>
parents:
2853
diff
changeset
|
1267 (set-buffer output-buffer) |
b858b91dff34
(byte-compile-file): Don't write output if error.
Richard M. Stallman <rms@gnu.org>
parents:
2853
diff
changeset
|
1268 (goto-char (point-max)) |
b858b91dff34
(byte-compile-file): Don't write output if error.
Richard M. Stallman <rms@gnu.org>
parents:
2853
diff
changeset
|
1269 (insert "\n") ; aaah, unix. |
b858b91dff34
(byte-compile-file): Don't write output if error.
Richard M. Stallman <rms@gnu.org>
parents:
2853
diff
changeset
|
1270 (let ((vms-stmlf-recfm t)) |
b858b91dff34
(byte-compile-file): Don't write output if error.
Richard M. Stallman <rms@gnu.org>
parents:
2853
diff
changeset
|
1271 (if (file-writable-p target-file) |
17002
07144e5d208a
(byte-compile-file): Write a compiled file without
Karl Heuer <kwzh@gnu.org>
parents:
16788
diff
changeset
|
1272 ;; We must disable any code conversion here. |
17077
8f8c3d05b158
(byte-compile-file): Bind coding-system-for-write
Kenichi Handa <handa@m17n.org>
parents:
17002
diff
changeset
|
1273 (let ((coding-system-for-write 'no-conversion)) |
9781
ae6fed248fb9
(byte-compile-file): Treat windows-nt like ms-dos.
Richard M. Stallman <rms@gnu.org>
parents:
9414
diff
changeset
|
1274 (if (or (eq system-type 'ms-dos) (eq system-type 'windows-nt)) |
5454
751ea2cff517
[ms-dos] (byte-compile-file): Save as binary.
Richard M. Stallman <rms@gnu.org>
parents:
5431
diff
changeset
|
1275 (setq buffer-file-type t)) |
2855
b858b91dff34
(byte-compile-file): Don't write output if error.
Richard M. Stallman <rms@gnu.org>
parents:
2853
diff
changeset
|
1276 (write-region 1 (point-max) target-file)) |
b858b91dff34
(byte-compile-file): Don't write output if error.
Richard M. Stallman <rms@gnu.org>
parents:
2853
diff
changeset
|
1277 ;; This is just to give a better error message than |
b858b91dff34
(byte-compile-file): Don't write output if error.
Richard M. Stallman <rms@gnu.org>
parents:
2853
diff
changeset
|
1278 ;; write-region |
b858b91dff34
(byte-compile-file): Don't write output if error.
Richard M. Stallman <rms@gnu.org>
parents:
2853
diff
changeset
|
1279 (signal 'file-error |
b858b91dff34
(byte-compile-file): Don't write output if error.
Richard M. Stallman <rms@gnu.org>
parents:
2853
diff
changeset
|
1280 (list "Opening output file" |
b858b91dff34
(byte-compile-file): Don't write output if error.
Richard M. Stallman <rms@gnu.org>
parents:
2853
diff
changeset
|
1281 (if (file-exists-p target-file) |
b858b91dff34
(byte-compile-file): Don't write output if error.
Richard M. Stallman <rms@gnu.org>
parents:
2853
diff
changeset
|
1282 "cannot overwrite file" |
b858b91dff34
(byte-compile-file): Don't write output if error.
Richard M. Stallman <rms@gnu.org>
parents:
2853
diff
changeset
|
1283 "directory not writable or nonexistent") |
10235
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1284 target-file)))) |
2855
b858b91dff34
(byte-compile-file): Don't write output if error.
Richard M. Stallman <rms@gnu.org>
parents:
2853
diff
changeset
|
1285 (kill-buffer (current-buffer))) |
b858b91dff34
(byte-compile-file): Don't write output if error.
Richard M. Stallman <rms@gnu.org>
parents:
2853
diff
changeset
|
1286 (if (and byte-compile-generate-call-tree |
b858b91dff34
(byte-compile-file): Don't write output if error.
Richard M. Stallman <rms@gnu.org>
parents:
2853
diff
changeset
|
1287 (or (eq t byte-compile-generate-call-tree) |
b858b91dff34
(byte-compile-file): Don't write output if error.
Richard M. Stallman <rms@gnu.org>
parents:
2853
diff
changeset
|
1288 (y-or-n-p (format "Report call tree for %s? " filename)))) |
b858b91dff34
(byte-compile-file): Don't write output if error.
Richard M. Stallman <rms@gnu.org>
parents:
2853
diff
changeset
|
1289 (save-excursion |
b858b91dff34
(byte-compile-file): Don't write output if error.
Richard M. Stallman <rms@gnu.org>
parents:
2853
diff
changeset
|
1290 (display-call-tree filename))) |
b858b91dff34
(byte-compile-file): Don't write output if error.
Richard M. Stallman <rms@gnu.org>
parents:
2853
diff
changeset
|
1291 (if load |
6043
1b850ad30158
(byte-compile-file): Return nil on failure.
Karl Heuer <kwzh@gnu.org>
parents:
5562
diff
changeset
|
1292 (load target-file)) |
1b850ad30158
(byte-compile-file): Return nil on failure.
Karl Heuer <kwzh@gnu.org>
parents:
5562
diff
changeset
|
1293 t))) |
757 | 1294 |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1295 ;;(defun byte-compile-and-load-file (&optional filename) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1296 ;; "Compile a file of Lisp code named FILENAME into a file of byte code, |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1297 ;;and then load it. The output file's name is made by appending \"c\" to |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1298 ;;the end of FILENAME." |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1299 ;; (interactive) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1300 ;; (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
|
1301 ;; (byte-compile-file filename t) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1302 ;; (let ((current-prefix-arg '(4))) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1303 ;; (call-interactively 'byte-compile-file)))) |
757 | 1304 |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1305 ;;(defun byte-compile-buffer (&optional buffer) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1306 ;; "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
|
1307 ;; (interactive "bByte compile buffer: ") |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1308 ;; (setq buffer (if buffer (get-buffer buffer) (current-buffer))) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1309 ;; (message "Compiling %s..." (buffer-name buffer)) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1310 ;; (let* ((filename (or (buffer-file-name buffer) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1311 ;; (concat "#<buffer " (buffer-name buffer) ">"))) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1312 ;; (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
|
1313 ;; (byte-compile-from-buffer buffer nil)) |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1314 ;; (message "Compiling %s...done" (buffer-name buffer)) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1315 ;; t) |
757 | 1316 |
1317 ;;; compiling a single function | |
819
5bbabfcef929
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
784
diff
changeset
|
1318 ;;;###autoload |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1319 (defun compile-defun (&optional arg) |
757 | 1320 "Compile and evaluate the current top-level form. |
1321 Print the result in the minibuffer. | |
1322 With argument, insert value in current buffer after the form." | |
1323 (interactive "P") | |
1324 (save-excursion | |
1325 (end-of-defun) | |
1326 (beginning-of-defun) | |
1327 (let* ((byte-compile-current-file nil) | |
1328 (byte-compile-last-warned-form 'nothing) | |
819
5bbabfcef929
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
784
diff
changeset
|
1329 (value (eval (displaying-byte-compile-warnings |
5bbabfcef929
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
784
diff
changeset
|
1330 (byte-compile-sexp (read (current-buffer))))))) |
757 | 1331 (cond (arg |
1332 (message "Compiling from buffer... done.") | |
1333 (prin1 value (current-buffer)) | |
1334 (insert "\n")) | |
1335 ((message "%s" (prin1-to-string value))))))) | |
1336 | |
1337 | |
6193
74fcc9007c39
(byte-compile-insert-header): Take a filename argument.
Richard M. Stallman <rms@gnu.org>
parents:
6081
diff
changeset
|
1338 (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
|
1339 ;; 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
|
1340 (let (outbuffer |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1341 ;; 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
|
1342 (float-output-format nil) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1343 (case-fold-search nil) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1344 (print-length nil) |
13138
2a0ef3a2ccc3
(byte-compile-from-buffer): Bind print-level.
Richard M. Stallman <rms@gnu.org>
parents:
12928
diff
changeset
|
1345 (print-level nil) |
10235
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1346 ;; Simulate entry to byte-compile-top-level |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1347 (byte-compile-constants nil) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1348 (byte-compile-variables nil) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1349 (byte-compile-tag-number 0) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1350 (byte-compile-depth 0) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1351 (byte-compile-maxdepth 0) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1352 (byte-compile-output nil) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1353 ;; #### 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
|
1354 ;; (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
|
1355 ;; byte-compile-warning-types |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1356 ;; byte-compile-warnings)) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1357 ) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1358 (byte-compile-close-variables |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1359 (save-excursion |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1360 (setq outbuffer |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1361 (set-buffer (get-buffer-create " *Compiler Output*"))) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1362 (erase-buffer) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1363 ;; (emacs-lisp-mode) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1364 (setq case-fold-search nil) |
12823
c1fcd8660aba
(byte-compile-insert-header): Use 19.29, not 19.28.90
Richard M. Stallman <rms@gnu.org>
parents:
12794
diff
changeset
|
1365 (and filename (byte-compile-insert-header filename inbuffer outbuffer)) |
2216
8dfca05a5852
* bytecomp.el (byte-compile-from-buffer): Put buffer containing
Jim Blandy <jimb@redhat.com>
parents:
2104
diff
changeset
|
1366 |
10235
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1367 ;; 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
|
1368 ;; write files containing binary information specially. |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1369 ;; 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
|
1370 ;; 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
|
1371 ;; 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
|
1372 ;; need to be written carefully. |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1373 (setq overwrite-mode 'overwrite-mode-binary)) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1374 (displaying-byte-compile-warnings |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1375 (save-excursion |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1376 (set-buffer inbuffer) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1377 (goto-char 1) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1378 |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1379 ;; Compile the forms from the input buffer. |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1380 (while (progn |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1381 (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
|
1382 (looking-at ";")) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1383 (forward-line 1)) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1384 (not (eobp))) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1385 (byte-compile-file-form (read inbuffer))) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1386 |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1387 ;; Compile pending forms at end of file. |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1388 (byte-compile-flush-pending) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1389 (byte-compile-warn-about-unresolved-functions) |
14040 | 1390 ;; 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
|
1391 ;; 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
|
1392 ;; been compiled. |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1393 (setq byte-compile-unresolved-functions nil)))) |
8446
0199ece40d91
(byte-compile-protect-from-advice): Macro deleted.
Richard M. Stallman <rms@gnu.org>
parents:
8115
diff
changeset
|
1394 outbuffer)) |
757 | 1395 |
12823
c1fcd8660aba
(byte-compile-insert-header): Use 19.29, not 19.28.90
Richard M. Stallman <rms@gnu.org>
parents:
12794
diff
changeset
|
1396 (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
|
1397 (set-buffer inbuffer) |
15925
278440a92757
(byte-compile-insert-header): Clean up syntax
Richard M. Stallman <rms@gnu.org>
parents:
14766
diff
changeset
|
1398 (let ((dynamic-docstrings byte-compile-dynamic-docstrings) |
278440a92757
(byte-compile-insert-header): Clean up syntax
Richard M. Stallman <rms@gnu.org>
parents:
14766
diff
changeset
|
1399 (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
|
1400 (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
|
1401 (goto-char 1) |
c1fcd8660aba
(byte-compile-insert-header): Use 19.29, not 19.28.90
Richard M. Stallman <rms@gnu.org>
parents:
12794
diff
changeset
|
1402 ;; |
c1fcd8660aba
(byte-compile-insert-header): Use 19.29, not 19.28.90
Richard M. Stallman <rms@gnu.org>
parents:
12794
diff
changeset
|
1403 ;; The magic number of .elc files is ";ELC", or 0x3B454C43. After that is |
c1fcd8660aba
(byte-compile-insert-header): Use 19.29, not 19.28.90
Richard M. Stallman <rms@gnu.org>
parents:
12794
diff
changeset
|
1404 ;; the file-format version number (18 or 19) as a byte, followed by some |
c1fcd8660aba
(byte-compile-insert-header): Use 19.29, not 19.28.90
Richard M. Stallman <rms@gnu.org>
parents:
12794
diff
changeset
|
1405 ;; nulls. The primary motivation for doing this is to get some binary |
c1fcd8660aba
(byte-compile-insert-header): Use 19.29, not 19.28.90
Richard M. Stallman <rms@gnu.org>
parents:
12794
diff
changeset
|
1406 ;; characters up in the first line of the file so that `diff' will simply |
c1fcd8660aba
(byte-compile-insert-header): Use 19.29, not 19.28.90
Richard M. Stallman <rms@gnu.org>
parents:
12794
diff
changeset
|
1407 ;; say "Binary files differ" instead of actually doing a diff of two .elc |
c1fcd8660aba
(byte-compile-insert-header): Use 19.29, not 19.28.90
Richard M. Stallman <rms@gnu.org>
parents:
12794
diff
changeset
|
1408 ;; files. An extra benefit is that you can add this to /etc/magic: |
c1fcd8660aba
(byte-compile-insert-header): Use 19.29, not 19.28.90
Richard M. Stallman <rms@gnu.org>
parents:
12794
diff
changeset
|
1409 ;; |
c1fcd8660aba
(byte-compile-insert-header): Use 19.29, not 19.28.90
Richard M. Stallman <rms@gnu.org>
parents:
12794
diff
changeset
|
1410 ;; 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
|
1411 ;; >4 byte x version %d |
c1fcd8660aba
(byte-compile-insert-header): Use 19.29, not 19.28.90
Richard M. Stallman <rms@gnu.org>
parents:
12794
diff
changeset
|
1412 ;; |
c1fcd8660aba
(byte-compile-insert-header): Use 19.29, not 19.28.90
Richard M. Stallman <rms@gnu.org>
parents:
12794
diff
changeset
|
1413 (insert |
c1fcd8660aba
(byte-compile-insert-header): Use 19.29, not 19.28.90
Richard M. Stallman <rms@gnu.org>
parents:
12794
diff
changeset
|
1414 ";ELC" |
c1fcd8660aba
(byte-compile-insert-header): Use 19.29, not 19.28.90
Richard M. Stallman <rms@gnu.org>
parents:
12794
diff
changeset
|
1415 (if (byte-compile-version-cond byte-compile-compatibility) 18 19) |
c1fcd8660aba
(byte-compile-insert-header): Use 19.29, not 19.28.90
Richard M. Stallman <rms@gnu.org>
parents:
12794
diff
changeset
|
1416 "\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
|
1417 ) |
15925
278440a92757
(byte-compile-insert-header): Clean up syntax
Richard M. Stallman <rms@gnu.org>
parents:
14766
diff
changeset
|
1418 (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
|
1419 (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
|
1420 (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
|
1421 " on " |
c1fcd8660aba
(byte-compile-insert-header): Use 19.29, not 19.28.90
Richard M. Stallman <rms@gnu.org>
parents:
12794
diff
changeset
|
1422 (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
|
1423 (insert ";;; in Emacs version " emacs-version "\n") |
15927
9b6ae5c1a0bf
(byte-compile-insert-header):
Richard M. Stallman <rms@gnu.org>
parents:
15926
diff
changeset
|
1424 (insert ";;; with bytecomp version " |
15930
811f16bdff08
(byte-compile-insert-header): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
15927
diff
changeset
|
1425 (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
|
1426 (match-string 0 byte-compile-version)) |
15927
9b6ae5c1a0bf
(byte-compile-insert-header):
Richard M. Stallman <rms@gnu.org>
parents:
15926
diff
changeset
|
1427 "\n;;; " |
12823
c1fcd8660aba
(byte-compile-insert-header): Use 19.29, not 19.28.90
Richard M. Stallman <rms@gnu.org>
parents:
12794
diff
changeset
|
1428 (cond |
15925
278440a92757
(byte-compile-insert-header): Clean up syntax
Richard M. Stallman <rms@gnu.org>
parents:
14766
diff
changeset
|
1429 ((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
|
1430 ((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
|
1431 (byte-optimize "with all optimizations") |
278440a92757
(byte-compile-insert-header): Clean up syntax
Richard M. Stallman <rms@gnu.org>
parents:
14766
diff
changeset
|
1432 (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
|
1433 (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
|
1434 "; 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
|
1435 ".\n")) |
15925
278440a92757
(byte-compile-insert-header): Clean up syntax
Richard M. Stallman <rms@gnu.org>
parents:
14766
diff
changeset
|
1436 (if dynamic |
278440a92757
(byte-compile-insert-header): Clean up syntax
Richard M. Stallman <rms@gnu.org>
parents:
14766
diff
changeset
|
1437 (insert ";;; Function definitions are lazy-loaded.\n")) |
12823
c1fcd8660aba
(byte-compile-insert-header): Use 19.29, not 19.28.90
Richard M. Stallman <rms@gnu.org>
parents:
12794
diff
changeset
|
1438 (if (not (byte-compile-version-cond byte-compile-compatibility)) |
15925
278440a92757
(byte-compile-insert-header): Clean up syntax
Richard M. Stallman <rms@gnu.org>
parents:
14766
diff
changeset
|
1439 (insert ";;; This file uses opcodes which do not exist in Emacs 18.\n" |
12823
c1fcd8660aba
(byte-compile-insert-header): Use 19.29, not 19.28.90
Richard M. Stallman <rms@gnu.org>
parents:
12794
diff
changeset
|
1440 ;; Have to check if emacs-version is bound so that this works |
c1fcd8660aba
(byte-compile-insert-header): Use 19.29, not 19.28.90
Richard M. Stallman <rms@gnu.org>
parents:
12794
diff
changeset
|
1441 ;; in files loaded early in loadup.el. |
c1fcd8660aba
(byte-compile-insert-header): Use 19.29, not 19.28.90
Richard M. Stallman <rms@gnu.org>
parents:
12794
diff
changeset
|
1442 "\n(if (and (boundp 'emacs-version)\n" |
16623
b33613b8aadb
(byte-compile-insert-header): If emacs-version
Richard M. Stallman <rms@gnu.org>
parents:
16435
diff
changeset
|
1443 ;; If there is a name at the end of emacs-version, |
b33613b8aadb
(byte-compile-insert-header): If emacs-version
Richard M. Stallman <rms@gnu.org>
parents:
16435
diff
changeset
|
1444 ;; don't try to check the version number. |
16666
b1e4c26fc85c
(byte-compile-insert-header): Fix previous change.
Karl Heuer <kwzh@gnu.org>
parents:
16623
diff
changeset
|
1445 "\t (< (aref emacs-version (1- (length emacs-version))) ?A)\n" |
b1e4c26fc85c
(byte-compile-insert-header): Fix previous change.
Karl Heuer <kwzh@gnu.org>
parents:
16623
diff
changeset
|
1446 "\t (or (and (boundp 'epoch::version) epoch::version)\n" |
12823
c1fcd8660aba
(byte-compile-insert-header): Use 19.29, not 19.28.90
Richard M. Stallman <rms@gnu.org>
parents:
12794
diff
changeset
|
1447 (if dynamic-docstrings |
c1fcd8660aba
(byte-compile-insert-header): Use 19.29, not 19.28.90
Richard M. Stallman <rms@gnu.org>
parents:
12794
diff
changeset
|
1448 "\t (string-lessp emacs-version \"19.29\")))\n" |
c1fcd8660aba
(byte-compile-insert-header): Use 19.29, not 19.28.90
Richard M. Stallman <rms@gnu.org>
parents:
12794
diff
changeset
|
1449 "\t (string-lessp emacs-version \"19\")))\n") |
c1fcd8660aba
(byte-compile-insert-header): Use 19.29, not 19.28.90
Richard M. Stallman <rms@gnu.org>
parents:
12794
diff
changeset
|
1450 " (error \"`" |
c1fcd8660aba
(byte-compile-insert-header): Use 19.29, not 19.28.90
Richard M. Stallman <rms@gnu.org>
parents:
12794
diff
changeset
|
1451 ;; prin1-to-string is used to quote backslashes. |
c1fcd8660aba
(byte-compile-insert-header): Use 19.29, not 19.28.90
Richard M. Stallman <rms@gnu.org>
parents:
12794
diff
changeset
|
1452 (substring (prin1-to-string (file-name-nondirectory filename)) |
c1fcd8660aba
(byte-compile-insert-header): Use 19.29, not 19.28.90
Richard M. Stallman <rms@gnu.org>
parents:
12794
diff
changeset
|
1453 1 -1) |
c1fcd8660aba
(byte-compile-insert-header): Use 19.29, not 19.28.90
Richard M. Stallman <rms@gnu.org>
parents:
12794
diff
changeset
|
1454 (if dynamic-docstrings |
c1fcd8660aba
(byte-compile-insert-header): Use 19.29, not 19.28.90
Richard M. Stallman <rms@gnu.org>
parents:
12794
diff
changeset
|
1455 "' was compiled for Emacs 19.29 or later\"))\n\n" |
c1fcd8660aba
(byte-compile-insert-header): Use 19.29, not 19.28.90
Richard M. Stallman <rms@gnu.org>
parents:
12794
diff
changeset
|
1456 "' was compiled for Emacs 19\"))\n\n")) |
c1fcd8660aba
(byte-compile-insert-header): Use 19.29, not 19.28.90
Richard M. Stallman <rms@gnu.org>
parents:
12794
diff
changeset
|
1457 (insert "(or (boundp 'current-load-list) (setq current-load-list nil))\n" |
c1fcd8660aba
(byte-compile-insert-header): Use 19.29, not 19.28.90
Richard M. Stallman <rms@gnu.org>
parents:
12794
diff
changeset
|
1458 "\n") |
c1fcd8660aba
(byte-compile-insert-header): Use 19.29, not 19.28.90
Richard M. Stallman <rms@gnu.org>
parents:
12794
diff
changeset
|
1459 ))) |
757 | 1460 |
1461 | |
1462 (defun byte-compile-output-file-form (form) | |
1463 ;; 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
|
1464 ;; 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
|
1465 ;; 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
|
1466 ;; 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
|
1467 ;; 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
|
1468 ;; it here. |
19637
baaf02a51ba2
(byte-compile-output-file-form): Handle custom-declare-variable.
Richard M. Stallman <rms@gnu.org>
parents:
18960
diff
changeset
|
1469 (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
|
1470 custom-declare-variable)) |
757 | 1471 (stringp (nth 3 form))) |
10235
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1472 (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
|
1473 (memq (car form) |
baaf02a51ba2
(byte-compile-output-file-form): Handle custom-declare-variable.
Richard M. Stallman <rms@gnu.org>
parents:
18960
diff
changeset
|
1474 '(autoload custom-declare-variable))) |
757 | 1475 (let ((print-escape-newlines t) |
12552
176c42cc7eeb
(byte-compile-output-file-form): Bind print-length
Karl Heuer <kwzh@gnu.org>
parents:
12511
diff
changeset
|
1476 (print-length nil) |
176c42cc7eeb
(byte-compile-output-file-form): Bind print-length
Karl Heuer <kwzh@gnu.org>
parents:
12511
diff
changeset
|
1477 (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
|
1478 (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
|
1479 (print-gensym t)) |
757 | 1480 (princ "\n" outbuffer) |
1481 (prin1 form outbuffer) | |
1482 nil))) | |
1483 | |
10235
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1484 (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
|
1485 "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
|
1486 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
|
1487 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
|
1488 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
|
1489 of the function bytecode string. In that case, |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
1490 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
|
1491 together, for lazy loading. |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
1492 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
|
1493 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
|
1494 `autoload' and `custom-declare-variable' need that." |
12794
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
1495 ;; We need to examine byte-compile-dynamic-docstrings |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
1496 ;; 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
|
1497 (let ((dynamic-docstrings byte-compile-dynamic-docstrings)) |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
1498 (set-buffer |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
1499 (prog1 (current-buffer) |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
1500 (set-buffer outbuffer) |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
1501 (let (position) |
10235
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1502 |
12794
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
1503 ;; 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
|
1504 (and (>= (nth 1 info) 0) |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
1505 dynamic-docstrings |
13791
1feec098c24d
(byte-compile-output-docform): Don't do dynamic doc
Karl Heuer <kwzh@gnu.org>
parents:
13474
diff
changeset
|
1506 (not byte-compile-compatibility) |
12794
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
1507 (progn |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
1508 ;; 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
|
1509 ;; for make-docfile's sake. |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
1510 (insert "\n") |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
1511 (setq position |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
1512 (byte-compile-output-as-comment |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
1513 (nth (nth 1 info) form) nil)) |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
1514 ;; 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
|
1515 ;; negate POSITION. |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
1516 (if (and (stringp (nth (nth 1 info) form)) |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
1517 (> (length (nth (nth 1 info) form)) 0) |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
1518 (eq (aref (nth (nth 1 info) form) 0) ?*)) |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
1519 (setq position (- position))))) |
10235
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1520 |
12794
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
1521 (if preface |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
1522 (progn |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
1523 (insert preface) |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
1524 (prin1 name outbuffer))) |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
1525 (insert (car info)) |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
1526 (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
|
1527 (print-quoted t) |
18960
12a8bc6cb225
(byte-compile-output-docform):
Richard M. Stallman <rms@gnu.org>
parents:
18927
diff
changeset
|
1528 ;; Use a cons cell to say that we want |
12a8bc6cb225
(byte-compile-output-docform):
Richard M. Stallman <rms@gnu.org>
parents:
18927
diff
changeset
|
1529 ;; print-gensym-alist not to be cleared |
12a8bc6cb225
(byte-compile-output-docform):
Richard M. Stallman <rms@gnu.org>
parents:
18927
diff
changeset
|
1530 ;; between calls to print functions. |
12a8bc6cb225
(byte-compile-output-docform):
Richard M. Stallman <rms@gnu.org>
parents:
18927
diff
changeset
|
1531 (print-gensym '(t)) |
12a8bc6cb225
(byte-compile-output-docform):
Richard M. Stallman <rms@gnu.org>
parents:
18927
diff
changeset
|
1532 print-gensym-alist |
12794
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
1533 (index 0)) |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
1534 (prin1 (car form) outbuffer) |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
1535 (while (setq form (cdr form)) |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
1536 (setq index (1+ index)) |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
1537 (insert " ") |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
1538 (cond ((and (numberp specindex) (= index specindex)) |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
1539 (let ((position |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
1540 (byte-compile-output-as-comment |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
1541 (cons (car form) (nth 1 form)) |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
1542 t))) |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
1543 (princ (format "(#$ . %d) nil" position) outbuffer) |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
1544 (setq form (cdr form)) |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
1545 (setq index (1+ index)))) |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
1546 ((= index (nth 1 info)) |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
1547 (if position |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
1548 (princ (format (if quoted "'(#$ . %d)" "(#$ . %d)") |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
1549 position) |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
1550 outbuffer) |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
1551 (let ((print-escape-newlines nil)) |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
1552 (goto-char (prog1 (1+ (point)) |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
1553 (prin1 (car form) outbuffer))) |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
1554 (insert "\\\n") |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
1555 (goto-char (point-max))))) |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
1556 (t |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
1557 (prin1 (car form) outbuffer))))) |
913a19cf074a
(byte-compile-output-docform): Check
Richard M. Stallman <rms@gnu.org>
parents:
12726
diff
changeset
|
1558 (insert (nth 2 info)))))) |
757 | 1559 nil) |
1560 | |
1561 (defun byte-compile-keep-pending (form &optional handler) | |
1562 (if (memq byte-optimize '(t source)) | |
1563 (setq form (byte-optimize-form form t))) | |
1564 (if handler | |
1565 (let ((for-effect t)) | |
1566 ;; To avoid consing up monstrously large forms at load time, we split | |
1567 ;; the output regularly. | |
3954
cac16b165691
(byte-compile-keep-pending): Handle fset like defalias.
Richard M. Stallman <rms@gnu.org>
parents:
3948
diff
changeset
|
1568 (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
|
1569 (nthcdr 300 byte-compile-output) |
757 | 1570 (byte-compile-flush-pending)) |
1571 (funcall handler form) | |
1572 (if for-effect | |
1573 (byte-compile-discard))) | |
1574 (byte-compile-form form t)) | |
1575 nil) | |
1576 | |
1577 (defun byte-compile-flush-pending () | |
1578 (if byte-compile-output | |
1579 (let ((form (byte-compile-out-toplevel t 'file))) | |
1580 (cond ((eq (car-safe form) 'progn) | |
1581 (mapcar 'byte-compile-output-file-form (cdr form))) | |
1582 (form | |
1583 (byte-compile-output-file-form form))) | |
1584 (setq byte-compile-constants nil | |
1585 byte-compile-variables nil | |
1586 byte-compile-depth 0 | |
1587 byte-compile-maxdepth 0 | |
1588 byte-compile-output nil)))) | |
1589 | |
1590 (defun byte-compile-file-form (form) | |
1591 (let ((byte-compile-current-form nil) ; close over this for warnings. | |
1592 handler) | |
1593 (cond | |
1594 ((not (consp form)) | |
1595 (byte-compile-keep-pending form)) | |
1596 ((and (symbolp (car form)) | |
1597 (setq handler (get (car form) 'byte-hunk-handler))) | |
1598 (cond ((setq form (funcall handler form)) | |
1599 (byte-compile-flush-pending) | |
1600 (byte-compile-output-file-form form)))) | |
1601 ((eq form (setq form (macroexpand form byte-compile-macro-environment))) | |
1602 (byte-compile-keep-pending form)) | |
1603 (t | |
1604 (byte-compile-file-form form))))) | |
1605 | |
1606 ;; Functions and variables with doc strings must be output separately, | |
1607 ;; so make-docfile can recognise them. Most other things can be output | |
1608 ;; as byte-code. | |
1609 | |
1610 (put 'defsubst 'byte-hunk-handler 'byte-compile-file-form-defsubst) | |
1611 (defun byte-compile-file-form-defsubst (form) | |
1612 (cond ((assq (nth 1 form) byte-compile-unresolved-functions) | |
1613 (setq byte-compile-current-form (nth 1 form)) | |
1614 (byte-compile-warn "defsubst %s was used before it was defined" | |
1615 (nth 1 form)))) | |
1616 (byte-compile-file-form | |
1617 (macroexpand form byte-compile-macro-environment)) | |
1618 ;; Return nil so the form is not output twice. | |
1619 nil) | |
1620 | |
1621 (put 'autoload 'byte-hunk-handler 'byte-compile-file-form-autoload) | |
1622 (defun byte-compile-file-form-autoload (form) | |
1623 (and (let ((form form)) | |
1624 (while (if (setq form (cdr form)) (byte-compile-constp (car form)))) | |
1625 (null form)) ;Constants only | |
1626 (eval (nth 5 form)) ;Macro | |
1627 (eval form)) ;Define the autoload. | |
1628 (if (stringp (nth 3 form)) | |
1629 form | |
1630 ;; No doc string, so we can compile this as a normal form. | |
1631 (byte-compile-keep-pending form 'byte-compile-normal-call))) | |
1632 | |
1633 (put 'defvar 'byte-hunk-handler 'byte-compile-file-form-defvar) | |
1634 (put 'defconst 'byte-hunk-handler 'byte-compile-file-form-defvar) | |
1635 (defun byte-compile-file-form-defvar (form) | |
1636 (if (null (nth 3 form)) | |
1637 ;; Since there is no doc string, we can compile this as a normal form, | |
1638 ;; and not do a file-boundary. | |
1639 (byte-compile-keep-pending form) | |
1640 (if (memq 'free-vars byte-compile-warnings) | |
1641 (setq byte-compile-bound-variables | |
1642 (cons (nth 1 form) byte-compile-bound-variables))) | |
1643 (cond ((consp (nth 2 form)) | |
1644 (setq form (copy-sequence form)) | |
1645 (setcar (cdr (cdr form)) | |
1646 (byte-compile-top-level (nth 2 form) nil 'file)))) | |
1647 form)) | |
1648 | |
17704
00ed998f90d3
(byte-compile-file-form-custom-declare-variable): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17077
diff
changeset
|
1649 (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
|
1650 '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
|
1651 (defun byte-compile-file-form-custom-declare-variable (form) |
00ed998f90d3
(byte-compile-file-form-custom-declare-variable): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17077
diff
changeset
|
1652 (if (memq 'free-vars byte-compile-warnings) |
00ed998f90d3
(byte-compile-file-form-custom-declare-variable): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17077
diff
changeset
|
1653 (setq byte-compile-bound-variables |
00ed998f90d3
(byte-compile-file-form-custom-declare-variable): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17077
diff
changeset
|
1654 (cons (nth 1 (nth 1 form)) byte-compile-bound-variables))) |
00ed998f90d3
(byte-compile-file-form-custom-declare-variable): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17077
diff
changeset
|
1655 form) |
00ed998f90d3
(byte-compile-file-form-custom-declare-variable): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17077
diff
changeset
|
1656 |
757 | 1657 (put 'require 'byte-hunk-handler 'byte-compile-file-form-eval-boundary) |
1658 (defun byte-compile-file-form-eval-boundary (form) | |
1659 (eval form) | |
1660 (byte-compile-keep-pending form 'byte-compile-normal-call)) | |
1661 | |
1662 (put 'progn 'byte-hunk-handler 'byte-compile-file-form-progn) | |
1663 (put 'prog1 'byte-hunk-handler 'byte-compile-file-form-progn) | |
1664 (put 'prog2 'byte-hunk-handler 'byte-compile-file-form-progn) | |
1665 (defun byte-compile-file-form-progn (form) | |
1666 (mapcar 'byte-compile-file-form (cdr form)) | |
1667 ;; Return nil so the forms are not output twice. | |
1668 nil) | |
1669 | |
1670 ;; This handler is not necessary, but it makes the output from dont-compile | |
1671 ;; and similar macros cleaner. | |
1672 (put 'eval 'byte-hunk-handler 'byte-compile-file-form-eval) | |
1673 (defun byte-compile-file-form-eval (form) | |
1674 (if (eq (car-safe (nth 1 form)) 'quote) | |
1675 (nth 1 (nth 1 form)) | |
1676 (byte-compile-keep-pending form))) | |
1677 | |
1678 (put 'defun 'byte-hunk-handler 'byte-compile-file-form-defun) | |
1679 (defun byte-compile-file-form-defun (form) | |
1680 (byte-compile-file-form-defmumble form nil)) | |
1681 | |
1682 (put 'defmacro 'byte-hunk-handler 'byte-compile-file-form-defmacro) | |
1683 (defun byte-compile-file-form-defmacro (form) | |
1684 (byte-compile-file-form-defmumble form t)) | |
1685 | |
1686 (defun byte-compile-file-form-defmumble (form macrop) | |
1687 (let* ((name (car (cdr form))) | |
1688 (this-kind (if macrop 'byte-compile-macro-environment | |
1689 'byte-compile-function-environment)) | |
1690 (that-kind (if macrop 'byte-compile-function-environment | |
1691 'byte-compile-macro-environment)) | |
1692 (this-one (assq name (symbol-value this-kind))) | |
1693 (that-one (assq name (symbol-value that-kind))) | |
1694 (byte-compile-free-references nil) | |
1695 (byte-compile-free-assignments nil)) | |
1696 | |
1697 ;; When a function or macro is defined, add it to the call tree so that | |
1698 ;; we can tell when functions are not used. | |
1699 (if byte-compile-generate-call-tree | |
1700 (or (assq name byte-compile-call-tree) | |
1701 (setq byte-compile-call-tree | |
1702 (cons (list name nil nil) byte-compile-call-tree)))) | |
1703 | |
1704 (setq byte-compile-current-form name) ; for warnings | |
1705 (if (memq 'redefine byte-compile-warnings) | |
1706 (byte-compile-arglist-warn form macrop)) | |
1707 (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
|
1708 (message "Compiling %s... (%s)" (or filename "") (nth 1 form))) |
757 | 1709 (cond (that-one |
1710 (if (and (memq 'redefine byte-compile-warnings) | |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1711 ;; don't warn when compiling the stubs in byte-run... |
757 | 1712 (not (assq (nth 1 form) |
1713 byte-compile-initial-macro-environment))) | |
1714 (byte-compile-warn | |
1715 "%s defined multiple times, as both function and macro" | |
1716 (nth 1 form))) | |
1717 (setcdr that-one nil)) | |
1718 (this-one | |
1719 (if (and (memq 'redefine byte-compile-warnings) | |
1720 ;; hack: don't warn when compiling the magic internal | |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1721 ;; byte-compiler macros in byte-run.el... |
757 | 1722 (not (assq (nth 1 form) |
1723 byte-compile-initial-macro-environment))) | |
1724 (byte-compile-warn "%s %s defined multiple times in this file" | |
1725 (if macrop "macro" "function") | |
1726 (nth 1 form)))) | |
1727 ((and (fboundp name) | |
1728 (eq (car-safe (symbol-function name)) | |
1729 (if macrop 'lambda 'macro))) | |
1730 (if (memq 'redefine byte-compile-warnings) | |
1731 (byte-compile-warn "%s %s being redefined as a %s" | |
1732 (if macrop "function" "macro") | |
1733 (nth 1 form) | |
1734 (if macrop "macro" "function"))) | |
1735 ;; shadow existing definition | |
1736 (set this-kind | |
1737 (cons (cons name nil) (symbol-value this-kind)))) | |
1738 ) | |
1739 (let ((body (nthcdr 3 form))) | |
1740 (if (and (stringp (car body)) | |
1741 (symbolp (car-safe (cdr-safe body))) | |
1742 (car-safe (cdr-safe body)) | |
1743 (stringp (car-safe (cdr-safe (cdr-safe body))))) | |
1744 (byte-compile-warn "Probable `\"' without `\\' in doc string of %s" | |
1745 (nth 1 form)))) | |
1746 (let* ((new-one (byte-compile-lambda (cons 'lambda (nthcdr 2 form)))) | |
1747 (code (byte-compile-byte-code-maker new-one))) | |
1748 (if this-one | |
1749 (setcdr this-one new-one) | |
1750 (set this-kind | |
1751 (cons (cons name new-one) (symbol-value this-kind)))) | |
1752 (if (and (stringp (nth 3 form)) | |
1753 (eq 'quote (car-safe code)) | |
1754 (eq 'lambda (car-safe (nth 1 code)))) | |
1755 (cons (car form) | |
1756 (cons name (cdr (nth 1 code)))) | |
10235
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1757 (byte-compile-flush-pending) |
757 | 1758 (if (not (stringp (nth 3 form))) |
10235
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1759 ;; 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
|
1760 ;; 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
|
1761 (byte-compile-output-docform |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1762 (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
|
1763 "\n(fset '" "\n(defalias '") |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1764 name |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1765 (cond ((atom code) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1766 (if macrop '(" '(macro . #[" -1 "])") '(" #[" -1 "]"))) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1767 ((eq (car code) 'quote) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1768 (setq code new-one) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1769 (if macrop '(" '(macro " -1 ")") '(" '(" -1 ")"))) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1770 ((if macrop '(" (cons 'macro (" -1 "))") '(" (" -1 ")")))) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1771 (append code nil) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1772 (and (atom code) byte-compile-dynamic |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1773 1) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1774 nil) |
757 | 1775 ;; 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
|
1776 ;; b-c-output-file-form analyze the defalias. |
757 | 1777 (byte-compile-output-docform |
10235
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1778 (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
|
1779 "\n(fset '" "\n(defalias '") |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1780 name |
757 | 1781 (cond ((atom code) |
1782 (if macrop '(" '(macro . #[" 4 "])") '(" #[" 4 "]"))) | |
1783 ((eq (car code) 'quote) | |
1784 (setq code new-one) | |
1785 (if macrop '(" '(macro " 2 ")") '(" '(" 2 ")"))) | |
1786 ((if macrop '(" (cons 'macro (" 5 "))") '(" (" 5 ")")))) | |
10235
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1787 (append code nil) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1788 (and (atom code) byte-compile-dynamic |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1789 1) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1790 nil)) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1791 (princ ")" outbuffer) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1792 nil)))) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1793 |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1794 ;; 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
|
1795 ;; 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
|
1796 ;; 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
|
1797 (defun byte-compile-output-as-comment (exp quoted) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1798 (let ((position (point))) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1799 (set-buffer |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1800 (prog1 (current-buffer) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1801 (set-buffer outbuffer) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1802 |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1803 ;; 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
|
1804 (insert " ") |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1805 (if quoted |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1806 (prin1 exp outbuffer) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1807 (princ exp outbuffer)) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1808 (goto-char position) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1809 ;; Quote certain special characters as needed. |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1810 ;; 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
|
1811 (while (search-forward "\^A" nil t) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1812 (replace-match "\^A\^A" t t)) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1813 (goto-char position) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1814 (while (search-forward "\000" nil t) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1815 (replace-match "\^A0" t t)) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1816 (goto-char position) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1817 (while (search-forward "\037" nil t) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1818 (replace-match "\^A_" t t)) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1819 (goto-char (point-max)) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1820 (insert "\037") |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1821 (goto-char position) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1822 (insert "#@" (format "%d" (- (point-max) position))) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1823 |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1824 ;; Save the file position of the object. |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1825 ;; 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
|
1826 ;; 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
|
1827 ;; 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
|
1828 ;; to a file position; they cancel. |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1829 (setq position (point)) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1830 (goto-char (point-max)))) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1831 position)) |
ff7189e5e459
(byte-compile-dest-file): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9802
diff
changeset
|
1832 |
757 | 1833 |
1834 | |
819
5bbabfcef929
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
784
diff
changeset
|
1835 ;;;###autoload |
757 | 1836 (defun byte-compile (form) |
1837 "If FORM is a symbol, byte-compile its function definition. | |
1838 If FORM is a lambda or a macro, byte-compile it as a function." | |
1839 (displaying-byte-compile-warnings | |
1840 (byte-compile-close-variables | |
1841 (let* ((fun (if (symbolp form) | |
1842 (and (fboundp form) (symbol-function form)) | |
1843 form)) | |
1844 (macro (eq (car-safe fun) 'macro))) | |
1845 (if macro | |
1846 (setq fun (cdr fun))) | |
1847 (cond ((eq (car-safe fun) 'lambda) | |
1848 (setq fun (if macro | |
1849 (cons 'macro (byte-compile-lambda fun)) | |
1850 (byte-compile-lambda fun))) | |
1851 (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
|
1852 (defalias form fun) |
757 | 1853 fun))))))) |
1854 | |
1855 (defun byte-compile-sexp (sexp) | |
1856 "Compile and return SEXP." | |
1857 (displaying-byte-compile-warnings | |
1858 (byte-compile-close-variables | |
1859 (byte-compile-top-level sexp)))) | |
1860 | |
1861 ;; Given a function made by byte-compile-lambda, make a form which produces it. | |
1862 (defun byte-compile-byte-code-maker (fun) | |
1863 (cond | |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
1864 ((byte-compile-version-cond byte-compile-compatibility) |
757 | 1865 ;; Return (quote (lambda ...)). |
1866 (list 'quote (byte-compile-byte-code-unmake fun))) | |
1867 ;; ## atom is faster than compiled-func-p. | |
1868 ((atom fun) ; compiled function. | |
1869 ;; generate-emacs19-bytecodes must be on, otherwise byte-compile-lambda | |
1870 ;; would have produced a lambda. | |
16149
eb953f4baf7b
(byte-compile-out-toplevel): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
15972
diff
changeset
|
1871 fun) |
757 | 1872 ;; 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
|
1873 ;; function, or this is Emacs 18, or generate-emacs19-bytecodes is off. |
757 | 1874 ((let (tmp) |
1875 (if (and (setq tmp (assq 'byte-code (cdr-safe (cdr fun)))) | |
1876 (null (cdr (memq tmp fun)))) | |
1877 ;; Generate a make-byte-code call. | |
1878 (let* ((interactive (assq 'interactive (cdr (cdr fun))))) | |
1879 (nconc (list 'make-byte-code | |
1880 (list 'quote (nth 1 fun)) ;arglist | |
1881 (nth 1 tmp) ;bytes | |
1882 (nth 2 tmp) ;consts | |
1883 (nth 3 tmp)) ;depth | |
1884 (cond ((stringp (nth 2 fun)) | |
1885 (list (nth 2 fun))) ;doc | |
1886 (interactive | |
1887 (list nil))) | |
1888 (cond (interactive | |
1889 (list (if (or (null (nth 1 interactive)) | |
1890 (stringp (nth 1 interactive))) | |
1891 (nth 1 interactive) | |
1892 ;; Interactive spec is a list or a variable | |
1893 ;; (if it is correct). | |
1894 (list 'quote (nth 1 interactive)))))))) | |
1895 ;; a non-compiled function (probably trivial) | |
1896 (list 'quote fun)))))) | |
1897 | |
1898 ;; Turn a function into an ordinary lambda. Needed for v18 files. | |
1899 (defun byte-compile-byte-code-unmake (function) | |
1900 (if (consp function) | |
1901 function;;It already is a lambda. | |
1902 (setq function (append function nil)) ; turn it into a list | |
1903 (nconc (list 'lambda (nth 0 function)) | |
1904 (and (nth 4 function) (list (nth 4 function))) | |
1905 (if (nthcdr 5 function) | |
1906 (list (cons 'interactive (if (nth 5 function) | |
1907 (nthcdr 5 function))))) | |
1908 (list (list 'byte-code | |
1909 (nth 1 function) (nth 2 function) | |
1910 (nth 3 function)))))) | |
1911 | |
1912 | |
1913 ;; Byte-compile a lambda-expression and return a valid function. | |
1914 ;; The value is usually a compiled function but may be the original | |
1915 ;; lambda-expression. | |
1916 (defun byte-compile-lambda (fun) | |
1917 (let* ((arglist (nth 1 fun)) | |
1918 (byte-compile-bound-variables | |
1919 (nconc (and (memq 'free-vars byte-compile-warnings) | |
1920 (delq '&rest (delq '&optional (copy-sequence arglist)))) | |
1921 byte-compile-bound-variables)) | |
1922 (body (cdr (cdr fun))) | |
1923 (doc (if (stringp (car body)) | |
1924 (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
|
1925 ;; 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
|
1926 ;; unless it is the last element of the body. |
d79492598ec8
(byte-compile-lambda): If the doc string is also the
Richard M. Stallman <rms@gnu.org>
parents:
16159
diff
changeset
|
1927 (if (nthcdr 2 body) |
d79492598ec8
(byte-compile-lambda): If the doc string is also the
Richard M. Stallman <rms@gnu.org>
parents:
16159
diff
changeset
|
1928 (setq body (cdr body)))))) |
757 | 1929 (int (assq 'interactive body))) |
1930 (cond (int | |
1931 ;; Skip (interactive) if it is in front (the most usual location). | |
1932 (if (eq int (car body)) | |
1933 (setq body (cdr body))) | |
1532 | 1934 (cond ((consp (cdr int)) |
757 | 1935 (if (cdr (cdr int)) |
1936 (byte-compile-warn "malformed interactive spec: %s" | |
1937 (prin1-to-string int))) | |
1532 | 1938 ;; If the interactive spec is a call to `list', |
1939 ;; don't compile it, because `call-interactively' | |
1940 ;; looks at the args of `list'. | |
13474
3e7f6fdc234d
(byte-compile-associative): Do operations left to right.
Richard M. Stallman <rms@gnu.org>
parents:
13403
diff
changeset
|
1941 (let ((form (nth 1 int))) |
3e7f6fdc234d
(byte-compile-associative): Do operations left to right.
Richard M. Stallman <rms@gnu.org>
parents:
13403
diff
changeset
|
1942 (while (or (eq (car-safe form) 'let) |
3e7f6fdc234d
(byte-compile-associative): Do operations left to right.
Richard M. Stallman <rms@gnu.org>
parents:
13403
diff
changeset
|
1943 (eq (car-safe form) 'let*) |
3e7f6fdc234d
(byte-compile-associative): Do operations left to right.
Richard M. Stallman <rms@gnu.org>
parents:
13403
diff
changeset
|
1944 (eq (car-safe form) 'save-excursion)) |
3e7f6fdc234d
(byte-compile-associative): Do operations left to right.
Richard M. Stallman <rms@gnu.org>
parents:
13403
diff
changeset
|
1945 (while (consp (cdr form)) |
3e7f6fdc234d
(byte-compile-associative): Do operations left to right.
Richard M. Stallman <rms@gnu.org>
parents:
13403
diff
changeset
|
1946 (setq form (cdr form))) |
3e7f6fdc234d
(byte-compile-associative): Do operations left to right.
Richard M. Stallman <rms@gnu.org>
parents:
13403
diff
changeset
|
1947 (setq form (car form))) |
3e7f6fdc234d
(byte-compile-associative): Do operations left to right.
Richard M. Stallman <rms@gnu.org>
parents:
13403
diff
changeset
|
1948 (or (eq (car-safe form) 'list) |
3e7f6fdc234d
(byte-compile-associative): Do operations left to right.
Richard M. Stallman <rms@gnu.org>
parents:
13403
diff
changeset
|
1949 (setq int (list 'interactive |
3e7f6fdc234d
(byte-compile-associative): Do operations left to right.
Richard M. Stallman <rms@gnu.org>
parents:
13403
diff
changeset
|
1950 (byte-compile-top-level (nth 1 int))))))) |
1532 | 1951 ((cdr int) |
1952 (byte-compile-warn "malformed interactive spec: %s" | |
1953 (prin1-to-string int)))))) | |
757 | 1954 (let ((compiled (byte-compile-top-level (cons 'progn body) nil 'lambda))) |
1955 (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
|
1956 (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
|
1957 byte-compile-compatibility))) |
757 | 1958 (apply 'make-byte-code |
1959 (append (list arglist) | |
1960 ;; byte-string, constants-vector, stack depth | |
1961 (cdr compiled) | |
1962 ;; optionally, the doc string. | |
1963 (if (or doc int) | |
1964 (list doc)) | |
1965 ;; optionally, the interactive spec. | |
1966 (if int | |
1967 (list (nth 1 int))))) | |
1968 (setq compiled | |
1969 (nconc (if int (list int)) | |
1970 (cond ((eq (car-safe compiled) 'progn) (cdr compiled)) | |
1971 (compiled (list compiled))))) | |
1972 (nconc (list 'lambda arglist) | |
1973 (if (or doc (stringp (car compiled))) | |
1974 (cons doc (cond (compiled) | |
1975 (body (list nil)))) | |
1976 compiled)))))) | |
1977 | |
1978 (defun byte-compile-constants-vector () | |
1979 ;; Builds the constants-vector from the current variables and constants. | |
1980 ;; This modifies the constants from (const . nil) to (const . offset). | |
1981 ;; To keep the byte-codes to look up the vector as short as possible: | |
1982 ;; First 6 elements are vars, as there are one-byte varref codes for those. | |
1983 ;; Next up to byte-constant-limit are constants, still with one-byte codes. | |
1984 ;; Next variables again, to get 2-byte codes for variable lookup. | |
1985 ;; The rest of the constants and variables need 3-byte byte-codes. | |
1986 (let* ((i -1) | |
1987 (rest (nreverse byte-compile-variables)) ; nreverse because the first | |
1988 (other (nreverse byte-compile-constants)) ; vars often are used most. | |
1989 ret tmp | |
1990 (limits '(5 ; Use the 1-byte varref codes, | |
1991 63 ; 1-constlim ; 1-byte byte-constant codes, | |
1992 255 ; 2-byte varref codes, | |
1993 65535)) ; 3-byte codes for the rest. | |
1994 limit) | |
1995 (while (or rest other) | |
1996 (setq limit (car limits)) | |
1997 (while (and rest (not (eq i limit))) | |
1998 (if (setq tmp (assq (car (car rest)) ret)) | |
1999 (setcdr (car rest) (cdr tmp)) | |
2000 (setcdr (car rest) (setq i (1+ i))) | |
2001 (setq ret (cons (car rest) ret))) | |
2002 (setq rest (cdr rest))) | |
2003 (setq limits (cdr limits) | |
2004 rest (prog1 other | |
2005 (setq other rest)))) | |
2006 (apply 'vector (nreverse (mapcar 'car ret))))) | |
2007 | |
2008 ;; Given an expression FORM, compile it and return an equivalent byte-code | |
2009 ;; expression (a call to the function byte-code). | |
2010 (defun byte-compile-top-level (form &optional for-effect output-type) | |
2011 ;; OUTPUT-TYPE advises about how form is expected to be used: | |
2012 ;; 'eval or nil -> a single form, | |
2013 ;; 'progn or t -> a list of forms, | |
2014 ;; 'lambda -> body of a lambda, | |
2015 ;; 'file -> used at file-level. | |
8446
0199ece40d91
(byte-compile-protect-from-advice): Macro deleted.
Richard M. Stallman <rms@gnu.org>
parents:
8115
diff
changeset
|
2016 (let ((byte-compile-constants nil) |
0199ece40d91
(byte-compile-protect-from-advice): Macro deleted.
Richard M. Stallman <rms@gnu.org>
parents:
8115
diff
changeset
|
2017 (byte-compile-variables nil) |
0199ece40d91
(byte-compile-protect-from-advice): Macro deleted.
Richard M. Stallman <rms@gnu.org>
parents:
8115
diff
changeset
|
2018 (byte-compile-tag-number 0) |
0199ece40d91
(byte-compile-protect-from-advice): Macro deleted.
Richard M. Stallman <rms@gnu.org>
parents:
8115
diff
changeset
|
2019 (byte-compile-depth 0) |
0199ece40d91
(byte-compile-protect-from-advice): Macro deleted.
Richard M. Stallman <rms@gnu.org>
parents:
8115
diff
changeset
|
2020 (byte-compile-maxdepth 0) |
0199ece40d91
(byte-compile-protect-from-advice): Macro deleted.
Richard M. Stallman <rms@gnu.org>
parents:
8115
diff
changeset
|
2021 (byte-compile-output nil)) |
6081
65adb7b035fd
(byte-compile-protect-from-advice): New macro that
Richard M. Stallman <rms@gnu.org>
parents:
6043
diff
changeset
|
2022 (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
|
2023 (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
|
2024 (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
|
2025 (setq form (nth 1 form))) |
65adb7b035fd
(byte-compile-protect-from-advice): New macro that
Richard M. Stallman <rms@gnu.org>
parents:
6043
diff
changeset
|
2026 (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
|
2027 (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
|
2028 (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
|
2029 (natnump (nth 3 form))) |
65adb7b035fd
(byte-compile-protect-from-advice): New macro that
Richard M. Stallman <rms@gnu.org>
parents:
6043
diff
changeset
|
2030 form |
65adb7b035fd
(byte-compile-protect-from-advice): New macro that
Richard M. Stallman <rms@gnu.org>
parents:
6043
diff
changeset
|
2031 (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
|
2032 (byte-compile-out-toplevel for-effect output-type)))) |
757 | 2033 |
2034 (defun byte-compile-out-toplevel (&optional for-effect output-type) | |
2035 (if for-effect | |
2036 ;; The stack is empty. Push a value to be returned from (byte-code ..). | |
2037 (if (eq (car (car byte-compile-output)) 'byte-discard) | |
2038 (setq byte-compile-output (cdr byte-compile-output)) | |
2039 (byte-compile-push-constant | |
2040 ;; Push any constant - preferably one which already is used, and | |
2041 ;; a number or symbol - ie not some big sequence. The return value | |
2042 ;; isn't returned, but it would be a shame if some textually large | |
2043 ;; constant was not optimized away because we chose to return it. | |
2044 (and (not (assq nil byte-compile-constants)) ; Nil is often there. | |
2045 (let ((tmp (reverse byte-compile-constants))) | |
2046 (while (and tmp (not (or (symbolp (car (car tmp))) | |
2047 (numberp (car (car tmp)))))) | |
2048 (setq tmp (cdr tmp))) | |
2049 (car (car tmp))))))) | |
2050 (byte-compile-out 'byte-return 0) | |
2051 (setq byte-compile-output (nreverse byte-compile-output)) | |
2052 (if (memq byte-optimize '(t byte)) | |
2053 (setq byte-compile-output | |
2054 (byte-optimize-lapcode byte-compile-output for-effect))) | |
2055 | |
2056 ;; Decompile trivial functions: | |
2057 ;; only constants and variables, or a single funcall except in lambdas. | |
2058 ;; Except for Lisp_Compiled objects, forms like (foo "hi") | |
2059 ;; are still quicker than (byte-code "..." [foo "hi"] 2). | |
2060 ;; Note that even (quote foo) must be parsed just as any subr by the | |
2061 ;; interpreter, so quote should be compiled into byte-code in some contexts. | |
2062 ;; 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
|
2063 ;; 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
|
2064 ;; 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
|
2065 ;; 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
|
2066 ;; the Lisp_Compiled type, the compiled form is faster. |
757 | 2067 ;; eval -> atom, quote or (function atom atom atom) |
2068 ;; progn -> as <<same-as-eval>> or (progn <<same-as-eval>> atom) | |
2069 ;; file -> as progn, but takes both quotes and atoms, and longer forms. | |
2070 (let (rest | |
2071 (maycall (not (eq output-type 'lambda))) ; t if we may make a funcall. | |
2072 tmp body) | |
2073 (cond | |
2074 ;; #### 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
|
2075 ((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
|
2076 (nthcdr (if (eq output-type 'file) 50 8) byte-compile-output) |
757 | 2077 (assq 'TAG byte-compile-output) ; Not necessary, but speeds up a bit. |
2078 (not (setq tmp (assq 'byte-return byte-compile-output))) | |
2079 (progn | |
2080 (setq rest (nreverse | |
2081 (cdr (memq tmp (reverse byte-compile-output))))) | |
2082 (while (cond | |
2083 ((memq (car (car rest)) '(byte-varref byte-constant)) | |
2084 (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
|
2085 (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
|
2086 (or (consp tmp) |
eb953f4baf7b
(byte-compile-out-toplevel): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
15972
diff
changeset
|
2087 (and (symbolp tmp) |
eb953f4baf7b
(byte-compile-out-toplevel): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
15972
diff
changeset
|
2088 (not (memq tmp '(nil t)))))) |
eb953f4baf7b
(byte-compile-out-toplevel): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
15972
diff
changeset
|
2089 (if maycall |
eb953f4baf7b
(byte-compile-out-toplevel): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
15972
diff
changeset
|
2090 (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
|
2091 (setq body (cons tmp body)))) |
757 | 2092 ((and maycall |
2093 ;; Allow a funcall if at most one atom follows it. | |
2094 (null (nthcdr 3 rest)) | |
2095 (setq tmp (get (car (car rest)) 'byte-opcode-invert)) | |
2096 (or (null (cdr rest)) | |
2097 (and (memq output-type '(file progn t)) | |
2098 (cdr (cdr rest)) | |
2099 (eq (car (nth 1 rest)) 'byte-discard) | |
2100 (progn (setq rest (cdr rest)) t)))) | |
2101 (setq maycall nil) ; Only allow one real function call. | |
2102 (setq body (nreverse body)) | |
2103 (setq body (list | |
2104 (if (and (eq tmp 'funcall) | |
2105 (eq (car-safe (car body)) 'quote)) | |
2106 (cons (nth 1 (car body)) (cdr body)) | |
2107 (cons tmp body)))) | |
2108 (or (eq output-type 'file) | |
2109 (not (delq nil (mapcar 'consp (cdr (car body)))))))) | |
2110 (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
|
2111 rest)) |
757 | 2112 (let ((byte-compile-vector (byte-compile-constants-vector))) |
2113 (list 'byte-code (byte-compile-lapcode byte-compile-output) | |
2114 byte-compile-vector byte-compile-maxdepth))) | |
2115 ;; it's a trivial function | |
2116 ((cdr body) (cons 'progn (nreverse body))) | |
2117 ((car body))))) | |
2118 | |
2119 ;; Given BODY, compile it and return a new body. | |
2120 (defun byte-compile-top-level-body (body &optional for-effect) | |
2121 (setq body (byte-compile-top-level (cons 'progn body) for-effect t)) | |
2122 (cond ((eq (car-safe body) 'progn) | |
2123 (cdr body)) | |
2124 (body | |
2125 (list body)))) | |
2126 | |
2127 ;; This is the recursive entry point for compiling each subform of an | |
2128 ;; expression. | |
2129 ;; If for-effect is non-nil, byte-compile-form will output a byte-discard | |
2130 ;; before terminating (ie no value will be left on the stack). | |
2131 ;; A byte-compile handler may, when for-effect is non-nil, choose output code | |
2132 ;; which does not leave a value on the stack, and then set for-effect to nil | |
2133 ;; (to prevent byte-compile-form from outputting the byte-discard). | |
2134 ;; If a handler wants to call another handler, it should do so via | |
2135 ;; byte-compile-form, or take extreme care to handle for-effect correctly. | |
2136 ;; (Use byte-compile-form-do-effect to reset the for-effect flag too.) | |
2137 ;; | |
2138 (defun byte-compile-form (form &optional for-effect) | |
2139 (setq form (macroexpand form byte-compile-macro-environment)) | |
2140 (cond ((not (consp form)) | |
2141 (cond ((or (not (symbolp form)) (memq form '(nil t))) | |
2142 (byte-compile-constant form)) | |
2143 ((and for-effect byte-compile-delete-errors) | |
2144 (setq for-effect nil)) | |
2145 (t (byte-compile-variable-ref 'byte-varref form)))) | |
2146 ((symbolp (car form)) | |
2147 (let* ((fn (car form)) | |
2148 (handler (get fn 'byte-compile))) | |
958 | 2149 (if (memq fn '(t nil)) |
2150 (byte-compile-warn "%s called as a function" fn)) | |
757 | 2151 (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
|
2152 (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
|
2153 byte-compile-compatibility)) |
757 | 2154 (not (get (get fn 'byte-opcode) 'emacs19-opcode)))) |
2155 (funcall handler form) | |
2156 (if (memq 'callargs byte-compile-warnings) | |
2157 (byte-compile-callargs-warn form)) | |
2158 (byte-compile-normal-call form)))) | |
1819
df06a60f3362
* disass.el (disassemble): Add autoload cookie for this.
Jim Blandy <jimb@redhat.com>
parents:
1604
diff
changeset
|
2159 ((and (or (byte-code-function-p (car form)) |
757 | 2160 (eq (car-safe (car form)) 'lambda)) |
2161 ;; if the form comes out the same way it went in, that's | |
2162 ;; because it was malformed, and we couldn't unfold it. | |
2163 (not (eq form (setq form (byte-compile-unfold-lambda form))))) | |
2164 (byte-compile-form form for-effect) | |
2165 (setq for-effect nil)) | |
2166 ((byte-compile-normal-call form))) | |
2167 (if for-effect | |
2168 (byte-compile-discard))) | |
2169 | |
2170 (defun byte-compile-normal-call (form) | |
2171 (if byte-compile-generate-call-tree | |
2172 (byte-compile-annotate-call-tree form)) | |
2173 (byte-compile-push-constant (car form)) | |
2174 (mapcar 'byte-compile-form (cdr form)) ; wasteful, but faster. | |
2175 (byte-compile-out 'byte-call (length (cdr form)))) | |
2176 | |
2177 (defun byte-compile-variable-ref (base-op var) | |
2178 (if (or (not (symbolp var)) (memq var '(nil t))) | |
2179 (byte-compile-warn (if (eq base-op 'byte-varbind) | |
2180 "Attempt to let-bind %s %s" | |
2181 "Variable reference to %s %s") | |
2182 (if (symbolp var) "constant" "nonvariable") | |
2183 (prin1-to-string var)) | |
10256
83d56dd99a40
(byte-compile-warning-types): Add obsolete.
Richard M. Stallman <rms@gnu.org>
parents:
10235
diff
changeset
|
2184 (if (and (get var 'byte-obsolete-variable) |
83d56dd99a40
(byte-compile-warning-types): Add obsolete.
Richard M. Stallman <rms@gnu.org>
parents:
10235
diff
changeset
|
2185 (memq 'obsolete byte-compile-warnings)) |
958 | 2186 (let ((ob (get var 'byte-obsolete-variable))) |
2187 (byte-compile-warn "%s is an obsolete variable; %s" var | |
2188 (if (stringp ob) | |
2189 ob | |
2190 (format "use %s instead." ob))))) | |
757 | 2191 (if (memq 'free-vars byte-compile-warnings) |
2192 (if (eq base-op 'byte-varbind) | |
2193 (setq byte-compile-bound-variables | |
2194 (cons var byte-compile-bound-variables)) | |
2195 (or (boundp var) | |
2196 (memq var byte-compile-bound-variables) | |
2197 (if (eq base-op 'byte-varset) | |
2198 (or (memq var byte-compile-free-assignments) | |
2199 (progn | |
2200 (byte-compile-warn "assignment to free variable %s" var) | |
2201 (setq byte-compile-free-assignments | |
2202 (cons var byte-compile-free-assignments)))) | |
2203 (or (memq var byte-compile-free-references) | |
2204 (progn | |
2205 (byte-compile-warn "reference to free variable %s" var) | |
2206 (setq byte-compile-free-references | |
2207 (cons var byte-compile-free-references))))))))) | |
2208 (let ((tmp (assq var byte-compile-variables))) | |
2209 (or tmp | |
2210 (setq tmp (list var) | |
2211 byte-compile-variables (cons tmp byte-compile-variables))) | |
2212 (byte-compile-out base-op tmp))) | |
2213 | |
2214 (defmacro byte-compile-get-constant (const) | |
2215 (` (or (if (stringp (, const)) | |
2216 (assoc (, const) byte-compile-constants) | |
2217 (assq (, const) byte-compile-constants)) | |
2218 (car (setq byte-compile-constants | |
2219 (cons (list (, const)) byte-compile-constants)))))) | |
2220 | |
2221 ;; Use this when the value of a form is a constant. This obeys for-effect. | |
2222 (defun byte-compile-constant (const) | |
2223 (if for-effect | |
2224 (setq for-effect nil) | |
2225 (byte-compile-out 'byte-constant (byte-compile-get-constant const)))) | |
2226 | |
2227 ;; Use this for a constant that is not the value of its containing form. | |
2228 ;; This ignores for-effect. | |
2229 (defun byte-compile-push-constant (const) | |
2230 (let ((for-effect nil)) | |
2231 (inline (byte-compile-constant const)))) | |
2232 | |
2233 | |
2234 ;; Compile those primitive ordinary functions | |
2235 ;; which have special byte codes just for speed. | |
2236 | |
2237 (defmacro byte-defop-compiler (function &optional compile-handler) | |
2238 ;; add a compiler-form for FUNCTION. | |
2239 ;; If function is a symbol, then the variable "byte-SYMBOL" must name | |
2240 ;; the opcode to be used. If function is a list, the first element | |
2241 ;; is the function and the second element is the bytecode-symbol. | |
2242 ;; COMPILE-HANDLER is the function to use to compile this byte-op, or | |
2243 ;; may be the abbreviations 0, 1, 2, 3, 0-1, or 1-2. | |
2244 ;; If it is nil, then the handler is "byte-compile-SYMBOL." | |
2245 (let (opcode) | |
2246 (if (symbolp function) | |
2247 (setq opcode (intern (concat "byte-" (symbol-name function)))) | |
2248 (setq opcode (car (cdr function)) | |
2249 function (car function))) | |
2250 (let ((fnform | |
2251 (list 'put (list 'quote function) ''byte-compile | |
2252 (list 'quote | |
2253 (or (cdr (assq compile-handler | |
2254 '((0 . byte-compile-no-args) | |
2255 (1 . byte-compile-one-arg) | |
2256 (2 . byte-compile-two-args) | |
2257 (3 . byte-compile-three-args) | |
2258 (0-1 . byte-compile-zero-or-one-arg) | |
2259 (1-2 . byte-compile-one-or-two-args) | |
2260 (2-3 . byte-compile-two-or-three-args) | |
2261 ))) | |
2262 compile-handler | |
2263 (intern (concat "byte-compile-" | |
2264 (symbol-name function)))))))) | |
2265 (if opcode | |
2266 (list 'progn fnform | |
2267 (list 'put (list 'quote function) | |
2268 ''byte-opcode (list 'quote opcode)) | |
2269 (list 'put (list 'quote opcode) | |
2270 ''byte-opcode-invert (list 'quote function))) | |
2271 fnform)))) | |
2272 | |
2273 (defmacro byte-defop-compiler19 (function &optional compile-handler) | |
2274 ;; 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
|
2275 ;; be used when byte-compile-compatibility is false. |
757 | 2276 (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
|
2277 byte-compile-compatibility) |
958 | 2278 ;; #### instead of doing nothing, this should do some remprops, |
2279 ;; #### to protect against the case where a single-version compiler | |
2280 ;; #### is loaded into a world that has contained a multi-version one. | |
757 | 2281 nil |
2282 (list 'progn | |
2283 (list 'put | |
2284 (list 'quote | |
2285 (or (car (cdr-safe function)) | |
2286 (intern (concat "byte-" | |
2287 (symbol-name (or (car-safe function) function)))))) | |
2288 ''emacs19-opcode t) | |
2289 (list 'byte-defop-compiler function compile-handler)))) | |
2290 | |
2291 (defmacro byte-defop-compiler-1 (function &optional compile-handler) | |
2292 (list 'byte-defop-compiler (list function nil) compile-handler)) | |
2293 | |
2294 | |
2295 (put 'byte-call 'byte-opcode-invert 'funcall) | |
2296 (put 'byte-list1 'byte-opcode-invert 'list) | |
2297 (put 'byte-list2 'byte-opcode-invert 'list) | |
2298 (put 'byte-list3 'byte-opcode-invert 'list) | |
2299 (put 'byte-list4 'byte-opcode-invert 'list) | |
2300 (put 'byte-listN 'byte-opcode-invert 'list) | |
2301 (put 'byte-concat2 'byte-opcode-invert 'concat) | |
2302 (put 'byte-concat3 'byte-opcode-invert 'concat) | |
2303 (put 'byte-concat4 'byte-opcode-invert 'concat) | |
2304 (put 'byte-concatN 'byte-opcode-invert 'concat) | |
2305 (put 'byte-insertN 'byte-opcode-invert 'insert) | |
2306 | |
2307 (byte-defop-compiler (dot byte-point) 0) | |
2308 (byte-defop-compiler (dot-max byte-point-max) 0) | |
2309 (byte-defop-compiler (dot-min byte-point-min) 0) | |
2310 (byte-defop-compiler point 0) | |
2311 ;;(byte-defop-compiler mark 0) ;; obsolete | |
2312 (byte-defop-compiler point-max 0) | |
2313 (byte-defop-compiler point-min 0) | |
2314 (byte-defop-compiler following-char 0) | |
2315 (byte-defop-compiler preceding-char 0) | |
2316 (byte-defop-compiler current-column 0) | |
2317 (byte-defop-compiler eolp 0) | |
2318 (byte-defop-compiler eobp 0) | |
2319 (byte-defop-compiler bolp 0) | |
2320 (byte-defop-compiler bobp 0) | |
2321 (byte-defop-compiler current-buffer 0) | |
2322 ;;(byte-defop-compiler read-char 0) ;; obsolete | |
2323 (byte-defop-compiler interactive-p 0) | |
2324 (byte-defop-compiler19 widen 0) | |
2325 (byte-defop-compiler19 end-of-line 0-1) | |
2326 (byte-defop-compiler19 forward-char 0-1) | |
2327 (byte-defop-compiler19 forward-line 0-1) | |
2328 (byte-defop-compiler symbolp 1) | |
2329 (byte-defop-compiler consp 1) | |
2330 (byte-defop-compiler stringp 1) | |
2331 (byte-defop-compiler listp 1) | |
2332 (byte-defop-compiler not 1) | |
2333 (byte-defop-compiler (null byte-not) 1) | |
2334 (byte-defop-compiler car 1) | |
2335 (byte-defop-compiler cdr 1) | |
2336 (byte-defop-compiler length 1) | |
2337 (byte-defop-compiler symbol-value 1) | |
2338 (byte-defop-compiler symbol-function 1) | |
2339 (byte-defop-compiler (1+ byte-add1) 1) | |
2340 (byte-defop-compiler (1- byte-sub1) 1) | |
2341 (byte-defop-compiler goto-char 1) | |
18722
3905119ebc75
(char-after): Allow 0 args.
Richard M. Stallman <rms@gnu.org>
parents:
18391
diff
changeset
|
2342 (byte-defop-compiler char-after 0-1) |
757 | 2343 (byte-defop-compiler set-buffer 1) |
2344 ;;(byte-defop-compiler set-mark 1) ;; obsolete | |
2345 (byte-defop-compiler19 forward-word 1) | |
2346 (byte-defop-compiler19 char-syntax 1) | |
2347 (byte-defop-compiler19 nreverse 1) | |
2348 (byte-defop-compiler19 car-safe 1) | |
2349 (byte-defop-compiler19 cdr-safe 1) | |
2350 (byte-defop-compiler19 numberp 1) | |
2351 (byte-defop-compiler19 integerp 1) | |
2352 (byte-defop-compiler19 skip-chars-forward 1-2) | |
2353 (byte-defop-compiler19 skip-chars-backward 1-2) | |
2354 (byte-defop-compiler eq 2) | |
2355 (byte-defop-compiler memq 2) | |
2356 (byte-defop-compiler cons 2) | |
2357 (byte-defop-compiler aref 2) | |
2358 (byte-defop-compiler set 2) | |
2359 (byte-defop-compiler (= byte-eqlsign) 2) | |
2360 (byte-defop-compiler (< byte-lss) 2) | |
2361 (byte-defop-compiler (> byte-gtr) 2) | |
2362 (byte-defop-compiler (<= byte-leq) 2) | |
2363 (byte-defop-compiler (>= byte-geq) 2) | |
2364 (byte-defop-compiler get 2) | |
2365 (byte-defop-compiler nth 2) | |
2366 (byte-defop-compiler substring 2-3) | |
958 | 2367 (byte-defop-compiler19 (move-marker byte-set-marker) 2-3) |
757 | 2368 (byte-defop-compiler19 set-marker 2-3) |
2369 (byte-defop-compiler19 match-beginning 1) | |
2370 (byte-defop-compiler19 match-end 1) | |
2371 (byte-defop-compiler19 upcase 1) | |
2372 (byte-defop-compiler19 downcase 1) | |
2373 (byte-defop-compiler19 string= 2) | |
2374 (byte-defop-compiler19 string< 2) | |
958 | 2375 (byte-defop-compiler19 (string-equal byte-string=) 2) |
2376 (byte-defop-compiler19 (string-lessp byte-string<) 2) | |
757 | 2377 (byte-defop-compiler19 equal 2) |
2378 (byte-defop-compiler19 nthcdr 2) | |
2379 (byte-defop-compiler19 elt 2) | |
2380 (byte-defop-compiler19 member 2) | |
2381 (byte-defop-compiler19 assq 2) | |
958 | 2382 (byte-defop-compiler19 (rplaca byte-setcar) 2) |
2383 (byte-defop-compiler19 (rplacd byte-setcdr) 2) | |
757 | 2384 (byte-defop-compiler19 setcar 2) |
2385 (byte-defop-compiler19 setcdr 2) | |
2386 (byte-defop-compiler19 buffer-substring 2) | |
2387 (byte-defop-compiler19 delete-region 2) | |
2388 (byte-defop-compiler19 narrow-to-region 2) | |
2389 (byte-defop-compiler19 (% byte-rem) 2) | |
2390 (byte-defop-compiler aset 3) | |
2391 | |
2392 (byte-defop-compiler max byte-compile-associative) | |
2393 (byte-defop-compiler min byte-compile-associative) | |
2394 (byte-defop-compiler (+ byte-plus) byte-compile-associative) | |
2395 (byte-defop-compiler19 (* byte-mult) byte-compile-associative) | |
2396 | |
2397 ;;####(byte-defop-compiler19 move-to-column 1) | |
2398 (byte-defop-compiler-1 interactive byte-compile-noop) | |
2399 | |
2400 | |
2401 (defun byte-compile-subr-wrong-args (form n) | |
2402 (byte-compile-warn "%s called with %d arg%s, but requires %s" | |
2403 (car form) (length (cdr form)) | |
2404 (if (= 1 (length (cdr form))) "" "s") n) | |
2405 ;; get run-time wrong-number-of-args error. | |
2406 (byte-compile-normal-call form)) | |
2407 | |
2408 (defun byte-compile-no-args (form) | |
2409 (if (not (= (length form) 1)) | |
2410 (byte-compile-subr-wrong-args form "none") | |
2411 (byte-compile-out (get (car form) 'byte-opcode) 0))) | |
2412 | |
2413 (defun byte-compile-one-arg (form) | |
2414 (if (not (= (length form) 2)) | |
2415 (byte-compile-subr-wrong-args form 1) | |
2416 (byte-compile-form (car (cdr form))) ;; Push the argument | |
2417 (byte-compile-out (get (car form) 'byte-opcode) 0))) | |
2418 | |
2419 (defun byte-compile-two-args (form) | |
2420 (if (not (= (length form) 3)) | |
2421 (byte-compile-subr-wrong-args form 2) | |
2422 (byte-compile-form (car (cdr form))) ;; Push the arguments | |
2423 (byte-compile-form (nth 2 form)) | |
2424 (byte-compile-out (get (car form) 'byte-opcode) 0))) | |
2425 | |
2426 (defun byte-compile-three-args (form) | |
2427 (if (not (= (length form) 4)) | |
2428 (byte-compile-subr-wrong-args form 3) | |
2429 (byte-compile-form (car (cdr form))) ;; Push the arguments | |
2430 (byte-compile-form (nth 2 form)) | |
2431 (byte-compile-form (nth 3 form)) | |
2432 (byte-compile-out (get (car form) 'byte-opcode) 0))) | |
2433 | |
2434 (defun byte-compile-zero-or-one-arg (form) | |
2435 (let ((len (length form))) | |
2436 (cond ((= len 1) (byte-compile-one-arg (append form '(nil)))) | |
2437 ((= len 2) (byte-compile-one-arg form)) | |
2438 (t (byte-compile-subr-wrong-args form "0-1"))))) | |
2439 | |
2440 (defun byte-compile-one-or-two-args (form) | |
2441 (let ((len (length form))) | |
2442 (cond ((= len 2) (byte-compile-two-args (append form '(nil)))) | |
2443 ((= len 3) (byte-compile-two-args form)) | |
2444 (t (byte-compile-subr-wrong-args form "1-2"))))) | |
2445 | |
2446 (defun byte-compile-two-or-three-args (form) | |
2447 (let ((len (length form))) | |
2448 (cond ((= len 3) (byte-compile-three-args (append form '(nil)))) | |
2449 ((= len 4) (byte-compile-three-args form)) | |
2450 (t (byte-compile-subr-wrong-args form "2-3"))))) | |
2451 | |
2452 (defun byte-compile-noop (form) | |
2453 (byte-compile-constant nil)) | |
2454 | |
2455 (defun byte-compile-discard () | |
2456 (byte-compile-out 'byte-discard 0)) | |
2457 | |
2458 | |
2459 ;; 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
|
2460 ;; 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
|
2461 ;; 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
|
2462 ;; 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
|
2463 ;; in order to convert markers to numbers, and trigger expected errors. |
757 | 2464 (defun byte-compile-associative (form) |
2465 (if (cdr form) | |
13474
3e7f6fdc234d
(byte-compile-associative): Do operations left to right.
Richard M. Stallman <rms@gnu.org>
parents:
13403
diff
changeset
|
2466 (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
|
2467 (args (copy-sequence (cdr form)))) |
3e7f6fdc234d
(byte-compile-associative): Do operations left to right.
Richard M. Stallman <rms@gnu.org>
parents:
13403
diff
changeset
|
2468 (byte-compile-form (car args)) |
3e7f6fdc234d
(byte-compile-associative): Do operations left to right.
Richard M. Stallman <rms@gnu.org>
parents:
13403
diff
changeset
|
2469 (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
|
2470 (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
|
2471 opcode (get '+ 'byte-opcode))) |
13474
3e7f6fdc234d
(byte-compile-associative): Do operations left to right.
Richard M. Stallman <rms@gnu.org>
parents:
13403
diff
changeset
|
2472 (while args |
3e7f6fdc234d
(byte-compile-associative): Do operations left to right.
Richard M. Stallman <rms@gnu.org>
parents:
13403
diff
changeset
|
2473 (byte-compile-form (car args)) |
3e7f6fdc234d
(byte-compile-associative): Do operations left to right.
Richard M. Stallman <rms@gnu.org>
parents:
13403
diff
changeset
|
2474 (byte-compile-out opcode 0) |
3e7f6fdc234d
(byte-compile-associative): Do operations left to right.
Richard M. Stallman <rms@gnu.org>
parents:
13403
diff
changeset
|
2475 (setq args (cdr args)))) |
757 | 2476 (byte-compile-constant (eval form)))) |
2477 | |
2478 | |
2479 ;; more complicated compiler macros | |
2480 | |
2481 (byte-defop-compiler list) | |
2482 (byte-defop-compiler concat) | |
2483 (byte-defop-compiler fset) | |
2484 (byte-defop-compiler (indent-to-column byte-indent-to) byte-compile-indent-to) | |
2485 (byte-defop-compiler indent-to) | |
2486 (byte-defop-compiler insert) | |
2487 (byte-defop-compiler-1 function byte-compile-function-form) | |
2488 (byte-defop-compiler-1 - byte-compile-minus) | |
2489 (byte-defop-compiler19 (/ byte-quo) byte-compile-quo) | |
2490 (byte-defop-compiler19 nconc) | |
2491 (byte-defop-compiler-1 beginning-of-line) | |
2492 | |
2493 (defun byte-compile-list (form) | |
2494 (let ((count (length (cdr form)))) | |
2495 (cond ((= count 0) | |
2496 (byte-compile-constant nil)) | |
2497 ((< count 5) | |
2498 (mapcar 'byte-compile-form (cdr form)) | |
2499 (byte-compile-out | |
2500 (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
|
2501 ((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
|
2502 byte-compile-compatibility))) |
757 | 2503 (mapcar 'byte-compile-form (cdr form)) |
2504 (byte-compile-out 'byte-listN count)) | |
2505 (t (byte-compile-normal-call form))))) | |
2506 | |
2507 (defun byte-compile-concat (form) | |
2508 (let ((count (length (cdr form)))) | |
2509 (cond ((and (< 1 count) (< count 5)) | |
2510 (mapcar 'byte-compile-form (cdr form)) | |
2511 (byte-compile-out | |
2512 (aref [byte-concat2 byte-concat3 byte-concat4] (- count 2)) | |
2513 0)) | |
2514 ;; Concat of one arg is not a no-op if arg is not a string. | |
2515 ((= count 0) | |
2516 (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
|
2517 ((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
|
2518 byte-compile-compatibility))) |
757 | 2519 (mapcar 'byte-compile-form (cdr form)) |
2520 (byte-compile-out 'byte-concatN count)) | |
2521 ((byte-compile-normal-call form))))) | |
2522 | |
2523 (defun byte-compile-minus (form) | |
2524 (if (null (setq form (cdr form))) | |
2525 (byte-compile-constant 0) | |
2526 (byte-compile-form (car form)) | |
2527 (if (cdr form) | |
2528 (while (setq form (cdr form)) | |
2529 (byte-compile-form (car form)) | |
2530 (byte-compile-out 'byte-diff 0)) | |
2531 (byte-compile-out 'byte-negate 0)))) | |
2532 | |
2533 (defun byte-compile-quo (form) | |
2534 (let ((len (length form))) | |
2535 (cond ((<= len 2) | |
2536 (byte-compile-subr-wrong-args form "2 or more")) | |
2537 (t | |
2538 (byte-compile-form (car (setq form (cdr form)))) | |
2539 (while (setq form (cdr form)) | |
2540 (byte-compile-form (car form)) | |
2541 (byte-compile-out 'byte-quo 0)))))) | |
2542 | |
2543 (defun byte-compile-nconc (form) | |
2544 (let ((len (length form))) | |
2545 (cond ((= len 1) | |
2546 (byte-compile-constant nil)) | |
2547 ((= len 2) | |
2548 ;; nconc of one arg is a noop, even if that arg isn't a list. | |
2549 (byte-compile-form (nth 1 form))) | |
2550 (t | |
2551 (byte-compile-form (car (setq form (cdr form)))) | |
2552 (while (setq form (cdr form)) | |
2553 (byte-compile-form (car form)) | |
2554 (byte-compile-out 'byte-nconc 0)))))) | |
2555 | |
2556 (defun byte-compile-fset (form) | |
2557 ;; warn about forms like (fset 'foo '(lambda () ...)) | |
2558 ;; (where the lambda expression is non-trivial...) | |
2559 (let ((fn (nth 2 form)) | |
2560 body) | |
2561 (if (and (eq (car-safe fn) 'quote) | |
2562 (eq (car-safe (setq fn (nth 1 fn))) 'lambda)) | |
2563 (progn | |
2564 (setq body (cdr (cdr fn))) | |
2565 (if (stringp (car body)) (setq body (cdr body))) | |
2566 (if (eq 'interactive (car-safe (car body))) (setq body (cdr body))) | |
2567 (if (and (consp (car body)) | |
2568 (not (eq 'byte-code (car (car body))))) | |
2569 (byte-compile-warn | |
2570 "A quoted lambda form is the second argument of fset. This is probably | |
2571 not what you want, as that lambda cannot be compiled. Consider using | |
2572 the syntax (function (lambda (...) ...)) instead."))))) | |
2573 (byte-compile-two-args form)) | |
2574 | |
2575 (defun byte-compile-funarg (form) | |
2576 ;; (mapcar '(lambda (x) ..) ..) ==> (mapcar (function (lambda (x) ..)) ..) | |
3591
507f64624555
Apply typo patches from Paul Eggert.
Jim Blandy <jimb@redhat.com>
parents:
3455
diff
changeset
|
2577 ;; for cases where it's guaranteed that first arg will be used as a lambda. |
757 | 2578 (byte-compile-normal-call |
2579 (let ((fn (nth 1 form))) | |
2580 (if (and (eq (car-safe fn) 'quote) | |
2581 (eq (car-safe (nth 1 fn)) 'lambda)) | |
2582 (cons (car form) | |
2583 (cons (cons 'function (cdr fn)) | |
2584 (cdr (cdr form)))) | |
2585 form)))) | |
2586 | |
15953
38a50022d610
(byte-compile-funarg-2): New function,
Richard M. Stallman <rms@gnu.org>
parents:
15930
diff
changeset
|
2587 (defun byte-compile-funarg-2 (form) |
38a50022d610
(byte-compile-funarg-2): New function,
Richard M. Stallman <rms@gnu.org>
parents:
15930
diff
changeset
|
2588 ;; (sort ... '(lambda (x) ..)) ==> (sort ... (function (lambda (x) ..))) |
38a50022d610
(byte-compile-funarg-2): New function,
Richard M. Stallman <rms@gnu.org>
parents:
15930
diff
changeset
|
2589 ;; 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
|
2590 (byte-compile-normal-call |
38a50022d610
(byte-compile-funarg-2): New function,
Richard M. Stallman <rms@gnu.org>
parents:
15930
diff
changeset
|
2591 (let ((fn (nth 2 form))) |
38a50022d610
(byte-compile-funarg-2): New function,
Richard M. Stallman <rms@gnu.org>
parents:
15930
diff
changeset
|
2592 (if (and (eq (car-safe fn) 'quote) |
38a50022d610
(byte-compile-funarg-2): New function,
Richard M. Stallman <rms@gnu.org>
parents:
15930
diff
changeset
|
2593 (eq (car-safe (nth 1 fn)) 'lambda)) |
38a50022d610
(byte-compile-funarg-2): New function,
Richard M. Stallman <rms@gnu.org>
parents:
15930
diff
changeset
|
2594 (cons (car form) |
38a50022d610
(byte-compile-funarg-2): New function,
Richard M. Stallman <rms@gnu.org>
parents:
15930
diff
changeset
|
2595 (cons (nth 1 form) |
38a50022d610
(byte-compile-funarg-2): New function,
Richard M. Stallman <rms@gnu.org>
parents:
15930
diff
changeset
|
2596 (cons (cons 'function (cdr fn)) |
38a50022d610
(byte-compile-funarg-2): New function,
Richard M. Stallman <rms@gnu.org>
parents:
15930
diff
changeset
|
2597 (cdr (cdr (cdr form)))))) |
38a50022d610
(byte-compile-funarg-2): New function,
Richard M. Stallman <rms@gnu.org>
parents:
15930
diff
changeset
|
2598 form)))) |
38a50022d610
(byte-compile-funarg-2): New function,
Richard M. Stallman <rms@gnu.org>
parents:
15930
diff
changeset
|
2599 |
757 | 2600 ;; (function foo) must compile like 'foo, not like (symbol-function 'foo). |
2601 ;; Otherwise it will be incompatible with the interpreter, | |
2602 ;; and (funcall (function foo)) will lose with autoloads. | |
2603 | |
2604 (defun byte-compile-function-form (form) | |
2605 (byte-compile-constant | |
2606 (cond ((symbolp (nth 1 form)) | |
2607 (nth 1 form)) | |
2608 ;; If we're not allowed to use #[] syntax, then output a form like | |
2609 ;; '(lambda (..) (byte-code ..)) instead of a call to make-byte-code. | |
2610 ;; In this situation, calling make-byte-code at run-time will usually | |
2611 ;; 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
|
2612 ((byte-compile-version-cond byte-compile-compatibility) |
757 | 2613 (byte-compile-byte-code-unmake (byte-compile-lambda (nth 1 form)))) |
2614 ((byte-compile-lambda (nth 1 form)))))) | |
2615 | |
2616 (defun byte-compile-indent-to (form) | |
2617 (let ((len (length form))) | |
2618 (cond ((= len 2) | |
2619 (byte-compile-form (car (cdr form))) | |
2620 (byte-compile-out 'byte-indent-to 0)) | |
2621 ((= len 3) | |
2622 ;; no opcode for 2-arg case. | |
2623 (byte-compile-normal-call form)) | |
2624 (t | |
2625 (byte-compile-subr-wrong-args form "1-2"))))) | |
2626 | |
2627 (defun byte-compile-insert (form) | |
2628 (cond ((null (cdr form)) | |
2629 (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
|
2630 ((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
|
2631 byte-compile-compatibility)) |
757 | 2632 (<= (length form) 256)) |
2633 (mapcar 'byte-compile-form (cdr form)) | |
2634 (if (cdr (cdr form)) | |
2635 (byte-compile-out 'byte-insertN (length (cdr form))) | |
2636 (byte-compile-out 'byte-insert 0))) | |
2637 ((memq t (mapcar 'consp (cdr (cdr form)))) | |
2638 (byte-compile-normal-call form)) | |
2639 ;; We can split it; there is no function call after inserting 1st arg. | |
2640 (t | |
2641 (while (setq form (cdr form)) | |
2642 (byte-compile-form (car form)) | |
2643 (byte-compile-out 'byte-insert 0) | |
2644 (if (cdr form) | |
2645 (byte-compile-discard)))))) | |
2646 | |
2647 (defun byte-compile-beginning-of-line (form) | |
2648 (if (not (byte-compile-constp (nth 1 form))) | |
2649 (byte-compile-normal-call form) | |
2650 (byte-compile-form | |
2651 (list 'forward-line | |
2652 (if (integerp (setq form (or (eval (nth 1 form)) 1))) | |
2653 (1- form) | |
2654 (byte-compile-warn "Non-numeric arg to beginning-of-line: %s" | |
2655 form) | |
2656 (list '1- (list 'quote form)))) | |
2657 t) | |
2658 (byte-compile-constant nil))) | |
2659 | |
2660 | |
2661 (byte-defop-compiler-1 setq) | |
2662 (byte-defop-compiler-1 setq-default) | |
2663 (byte-defop-compiler-1 quote) | |
2664 (byte-defop-compiler-1 quote-form) | |
2665 | |
2666 (defun byte-compile-setq (form) | |
2667 (let ((args (cdr form))) | |
2668 (if args | |
2669 (while args | |
2670 (byte-compile-form (car (cdr args))) | |
2671 (or for-effect (cdr (cdr args)) | |
2672 (byte-compile-out 'byte-dup 0)) | |
2673 (byte-compile-variable-ref 'byte-varset (car args)) | |
2674 (setq args (cdr (cdr args)))) | |
2675 ;; (setq), with no arguments. | |
2676 (byte-compile-form nil for-effect)) | |
2677 (setq for-effect nil))) | |
2678 | |
2679 (defun byte-compile-setq-default (form) | |
4049
7908fc6e4fb9
(byte-compile-setq-default):
Richard M. Stallman <rms@gnu.org>
parents:
4013
diff
changeset
|
2680 (let ((args (cdr form)) |
7908fc6e4fb9
(byte-compile-setq-default):
Richard M. Stallman <rms@gnu.org>
parents:
4013
diff
changeset
|
2681 setters) |
7908fc6e4fb9
(byte-compile-setq-default):
Richard M. Stallman <rms@gnu.org>
parents:
4013
diff
changeset
|
2682 (while args |
7908fc6e4fb9
(byte-compile-setq-default):
Richard M. Stallman <rms@gnu.org>
parents:
4013
diff
changeset
|
2683 (setq setters |
7908fc6e4fb9
(byte-compile-setq-default):
Richard M. Stallman <rms@gnu.org>
parents:
4013
diff
changeset
|
2684 (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
|
2685 setters)) |
7908fc6e4fb9
(byte-compile-setq-default):
Richard M. Stallman <rms@gnu.org>
parents:
4013
diff
changeset
|
2686 (setq args (cdr (cdr args)))) |
7908fc6e4fb9
(byte-compile-setq-default):
Richard M. Stallman <rms@gnu.org>
parents:
4013
diff
changeset
|
2687 (byte-compile-form (cons 'progn (nreverse setters))))) |
757 | 2688 |
2689 (defun byte-compile-quote (form) | |
2690 (byte-compile-constant (car (cdr form)))) | |
2691 | |
2692 (defun byte-compile-quote-form (form) | |
2693 (byte-compile-constant (byte-compile-top-level (nth 1 form)))) | |
2694 | |
2695 | |
2696 ;;; control structures | |
2697 | |
2698 (defun byte-compile-body (body &optional for-effect) | |
2699 (while (cdr body) | |
2700 (byte-compile-form (car body) t) | |
2701 (setq body (cdr body))) | |
2702 (byte-compile-form (car body) for-effect)) | |
2703 | |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
2704 (defsubst byte-compile-body-do-effect (body) |
757 | 2705 (byte-compile-body body for-effect) |
2706 (setq for-effect nil)) | |
2707 | |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
2708 (defsubst byte-compile-form-do-effect (form) |
757 | 2709 (byte-compile-form form for-effect) |
2710 (setq for-effect nil)) | |
2711 | |
2712 (byte-defop-compiler-1 inline byte-compile-progn) | |
2713 (byte-defop-compiler-1 progn) | |
2714 (byte-defop-compiler-1 prog1) | |
2715 (byte-defop-compiler-1 prog2) | |
2716 (byte-defop-compiler-1 if) | |
2717 (byte-defop-compiler-1 cond) | |
2718 (byte-defop-compiler-1 and) | |
2719 (byte-defop-compiler-1 or) | |
2720 (byte-defop-compiler-1 while) | |
2721 (byte-defop-compiler-1 funcall) | |
2722 (byte-defop-compiler-1 apply byte-compile-funarg) | |
2723 (byte-defop-compiler-1 mapcar byte-compile-funarg) | |
2724 (byte-defop-compiler-1 mapatoms byte-compile-funarg) | |
2725 (byte-defop-compiler-1 mapconcat byte-compile-funarg) | |
15953
38a50022d610
(byte-compile-funarg-2): New function,
Richard M. Stallman <rms@gnu.org>
parents:
15930
diff
changeset
|
2726 (byte-defop-compiler-1 sort byte-compile-funarg-2) |
757 | 2727 (byte-defop-compiler-1 let) |
2728 (byte-defop-compiler-1 let*) | |
2729 | |
2730 (defun byte-compile-progn (form) | |
2731 (byte-compile-body-do-effect (cdr form))) | |
2732 | |
2733 (defun byte-compile-prog1 (form) | |
2734 (byte-compile-form-do-effect (car (cdr form))) | |
2735 (byte-compile-body (cdr (cdr form)) t)) | |
2736 | |
2737 (defun byte-compile-prog2 (form) | |
2738 (byte-compile-form (nth 1 form) t) | |
2739 (byte-compile-form-do-effect (nth 2 form)) | |
2740 (byte-compile-body (cdr (cdr (cdr form))) t)) | |
2741 | |
2742 (defmacro byte-compile-goto-if (cond discard tag) | |
2743 (` (byte-compile-goto | |
2744 (if (, cond) | |
2745 (if (, discard) 'byte-goto-if-not-nil 'byte-goto-if-not-nil-else-pop) | |
2746 (if (, discard) 'byte-goto-if-nil 'byte-goto-if-nil-else-pop)) | |
2747 (, tag)))) | |
2748 | |
2749 (defun byte-compile-if (form) | |
2750 (byte-compile-form (car (cdr form))) | |
2751 (if (null (nthcdr 3 form)) | |
2752 ;; No else-forms | |
2753 (let ((donetag (byte-compile-make-tag))) | |
2754 (byte-compile-goto-if nil for-effect donetag) | |
2755 (byte-compile-form (nth 2 form) for-effect) | |
2756 (byte-compile-out-tag donetag)) | |
2757 (let ((donetag (byte-compile-make-tag)) (elsetag (byte-compile-make-tag))) | |
2758 (byte-compile-goto 'byte-goto-if-nil elsetag) | |
2759 (byte-compile-form (nth 2 form) for-effect) | |
2760 (byte-compile-goto 'byte-goto donetag) | |
2761 (byte-compile-out-tag elsetag) | |
2762 (byte-compile-body (cdr (cdr (cdr form))) for-effect) | |
2763 (byte-compile-out-tag donetag))) | |
2764 (setq for-effect nil)) | |
2765 | |
2766 (defun byte-compile-cond (clauses) | |
2767 (let ((donetag (byte-compile-make-tag)) | |
2768 nexttag clause) | |
2769 (while (setq clauses (cdr clauses)) | |
2770 (setq clause (car clauses)) | |
2771 (cond ((or (eq (car clause) t) | |
2772 (and (eq (car-safe (car clause)) 'quote) | |
2773 (car-safe (cdr-safe (car clause))))) | |
2774 ;; Unconditional clause | |
2775 (setq clause (cons t clause) | |
2776 clauses nil)) | |
2777 ((cdr clauses) | |
2778 (byte-compile-form (car clause)) | |
2779 (if (null (cdr clause)) | |
2780 ;; First clause is a singleton. | |
2781 (byte-compile-goto-if t for-effect donetag) | |
2782 (setq nexttag (byte-compile-make-tag)) | |
2783 (byte-compile-goto 'byte-goto-if-nil nexttag) | |
2784 (byte-compile-body (cdr clause) for-effect) | |
2785 (byte-compile-goto 'byte-goto donetag) | |
2786 (byte-compile-out-tag nexttag))))) | |
2787 ;; Last clause | |
2788 (and (cdr clause) (not (eq (car clause) t)) | |
2789 (progn (byte-compile-form (car clause)) | |
2790 (byte-compile-goto-if nil for-effect donetag) | |
2791 (setq clause (cdr clause)))) | |
2792 (byte-compile-body-do-effect clause) | |
2793 (byte-compile-out-tag donetag))) | |
2794 | |
2795 (defun byte-compile-and (form) | |
2796 (let ((failtag (byte-compile-make-tag)) | |
2797 (args (cdr form))) | |
2798 (if (null args) | |
2799 (byte-compile-form-do-effect t) | |
2800 (while (cdr args) | |
2801 (byte-compile-form (car args)) | |
2802 (byte-compile-goto-if nil for-effect failtag) | |
2803 (setq args (cdr args))) | |
2804 (byte-compile-form-do-effect (car args)) | |
2805 (byte-compile-out-tag failtag)))) | |
2806 | |
2807 (defun byte-compile-or (form) | |
2808 (let ((wintag (byte-compile-make-tag)) | |
2809 (args (cdr form))) | |
2810 (if (null args) | |
2811 (byte-compile-form-do-effect nil) | |
2812 (while (cdr args) | |
2813 (byte-compile-form (car args)) | |
2814 (byte-compile-goto-if t for-effect wintag) | |
2815 (setq args (cdr args))) | |
2816 (byte-compile-form-do-effect (car args)) | |
2817 (byte-compile-out-tag wintag)))) | |
2818 | |
2819 (defun byte-compile-while (form) | |
2820 (let ((endtag (byte-compile-make-tag)) | |
2821 (looptag (byte-compile-make-tag))) | |
2822 (byte-compile-out-tag looptag) | |
2823 (byte-compile-form (car (cdr form))) | |
2824 (byte-compile-goto-if nil for-effect endtag) | |
2825 (byte-compile-body (cdr (cdr form)) t) | |
2826 (byte-compile-goto 'byte-goto looptag) | |
2827 (byte-compile-out-tag endtag) | |
2828 (setq for-effect nil))) | |
2829 | |
2830 (defun byte-compile-funcall (form) | |
2831 (mapcar 'byte-compile-form (cdr form)) | |
2832 (byte-compile-out 'byte-call (length (cdr (cdr form))))) | |
2833 | |
2834 | |
2835 (defun byte-compile-let (form) | |
2836 ;; First compute the binding values in the old scope. | |
2837 (let ((varlist (car (cdr form)))) | |
2838 (while varlist | |
2839 (if (consp (car varlist)) | |
2840 (byte-compile-form (car (cdr (car varlist)))) | |
2841 (byte-compile-push-constant nil)) | |
2842 (setq varlist (cdr varlist)))) | |
2843 (let ((byte-compile-bound-variables byte-compile-bound-variables) ;new scope | |
2844 (varlist (reverse (car (cdr form))))) | |
2845 (while varlist | |
2846 (byte-compile-variable-ref 'byte-varbind (if (consp (car varlist)) | |
2847 (car (car varlist)) | |
2848 (car varlist))) | |
2849 (setq varlist (cdr varlist))) | |
2850 (byte-compile-body-do-effect (cdr (cdr form))) | |
2851 (byte-compile-out 'byte-unbind (length (car (cdr form)))))) | |
2852 | |
2853 (defun byte-compile-let* (form) | |
2854 (let ((byte-compile-bound-variables byte-compile-bound-variables) ;new scope | |
2855 (varlist (copy-sequence (car (cdr form))))) | |
2856 (while varlist | |
2857 (if (atom (car varlist)) | |
2858 (byte-compile-push-constant nil) | |
2859 (byte-compile-form (car (cdr (car varlist)))) | |
2860 (setcar varlist (car (car varlist)))) | |
2861 (byte-compile-variable-ref 'byte-varbind (car varlist)) | |
2862 (setq varlist (cdr varlist))) | |
2863 (byte-compile-body-do-effect (cdr (cdr form))) | |
2864 (byte-compile-out 'byte-unbind (length (car (cdr form)))))) | |
2865 | |
2866 | |
2867 (byte-defop-compiler-1 /= byte-compile-negated) | |
2868 (byte-defop-compiler-1 atom byte-compile-negated) | |
2869 (byte-defop-compiler-1 nlistp byte-compile-negated) | |
2870 | |
2871 (put '/= 'byte-compile-negated-op '=) | |
2872 (put 'atom 'byte-compile-negated-op 'consp) | |
2873 (put 'nlistp 'byte-compile-negated-op 'listp) | |
2874 | |
2875 (defun byte-compile-negated (form) | |
2876 (byte-compile-form-do-effect (byte-compile-negation-optimizer form))) | |
2877 | |
2878 ;; Even when optimization is off, /= is optimized to (not (= ...)). | |
2879 (defun byte-compile-negation-optimizer (form) | |
2880 ;; an optimizer for forms where <form1> is less efficient than (not <form2>) | |
2881 (list 'not | |
2882 (cons (or (get (car form) 'byte-compile-negated-op) | |
2883 (error | |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
2884 "Compiler error: `%s' has no `byte-compile-negated-op' property" |
757 | 2885 (car form))) |
2886 (cdr form)))) | |
2887 | |
2888 ;;; other tricky macro-like special-forms | |
2889 | |
2890 (byte-defop-compiler-1 catch) | |
2891 (byte-defop-compiler-1 unwind-protect) | |
2892 (byte-defop-compiler-1 condition-case) | |
2893 (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
|
2894 (byte-defop-compiler-1 save-current-buffer) |
757 | 2895 (byte-defop-compiler-1 save-restriction) |
2896 (byte-defop-compiler-1 save-window-excursion) | |
2897 (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
|
2898 (byte-defop-compiler-1 track-mouse) |
757 | 2899 |
2900 (defun byte-compile-catch (form) | |
2901 (byte-compile-form (car (cdr form))) | |
2902 (byte-compile-push-constant | |
2903 (byte-compile-top-level (cons 'progn (cdr (cdr form))) for-effect)) | |
2904 (byte-compile-out 'byte-catch 0)) | |
2905 | |
2906 (defun byte-compile-unwind-protect (form) | |
2907 (byte-compile-push-constant | |
2908 (byte-compile-top-level-body (cdr (cdr form)) t)) | |
2909 (byte-compile-out 'byte-unwind-protect 0) | |
2910 (byte-compile-form-do-effect (car (cdr form))) | |
2911 (byte-compile-out 'byte-unbind 1)) | |
2912 | |
2798
e2f296263868
(byte-compile-track-mouse): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2735
diff
changeset
|
2913 (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
|
2914 (byte-compile-form |
649c8a929063
(byte-compile-track-mouse): Undo previous change,
Richard M. Stallman <rms@gnu.org>
parents:
6217
diff
changeset
|
2915 (list |
649c8a929063
(byte-compile-track-mouse): Undo previous change,
Richard M. Stallman <rms@gnu.org>
parents:
6217
diff
changeset
|
2916 'funcall |
649c8a929063
(byte-compile-track-mouse): Undo previous change,
Richard M. Stallman <rms@gnu.org>
parents:
6217
diff
changeset
|
2917 (list 'quote |
649c8a929063
(byte-compile-track-mouse): Undo previous change,
Richard M. Stallman <rms@gnu.org>
parents:
6217
diff
changeset
|
2918 (list 'lambda nil |
649c8a929063
(byte-compile-track-mouse): Undo previous change,
Richard M. Stallman <rms@gnu.org>
parents:
6217
diff
changeset
|
2919 (cons 'track-mouse |
649c8a929063
(byte-compile-track-mouse): Undo previous change,
Richard M. Stallman <rms@gnu.org>
parents:
6217
diff
changeset
|
2920 (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
|
2921 |
757 | 2922 (defun byte-compile-condition-case (form) |
2923 (let* ((var (nth 1 form)) | |
2924 (byte-compile-bound-variables | |
2925 (if var (cons var byte-compile-bound-variables) | |
2926 byte-compile-bound-variables))) | |
2927 (or (symbolp var) | |
2928 (byte-compile-warn | |
2929 "%s is not a variable-name or nil (in condition-case)" var)) | |
2930 (byte-compile-push-constant var) | |
2931 (byte-compile-push-constant (byte-compile-top-level | |
2932 (nth 2 form) for-effect)) | |
2933 (let ((clauses (cdr (cdr (cdr form)))) | |
2934 compiled-clauses) | |
2935 (while clauses | |
3653
974055b516d9
* bytecomp.el: Bring it up to version 2.10 of the
Jim Blandy <jimb@redhat.com>
parents:
3591
diff
changeset
|
2936 (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
|
2937 (condition (car clause))) |
5562
2b3d2ea74ce1
(byte-compile-condition-case): Disable warning about
Richard M. Stallman <rms@gnu.org>
parents:
5454
diff
changeset
|
2938 (cond ((not (or (symbolp condition) |
2b3d2ea74ce1
(byte-compile-condition-case): Disable warning about
Richard M. Stallman <rms@gnu.org>
parents:
5454
diff
changeset
|
2939 (and (listp condition) |
2b3d2ea74ce1
(byte-compile-condition-case): Disable warning about
Richard M. Stallman <rms@gnu.org>
parents:
5454
diff
changeset
|
2940 (let ((syms condition) (ok t)) |
2b3d2ea74ce1
(byte-compile-condition-case): Disable warning about
Richard M. Stallman <rms@gnu.org>
parents:
5454
diff
changeset
|
2941 (while syms |
2b3d2ea74ce1
(byte-compile-condition-case): Disable warning about
Richard M. Stallman <rms@gnu.org>
parents:
5454
diff
changeset
|
2942 (if (not (symbolp (car syms))) |
2b3d2ea74ce1
(byte-compile-condition-case): Disable warning about
Richard M. Stallman <rms@gnu.org>
parents:
5454
diff
changeset
|
2943 (setq ok nil)) |
2b3d2ea74ce1
(byte-compile-condition-case): Disable warning about
Richard M. Stallman <rms@gnu.org>
parents:
5454
diff
changeset
|
2944 (setq syms (cdr syms))) |
2b3d2ea74ce1
(byte-compile-condition-case): Disable warning about
Richard M. Stallman <rms@gnu.org>
parents:
5454
diff
changeset
|
2945 ok)))) |
3653
974055b516d9
* bytecomp.el: Bring it up to version 2.10 of the
Jim Blandy <jimb@redhat.com>
parents:
3591
diff
changeset
|
2946 (byte-compile-warn |
5562
2b3d2ea74ce1
(byte-compile-condition-case): Disable warning about
Richard M. Stallman <rms@gnu.org>
parents:
5454
diff
changeset
|
2947 "%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
|
2948 (prin1-to-string condition))) |
5562
2b3d2ea74ce1
(byte-compile-condition-case): Disable warning about
Richard M. Stallman <rms@gnu.org>
parents:
5454
diff
changeset
|
2949 ;; ((not (or (eq condition 't) |
2b3d2ea74ce1
(byte-compile-condition-case): Disable warning about
Richard M. Stallman <rms@gnu.org>
parents:
5454
diff
changeset
|
2950 ;; (and (stringp (get condition 'error-message)) |
2b3d2ea74ce1
(byte-compile-condition-case): Disable warning about
Richard M. Stallman <rms@gnu.org>
parents:
5454
diff
changeset
|
2951 ;; (consp (get condition 'error-conditions))))) |
2b3d2ea74ce1
(byte-compile-condition-case): Disable warning about
Richard M. Stallman <rms@gnu.org>
parents:
5454
diff
changeset
|
2952 ;; (byte-compile-warn |
2b3d2ea74ce1
(byte-compile-condition-case): Disable warning about
Richard M. Stallman <rms@gnu.org>
parents:
5454
diff
changeset
|
2953 ;; "%s is not a known condition name (in condition-case)" |
2b3d2ea74ce1
(byte-compile-condition-case): Disable warning about
Richard M. Stallman <rms@gnu.org>
parents:
5454
diff
changeset
|
2954 ;; condition)) |
2b3d2ea74ce1
(byte-compile-condition-case): Disable warning about
Richard M. Stallman <rms@gnu.org>
parents:
5454
diff
changeset
|
2955 ) |
757 | 2956 (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
|
2957 (cons (cons condition |
757 | 2958 (byte-compile-top-level-body |
2959 (cdr clause) for-effect)) | |
2960 compiled-clauses))) | |
2961 (setq clauses (cdr clauses))) | |
2962 (byte-compile-push-constant (nreverse compiled-clauses))) | |
2963 (byte-compile-out 'byte-condition-case 0))) | |
2964 | |
2965 | |
2966 (defun byte-compile-save-excursion (form) | |
2967 (byte-compile-out 'byte-save-excursion 0) | |
2968 (byte-compile-body-do-effect (cdr form)) | |
2969 (byte-compile-out 'byte-unbind 1)) | |
2970 | |
2971 (defun byte-compile-save-restriction (form) | |
2972 (byte-compile-out 'byte-save-restriction 0) | |
2973 (byte-compile-body-do-effect (cdr form)) | |
2974 (byte-compile-out 'byte-unbind 1)) | |
2975 | |
16274
e9819849c533
(save-current-buffer): Compile it like save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
16232
diff
changeset
|
2976 (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
|
2977 (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
|
2978 (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
|
2979 (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
|
2980 |
757 | 2981 (defun byte-compile-save-window-excursion (form) |
2982 (byte-compile-push-constant | |
2983 (byte-compile-top-level-body (cdr form) for-effect)) | |
2984 (byte-compile-out 'byte-save-window-excursion 0)) | |
2985 | |
2986 (defun byte-compile-with-output-to-temp-buffer (form) | |
2987 (byte-compile-form (car (cdr form))) | |
2988 (byte-compile-out 'byte-temp-output-buffer-setup 0) | |
2989 (byte-compile-body (cdr (cdr form))) | |
2990 (byte-compile-out 'byte-temp-output-buffer-show 0)) | |
2991 | |
2992 | |
2993 ;;; top-level forms elsewhere | |
2994 | |
2995 (byte-defop-compiler-1 defun) | |
2996 (byte-defop-compiler-1 defmacro) | |
2997 (byte-defop-compiler-1 defvar) | |
2998 (byte-defop-compiler-1 defconst byte-compile-defvar) | |
2999 (byte-defop-compiler-1 autoload) | |
3000 (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
|
3001 (byte-defop-compiler-1 defalias) |
757 | 3002 |
3003 (defun byte-compile-defun (form) | |
3004 ;; This is not used for file-level defuns with doc strings. | |
3005 (byte-compile-two-args ; Use this to avoid byte-compile-fset's warning. | |
3006 (list 'fset (list 'quote (nth 1 form)) | |
3007 (byte-compile-byte-code-maker | |
3008 (byte-compile-lambda (cons 'lambda (cdr (cdr form))))))) | |
3009 (byte-compile-discard) | |
3010 (byte-compile-constant (nth 1 form))) | |
3011 | |
3012 (defun byte-compile-defmacro (form) | |
3013 ;; This is not used for file-level defmacros with doc strings. | |
3014 (byte-compile-body-do-effect | |
3015 (list (list 'fset (list 'quote (nth 1 form)) | |
3016 (let ((code (byte-compile-byte-code-maker | |
3017 (byte-compile-lambda | |
3018 (cons 'lambda (cdr (cdr form))))))) | |
3019 (if (eq (car-safe code) 'make-byte-code) | |
3020 (list 'cons ''macro code) | |
3021 (list 'quote (cons 'macro (eval code)))))) | |
3022 (list 'quote (nth 1 form))))) | |
3023 | |
3024 (defun byte-compile-defvar (form) | |
3025 ;; This is not used for file-level defvar/consts with doc strings. | |
3026 (let ((var (nth 1 form)) | |
3027 (value (nth 2 form)) | |
3028 (string (nth 3 form))) | |
3029 (if (memq 'free-vars byte-compile-warnings) | |
3030 (setq byte-compile-bound-variables | |
3031 (cons var byte-compile-bound-variables))) | |
3032 (byte-compile-body-do-effect | |
3033 (list (if (cdr (cdr form)) | |
3034 (if (eq (car form) 'defconst) | |
3035 (list 'setq var value) | |
3036 (list 'or (list 'boundp (list 'quote var)) | |
3037 (list 'setq var value)))) | |
10514
0b52bc04c180
(byte-compile-defvar): Add the var to current-load-list.
Richard M. Stallman <rms@gnu.org>
parents:
10372
diff
changeset
|
3038 ;; Put the defined variable in this library's load-history entry |
0b52bc04c180
(byte-compile-defvar): Add the var to current-load-list.
Richard M. Stallman <rms@gnu.org>
parents:
10372
diff
changeset
|
3039 ;; just as a real defvar would. |
0b52bc04c180
(byte-compile-defvar): Add the var to current-load-list.
Richard M. Stallman <rms@gnu.org>
parents:
10372
diff
changeset
|
3040 (list 'setq 'current-load-list |
0b52bc04c180
(byte-compile-defvar): Add the var to current-load-list.
Richard M. Stallman <rms@gnu.org>
parents:
10372
diff
changeset
|
3041 (list 'cons (list 'quote var) |
0b52bc04c180
(byte-compile-defvar): Add the var to current-load-list.
Richard M. Stallman <rms@gnu.org>
parents:
10372
diff
changeset
|
3042 'current-load-list)) |
757 | 3043 (if string |
3044 (list 'put (list 'quote var) ''variable-documentation string)) | |
3045 (list 'quote var))))) | |
3046 | |
3047 (defun byte-compile-autoload (form) | |
3048 (and (byte-compile-constp (nth 1 form)) | |
3049 (byte-compile-constp (nth 5 form)) | |
3050 (eval (nth 5 form)) ; macro-p | |
3051 (not (fboundp (eval (nth 1 form)))) | |
3052 (byte-compile-warn | |
3053 "The compiler ignores `autoload' except at top level. You should | |
3054 probably put the autoload of the macro `%s' at top-level." | |
3055 (eval (nth 1 form)))) | |
3056 (byte-compile-normal-call form)) | |
3057 | |
3058 ;; Lambda's in valid places are handled as special cases by various code. | |
3059 ;; The ones that remain are errors. | |
3060 (defun byte-compile-lambda-form (form) | |
3061 (error "`lambda' used as function name is invalid")) | |
3062 | |
8086
9f6348616e4d
(byte-compile-callargs-warn): Handle function defnition
Richard M. Stallman <rms@gnu.org>
parents:
7298
diff
changeset
|
3063 ;; 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
|
3064 (defun byte-compile-defalias (form) |
9f6348616e4d
(byte-compile-callargs-warn): Handle function defnition
Richard M. Stallman <rms@gnu.org>
parents:
7298
diff
changeset
|
3065 (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
|
3066 (eq (car (nth 1 form)) 'quote) |
9f6348616e4d
(byte-compile-callargs-warn): Handle function defnition
Richard M. Stallman <rms@gnu.org>
parents:
7298
diff
changeset
|
3067 (consp (cdr (nth 1 form))) |
9f6348616e4d
(byte-compile-callargs-warn): Handle function defnition
Richard M. Stallman <rms@gnu.org>
parents:
7298
diff
changeset
|
3068 (symbolp (nth 1 (nth 1 form))) |
9f6348616e4d
(byte-compile-callargs-warn): Handle function defnition
Richard M. Stallman <rms@gnu.org>
parents:
7298
diff
changeset
|
3069 (consp (nthcdr 2 form)) |
9f6348616e4d
(byte-compile-callargs-warn): Handle function defnition
Richard M. Stallman <rms@gnu.org>
parents:
7298
diff
changeset
|
3070 (consp (nth 2 form)) |
9f6348616e4d
(byte-compile-callargs-warn): Handle function defnition
Richard M. Stallman <rms@gnu.org>
parents:
7298
diff
changeset
|
3071 (eq (car (nth 2 form)) 'quote) |
9f6348616e4d
(byte-compile-callargs-warn): Handle function defnition
Richard M. Stallman <rms@gnu.org>
parents:
7298
diff
changeset
|
3072 (consp (cdr (nth 2 form))) |
9f6348616e4d
(byte-compile-callargs-warn): Handle function defnition
Richard M. Stallman <rms@gnu.org>
parents:
7298
diff
changeset
|
3073 (symbolp (nth 1 (nth 2 form)))) |
9f6348616e4d
(byte-compile-callargs-warn): Handle function defnition
Richard M. Stallman <rms@gnu.org>
parents:
7298
diff
changeset
|
3074 (progn |
9f6348616e4d
(byte-compile-callargs-warn): Handle function defnition
Richard M. Stallman <rms@gnu.org>
parents:
7298
diff
changeset
|
3075 (byte-compile-defalias-warn (nth 1 (nth 1 form)) |
9f6348616e4d
(byte-compile-callargs-warn): Handle function defnition
Richard M. Stallman <rms@gnu.org>
parents:
7298
diff
changeset
|
3076 (nth 1 (nth 2 form))) |
9f6348616e4d
(byte-compile-callargs-warn): Handle function defnition
Richard M. Stallman <rms@gnu.org>
parents:
7298
diff
changeset
|
3077 (setq byte-compile-function-environment |
9f6348616e4d
(byte-compile-callargs-warn): Handle function defnition
Richard M. Stallman <rms@gnu.org>
parents:
7298
diff
changeset
|
3078 (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
|
3079 (nth 1 (nth 2 form))) |
9f6348616e4d
(byte-compile-callargs-warn): Handle function defnition
Richard M. Stallman <rms@gnu.org>
parents:
7298
diff
changeset
|
3080 byte-compile-function-environment)))) |
8115
e45d541e55cf
(byte-compile-defalias): Fix typo in prev change.
Richard M. Stallman <rms@gnu.org>
parents:
8086
diff
changeset
|
3081 (byte-compile-normal-call form)) |
8086
9f6348616e4d
(byte-compile-callargs-warn): Handle function defnition
Richard M. Stallman <rms@gnu.org>
parents:
7298
diff
changeset
|
3082 |
9f6348616e4d
(byte-compile-callargs-warn): Handle function defnition
Richard M. Stallman <rms@gnu.org>
parents:
7298
diff
changeset
|
3083 ;; 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
|
3084 ;; 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
|
3085 ;; the function it is being aliased to. |
9f6348616e4d
(byte-compile-callargs-warn): Handle function defnition
Richard M. Stallman <rms@gnu.org>
parents:
7298
diff
changeset
|
3086 (defun byte-compile-defalias-warn (new alias) |
9f6348616e4d
(byte-compile-callargs-warn): Handle function defnition
Richard M. Stallman <rms@gnu.org>
parents:
7298
diff
changeset
|
3087 (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
|
3088 (if calls |
9f6348616e4d
(byte-compile-callargs-warn): Handle function defnition
Richard M. Stallman <rms@gnu.org>
parents:
7298
diff
changeset
|
3089 (setq byte-compile-unresolved-functions |
9f6348616e4d
(byte-compile-callargs-warn): Handle function defnition
Richard M. Stallman <rms@gnu.org>
parents:
7298
diff
changeset
|
3090 (delq calls byte-compile-unresolved-functions))))) |
757 | 3091 |
3092 ;;; tags | |
3093 | |
3094 ;; Note: Most operations will strip off the 'TAG, but it speeds up | |
3095 ;; optimization to have the 'TAG as a part of the tag. | |
3096 ;; Tags will be (TAG . (tag-number . stack-depth)). | |
3097 (defun byte-compile-make-tag () | |
3098 (list 'TAG (setq byte-compile-tag-number (1+ byte-compile-tag-number)))) | |
3099 | |
3100 | |
3101 (defun byte-compile-out-tag (tag) | |
3102 (setq byte-compile-output (cons tag byte-compile-output)) | |
3103 (if (cdr (cdr tag)) | |
3104 (progn | |
3105 ;; ## remove this someday | |
3106 (and byte-compile-depth | |
3107 (not (= (cdr (cdr tag)) byte-compile-depth)) | |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
3108 (error "Compiler bug: depth conflict at tag %d" (car (cdr tag)))) |
757 | 3109 (setq byte-compile-depth (cdr (cdr tag)))) |
3110 (setcdr (cdr tag) byte-compile-depth))) | |
3111 | |
3112 (defun byte-compile-goto (opcode tag) | |
3113 (setq byte-compile-output (cons (cons opcode tag) byte-compile-output)) | |
3114 (setcdr (cdr tag) (if (memq opcode byte-goto-always-pop-ops) | |
3115 (1- byte-compile-depth) | |
3116 byte-compile-depth)) | |
3117 (setq byte-compile-depth (and (not (eq opcode 'byte-goto)) | |
3118 (1- byte-compile-depth)))) | |
3119 | |
3120 (defun byte-compile-out (opcode offset) | |
3121 (setq byte-compile-output (cons (cons opcode offset) byte-compile-output)) | |
3122 (cond ((eq opcode 'byte-call) | |
3123 (setq byte-compile-depth (- byte-compile-depth offset))) | |
3124 ((eq opcode 'byte-return) | |
3125 ;; This is actually an unnecessary case, because there should be | |
3126 ;; no more opcodes behind byte-return. | |
3127 (setq byte-compile-depth nil)) | |
3128 (t | |
3129 (setq byte-compile-depth (+ byte-compile-depth | |
3130 (or (aref byte-stack+-info | |
3131 (symbol-value opcode)) | |
3132 (- (1- offset)))) | |
3133 byte-compile-maxdepth (max byte-compile-depth | |
3134 byte-compile-maxdepth)))) | |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
3135 ;;(if (< byte-compile-depth 0) (error "Compiler error: stack underflow")) |
757 | 3136 ) |
3137 | |
3138 | |
3139 ;;; call tree stuff | |
3140 | |
3141 (defun byte-compile-annotate-call-tree (form) | |
3142 (let (entry) | |
3143 ;; annotate the current call | |
3144 (if (setq entry (assq (car form) byte-compile-call-tree)) | |
3145 (or (memq byte-compile-current-form (nth 1 entry)) ;callers | |
3146 (setcar (cdr entry) | |
3147 (cons byte-compile-current-form (nth 1 entry)))) | |
3148 (setq byte-compile-call-tree | |
3149 (cons (list (car form) (list byte-compile-current-form) nil) | |
3150 byte-compile-call-tree))) | |
3151 ;; annotate the current function | |
3152 (if (setq entry (assq byte-compile-current-form byte-compile-call-tree)) | |
3153 (or (memq (car form) (nth 2 entry)) ;called | |
3154 (setcar (cdr (cdr entry)) | |
3155 (cons (car form) (nth 2 entry)))) | |
3156 (setq byte-compile-call-tree | |
3157 (cons (list byte-compile-current-form nil (list (car form))) | |
3158 byte-compile-call-tree))) | |
3159 )) | |
3160 | |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
3161 ;; Renamed from byte-compile-report-call-tree |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
3162 ;; to avoid interfering with completion of byte-compile-file. |
819
5bbabfcef929
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
784
diff
changeset
|
3163 ;;;###autoload |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
3164 (defun display-call-tree (&optional filename) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
3165 "Display a call graph of a specified file. |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
3166 This lists which functions have been called, what functions called |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
3167 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
|
3168 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
|
3169 all functions called by those functions. |
757 | 3170 |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
3171 The call graph does not include macros, inline functions, or |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
3172 primitives that the byte-code interpreter knows about directly \(eq, |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
3173 cons, etc.\). |
757 | 3174 |
3175 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
|
3176 \(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
|
3177 invoked interactively." |
757 | 3178 (interactive) |
3179 (message "Generating call tree...") | |
3180 (with-output-to-temp-buffer "*Call-Tree*" | |
3181 (set-buffer "*Call-Tree*") | |
3182 (erase-buffer) | |
10687
1bd70186f894
(byte-compile-file-form-defmumble, display-call-tree): Print ellipsis earlier,
Karl Heuer <kwzh@gnu.org>
parents:
10514
diff
changeset
|
3183 (message "Generating call tree... (sorting on %s)" |
757 | 3184 byte-compile-call-tree-sort) |
3185 (insert "Call tree for " | |
3186 (cond ((null byte-compile-current-file) (or filename "???")) | |
3187 ((stringp byte-compile-current-file) | |
3188 byte-compile-current-file) | |
3189 (t (buffer-name byte-compile-current-file))) | |
3190 " sorted on " | |
3191 (prin1-to-string byte-compile-call-tree-sort) | |
3192 ":\n\n") | |
3193 (if byte-compile-call-tree-sort | |
3194 (setq byte-compile-call-tree | |
3195 (sort byte-compile-call-tree | |
3196 (cond ((eq byte-compile-call-tree-sort 'callers) | |
3197 (function (lambda (x y) (< (length (nth 1 x)) | |
3198 (length (nth 1 y)))))) | |
3199 ((eq byte-compile-call-tree-sort 'calls) | |
3200 (function (lambda (x y) (< (length (nth 2 x)) | |
3201 (length (nth 2 y)))))) | |
3202 ((eq byte-compile-call-tree-sort 'calls+callers) | |
3203 (function (lambda (x y) (< (+ (length (nth 1 x)) | |
3204 (length (nth 2 x))) | |
3205 (+ (length (nth 1 y)) | |
3206 (length (nth 2 y))))))) | |
3207 ((eq byte-compile-call-tree-sort 'name) | |
3208 (function (lambda (x y) (string< (car x) | |
3209 (car y))))) | |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
3210 (t (error "`byte-compile-call-tree-sort': `%s' - unknown sort mode" |
757 | 3211 byte-compile-call-tree-sort)))))) |
3212 (message "Generating call tree...") | |
3213 (let ((rest byte-compile-call-tree) | |
3214 (b (current-buffer)) | |
3215 f p | |
3216 callers calls) | |
3217 (while rest | |
3218 (prin1 (car (car rest)) b) | |
3219 (setq callers (nth 1 (car rest)) | |
3220 calls (nth 2 (car rest))) | |
3221 (insert "\t" | |
3222 (cond ((not (fboundp (setq f (car (car rest))))) | |
3223 (if (null f) | |
3224 " <top level>";; shouldn't insert nil then, actually -sk | |
3225 " <not defined>")) | |
3226 ((subrp (setq f (symbol-function f))) | |
3227 " <subr>") | |
3228 ((symbolp f) | |
3229 (format " ==> %s" f)) | |
1819
df06a60f3362
* disass.el (disassemble): Add autoload cookie for this.
Jim Blandy <jimb@redhat.com>
parents:
1604
diff
changeset
|
3230 ((byte-code-function-p f) |
757 | 3231 "<compiled function>") |
3232 ((not (consp f)) | |
3233 "<malformed function>") | |
3234 ((eq 'macro (car f)) | |
1819
df06a60f3362
* disass.el (disassemble): Add autoload cookie for this.
Jim Blandy <jimb@redhat.com>
parents:
1604
diff
changeset
|
3235 (if (or (byte-code-function-p (cdr f)) |
757 | 3236 (assq 'byte-code (cdr (cdr (cdr f))))) |
3237 " <compiled macro>" | |
3238 " <macro>")) | |
3239 ((assq 'byte-code (cdr (cdr f))) | |
3240 "<compiled lambda>") | |
3241 ((eq 'lambda (car f)) | |
3242 "<function>") | |
3243 (t "???")) | |
3244 (format " (%d callers + %d calls = %d)" | |
3245 ;; Does the optimizer eliminate common subexpressions?-sk | |
3246 (length callers) | |
3247 (length calls) | |
3248 (+ (length callers) (length calls))) | |
3249 "\n") | |
3250 (if callers | |
3251 (progn | |
3252 (insert " called by:\n") | |
3253 (setq p (point)) | |
3254 (insert " " (if (car callers) | |
3255 (mapconcat 'symbol-name callers ", ") | |
3256 "<top level>")) | |
3257 (let ((fill-prefix " ")) | |
3258 (fill-region-as-paragraph p (point))))) | |
3259 (if calls | |
3260 (progn | |
3261 (insert " calls:\n") | |
3262 (setq p (point)) | |
3263 (insert " " (mapconcat 'symbol-name calls ", ")) | |
3264 (let ((fill-prefix " ")) | |
3265 (fill-region-as-paragraph p (point))))) | |
3266 (insert "\n") | |
3267 (setq rest (cdr rest))) | |
3268 | |
3269 (message "Generating call tree...(finding uncalled functions...)") | |
3270 (setq rest byte-compile-call-tree) | |
3271 (let ((uncalled nil)) | |
3272 (while rest | |
3273 (or (nth 1 (car rest)) | |
3274 (null (setq f (car (car rest)))) | |
3275 (byte-compile-fdefinition f t) | |
3276 (commandp (byte-compile-fdefinition f nil)) | |
3277 (setq uncalled (cons f uncalled))) | |
3278 (setq rest (cdr rest))) | |
3279 (if uncalled | |
3280 (let ((fill-prefix " ")) | |
3281 (insert "Noninteractive functions not known to be called:\n ") | |
3282 (setq p (point)) | |
3283 (insert (mapconcat 'symbol-name (nreverse uncalled) ", ")) | |
3284 (fill-region-as-paragraph p (point))))) | |
3285 ) | |
3286 (message "Generating call tree...done.") | |
3287 )) | |
3288 | |
3289 | |
3290 ;;; by crl@newton.purdue.edu | |
3291 ;;; Only works noninteractively. | |
819
5bbabfcef929
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
784
diff
changeset
|
3292 ;;;###autoload |
757 | 3293 (defun batch-byte-compile () |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
3294 "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
|
3295 Use this from the command line, with `-batch'; |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
3296 it won't work in an interactive Emacs. |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
3297 Each file is processed even if an error occurred previously. |
757 | 3298 For example, invoke \"emacs -batch -f batch-byte-compile $emacs/ ~/*.el\"" |
3299 ;; command-line-args-left is what is left of the command line (from startup.el) | |
3300 (defvar command-line-args-left) ;Avoid 'free variable' warning | |
3301 (if (not noninteractive) | |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
3302 (error "`batch-byte-compile' is to be used only with -batch")) |
757 | 3303 (let ((error nil)) |
3304 (while command-line-args-left | |
3305 (if (file-directory-p (expand-file-name (car command-line-args-left))) | |
3306 (let ((files (directory-files (car command-line-args-left))) | |
3307 source dest) | |
3308 (while files | |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
3309 (if (and (string-match emacs-lisp-file-regexp (car files)) |
757 | 3310 (not (auto-save-file-name-p (car files))) |
3311 (setq source (expand-file-name (car files) | |
3312 (car command-line-args-left))) | |
3313 (setq dest (byte-compile-dest-file source)) | |
3314 (file-exists-p dest) | |
3315 (file-newer-than-file-p source dest)) | |
3316 (if (null (batch-byte-compile-file source)) | |
3317 (setq error t))) | |
3318 (setq files (cdr files)))) | |
3319 (if (null (batch-byte-compile-file (car command-line-args-left))) | |
3320 (setq error t))) | |
3321 (setq command-line-args-left (cdr command-line-args-left))) | |
3322 (message "Done") | |
3323 (kill-emacs (if error 1 0)))) | |
3324 | |
3325 (defun batch-byte-compile-file (file) | |
3326 (condition-case err | |
18391
1ff0bfd40508
(byte-compile-file): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
18266
diff
changeset
|
3327 (byte-compile-file file) |
757 | 3328 (error |
3329 (message (if (cdr err) | |
3330 ">>Error occurred processing %s: %s (%s)" | |
3331 ">>Error occurred processing %s: %s") | |
3332 file | |
3333 (get (car err) 'error-message) | |
3334 (prin1-to-string (cdr err))) | |
3335 nil))) | |
3336 | |
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
|
3337 ;;;###autoload |
3653
974055b516d9
* bytecomp.el: Bring it up to version 2.10 of the
Jim Blandy <jimb@redhat.com>
parents:
3591
diff
changeset
|
3338 (defun batch-byte-recompile-directory () |
974055b516d9
* bytecomp.el: Bring it up to version 2.10 of the
Jim Blandy <jimb@redhat.com>
parents:
3591
diff
changeset
|
3339 "Runs `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
|
3340 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
|
3341 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
|
3342 ;; 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
|
3343 (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
|
3344 (if (not noninteractive) |
974055b516d9
* bytecomp.el: Bring it up to version 2.10 of the
Jim Blandy <jimb@redhat.com>
parents:
3591
diff
changeset
|
3345 (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
|
3346 (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
|
3347 (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
|
3348 (while 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
|
3349 (byte-recompile-directory (car 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
|
3350 (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
|
3351 (kill-emacs 0)) |
974055b516d9
* bytecomp.el: Bring it up to version 2.10 of the
Jim Blandy <jimb@redhat.com>
parents:
3591
diff
changeset
|
3352 |
757 | 3353 |
3354 (make-obsolete 'dot 'point) | |
3355 (make-obsolete 'dot-max 'point-max) | |
3356 (make-obsolete 'dot-min 'point-min) | |
3357 (make-obsolete 'dot-marker 'point-marker) | |
3358 | |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
3359 (make-obsolete 'buffer-flush-undo 'buffer-disable-undo) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
3360 (make-obsolete 'baud-rate "use the baud-rate variable instead") |
1819
df06a60f3362
* disass.el (disassemble): Add autoload cookie for this.
Jim Blandy <jimb@redhat.com>
parents:
1604
diff
changeset
|
3361 (make-obsolete 'compiled-function-p 'byte-code-function-p) |
16435
f91116721767
(define-function): Mark it as obsolete.
Richard M. Stallman <rms@gnu.org>
parents:
16274
diff
changeset
|
3362 (make-obsolete 'define-function 'defalias) |
958 | 3363 (make-obsolete-variable 'auto-fill-hook 'auto-fill-function) |
3364 (make-obsolete-variable 'blink-paren-hook 'blink-paren-function) | |
3365 (make-obsolete-variable 'lisp-indent-hook 'lisp-indent-function) | |
3366 (make-obsolete-variable 'temp-buffer-show-hook | |
3367 'temp-buffer-show-function) | |
3368 (make-obsolete-variable 'inhibit-local-variables | |
10372 | 3369 "use enable-local-variables (with the reversed sense).") |
1604
25173c1db5a6
* bytecomp.el: Declare unread-command-char an obsolete variable.
Jim Blandy <jimb@redhat.com>
parents:
1532
diff
changeset
|
3370 (make-obsolete-variable 'unread-command-char |
1819
df06a60f3362
* disass.el (disassemble): Add autoload cookie for this.
Jim Blandy <jimb@redhat.com>
parents:
1604
diff
changeset
|
3371 "use unread-command-events instead. That variable is a list of events to reread, so it now uses nil to mean `no event', instead of -1.") |
df06a60f3362
* disass.el (disassemble): Add autoload cookie for this.
Jim Blandy <jimb@redhat.com>
parents:
1604
diff
changeset
|
3372 (make-obsolete-variable 'unread-command-event |
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
|
3373 "use unread-command-events; which is a list of events rather than a single event.") |
2626
7ff77992fca0
* bytecomp.el (meta-flag): Declare this an obsolete variable.
Jim Blandy <jimb@redhat.com>
parents:
2566
diff
changeset
|
3374 (make-obsolete-variable 'suspend-hooks 'suspend-hook) |
2299
53abb56a18fa
* simple.el (comment-indent-function): New variable, intended to
Jim Blandy <jimb@redhat.com>
parents:
2217
diff
changeset
|
3375 (make-obsolete-variable 'comment-indent-hook 'comment-indent-function) |
2626
7ff77992fca0
* bytecomp.el (meta-flag): Declare this an obsolete variable.
Jim Blandy <jimb@redhat.com>
parents:
2566
diff
changeset
|
3376 (make-obsolete-variable 'meta-flag "Use the set-input-mode function instead.") |
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
|
3377 (make-obsolete-variable 'executing-macro 'executing-kbd-macro) |
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
|
3378 (make-obsolete-variable 'before-change-function |
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
|
3379 "use before-change-functions; which is a list of functions rather than a single function.") |
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
|
3380 (make-obsolete-variable 'after-change-function |
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
|
3381 "use after-change-functions; which is a list of functions rather than a single function.") |
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
|
3382 (make-obsolete-variable 'font-lock-doc-string-face 'font-lock-string-face) |
14766
aaaef422311b
(post-command-idle-hook, post-command-idle-delay): Mark obsolete.
Richard M. Stallman <rms@gnu.org>
parents:
14412
diff
changeset
|
3383 (make-obsolete-variable 'post-command-idle-hook |
aaaef422311b
(post-command-idle-hook, post-command-idle-delay): Mark obsolete.
Richard M. Stallman <rms@gnu.org>
parents:
14412
diff
changeset
|
3384 "use timers instead, with `run-with-idle-timer'.") |
aaaef422311b
(post-command-idle-hook, post-command-idle-delay): Mark obsolete.
Richard M. Stallman <rms@gnu.org>
parents:
14412
diff
changeset
|
3385 (make-obsolete-variable 'post-command-idle-delay |
aaaef422311b
(post-command-idle-hook, post-command-idle-delay): Mark obsolete.
Richard M. Stallman <rms@gnu.org>
parents:
14412
diff
changeset
|
3386 "use timers instead, with `run-with-idle-timer'.") |
757 | 3387 |
3388 (provide 'byte-compile) | |
5341
2f4fab6070b8
Provide bytecomp as well as byte-compile.
Richard M. Stallman <rms@gnu.org>
parents:
5283
diff
changeset
|
3389 (provide 'bytecomp) |
757 | 3390 |
3391 | |
3392 ;;; report metering (see the hacks in bytecode.c) | |
3393 | |
784
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
3394 (defun byte-compile-report-ops () |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
3395 (defvar byte-code-meter) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
3396 (with-output-to-temp-buffer "*Meter*" |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
3397 (set-buffer "*Meter*") |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
3398 (let ((i 0) n op off) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
3399 (while (< i 256) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
3400 (setq n (aref (aref byte-code-meter 0) i) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
3401 off nil) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
3402 (if t ;(not (zerop n)) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
3403 (progn |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
3404 (setq op i) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
3405 (setq off nil) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
3406 (cond ((< op byte-nth) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
3407 (setq off (logand op 7)) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
3408 (setq op (logand op 248))) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
3409 ((>= op byte-constant) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
3410 (setq off (- op byte-constant) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
3411 op byte-constant))) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
3412 (setq op (aref byte-code-vector op)) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
3413 (insert (format "%-4d" i)) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
3414 (insert (symbol-name op)) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
3415 (if off (insert " [" (int-to-string off) "]")) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
3416 (indent-to 40) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
3417 (insert (int-to-string n) "\n"))) |
6d993c174c62
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
757
diff
changeset
|
3418 (setq i (1+ i)))))) |
757 | 3419 |
3420 ;; To avoid "lisp nesting exceeds max-lisp-eval-depth" when bytecomp compiles | |
3421 ;; itself, compile some of its most used recursive functions (at load time). | |
3422 ;; | |
3423 (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
|
3424 (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
|
3425 (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
|
3426 (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
|
3427 (byte-compile-warnings nil)) |
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
|
3428 (mapcar '(lambda (x) |
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
|
3429 (or noninteractive (message "compiling %s..." x)) |
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
|
3430 (byte-compile x) |
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
|
3431 (or noninteractive (message "compiling %s...done" x))) |
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
|
3432 '(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
|
3433 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
|
3434 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
|
3435 ;; 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
|
3436 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
|
3437 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
|
3438 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
|
3439 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
|
3440 nil) |
819
5bbabfcef929
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
784
diff
changeset
|
3441 |
5bbabfcef929
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
784
diff
changeset
|
3442 ;;; bytecomp.el ends here |