Mercurial > hg > xemacs-beta
annotate lisp/bytecomp.el @ 5574:d4f334808463
Support inlining labels, bytecomp.el.
lisp/ChangeLog addition:
2011-10-02 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-initial-macro-environment):
Add #'declare to this, so it doesn't need to rely on
#'cl-compiling file to determine when we're byte-compiling.
Update #'labels to support declaring labels inline, as Common Lisp
requires.
* bytecomp.el (byte-compile-function-form):
Don't error if FUNCTION is quoting a non-lambda, non-symbol, just
return it.
* cl-extra.el (cl-macroexpand-all):
If a label name has been quoted, expand to the label placeholder
quoted with 'function. This allows the byte compiler to
distinguish between uses of the placeholder as data and uses in
contexts where it should be inlined.
* cl-macs.el:
* cl-macs.el (cl-do-proclaim):
When proclaming something as inline, if it is bound as a label,
don't modify the symbol's plist; instead, treat the first element
of its placeholder constant vector as a place to store compile
information.
* cl-macs.el (declare):
Leave processing declarations while compiling to the
implementation of #'declare in
byte-compile-initial-macro-environment.
tests/ChangeLog addition:
2011-10-02 Aidan Kehoe <kehoea@parhasard.net>
* automated/lisp-tests.el:
* automated/lisp-tests.el (+):
Test #'labels and inlining.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Sun, 02 Oct 2011 15:32:16 +0100 |
| parents | f0f1fd0d8486 |
| children | 89cb6a66a61f |
| rev | line source |
|---|---|
| 428 | 1 ;;; bytecomp.el --- compilation of Lisp code into byte code. |
| 2 | |
| 3 ;;; Copyright (C) 1985-1987, 1991-1994 Free Software Foundation, Inc. | |
| 4 ;;; Copyright (C) 1996 Ben Wing. | |
| 5 | |
| 442 | 6 ;; Authors: Jamie Zawinski <jwz@jwz.org> |
| 428 | 7 ;; Hallvard Furuseth <hbf@ulrik.uio.no> |
| 442 | 8 ;; Ben Wing <ben@xemacs.org> |
| 9 ;; Martin Buchholz <martin@xemacs.org> | |
| 10 ;; Richard Stallman <rms@gnu.org> | |
| 11 ;; Keywords: internal lisp | |
| 12 | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
13 (defconst byte-compile-version "2.28 XEmacs; 2009-08-09.") |
| 428 | 14 |
| 15 ;; This file is part of XEmacs. | |
| 16 | |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5269
diff
changeset
|
17 ;; XEmacs is free software: you can redistribute it and/or modify it |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5269
diff
changeset
|
18 ;; under the terms of the GNU General Public License as published by the |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5269
diff
changeset
|
19 ;; Free Software Foundation, either version 3 of the License, or (at your |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5269
diff
changeset
|
20 ;; option) any later version. |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5269
diff
changeset
|
21 |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5269
diff
changeset
|
22 ;; XEmacs is distributed in the hope that it will be useful, but WITHOUT |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5269
diff
changeset
|
23 ;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5269
diff
changeset
|
24 ;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5269
diff
changeset
|
25 ;; for more details. |
| 428 | 26 |
| 27 ;; You should have received a copy of the GNU General Public License | |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5269
diff
changeset
|
28 ;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>. |
| 428 | 29 |
| 30 ;;; Synched up with: FSF 19.30. | |
| 31 | |
| 32 ;;; Commentary: | |
| 33 | |
| 34 ;; The Emacs Lisp byte compiler. This crunches lisp source into a | |
| 442 | 35 ;; sort of p-code (`bytecode') which takes up less space and can be |
| 36 ;; interpreted faster. First, the source code forms are converted to | |
| 37 ;; an intermediate form, `lapcode' [`LAP' == `Lisp Assembly Program'] | |
| 38 ;; which is much easier to manipulate than bytecode. Then the lapcode | |
| 39 ;; is converted to bytecode, which can be considered to be actual | |
| 40 ;; machine language. Optimizations can occur at either the source | |
| 41 ;; level or the lapcode level. | |
| 42 | |
| 43 ;; The user entry points are byte-compile-file, | |
| 428 | 44 ;; byte-recompile-directory and byte-compile-buffer. |
| 45 | |
| 46 ;;; Code: | |
| 47 | |
| 48 ;;; ======================================================================== | |
| 49 ;;; Entry points: | |
| 50 ;;; byte-recompile-directory, byte-compile-file, | |
| 51 ;;; batch-byte-compile, batch-byte-recompile-directory, | |
| 52 ;;; byte-compile, compile-defun, | |
| 53 ;;; display-call-tree | |
| 54 ;;; RMS says: | |
| 55 ;;; (byte-compile-buffer and byte-compile-and-load-file were turned off | |
| 56 ;;; because they are not terribly useful and get in the way of completion.) | |
| 57 ;;; But I'm leaving them. --ben | |
| 58 | |
| 59 ;;; This version of the byte compiler has the following improvements: | |
| 60 ;;; + optimization of compiled code: | |
| 61 ;;; - removal of unreachable code; | |
| 62 ;;; - removal of calls to side-effectless functions whose return-value | |
| 63 ;;; is unused; | |
| 64 ;;; - compile-time evaluation of safe constant forms, such as (consp nil) | |
| 65 ;;; and (ash 1 6); | |
| 66 ;;; - open-coding of literal lambdas; | |
| 67 ;;; - peephole optimization of emitted code; | |
| 68 ;;; - trivial functions are left uncompiled for speed. | |
| 69 ;;; + support for inline functions; | |
| 70 ;;; + compile-time evaluation of arbitrary expressions; | |
| 71 ;;; + compile-time warning messages for: | |
| 72 ;;; - functions being redefined with incompatible arglists; | |
| 73 ;;; - functions being redefined as macros, or vice-versa; | |
| 74 ;;; - functions or macros defined multiple times in the same file; | |
| 75 ;;; - functions being called with the incorrect number of arguments; | |
| 76 ;;; - functions being called which are not defined globally, in the | |
| 77 ;;; file, or as autoloads; | |
| 78 ;;; - assignment and reference of undeclared free variables; | |
| 79 ;;; - various syntax errors; | |
| 80 ;;; + correct compilation of nested defuns, defmacros, defvars and defsubsts; | |
| 81 ;;; + correct compilation of top-level uses of macros; | |
| 82 ;;; + the ability to generate a histogram of functions called. | |
| 83 | |
| 84 ;;; User customization variables: | |
| 85 ;;; | |
| 86 ;;; byte-compile-verbose Whether to report the function currently being | |
| 87 ;;; compiled in the minibuffer; | |
| 88 ;;; byte-optimize Whether to do optimizations; this may be | |
| 89 ;;; t, nil, 'source, or 'byte; | |
| 90 ;;; byte-optimize-log Whether to report (in excruciating detail) | |
| 91 ;;; exactly which optimizations have been made. | |
| 92 ;;; This may be t, nil, 'source, or 'byte; | |
| 93 ;;; byte-compile-error-on-warn Whether to stop compilation when a warning is | |
| 94 ;;; produced; | |
| 95 ;;; byte-compile-delete-errors Whether the optimizer may delete calls or | |
| 96 ;;; variable references that are side-effect-free | |
| 97 ;;; except that they may return an error. | |
| 98 ;;; byte-compile-generate-call-tree Whether to generate a histogram of | |
| 99 ;;; function calls. This can be useful for | |
| 100 ;;; finding unused functions, as well as simple | |
| 101 ;;; performance metering. | |
| 102 ;;; byte-compile-warnings List of warnings to issue, or t. May contain | |
| 103 ;;; 'free-vars (references to variables not in the | |
| 104 ;;; current lexical scope) | |
| 105 ;;; 'unused-vars (non-global variables bound but | |
| 106 ;;; not referenced) | |
| 107 ;;; 'unresolved (calls to unknown functions) | |
| 108 ;;; 'callargs (lambda calls with args that don't | |
| 109 ;;; match the lambda's definition) | |
| 110 ;;; 'subr-callargs (calls to subrs with args that | |
| 111 ;;; don't match the subr's definition) | |
| 112 ;;; 'redefine (function cell redefined from | |
| 113 ;;; a macro to a lambda or vice versa, | |
| 114 ;;; or redefined to take other args) | |
| 115 ;;; 'obsolete (obsolete variables and functions) | |
| 116 ;;; 'pedantic (references to Emacs-compatible | |
| 117 ;;; symbols) | |
|
4719
bd51ab22afa8
Make it possible to silence warnings issued when #'mapcar's result is discarded.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4716
diff
changeset
|
118 ;;; 'discarded-consing (use of mapcar instead of |
|
bd51ab22afa8
Make it possible to silence warnings issued when #'mapcar's result is discarded.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4716
diff
changeset
|
119 ;;; mapc, and similar) |
|
bd51ab22afa8
Make it possible to silence warnings issued when #'mapcar's result is discarded.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4716
diff
changeset
|
120 ;;; 'quoted-lambda (quoting a lambda expression |
|
bd51ab22afa8
Make it possible to silence warnings issued when #'mapcar's result is discarded.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4716
diff
changeset
|
121 ;;; as data, not as a function, |
|
bd51ab22afa8
Make it possible to silence warnings issued when #'mapcar's result is discarded.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4716
diff
changeset
|
122 ;;; and using it in a function |
|
bd51ab22afa8
Make it possible to silence warnings issued when #'mapcar's result is discarded.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4716
diff
changeset
|
123 ;;; context ) |
| 428 | 124 ;;; emacs-lisp-file-regexp Regexp for the extension of source-files; |
| 444 | 125 ;;; see also the function `byte-compile-dest-file'. |
| 428 | 126 ;;; byte-compile-overwrite-file If nil, delete old .elc files before saving. |
| 127 ;;; | |
| 128 ;;; Most of the above parameters can also be set on a file-by-file basis; see | |
| 129 ;;; the documentation of the `byte-compiler-options' macro. | |
| 130 | |
| 131 ;;; New Features: | |
| 132 ;;; | |
| 133 ;;; o The form `defsubst' is just like `defun', except that the function | |
| 134 ;;; generated will be open-coded in compiled code which uses it. This | |
| 135 ;;; means that no function call will be generated, it will simply be | |
| 136 ;;; spliced in. Lisp functions calls are very slow, so this can be a | |
| 137 ;;; big win. | |
| 138 ;;; | |
| 139 ;;; You can generally accomplish the same thing with `defmacro', but in | |
| 140 ;;; that case, the defined procedure can't be used as an argument to | |
| 141 ;;; mapcar, etc. | |
| 142 ;;; | |
| 143 ;;; o You can make a given function be inline even if it has already been | |
| 144 ;;; defined with `defun' by using the `proclaim-inline' form like so: | |
| 145 ;;; (proclaim-inline my-function) | |
| 146 ;;; This is, in fact, exactly what `defsubst' does. To make a function no | |
| 147 ;;; longer be inline, you must use `proclaim-notinline'. Beware that if | |
| 148 ;;; you define a function with `defsubst' and later redefine it with | |
| 444 | 149 ;;; `defun', it will still be open-coded until you use `proclaim-notinline'. |
| 428 | 150 ;;; |
| 151 ;;; o You can also open-code one particular call to a function without | |
| 152 ;;; open-coding all calls. Use the 'inline' form to do this, like so: | |
| 153 ;;; | |
| 154 ;;; (inline (foo 1 2 3)) ;; `foo' will be open-coded | |
| 155 ;;; or... | |
| 156 ;;; (inline ;; `foo' and `baz' will be | |
| 157 ;;; (foo 1 2 3 (bar 5)) ;; open-coded, but `bar' will not. | |
| 158 ;;; (baz 0)) | |
| 159 ;;; | |
| 160 ;;; o It is possible to open-code a function in the same file it is defined | |
| 161 ;;; in without having to load that file before compiling it. the | |
| 162 ;;; byte-compiler has been modified to remember function definitions in | |
| 163 ;;; the compilation environment in the same way that it remembers macro | |
| 164 ;;; definitions. | |
| 165 ;;; | |
| 166 ;;; o Forms like ((lambda ...) ...) are open-coded. | |
| 167 ;;; | |
| 444 | 168 ;;; o The form `eval-when-compile' is like `progn', except that the body |
| 428 | 169 ;;; is evaluated at compile-time. When it appears at top-level, this |
| 170 ;;; is analogous to the Common Lisp idiom (eval-when (compile) ...). | |
| 171 ;;; When it does not appear at top-level, it is similar to the | |
| 172 ;;; Common Lisp #. reader macro (but not in interpreted code). | |
| 173 ;;; | |
| 444 | 174 ;;; o The form `eval-and-compile' is similar to `eval-when-compile', |
| 175 ;;; but the whole form is evalled both at compile-time and at run-time. | |
| 428 | 176 ;;; |
| 177 ;;; o The command M-x byte-compile-and-load-file does what you'd think. | |
| 178 ;;; | |
| 444 | 179 ;;; o The command `compile-defun' is analogous to `eval-defun'. |
| 428 | 180 ;;; |
| 444 | 181 ;;; o If you run `byte-compile-file' on a filename which is visited in a |
| 428 | 182 ;;; buffer, and that buffer is modified, you are asked whether you want |
| 183 ;;; to save the buffer before compiling. | |
| 184 ;;; | |
| 185 ;;; o You can add this to /etc/magic to make file(1) recognize the files | |
| 186 ;;; generated by this compiler: | |
| 187 ;;; | |
| 613 | 188 ;;; 0 string ;ELC XEmacs Lisp compiled file, |
| 428 | 189 ;;; >4 byte x version %d |
| 190 ;;; | |
| 191 ;;; TO DO: | |
| 192 ;;; | |
| 193 ;;; o Should implement declarations and proclamations, notably special, | |
| 194 ;;; unspecial, and ignore. Do this in such a way as to not break cl.el. | |
| 195 ;;; o The bound-but-not-used warnings are not issued for variables whose | |
| 196 ;;; bindings were established in the arglist, due to the lack of an | |
| 197 ;;; ignore declaration. Once ignore exists, this should be turned on. | |
| 198 ;;; o Warn about functions and variables defined but not used? | |
| 199 ;;; Maybe add some kind of `export' declaration for this? | |
| 200 ;;; (With interactive functions being automatically exported?) | |
| 201 ;;; o Any reference to a variable, even one which is a no-op, will cause | |
| 202 ;;; the warning not to be given. Possibly we could use the for-effect | |
| 203 ;;; flag to determine when this reference is useless; possibly more | |
| 204 ;;; complex flow analysis would be necessary. | |
| 205 ;;; o If the optimizer deletes a variable reference, we might be left with | |
| 206 ;;; a bound-but-not-referenced warning. Generally this is ok, but not if | |
| 207 ;;; it's a synergistic result of macroexpansion. Need some way to note | |
| 208 ;;; that a varref is being optimized away? Of course it would be nice to | |
| 209 ;;; optimize away the binding too, someday, but it's unsafe today. | |
| 210 ;;; o (See byte-optimize.el for the optimization TODO list.) | |
| 211 | |
| 212 (require 'backquote) | |
| 213 | |
| 214 (or (fboundp 'defsubst) | |
| 215 ;; This really ought to be loaded already! | |
| 216 (load-library "bytecomp-runtime")) | |
| 217 | |
| 444 | 218 (defvar emacs-lisp-file-regexp "\\.el$" |
| 428 | 219 "*Regexp which matches Emacs Lisp source files. |
| 220 You may want to redefine `byte-compile-dest-file' if you change this.") | |
| 221 | |
| 222 ;; This enables file name handlers such as jka-compr | |
| 223 ;; to remove parts of the file name that should not be copied | |
| 224 ;; through to the output file name. | |
| 225 (defun byte-compiler-base-file-name (filename) | |
| 226 (let ((handler (find-file-name-handler filename | |
| 227 'byte-compiler-base-file-name))) | |
| 228 (if handler | |
| 229 (funcall handler 'byte-compiler-base-file-name filename) | |
| 230 filename))) | |
| 231 | |
| 232 (unless (fboundp 'byte-compile-dest-file) | |
| 233 ;; The user may want to redefine this along with emacs-lisp-file-regexp, | |
| 234 ;; so only define it if it is undefined. | |
| 235 (defun byte-compile-dest-file (filename) | |
| 236 "Convert an Emacs Lisp source file name to a compiled file name." | |
| 237 (setq filename (byte-compiler-base-file-name filename)) | |
| 238 (setq filename (file-name-sans-versions filename)) | |
| 239 (if (string-match emacs-lisp-file-regexp filename) | |
| 240 (concat (substring filename 0 (match-beginning 0)) ".elc") | |
| 241 (concat filename ".elc")))) | |
| 242 | |
| 243 ;; This can be the 'byte-compile property of any symbol. | |
| 244 (autoload 'byte-compile-inline-expand "byte-optimize") | |
| 245 | |
| 246 ;; This is the entrypoint to the lapcode optimizer pass1. | |
| 247 (autoload 'byte-optimize-form "byte-optimize") | |
| 248 ;; This is the entrypoint to the lapcode optimizer pass2. | |
| 249 (autoload 'byte-optimize-lapcode "byte-optimize") | |
| 250 (autoload 'byte-compile-unfold-lambda "byte-optimize") | |
| 251 | |
| 252 ;; This is the entry point to the decompiler, which is used by the | |
| 253 ;; disassembler. The disassembler just requires 'byte-compile, but | |
| 254 ;; that doesn't define this function, so this seems to be a reasonable | |
| 255 ;; thing to do. | |
| 256 (autoload 'byte-decompile-bytecode "byte-optimize") | |
| 257 | |
| 258 (defvar byte-compile-verbose | |
| 259 (and (not noninteractive) (> (device-baud-rate) search-slow-speed)) | |
| 260 "*Non-nil means print messages describing progress of byte-compiler.") | |
| 261 | |
| 262 (defvar byte-compile-print-gensym t | |
| 263 "*Non-nil means generate code that creates unique symbols at run-time. | |
| 264 This is achieved by printing uninterned symbols using the `#:SYMBOL' | |
| 265 notation, so that they will be read uninterned when run. | |
| 266 | |
| 267 With this feature, code that uses uninterned symbols in macros will | |
|
5503
7b5946dbfb96
Drop support for generating code appropriate for Emacs 19, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5475
diff
changeset
|
268 not be runnable under pre-21.0 XEmacsen.") |
| 428 | 269 |
| 270 (defvar byte-optimize t | |
| 271 "*Enables optimization in the byte compiler. | |
| 272 nil means don't do any optimization. | |
| 273 t means do all optimizations. | |
| 274 `source' means do source-level optimizations only. | |
| 275 `byte' means do code-level optimizations only.") | |
| 276 | |
| 277 (defvar byte-compile-delete-errors t | |
| 278 "*If non-nil, the optimizer may delete forms that may signal an error. | |
| 279 This includes variable references and calls to functions such as `car'.") | |
| 280 | |
| 281 ;; XEmacs addition | |
| 282 (defvar byte-compile-new-bytecodes nil | |
| 283 "This is completely ignored. It is only around for backwards | |
| 284 compatibility.") | |
| 285 | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
286 (defvar byte-compile-checks-on-load '((featurep 'xemacs)) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
287 "A list of expressions to check when first loading a file. |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
288 Emacs will throw an error if any of them fail; checks will be made in |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
289 reverse order.") |
| 428 | 290 |
| 291 ;; FSF enables byte-compile-dynamic-docstrings but not byte-compile-dynamic | |
| 292 ;; by default. This would be a reasonable conservative approach except | |
| 293 ;; for the fact that if you enable either of these, you get incompatible | |
| 294 ;; byte code that can't be read by XEmacs 19.13 or before or FSF 19.28 or | |
| 295 ;; before. | |
| 296 ;; | |
| 297 ;; Therefore, neither is enabled for 19.14. Both are enabled for 20.0 | |
| 298 ;; because we have no reason to be conservative about changing the | |
| 299 ;; way things work. (Ben) | |
| 300 | |
| 301 ;; However, I don't think that defaulting byte-compile-dynamic to nil | |
| 302 ;; is a compatibility issue - rather it is a performance issue. | |
| 303 ;; Therefore I am setting byte-compile-dynamic back to nil. (mrb) | |
| 304 | |
| 305 (defvar byte-compile-dynamic nil | |
| 306 "*If non-nil, compile function bodies so they load lazily. | |
| 307 They are hidden comments in the compiled file, and brought into core when the | |
| 308 function is called. | |
| 309 | |
| 310 To enable this option, make it a file-local variable | |
| 311 in the source file you want it to apply to. | |
| 312 For example, add -*-byte-compile-dynamic: t;-*- on the first line. | |
| 313 | |
| 314 When this option is true, if you load the compiled file and then move it, | |
| 315 the functions you loaded will not be able to run.") | |
| 316 | |
| 317 (defvar byte-compile-dynamic-docstrings (emacs-version>= 20) | |
| 318 "*If non-nil, compile doc strings for lazy access. | |
| 319 We bury the doc strings of functions and variables | |
| 320 inside comments in the file, and bring them into core only when they | |
| 321 are actually needed. | |
| 322 | |
| 323 When this option is true, if you load the compiled file and then move it, | |
| 324 you won't be able to find the documentation of anything in that file. | |
| 325 | |
| 326 To disable this option for a certain file, make it a file-local variable | |
| 327 in the source file. For example, add this to the first line: | |
| 328 -*-byte-compile-dynamic-docstrings:nil;-*- | |
| 329 You can also set the variable globally. | |
| 330 | |
| 331 This option is enabled by default because it reduces Emacs memory usage.") | |
| 332 | |
| 333 (defvar byte-optimize-log nil | |
| 334 "*If true, the byte-compiler will log its optimizations into *Compile-Log*. | |
| 335 If this is 'source, then only source-level optimizations will be logged. | |
| 336 If it is 'byte, then only byte-level optimizations will be logged.") | |
| 337 | |
| 338 (defvar byte-compile-error-on-warn nil | |
| 339 "*If true, the byte-compiler reports warnings with `error'.") | |
| 340 | |
| 341 ;; byte-compile-warning-types in FSF. | |
| 342 (defvar byte-compile-default-warnings | |
|
4719
bd51ab22afa8
Make it possible to silence warnings issued when #'mapcar's result is discarded.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4716
diff
changeset
|
343 '(redefine callargs subr-callargs free-vars unresolved unused-vars obsolete |
|
bd51ab22afa8
Make it possible to silence warnings issued when #'mapcar's result is discarded.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4716
diff
changeset
|
344 discarded-consing quoted-lambda) |
| 428 | 345 "*The warnings used when byte-compile-warnings is t.") |
| 346 | |
| 347 (defvar byte-compile-warnings t | |
| 348 "*List of warnings that the compiler should issue (t for the default set). | |
| 349 Elements of the list may be: | |
| 350 | |
| 351 free-vars references to variables not in the current lexical scope. | |
| 352 unused-vars references to non-global variables bound but not referenced. | |
| 353 unresolved calls to unknown functions. | |
| 354 callargs lambda calls with args that don't match the definition. | |
| 355 subr-callargs calls to subrs with args that don't match the definition. | |
| 356 redefine function cell redefined from a macro to a lambda or vice | |
| 357 versa, or redefined to take a different number of arguments. | |
| 358 obsolete use of an obsolete function or variable. | |
| 359 pedantic warn of use of compatible symbols. | |
|
4719
bd51ab22afa8
Make it possible to silence warnings issued when #'mapcar's result is discarded.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4716
diff
changeset
|
360 discarded-consing |
|
bd51ab22afa8
Make it possible to silence warnings issued when #'mapcar's result is discarded.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4716
diff
changeset
|
361 calls to (some) functions that allocate memory, where that |
|
bd51ab22afa8
Make it possible to silence warnings issued when #'mapcar's result is discarded.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4716
diff
changeset
|
362 memory is immediately discarded; canonically, the use of |
|
bd51ab22afa8
Make it possible to silence warnings issued when #'mapcar's result is discarded.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4716
diff
changeset
|
363 mapcar instead of mapc |
|
bd51ab22afa8
Make it possible to silence warnings issued when #'mapcar's result is discarded.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4716
diff
changeset
|
364 quoted-lambda passing a lambda expression not quoted as a function, as a |
|
bd51ab22afa8
Make it possible to silence warnings issued when #'mapcar's result is discarded.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4716
diff
changeset
|
365 function argument |
| 428 | 366 |
| 367 The default set is specified by `byte-compile-default-warnings' and | |
| 368 normally encompasses all possible warnings. | |
| 369 | |
| 370 See also the macro `byte-compiler-options'.") | |
| 371 | |
| 372 (defvar byte-compile-generate-call-tree nil | |
| 373 "*Non-nil means collect call-graph information when compiling. | |
| 374 This records functions that were called and from where. | |
| 375 If the value is t, compilation displays the call graph when it finishes. | |
| 376 If the value is neither t nor nil, compilation asks you whether to display | |
| 377 the graph. | |
| 378 | |
| 379 The call tree only lists functions called, not macros used. Those functions | |
| 380 which the byte-code interpreter knows about directly (eq, cons, etc.) are | |
| 381 not reported. | |
| 382 | |
| 383 The call tree also lists those functions which are not known to be called | |
| 384 \(that is, to which no calls have been compiled). Functions which can be | |
| 385 invoked interactively are excluded from this list.") | |
| 386 | |
| 387 (defconst byte-compile-call-tree nil "Alist of functions and their call tree. | |
| 388 Each element looks like | |
| 389 | |
| 390 \(FUNCTION CALLERS CALLS\) | |
| 391 | |
| 392 where CALLERS is a list of functions that call FUNCTION, and CALLS | |
| 393 is a list of functions for which calls were generated while compiling | |
| 394 FUNCTION.") | |
| 395 | |
| 396 (defvar byte-compile-call-tree-sort 'name | |
| 397 "*If non-nil, sort the call tree. | |
| 398 The values `name', `callers', `calls', `calls+callers' | |
| 399 specify different fields to sort on.") | |
| 400 | |
| 401 (defvar byte-compile-overwrite-file t | |
| 402 "If nil, old .elc files are deleted before the new is saved, and .elc | |
| 403 files will have the same modes as the corresponding .el file. Otherwise, | |
| 404 existing .elc files will simply be overwritten, and the existing modes | |
| 405 will not be changed. If this variable is nil, then an .elc file which | |
| 406 is a symbolic link will be turned into a normal file, instead of the file | |
| 407 which the link points to being overwritten.") | |
| 408 | |
| 409 (defvar byte-recompile-directory-ignore-errors-p nil | |
| 410 "If true, then `byte-recompile-directory' will continue compiling even | |
| 411 when an error occurs in a file. This is bound to t by | |
| 412 `batch-byte-recompile-directory'.") | |
| 413 | |
| 502 | 414 (defvar byte-recompile-ignore-uncompilable-mule-files t |
| 415 "If non-nil, `byte-recompile-*' ignores non-ASCII .el files in a non-Mule | |
| 416 XEmacs. This assumes that such files have a -*- coding: ??? -*- magic | |
| 417 cookie in their first line or a ;;;###coding system: magic cookie | |
| 418 early in the file.") | |
| 419 | |
| 428 | 420 (defvar byte-recompile-directory-recursively t |
| 421 "*If true, then `byte-recompile-directory' will recurse on subdirectories.") | |
| 422 | |
| 423 (defvar byte-compile-constants nil | |
| 424 "list of all constants encountered during compilation of this form") | |
| 425 (defvar byte-compile-variables nil | |
| 426 "list of all variables encountered during compilation of this form") | |
| 427 (defvar byte-compile-bound-variables nil | |
| 428 "Alist of variables bound in the context of the current form, | |
| 429 that is, the current lexical environment. This list lives partly | |
| 430 on the specbind stack. The cdr of each cell is an integer bitmask.") | |
|
5391
f9dc75bdbdc4
Implement #'load-time-value less hackishly, by modifying the byte compiler.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5377
diff
changeset
|
431 (defvar byte-compile-output-preface nil |
|
f9dc75bdbdc4
Implement #'load-time-value less hackishly, by modifying the byte compiler.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5377
diff
changeset
|
432 "Form to output before current by `byte-compile-output-file-form' |
|
f9dc75bdbdc4
Implement #'load-time-value less hackishly, by modifying the byte compiler.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5377
diff
changeset
|
433 This is used for implementing `load-time-value'.") |
| 428 | 434 |
|
4623
a9f83990e6bf
Fix a byte compiler bug with characters above ?\xFF.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4539
diff
changeset
|
435 (defvar byte-compile-force-escape-quoted nil |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
436 "If t, `byte-compile-maybe-reset-coding' always chooses `escape-quoted' |
|
4623
a9f83990e6bf
Fix a byte compiler bug with characters above ?\xFF.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4539
diff
changeset
|
437 |
|
a9f83990e6bf
Fix a byte compiler bug with characters above ?\xFF.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4539
diff
changeset
|
438 This is for situations where the byte compiler output file needs to be |
|
a9f83990e6bf
Fix a byte compiler bug with characters above ?\xFF.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4539
diff
changeset
|
439 able to encode character values above ?\\xFF, but this cannot be |
|
a9f83990e6bf
Fix a byte compiler bug with characters above ?\xFF.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4539
diff
changeset
|
440 easily determined from the input file.") |
|
a9f83990e6bf
Fix a byte compiler bug with characters above ?\xFF.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4539
diff
changeset
|
441 |
| 428 | 442 (defconst byte-compile-referenced-bit 1) |
| 443 (defconst byte-compile-assigned-bit 2) | |
| 444 (defconst byte-compile-arglist-bit 4) | |
| 445 (defconst byte-compile-global-bit 8) | |
| 446 | |
| 447 (defvar byte-compile-free-references) | |
| 448 (defvar byte-compile-free-assignments) | |
| 449 | |
| 450 (defvar byte-compiler-error-flag) | |
| 451 | |
| 446 | 452 ;;; A form of eval that includes the currently defined macro definitions. |
| 453 ;;; This helps implement the promise made in the Lispref: | |
| 454 ;;; | |
| 455 ;;; "If a file being compiled contains a `defmacro' form, the macro is | |
| 456 ;;; defined temporarily for the rest of the compilation of that file." | |
| 457 (defun byte-compile-eval (form) | |
| 458 (let ((save-macro-environment nil)) | |
| 459 (unwind-protect | |
|
5503
7b5946dbfb96
Drop support for generating code appropriate for Emacs 19, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5475
diff
changeset
|
460 (loop |
|
7b5946dbfb96
Drop support for generating code appropriate for Emacs 19, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5475
diff
changeset
|
461 for (sym . def) in byte-compile-macro-environment |
|
7b5946dbfb96
Drop support for generating code appropriate for Emacs 19, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5475
diff
changeset
|
462 do (when (symbolp sym) |
|
7b5946dbfb96
Drop support for generating code appropriate for Emacs 19, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5475
diff
changeset
|
463 (push |
|
7b5946dbfb96
Drop support for generating code appropriate for Emacs 19, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5475
diff
changeset
|
464 (if (fboundp sym) |
|
7b5946dbfb96
Drop support for generating code appropriate for Emacs 19, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5475
diff
changeset
|
465 (cons sym (symbol-function sym)) |
|
7b5946dbfb96
Drop support for generating code appropriate for Emacs 19, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5475
diff
changeset
|
466 sym) |
|
7b5946dbfb96
Drop support for generating code appropriate for Emacs 19, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5475
diff
changeset
|
467 save-macro-environment) |
|
7b5946dbfb96
Drop support for generating code appropriate for Emacs 19, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5475
diff
changeset
|
468 (fset sym (cons 'macro def))) |
| 446 | 469 finally return (eval form)) |
| 470 (dolist (elt save-macro-environment) | |
| 471 (if (symbolp elt) | |
| 472 (fmakunbound elt) | |
| 473 (fset (car elt) (cdr elt))))))) | |
| 474 | |
|
5566
4654c01af32b
Improve the implementation, documentation of #'labels, #'flet.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5562
diff
changeset
|
475 (defvar for-effect) ; ## Kludge! This should be an arg, not a special. |
|
4654c01af32b
Improve the implementation, documentation of #'labels, #'flet.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5562
diff
changeset
|
476 |
| 428 | 477 (defconst byte-compile-initial-macro-environment |
|
5263
0d436a78c514
Add an implementation for #'the, cl-macs.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5182
diff
changeset
|
478 `((byte-compiler-options |
|
0d436a78c514
Add an implementation for #'the, cl-macs.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5182
diff
changeset
|
479 . ,#'(lambda (&rest forms) |
|
0d436a78c514
Add an implementation for #'the, cl-macs.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5182
diff
changeset
|
480 (apply 'byte-compiler-options-handler forms))) |
|
0d436a78c514
Add an implementation for #'the, cl-macs.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5182
diff
changeset
|
481 (eval-when-compile |
|
0d436a78c514
Add an implementation for #'the, cl-macs.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5182
diff
changeset
|
482 . ,#'(lambda (&rest body) |
|
0d436a78c514
Add an implementation for #'the, cl-macs.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5182
diff
changeset
|
483 (list 'quote (byte-compile-eval (cons 'progn body))))) |
|
0d436a78c514
Add an implementation for #'the, cl-macs.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5182
diff
changeset
|
484 (eval-and-compile |
|
0d436a78c514
Add an implementation for #'the, cl-macs.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5182
diff
changeset
|
485 . ,#'(lambda (&rest body) |
|
0d436a78c514
Add an implementation for #'the, cl-macs.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5182
diff
changeset
|
486 (byte-compile-eval (cons 'progn body)) |
|
0d436a78c514
Add an implementation for #'the, cl-macs.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5182
diff
changeset
|
487 (cons 'progn body))) |
|
0d436a78c514
Add an implementation for #'the, cl-macs.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5182
diff
changeset
|
488 (the . |
|
5269
90a0084b3541
Rephrase the #'the docstring, make it nicer while byte-compiling.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5265
diff
changeset
|
489 ,#'(lambda (type form) |
|
5282
dcc34e28cd84
Warn at byte-compile in #'the if FORM constant & not TYPE; fix byte-compile-constp
Aidan Kehoe <kehoea@parhasard.net>
parents:
5269
diff
changeset
|
490 (if (cl-const-expr-p form) |
|
dcc34e28cd84
Warn at byte-compile in #'the if FORM constant & not TYPE; fix byte-compile-constp
Aidan Kehoe <kehoea@parhasard.net>
parents:
5269
diff
changeset
|
491 (or (eval (cl-make-type-test form type)) |
|
dcc34e28cd84
Warn at byte-compile in #'the if FORM constant & not TYPE; fix byte-compile-constp
Aidan Kehoe <kehoea@parhasard.net>
parents:
5269
diff
changeset
|
492 (byte-compile-warn |
|
dcc34e28cd84
Warn at byte-compile in #'the if FORM constant & not TYPE; fix byte-compile-constp
Aidan Kehoe <kehoea@parhasard.net>
parents:
5269
diff
changeset
|
493 "%s is not of type %s" form type))) |
|
5263
0d436a78c514
Add an implementation for #'the, cl-macs.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5182
diff
changeset
|
494 (if byte-compile-delete-errors |
|
5269
90a0084b3541
Rephrase the #'the docstring, make it nicer while byte-compiling.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5265
diff
changeset
|
495 form |
|
5562
855b667dea13
Drop cl-macro-environment in favour of byte-compile-macro-environment.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5560
diff
changeset
|
496 (funcall (cdr (symbol-function 'the)) type form)))) |
|
5574
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
497 (declare |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
498 . ,#'(lambda (&rest specs) |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
499 (while specs |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
500 (if (listp cl-declare-stack) (push (car specs) cl-declare-stack)) |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
501 (cl-do-proclaim (pop specs) nil)))) |
|
5562
855b667dea13
Drop cl-macro-environment in favour of byte-compile-macro-environment.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5560
diff
changeset
|
502 (load-time-value |
|
855b667dea13
Drop cl-macro-environment in favour of byte-compile-macro-environment.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5560
diff
changeset
|
503 . ,#'(lambda (form &optional read-only) |
|
855b667dea13
Drop cl-macro-environment in favour of byte-compile-macro-environment.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5560
diff
changeset
|
504 (let* ((gensym (gensym)) |
|
855b667dea13
Drop cl-macro-environment in favour of byte-compile-macro-environment.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5560
diff
changeset
|
505 (byte-compile-bound-variables |
|
855b667dea13
Drop cl-macro-environment in favour of byte-compile-macro-environment.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5560
diff
changeset
|
506 (acons gensym byte-compile-global-bit |
|
855b667dea13
Drop cl-macro-environment in favour of byte-compile-macro-environment.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5560
diff
changeset
|
507 byte-compile-bound-variables))) |
|
855b667dea13
Drop cl-macro-environment in favour of byte-compile-macro-environment.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5560
diff
changeset
|
508 (setq byte-compile-output-preface |
|
855b667dea13
Drop cl-macro-environment in favour of byte-compile-macro-environment.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5560
diff
changeset
|
509 (byte-compile-top-level |
|
855b667dea13
Drop cl-macro-environment in favour of byte-compile-macro-environment.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5560
diff
changeset
|
510 `(progn (setq ,gensym ,form) ,byte-compile-output-preface) |
|
855b667dea13
Drop cl-macro-environment in favour of byte-compile-macro-environment.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5560
diff
changeset
|
511 t 'file)) |
|
855b667dea13
Drop cl-macro-environment in favour of byte-compile-macro-environment.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5560
diff
changeset
|
512 `(symbol-value ',gensym)))) |
|
855b667dea13
Drop cl-macro-environment in favour of byte-compile-macro-environment.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5560
diff
changeset
|
513 (labels |
|
855b667dea13
Drop cl-macro-environment in favour of byte-compile-macro-environment.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5560
diff
changeset
|
514 . ,#'(lambda (bindings &rest body) |
|
5566
4654c01af32b
Improve the implementation, documentation of #'labels, #'flet.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5562
diff
changeset
|
515 (let* ((names (mapcar 'car bindings)) |
|
4654c01af32b
Improve the implementation, documentation of #'labels, #'flet.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5562
diff
changeset
|
516 (lambdas (mapcar |
|
4654c01af32b
Improve the implementation, documentation of #'labels, #'flet.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5562
diff
changeset
|
517 (function* |
|
4654c01af32b
Improve the implementation, documentation of #'labels, #'flet.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5562
diff
changeset
|
518 (lambda ((name . definition)) |
|
4654c01af32b
Improve the implementation, documentation of #'labels, #'flet.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5562
diff
changeset
|
519 (cons 'lambda (cdr (cl-transform-lambda |
|
4654c01af32b
Improve the implementation, documentation of #'labels, #'flet.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5562
diff
changeset
|
520 definition name))))) |
|
4654c01af32b
Improve the implementation, documentation of #'labels, #'flet.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5562
diff
changeset
|
521 bindings)) |
|
5562
855b667dea13
Drop cl-macro-environment in favour of byte-compile-macro-environment.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5560
diff
changeset
|
522 (placeholders |
|
5566
4654c01af32b
Improve the implementation, documentation of #'labels, #'flet.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5562
diff
changeset
|
523 (mapcar #'(lambda (lambda) |
|
4654c01af32b
Improve the implementation, documentation of #'labels, #'flet.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5562
diff
changeset
|
524 (make-byte-code (second lambda) "\xc0\x87" |
|
5574
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
525 ;; This list is used for |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
526 ;; the byte-optimize |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
527 ;; property, if the |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
528 ;; function is to be |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
529 ;; inlined. See |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
530 ;; cl-do-proclaim. |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
531 (vector nil) 1)) |
|
5566
4654c01af32b
Improve the implementation, documentation of #'labels, #'flet.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5562
diff
changeset
|
532 lambdas)) |
|
5562
855b667dea13
Drop cl-macro-environment in favour of byte-compile-macro-environment.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5560
diff
changeset
|
533 (byte-compile-macro-environment |
|
5566
4654c01af32b
Improve the implementation, documentation of #'labels, #'flet.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5562
diff
changeset
|
534 (pairlis names (mapcar |
|
4654c01af32b
Improve the implementation, documentation of #'labels, #'flet.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5562
diff
changeset
|
535 #'(lambda (placeholder) |
|
4654c01af32b
Improve the implementation, documentation of #'labels, #'flet.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5562
diff
changeset
|
536 `(lambda (&rest cl-labels-args) |
|
5574
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
537 ;; Be careful not to quote |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
538 ;; PLACEHOLDER, otherwise |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
539 ;; byte-optimize-funcall inlines |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
540 ;; it. |
|
5566
4654c01af32b
Improve the implementation, documentation of #'labels, #'flet.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5562
diff
changeset
|
541 (list* 'funcall ,placeholder |
|
4654c01af32b
Improve the implementation, documentation of #'labels, #'flet.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5562
diff
changeset
|
542 cl-labels-args))) |
|
4654c01af32b
Improve the implementation, documentation of #'labels, #'flet.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5562
diff
changeset
|
543 placeholders) |
|
4654c01af32b
Improve the implementation, documentation of #'labels, #'flet.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5562
diff
changeset
|
544 byte-compile-macro-environment)) |
|
4654c01af32b
Improve the implementation, documentation of #'labels, #'flet.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5562
diff
changeset
|
545 (gensym (gensym))) |
|
5574
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
546 (labels |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
547 ((byte-compile-transform-labels (form names lambdas |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
548 placeholders) |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
549 (let* ((inline |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
550 (mapcan |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
551 #'(lambda (name placeholder lambda) |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
552 (and |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
553 (eq |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
554 (getf (aref |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
555 (compiled-function-constants |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
556 placeholder) 0) |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
557 'byte-optimizer) |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
558 'byte-compile-inline-expand) |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
559 `(((function ,placeholder) |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
560 ,(byte-compile-lambda lambda) |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
561 (function ,lambda))))) |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
562 names placeholders lambdas)) |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
563 (compiled |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
564 (mapcar #'byte-compile-lambda |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
565 (if (not inline) |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
566 lambdas |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
567 ;; See further down for the |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
568 ;; rationale of the sublis calls. |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
569 (sublis (pairlis |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
570 (mapcar #'cadar inline) |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
571 (mapcar #'third inline)) |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
572 (sublis |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
573 (pairlis |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
574 (mapcar #'car inline) |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
575 (mapcar #'second inline)) |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
576 lambdas :test #'equal) |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
577 :test #'eq)))) |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
578 elt) |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
579 (mapc #'(lambda (placeholder function) |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
580 (nsubst function placeholder compiled |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
581 :test #'eq |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
582 :descend-structures t)) |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
583 placeholders compiled) |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
584 (when inline |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
585 (dolist (triad inline) |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
586 (nsubst (setq elt (elt compiled |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
587 (position (cadar triad) |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
588 placeholders))) |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
589 (second triad) compiled :test #'eq |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
590 :descend-structures t) |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
591 (setf (second triad) elt)) |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
592 ;; For inlined labels: first, replace uses of |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
593 ;; the placeholder in places where it's not an |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
594 ;; evident, explicit funcall (that is, where |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
595 ;; it is not to be inlined) with the compiled |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
596 ;; function: |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
597 (setq form (sublis |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
598 (pairlis (mapcar #'car inline) |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
599 (mapcar #'second inline)) |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
600 form :test #'equal) |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
601 ;; Now replace uses of the placeholder |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
602 ;; where it is an evident funcall with the |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
603 ;; lambda, quoted as a function, to allow |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
604 ;; byte-optimize-funcall to do its |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
605 ;; thing. Note that the lambdas still have |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
606 ;; the placeholders, so there's no risk |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
607 ;; of recursive inlining. |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
608 form (sublis (pairlis |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
609 (mapcar #'cadar inline) |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
610 (mapcar #'third inline)) |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
611 form :test #'eq))) |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
612 (sublis (pairlis placeholders compiled) form |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
613 :test #'eq)))) |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
614 (put gensym 'byte-compile |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
615 #'(lambda (form) |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
616 (let* ((names (cadr (cl-pop2 form))) |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
617 (lambdas (mapcar #'cadr (cdr (pop form)))) |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
618 (placeholders (cadr (pop form)))) |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
619 (byte-compile-body-do-effect |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
620 (byte-compile-transform-labels form names |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
621 lambdas |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
622 placeholders))))) |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
623 (put gensym 'byte-hunk-handler |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
624 #'(lambda (form) |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
625 (let* ((names (cadr (cl-pop2 form))) |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
626 (lambdas (mapcar #'cadr (cdr (pop form)))) |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
627 (placeholders (cadr (pop form)))) |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
628 (byte-compile-file-form |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
629 (cons 'progn |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
630 (byte-compile-transform-labels |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
631 form names lambdas placeholders)))))) |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
632 (cl-macroexpand-all `(,gensym ',names (list ,@lambdas) |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
633 ',placeholders ,@body) |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
634 byte-compile-macro-environment))))) |
|
5566
4654c01af32b
Improve the implementation, documentation of #'labels, #'flet.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5562
diff
changeset
|
635 (flet . |
|
4654c01af32b
Improve the implementation, documentation of #'labels, #'flet.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5562
diff
changeset
|
636 ,#'(lambda (bindings &rest body) |
|
4654c01af32b
Improve the implementation, documentation of #'labels, #'flet.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5562
diff
changeset
|
637 (let* ((names (mapcar 'car bindings)) |
|
4654c01af32b
Improve the implementation, documentation of #'labels, #'flet.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5562
diff
changeset
|
638 (lambdas (mapcar |
|
4654c01af32b
Improve the implementation, documentation of #'labels, #'flet.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5562
diff
changeset
|
639 (function* |
|
4654c01af32b
Improve the implementation, documentation of #'labels, #'flet.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5562
diff
changeset
|
640 (lambda ((function . definition)) |
|
4654c01af32b
Improve the implementation, documentation of #'labels, #'flet.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5562
diff
changeset
|
641 (cons 'lambda (cdr (cl-transform-lambda |
|
4654c01af32b
Improve the implementation, documentation of #'labels, #'flet.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5562
diff
changeset
|
642 definition function))))) |
|
4654c01af32b
Improve the implementation, documentation of #'labels, #'flet.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5562
diff
changeset
|
643 bindings)) |
|
4654c01af32b
Improve the implementation, documentation of #'labels, #'flet.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5562
diff
changeset
|
644 (gensym (gensym))) |
|
4654c01af32b
Improve the implementation, documentation of #'labels, #'flet.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5562
diff
changeset
|
645 (put gensym 'byte-compile-flet-environment |
|
4654c01af32b
Improve the implementation, documentation of #'labels, #'flet.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5562
diff
changeset
|
646 (pairlis names lambdas)) |
|
4654c01af32b
Improve the implementation, documentation of #'labels, #'flet.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5562
diff
changeset
|
647 (put gensym 'byte-compile |
|
4654c01af32b
Improve the implementation, documentation of #'labels, #'flet.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5562
diff
changeset
|
648 #'(lambda (form) |
|
4654c01af32b
Improve the implementation, documentation of #'labels, #'flet.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5562
diff
changeset
|
649 (let* ((byte-compile-flet-environment |
|
4654c01af32b
Improve the implementation, documentation of #'labels, #'flet.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5562
diff
changeset
|
650 (get (car form) 'byte-compile-flet-environment)) |
|
4654c01af32b
Improve the implementation, documentation of #'labels, #'flet.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5562
diff
changeset
|
651 (byte-compile-function-environment |
|
4654c01af32b
Improve the implementation, documentation of #'labels, #'flet.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5562
diff
changeset
|
652 (append byte-compile-flet-environment |
|
4654c01af32b
Improve the implementation, documentation of #'labels, #'flet.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5562
diff
changeset
|
653 byte-compile-function-environment)) |
|
4654c01af32b
Improve the implementation, documentation of #'labels, #'flet.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5562
diff
changeset
|
654 name) |
|
4654c01af32b
Improve the implementation, documentation of #'labels, #'flet.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5562
diff
changeset
|
655 (dolist (acons byte-compile-flet-environment) |
|
4654c01af32b
Improve the implementation, documentation of #'labels, #'flet.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5562
diff
changeset
|
656 (setq name (car acons)) |
|
4654c01af32b
Improve the implementation, documentation of #'labels, #'flet.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5562
diff
changeset
|
657 (if (and (memq 'redefine byte-compile-warnings) |
|
4654c01af32b
Improve the implementation, documentation of #'labels, #'flet.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5562
diff
changeset
|
658 (or (cdr |
|
4654c01af32b
Improve the implementation, documentation of #'labels, #'flet.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5562
diff
changeset
|
659 (assq name |
|
4654c01af32b
Improve the implementation, documentation of #'labels, #'flet.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5562
diff
changeset
|
660 byte-compile-macro-environment)) |
|
4654c01af32b
Improve the implementation, documentation of #'labels, #'flet.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5562
diff
changeset
|
661 (eq 'macro |
|
4654c01af32b
Improve the implementation, documentation of #'labels, #'flet.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5562
diff
changeset
|
662 (ignore-errors |
|
4654c01af32b
Improve the implementation, documentation of #'labels, #'flet.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5562
diff
changeset
|
663 (car (symbol-function name)))))) |
|
4654c01af32b
Improve the implementation, documentation of #'labels, #'flet.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5562
diff
changeset
|
664 ;; XEmacs change; this is a warning, not an |
|
4654c01af32b
Improve the implementation, documentation of #'labels, #'flet.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5562
diff
changeset
|
665 ;; error. The only use case for #'flet instead |
|
4654c01af32b
Improve the implementation, documentation of #'labels, #'flet.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5562
diff
changeset
|
666 ;; of #'labels is to shadow a dynamically |
|
4654c01af32b
Improve the implementation, documentation of #'labels, #'flet.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5562
diff
changeset
|
667 ;; bound function at runtime, and it's |
|
4654c01af32b
Improve the implementation, documentation of #'labels, #'flet.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5562
diff
changeset
|
668 ;; reasonable to do this even if that symbol |
|
4654c01af32b
Improve the implementation, documentation of #'labels, #'flet.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5562
diff
changeset
|
669 ;; has a macro binding at compile time. |
|
4654c01af32b
Improve the implementation, documentation of #'labels, #'flet.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5562
diff
changeset
|
670 (byte-compile-warn |
|
4654c01af32b
Improve the implementation, documentation of #'labels, #'flet.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5562
diff
changeset
|
671 "flet: redefining macro %s as a function" |
|
4654c01af32b
Improve the implementation, documentation of #'labels, #'flet.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5562
diff
changeset
|
672 name)) |
|
4654c01af32b
Improve the implementation, documentation of #'labels, #'flet.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5562
diff
changeset
|
673 (if (get name 'byte-opcode) |
|
4654c01af32b
Improve the implementation, documentation of #'labels, #'flet.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5562
diff
changeset
|
674 (byte-compile-warn |
|
4654c01af32b
Improve the implementation, documentation of #'labels, #'flet.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5562
diff
changeset
|
675 "flet: %s has a byte code, consider #'labels" |
|
4654c01af32b
Improve the implementation, documentation of #'labels, #'flet.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5562
diff
changeset
|
676 name)) |
|
4654c01af32b
Improve the implementation, documentation of #'labels, #'flet.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5562
diff
changeset
|
677 (if (get name 'byte-compile) |
|
4654c01af32b
Improve the implementation, documentation of #'labels, #'flet.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5562
diff
changeset
|
678 (byte-compile-warn |
|
4654c01af32b
Improve the implementation, documentation of #'labels, #'flet.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5562
diff
changeset
|
679 "flet: %s has a byte-compile method, |
|
4654c01af32b
Improve the implementation, documentation of #'labels, #'flet.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5562
diff
changeset
|
680 consider #'labels" name))) |
|
4654c01af32b
Improve the implementation, documentation of #'labels, #'flet.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5562
diff
changeset
|
681 (byte-compile-form (second form))))) |
|
4654c01af32b
Improve the implementation, documentation of #'labels, #'flet.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5562
diff
changeset
|
682 `(,gensym (letf* ,(mapcar* #'(lambda (name lambda) |
|
4654c01af32b
Improve the implementation, documentation of #'labels, #'flet.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5562
diff
changeset
|
683 `((symbol-function ',name) |
|
4654c01af32b
Improve the implementation, documentation of #'labels, #'flet.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5562
diff
changeset
|
684 ,lambda)) names lambdas) |
|
4654c01af32b
Improve the implementation, documentation of #'labels, #'flet.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5562
diff
changeset
|
685 ,@body)))))) |
|
4654c01af32b
Improve the implementation, documentation of #'labels, #'flet.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5562
diff
changeset
|
686 |
| 428 | 687 "The default macro-environment passed to macroexpand by the compiler. |
| 688 Placing a macro here will cause a macro to have different semantics when | |
| 689 expanded by the compiler as when expanded by the interpreter.") | |
| 690 | |
| 691 (defvar byte-compile-function-environment nil | |
| 692 "Alist of functions defined in the file being compiled. | |
| 693 This is so we can inline them when necessary. | |
| 694 Each element looks like (FUNCTIONNAME . DEFINITION). It is | |
| 695 \(FUNCTIONNAME . nil) when a function is redefined as a macro.") | |
| 696 | |
| 697 (defvar byte-compile-autoload-environment nil | |
| 698 "Alist of functions and macros defined by autoload in the file being compiled. | |
| 699 This is so we can suppress warnings about calls to these functions, even though | |
| 700 they do not have `real' definitions. | |
| 701 Each element looks like (FUNCTIONNAME . CALL-TO-AUTOLOAD).") | |
| 702 | |
| 703 (defvar byte-compile-unresolved-functions nil | |
| 704 "Alist of undefined functions to which calls have been compiled (used for | |
| 705 warnings when the function is later defined with incorrect args).") | |
| 706 | |
| 707 (defvar byte-compile-file-domain) ; domain of file being compiled | |
| 708 | |
| 709 (defvar byte-compile-tag-number 0) | |
| 710 (defvar byte-compile-output nil | |
| 711 "Alist describing contents to put in byte code string. | |
| 712 Each element is (INDEX . VALUE)") | |
| 713 (defvar byte-compile-depth 0 "Current depth of execution stack.") | |
| 714 (defvar byte-compile-maxdepth 0 "Maximum depth of execution stack.") | |
| 715 | |
| 716 | |
| 717 ;;; The byte codes; this information is duplicated in bytecode.c | |
| 718 | |
| 719 (defconst byte-code-vector nil | |
| 720 "An array containing byte-code names indexed by byte-code values.") | |
| 721 | |
| 722 (defconst byte-stack+-info nil | |
| 723 "An array with the stack adjustment for each byte-code.") | |
| 724 | |
| 725 (defmacro byte-defop (opcode stack-adjust opname &optional docstring) | |
| 726 ;; This is a speed-hack for building the byte-code-vector at compile-time. | |
| 727 ;; We fill in the vector at macroexpand-time, and then after the last call | |
| 728 ;; to byte-defop, we write the vector out as a constant instead of writing | |
| 729 ;; out a bunch of calls to aset. | |
| 730 ;; Actually, we don't fill in the vector itself, because that could make | |
| 731 ;; it problematic to compile big changes to this compiler; we store the | |
| 732 ;; values on its plist, and remove them later in -extrude. | |
| 733 (let ((v1 (or (get 'byte-code-vector 'tmp-compile-time-value) | |
| 734 (put 'byte-code-vector 'tmp-compile-time-value | |
| 735 (make-vector 256 nil)))) | |
| 736 (v2 (or (get 'byte-stack+-info 'tmp-compile-time-value) | |
| 737 (put 'byte-stack+-info 'tmp-compile-time-value | |
| 738 (make-vector 256 nil))))) | |
| 739 (aset v1 opcode opname) | |
| 740 (aset v2 opcode stack-adjust)) | |
| 741 (if docstring | |
| 742 (list 'defconst opname opcode (concat "Byte code opcode " docstring ".")) | |
| 743 (list 'defconst opname opcode))) | |
| 744 | |
| 745 (defmacro byte-extrude-byte-code-vectors () | |
| 746 (prog1 (list 'setq 'byte-code-vector | |
| 747 (get 'byte-code-vector 'tmp-compile-time-value) | |
| 748 'byte-stack+-info | |
| 749 (get 'byte-stack+-info 'tmp-compile-time-value)) | |
| 750 (remprop 'byte-code-vector 'tmp-compile-time-value) | |
| 751 (remprop 'byte-stack+-info 'tmp-compile-time-value))) | |
| 752 | |
| 753 | |
| 754 ;; unused: 0-7 | |
| 755 | |
| 756 ;; These opcodes are special in that they pack their argument into the | |
| 757 ;; opcode word. | |
| 758 ;; | |
| 759 (byte-defop 8 1 byte-varref "for variable reference") | |
| 760 (byte-defop 16 -1 byte-varset "for setting a variable") | |
| 761 (byte-defop 24 -1 byte-varbind "for binding a variable") | |
| 762 (byte-defop 32 0 byte-call "for calling a function") | |
| 763 (byte-defop 40 0 byte-unbind "for unbinding special bindings") | |
| 764 ;; codes 8-47 are consumed by the preceding opcodes | |
| 765 | |
| 766 ;; unused: 48-55 | |
| 767 | |
| 768 (byte-defop 56 -1 byte-nth) | |
| 769 (byte-defop 57 0 byte-symbolp) | |
| 770 (byte-defop 58 0 byte-consp) | |
| 771 (byte-defop 59 0 byte-stringp) | |
| 772 (byte-defop 60 0 byte-listp) | |
| 773 (byte-defop 61 -1 byte-old-eq) | |
| 774 (byte-defop 62 -1 byte-old-memq) | |
| 775 (byte-defop 63 0 byte-not) | |
| 776 (byte-defop 64 0 byte-car) | |
| 777 (byte-defop 65 0 byte-cdr) | |
| 778 (byte-defop 66 -1 byte-cons) | |
| 779 (byte-defop 67 0 byte-list1) | |
| 780 (byte-defop 68 -1 byte-list2) | |
| 781 (byte-defop 69 -2 byte-list3) | |
| 782 (byte-defop 70 -3 byte-list4) | |
| 783 (byte-defop 71 0 byte-length) | |
| 784 (byte-defop 72 -1 byte-aref) | |
| 785 (byte-defop 73 -2 byte-aset) | |
| 786 (byte-defop 74 0 byte-symbol-value) | |
| 787 (byte-defop 75 0 byte-symbol-function) ; this was commented out | |
| 788 (byte-defop 76 -1 byte-set) | |
| 789 (byte-defop 77 -1 byte-fset) ; this was commented out | |
| 790 (byte-defop 78 -1 byte-get) | |
|
5089
99f8ebc082d9
Make #'substring an alias of #'subseq; give the latter the byte code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4996
diff
changeset
|
791 (byte-defop 79 -2 byte-subseq) |
| 428 | 792 (byte-defop 80 -1 byte-concat2) |
| 793 (byte-defop 81 -2 byte-concat3) | |
| 794 (byte-defop 82 -3 byte-concat4) | |
| 795 (byte-defop 83 0 byte-sub1) | |
| 796 (byte-defop 84 0 byte-add1) | |
| 797 (byte-defop 85 -1 byte-eqlsign) | |
| 798 (byte-defop 86 -1 byte-gtr) | |
| 799 (byte-defop 87 -1 byte-lss) | |
| 800 (byte-defop 88 -1 byte-leq) | |
| 801 (byte-defop 89 -1 byte-geq) | |
| 802 (byte-defop 90 -1 byte-diff) | |
| 803 (byte-defop 91 0 byte-negate) | |
| 804 (byte-defop 92 -1 byte-plus) | |
| 805 (byte-defop 93 -1 byte-max) | |
| 806 (byte-defop 94 -1 byte-min) | |
| 807 (byte-defop 95 -1 byte-mult) | |
| 808 (byte-defop 96 1 byte-point) | |
| 809 (byte-defop 97 -1 byte-eq) ; new as of v20 | |
| 810 (byte-defop 98 0 byte-goto-char) | |
| 811 (byte-defop 99 0 byte-insert) | |
| 812 (byte-defop 100 1 byte-point-max) | |
| 813 (byte-defop 101 1 byte-point-min) | |
| 814 (byte-defop 102 0 byte-char-after) | |
| 815 (byte-defop 103 1 byte-following-char) | |
| 816 (byte-defop 104 1 byte-preceding-char) | |
| 817 (byte-defop 105 1 byte-current-column) | |
| 818 (byte-defop 106 0 byte-indent-to) | |
| 819 (byte-defop 107 -1 byte-equal) ; new as of v20 | |
| 820 (byte-defop 108 1 byte-eolp) | |
| 821 (byte-defop 109 1 byte-eobp) | |
| 822 (byte-defop 110 1 byte-bolp) | |
| 823 (byte-defop 111 1 byte-bobp) | |
| 824 (byte-defop 112 1 byte-current-buffer) | |
| 825 (byte-defop 113 0 byte-set-buffer) | |
| 826 (byte-defop 114 0 byte-save-current-buffer | |
| 827 "To make a binding to record the current buffer.") | |
| 828 ;;(byte-defop 114 1 byte-read-char-OBSOLETE) ;obsolete as of v19 | |
| 829 (byte-defop 115 -1 byte-memq) ; new as of v20 | |
| 830 (byte-defop 116 1 byte-interactive-p) | |
| 831 | |
| 832 (byte-defop 117 0 byte-forward-char) | |
| 833 (byte-defop 118 0 byte-forward-word) | |
| 834 (byte-defop 119 -1 byte-skip-chars-forward) | |
| 835 (byte-defop 120 -1 byte-skip-chars-backward) | |
| 836 (byte-defop 121 0 byte-forward-line) | |
| 837 (byte-defop 122 0 byte-char-syntax) | |
| 838 (byte-defop 123 -1 byte-buffer-substring) | |
| 839 (byte-defop 124 -1 byte-delete-region) | |
| 840 (byte-defop 125 -1 byte-narrow-to-region) | |
| 841 (byte-defop 126 1 byte-widen) | |
| 842 (byte-defop 127 0 byte-end-of-line) | |
| 843 | |
| 844 ;; unused: 128 | |
| 845 | |
| 846 ;; These store their argument in the next two bytes | |
| 847 (byte-defop 129 1 byte-constant2 | |
| 848 "for reference to a constant with vector index >= byte-constant-limit") | |
| 849 (byte-defop 130 0 byte-goto "for unconditional jump") | |
| 850 (byte-defop 131 -1 byte-goto-if-nil "to pop value and jump if it's nil") | |
| 851 (byte-defop 132 -1 byte-goto-if-not-nil | |
| 852 "to pop value and jump if it's not nil") | |
| 853 (byte-defop 133 -1 byte-goto-if-nil-else-pop | |
| 854 "to examine top-of-stack, jump and don't pop it if it's nil, | |
| 855 otherwise pop it") | |
| 856 (byte-defop 134 -1 byte-goto-if-not-nil-else-pop | |
| 857 "to examine top-of-stack, jump and don't pop it if it's non-nil, | |
| 858 otherwise pop it") | |
| 859 | |
| 860 (byte-defop 135 -1 byte-return "to pop a value and return it from `byte-code'") | |
| 861 (byte-defop 136 -1 byte-discard "to discard one value from stack") | |
| 862 (byte-defop 137 1 byte-dup "to duplicate the top of the stack") | |
| 863 | |
| 864 (byte-defop 138 0 byte-save-excursion | |
| 865 "to make a binding to record the buffer, point and mark") | |
|
4775
1d61580e0cf7
Remove Fsave_window_excursion from window.c, it's overridden by Lisp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4743
diff
changeset
|
866 (byte-defop 139 0 byte-save-window-excursion ; almost obsolete |
| 428 | 867 "to make a binding to record entire window configuration") |
| 868 (byte-defop 140 0 byte-save-restriction | |
| 869 "to make a binding to record the current buffer clipping restrictions") | |
| 870 (byte-defop 141 -1 byte-catch | |
| 871 "for catch. Takes, on stack, the tag and an expression for the body") | |
| 872 (byte-defop 142 -1 byte-unwind-protect | |
| 873 "for unwind-protect. Takes, on stack, an expression for the unwind-action") | |
| 874 | |
| 875 ;; For condition-case. Takes, on stack, the variable to bind, | |
| 876 ;; an expression for the body, and a list of clauses. | |
| 877 (byte-defop 143 -2 byte-condition-case) | |
| 878 | |
| 879 ;; For entry to with-output-to-temp-buffer. | |
| 880 ;; Takes, on stack, the buffer name. | |
| 881 ;; Binds standard-output and does some other things. | |
| 882 ;; Returns with temp buffer on the stack in place of buffer name. | |
| 883 (byte-defop 144 0 byte-temp-output-buffer-setup) | |
| 884 | |
| 885 ;; For exit from with-output-to-temp-buffer. | |
| 886 ;; Expects the temp buffer on the stack underneath value to return. | |
| 887 ;; Pops them both, then pushes the value back on. | |
| 888 ;; Unbinds standard-output and makes the temp buffer visible. | |
| 889 (byte-defop 145 -1 byte-temp-output-buffer-show) | |
| 890 | |
| 891 ;; To unbind back to the beginning of this frame. | |
| 892 ;; Not used yet, but will be needed for tail-recursion elimination. | |
| 893 (byte-defop 146 0 byte-unbind-all) | |
| 894 | |
| 895 (byte-defop 147 -2 byte-set-marker) | |
| 896 (byte-defop 148 0 byte-match-beginning) | |
| 897 (byte-defop 149 0 byte-match-end) | |
| 898 (byte-defop 150 0 byte-upcase) | |
| 899 (byte-defop 151 0 byte-downcase) | |
| 900 (byte-defop 152 -1 byte-string=) | |
| 901 (byte-defop 153 -1 byte-string<) | |
| 902 (byte-defop 154 -1 byte-old-equal) | |
| 903 (byte-defop 155 -1 byte-nthcdr) | |
| 904 (byte-defop 156 -1 byte-elt) | |
| 905 (byte-defop 157 -1 byte-old-member) | |
| 906 (byte-defop 158 -1 byte-old-assq) | |
| 907 (byte-defop 159 0 byte-nreverse) | |
| 908 (byte-defop 160 -1 byte-setcar) | |
| 909 (byte-defop 161 -1 byte-setcdr) | |
| 910 (byte-defop 162 0 byte-car-safe) | |
| 911 (byte-defop 163 0 byte-cdr-safe) | |
| 912 (byte-defop 164 -1 byte-nconc) | |
| 913 (byte-defop 165 -1 byte-quo) | |
| 914 (byte-defop 166 -1 byte-rem) | |
| 915 (byte-defop 167 0 byte-numberp) | |
|
4885
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
916 (byte-defop 168 0 byte-fixnump) |
| 428 | 917 |
| 918 ;; unused: 169 | |
| 919 | |
| 920 ;; These are not present in FSF. | |
| 921 ;; | |
| 922 (byte-defop 170 0 byte-rel-goto) | |
| 923 (byte-defop 171 -1 byte-rel-goto-if-nil) | |
| 924 (byte-defop 172 -1 byte-rel-goto-if-not-nil) | |
| 925 (byte-defop 173 -1 byte-rel-goto-if-nil-else-pop) | |
| 926 (byte-defop 174 -1 byte-rel-goto-if-not-nil-else-pop) | |
| 927 | |
| 928 (byte-defop 175 nil byte-listN) | |
| 929 (byte-defop 176 nil byte-concatN) | |
| 930 (byte-defop 177 nil byte-insertN) | |
| 931 | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
932 (byte-defop 178 1 byte-bind-multiple-value-limits) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
933 (byte-defop 179 -3 byte-multiple-value-list-internal) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
934 (byte-defop 180 0 byte-multiple-value-call) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
935 (byte-defop 181 -1 byte-throw) |
| 428 | 936 |
| 937 ;; these ops are new to v20 | |
| 938 (byte-defop 182 -1 byte-member) | |
| 939 (byte-defop 183 -1 byte-assq) | |
| 940 | |
| 941 ;; unused: 184-191 | |
| 942 | |
| 943 (byte-defop 192 1 byte-constant "for reference to a constant") | |
| 944 ;; codes 193-255 are consumed by byte-constant. | |
| 945 (defconst byte-constant-limit 64 | |
| 946 "Exclusive maximum index usable in the `byte-constant' opcode.") | |
| 947 | |
| 444 | 948 (defconst byte-goto-ops |
| 949 '(byte-goto byte-goto-if-nil byte-goto-if-not-nil | |
| 950 byte-goto-if-nil-else-pop | |
| 951 byte-goto-if-not-nil-else-pop) | |
| 428 | 952 "List of byte-codes whose offset is a pc.") |
| 953 | |
| 954 (defconst byte-goto-always-pop-ops | |
| 444 | 955 '(byte-goto-if-nil byte-goto-if-not-nil)) |
| 428 | 956 |
| 957 (defconst byte-rel-goto-ops | |
| 444 | 958 '(byte-rel-goto byte-rel-goto-if-nil byte-rel-goto-if-not-nil |
| 959 byte-rel-goto-if-nil-else-pop byte-rel-goto-if-not-nil-else-pop) | |
| 428 | 960 "byte-codes for relative jumps.") |
| 961 | |
| 962 (byte-extrude-byte-code-vectors) | |
| 963 | |
| 964 ;;; lapcode generator | |
| 965 ;;; | |
| 966 ;;; the byte-compiler now does source -> lapcode -> bytecode instead of | |
| 967 ;;; source -> bytecode, because it's a lot easier to make optimizations | |
| 968 ;;; on lapcode than on bytecode. | |
| 969 ;;; | |
| 970 ;;; Elements of the lapcode list are of the form (<instruction> . <parameter>) | |
| 971 ;;; where instruction is a symbol naming a byte-code instruction, | |
| 972 ;;; and parameter is an argument to that instruction, if any. | |
| 973 ;;; | |
| 974 ;;; The instruction can be the pseudo-op TAG, which means that this position | |
| 975 ;;; in the instruction stream is a target of a goto. (car PARAMETER) will be | |
| 976 ;;; the PC for this location, and the whole instruction "(TAG pc)" will be the | |
| 977 ;;; parameter for some goto op. | |
| 978 ;;; | |
| 979 ;;; If the operation is varbind, varref, varset or push-constant, then the | |
| 980 ;;; parameter is (variable/constant . index_in_constant_vector). | |
| 981 ;;; | |
| 982 ;;; First, the source code is macroexpanded and optimized in various ways. | |
| 983 ;;; Then the resultant code is compiled into lapcode. Another set of | |
| 984 ;;; optimizations are then run over the lapcode. Then the variables and | |
| 985 ;;; constants referenced by the lapcode are collected and placed in the | |
| 986 ;;; constants-vector. (This happens now so that variables referenced by dead | |
| 987 ;;; code don't consume space.) And finally, the lapcode is transformed into | |
| 988 ;;; compacted byte-code. | |
| 989 ;;; | |
| 990 ;;; A distinction is made between variables and constants because the variable- | |
| 991 ;;; referencing instructions are more sensitive to the variables being near the | |
| 992 ;;; front of the constants-vector than the constant-referencing instructions. | |
| 993 ;;; Also, this lets us notice references to free variables. | |
| 994 | |
| 995 (defun byte-compile-lapcode (lap) | |
| 996 "Turns lapcode into bytecode. The lapcode is destroyed." | |
| 997 ;; Lapcode modifications: changes the ID of a tag to be the tag's PC. | |
| 998 (let ((pc 0) ; Program counter | |
| 999 op off ; Operation & offset | |
| 1000 (bytes '()) ; Put the output bytes here | |
| 1001 (patchlist nil) ; List of tags and goto's to patch | |
| 1002 rest rel tmp) | |
| 1003 (while lap | |
| 1004 (setq op (car (car lap)) | |
| 1005 off (cdr (car lap))) | |
| 1006 (cond ((not (symbolp op)) | |
| 1007 (error "Non-symbolic opcode `%s'" op)) | |
| 1008 ((eq op 'TAG) | |
| 1009 (setcar off pc) | |
| 1010 (push off patchlist)) | |
| 1011 ((memq op byte-goto-ops) | |
| 1012 (setq pc (+ pc 3)) | |
| 1013 (setq bytes (cons (cons pc (cdr off)) | |
| 1014 (cons nil | |
| 1015 (cons (symbol-value op) bytes)))) | |
| 1016 (push bytes patchlist)) | |
| 1017 (t | |
| 1018 (setq bytes | |
| 1019 (cond ((cond ((consp off) | |
| 1020 ;; Variable or constant reference | |
| 1021 (setq off (cdr off)) | |
| 1022 (eq op 'byte-constant))) | |
| 1023 (cond ((< off byte-constant-limit) | |
| 1024 (setq pc (1+ pc)) | |
| 1025 (cons (+ byte-constant off) bytes)) | |
| 1026 (t | |
| 1027 (setq pc (+ 3 pc)) | |
| 1028 (cons (lsh off -8) | |
| 1029 (cons (logand off 255) | |
| 1030 (cons byte-constant2 bytes)))))) | |
| 1031 ((and (<= byte-listN (symbol-value op)) | |
| 1032 (<= (symbol-value op) byte-insertN)) | |
| 1033 (setq pc (+ 2 pc)) | |
| 1034 (cons off (cons (symbol-value op) bytes))) | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
1035 ((= byte-multiple-value-call (symbol-value op)) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
1036 (setq pc (1+ pc)) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
1037 ;; Ignore off. |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
1038 (cons (symbol-value op) bytes)) |
| 428 | 1039 ((< off 6) |
| 1040 (setq pc (1+ pc)) | |
| 1041 (cons (+ (symbol-value op) off) bytes)) | |
| 1042 ((< off 256) | |
| 1043 (setq pc (+ 2 pc)) | |
| 1044 (cons off (cons (+ (symbol-value op) 6) bytes))) | |
| 1045 (t | |
| 1046 (setq pc (+ 3 pc)) | |
| 1047 (cons (lsh off -8) | |
| 1048 (cons (logand off 255) | |
| 1049 (cons (+ (symbol-value op) 7) | |
| 1050 bytes)))))))) | |
| 1051 (setq lap (cdr lap))) | |
| 1052 ;;(if (not (= pc (length bytes))) | |
| 1053 ;; (error "Compiler error: pc mismatch - %s %s" pc (length bytes))) | |
| 1054 (cond (t ;; starting with Emacs 19. | |
| 1055 ;; Make relative jumps | |
| 1056 (setq patchlist (nreverse patchlist)) | |
| 1057 (while (progn | |
| 1058 (setq off 0) ; PC change because of deleted bytes | |
| 1059 (setq rest patchlist) | |
| 1060 (while rest | |
| 1061 (setq tmp (car rest)) | |
| 1062 (and (consp (car tmp)) ; Jump | |
| 1063 (prog1 (null (nth 1 tmp)) ; Absolute jump | |
| 1064 (setq tmp (car tmp))) | |
| 1065 (progn | |
| 1066 (setq rel (- (car (cdr tmp)) (car tmp))) | |
| 1067 (and (<= -129 rel) (< rel 128))) | |
| 1068 (progn | |
| 1069 ;; Convert to relative jump. | |
| 1070 (setcdr (car rest) (cdr (cdr (car rest)))) | |
| 1071 (setcar (cdr (car rest)) | |
| 1072 (+ (car (cdr (car rest))) | |
| 1073 (- byte-rel-goto byte-goto))) | |
| 1074 (setq off (1- off)))) | |
| 1075 (setcar tmp (+ (car tmp) off)) ; Adjust PC | |
| 1076 (setq rest (cdr rest))) | |
| 1077 ;; If optimizing, repeat until no change. | |
| 1078 (and byte-optimize | |
| 1079 (not (zerop off))))))) | |
| 1080 ;; Patch PC into jumps | |
| 1081 (let (bytes) | |
| 1082 (while patchlist | |
| 1083 (setq bytes (car patchlist)) | |
| 1084 (cond ((atom (car bytes))) ; Tag | |
| 1085 ((nth 1 bytes) ; Relative jump | |
| 1086 (setcar bytes (+ (- (car (cdr (car bytes))) (car (car bytes))) | |
| 1087 128))) | |
| 1088 (t ; Absolute jump | |
| 1089 (setq pc (car (cdr (car bytes)))) ; Pick PC from tag | |
| 1090 (setcar (cdr bytes) (logand pc 255)) | |
| 1091 (setcar bytes (lsh pc -8)))) | |
| 1092 (setq patchlist (cdr patchlist)))) | |
| 1093 (concat (nreverse bytes)))) | |
| 1094 | |
| 1095 | |
| 1096 ;;; byte compiler messages | |
| 1097 | |
| 1098 (defvar byte-compile-current-form nil) | |
| 1099 (defvar byte-compile-current-file nil) | |
| 1100 (defvar byte-compile-dest-file nil) | |
| 1101 | |
| 1102 (defmacro byte-compile-log (format-string &rest args) | |
| 1103 `(when (and byte-optimize (memq byte-optimize-log '(t source))) | |
| 1104 (let ((print-escape-newlines t) | |
| 1105 (print-level 4) | |
| 1106 (print-length 4)) | |
| 1107 (byte-compile-log-1 (format ,format-string ,@args))))) | |
| 1108 | |
| 1109 (defconst byte-compile-last-warned-form 'nothing) | |
| 1110 | |
| 1111 ;; Log a message STRING in *Compile-Log*. | |
| 1112 ;; Also log the current function and file if not already done. | |
| 1113 (defun byte-compile-log-1 (string &optional fill) | |
| 1114 (let* ((this-form (or byte-compile-current-form "toplevel forms")) | |
| 1115 (while-compiling-msg | |
| 1116 (when (or byte-compile-current-file | |
| 1117 (not (eq this-form byte-compile-last-warned-form))) | |
| 1118 (format | |
| 1119 "While compiling %s%s:" | |
| 1120 this-form | |
| 1121 (cond | |
| 1122 ((stringp byte-compile-current-file) | |
| 1123 (concat " in file " byte-compile-current-file)) | |
| 1124 ((bufferp byte-compile-current-file) | |
| 1125 (concat " in buffer " | |
| 1126 (buffer-name byte-compile-current-file))) | |
| 1127 ("")))))) | |
| 1128 (if noninteractive | |
| 1129 (progn | |
| 1130 (when while-compiling-msg (message "%s" while-compiling-msg)) | |
| 1131 (message " %s" string)) | |
| 1132 (with-current-buffer (get-buffer-create "*Compile-Log*") | |
| 1133 (goto-char (point-max)) | |
| 1134 (when byte-compile-current-file | |
| 1135 (when (> (point-max) (point-min)) | |
| 1136 (insert "\n\^L\n")) | |
| 1137 (insert (current-time-string) "\n")) | |
| 1138 (when while-compiling-msg (insert while-compiling-msg "\n")) | |
| 1139 (insert " " string "\n") | |
| 1140 (when (and fill (not (string-match "\n" string))) | |
| 1141 (let ((fill-prefix " ") | |
| 1142 (fill-column 78)) | |
| 1143 (fill-paragraph nil))))) | |
| 1144 (setq byte-compile-current-file nil) | |
| 1145 (setq byte-compile-last-warned-form this-form))) | |
| 1146 | |
| 1147 ;; Log the start of a file in *Compile-Log*, and mark it as done. | |
| 1148 ;; But do nothing in batch mode. | |
| 1149 (defun byte-compile-log-file () | |
| 1150 (when (and byte-compile-current-file (not noninteractive)) | |
| 1151 (with-current-buffer (get-buffer-create "*Compile-Log*") | |
| 1152 (when (> (point-max) (point-min)) | |
| 1153 (goto-char (point-max)) | |
| 1154 (insert "\n\^L\n")) | |
| 1155 (insert "Compiling " | |
| 1156 (if (stringp byte-compile-current-file) | |
| 1157 (concat "file " byte-compile-current-file) | |
| 1158 (concat "buffer " (buffer-name byte-compile-current-file))) | |
| 1159 " at " (current-time-string) "\n") | |
| 1160 (setq byte-compile-current-file nil)))) | |
| 1161 | |
| 502 | 1162 (defvar byte-compile-inbuffer) |
| 1163 (defvar byte-compile-outbuffer) | |
| 1164 | |
| 428 | 1165 (defun byte-compile-warn (format &rest args) |
| 1166 (setq format (apply 'format format args)) | |
| 1167 (if byte-compile-error-on-warn | |
| 1168 (error "%s" format) ; byte-compile-file catches and logs it | |
| 1169 (byte-compile-log-1 (concat "** " format) t) | |
| 502 | 1170 |
| 1171 ;; This was a first attempt to add line numbers to the | |
| 1172 ;; byte-compilation output. Unfortunately, it doesn't work | |
| 1173 ;; perfectly: it reports the line number at the end of the form | |
| 1174 ;; (which may be an entire function), rather than the line number | |
| 1175 ;; of the actual problem. Doing this right is hard because we | |
| 1176 ;; currently use the built-in Lisp parser to parse the entire form | |
| 1177 ;; at once. What we basically need is a whole separate parser | |
| 1178 ;; that annotates its output with line numbers. For example, we | |
| 1179 ;; might modify the parser in lread.c so that, with the right | |
| 1180 ;; option set, it replaces every Lisp object contained in the | |
| 1181 ;; structure it returns with a cons of that object and the line | |
| 1182 ;; number it was found on (determined by counting newlines, | |
| 1183 ;; starting from some arbitrary point). You then have two | |
| 1184 ;; options: (a) Modify the byte compiler so that everything that | |
| 1185 ;; compiles a form deals with the new annotated form rather than | |
| 1186 ;; the old one, or (b) The byte compiler saves this structure | |
| 1187 ;; while converting it into a normal structure that's given to the | |
| 1188 ;; various form handlers, which need no (or less) modification. | |
| 1189 ;; In the former case, finding the line number is trivial because | |
| 1190 ;; it's in the form. In the latter case, finding the line number | |
| 1191 ;; depends on having a unique Lisp object that can be looked up in | |
| 1192 ;; the annotated structure -- i.e. a list, vector, or string. | |
| 1193 ;; You'd have to look at the various places where errors are spit | |
| 1194 ;; out (not very many, really), and make sure that such a unique | |
| 1195 ;; object is available. Then you do a depth-first search through | |
| 1196 ;; the annotated structure to find the object. | |
| 1197 ;; | |
| 1198 ;; An alternative way of doing (b) that's probably much more | |
| 1199 ;; efficient (and easier to implement) is simply to have the | |
| 1200 ;; parser in lread.c annotate every unique object using a separate | |
| 1201 ;; hash table. This also eliminates the need for a search to find | |
| 1202 ;; the line number. In order to be fine-grained enough to get at | |
| 1203 ;; every symbol in a form -- e.g. if we want to pinpoint a | |
| 1204 ;; particular undefined variable in a function call -- we need to | |
| 1205 ;; annotate every cons, not just each list. We still have | |
| 1206 ;; (probably unimportant) problems with vectors, since all we have | |
| 1207 ;; is the start of the vector. If we cared about this, we could | |
| 1208 ;; store in the hash table a list of the line numbers for each | |
| 1209 ;; item in the vector, not just its start. | |
| 1210 ;; | |
| 1211 ;; --ben | |
| 1212 | |
| 1213 ; (byte-compile-log-1 (concat "** line: " | |
| 1214 ; (save-excursion | |
| 1215 ; (set-buffer byte-compile-inbuffer) | |
| 1216 ; (int-to-string (line-number))) | |
| 1217 ; " " | |
| 1218 ; format) t) | |
| 428 | 1219 ;;; RMS says: |
| 1220 ;;; It is useless to flash warnings too fast to be read. | |
| 1221 ;;; Besides, they will all be shown at the end. | |
| 1222 ;;; and comments out the next two lines. | |
| 1223 (or noninteractive ; already written on stdout. | |
| 1224 (message "Warning: %s" format)))) | |
| 1225 | |
| 1226 ;;; This function should be used to report errors that have halted | |
| 1227 ;;; compilation of the current file. | |
| 1228 (defun byte-compile-report-error (error-info) | |
| 1229 (setq byte-compiler-error-flag t) | |
| 1230 (byte-compile-log-1 | |
| 1231 (concat "!! " | |
| 1232 (format (if (cdr error-info) "%s (%s)" "%s") | |
| 1233 (get (car error-info) 'error-message) | |
| 442 | 1234 (prin1-to-string (cdr error-info))))) |
| 1235 (if stack-trace-on-error | |
| 1236 (backtrace nil t))) | |
| 428 | 1237 |
| 1238 ;;; Used by make-obsolete. | |
| 1239 (defun byte-compile-obsolete (form) | |
| 1240 (let ((new (get (car form) 'byte-obsolete-info))) | |
| 1241 (if (memq 'obsolete byte-compile-warnings) | |
| 1242 (byte-compile-warn "%s is an obsolete function; %s" (car form) | |
| 1243 (if (stringp (car new)) | |
| 1244 (car new) | |
| 1245 (format "use %s instead." (car new))))) | |
| 1246 (funcall (or (cdr new) 'byte-compile-normal-call) form))) | |
| 1247 | |
| 1248 ;;; Used by make-obsolete. | |
| 1249 (defun byte-compile-compatible (form) | |
| 1250 (let ((new (get (car form) 'byte-compatible-info))) | |
| 1251 (if (memq 'pedantic byte-compile-warnings) | |
| 1252 (byte-compile-warn "%s is provided for compatibility; %s" (car form) | |
| 1253 (if (stringp (car new)) | |
| 1254 (car new) | |
| 1255 (format "use %s instead." (car new))))) | |
| 1256 (funcall (or (cdr new) 'byte-compile-normal-call) form))) | |
| 1257 | |
| 1258 ;; Compiler options | |
| 1259 | |
| 1260 (defconst byte-compiler-legal-options | |
| 1261 '((optimize byte-optimize (t nil source byte) val) | |
|
5503
7b5946dbfb96
Drop support for generating code appropriate for Emacs 19, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5475
diff
changeset
|
1262 (file-format byte-compile-emacs19-compatibility (emacs20) |
| 428 | 1263 (eq val 'emacs19)) |
| 1264 (delete-errors byte-compile-delete-errors (t nil) val) | |
| 1265 (verbose byte-compile-verbose (t nil) val) | |
| 1266 (new-bytecodes byte-compile-new-bytecodes (t nil) val) | |
| 1267 (warnings byte-compile-warnings | |
|
4719
bd51ab22afa8
Make it possible to silence warnings issued when #'mapcar's result is discarded.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4716
diff
changeset
|
1268 ((callargs subr-callargs redefine free-vars unused-vars |
|
bd51ab22afa8
Make it possible to silence warnings issued when #'mapcar's result is discarded.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4716
diff
changeset
|
1269 unresolved discarded-consing quoted-lambda)) |
| 428 | 1270 val))) |
| 1271 | |
| 1272 ;; XEmacs addition | |
| 1273 (defconst byte-compiler-obsolete-options | |
|
5503
7b5946dbfb96
Drop support for generating code appropriate for Emacs 19, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5475
diff
changeset
|
1274 '((new-bytecodes t) (byte-compile-emacs19-compatibility nil))) |
| 428 | 1275 |
| 1276 (defun byte-compiler-options-handler (&rest args) | |
| 1277 (let (key val desc choices) | |
| 1278 (while args | |
| 1279 (if (or (atom (car args)) (nthcdr 2 (car args)) (null (cdr (car args)))) | |
| 1280 (error "malformed byte-compiler-option %s" (car args))) | |
| 1281 (setq key (car (car args)) | |
| 1282 val (car (cdr (car args))) | |
| 1283 desc (assq key byte-compiler-legal-options)) | |
| 1284 (or desc | |
| 1285 (error "unknown byte-compiler option %s" key)) | |
| 1286 (if (assq key byte-compiler-obsolete-options) | |
| 1287 (byte-compile-warn "%s is an obsolete byte-compiler option." key)) | |
| 1288 (setq choices (nth 2 desc)) | |
| 1289 (if (consp (car choices)) | |
| 1290 (let* (this | |
| 1291 (handler 'cons) | |
| 1292 (var (nth 1 desc)) | |
| 1293 (ret (and (memq (car val) '(+ -)) | |
| 1294 (copy-sequence (if (eq t (symbol-value var)) | |
| 1295 (car choices) | |
| 1296 (symbol-value var)))))) | |
| 1297 (setq choices (car choices)) | |
| 1298 (while val | |
| 1299 (setq this (car val)) | |
| 1300 (cond ((memq this choices) | |
| 1301 (setq ret (funcall handler this ret))) | |
| 1302 ((eq this '+) (setq handler 'cons)) | |
| 1303 ((eq this '-) (setq handler 'delq)) | |
| 1304 ((error "%s only accepts %s." key choices))) | |
| 1305 (setq val (cdr val))) | |
| 1306 (set (nth 1 desc) ret)) | |
| 1307 (or (memq val choices) | |
| 1308 (error "%s must be one of %s." key choices)) | |
| 1309 (set (nth 1 desc) (eval (nth 3 desc)))) | |
| 1310 (setq args (cdr args))) | |
| 1311 nil)) | |
| 1312 | |
| 1313 ;;; sanity-checking arglists | |
| 1314 | |
| 1315 (defun byte-compile-fdefinition (name macro-p) | |
| 1316 (let* ((list (if (memq macro-p '(nil subr)) | |
| 1317 byte-compile-function-environment | |
| 1318 byte-compile-macro-environment)) | |
| 1319 (env (cdr (assq name list)))) | |
| 1320 (or env | |
| 1321 (let ((fn name)) | |
| 1322 (while (and (symbolp fn) | |
| 1323 (fboundp fn) | |
| 1324 (or (symbolp (symbol-function fn)) | |
| 1325 (consp (symbol-function fn)) | |
| 1326 (and (not macro-p) | |
| 1327 (compiled-function-p (symbol-function fn))) | |
| 1328 (and (eq macro-p 'subr) (subrp fn)))) | |
| 1329 (setq fn (symbol-function fn))) | |
| 1330 (if (or (and (not macro-p) (compiled-function-p fn)) | |
| 1331 (and (eq macro-p 'subr) (subrp fn))) | |
| 1332 fn | |
| 1333 (and (consp fn) | |
| 1334 (not (eq macro-p 'subr)) | |
| 1335 (if (eq 'macro (car fn)) | |
| 1336 (cdr fn) | |
| 1337 (if macro-p | |
| 1338 nil | |
| 1339 (if (eq 'autoload (car fn)) | |
| 1340 nil | |
| 1341 fn))))))))) | |
| 1342 | |
| 1343 (defun byte-compile-arglist-signature (arglist) | |
| 1344 (let ((args 0) | |
| 1345 opts | |
| 1346 restp) | |
| 1347 (while arglist | |
| 1348 (cond ((eq (car arglist) '&optional) | |
| 1349 (or opts (setq opts 0))) | |
| 1350 ((eq (car arglist) '&rest) | |
| 1351 (if (cdr arglist) | |
| 1352 (setq restp t | |
| 1353 arglist nil))) | |
| 1354 (t | |
| 1355 (if opts | |
| 1356 (setq opts (1+ opts)) | |
| 1357 (setq args (1+ args))))) | |
| 1358 (setq arglist (cdr arglist))) | |
| 1359 (cons args (if restp nil (if opts (+ args opts) args))))) | |
| 1360 | |
| 1361 | |
| 1362 (defun byte-compile-arglist-signatures-congruent-p (old new) | |
| 1363 (not (or | |
| 1364 (> (car new) (car old)) ; requires more args now | |
| 1365 (and (null (cdr old)) ; tooks rest-args, doesn't any more | |
| 1366 (cdr new)) | |
| 1367 (and (cdr new) (cdr old) ; can't take as many args now | |
| 1368 (< (cdr new) (cdr old))) | |
| 1369 ))) | |
| 1370 | |
| 1371 (defun byte-compile-arglist-signature-string (signature) | |
| 1372 (cond ((null (cdr signature)) | |
| 1373 (format "%d+" (car signature))) | |
| 1374 ((= (car signature) (cdr signature)) | |
| 1375 (format "%d" (car signature))) | |
| 1376 (t (format "%d-%d" (car signature) (cdr signature))))) | |
| 1377 | |
| 1378 | |
| 1379 ;; Warn if the form is calling a function with the wrong number of arguments. | |
| 1380 (defun byte-compile-callargs-warn (form) | |
| 1381 (let* ((def (or (byte-compile-fdefinition (car form) nil) | |
| 1382 (byte-compile-fdefinition (car form) t))) | |
| 1383 (sig (and def (byte-compile-arglist-signature | |
| 1384 (if (eq 'lambda (car-safe def)) | |
| 1385 (nth 1 def) | |
| 1386 (if (compiled-function-p def) | |
| 1387 (compiled-function-arglist def) | |
| 1388 '(&rest def)))))) | |
| 1389 (ncall (length (cdr form)))) | |
| 1390 (if (and (null def) | |
| 1391 (fboundp 'subr-min-args) | |
| 1392 (setq def (byte-compile-fdefinition (car form) 'subr))) | |
| 1393 (setq sig (cons (subr-min-args def) (subr-max-args def)))) | |
| 1394 (if sig | |
| 1395 (if (or (< ncall (car sig)) | |
| 1396 (and (cdr sig) (> ncall (cdr sig)))) | |
| 1397 (byte-compile-warn | |
| 1398 "%s called with %d argument%s, but %s %s" | |
| 1399 (car form) ncall | |
| 1400 (if (= 1 ncall) "" "s") | |
| 1401 (if (< ncall (car sig)) | |
| 1402 "requires" | |
| 1403 "accepts only") | |
| 1404 (byte-compile-arglist-signature-string sig))) | |
| 1405 (or (fboundp (car form)) ; might be a subr or autoload. | |
| 1406 ;; ## this doesn't work with recursion. | |
| 1407 (eq (car form) byte-compile-current-form) | |
| 1408 ;; It's a currently-undefined function. | |
| 1409 ;; Remember number of args in call. | |
| 1410 (let ((cons (assq (car form) byte-compile-unresolved-functions)) | |
| 1411 (n (length (cdr form)))) | |
| 1412 (if cons | |
| 1413 (or (memq n (cdr cons)) | |
| 1414 (setcdr cons (cons n (cdr cons)))) | |
| 1415 (setq byte-compile-unresolved-functions | |
| 1416 (cons (list (car form) n) | |
| 1417 byte-compile-unresolved-functions)))))))) | |
| 1418 | |
| 1419 ;; Warn if the function or macro is being redefined with a different | |
| 1420 ;; number of arguments. | |
| 1421 (defun byte-compile-arglist-warn (form macrop) | |
| 1422 (let ((old (byte-compile-fdefinition (nth 1 form) macrop))) | |
| 1423 (if old | |
| 1424 (let ((sig1 (byte-compile-arglist-signature | |
| 1425 (if (eq 'lambda (car-safe old)) | |
| 1426 (nth 1 old) | |
| 1427 (if (compiled-function-p old) | |
| 1428 (compiled-function-arglist old) | |
| 1429 '(&rest def))))) | |
| 1430 (sig2 (byte-compile-arglist-signature (nth 2 form)))) | |
| 1431 (or (byte-compile-arglist-signatures-congruent-p sig1 sig2) | |
| 1432 (byte-compile-warn "%s %s used to take %s %s, now takes %s" | |
| 1433 (if (eq (car form) 'defun) "function" "macro") | |
| 1434 (nth 1 form) | |
| 1435 (byte-compile-arglist-signature-string sig1) | |
| 1436 (if (equal sig1 '(1 . 1)) "argument" "arguments") | |
| 1437 (byte-compile-arglist-signature-string sig2)))) | |
| 1438 ;; This is the first definition. See if previous calls are compatible. | |
| 1439 (let ((calls (assq (nth 1 form) byte-compile-unresolved-functions)) | |
| 1440 nums sig min max) | |
| 1441 (if calls | |
| 1442 (progn | |
| 1443 (setq sig (byte-compile-arglist-signature (nth 2 form)) | |
| 1444 nums (sort (copy-sequence (cdr calls)) (function <)) | |
| 1445 min (car nums) | |
| 1446 max (car (nreverse nums))) | |
| 1447 (if (or (< min (car sig)) | |
| 1448 (and (cdr sig) (> max (cdr sig)))) | |
| 1449 (byte-compile-warn | |
| 1450 "%s being defined to take %s%s, but was previously called with %s" | |
| 1451 (nth 1 form) | |
| 1452 (byte-compile-arglist-signature-string sig) | |
| 1453 (if (equal sig '(1 . 1)) " arg" " args") | |
| 1454 (byte-compile-arglist-signature-string (cons min max)))) | |
| 1455 | |
| 1456 (setq byte-compile-unresolved-functions | |
| 1457 (delq calls byte-compile-unresolved-functions))))) | |
| 1458 ))) | |
| 1459 | |
| 1460 ;; If we have compiled any calls to functions which are not known to be | |
| 1461 ;; defined, issue a warning enumerating them. | |
| 1462 ;; `unresolved' in the list `byte-compile-warnings' disables this. | |
| 1463 (defun byte-compile-warn-about-unresolved-functions (&optional msg) | |
| 1464 (if (memq 'unresolved byte-compile-warnings) | |
| 1465 (let ((byte-compile-current-form (or msg "the end of the data"))) | |
| 1466 ;; First delete the autoloads from the list. | |
| 1467 (if byte-compile-autoload-environment | |
| 1468 (let ((rest byte-compile-unresolved-functions)) | |
| 1469 (while rest | |
| 1470 (if (assq (car (car rest)) byte-compile-autoload-environment) | |
| 1471 (setq byte-compile-unresolved-functions | |
| 1472 (delq (car rest) byte-compile-unresolved-functions))) | |
| 1473 (setq rest (cdr rest))))) | |
| 1474 ;; Now warn. | |
| 1475 (if (cdr byte-compile-unresolved-functions) | |
| 1476 (let* ((str "The following functions are not known to be defined: ") | |
| 1477 (L (+ (length str) 5)) | |
| 1478 (rest (reverse byte-compile-unresolved-functions)) | |
| 1479 s) | |
| 1480 (while rest | |
| 1481 (setq s (symbol-name (car (car rest))) | |
| 1482 L (+ L (length s) 2) | |
| 1483 rest (cdr rest)) | |
| 1484 (if (<= L (1- fill-column)) | |
| 1485 (setq str (concat str " " s (and rest ","))) | |
| 1486 (setq str (concat str "\n " s (and rest ",")) | |
| 1487 L (+ (length s) 4)))) | |
| 1488 (byte-compile-warn "%s" str)) | |
| 1489 (if byte-compile-unresolved-functions | |
| 1490 (byte-compile-warn "the function %s is not known to be defined." | |
| 1491 (car (car byte-compile-unresolved-functions))))))) | |
| 1492 nil) | |
| 1493 | |
| 1494 (defun byte-compile-defvar-p (var) | |
| 1495 ;; Whether the byte compiler thinks that non-lexical references to this | |
| 1496 ;; variable are ok. | |
| 1497 (or (globally-boundp var) | |
| 1498 (let ((rest byte-compile-bound-variables)) | |
| 1499 (while (and rest var) | |
| 1500 (if (and (eq var (car-safe (car rest))) | |
| 1501 (not (= 0 (logand (cdr (car rest)) | |
| 1502 byte-compile-global-bit)))) | |
| 1503 (setq var nil)) | |
| 1504 (setq rest (cdr rest))) | |
| 1505 ;; if var is nil at this point, it's a defvar in this file. | |
| 444 | 1506 (not var)) |
| 1507 ;; Perhaps (eval-when-compile (defvar foo)) | |
| 1508 (and (boundp 'current-load-list) | |
| 1509 (memq var current-load-list)))) | |
| 428 | 1510 |
| 1511 | |
| 1512 ;;; If we have compiled bindings of variables which have no referents, warn. | |
| 1513 (defun byte-compile-warn-about-unused-variables () | |
| 1514 (let ((rest byte-compile-bound-variables) | |
| 1515 (unreferenced '()) | |
| 1516 cell) | |
| 1517 (while (and rest | |
| 1518 ;; only warn about variables whose lifetime is now ending, | |
| 1519 ;; that is, variables from the lexical scope that is now | |
| 1520 ;; terminating. (Think nested lets.) | |
| 1521 (not (eq (car rest) 'new-scope))) | |
| 1522 (setq cell (car rest)) | |
| 1523 (if (and (= 0 (logand byte-compile-referenced-bit (cdr cell))) | |
| 1524 ;; Don't warn about declared-but-unused arguments, | |
| 1525 ;; for two reasons: first, the arglist structure | |
| 1526 ;; might be imposed by external forces, and we don't | |
| 1527 ;; have (declare (ignore x)) yet; and second, inline | |
| 1528 ;; expansion produces forms like | |
| 1529 ;; ((lambda (arg) (byte-code "..." [arg])) x) | |
| 1530 ;; which we can't (ok, well, don't) recognize as | |
| 1531 ;; containing a reference to arg, so every inline | |
| 1532 ;; expansion would generate a warning. (If we had | |
| 1533 ;; `ignore' then inline expansion could emit an | |
| 1534 ;; ignore declaration.) | |
| 1535 (= 0 (logand byte-compile-arglist-bit (cdr cell))) | |
| 1536 ;; Don't warn about defvars because this is a | |
| 1537 ;; legitimate special binding. | |
| 1538 (not (byte-compile-defvar-p (car cell)))) | |
| 1539 (setq unreferenced (cons (car cell) unreferenced))) | |
| 1540 (setq rest (cdr rest))) | |
| 1541 (setq unreferenced (nreverse unreferenced)) | |
| 1542 (while unreferenced | |
| 1543 (byte-compile-warn | |
| 1544 (format "variable %s bound but not referenced" (car unreferenced))) | |
| 1545 (setq unreferenced (cdr unreferenced))))) | |
| 1546 | |
| 1547 | |
| 1548 (defmacro byte-compile-constant-symbol-p (symbol) | |
| 1549 `(or (keywordp ,symbol) (memq ,symbol '(nil t)))) | |
| 1550 | |
| 1551 (defmacro byte-compile-constp (form) | |
| 1552 ;; Returns non-nil if FORM is a constant. | |
|
5282
dcc34e28cd84
Warn at byte-compile in #'the if FORM constant & not TYPE; fix byte-compile-constp
Aidan Kehoe <kehoea@parhasard.net>
parents:
5269
diff
changeset
|
1553 `(cond ((consp ,form) (memq (car ,form) '(quote function))) |
| 428 | 1554 ((symbolp ,form) (byte-compile-constant-symbol-p ,form)) |
| 1555 (t))) | |
| 1556 | |
| 1557 (defmacro byte-compile-close-variables (&rest body) | |
| 1558 `(let | |
| 1559 (;; | |
| 1560 ;; Close over these variables to encapsulate the | |
| 1561 ;; compilation state | |
| 1562 ;; | |
| 1563 (byte-compile-macro-environment | |
| 1564 ;; Copy it because the compiler may patch into the | |
| 1565 ;; macroenvironment. | |
| 1566 (copy-alist byte-compile-initial-macro-environment)) | |
| 1567 (byte-compile-function-environment nil) | |
| 1568 (byte-compile-autoload-environment nil) | |
| 1569 (byte-compile-unresolved-functions nil) | |
| 1570 (byte-compile-bound-variables nil) | |
| 1571 (byte-compile-free-references nil) | |
| 1572 (byte-compile-free-assignments nil) | |
| 1573 ;; | |
| 1574 ;; Close over these variables so that `byte-compiler-options' | |
| 1575 ;; can change them on a per-file basis. | |
| 1576 ;; | |
| 1577 (byte-compile-verbose byte-compile-verbose) | |
| 1578 (byte-optimize byte-optimize) | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
1579 (byte-compile-checks-on-load |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
1580 byte-compile-checks-on-load) |
| 428 | 1581 (byte-compile-dynamic byte-compile-dynamic) |
| 1582 (byte-compile-dynamic-docstrings | |
| 1583 byte-compile-dynamic-docstrings) | |
| 1584 (byte-compile-warnings (if (eq byte-compile-warnings t) | |
| 1585 byte-compile-default-warnings | |
| 1586 byte-compile-warnings)) | |
| 1587 (byte-compile-file-domain nil)) | |
| 1588 (prog1 | |
| 1589 (progn ,@body) | |
| 1590 (if (memq 'unused-vars byte-compile-warnings) | |
| 1591 ;; done compiling in this scope, warn now. | |
| 1592 (byte-compile-warn-about-unused-variables))))) | |
| 1593 | |
| 1594 | |
| 1595 (defmacro displaying-byte-compile-warnings (&rest body) | |
| 1596 `(let* ((byte-compile-log-buffer (get-buffer-create "*Compile-Log*")) | |
| 1597 (byte-compile-point-max-prev (point-max byte-compile-log-buffer))) | |
| 1598 ;; Log the file name or buffer name. | |
| 1599 (byte-compile-log-file) | |
| 1600 ;; Record how much is logged now. | |
| 1601 ;; We will display the log buffer if anything more is logged | |
| 1602 ;; before the end of BODY. | |
| 1603 (defvar byte-compile-warnings-beginning) | |
| 1604 (let ((byte-compile-warnings-beginning | |
| 1605 (if (boundp 'byte-compile-warnings-beginning) | |
| 1606 byte-compile-warnings-beginning | |
| 1607 (point-max byte-compile-log-buffer)))) | |
| 1608 | |
| 1609 (unwind-protect | |
| 442 | 1610 (call-with-condition-handler |
| 1611 #'(lambda (error-info) | |
| 1612 (byte-compile-report-error error-info)) | |
| 1613 #'(lambda () | |
| 1614 (progn ,@body))) | |
| 428 | 1615 ;; Always set point in log to start of interesting output. |
| 1616 (with-current-buffer byte-compile-log-buffer | |
| 1617 (let ((show-begin | |
| 1618 (progn (goto-char byte-compile-point-max-prev) | |
| 1619 (skip-chars-forward "\^L\n") | |
| 1620 (point)))) | |
| 1621 ;; If there were compilation warnings, display them. | |
| 1622 (if temp-buffer-show-function | |
| 1623 (let ((show-buffer (get-buffer-create "*Compile-Log-Show*"))) | |
| 1624 ;; Always clean show-buffer, even when not displaying it, | |
| 1625 ;; so that misleading previous messages aren't left around. | |
| 1626 (with-current-buffer show-buffer | |
| 1627 (setq buffer-read-only nil) | |
| 1628 (erase-buffer)) | |
| 1629 (copy-to-buffer show-buffer show-begin (point-max)) | |
| 1630 (when (< byte-compile-warnings-beginning (point-max)) | |
| 1631 (funcall temp-buffer-show-function show-buffer))) | |
| 1632 (when (< byte-compile-warnings-beginning (point-max)) | |
| 1633 (select-window | |
| 1634 (prog1 (selected-window) | |
| 1635 (select-window (display-buffer (current-buffer))) | |
| 1636 (goto-char show-begin) | |
| 1637 (recenter 1))))))))))) | |
| 1638 | |
| 1639 | |
| 1640 ;;;###autoload | |
| 1641 (defun byte-force-recompile (directory) | |
| 1642 "Recompile every `.el' file in DIRECTORY that already has a `.elc' file. | |
| 1643 Files in subdirectories of DIRECTORY are processed also." | |
| 1644 (interactive "DByte force recompile (directory): ") | |
| 442 | 1645 (byte-recompile-directory directory nil nil t)) |
| 428 | 1646 |
| 1647 ;;;###autoload | |
| 1648 (defun byte-recompile-directory (directory &optional arg norecursion force) | |
| 1649 "Recompile every `.el' file in DIRECTORY that needs recompilation. | |
| 1650 This is if a `.elc' file exists but is older than the `.el' file. | |
| 444 | 1651 Files in subdirectories of DIRECTORY are also processed unless |
| 1652 optional argument NORECURSION is non-nil. | |
| 428 | 1653 |
| 1654 If the `.elc' file does not exist, normally the `.el' file is *not* compiled. | |
| 1655 But a prefix argument (optional second arg) means ask user, | |
| 1656 for each such `.el' file, whether to compile it. Prefix argument 0 means | |
| 1657 don't ask and compile the file anyway. | |
| 1658 | |
| 1659 A nonzero prefix argument also means ask about each subdirectory. | |
| 1660 | |
| 444 | 1661 If the fourth optional argument FORCE is non-nil, |
| 428 | 1662 recompile every `.el' file that already has a `.elc' file." |
| 1663 (interactive "DByte recompile directory: \nP") | |
| 1664 (if arg | |
| 1665 (setq arg (prefix-numeric-value arg))) | |
| 1666 (if noninteractive | |
| 1667 nil | |
| 1668 (save-some-buffers) | |
| 1669 (redraw-modeline)) | |
| 1670 (let ((directories (list (expand-file-name directory))) | |
| 1671 (file-count 0) | |
| 1672 (dir-count 0) | |
| 1673 last-dir) | |
| 1674 (displaying-byte-compile-warnings | |
| 1675 (while directories | |
| 1676 (setq directory (file-name-as-directory (car directories))) | |
| 1677 (or noninteractive (message "Checking %s..." directory)) | |
| 1678 (let ((files (directory-files directory)) | |
| 1679 source dest) | |
| 1680 (while files | |
| 1681 (setq source (expand-file-name (car files) directory)) | |
| 1682 (if (and (not (member (car files) '("." ".." "RCS" "CVS" "SCCS"))) | |
| 1683 ;; Stay away from directory back-links, etc: | |
| 1684 (not (file-symlink-p source)) | |
| 1685 (file-directory-p source) | |
| 1686 byte-recompile-directory-recursively) | |
| 1687 ;; This file is a subdirectory. Handle them differently. | |
| 1688 (if (or (null arg) | |
| 1689 (eq arg 0) | |
| 1690 (y-or-n-p (concat "Check " source "? "))) | |
| 1691 (setq directories | |
| 1692 (nconc directories (list source)))) | |
| 1693 ;; It is an ordinary file. Decide whether to compile it. | |
| 1694 (if (and (string-match emacs-lisp-file-regexp source) | |
| 1695 (not (auto-save-file-name-p source)) | |
| 502 | 1696 ;; make sure not a mule file we can't handle. |
| 1697 (or (not byte-recompile-ignore-uncompilable-mule-files) | |
| 1698 (featurep 'mule) | |
| 1699 (not (find-coding-system-magic-cookie-in-file | |
| 1700 source))) | |
| 428 | 1701 (setq dest (byte-compile-dest-file source)) |
| 1702 (if (file-exists-p dest) | |
| 1703 ;; File was already compiled. | |
| 1704 (or force (file-newer-than-file-p source dest)) | |
| 1705 ;; No compiled file exists yet. | |
| 1706 (and arg | |
| 1707 (or (eq 0 arg) | |
| 1708 (y-or-n-p (concat "Compile " source "? ")))))) | |
| 1709 (progn ;(if (and noninteractive (not byte-compile-verbose)) | |
| 1710 ; (message "Compiling %s..." source)) | |
| 1711 ; we do this in byte-compile-file. | |
| 1712 (if byte-recompile-directory-ignore-errors-p | |
| 1713 (batch-byte-compile-1 source) | |
| 1714 (byte-compile-file source)) | |
| 1715 (or noninteractive | |
| 1716 (message "Checking %s..." directory)) | |
| 1717 (setq file-count (1+ file-count)) | |
| 1718 (if (not (eq last-dir directory)) | |
| 1719 (setq last-dir directory | |
| 1720 dir-count (1+ dir-count))) | |
| 1721 ))) | |
| 1722 (setq files (cdr files)))) | |
| 1723 (setq directories (cdr directories)))) | |
| 1724 (message "Done (Total of %d file%s compiled%s)" | |
| 1725 file-count (if (= file-count 1) "" "s") | |
| 1726 (if (> dir-count 1) (format " in %d directories" dir-count) "")))) | |
| 1727 | |
| 1728 ;;;###autoload | |
| 1729 (defun byte-recompile-file (filename &optional force) | |
| 1730 "Recompile a file of Lisp code named FILENAME if it needs recompilation. | |
| 1731 This is if the `.elc' file exists but is older than the `.el' file. | |
| 1732 | |
| 1733 If the `.elc' file does not exist, normally the `.el' file is *not* | |
| 1734 compiled. But a prefix argument (optional second arg) means ask user | |
| 1735 whether to compile it. Prefix argument 0 don't ask and recompile anyway." | |
| 1736 (interactive "fByte recompile file: \nP") | |
| 1737 (let ((dest)) | |
| 1738 (if (and (string-match emacs-lisp-file-regexp filename) | |
| 1739 (not (auto-save-file-name-p filename)) | |
| 1740 (setq dest (byte-compile-dest-file filename)) | |
| 1741 (if (file-exists-p dest) | |
| 1742 (file-newer-than-file-p filename dest) | |
| 1743 (and force | |
| 1744 (or (eq 0 force) | |
| 502 | 1745 (y-or-n-p (concat "Compile " filename "? "))))) |
| 1746 (or (not byte-recompile-ignore-uncompilable-mule-files) | |
| 1747 (featurep 'mule) | |
| 1748 (not (find-coding-system-magic-cookie-in-file filename)))) | |
| 428 | 1749 (byte-compile-file filename)))) |
| 1750 | |
| 1751 ;;;###autoload | |
| 1752 (defun byte-compile-file (filename &optional load) | |
| 1753 "Compile a file of Lisp code named FILENAME into a file of byte code. | |
| 1754 The output file's name is made by appending `c' to the end of FILENAME. | |
| 1755 With prefix arg (noninteractively: 2nd arg), load the file after compiling." | |
| 1756 ;; (interactive "fByte compile file: \nP") | |
| 1757 (interactive | |
| 1758 (let ((file buffer-file-name) | |
| 1759 (file-name nil) | |
| 1760 (file-dir nil)) | |
| 1761 (and file | |
| 1762 (eq (cdr (assq 'major-mode (buffer-local-variables))) | |
| 1763 'emacs-lisp-mode) | |
| 1764 (setq file-name (file-name-nondirectory file) | |
| 1765 file-dir (file-name-directory file))) | |
| 1766 (list (read-file-name (if current-prefix-arg | |
| 1767 "Byte compile and load file: " | |
| 1768 "Byte compile file: ") | |
| 1769 file-dir nil nil file-name) | |
| 1770 current-prefix-arg))) | |
| 1771 ;; Expand now so we get the current buffer's defaults | |
| 1772 (setq filename (expand-file-name filename)) | |
| 1773 | |
| 1774 ;; If we're compiling a file that's in a buffer and is modified, offer | |
| 1775 ;; to save it first. | |
| 1776 (or noninteractive | |
| 1777 (let ((b (get-file-buffer (expand-file-name filename)))) | |
| 1778 (if (and b (buffer-modified-p b) | |
| 1779 (y-or-n-p (format "save buffer %s first? " (buffer-name b)))) | |
| 1780 (save-excursion (set-buffer b) (save-buffer))))) | |
| 1781 | |
| 1782 (if (or noninteractive byte-compile-verbose) ; XEmacs change | |
| 1783 (message "Compiling %s..." filename)) | |
| 1784 (let (;;(byte-compile-current-file (file-name-nondirectory filename)) | |
| 1785 (byte-compile-current-file filename) | |
| 1786 target-file input-buffer output-buffer | |
| 1787 byte-compile-dest-file) | |
| 1788 (setq target-file (byte-compile-dest-file filename)) | |
| 1789 (setq byte-compile-dest-file target-file) | |
| 1790 (save-excursion | |
| 1791 (setq input-buffer (get-buffer-create " *Compiler Input*")) | |
| 1792 (set-buffer input-buffer) | |
| 1793 (erase-buffer) | |
| 1794 (insert-file-contents filename) | |
| 1795 ;; Run hooks including the uncompression hook. | |
| 1796 ;; If they change the file name, then change it for the output also. | |
| 1797 (let ((buffer-file-name filename) | |
| 1798 (default-major-mode 'emacs-lisp-mode) | |
| 1799 (enable-local-eval nil)) | |
| 1800 (normal-mode) | |
| 1801 (setq filename buffer-file-name))) | |
| 1802 (setq byte-compiler-error-flag nil) | |
| 1803 ;; It is important that input-buffer not be current at this call, | |
| 1804 ;; so that the value of point set in input-buffer | |
| 1805 ;; within byte-compile-from-buffer lingers in that buffer. | |
| 1806 (setq output-buffer (byte-compile-from-buffer input-buffer filename)) | |
| 1807 (if byte-compiler-error-flag | |
| 1808 nil | |
| 1809 (if byte-compile-verbose | |
| 1810 (message "Compiling %s...done" filename)) | |
| 1811 (kill-buffer input-buffer) | |
| 1812 (save-excursion | |
| 1813 (set-buffer output-buffer) | |
| 1814 (goto-char (point-max)) | |
| 1815 (insert "\n") ; aaah, unix. | |
| 1816 (setq target-file (byte-compile-dest-file filename)) | |
| 1817 (unless byte-compile-overwrite-file | |
| 1818 (ignore-file-errors (delete-file target-file))) | |
| 1819 (if (file-writable-p target-file) | |
|
4529
6f41fb7f3a65
Protect .elc encoding from latin-unity.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4392
diff
changeset
|
1820 ;; prevent generic hooks from changing our format, eg, |
|
6f41fb7f3a65
Protect .elc encoding from latin-unity.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4392
diff
changeset
|
1821 ;; latin-unity is known to change the coding system! |
|
6f41fb7f3a65
Protect .elc encoding from latin-unity.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4392
diff
changeset
|
1822 (let ((write-region-pre-hook nil)) |
|
6f41fb7f3a65
Protect .elc encoding from latin-unity.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4392
diff
changeset
|
1823 (write-region 1 (point-max) target-file)) |
| 428 | 1824 ;; This is just to give a better error message than write-region |
| 1825 (signal 'file-error | |
| 1826 (list "Opening output file" | |
| 1827 (if (file-exists-p target-file) | |
| 1828 "cannot overwrite file" | |
| 1829 "directory not writable or nonexistent") | |
| 1830 target-file))) | |
| 1831 (or byte-compile-overwrite-file | |
| 1832 (condition-case () | |
| 1833 (set-file-modes target-file (file-modes filename)) | |
| 1834 (error nil))) | |
| 1835 (kill-buffer (current-buffer))) | |
| 1836 (if (and byte-compile-generate-call-tree | |
| 1837 (or (eq t byte-compile-generate-call-tree) | |
| 1838 (y-or-n-p (format "Report call tree for %s? " filename)))) | |
| 1839 (save-excursion | |
| 1840 (display-call-tree filename))) | |
| 1841 (if load | |
| 1842 (load target-file)) | |
| 1843 t))) | |
| 1844 | |
| 1845 ;; RMS comments the next two out. | |
| 1846 | |
| 1847 ;;;###autoload | |
| 1848 (defun byte-compile-and-load-file (&optional filename) | |
| 1849 "Compile a file of Lisp code named FILENAME into a file of byte code, | |
| 1850 and then load it. The output file's name is made by appending \"c\" to | |
| 1851 the end of FILENAME." | |
| 1852 (interactive) | |
| 1853 (if filename ; I don't get it, (interactive-p) doesn't always work | |
| 1854 (byte-compile-file filename t) | |
| 1855 (let ((current-prefix-arg '(4))) | |
| 1856 (call-interactively 'byte-compile-file)))) | |
| 1857 | |
| 1858 ;;;###autoload | |
| 1859 (defun byte-compile-buffer (&optional buffer) | |
| 1860 "Byte-compile and evaluate contents of BUFFER (default: the current buffer)." | |
| 1861 (interactive "bByte compile buffer: ") | |
| 1862 (setq buffer (if buffer (get-buffer buffer) (current-buffer))) | |
| 1863 (message "Compiling %s..." buffer) | |
| 1864 (let* ((filename (or (buffer-file-name buffer) | |
| 1865 (prin1-to-string buffer))) | |
| 1866 (byte-compile-current-file buffer)) | |
| 1867 (byte-compile-from-buffer buffer filename t)) | |
| 1868 (message "Compiling %s...done" buffer) | |
| 1869 t) | |
| 1870 | |
| 1871 ;;; compiling a single function | |
| 1872 ;;;###autoload | |
| 1873 (defun compile-defun (&optional arg) | |
| 1874 "Compile and evaluate the current top-level form. | |
| 1875 Print the result in the minibuffer. | |
| 1876 With argument, insert value in current buffer after the form." | |
| 1877 (interactive "P") | |
| 1878 (save-excursion | |
| 1879 (end-of-defun) | |
| 1880 (beginning-of-defun) | |
| 1881 (let* ((byte-compile-current-file (buffer-file-name)) | |
| 1882 (load-file-name (buffer-file-name)) | |
| 1883 (byte-compile-last-warned-form 'nothing) | |
| 1884 (value (eval (displaying-byte-compile-warnings | |
| 1885 (byte-compile-sexp (read (current-buffer)) | |
| 1886 "toplevel forms"))))) | |
| 1887 (cond (arg | |
| 1888 (message "Compiling from buffer... done.") | |
| 1889 (prin1 value (current-buffer)) | |
| 1890 (insert "\n")) | |
| 1891 ((message "%s" (prin1-to-string value))))))) | |
| 1892 | |
| 1893 (defun byte-compile-from-buffer (byte-compile-inbuffer filename &optional eval) | |
| 1894 ;; buffer --> output-buffer, or buffer --> eval form, return nil | |
| 1895 (let (byte-compile-outbuffer | |
| 1896 ;; Prevent truncation of flonums and lists as we read and print them | |
| 1897 (float-output-format nil) | |
| 1898 (case-fold-search nil) | |
| 1899 (print-length nil) | |
| 1900 (print-level nil) | |
| 1901 ;; Simulate entry to byte-compile-top-level | |
| 1902 (byte-compile-constants nil) | |
| 1903 (byte-compile-variables nil) | |
| 1904 (byte-compile-tag-number 0) | |
| 1905 (byte-compile-depth 0) | |
| 1906 (byte-compile-maxdepth 0) | |
| 1907 (byte-compile-output nil) | |
| 1908 ;; #### This is bound in b-c-close-variables. | |
| 1909 ;; (byte-compile-warnings (if (eq byte-compile-warnings t) | |
| 1910 ;; byte-compile-warning-types | |
| 1911 ;; byte-compile-warnings)) | |
|
4623
a9f83990e6bf
Fix a byte compiler bug with characters above ?\xFF.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4539
diff
changeset
|
1912 (byte-compile-force-escape-quoted byte-compile-force-escape-quoted) |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
1913 (byte-compile-using-dynamic nil)) |
| 428 | 1914 (byte-compile-close-variables |
| 1915 (save-excursion | |
| 1916 (setq byte-compile-outbuffer | |
| 1917 (set-buffer (get-buffer-create " *Compiler Output*"))) | |
| 1918 (erase-buffer) | |
| 1919 ;; (emacs-lisp-mode) | |
| 1920 (setq case-fold-search nil) | |
| 1921 (and filename | |
| 1922 (not eval) | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
1923 (byte-compile-maybe-reset-coding byte-compile-inbuffer |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
1924 byte-compile-outbuffer)) |
|
4623
a9f83990e6bf
Fix a byte compiler bug with characters above ?\xFF.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4539
diff
changeset
|
1925 (setq byte-compile-using-dynamic |
|
a9f83990e6bf
Fix a byte compiler bug with characters above ?\xFF.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4539
diff
changeset
|
1926 (or (symbol-value-in-buffer 'byte-compile-dynamic |
|
a9f83990e6bf
Fix a byte compiler bug with characters above ?\xFF.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4539
diff
changeset
|
1927 byte-compile-inbuffer) |
|
a9f83990e6bf
Fix a byte compiler bug with characters above ?\xFF.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4539
diff
changeset
|
1928 (symbol-value-in-buffer 'byte-compile-dynamic-docstrings |
|
a9f83990e6bf
Fix a byte compiler bug with characters above ?\xFF.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4539
diff
changeset
|
1929 byte-compile-inbuffer))) |
| 428 | 1930 ;; This is a kludge. Some operating systems (OS/2, DOS) need to |
| 1931 ;; write files containing binary information specially. | |
| 1932 ;; Under most circumstances, such files will be in binary | |
| 1933 ;; overwrite mode, so those OS's use that flag to guess how | |
| 1934 ;; they should write their data. Advise them that .elc files | |
| 1935 ;; need to be written carefully. | |
| 1936 (setq overwrite-mode 'overwrite-mode-binary)) | |
| 1937 (displaying-byte-compile-warnings | |
| 1938 (save-excursion | |
|
4623
a9f83990e6bf
Fix a byte compiler bug with characters above ?\xFF.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4539
diff
changeset
|
1939 ;; All our save-excursions may have led to a less-than-useful |
|
a9f83990e6bf
Fix a byte compiler bug with characters above ?\xFF.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4539
diff
changeset
|
1940 ;; value for point in the outbuffer: |
|
a9f83990e6bf
Fix a byte compiler bug with characters above ?\xFF.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4539
diff
changeset
|
1941 (goto-char (point-max byte-compile-outbuffer) byte-compile-outbuffer) |
| 428 | 1942 (set-buffer byte-compile-inbuffer) |
| 1943 (goto-char 1) | |
| 1944 | |
| 1945 ;; Compile the forms from the input buffer. | |
| 1946 (while (progn | |
| 1947 (while (progn (skip-chars-forward " \t\n\^L") | |
| 1948 (looking-at ";")) | |
| 1949 (forward-line 1)) | |
| 1950 (not (eobp))) | |
|
5568
b039c0f018b8
Error if byte-compiling a form hasn't wrapped byte-compile-inbuffer.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5566
diff
changeset
|
1951 (byte-compile-file-form (read byte-compile-inbuffer)) |
|
b039c0f018b8
Error if byte-compiling a form hasn't wrapped byte-compile-inbuffer.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5566
diff
changeset
|
1952 (or (eq byte-compile-inbuffer (current-buffer)) |
|
b039c0f018b8
Error if byte-compiling a form hasn't wrapped byte-compile-inbuffer.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5566
diff
changeset
|
1953 (error 'invalid-state |
|
b039c0f018b8
Error if byte-compiling a form hasn't wrapped byte-compile-inbuffer.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5566
diff
changeset
|
1954 "byte compiling didn't save-excursion appropriately" |
|
b039c0f018b8
Error if byte-compiling a form hasn't wrapped byte-compile-inbuffer.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5566
diff
changeset
|
1955 (current-buffer)))) |
| 428 | 1956 |
| 1957 ;; Compile pending forms at end of file. | |
| 1958 (byte-compile-flush-pending) | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
1959 (byte-compile-insert-header filename byte-compile-inbuffer |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
1960 byte-compile-outbuffer) |
| 428 | 1961 (byte-compile-warn-about-unresolved-functions) |
| 1962 ;; Should we always do this? When calling multiple files, it | |
| 1963 ;; would be useful to delay this warning until all have | |
| 1964 ;; been compiled. | |
| 1965 (setq byte-compile-unresolved-functions nil))) | |
| 1966 (save-excursion | |
| 1967 (set-buffer byte-compile-outbuffer) | |
|
4623
a9f83990e6bf
Fix a byte compiler bug with characters above ?\xFF.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4539
diff
changeset
|
1968 (goto-char (point-min)) |
|
a9f83990e6bf
Fix a byte compiler bug with characters above ?\xFF.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4539
diff
changeset
|
1969 (when (and (or byte-compile-using-dynamic |
|
a9f83990e6bf
Fix a byte compiler bug with characters above ?\xFF.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4539
diff
changeset
|
1970 (eq buffer-file-coding-system 'raw-text-unix)) |
|
a9f83990e6bf
Fix a byte compiler bug with characters above ?\xFF.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4539
diff
changeset
|
1971 (re-search-forward "[^\x00-\xff]" nil t)) |
|
a9f83990e6bf
Fix a byte compiler bug with characters above ?\xFF.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4539
diff
changeset
|
1972 (when (or noninteractive byte-compile-verbose) |
|
a9f83990e6bf
Fix a byte compiler bug with characters above ?\xFF.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4539
diff
changeset
|
1973 (message |
|
a9f83990e6bf
Fix a byte compiler bug with characters above ?\xFF.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4539
diff
changeset
|
1974 "%s: includes char above ?\\xFF, recompiling sans dynamic features." |
|
a9f83990e6bf
Fix a byte compiler bug with characters above ?\xFF.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4539
diff
changeset
|
1975 filename)) |
|
a9f83990e6bf
Fix a byte compiler bug with characters above ?\xFF.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4539
diff
changeset
|
1976 (set-symbol-value-in-buffer 'byte-compile-dynamic nil |
|
a9f83990e6bf
Fix a byte compiler bug with characters above ?\xFF.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4539
diff
changeset
|
1977 byte-compile-inbuffer) |
|
a9f83990e6bf
Fix a byte compiler bug with characters above ?\xFF.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4539
diff
changeset
|
1978 (set-symbol-value-in-buffer 'byte-compile-dynamic-docstrings nil |
|
a9f83990e6bf
Fix a byte compiler bug with characters above ?\xFF.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4539
diff
changeset
|
1979 byte-compile-inbuffer) |
|
a9f83990e6bf
Fix a byte compiler bug with characters above ?\xFF.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4539
diff
changeset
|
1980 (setq byte-compile-force-escape-quoted t |
|
a9f83990e6bf
Fix a byte compiler bug with characters above ?\xFF.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4539
diff
changeset
|
1981 byte-compile-outbuffer |
|
a9f83990e6bf
Fix a byte compiler bug with characters above ?\xFF.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4539
diff
changeset
|
1982 (byte-compile-from-buffer byte-compile-inbuffer |
|
a9f83990e6bf
Fix a byte compiler bug with characters above ?\xFF.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4539
diff
changeset
|
1983 filename eval))))) |
| 428 | 1984 (if (not eval) |
| 1985 byte-compile-outbuffer | |
| 1986 (let (form) | |
| 1987 (while (condition-case nil | |
| 1988 (progn (setq form (read byte-compile-outbuffer)) | |
| 1989 t) | |
| 1990 (end-of-file nil)) | |
| 1991 (eval form))) | |
| 1992 (kill-buffer byte-compile-outbuffer) | |
| 1993 nil))) | |
| 1994 | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
1995 (defvar byte-compile-checks-and-comments-space 475 |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
1996 "Number of octets of space for checks and comments; used by the dynamic |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
1997 docstrings code.") |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
1998 |
| 428 | 1999 (defun byte-compile-insert-header (filename byte-compile-inbuffer |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
2000 byte-compile-outbuffer) |
| 428 | 2001 (set-buffer byte-compile-inbuffer) |
|
4686
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
2002 (let (comments) |
| 428 | 2003 (set-buffer byte-compile-outbuffer) |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
2004 (delete-region 1 (1+ byte-compile-checks-and-comments-space)) |
| 428 | 2005 (goto-char 1) |
| 2006 ;; | |
| 2007 ;; The magic number of .elc files is ";ELC", or 0x3B454C43. After that is | |
| 2008 ;; the file-format version number (19 or 20) as a byte, followed by some | |
| 2009 ;; nulls. The primary motivation for doing this is to get some binary | |
| 2010 ;; characters up in the first line of the file so that `diff' will simply | |
| 2011 ;; say "Binary files differ" instead of actually doing a diff of two .elc | |
| 2012 ;; files. An extra benefit is that you can add this to /etc/magic: | |
| 2013 ;; | |
| 613 | 2014 ;; 0 string ;ELC XEmacs Lisp compiled file, |
| 428 | 2015 ;; >4 byte x version %d |
| 2016 ;; | |
| 2017 (insert | |
| 2018 ";ELC" | |
|
5503
7b5946dbfb96
Drop support for generating code appropriate for Emacs 19, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5475
diff
changeset
|
2019 20 |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
2020 "\000\000\000\n") |
|
5573
f0f1fd0d8486
Remove ELC files from `binary-file-regexps', many of them are escape-quoted.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5568
diff
changeset
|
2021 (insert (format ";;;###coding system: %s\n" |
|
f0f1fd0d8486
Remove ELC files from `binary-file-regexps', many of them are escape-quoted.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5568
diff
changeset
|
2022 (coding-system-name buffer-file-coding-system))) |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
2023 (insert (format |
|
4686
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
2024 "\n(or %s\n (error \"Loading this file requires %s\"))\n" |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
2025 (let ((print-readably t)) |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
2026 (prin1-to-string (if (> (length |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
2027 byte-compile-checks-on-load) |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
2028 1) |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
2029 (cons 'and |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
2030 (setq byte-compile-checks-on-load |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
2031 (reverse |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
2032 byte-compile-checks-on-load))) |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
2033 (car byte-compile-checks-on-load)))) |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
2034 (loop |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
2035 for check in byte-compile-checks-on-load |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
2036 with seen-first = nil |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
2037 with res = "" |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
2038 do |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
2039 (if seen-first |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
2040 (setq res (concat res ", ")) |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
2041 (setq seen-first t)) |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
2042 ;; Print featurep calls differently: |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
2043 (if (and (eq (car check) 'featurep) |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
2044 (eq (car (second check)) 'quote) |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
2045 (symbolp (second (second check)))) |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
2046 (setq res (concat res |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
2047 (symbol-name (second (second check))))) |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
2048 (setq res (concat res |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
2049 (let ((print-readably t)) |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
2050 (prin1-to-string check))))) |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
2051 finally return res))) |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
2052 (setq comments |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
2053 (with-string-as-buffer-contents "" |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
2054 (insert "\n;;; compiled by " |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
2055 (or (and (boundp 'user-mail-address) user-mail-address) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
2056 (concat (user-login-name) "@" (system-name))) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
2057 " on " |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
2058 (current-time-string) "\n;;; from file " filename "\n") |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
2059 (insert ";;; emacs version " emacs-version ".\n") |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
2060 (insert ";;; bytecomp version " byte-compile-version "\n;;; " |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
2061 (cond |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
2062 ((eq byte-optimize 'source) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
2063 "source-level optimization only") |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
2064 ((eq byte-optimize 'byte) "byte-level optimization only") |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
2065 (byte-optimize "optimization is on") |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
2066 (t "optimization is off")) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
2067 "\n"))) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
2068 |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
2069 ;; We won't trip this unless the byte-compiler changes, in which case |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
2070 ;; it's just a matter of upping the space. |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
2071 (assert (natnump (- (1+ byte-compile-checks-and-comments-space) (point))) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
2072 t "Not enough space for the feature checks!") |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
2073 |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
2074 (if (natnump (- (1+ byte-compile-checks-and-comments-space) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
2075 (+ (point) (length comments)))) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
2076 (insert comments)) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
2077 (insert-char ?\ (- (1+ byte-compile-checks-and-comments-space) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
2078 (point))))) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
2079 |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
2080 (defun byte-compile-maybe-reset-coding (byte-compile-inbuffer |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
2081 byte-compile-outbuffer) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
2082 ;; We also reserve some space for the feature checks: |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
2083 (goto-char 1) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
2084 (insert-char ?\ byte-compile-checks-and-comments-space) |
| 771 | 2085 (if (or (featurep '(not mule)) ;; Don't scan buffer if we are not muleized |
|
4623
a9f83990e6bf
Fix a byte compiler bug with characters above ?\xFF.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4539
diff
changeset
|
2086 (and |
|
a9f83990e6bf
Fix a byte compiler bug with characters above ?\xFF.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4539
diff
changeset
|
2087 (not byte-compile-force-escape-quoted) |
|
a9f83990e6bf
Fix a byte compiler bug with characters above ?\xFF.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4539
diff
changeset
|
2088 (save-excursion |
|
a9f83990e6bf
Fix a byte compiler bug with characters above ?\xFF.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4539
diff
changeset
|
2089 (set-buffer byte-compile-inbuffer) |
|
a9f83990e6bf
Fix a byte compiler bug with characters above ?\xFF.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4539
diff
changeset
|
2090 (goto-char (point-min)) |
|
a9f83990e6bf
Fix a byte compiler bug with characters above ?\xFF.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4539
diff
changeset
|
2091 ;; Look for any non-Latin-1 literals or Unicode character |
|
a9f83990e6bf
Fix a byte compiler bug with characters above ?\xFF.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4539
diff
changeset
|
2092 ;; escapes. Any such occurrences in a @#COUNT comment will lead |
|
a9f83990e6bf
Fix a byte compiler bug with characters above ?\xFF.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4539
diff
changeset
|
2093 ;; to an escape-quoted coding cookie being inserted, but this is |
|
a9f83990e6bf
Fix a byte compiler bug with characters above ?\xFF.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4539
diff
changeset
|
2094 ;; not true of ordinary comments. |
|
a9f83990e6bf
Fix a byte compiler bug with characters above ?\xFF.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4539
diff
changeset
|
2095 (let ((non-latin-1-re |
|
a9f83990e6bf
Fix a byte compiler bug with characters above ?\xFF.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4539
diff
changeset
|
2096 (concat "[^\000-\377]" |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
2097 #r"\|\\u[0-9a-fA-F]\{4,4\}\|\\U[0-9a-fA-F]" |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
2098 "\\{8,8\\}")) |
|
4623
a9f83990e6bf
Fix a byte compiler bug with characters above ?\xFF.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4539
diff
changeset
|
2099 (case-fold-search nil)) |
|
a9f83990e6bf
Fix a byte compiler bug with characters above ?\xFF.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4539
diff
changeset
|
2100 (catch 'need-to-escape-quote |
|
a9f83990e6bf
Fix a byte compiler bug with characters above ?\xFF.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4539
diff
changeset
|
2101 (while (re-search-forward non-latin-1-re nil t) |
|
a9f83990e6bf
Fix a byte compiler bug with characters above ?\xFF.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4539
diff
changeset
|
2102 (skip-chars-backward "^;" (point-at-bol)) |
|
a9f83990e6bf
Fix a byte compiler bug with characters above ?\xFF.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4539
diff
changeset
|
2103 (if (bolp) (throw 'need-to-escape-quote nil)) |
|
a9f83990e6bf
Fix a byte compiler bug with characters above ?\xFF.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4539
diff
changeset
|
2104 (forward-line 1)) |
|
a9f83990e6bf
Fix a byte compiler bug with characters above ?\xFF.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4539
diff
changeset
|
2105 t))))) |
| 771 | 2106 (setq buffer-file-coding-system 'raw-text-unix) |
| 2107 (setq buffer-file-coding-system 'escape-quoted) | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
2108 (pushnew '(featurep 'mule) byte-compile-checks-on-load) |
| 771 | 2109 (save-excursion |
| 2110 (set-buffer byte-compile-inbuffer) | |
| 2111 (setq byte-compile-dynamic nil | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
2112 byte-compile-dynamic-docstrings nil)))) |
| 428 | 2113 |
| 2114 (defun byte-compile-output-file-form (form) | |
| 2115 ;; writes the given form to the output buffer, being careful of docstrings | |
| 2116 ;; in defun, defmacro, defvar, defconst and autoload because make-docfile is | |
| 2117 ;; so amazingly stupid. | |
| 2118 ;; defalias calls are output directly by byte-compile-file-form-defmumble; | |
| 2119 ;; it does not pay to first build the defalias in defmumble and then parse | |
| 2120 ;; it here. | |
|
4539
061e030e3270
Fix some bugs in load-history construction, built-in symbol file names.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4529
diff
changeset
|
2121 (if (and (memq (car-safe form) '(defun defmacro defvar defconst autoload |
|
061e030e3270
Fix some bugs in load-history construction, built-in symbol file names.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4529
diff
changeset
|
2122 custom-declare-variable)) |
| 428 | 2123 (stringp (nth 3 form))) |
| 2124 (byte-compile-output-docform nil nil '("\n(" 3 ")") form nil | |
|
4539
061e030e3270
Fix some bugs in load-history construction, built-in symbol file names.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4529
diff
changeset
|
2125 (memq (car form) |
|
061e030e3270
Fix some bugs in load-history construction, built-in symbol file names.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4529
diff
changeset
|
2126 '(autoload custom-declare-variable))) |
|
5560
58b38d5b32d0
Implement print-circle, allowing recursive and circular structures to be read.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5548
diff
changeset
|
2127 (let* ((print-escape-newlines t) |
|
58b38d5b32d0
Implement print-circle, allowing recursive and circular structures to be read.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5548
diff
changeset
|
2128 (print-length nil) |
|
58b38d5b32d0
Implement print-circle, allowing recursive and circular structures to be read.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5548
diff
changeset
|
2129 (print-level nil) |
|
58b38d5b32d0
Implement print-circle, allowing recursive and circular structures to be read.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5548
diff
changeset
|
2130 (print-readably t) ; print #[] for bytecode, 'x for (quote x) |
|
58b38d5b32d0
Implement print-circle, allowing recursive and circular structures to be read.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5548
diff
changeset
|
2131 (print-gensym byte-compile-print-gensym) |
|
58b38d5b32d0
Implement print-circle, allowing recursive and circular structures to be read.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5548
diff
changeset
|
2132 (print-continuous-numbering print-gensym) |
|
58b38d5b32d0
Implement print-circle, allowing recursive and circular structures to be read.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5548
diff
changeset
|
2133 (print-circle t)) |
|
5391
f9dc75bdbdc4
Implement #'load-time-value less hackishly, by modifying the byte compiler.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5377
diff
changeset
|
2134 (when byte-compile-output-preface |
|
f9dc75bdbdc4
Implement #'load-time-value less hackishly, by modifying the byte compiler.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5377
diff
changeset
|
2135 (princ "\n(progn " byte-compile-outbuffer) |
|
f9dc75bdbdc4
Implement #'load-time-value less hackishly, by modifying the byte compiler.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5377
diff
changeset
|
2136 (prin1 byte-compile-output-preface byte-compile-outbuffer)) |
| 428 | 2137 (princ "\n" byte-compile-outbuffer) |
| 2138 (prin1 form byte-compile-outbuffer) | |
|
5391
f9dc75bdbdc4
Implement #'load-time-value less hackishly, by modifying the byte compiler.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5377
diff
changeset
|
2139 (when byte-compile-output-preface (princ ")" byte-compile-outbuffer)) |
| 428 | 2140 nil))) |
| 2141 | |
| 2142 (defun byte-compile-output-docform (preface name info form specindex quoted) | |
| 2143 "Print a form with a doc string. INFO is (prefix doc-index postfix). | |
| 2144 If PREFACE and NAME are non-nil, print them too, | |
| 2145 before INFO and the FORM but after the doc string itself. | |
| 2146 If SPECINDEX is non-nil, it is the index in FORM | |
| 2147 of the function bytecode string. In that case, | |
| 2148 we output that argument and the following argument (the constants vector) | |
| 2149 together, for lazy loading. | |
| 2150 QUOTED says that we have to put a quote before the | |
| 2151 list that represents a doc string reference. | |
| 2152 `autoload' needs that." | |
| 2153 ;; We need to examine byte-compile-dynamic-docstrings | |
| 2154 ;; in the input buffer (now current), not in the output buffer. | |
| 2155 (let ((dynamic-docstrings byte-compile-dynamic-docstrings)) | |
| 2156 (set-buffer | |
| 2157 (prog1 (current-buffer) | |
| 2158 (set-buffer byte-compile-outbuffer) | |
| 2159 (let (position) | |
| 2160 | |
| 2161 ;; Insert the doc string, and make it a comment with #@LENGTH. | |
| 2162 (and (>= (nth 1 info) 0) | |
| 2163 dynamic-docstrings | |
| 2164 (progn | |
| 2165 ;; Make the doc string start at beginning of line | |
| 2166 ;; for make-docfile's sake. | |
| 2167 (insert "\n") | |
| 2168 (setq position | |
| 2169 (byte-compile-output-as-comment | |
| 2170 (nth (nth 1 info) form) nil)) | |
| 2171 ;; If the doc string starts with * (a user variable), | |
| 2172 ;; negate POSITION. | |
| 2173 (if (and (stringp (nth (nth 1 info) form)) | |
| 2174 (> (length (nth (nth 1 info) form)) 0) | |
| 2175 (char= (aref (nth (nth 1 info) form) 0) ?*)) | |
| 2176 (setq position (- position))))) | |
|
5560
58b38d5b32d0
Implement print-circle, allowing recursive and circular structures to be read.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5548
diff
changeset
|
2177 (byte-compile-flush-pending) |
|
58b38d5b32d0
Implement print-circle, allowing recursive and circular structures to be read.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5548
diff
changeset
|
2178 (let* ((print-escape-newlines t) |
|
58b38d5b32d0
Implement print-circle, allowing recursive and circular structures to be read.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5548
diff
changeset
|
2179 (print-readably t) ; print #[] for bytecode, 'x for (quote x) |
|
58b38d5b32d0
Implement print-circle, allowing recursive and circular structures to be read.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5548
diff
changeset
|
2180 (print-gensym byte-compile-print-gensym) |
|
58b38d5b32d0
Implement print-circle, allowing recursive and circular structures to be read.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5548
diff
changeset
|
2181 (print-continuous-numbering print-gensym) |
|
58b38d5b32d0
Implement print-circle, allowing recursive and circular structures to be read.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5548
diff
changeset
|
2182 (print-circle t) |
|
58b38d5b32d0
Implement print-circle, allowing recursive and circular structures to be read.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5548
diff
changeset
|
2183 (index 0)) |
|
5391
f9dc75bdbdc4
Implement #'load-time-value less hackishly, by modifying the byte compiler.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5377
diff
changeset
|
2184 (when byte-compile-output-preface |
|
f9dc75bdbdc4
Implement #'load-time-value less hackishly, by modifying the byte compiler.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5377
diff
changeset
|
2185 (princ "\n(progn " byte-compile-outbuffer) |
|
f9dc75bdbdc4
Implement #'load-time-value less hackishly, by modifying the byte compiler.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5377
diff
changeset
|
2186 (prin1 byte-compile-output-preface byte-compile-outbuffer)) |
|
f9dc75bdbdc4
Implement #'load-time-value less hackishly, by modifying the byte compiler.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5377
diff
changeset
|
2187 (if preface |
|
f9dc75bdbdc4
Implement #'load-time-value less hackishly, by modifying the byte compiler.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5377
diff
changeset
|
2188 (progn |
|
f9dc75bdbdc4
Implement #'load-time-value less hackishly, by modifying the byte compiler.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5377
diff
changeset
|
2189 (insert preface) |
|
f9dc75bdbdc4
Implement #'load-time-value less hackishly, by modifying the byte compiler.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5377
diff
changeset
|
2190 (prin1 name byte-compile-outbuffer))) |
|
f9dc75bdbdc4
Implement #'load-time-value less hackishly, by modifying the byte compiler.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5377
diff
changeset
|
2191 (insert (car info)) |
| 428 | 2192 (prin1 (car form) byte-compile-outbuffer) |
| 2193 (while (setq form (cdr form)) | |
| 2194 (setq index (1+ index)) | |
| 2195 (insert " ") | |
| 2196 (cond ((and (numberp specindex) (= index specindex)) | |
| 2197 (let ((position | |
| 2198 (byte-compile-output-as-comment | |
| 2199 (cons (car form) (nth 1 form)) | |
| 2200 t))) | |
| 2201 (princ (format "(#$ . %d) nil" position) | |
| 2202 byte-compile-outbuffer) | |
| 2203 (setq form (cdr form)) | |
| 2204 (setq index (1+ index)))) | |
| 2205 ((= index (nth 1 info)) | |
| 2206 (if position | |
| 2207 (princ (format (if quoted "'(#$ . %d)" "(#$ . %d)") | |
| 2208 position) | |
| 2209 byte-compile-outbuffer) | |
| 2210 (let ((print-escape-newlines nil)) | |
| 2211 (goto-char (prog1 (1+ (point)) | |
| 2212 (prin1 (car form) | |
| 2213 byte-compile-outbuffer))) | |
| 2214 (insert "\\\n") | |
| 2215 (goto-char (point-max))))) | |
| 2216 (t | |
| 2217 (prin1 (car form) byte-compile-outbuffer))))) | |
|
5391
f9dc75bdbdc4
Implement #'load-time-value less hackishly, by modifying the byte compiler.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5377
diff
changeset
|
2218 (insert (nth 2 info)) |
|
f9dc75bdbdc4
Implement #'load-time-value less hackishly, by modifying the byte compiler.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5377
diff
changeset
|
2219 (when byte-compile-output-preface |
|
f9dc75bdbdc4
Implement #'load-time-value less hackishly, by modifying the byte compiler.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5377
diff
changeset
|
2220 (princ ")" byte-compile-outbuffer)))))) |
| 428 | 2221 nil) |
| 2222 | |
| 2223 (defun byte-compile-keep-pending (form &optional handler) | |
| 2224 (if (memq byte-optimize '(t source)) | |
| 2225 (setq form (byte-optimize-form form t))) | |
| 2226 (if handler | |
| 2227 (let ((for-effect t)) | |
| 2228 ;; To avoid consing up monstrously large forms at load time, we split | |
| 2229 ;; the output regularly. | |
| 2230 (and (memq (car-safe form) '(fset defalias define-function)) | |
| 2231 (nthcdr 300 byte-compile-output) | |
| 2232 (byte-compile-flush-pending)) | |
| 2233 (funcall handler form) | |
| 2234 (when for-effect | |
| 2235 (byte-compile-discard))) | |
| 2236 (byte-compile-form form t)) | |
| 2237 nil) | |
| 2238 | |
| 2239 (defun byte-compile-flush-pending () | |
| 2240 (if byte-compile-output | |
| 2241 (let ((form (byte-compile-out-toplevel t 'file))) | |
| 2242 (cond ((eq (car-safe form) 'progn) | |
|
4783
e29fcfd8df5f
Eliminate most core code byte-compile warnings.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4775
diff
changeset
|
2243 (mapc 'byte-compile-output-file-form (cdr form))) |
| 428 | 2244 (form |
| 2245 (byte-compile-output-file-form form))) | |
| 2246 (setq byte-compile-constants nil | |
| 2247 byte-compile-variables nil | |
| 2248 byte-compile-depth 0 | |
| 2249 byte-compile-maxdepth 0 | |
| 2250 byte-compile-output nil)))) | |
| 2251 | |
| 2252 (defun byte-compile-file-form (form) | |
| 2253 (let ((byte-compile-current-form nil) ; close over this for warnings. | |
|
5391
f9dc75bdbdc4
Implement #'load-time-value less hackishly, by modifying the byte compiler.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5377
diff
changeset
|
2254 (byte-compile-output-preface nil) |
| 428 | 2255 handler) |
| 2256 (cond | |
| 2257 ((not (consp form)) | |
| 2258 (byte-compile-keep-pending form)) | |
| 2259 ((and (symbolp (car form)) | |
| 2260 (setq handler (get (car form) 'byte-hunk-handler))) | |
| 2261 (cond ((setq form (funcall handler form)) | |
| 2262 (byte-compile-flush-pending) | |
| 2263 (byte-compile-output-file-form form)))) | |
| 2264 ((eq form (setq form (macroexpand form byte-compile-macro-environment))) | |
| 2265 (byte-compile-keep-pending form)) | |
| 2266 (t | |
| 2267 (byte-compile-file-form form))))) | |
| 2268 | |
| 2269 ;; Functions and variables with doc strings must be output separately, | |
| 2270 ;; so make-docfile can recognize them. Most other things can be output | |
| 2271 ;; as byte-code. | |
| 2272 | |
| 2273 (put 'defsubst 'byte-hunk-handler 'byte-compile-file-form-defsubst) | |
| 2274 (defun byte-compile-file-form-defsubst (form) | |
| 2275 (cond ((assq (nth 1 form) byte-compile-unresolved-functions) | |
| 2276 (setq byte-compile-current-form (nth 1 form)) | |
| 2277 (byte-compile-warn "defsubst %s was used before it was defined" | |
| 2278 (nth 1 form)))) | |
| 2279 (byte-compile-file-form | |
| 2280 (macroexpand form byte-compile-macro-environment)) | |
| 2281 ;; Return nil so the form is not output twice. | |
| 2282 nil) | |
| 2283 | |
| 2284 (put 'autoload 'byte-hunk-handler 'byte-compile-file-form-autoload) | |
| 2285 (defun byte-compile-file-form-autoload (form) | |
| 2286 ;; | |
| 2287 ;; If this is an autoload of a macro, and all arguments are constants (that | |
| 2288 ;; is, there is no hairy computation going on here) then evaluate the form | |
| 2289 ;; at compile-time. This is so that we can make use of macros which we | |
| 2290 ;; have autoloaded from the file being compiled. Normal function autoloads | |
| 2291 ;; are not automatically evaluated at compile time, because there's not | |
| 2292 ;; much point to it (so why bother cluttering up the compile-time namespace.) | |
| 2293 ;; | |
| 2294 ;; If this is an autoload of a function, then record its definition in the | |
| 2295 ;; byte-compile-autoload-environment to suppress any `not known to be | |
| 2296 ;; defined' warnings at the end of this file (this only matters for | |
| 2297 ;; functions which are autoloaded and compiled in the same file, if the | |
| 2298 ;; autoload already exists in the compilation environment, we wouldn't have | |
| 2299 ;; warned anyway.) | |
| 2300 ;; | |
| 2301 (let* ((name (if (byte-compile-constp (nth 1 form)) | |
| 2302 (eval (nth 1 form)))) | |
| 2303 ;; In v19, the 5th arg to autoload can be t, nil, 'macro, or 'keymap. | |
| 2304 (macrop (and (byte-compile-constp (nth 5 form)) | |
| 2305 (memq (eval (nth 5 form)) '(t macro)))) | |
| 2306 ;; (functionp (and (byte-compile-constp (nth 5 form)) | |
| 2307 ;; (eq 'nil (eval (nth 5 form))))) | |
| 2308 ) | |
| 2309 (if (and macrop | |
| 2310 (let ((form form)) | |
| 2311 ;; all forms are constant | |
| 2312 (while (if (setq form (cdr form)) | |
| 2313 (byte-compile-constp (car form)))) | |
| 2314 (null form))) | |
| 440 | 2315 ;; eval the macro autoload into the compilation environment |
| 428 | 2316 (eval form)) |
| 2317 | |
| 2318 (if name | |
| 2319 (let ((old (assq name byte-compile-autoload-environment))) | |
| 2320 (cond (old | |
| 2321 (if (memq 'redefine byte-compile-warnings) | |
| 2322 (byte-compile-warn "multiple autoloads for %s" name)) | |
| 2323 (setcdr old form)) | |
| 2324 (t | |
| 2325 ;; We only use the names in the autoload environment, but | |
| 2326 ;; it might be useful to have the bodies some day. | |
| 2327 (setq byte-compile-autoload-environment | |
| 2328 (cons (cons name form) | |
| 2329 byte-compile-autoload-environment))))))) | |
| 2330 ;; | |
| 2331 ;; Now output the form. | |
| 2332 (if (stringp (nth 3 form)) | |
| 2333 form | |
| 2334 ;; No doc string, so we can compile this as a normal form. | |
| 2335 (byte-compile-keep-pending form 'byte-compile-normal-call))) | |
| 2336 | |
| 442 | 2337 (put 'defvar 'byte-hunk-handler 'byte-compile-file-form-defvar-or-defconst) |
| 2338 (put 'defconst 'byte-hunk-handler 'byte-compile-file-form-defvar-or-defconst) | |
| 2339 (defun byte-compile-file-form-defvar-or-defconst (form) | |
| 2340 ;; (defvar|defconst VAR [VALUE [DOCSTRING]]) | |
| 428 | 2341 (if (> (length form) 4) |
| 442 | 2342 (byte-compile-warn |
| 2343 "%s %s called with %d arguments, but accepts only %s" | |
| 2344 (car form) (nth 1 form) (length (cdr form)) 3)) | |
| 428 | 2345 (if (and (> (length form) 3) (not (stringp (nth 3 form)))) |
| 2346 (byte-compile-warn "Third arg to %s %s is not a string: %s" | |
| 2347 (car form) (nth 1 form) (nth 3 form))) | |
| 2348 (if (null (nth 3 form)) | |
| 2349 ;; Since there is no doc string, we can compile this as a normal form, | |
| 2350 ;; and not do a file-boundary. | |
| 2351 (byte-compile-keep-pending form) | |
| 2352 (if (memq 'free-vars byte-compile-warnings) | |
| 2353 (setq byte-compile-bound-variables | |
| 2354 (cons (cons (nth 1 form) byte-compile-global-bit) | |
| 2355 byte-compile-bound-variables))) | |
| 2356 (cond ((consp (nth 2 form)) | |
| 2357 (setq form (copy-sequence form)) | |
| 2358 (setcar (cdr (cdr form)) | |
| 2359 (byte-compile-top-level (nth 2 form) nil 'file)))) | |
| 2360 | |
| 2361 ;; The following turns out not to be necessary, since we emit a call to | |
| 2362 ;; defvar, which can hack Vfile_domain by itself! | |
| 2363 ;; | |
| 2364 ;; If a file domain has been set, emit (put 'VAR 'variable-domain ...) | |
| 2365 ;; after this defvar. | |
| 2366 ; (if byte-compile-file-domain | |
| 2367 ; (progn | |
| 2368 ; ;; Actually, this will emit the (put ...) before the (defvar ...) | |
| 2369 ; ;; but I don't think that can matter in this case. | |
| 2370 ; (byte-compile-keep-pending | |
| 2371 ; (list 'put (list 'quote (nth 1 form)) ''variable-domain | |
| 2372 ; (list 'quote byte-compile-file-domain))))) | |
| 2373 form)) | |
| 2374 | |
| 2375 (put 'require 'byte-hunk-handler 'byte-compile-file-form-eval-boundary) | |
| 2376 (defun byte-compile-file-form-eval-boundary (form) | |
| 2377 (eval form) | |
| 2378 (byte-compile-keep-pending form 'byte-compile-normal-call)) | |
| 2379 | |
|
4686
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
2380 ;; XEmacs change: be careful about multiple values with these three forms. |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
2381 (put 'progn 'byte-hunk-handler |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
2382 #'(lambda (form) |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
2383 (mapc 'byte-compile-file-form (cdr form)) |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
2384 ;; Return nil so the forms are not output twice. |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
2385 nil)) |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
2386 |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
2387 (put 'prog1 'byte-hunk-handler |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
2388 #'(lambda (form) |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
2389 (when (first form) |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
2390 (byte-compile-file-form `(or ,(first form) nil)) |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
2391 (mapc 'byte-compile-file-form (cdr form)) |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
2392 nil))) |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
2393 |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
2394 (put 'prog2 'byte-hunk-handler |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
2395 #'(lambda (form) |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
2396 (when (first form) |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
2397 (byte-compile-file-form (first form)) |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
2398 (when (second form) |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
2399 (setq form (cdr form)) |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
2400 (byte-compile-file-form `(or ,(first form) nil)) |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
2401 (mapc 'byte-compile-file-form (cdr form)) |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
2402 nil)))) |
| 428 | 2403 |
| 2404 ;; This handler is not necessary, but it makes the output from dont-compile | |
| 2405 ;; and similar macros cleaner. | |
| 2406 (put 'eval 'byte-hunk-handler 'byte-compile-file-form-eval) | |
| 2407 (defun byte-compile-file-form-eval (form) | |
| 2408 (if (eq (car-safe (nth 1 form)) 'quote) | |
| 2409 (nth 1 (nth 1 form)) | |
| 2410 (byte-compile-keep-pending form))) | |
| 2411 | |
| 2412 (put 'defun 'byte-hunk-handler 'byte-compile-file-form-defun) | |
| 2413 (defun byte-compile-file-form-defun (form) | |
| 2414 (byte-compile-file-form-defmumble form nil)) | |
| 2415 | |
| 2416 (put 'defmacro 'byte-hunk-handler 'byte-compile-file-form-defmacro) | |
| 2417 (defun byte-compile-file-form-defmacro (form) | |
| 2418 (byte-compile-file-form-defmumble form t)) | |
| 2419 | |
| 2420 (defun byte-compile-file-form-defmumble (form macrop) | |
| 2421 (let* ((name (car (cdr form))) | |
| 2422 (this-kind (if macrop 'byte-compile-macro-environment | |
| 2423 'byte-compile-function-environment)) | |
| 2424 (that-kind (if macrop 'byte-compile-function-environment | |
| 2425 'byte-compile-macro-environment)) | |
| 2426 (this-one (assq name (symbol-value this-kind))) | |
| 2427 (that-one (assq name (symbol-value that-kind))) | |
| 2428 (byte-compile-free-references nil) | |
| 2429 (byte-compile-free-assignments nil)) | |
| 2430 | |
| 2431 ;; When a function or macro is defined, add it to the call tree so that | |
| 2432 ;; we can tell when functions are not used. | |
| 2433 (if byte-compile-generate-call-tree | |
| 2434 (or (assq name byte-compile-call-tree) | |
| 2435 (setq byte-compile-call-tree | |
| 2436 (cons (list name nil nil) byte-compile-call-tree)))) | |
| 2437 | |
| 2438 (setq byte-compile-current-form name) ; for warnings | |
| 2439 (when (memq 'redefine byte-compile-warnings) | |
| 2440 (byte-compile-arglist-warn form macrop)) | |
| 2441 (defvar filename) ; #### filename used free | |
| 2442 (when byte-compile-verbose | |
| 2443 (message "Compiling %s... (%s)" | |
| 2444 (if filename (file-name-nondirectory filename) "") | |
| 2445 (nth 1 form))) | |
| 2446 (cond (that-one | |
| 2447 (when (and (memq 'redefine byte-compile-warnings) | |
| 2448 ;; hack hack: don't warn when compiling the stubs in | |
| 2449 ;; bytecomp-runtime... | |
| 2450 (not (assq (nth 1 form) | |
| 2451 byte-compile-initial-macro-environment))) | |
| 2452 (byte-compile-warn | |
| 2453 "%s defined multiple times, as both function and macro" | |
| 2454 (nth 1 form))) | |
| 2455 (setcdr that-one nil)) | |
| 2456 (this-one | |
| 2457 (when (and (memq 'redefine byte-compile-warnings) | |
| 2458 ;; hack: don't warn when compiling the magic internal | |
| 2459 ;; byte-compiler macros in bytecomp-runtime.el... | |
| 2460 (not (assq (nth 1 form) | |
| 2461 byte-compile-initial-macro-environment))) | |
| 2462 (byte-compile-warn "%s %s defined multiple times in this file" | |
| 2463 (if macrop "macro" "function") | |
| 2464 (nth 1 form)))) | |
| 2465 ((and (fboundp name) | |
| 2466 (or (subrp (symbol-function name)) | |
| 2467 (eq (car-safe (symbol-function name)) | |
| 2468 (if macrop 'lambda 'macro)))) | |
| 2469 (if (memq 'redefine byte-compile-warnings) | |
| 2470 (byte-compile-warn "%s %s being redefined as a %s" | |
| 2471 (if (subrp (symbol-function name)) | |
| 2472 "subr" | |
| 2473 (if macrop "function" "macro")) | |
| 2474 (nth 1 form) | |
| 2475 (if macrop "macro" "function"))) | |
| 2476 ;; shadow existing definition | |
| 2477 (set this-kind | |
| 2478 (cons (cons name nil) (symbol-value this-kind))))) | |
| 2479 (let ((body (nthcdr 3 form))) | |
| 2480 (if (and (stringp (car body)) | |
| 2481 (symbolp (car-safe (cdr-safe body))) | |
| 2482 (car-safe (cdr-safe body)) | |
| 2483 (stringp (car-safe (cdr-safe (cdr-safe body))))) | |
| 2484 (byte-compile-warn "Probable `\"' without `\\' in doc string of %s" | |
| 2485 (nth 1 form)))) | |
|
5506
b0d87f92e60b
Complete support for macro-declaration-function, bytecomp{,-runtime}.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5503
diff
changeset
|
2486 |
|
b0d87f92e60b
Complete support for macro-declaration-function, bytecomp{,-runtime}.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5503
diff
changeset
|
2487 ;; Generate code for declarations in macro definitions. |
|
b0d87f92e60b
Complete support for macro-declaration-function, bytecomp{,-runtime}.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5503
diff
changeset
|
2488 ;; Remove declarations from the body of the macro definition. |
|
b0d87f92e60b
Complete support for macro-declaration-function, bytecomp{,-runtime}.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5503
diff
changeset
|
2489 (when macrop |
|
b0d87f92e60b
Complete support for macro-declaration-function, bytecomp{,-runtime}.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5503
diff
changeset
|
2490 (let ((byte-compile-defmacro-body (nthcdr 3 form))) |
|
b0d87f92e60b
Complete support for macro-declaration-function, bytecomp{,-runtime}.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5503
diff
changeset
|
2491 (if (stringp (car byte-compile-defmacro-body)) |
|
b0d87f92e60b
Complete support for macro-declaration-function, bytecomp{,-runtime}.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5503
diff
changeset
|
2492 (setq byte-compile-defmacro-body (nthcdr 4 form))) |
|
b0d87f92e60b
Complete support for macro-declaration-function, bytecomp{,-runtime}.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5503
diff
changeset
|
2493 (when (and (consp byte-compile-defmacro-body) |
|
b0d87f92e60b
Complete support for macro-declaration-function, bytecomp{,-runtime}.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5503
diff
changeset
|
2494 (eq 'declare (car-safe (car byte-compile-defmacro-body)))) |
|
b0d87f92e60b
Complete support for macro-declaration-function, bytecomp{,-runtime}.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5503
diff
changeset
|
2495 (if (eq 'declare (car-safe (car-safe |
|
b0d87f92e60b
Complete support for macro-declaration-function, bytecomp{,-runtime}.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5503
diff
changeset
|
2496 (cdr byte-compile-defmacro-body)))) |
|
b0d87f92e60b
Complete support for macro-declaration-function, bytecomp{,-runtime}.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5503
diff
changeset
|
2497 (byte-compile-warn "Multiple macro-specific `declare' calls \ |
|
b0d87f92e60b
Complete support for macro-declaration-function, bytecomp{,-runtime}.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5503
diff
changeset
|
2498 not supported by XEmacs.")) |
|
b0d87f92e60b
Complete support for macro-declaration-function, bytecomp{,-runtime}.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5503
diff
changeset
|
2499 (setq byte-compile-output-preface |
|
b0d87f92e60b
Complete support for macro-declaration-function, bytecomp{,-runtime}.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5503
diff
changeset
|
2500 (byte-compile-top-level |
|
b0d87f92e60b
Complete support for macro-declaration-function, bytecomp{,-runtime}.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5503
diff
changeset
|
2501 `(progn (and macro-declaration-function |
|
b0d87f92e60b
Complete support for macro-declaration-function, bytecomp{,-runtime}.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5503
diff
changeset
|
2502 (funcall macro-declaration-function |
|
b0d87f92e60b
Complete support for macro-declaration-function, bytecomp{,-runtime}.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5503
diff
changeset
|
2503 ',name |
|
b0d87f92e60b
Complete support for macro-declaration-function, bytecomp{,-runtime}.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5503
diff
changeset
|
2504 ',(car byte-compile-defmacro-body))) |
|
b0d87f92e60b
Complete support for macro-declaration-function, bytecomp{,-runtime}.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5503
diff
changeset
|
2505 ,byte-compile-output-preface) t 'file))))) |
| 428 | 2506 (let* ((new-one (byte-compile-lambda (cons 'lambda (nthcdr 2 form)))) |
|
5106
8c3671b62dad
Remove #'byte-compile-compiled-obj-to-list, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5089
diff
changeset
|
2507 (code (byte-compile-byte-code-maker new-one)) |
|
8c3671b62dad
Remove #'byte-compile-compiled-obj-to-list, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5089
diff
changeset
|
2508 (docform-info |
|
8c3671b62dad
Remove #'byte-compile-compiled-obj-to-list, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5089
diff
changeset
|
2509 (cond ((atom code) ; compiled-function-p |
|
5391
f9dc75bdbdc4
Implement #'load-time-value less hackishly, by modifying the byte compiler.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5377
diff
changeset
|
2510 (if macrop '(" '(macro . #[" 4 "]))") '(" #[" 4 "])"))) |
|
5106
8c3671b62dad
Remove #'byte-compile-compiled-obj-to-list, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5089
diff
changeset
|
2511 ((eq (car code) 'quote) |
|
8c3671b62dad
Remove #'byte-compile-compiled-obj-to-list, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5089
diff
changeset
|
2512 (setq code new-one) |
|
5391
f9dc75bdbdc4
Implement #'load-time-value less hackishly, by modifying the byte compiler.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5377
diff
changeset
|
2513 (if macrop '(" '(macro " 2 "))") '(" '(" 2 "))"))) |
|
f9dc75bdbdc4
Implement #'load-time-value less hackishly, by modifying the byte compiler.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5377
diff
changeset
|
2514 ((if macrop '(" (cons 'macro (" 5 ")))") '(" (" 5 "))")))))) |
| 428 | 2515 (if this-one |
| 2516 (setcdr this-one new-one) | |
| 2517 (set this-kind | |
| 2518 (cons (cons name new-one) (symbol-value this-kind)))) | |
| 2519 (if (and (stringp (nth 3 form)) | |
| 2520 (eq 'quote (car-safe code)) | |
| 2521 (eq 'lambda (car-safe (nth 1 code)))) | |
| 2522 (cons (car form) | |
|
5106
8c3671b62dad
Remove #'byte-compile-compiled-obj-to-list, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5089
diff
changeset
|
2523 (cons name (cdr (nth 1 code)))) |
| 428 | 2524 (byte-compile-flush-pending) |
| 2525 (if (not (stringp (nth 3 form))) | |
|
5106
8c3671b62dad
Remove #'byte-compile-compiled-obj-to-list, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5089
diff
changeset
|
2526 ;; No doc string. Provide -1 as the "doc string index" so that |
|
8c3671b62dad
Remove #'byte-compile-compiled-obj-to-list, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5089
diff
changeset
|
2527 ;; no element will be treated as a doc string by |
|
8c3671b62dad
Remove #'byte-compile-compiled-obj-to-list, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5089
diff
changeset
|
2528 ;; byte-compile-output-doc-form. |
|
8c3671b62dad
Remove #'byte-compile-compiled-obj-to-list, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5089
diff
changeset
|
2529 (setq docform-info (list (first docform-info) -1 |
|
8c3671b62dad
Remove #'byte-compile-compiled-obj-to-list, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5089
diff
changeset
|
2530 (third docform-info)))) |
|
8c3671b62dad
Remove #'byte-compile-compiled-obj-to-list, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5089
diff
changeset
|
2531 (byte-compile-output-docform |
|
8c3671b62dad
Remove #'byte-compile-compiled-obj-to-list, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5089
diff
changeset
|
2532 "\n(defalias '" |
|
8c3671b62dad
Remove #'byte-compile-compiled-obj-to-list, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5089
diff
changeset
|
2533 name |
|
8c3671b62dad
Remove #'byte-compile-compiled-obj-to-list, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5089
diff
changeset
|
2534 docform-info |
|
8c3671b62dad
Remove #'byte-compile-compiled-obj-to-list, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5089
diff
changeset
|
2535 ;; The result of byte-compile-byte-code-maker is either a |
|
8c3671b62dad
Remove #'byte-compile-compiled-obj-to-list, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5089
diff
changeset
|
2536 ;; compiled-function object, or a list of some kind. If it's not a |
|
8c3671b62dad
Remove #'byte-compile-compiled-obj-to-list, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5089
diff
changeset
|
2537 ;; cons, we must coerce it into a list of the elements to be |
|
8c3671b62dad
Remove #'byte-compile-compiled-obj-to-list, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5089
diff
changeset
|
2538 ;; printed to the file. |
|
8c3671b62dad
Remove #'byte-compile-compiled-obj-to-list, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5089
diff
changeset
|
2539 (if (consp code) |
|
8c3671b62dad
Remove #'byte-compile-compiled-obj-to-list, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5089
diff
changeset
|
2540 code |
|
5391
f9dc75bdbdc4
Implement #'load-time-value less hackishly, by modifying the byte compiler.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5377
diff
changeset
|
2541 (list* (compiled-function-arglist code) |
|
f9dc75bdbdc4
Implement #'load-time-value less hackishly, by modifying the byte compiler.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5377
diff
changeset
|
2542 (compiled-function-instructions code) |
|
f9dc75bdbdc4
Implement #'load-time-value less hackishly, by modifying the byte compiler.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5377
diff
changeset
|
2543 (compiled-function-constants code) |
|
f9dc75bdbdc4
Implement #'load-time-value less hackishly, by modifying the byte compiler.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5377
diff
changeset
|
2544 (compiled-function-stack-depth code) |
|
f9dc75bdbdc4
Implement #'load-time-value less hackishly, by modifying the byte compiler.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5377
diff
changeset
|
2545 (compiled-function-doc-string code) |
|
5106
8c3671b62dad
Remove #'byte-compile-compiled-obj-to-list, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5089
diff
changeset
|
2546 (if (commandp code) |
|
8c3671b62dad
Remove #'byte-compile-compiled-obj-to-list, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5089
diff
changeset
|
2547 (list (nth 1 (compiled-function-interactive code)))))) |
|
8c3671b62dad
Remove #'byte-compile-compiled-obj-to-list, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5089
diff
changeset
|
2548 (and (atom code) byte-compile-dynamic |
|
8c3671b62dad
Remove #'byte-compile-compiled-obj-to-list, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5089
diff
changeset
|
2549 1) |
| 428 | 2550 nil)) |
|
5106
8c3671b62dad
Remove #'byte-compile-compiled-obj-to-list, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5089
diff
changeset
|
2551 nil))) |
| 428 | 2552 |
| 2553 ;; Print Lisp object EXP in the output file, inside a comment, | |
| 2554 ;; and return the file position it will have. | |
| 2555 ;; If QUOTED is non-nil, print with quoting; otherwise, print without quoting. | |
| 2556 (defun byte-compile-output-as-comment (exp quoted) | |
| 2557 (let ((position (point))) | |
| 2558 (set-buffer | |
| 2559 (prog1 (current-buffer) | |
| 2560 (set-buffer byte-compile-outbuffer) | |
| 2561 | |
| 2562 ;; Insert EXP, and make it a comment with #@LENGTH. | |
| 2563 (insert " ") | |
| 2564 (if quoted | |
| 2565 (prin1 exp byte-compile-outbuffer) | |
| 2566 (princ exp byte-compile-outbuffer)) | |
| 2567 (goto-char position) | |
| 2568 ;; Quote certain special characters as needed. | |
| 2569 ;; get_doc_string in doc.c does the unquoting. | |
| 2570 (while (search-forward "\^A" nil t) | |
| 2571 (replace-match "\^A\^A" t t)) | |
| 2572 (goto-char position) | |
| 2573 (while (search-forward "\000" nil t) | |
| 2574 (replace-match "\^A0" t t)) | |
| 2575 (goto-char position) | |
| 2576 (while (search-forward "\037" nil t) | |
| 2577 (replace-match "\^A_" t t)) | |
| 2578 (goto-char (point-max)) | |
| 2579 (insert "\037") | |
| 2580 (goto-char position) | |
| 2581 (insert "#@" (format "%d" (- (point-max) position))) | |
| 2582 | |
| 2583 ;; Save the file position of the object. | |
| 2584 ;; Note we should add 1 to skip the space | |
| 2585 ;; that we inserted before the actual doc string, | |
| 2586 ;; and subtract 1 to convert from an 1-origin Emacs position | |
| 2587 ;; to a file position; they cancel. | |
| 2588 (setq position (point)) | |
| 2589 (goto-char (point-max)))) | |
| 2590 position)) | |
| 2591 | |
| 2592 | |
| 2593 | |
| 2594 ;; The `domain' declaration. This is legal only at top-level in a file, and | |
| 2595 ;; should generally be the first form in the file. It is not legal inside | |
| 2596 ;; function bodies. | |
| 2597 | |
| 2598 (put 'domain 'byte-hunk-handler 'byte-compile-file-form-domain) | |
| 2599 (defun byte-compile-file-form-domain (form) | |
| 2600 (if (not (null (cdr (cdr form)))) | |
| 2601 (byte-compile-warn "domain used with too many arguments: %s" form)) | |
| 2602 (let ((domain (nth 1 form))) | |
| 2603 (or (null domain) | |
| 2604 (stringp domain) | |
| 2605 (progn | |
| 2606 (byte-compile-warn | |
| 2607 "argument to `domain' declaration must be a literal string: %s" | |
| 2608 form) | |
| 2609 (setq domain nil))) | |
| 2610 (setq byte-compile-file-domain domain)) | |
| 2611 (byte-compile-keep-pending form 'byte-compile-normal-call)) | |
| 2612 | |
| 2613 (defun byte-compile-domain (form) | |
| 2614 (byte-compile-warn "The `domain' declaration is legal only at top-level: %s" | |
| 2615 (let ((print-escape-newlines t) | |
| 2616 (print-level 4) | |
| 2617 (print-length 4)) | |
| 2618 (prin1-to-string form))) | |
| 2619 (byte-compile-normal-call | |
| 2620 (list 'signal ''error | |
| 2621 (list 'quote (list "`domain' used inside a function" form))))) | |
| 2622 | |
| 2623 ;; This is part of bytecomp.el in 19.35: | |
| 2624 (put 'custom-declare-variable 'byte-hunk-handler | |
| 2625 'byte-compile-file-form-custom-declare-variable) | |
| 2626 (defun byte-compile-file-form-custom-declare-variable (form) | |
| 4289 | 2627 ;; XEmacs change; our implementation byte compiles and gives warnings |
| 2628 ;; about the default value code, which GNU's doesn't. | |
| 2629 (let* ((quoted-default (car-safe (cdr-safe (cdr-safe form)))) | |
| 2630 (to-examine (car-safe (cdr-safe quoted-default)))) | |
| 2631 (if (memq 'free-vars byte-compile-warnings) | |
| 2632 (setq byte-compile-bound-variables | |
| 2633 (cons (cons (nth 1 (nth 1 form)) | |
| 2634 byte-compile-global-bit) | |
| 2635 byte-compile-bound-variables))) | |
| 2636 ;; Byte compile anything that smells like a lambda. I initially | |
| 2637 ;; considered limiting it to the :initialize, :set and :get args, but | |
| 2638 ;; that's not amazingly forward-compatible, and anyone expecting other | |
| 2639 ;; things to be stored as data, not code, is unrealistic. | |
| 2640 (loop | |
| 2641 for entry in-ref (nthcdr 4 form) | |
| 2642 do (cond ((and (eq 'function (car-safe entry)) | |
| 2643 (consp (car-safe (cdr-safe entry)))) | |
| 2644 (setf entry (copy-sequence entry)) | |
| 2645 (setcar (cdr entry) (byte-compile-lambda (car (cdr entry))))) | |
| 2646 ((and (eq 'lambda (car-safe entry))) | |
| 2647 (setf entry (byte-compile-lambda entry))))) | |
| 2648 ;; Byte compile the default value, as we do for defvar. | |
| 2649 (when (consp (cdr-safe to-examine)) | |
| 2650 (setq form (copy-sequence form)) | |
| 2651 (setcdr (third form) | |
| 2652 (list (byte-compile-top-level to-examine nil 'file))) | |
| 2653 ;; And save a value to be examined in the custom UI, if that differs | |
| 2654 ;; from the init value. | |
| 2655 (unless (equal to-examine (car-safe (cdr (third form)))) | |
| 4304 | 2656 (setcdr (third form) |
| 2657 (list (byte-compile-top-level | |
| 2658 ;; This is ugly. custom-declare-variable errors if | |
| 2659 ;; it's passed a keyword it doesn't know about, and | |
| 2660 ;; so to make this code run on 21.4, we add code to | |
| 2661 ;; modify the standard-value property to the | |
| 2662 ;; byte-compiled value for DEFAULT. | |
| 2663 `(prog2 (put ,(second form) 'standard-value | |
| 2664 '(,to-examine)) | |
| 2665 ,to-examine) | |
| 2666 nil 'file))))) | |
| 4289 | 2667 form)) |
| 428 | 2668 |
| 2669 ;;;###autoload | |
| 2670 (defun byte-compile (form) | |
| 2671 "If FORM is a symbol, byte-compile its function definition. | |
| 2672 If FORM is a lambda or a macro, byte-compile it as a function." | |
| 2673 (displaying-byte-compile-warnings | |
| 2674 (byte-compile-close-variables | |
| 2675 (let* ((fun (if (symbolp form) | |
| 2676 (and (fboundp form) (symbol-function form)) | |
| 2677 form)) | |
| 2678 (macro (eq (car-safe fun) 'macro))) | |
| 2679 (if macro | |
| 2680 (setq fun (cdr fun))) | |
| 2681 (cond ((eq (car-safe fun) 'lambda) | |
| 2682 (setq fun (if macro | |
| 2683 (cons 'macro (byte-compile-lambda fun)) | |
| 2684 (byte-compile-lambda fun))) | |
| 2685 (if (symbolp form) | |
| 2686 (defalias form fun) | |
| 2687 fun))))))) | |
| 2688 | |
| 2689 ;;;###autoload | |
| 2690 (defun byte-compile-sexp (sexp &optional msg) | |
| 2691 "Compile and return SEXP." | |
| 2692 (displaying-byte-compile-warnings | |
| 2693 (byte-compile-close-variables | |
| 2694 (prog1 | |
| 2695 (byte-compile-top-level sexp) | |
| 2696 (byte-compile-warn-about-unresolved-functions msg))))) | |
| 2697 | |
| 2698 ;; Given a function made by byte-compile-lambda, make a form which produces it. | |
| 2699 (defun byte-compile-byte-code-maker (fun) | |
| 2700 (cond | |
| 2701 ;; ## atom is faster than compiled-func-p. | |
| 2702 ((atom fun) ; compiled-function-p | |
| 2703 fun) | |
| 2704 ;; b-c-lambda didn't produce a compiled-function, so it must be a trivial | |
| 2705 ;; function. | |
| 2706 ((let (tmp) | |
| 2707 (if (and (setq tmp (assq 'byte-code (cdr-safe (cdr fun)))) | |
| 2708 (null (cdr (memq tmp fun)))) | |
| 2709 ;; Generate a make-byte-code call. | |
| 2710 (let* ((interactive (assq 'interactive (cdr (cdr fun))))) | |
| 2711 (nconc (list 'make-byte-code | |
| 2712 (list 'quote (nth 1 fun)) ;arglist | |
| 2713 (nth 1 tmp) ;instructions | |
| 2714 (nth 2 tmp) ;constants | |
| 2715 (nth 3 tmp)) ;stack-depth | |
| 2716 (cond ((stringp (nth 2 fun)) | |
| 2717 (list (nth 2 fun))) ;docstring | |
| 2718 (interactive | |
| 2719 (list nil))) | |
| 2720 (cond (interactive | |
| 2721 (list (if (or (null (nth 1 interactive)) | |
| 2722 (stringp (nth 1 interactive))) | |
| 2723 (nth 1 interactive) | |
| 2724 ;; Interactive spec is a list or a variable | |
| 2725 ;; (if it is correct). | |
| 2726 (list 'quote (nth 1 interactive)))))))) | |
| 2727 ;; a non-compiled function (probably trivial) | |
| 2728 (list 'quote fun)))))) | |
| 2729 | |
| 2730 ;; Byte-compile a lambda-expression and return a valid function. | |
| 2731 ;; The value is usually a compiled function but may be the original | |
| 2732 ;; lambda-expression. | |
| 2733 (defun byte-compile-lambda (fun) | |
| 2734 (or (eq 'lambda (car-safe fun)) | |
| 2735 (error "not a lambda -- %s" (prin1-to-string fun))) | |
| 2736 (let* ((arglist (nth 1 fun)) | |
| 2737 (byte-compile-bound-variables | |
| 2738 (let ((new-bindings | |
| 2739 (mapcar #'(lambda (x) (cons x byte-compile-arglist-bit)) | |
| 2740 (and (memq 'free-vars byte-compile-warnings) | |
| 2741 (delq '&rest (delq '&optional | |
| 2742 (copy-sequence arglist))))))) | |
| 2743 (nconc new-bindings | |
| 2744 (cons 'new-scope byte-compile-bound-variables)))) | |
| 2745 (body (cdr (cdr fun))) | |
| 2746 (doc (if (stringp (car body)) | |
| 2747 (prog1 (car body) | |
| 1548 | 2748 ;; Discard the doc string |
| 2749 ;; only if it is not the only element of the body. | |
| 2750 (if (cdr body) | |
| 2751 (setq body (cdr body)))))) | |
|
4639
7757334005ae
bytecomp.el: always check code in (interactive SEXP) for sanity
Aidan Kehoe <kehoea@parhasard.net>
parents:
4623
diff
changeset
|
2752 (int (assq 'interactive body)) compiled-int) |
| 428 | 2753 (dolist (arg arglist) |
| 2754 (cond ((not (symbolp arg)) | |
| 2755 (byte-compile-warn "non-symbol in arglist: %S" arg)) | |
| 2756 ((byte-compile-constant-symbol-p arg) | |
| 2757 (byte-compile-warn "constant symbol in arglist: %s" arg)) | |
| 2758 ((and (char= ?\& (aref (symbol-name arg) 0)) | |
| 2759 (not (eq arg '&optional)) | |
| 2760 (not (eq arg '&rest))) | |
| 2761 (byte-compile-warn "unrecognized `&' keyword in arglist: %s" | |
| 2762 arg)))) | |
| 2763 (cond (int | |
| 2764 ;; Skip (interactive) if it is in front (the most usual location). | |
| 2765 (if (eq int (car body)) | |
| 2766 (setq body (cdr body))) | |
| 2767 (cond ((consp (cdr int)) | |
| 2768 (if (cdr (cdr int)) | |
| 2769 (byte-compile-warn "malformed interactive spec: %s" | |
| 2770 (prin1-to-string int))) | |
|
4639
7757334005ae
bytecomp.el: always check code in (interactive SEXP) for sanity
Aidan Kehoe <kehoea@parhasard.net>
parents:
4623
diff
changeset
|
2771 ;; If the interactive spec is a call to `list', don't |
|
7757334005ae
bytecomp.el: always check code in (interactive SEXP) for sanity
Aidan Kehoe <kehoea@parhasard.net>
parents:
4623
diff
changeset
|
2772 ;; store the compiled form, because `call-interactively' |
|
7757334005ae
bytecomp.el: always check code in (interactive SEXP) for sanity
Aidan Kehoe <kehoea@parhasard.net>
parents:
4623
diff
changeset
|
2773 ;; looks at the args of `list' and treats certain |
|
7757334005ae
bytecomp.el: always check code in (interactive SEXP) for sanity
Aidan Kehoe <kehoea@parhasard.net>
parents:
4623
diff
changeset
|
2774 ;; functions specially. Compiling it is nonetheless |
|
7757334005ae
bytecomp.el: always check code in (interactive SEXP) for sanity
Aidan Kehoe <kehoea@parhasard.net>
parents:
4623
diff
changeset
|
2775 ;; useful for warnings. |
| 428 | 2776 (let ((form (nth 1 int))) |
| 2777 (while (or (eq (car-safe form) 'let) | |
| 2778 (eq (car-safe form) 'let*) | |
| 2779 (eq (car-safe form) 'save-excursion)) | |
| 2780 (while (consp (cdr form)) | |
| 2781 (setq form (cdr form))) | |
| 2782 (setq form (car form))) | |
|
4639
7757334005ae
bytecomp.el: always check code in (interactive SEXP) for sanity
Aidan Kehoe <kehoea@parhasard.net>
parents:
4623
diff
changeset
|
2783 (setq compiled-int |
|
7757334005ae
bytecomp.el: always check code in (interactive SEXP) for sanity
Aidan Kehoe <kehoea@parhasard.net>
parents:
4623
diff
changeset
|
2784 (byte-compile-top-level (nth 1 int))) |
| 428 | 2785 (or (eq (car-safe form) 'list) |
|
4639
7757334005ae
bytecomp.el: always check code in (interactive SEXP) for sanity
Aidan Kehoe <kehoea@parhasard.net>
parents:
4623
diff
changeset
|
2786 (setq int (list 'interactive compiled-int))))) |
| 428 | 2787 ((cdr int) |
| 2788 (byte-compile-warn "malformed interactive spec: %s" | |
| 2789 (prin1-to-string int)))))) | |
| 2790 (let ((compiled (byte-compile-top-level (cons 'progn body) nil 'lambda))) | |
| 2791 (if (memq 'unused-vars byte-compile-warnings) | |
| 2792 ;; done compiling in this scope, warn now. | |
| 2793 (byte-compile-warn-about-unused-variables)) | |
| 2794 (if (eq 'byte-code (car-safe compiled)) | |
| 2795 (apply 'make-byte-code | |
| 2796 (append (list arglist) | |
| 2797 ;; byte-string, constants-vector, stack depth | |
| 2798 (cdr compiled) | |
| 2799 ;; optionally, the doc string. | |
| 2800 (if (or doc int) | |
| 2801 (list doc)) | |
| 2802 ;; optionally, the interactive spec. | |
| 2803 (if int | |
| 2804 (list (nth 1 int))))) | |
| 2805 (setq compiled | |
| 2806 (nconc (if int (list int)) | |
| 2807 (cond ((eq (car-safe compiled) 'progn) (cdr compiled)) | |
| 2808 (compiled (list compiled))))) | |
| 2809 (nconc (list 'lambda arglist) | |
| 2810 (if (or doc (stringp (car compiled))) | |
| 2811 (cons doc (cond (compiled) | |
| 2812 (body (list nil)))) | |
| 2813 compiled)))))) | |
| 2814 | |
| 2815 (defun byte-compile-constants-vector () | |
| 2816 ;; Builds the constants-vector from the current variables and constants. | |
| 2817 ;; This modifies the constants from (const . nil) to (const . offset). | |
| 2818 ;; To keep the byte-codes to look up the vector as short as possible: | |
| 2819 ;; First 6 elements are vars, as there are one-byte varref codes for those. | |
| 2820 ;; Next up to byte-constant-limit are constants, still with one-byte codes. | |
| 2821 ;; Next variables again, to get 2-byte codes for variable lookup. | |
| 2822 ;; The rest of the constants and variables need 3-byte byte-codes. | |
| 2823 (let* ((i -1) | |
| 2824 (rest (nreverse byte-compile-variables)) ; nreverse because the first | |
| 2825 (other (nreverse byte-compile-constants)) ; vars often are used most. | |
| 2826 ret tmp | |
| 2827 (limits '(5 ; Use the 1-byte varref codes, | |
| 2828 63 ; 1-constlim ; 1-byte byte-constant codes, | |
| 2829 255 ; 2-byte varref codes, | |
| 2830 65535)) ; 3-byte codes for the rest. | |
| 2831 limit) | |
| 2832 (while (or rest other) | |
| 2833 (setq limit (car limits)) | |
| 2834 (while (and rest (not (eq i limit))) | |
| 2835 (if (setq tmp (assq (car (car rest)) ret)) | |
| 2836 (setcdr (car rest) (cdr tmp)) | |
| 2837 (setcdr (car rest) (setq i (1+ i))) | |
| 2838 (setq ret (cons (car rest) ret))) | |
| 2839 (setq rest (cdr rest))) | |
| 2840 (setq limits (cdr limits) | |
| 2841 rest (prog1 other | |
| 2842 (setq other rest)))) | |
| 2843 (apply 'vector (nreverse (mapcar 'car ret))))) | |
| 2844 | |
| 2845 ;; Given an expression FORM, compile it and return an equivalent byte-code | |
| 2846 ;; expression (a call to the function byte-code). | |
| 2847 (defun byte-compile-top-level (form &optional for-effect output-type) | |
| 2848 ;; OUTPUT-TYPE advises about how form is expected to be used: | |
| 2849 ;; 'eval or nil -> a single form, | |
| 2850 ;; 'progn or t -> a list of forms, | |
| 2851 ;; 'lambda -> body of a lambda, | |
| 2852 ;; 'file -> used at file-level. | |
| 2853 (let ((byte-compile-constants nil) | |
| 2854 (byte-compile-variables nil) | |
| 2855 (byte-compile-tag-number 0) | |
| 2856 (byte-compile-depth 0) | |
| 2857 (byte-compile-maxdepth 0) | |
| 2858 (byte-compile-output nil)) | |
| 2859 (if (memq byte-optimize '(t source)) | |
| 2860 (setq form (byte-optimize-form form for-effect))) | |
| 2861 (while (and (eq (car-safe form) 'progn) (null (cdr (cdr form)))) | |
| 2862 (setq form (nth 1 form))) | |
| 2863 (if (and (eq 'byte-code (car-safe form)) | |
| 2864 (not (memq byte-optimize '(t byte))) | |
| 2865 (stringp (nth 1 form)) | |
| 2866 (vectorp (nth 2 form)) | |
| 2867 (natnump (nth 3 form))) | |
| 2868 form | |
| 2869 (byte-compile-form form for-effect) | |
| 2870 (byte-compile-out-toplevel for-effect output-type)))) | |
| 2871 | |
| 2872 (defun byte-compile-out-toplevel (&optional for-effect output-type) | |
| 2873 (if for-effect | |
| 2874 ;; The stack is empty. Push a value to be returned from (byte-code ..). | |
| 2875 (if (eq (car (car byte-compile-output)) 'byte-discard) | |
| 2876 (setq byte-compile-output (cdr byte-compile-output)) | |
| 2877 (byte-compile-push-constant | |
| 2878 ;; Push any constant - preferably one which already is used, and | |
| 2879 ;; a number or symbol - ie not some big sequence. The return value | |
| 2880 ;; isn't returned, but it would be a shame if some textually large | |
| 2881 ;; constant was not optimized away because we chose to return it. | |
| 2882 (and (not (assq nil byte-compile-constants)) ; Nil is often there. | |
| 2883 (let ((tmp (reverse byte-compile-constants))) | |
| 2884 (while (and tmp (not (or (symbolp (car (car tmp))) | |
| 2885 (numberp (car (car tmp)))))) | |
| 2886 (setq tmp (cdr tmp))) | |
| 2887 (car (car tmp))))))) | |
| 2888 (byte-compile-out 'byte-return 0) | |
| 2889 (setq byte-compile-output (nreverse byte-compile-output)) | |
| 2890 (if (memq byte-optimize '(t byte)) | |
| 2891 (setq byte-compile-output | |
| 2892 (byte-optimize-lapcode byte-compile-output for-effect))) | |
| 2893 | |
| 2894 ;; Decompile trivial functions: | |
| 2895 ;; only constants and variables, or a single funcall except in lambdas. | |
| 2896 ;; Except for Lisp_Compiled objects, forms like (foo "hi") | |
| 2897 ;; are still quicker than (byte-code "..." [foo "hi"] 2). | |
| 2898 ;; Note that even (quote foo) must be parsed just as any subr by the | |
| 2899 ;; interpreter, so quote should be compiled into byte-code in some contexts. | |
| 2900 ;; What to leave uncompiled: | |
| 2901 ;; lambda -> never. we used to leave it uncompiled if the body was | |
| 2902 ;; a single atom, but that causes confusion if the docstring | |
| 2903 ;; uses the (file . pos) syntax. Besides, now that we have | |
| 2904 ;; the Lisp_Compiled type, the compiled form is faster. | |
| 2905 ;; eval -> atom, quote or (function atom atom atom) | |
| 2906 ;; progn -> as <<same-as-eval>> or (progn <<same-as-eval>> atom) | |
| 2907 ;; file -> as progn, but takes both quotes and atoms, and longer forms. | |
| 2908 (let (rest | |
| 2909 (maycall (not (eq output-type 'lambda))) ; t if we may make a funcall. | |
| 2910 tmp body) | |
| 2911 (cond | |
| 2912 ;; #### This should be split out into byte-compile-nontrivial-function-p. | |
| 2913 ((or (eq output-type 'lambda) | |
| 2914 (nthcdr (if (eq output-type 'file) 50 8) byte-compile-output) | |
| 2915 (assq 'TAG byte-compile-output) ; Not necessary, but speeds up a bit. | |
| 2916 (not (setq tmp (assq 'byte-return byte-compile-output))) | |
| 2917 (progn | |
| 2918 (setq rest (nreverse | |
| 2919 (cdr (memq tmp (reverse byte-compile-output))))) | |
| 2920 (while (cond | |
| 2921 ((memq (car (car rest)) '(byte-varref byte-constant)) | |
| 2922 (setq tmp (car (cdr (car rest)))) | |
| 2923 (if (if (eq (car (car rest)) 'byte-constant) | |
| 2924 (or (consp tmp) | |
| 2925 (and (symbolp tmp) | |
| 2926 (not (byte-compile-constant-symbol-p tmp))))) | |
| 2927 (if maycall | |
| 2928 (setq body (cons (list 'quote tmp) body))) | |
| 2929 (setq body (cons tmp body)))) | |
| 2930 ((and maycall | |
| 2931 ;; Allow a funcall if at most one atom follows it. | |
| 2932 (null (nthcdr 3 rest)) | |
|
5503
7b5946dbfb96
Drop support for generating code appropriate for Emacs 19, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5475
diff
changeset
|
2933 (setq tmp (get (car (car rest)) 'byte-opcode-invert)) |
| 428 | 2934 (or (null (cdr rest)) |
| 2935 (and (memq output-type '(file progn t)) | |
| 2936 (cdr (cdr rest)) | |
| 2937 (eq (car (nth 1 rest)) 'byte-discard) | |
| 2938 (progn (setq rest (cdr rest)) t)))) | |
| 2939 (setq maycall nil) ; Only allow one real function call. | |
| 2940 (setq body (nreverse body)) | |
| 2941 (setq body (list | |
| 2942 (if (and (eq tmp 'funcall) | |
| 2943 (eq (car-safe (car body)) 'quote)) | |
| 2944 (cons (nth 1 (car body)) (cdr body)) | |
| 2945 (cons tmp body)))) | |
| 2946 (or (eq output-type 'file) | |
| 2947 (not (delq nil (mapcar 'consp (cdr (car body)))))))) | |
| 2948 (setq rest (cdr rest))) | |
| 2949 rest)) | |
| 2950 (let ((byte-compile-vector (byte-compile-constants-vector))) | |
| 2951 (list 'byte-code (byte-compile-lapcode byte-compile-output) | |
| 2952 byte-compile-vector byte-compile-maxdepth))) | |
| 2953 ;; it's a trivial function | |
| 2954 ((cdr body) (cons 'progn (nreverse body))) | |
| 2955 ((car body))))) | |
| 2956 | |
| 2957 ;; Given BODY, compile it and return a new body. | |
| 2958 (defun byte-compile-top-level-body (body &optional for-effect) | |
| 2959 (setq body (byte-compile-top-level (cons 'progn body) for-effect t)) | |
| 2960 (cond ((eq (car-safe body) 'progn) | |
| 2961 (cdr body)) | |
| 2962 (body | |
| 2963 (list body)))) | |
| 2964 | |
| 2965 ;; This is the recursive entry point for compiling each subform of an | |
| 2966 ;; expression. | |
| 2967 ;; If for-effect is non-nil, byte-compile-form will output a byte-discard | |
| 2968 ;; before terminating (ie. no value will be left on the stack). | |
| 2969 ;; A byte-compile handler may, when for-effect is non-nil, choose output code | |
| 2970 ;; which does not leave a value on the stack, and then set for-effect to nil | |
| 2971 ;; (to prevent byte-compile-form from outputting the byte-discard). | |
| 2972 ;; If a handler wants to call another handler, it should do so via | |
| 2973 ;; byte-compile-form, or take extreme care to handle for-effect correctly. | |
| 2974 ;; (Use byte-compile-form-do-effect to reset the for-effect flag too.) | |
| 2975 ;; | |
| 2976 (defun byte-compile-form (form &optional for-effect) | |
| 2977 (setq form (macroexpand form byte-compile-macro-environment)) | |
| 2978 (cond ((not (consp form)) | |
| 2979 (cond ((or (not (symbolp form)) | |
| 2980 (byte-compile-constant-symbol-p form)) | |
| 2981 (byte-compile-constant form)) | |
| 2982 ((and for-effect byte-compile-delete-errors) | |
| 2983 (setq for-effect nil)) | |
| 2984 (t (byte-compile-variable-ref 'byte-varref form)))) | |
| 2985 ((symbolp (car form)) | |
| 2986 (let* ((fn (car form)) | |
| 2987 (handler (get fn 'byte-compile))) | |
| 2988 (if (memq fn '(t nil)) | |
| 2989 (byte-compile-warn "%s called as a function" fn)) | |
|
5503
7b5946dbfb96
Drop support for generating code appropriate for Emacs 19, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5475
diff
changeset
|
2990 (if handler |
| 428 | 2991 (funcall handler form) |
| 2992 (if (memq 'callargs byte-compile-warnings) | |
| 2993 (byte-compile-callargs-warn form)) | |
| 2994 (byte-compile-normal-call form)))) | |
| 2995 ((and (or (compiled-function-p (car form)) | |
| 2996 (eq (car-safe (car form)) 'lambda)) | |
| 2997 ;; if the form comes out the same way it went in, that's | |
| 2998 ;; because it was malformed, and we couldn't unfold it. | |
| 2999 (not (eq form (setq form (byte-compile-unfold-lambda form))))) | |
| 3000 (byte-compile-form form for-effect) | |
| 3001 (setq for-effect nil)) | |
| 3002 ((byte-compile-normal-call form))) | |
| 3003 (when for-effect | |
| 3004 (byte-compile-discard))) | |
| 3005 | |
|
5294
bbff29a01820
Add compiler macros and compilation sanity-checks for functions with keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5282
diff
changeset
|
3006 ;; Generate the list of functions with keyword arguments like so: |
|
bbff29a01820
Add compiler macros and compilation sanity-checks for functions with keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5282
diff
changeset
|
3007 ;; |
|
bbff29a01820
Add compiler macros and compilation sanity-checks for functions with keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5282
diff
changeset
|
3008 ;; (delete-duplicates |
|
bbff29a01820
Add compiler macros and compilation sanity-checks for functions with keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5282
diff
changeset
|
3009 ;; (sort* |
|
bbff29a01820
Add compiler macros and compilation sanity-checks for functions with keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5282
diff
changeset
|
3010 ;; (loop |
|
bbff29a01820
Add compiler macros and compilation sanity-checks for functions with keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5282
diff
changeset
|
3011 ;; for symbol being each symbol in obarray |
|
bbff29a01820
Add compiler macros and compilation sanity-checks for functions with keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5282
diff
changeset
|
3012 ;; with arglist = nil |
|
bbff29a01820
Add compiler macros and compilation sanity-checks for functions with keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5282
diff
changeset
|
3013 ;; if (and (fboundp symbol) |
|
bbff29a01820
Add compiler macros and compilation sanity-checks for functions with keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5282
diff
changeset
|
3014 ;; (ignore-errors (setq symbol (indirect-function symbol))) |
|
bbff29a01820
Add compiler macros and compilation sanity-checks for functions with keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5282
diff
changeset
|
3015 ;; (cond |
|
bbff29a01820
Add compiler macros and compilation sanity-checks for functions with keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5282
diff
changeset
|
3016 ;; ((and (subrp symbol) (setq symbol (intern (subr-name symbol))))) |
|
bbff29a01820
Add compiler macros and compilation sanity-checks for functions with keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5282
diff
changeset
|
3017 ;; ((and (compiled-function-p symbol) |
|
bbff29a01820
Add compiler macros and compilation sanity-checks for functions with keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5282
diff
changeset
|
3018 ;; (setq symbol (compiled-function-annotation symbol))))) |
|
bbff29a01820
Add compiler macros and compilation sanity-checks for functions with keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5282
diff
changeset
|
3019 ;; (setq arglist (function-arglist symbol)) |
|
bbff29a01820
Add compiler macros and compilation sanity-checks for functions with keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5282
diff
changeset
|
3020 ;; (setq arglist (ignore-errors (read-from-string arglist))) |
|
bbff29a01820
Add compiler macros and compilation sanity-checks for functions with keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5282
diff
changeset
|
3021 ;; (setq arglist (car arglist)) |
|
bbff29a01820
Add compiler macros and compilation sanity-checks for functions with keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5282
diff
changeset
|
3022 ;; (setq arglist (position '&key arglist))) |
|
bbff29a01820
Add compiler macros and compilation sanity-checks for functions with keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5282
diff
changeset
|
3023 ;; collect (cons symbol arglist)) |
|
bbff29a01820
Add compiler macros and compilation sanity-checks for functions with keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5282
diff
changeset
|
3024 ;; #'string-lessp |
|
bbff29a01820
Add compiler macros and compilation sanity-checks for functions with keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5282
diff
changeset
|
3025 ;; :key #'car) :test #'eq :key #'car) |
|
bbff29a01820
Add compiler macros and compilation sanity-checks for functions with keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5282
diff
changeset
|
3026 ;; |
|
bbff29a01820
Add compiler macros and compilation sanity-checks for functions with keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5282
diff
changeset
|
3027 ;; That won't include those that take advantage of cl-seq.el's |
|
bbff29a01820
Add compiler macros and compilation sanity-checks for functions with keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5282
diff
changeset
|
3028 ;; cl-parsing-keywords macro, but the below list does. |
|
bbff29a01820
Add compiler macros and compilation sanity-checks for functions with keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5282
diff
changeset
|
3029 |
|
bbff29a01820
Add compiler macros and compilation sanity-checks for functions with keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5282
diff
changeset
|
3030 (map nil |
|
bbff29a01820
Add compiler macros and compilation sanity-checks for functions with keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5282
diff
changeset
|
3031 (function* |
|
bbff29a01820
Add compiler macros and compilation sanity-checks for functions with keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5282
diff
changeset
|
3032 (lambda ((function . nargs)) |
|
bbff29a01820
Add compiler macros and compilation sanity-checks for functions with keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5282
diff
changeset
|
3033 ;; Document that the car of OBJECT, a symbol, describes a function |
|
bbff29a01820
Add compiler macros and compilation sanity-checks for functions with keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5282
diff
changeset
|
3034 ;; taking keyword arguments from the argument index described by |
|
bbff29a01820
Add compiler macros and compilation sanity-checks for functions with keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5282
diff
changeset
|
3035 ;; the cdr of OBJECT. |
|
bbff29a01820
Add compiler macros and compilation sanity-checks for functions with keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5282
diff
changeset
|
3036 (put function 'byte-compile-keyword-start nargs))) |
|
bbff29a01820
Add compiler macros and compilation sanity-checks for functions with keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5282
diff
changeset
|
3037 '((adjoin . 3) (assoc* . 3) (assoc-if . 3) (assoc-if-not . 3) |
|
bbff29a01820
Add compiler macros and compilation sanity-checks for functions with keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5282
diff
changeset
|
3038 (count . 3) (count-if . 3) (count-if-not . 3) (define-behavior . 3) |
|
bbff29a01820
Add compiler macros and compilation sanity-checks for functions with keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5282
diff
changeset
|
3039 (define-behavior-group . 2) (delete* . 3) (delete-duplicates . 2) |
|
bbff29a01820
Add compiler macros and compilation sanity-checks for functions with keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5282
diff
changeset
|
3040 (delete-if . 3) (delete-if-not . 3) (fill . 3) (find . 3) (find-if . 3) |
|
bbff29a01820
Add compiler macros and compilation sanity-checks for functions with keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5282
diff
changeset
|
3041 (find-if-not . 3) (internal-make-translation-table . 1) |
|
bbff29a01820
Add compiler macros and compilation sanity-checks for functions with keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5282
diff
changeset
|
3042 (make-Print-context . 1) (make-hash-table . 1) (make-saved-window . 1) |
|
bbff29a01820
Add compiler macros and compilation sanity-checks for functions with keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5282
diff
changeset
|
3043 (make-window-configuration . 1) (member* . 3) |
|
bbff29a01820
Add compiler macros and compilation sanity-checks for functions with keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5282
diff
changeset
|
3044 (member-if . 3) (member-if-not . 3) (merge . 5) (nsublis . 3) |
|
bbff29a01820
Add compiler macros and compilation sanity-checks for functions with keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5282
diff
changeset
|
3045 (nsubst . 4) (nsubst-if . 4) (nsubst-if-not . 4) (nsubstitute . 4) |
|
bbff29a01820
Add compiler macros and compilation sanity-checks for functions with keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5282
diff
changeset
|
3046 (nsubstitute-if . 4) (nsubstitute-if-not . 4) (override-behavior . 2) |
|
bbff29a01820
Add compiler macros and compilation sanity-checks for functions with keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5282
diff
changeset
|
3047 (position . 3) (position-if . 3) (position-if-not . 3) (rassoc* . 3) |
|
bbff29a01820
Add compiler macros and compilation sanity-checks for functions with keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5282
diff
changeset
|
3048 (rassoc-if . 3) (rassoc-if-not . 3) (reduce . 3) (remove* . 3) |
|
bbff29a01820
Add compiler macros and compilation sanity-checks for functions with keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5282
diff
changeset
|
3049 (remove-duplicates . 2) (remove-if . 3) (remove-if-not . 3) |
|
bbff29a01820
Add compiler macros and compilation sanity-checks for functions with keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5282
diff
changeset
|
3050 (replace . 3) (sort* . 3) (stable-sort . 3) (sublis . 3) |
|
bbff29a01820
Add compiler macros and compilation sanity-checks for functions with keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5282
diff
changeset
|
3051 (subsetp . 3) (subst . 4) (subst-if . 4) (subst-if-not . 4) |
|
bbff29a01820
Add compiler macros and compilation sanity-checks for functions with keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5282
diff
changeset
|
3052 (substitute . 4) (substitute-if . 4) (substitute-if-not . 4) |
|
bbff29a01820
Add compiler macros and compilation sanity-checks for functions with keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5282
diff
changeset
|
3053 (tree-equal . 3))) |
|
bbff29a01820
Add compiler macros and compilation sanity-checks for functions with keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5282
diff
changeset
|
3054 |
| 428 | 3055 (defun byte-compile-normal-call (form) |
|
5358
31475de17064
#'byte-compile-normal-call; only examine properties of (car FORM) if a symbol
Aidan Kehoe <kehoea@parhasard.net>
parents:
5356
diff
changeset
|
3056 (and (symbolp (car form)) (get (car form) 'byte-compile-keyword-start) |
|
5294
bbff29a01820
Add compiler macros and compilation sanity-checks for functions with keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5282
diff
changeset
|
3057 (let ((plist (nthcdr (get (car form) 'byte-compile-keyword-start) |
|
bbff29a01820
Add compiler macros and compilation sanity-checks for functions with keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5282
diff
changeset
|
3058 form))) |
|
bbff29a01820
Add compiler macros and compilation sanity-checks for functions with keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5282
diff
changeset
|
3059 (symbol-macrolet |
|
bbff29a01820
Add compiler macros and compilation sanity-checks for functions with keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5282
diff
changeset
|
3060 ((not-present '#:not-present)) |
|
bbff29a01820
Add compiler macros and compilation sanity-checks for functions with keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5282
diff
changeset
|
3061 (if (not (valid-plist-p plist)) |
|
bbff29a01820
Add compiler macros and compilation sanity-checks for functions with keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5282
diff
changeset
|
3062 (byte-compile-warn |
|
bbff29a01820
Add compiler macros and compilation sanity-checks for functions with keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5282
diff
changeset
|
3063 "#'%s: ill-formed keyword argument list: %S" (car form) plist) |
|
bbff29a01820
Add compiler macros and compilation sanity-checks for functions with keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5282
diff
changeset
|
3064 (and |
|
bbff29a01820
Add compiler macros and compilation sanity-checks for functions with keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5282
diff
changeset
|
3065 (memq 'callargs byte-compile-warnings) |
|
bbff29a01820
Add compiler macros and compilation sanity-checks for functions with keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5282
diff
changeset
|
3066 (map nil |
|
bbff29a01820
Add compiler macros and compilation sanity-checks for functions with keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5282
diff
changeset
|
3067 (function* |
|
bbff29a01820
Add compiler macros and compilation sanity-checks for functions with keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5282
diff
changeset
|
3068 (lambda ((function . nargs)) |
|
5548
b90c153730c7
Do the quoted-lambda check when functions take :if, :test, :key arguments, too.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5506
diff
changeset
|
3069 (let ((value (plist-get plist function not-present))) |
|
b90c153730c7
Do the quoted-lambda check when functions take :if, :test, :key arguments, too.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5506
diff
changeset
|
3070 (when (and (not (eq value not-present)) |
|
b90c153730c7
Do the quoted-lambda check when functions take :if, :test, :key arguments, too.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5506
diff
changeset
|
3071 (byte-compile-constp value)) |
|
b90c153730c7
Do the quoted-lambda check when functions take :if, :test, :key arguments, too.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5506
diff
changeset
|
3072 (byte-compile-callargs-warn |
|
b90c153730c7
Do the quoted-lambda check when functions take :if, :test, :key arguments, too.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5506
diff
changeset
|
3073 (cons (eval value) |
|
b90c153730c7
Do the quoted-lambda check when functions take :if, :test, :key arguments, too.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5506
diff
changeset
|
3074 (member* |
|
b90c153730c7
Do the quoted-lambda check when functions take :if, :test, :key arguments, too.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5506
diff
changeset
|
3075 nargs |
|
b90c153730c7
Do the quoted-lambda check when functions take :if, :test, :key arguments, too.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5506
diff
changeset
|
3076 ;; Dummy arguments. There's no need for |
|
b90c153730c7
Do the quoted-lambda check when functions take :if, :test, :key arguments, too.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5506
diff
changeset
|
3077 ;; it to be longer than even 2, now, but |
|
b90c153730c7
Do the quoted-lambda check when functions take :if, :test, :key arguments, too.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5506
diff
changeset
|
3078 ;; very little harm in it. |
|
b90c153730c7
Do the quoted-lambda check when functions take :if, :test, :key arguments, too.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5506
diff
changeset
|
3079 '(9 8 7 6 5 4 3 2 1)))) |
|
b90c153730c7
Do the quoted-lambda check when functions take :if, :test, :key arguments, too.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5506
diff
changeset
|
3080 (when (and (eq (car-safe value) 'quote) |
|
b90c153730c7
Do the quoted-lambda check when functions take :if, :test, :key arguments, too.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5506
diff
changeset
|
3081 (eq (car-safe (nth 1 value)) 'lambda) |
|
b90c153730c7
Do the quoted-lambda check when functions take :if, :test, :key arguments, too.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5506
diff
changeset
|
3082 (or |
|
b90c153730c7
Do the quoted-lambda check when functions take :if, :test, :key arguments, too.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5506
diff
changeset
|
3083 (null (memq 'quoted-lambda |
|
b90c153730c7
Do the quoted-lambda check when functions take :if, :test, :key arguments, too.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5506
diff
changeset
|
3084 byte-compile-warnings)) |
|
b90c153730c7
Do the quoted-lambda check when functions take :if, :test, :key arguments, too.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5506
diff
changeset
|
3085 (byte-compile-warn |
|
b90c153730c7
Do the quoted-lambda check when functions take :if, :test, :key arguments, too.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5506
diff
changeset
|
3086 "Passing a quoted lambda to #'%s, \ |
|
b90c153730c7
Do the quoted-lambda check when functions take :if, :test, :key arguments, too.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5506
diff
changeset
|
3087 keyword %s, forcing function quoting" (car form) function))) |
|
b90c153730c7
Do the quoted-lambda check when functions take :if, :test, :key arguments, too.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5506
diff
changeset
|
3088 (setcar value 'function)))))) |
|
b90c153730c7
Do the quoted-lambda check when functions take :if, :test, :key arguments, too.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5506
diff
changeset
|
3089 '((:key . 1) (:test . 2) (:test-not . 2) (:if . 1) |
|
b90c153730c7
Do the quoted-lambda check when functions take :if, :test, :key arguments, too.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5506
diff
changeset
|
3090 (:if-not . 1)))))))) |
| 428 | 3091 (if byte-compile-generate-call-tree |
| 3092 (byte-compile-annotate-call-tree form)) | |
| 3093 (byte-compile-push-constant (car form)) | |
|
4783
e29fcfd8df5f
Eliminate most core code byte-compile warnings.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4775
diff
changeset
|
3094 (mapc 'byte-compile-form (cdr form)) ; wasteful, but faster. |
| 428 | 3095 (byte-compile-out 'byte-call (length (cdr form)))) |
| 3096 | |
| 3097 ;; kludge added to XEmacs to work around the bogosities of a nonlexical lisp. | |
| 3098 (or (fboundp 'globally-boundp) (fset 'globally-boundp 'boundp)) | |
| 3099 | |
| 3100 (defun byte-compile-variable-ref (base-op var &optional varbind-flags) | |
| 3101 (if (or (not (symbolp var)) (byte-compile-constant-symbol-p var)) | |
| 3102 (byte-compile-warn | |
| 3103 (case base-op | |
| 3104 (byte-varref "Variable reference to %s %s") | |
| 3105 (byte-varset "Attempt to set %s %s") | |
| 3106 (byte-varbind "Attempt to let-bind %s %s")) | |
| 3107 (if (symbolp var) "constant symbol" "non-symbol") | |
| 3108 var) | |
| 3109 (if (and (get var 'byte-obsolete-variable) | |
| 3110 (memq 'obsolete byte-compile-warnings)) | |
| 3111 (let ((ob (get var 'byte-obsolete-variable))) | |
| 3112 (byte-compile-warn "%s is an obsolete variable; %s" var | |
| 3113 (if (stringp ob) | |
| 3114 ob | |
| 3115 (format "use %s instead." ob))))) | |
| 3116 (if (and (get var 'byte-compatible-variable) | |
| 3117 (memq 'pedantic byte-compile-warnings)) | |
| 3118 (let ((ob (get var 'byte-compatible-variable))) | |
| 3119 (byte-compile-warn "%s is provided for compatibility; %s" var | |
| 3120 (if (stringp ob) | |
| 3121 ob | |
| 3122 (format "use %s instead." ob))))) | |
| 3123 (if (memq 'free-vars byte-compile-warnings) | |
| 3124 (if (eq base-op 'byte-varbind) | |
| 3125 (setq byte-compile-bound-variables | |
| 3126 (cons (cons var (or varbind-flags 0)) | |
| 3127 byte-compile-bound-variables)) | |
| 3128 (or (globally-boundp var) | |
| 3129 (let ((cell (assq var byte-compile-bound-variables))) | |
| 3130 (if cell (setcdr cell | |
| 3131 (logior (cdr cell) | |
| 3132 (if (eq base-op 'byte-varset) | |
| 3133 byte-compile-assigned-bit | |
| 3134 byte-compile-referenced-bit))))) | |
| 444 | 3135 (and (boundp 'current-load-list) |
| 3136 (memq var current-load-list)) | |
| 428 | 3137 (if (eq base-op 'byte-varset) |
| 3138 (or (memq var byte-compile-free-assignments) | |
| 3139 (progn | |
| 3140 (byte-compile-warn "assignment to free variable %s" | |
| 3141 var) | |
| 3142 (setq byte-compile-free-assignments | |
| 3143 (cons var byte-compile-free-assignments)))) | |
| 3144 (or (memq var byte-compile-free-references) | |
| 3145 (progn | |
| 3146 (byte-compile-warn "reference to free variable %s" var) | |
| 3147 (setq byte-compile-free-references | |
| 3148 (cons var byte-compile-free-references))))))))) | |
| 3149 (let ((tmp (assq var byte-compile-variables))) | |
| 3150 (or tmp | |
| 3151 (setq tmp (list var) | |
| 3152 byte-compile-variables (cons tmp byte-compile-variables))) | |
| 3153 (byte-compile-out base-op tmp))) | |
| 3154 | |
| 3155 (defmacro byte-compile-get-constant (const) | |
| 3156 `(or (if (stringp ,const) | |
| 3157 (assoc ,const byte-compile-constants) | |
| 3158 (assq ,const byte-compile-constants)) | |
| 3159 (car (setq byte-compile-constants | |
| 3160 (cons (list ,const) byte-compile-constants))))) | |
| 3161 | |
| 3162 ;; Use this when the value of a form is a constant. This obeys for-effect. | |
| 3163 (defun byte-compile-constant (const) | |
| 3164 (if for-effect | |
| 3165 (setq for-effect nil) | |
| 3166 (byte-compile-out 'byte-constant (byte-compile-get-constant const)))) | |
| 3167 | |
| 3168 ;; Use this for a constant that is not the value of its containing form. | |
| 3169 ;; This ignores for-effect. | |
| 3170 (defun byte-compile-push-constant (const) | |
| 3171 (let ((for-effect nil)) | |
| 3172 (inline (byte-compile-constant const)))) | |
| 3173 | |
| 3174 | |
| 3175 ;; Compile those primitive ordinary functions | |
| 3176 ;; which have special byte codes just for speed. | |
| 3177 | |
| 3178 (defmacro byte-defop-compiler (function &optional compile-handler) | |
| 3179 ;; add a compiler-form for FUNCTION. | |
| 446 | 3180 ;; If FUNCTION is a symbol, then the variable "byte-SYMBOL" must name |
| 3181 ;; the opcode to be used. If is a list, the first element | |
| 428 | 3182 ;; is the function and the second element is the bytecode-symbol. |
| 3183 ;; COMPILE-HANDLER is the function to use to compile this byte-op, or | |
| 3184 ;; may be the abbreviations 0, 1, 2, 3, 0-1, 1-2, 2-3, 0+1, 1+1, 2+1, | |
| 3185 ;; 0-1+1, 1-2+1, 2-3+1, 0+2, or 1+2. If it is nil, then the handler is | |
| 3186 ;; "byte-compile-SYMBOL." | |
| 3187 (let (opcode) | |
| 3188 (if (symbolp function) | |
| 3189 (setq opcode (intern (concat "byte-" (symbol-name function)))) | |
| 3190 (setq opcode (car (cdr function)) | |
| 3191 function (car function))) | |
| 3192 (let ((fnform | |
| 3193 (list 'put (list 'quote function) ''byte-compile | |
| 3194 (list 'quote | |
| 3195 (or (cdr (assq compile-handler | |
| 3196 '((0 . byte-compile-no-args) | |
| 3197 (1 . byte-compile-one-arg) | |
| 3198 (2 . byte-compile-two-args) | |
| 3199 (3 . byte-compile-three-args) | |
| 3200 (0-1 . byte-compile-zero-or-one-arg) | |
| 3201 (1-2 . byte-compile-one-or-two-args) | |
| 3202 (2-3 . byte-compile-two-or-three-args) | |
| 3203 (0+1 . byte-compile-no-args-with-one-extra) | |
| 3204 (1+1 . byte-compile-one-arg-with-one-extra) | |
| 3205 (2+1 . byte-compile-two-args-with-one-extra) | |
| 3206 (0-1+1 . byte-compile-zero-or-one-arg-with-one-extra) | |
| 3207 (1-2+1 . byte-compile-one-or-two-args-with-one-extra) | |
| 3208 (2-3+1 . byte-compile-two-or-three-args-with-one-extra) | |
| 3209 (0+2 . byte-compile-no-args-with-two-extra) | |
| 3210 (1+2 . byte-compile-one-arg-with-two-extra) | |
| 3211 | |
| 3212 ))) | |
| 3213 compile-handler | |
| 3214 (intern (concat "byte-compile-" | |
| 3215 (symbol-name function)))))))) | |
| 3216 (if opcode | |
| 3217 (list 'progn fnform | |
| 3218 (list 'put (list 'quote function) | |
| 3219 ''byte-opcode (list 'quote opcode)) | |
| 3220 (list 'put (list 'quote opcode) | |
| 3221 ''byte-opcode-invert (list 'quote function))) | |
| 3222 fnform)))) | |
| 3223 | |
| 3224 (defmacro byte-defop-compiler-1 (function &optional compile-handler) | |
| 3225 (list 'byte-defop-compiler (list function nil) compile-handler)) | |
| 3226 | |
| 3227 | |
| 3228 (put 'byte-call 'byte-opcode-invert 'funcall) | |
| 3229 (put 'byte-list1 'byte-opcode-invert 'list) | |
| 3230 (put 'byte-list2 'byte-opcode-invert 'list) | |
| 3231 (put 'byte-list3 'byte-opcode-invert 'list) | |
| 3232 (put 'byte-list4 'byte-opcode-invert 'list) | |
| 3233 (put 'byte-listN 'byte-opcode-invert 'list) | |
| 3234 (put 'byte-concat2 'byte-opcode-invert 'concat) | |
| 3235 (put 'byte-concat3 'byte-opcode-invert 'concat) | |
| 3236 (put 'byte-concat4 'byte-opcode-invert 'concat) | |
| 3237 (put 'byte-concatN 'byte-opcode-invert 'concat) | |
| 3238 (put 'byte-insertN 'byte-opcode-invert 'insert) | |
| 3239 | |
| 3240 ;; How old is this stuff? -slb | |
| 3241 ;(byte-defop-compiler (dot byte-point) 0+1) | |
| 3242 ;(byte-defop-compiler (dot-max byte-point-max) 0+1) | |
| 3243 ;(byte-defop-compiler (dot-min byte-point-min) 0+1) | |
| 3244 (byte-defop-compiler point 0+1) | |
|
5503
7b5946dbfb96
Drop support for generating code appropriate for Emacs 19, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5475
diff
changeset
|
3245 (byte-defop-compiler eq 2) |
| 428 | 3246 (byte-defop-compiler point-max 0+1) |
| 3247 (byte-defop-compiler point-min 0+1) | |
| 3248 (byte-defop-compiler following-char 0+1) | |
| 3249 (byte-defop-compiler preceding-char 0+1) | |
| 3250 (byte-defop-compiler current-column 0+1) | |
| 3251 ;; FSF has special function here; generalized here by the 1+2 stuff. | |
| 3252 (byte-defop-compiler (indent-to-column byte-indent-to) 1+2) | |
| 3253 (byte-defop-compiler indent-to 1+2) | |
|
5503
7b5946dbfb96
Drop support for generating code appropriate for Emacs 19, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5475
diff
changeset
|
3254 (byte-defop-compiler equal 2) |
| 428 | 3255 (byte-defop-compiler eolp 0+1) |
| 3256 (byte-defop-compiler eobp 0+1) | |
| 3257 (byte-defop-compiler bolp 0+1) | |
| 3258 (byte-defop-compiler bobp 0+1) | |
| 3259 (byte-defop-compiler current-buffer 0) | |
| 3260 ;;(byte-defop-compiler read-char 0) ;; obsolete | |
|
5503
7b5946dbfb96
Drop support for generating code appropriate for Emacs 19, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5475
diff
changeset
|
3261 (byte-defop-compiler memq 2) |
| 428 | 3262 (byte-defop-compiler interactive-p 0) |
| 3263 (byte-defop-compiler widen 0+1) | |
| 3264 (byte-defop-compiler end-of-line 0-1+1) | |
| 3265 (byte-defop-compiler forward-char 0-1+1) | |
| 3266 (byte-defop-compiler forward-line 0-1+1) | |
| 3267 (byte-defop-compiler symbolp 1) | |
| 3268 (byte-defop-compiler consp 1) | |
| 3269 (byte-defop-compiler stringp 1) | |
| 3270 (byte-defop-compiler listp 1) | |
| 3271 (byte-defop-compiler not 1) | |
| 3272 (byte-defop-compiler (null byte-not) 1) | |
| 3273 (byte-defop-compiler car 1) | |
| 3274 (byte-defop-compiler cdr 1) | |
| 3275 (byte-defop-compiler length 1) | |
|
5562
855b667dea13
Drop cl-macro-environment in favour of byte-compile-macro-environment.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5560
diff
changeset
|
3276 (byte-defop-compiler symbol-value 1) |
| 428 | 3277 (byte-defop-compiler symbol-function 1) |
| 3278 (byte-defop-compiler (1+ byte-add1) 1) | |
| 3279 (byte-defop-compiler (1- byte-sub1) 1) | |
| 3280 (byte-defop-compiler goto-char 1+1) | |
| 3281 (byte-defop-compiler char-after 0-1+1) | |
| 3282 (byte-defop-compiler set-buffer 1) | |
| 3283 ;;(byte-defop-compiler set-mark 1) ;; obsolete | |
| 2217 | 3284 (byte-defop-compiler forward-word 0-1+1) |
| 428 | 3285 (byte-defop-compiler char-syntax 1+1) |
| 3286 (byte-defop-compiler nreverse 1) | |
| 3287 (byte-defop-compiler car-safe 1) | |
| 3288 (byte-defop-compiler cdr-safe 1) | |
| 3289 (byte-defop-compiler numberp 1) | |
|
4885
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
3290 (byte-defop-compiler fixnump 1) |
| 428 | 3291 (byte-defop-compiler skip-chars-forward 1-2+1) |
| 3292 (byte-defop-compiler skip-chars-backward 1-2+1) | |
|
5301
ec05a30f7148
Fix a bytecomp.el bug compiling #'eql, which was masked by cl-macs.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5294
diff
changeset
|
3293 (byte-defop-compiler eq 2) |
|
5503
7b5946dbfb96
Drop support for generating code appropriate for Emacs 19, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5475
diff
changeset
|
3294 ; (byte-defop-compiler old-eq 2) |
|
7b5946dbfb96
Drop support for generating code appropriate for Emacs 19, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5475
diff
changeset
|
3295 ; (byte-defop-compiler old-memq 2) |
| 428 | 3296 (byte-defop-compiler cons 2) |
| 3297 (byte-defop-compiler aref 2) | |
| 3298 (byte-defop-compiler get 2+1) | |
| 3299 (byte-defop-compiler nth 2) | |
|
5089
99f8ebc082d9
Make #'substring an alias of #'subseq; give the latter the byte code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4996
diff
changeset
|
3300 (byte-defop-compiler subseq byte-compile-subseq) |
|
99f8ebc082d9
Make #'substring an alias of #'subseq; give the latter the byte code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4996
diff
changeset
|
3301 (byte-defop-compiler (substring byte-subseq) 2-3) |
| 428 | 3302 (byte-defop-compiler (move-marker byte-set-marker) 2-3) |
| 3303 (byte-defop-compiler set-marker 2-3) | |
| 3304 (byte-defop-compiler match-beginning 1) | |
| 3305 (byte-defop-compiler match-end 1) | |
| 3306 (byte-defop-compiler upcase 1+1) | |
| 3307 (byte-defop-compiler downcase 1+1) | |
| 3308 (byte-defop-compiler string= 2) | |
| 3309 (byte-defop-compiler string< 2) | |
| 3310 (byte-defop-compiler (string-equal byte-string=) 2) | |
| 3311 (byte-defop-compiler (string-lessp byte-string<) 2) | |
|
5503
7b5946dbfb96
Drop support for generating code appropriate for Emacs 19, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5475
diff
changeset
|
3312 ; (byte-defop-compiler old-equal 2) |
| 428 | 3313 (byte-defop-compiler nthcdr 2) |
| 3314 (byte-defop-compiler elt 2) | |
|
5503
7b5946dbfb96
Drop support for generating code appropriate for Emacs 19, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5475
diff
changeset
|
3315 (byte-defop-compiler old-member 2) |
|
7b5946dbfb96
Drop support for generating code appropriate for Emacs 19, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5475
diff
changeset
|
3316 (byte-defop-compiler old-assq 2) |
| 428 | 3317 (byte-defop-compiler (rplaca byte-setcar) 2) |
| 3318 (byte-defop-compiler (rplacd byte-setcdr) 2) | |
| 3319 (byte-defop-compiler setcar 2) | |
| 3320 (byte-defop-compiler setcdr 2) | |
| 3321 (byte-defop-compiler delete-region 2+1) | |
| 3322 (byte-defop-compiler narrow-to-region 2+1) | |
| 3323 (byte-defop-compiler (% byte-rem) 2) | |
| 3324 (byte-defop-compiler aset 3) | |
| 3325 | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
3326 (byte-defop-compiler-1 bind-multiple-value-limits) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
3327 (byte-defop-compiler multiple-value-list-internal) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
3328 (byte-defop-compiler-1 multiple-value-call) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
3329 (byte-defop-compiler throw) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
3330 |
|
5503
7b5946dbfb96
Drop support for generating code appropriate for Emacs 19, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5475
diff
changeset
|
3331 (byte-defop-compiler member 2) |
|
7b5946dbfb96
Drop support for generating code appropriate for Emacs 19, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5475
diff
changeset
|
3332 (byte-defop-compiler assq 2) |
| 428 | 3333 |
| 3334 ;;####(byte-defop-compiler move-to-column 1) | |
| 3335 (byte-defop-compiler-1 interactive byte-compile-noop) | |
| 3336 (byte-defop-compiler-1 domain byte-compile-domain) | |
| 3337 | |
| 3338 ;; As of GNU Emacs 19.18 and Lucid Emacs 19.8, mod and % are different: `%' | |
| 3339 ;; means integral remainder and may have a negative result; `mod' is always | |
| 3340 ;; positive, and accepts floating point args. All code which uses `mod' and | |
| 3341 ;; requires the new interpretation must be compiled with bytecomp version 2.18 | |
| 3342 ;; or newer, or the emitted code will run the byte-code for `%' instead of an | |
| 3343 ;; actual call to `mod'. So be careful of compiling new code with an old | |
| 3344 ;; compiler. Note also that `%' is more efficient than `mod' because the | |
| 3345 ;; former is byte-coded and the latter is not. | |
| 3346 ;;(byte-defop-compiler (mod byte-rem) 2) | |
| 3347 | |
| 3348 | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
3349 (defun byte-compile-warn-wrong-args (form n) |
| 428 | 3350 (when (memq 'subr-callargs byte-compile-warnings) |
| 3351 (byte-compile-warn "%s called with %d arg%s, but requires %s" | |
| 3352 (car form) (length (cdr form)) | |
|
5366
f00192e1cd49
Examining the result of #'length: `eql', not `=', it's better style & cheaper
Aidan Kehoe <kehoea@parhasard.net>
parents:
5358
diff
changeset
|
3353 (if (eql 1 (length (cdr form))) "" "s") n))) |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
3354 |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
3355 (defun byte-compile-subr-wrong-args (form n) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
3356 (byte-compile-warn-wrong-args form n) |
| 428 | 3357 ;; get run-time wrong-number-of-args error. |
| 3358 (byte-compile-normal-call form)) | |
| 3359 | |
| 3360 (defun byte-compile-no-args (form) | |
| 3361 (case (length (cdr form)) | |
| 3362 (0 (byte-compile-out (get (car form) 'byte-opcode) 0)) | |
| 3363 (t (byte-compile-subr-wrong-args form "none")))) | |
| 3364 | |
| 3365 (defun byte-compile-one-arg (form) | |
| 3366 (case (length (cdr form)) | |
| 3367 (1 (byte-compile-form (car (cdr form))) ;; Push the argument | |
| 3368 (byte-compile-out (get (car form) 'byte-opcode) 0)) | |
| 3369 (t (byte-compile-subr-wrong-args form 1)))) | |
| 3370 | |
| 3371 (defun byte-compile-two-args (form) | |
| 3372 (case (length (cdr form)) | |
| 3373 (2 (byte-compile-form (nth 1 form)) ;; Push the arguments | |
| 3374 (byte-compile-form (nth 2 form)) | |
| 3375 (byte-compile-out (get (car form) 'byte-opcode) 0)) | |
| 3376 (t (byte-compile-subr-wrong-args form 2)))) | |
| 3377 | |
| 3378 (defun byte-compile-three-args (form) | |
| 3379 (case (length (cdr form)) | |
| 3380 (3 (byte-compile-form (nth 1 form)) ;; Push the arguments | |
| 3381 (byte-compile-form (nth 2 form)) | |
| 3382 (byte-compile-form (nth 3 form)) | |
| 3383 (byte-compile-out (get (car form) 'byte-opcode) 0)) | |
| 3384 (t (byte-compile-subr-wrong-args form 3)))) | |
| 3385 | |
| 3386 (defun byte-compile-zero-or-one-arg (form) | |
| 3387 (case (length (cdr form)) | |
| 3388 (0 (byte-compile-one-arg (append form '(nil)))) | |
| 3389 (1 (byte-compile-one-arg form)) | |
| 3390 (t (byte-compile-subr-wrong-args form "0-1")))) | |
| 3391 | |
| 3392 (defun byte-compile-one-or-two-args (form) | |
| 3393 (case (length (cdr form)) | |
| 3394 (1 (byte-compile-two-args (append form '(nil)))) | |
| 3395 (2 (byte-compile-two-args form)) | |
| 3396 (t (byte-compile-subr-wrong-args form "1-2")))) | |
| 3397 | |
| 3398 (defun byte-compile-two-or-three-args (form) | |
| 3399 (case (length (cdr form)) | |
| 3400 (2 (byte-compile-three-args (append form '(nil)))) | |
| 3401 (3 (byte-compile-three-args form)) | |
| 3402 (t (byte-compile-subr-wrong-args form "2-3")))) | |
| 3403 | |
| 3404 ;; from Ben Wing <ben@xemacs.org>: some inlined functions have extra | |
| 3405 ;; optional args added to them in XEmacs 19.12. Changing the byte | |
| 3406 ;; interpreter to deal with these args would be wrong and cause | |
| 3407 ;; incompatibility, so we generate non-inlined calls for those cases. | |
| 3408 ;; Without the following functions, spurious warnings will be generated; | |
| 3409 ;; however, they would still compile correctly because | |
| 3410 ;; `byte-compile-subr-wrong-args' also converts the call to non-inlined. | |
| 3411 | |
| 3412 (defun byte-compile-no-args-with-one-extra (form) | |
| 3413 (case (length (cdr form)) | |
| 3414 (0 (byte-compile-no-args form)) | |
| 446 | 3415 (1 (if (eq nil (nth 1 form)) |
| 3416 (byte-compile-no-args (butlast form)) | |
| 3417 (byte-compile-normal-call form))) | |
| 428 | 3418 (t (byte-compile-subr-wrong-args form "0-1")))) |
| 3419 | |
| 3420 (defun byte-compile-one-arg-with-one-extra (form) | |
| 3421 (case (length (cdr form)) | |
| 3422 (1 (byte-compile-one-arg form)) | |
| 446 | 3423 (2 (if (eq nil (nth 2 form)) |
| 3424 (byte-compile-one-arg (butlast form)) | |
| 3425 (byte-compile-normal-call form))) | |
| 428 | 3426 (t (byte-compile-subr-wrong-args form "1-2")))) |
| 3427 | |
| 3428 (defun byte-compile-two-args-with-one-extra (form) | |
| 3429 (case (length (cdr form)) | |
| 3430 (2 (byte-compile-two-args form)) | |
| 446 | 3431 (3 (if (eq nil (nth 3 form)) |
| 3432 (byte-compile-two-args (butlast form)) | |
| 3433 (byte-compile-normal-call form))) | |
| 428 | 3434 (t (byte-compile-subr-wrong-args form "2-3")))) |
| 3435 | |
| 3436 (defun byte-compile-zero-or-one-arg-with-one-extra (form) | |
| 3437 (case (length (cdr form)) | |
| 3438 (0 (byte-compile-one-arg (append form '(nil)))) | |
| 3439 (1 (byte-compile-one-arg form)) | |
| 446 | 3440 (2 (if (eq nil (nth 2 form)) |
| 3441 (byte-compile-one-arg (butlast form)) | |
| 3442 (byte-compile-normal-call form))) | |
| 428 | 3443 (t (byte-compile-subr-wrong-args form "0-2")))) |
| 3444 | |
| 3445 (defun byte-compile-one-or-two-args-with-one-extra (form) | |
| 3446 (case (length (cdr form)) | |
| 3447 (1 (byte-compile-two-args (append form '(nil)))) | |
| 3448 (2 (byte-compile-two-args form)) | |
| 446 | 3449 (3 (if (eq nil (nth 3 form)) |
| 3450 (byte-compile-two-args (butlast form)) | |
| 3451 (byte-compile-normal-call form))) | |
| 428 | 3452 (t (byte-compile-subr-wrong-args form "1-3")))) |
| 3453 | |
| 3454 (defun byte-compile-two-or-three-args-with-one-extra (form) | |
| 3455 (case (length (cdr form)) | |
| 3456 (2 (byte-compile-three-args (append form '(nil)))) | |
| 3457 (3 (byte-compile-three-args form)) | |
| 446 | 3458 (4 (if (eq nil (nth 4 form)) |
| 3459 (byte-compile-three-args (butlast form)) | |
| 3460 (byte-compile-normal-call form))) | |
| 428 | 3461 (t (byte-compile-subr-wrong-args form "2-4")))) |
| 3462 | |
| 3463 (defun byte-compile-no-args-with-two-extra (form) | |
| 3464 (case (length (cdr form)) | |
| 3465 (0 (byte-compile-no-args form)) | |
| 3466 ((1 2) (byte-compile-normal-call form)) | |
| 3467 (t (byte-compile-subr-wrong-args form "0-2")))) | |
| 3468 | |
| 3469 (defun byte-compile-one-arg-with-two-extra (form) | |
| 3470 (case (length (cdr form)) | |
| 3471 (1 (byte-compile-one-arg form)) | |
| 3472 ((2 3) (byte-compile-normal-call form)) | |
| 3473 (t (byte-compile-subr-wrong-args form "1-3")))) | |
| 3474 | |
| 3475 (defun byte-compile-noop (form) | |
| 3476 (byte-compile-constant nil)) | |
| 3477 | |
| 3478 (defun byte-compile-discard () | |
| 3479 (byte-compile-out 'byte-discard 0)) | |
| 3480 | |
| 446 | 3481 (defun byte-compile-max (form) |
| 3482 (let ((args (cdr form))) | |
| 428 | 3483 (case (length args) |
| 446 | 3484 (0 (byte-compile-subr-wrong-args form "1 or more")) |
| 3485 (1 (byte-compile-form (car args)) | |
| 3486 (when (not byte-compile-delete-errors) | |
| 3487 (byte-compile-out 'byte-dup 0) | |
| 3488 (byte-compile-out 'byte-max 0))) | |
| 428 | 3489 (t (byte-compile-form (car args)) |
| 446 | 3490 (dolist (elt (cdr args)) |
| 3491 (byte-compile-form elt) | |
| 3492 (byte-compile-out 'byte-max 0)))))) | |
| 3493 | |
| 3494 (defun byte-compile-min (form) | |
| 3495 (let ((args (cdr form))) | |
| 3496 (case (length args) | |
| 3497 (0 (byte-compile-subr-wrong-args form "1 or more")) | |
| 3498 (1 (byte-compile-form (car args)) | |
| 3499 (when (not byte-compile-delete-errors) | |
| 3500 (byte-compile-out 'byte-dup 0) | |
| 3501 (byte-compile-out 'byte-min 0))) | |
| 3502 (t (byte-compile-form (car args)) | |
| 3503 (dolist (elt (cdr args)) | |
| 3504 (byte-compile-form elt) | |
| 3505 (byte-compile-out 'byte-min 0)))))) | |
| 428 | 3506 |
| 3507 | |
| 3508 ;; more complicated compiler macros | |
| 3509 | |
| 3510 (byte-defop-compiler list) | |
| 3511 (byte-defop-compiler concat) | |
| 3512 (byte-defop-compiler fset) | |
| 3513 (byte-defop-compiler insert) | |
| 3514 (byte-defop-compiler-1 function byte-compile-function-form) | |
| 446 | 3515 (byte-defop-compiler max) |
| 3516 (byte-defop-compiler min) | |
| 3517 (byte-defop-compiler (+ byte-plus) byte-compile-plus) | |
| 3518 (byte-defop-compiler-1 - byte-compile-minus) | |
| 3519 (byte-defop-compiler (* byte-mult) byte-compile-mult) | |
| 3520 (byte-defop-compiler (/ byte-quo) byte-compile-quo) | |
| 428 | 3521 (byte-defop-compiler nconc) |
| 3522 (byte-defop-compiler-1 beginning-of-line) | |
| 3523 | |
| 3524 (byte-defop-compiler (= byte-eqlsign) byte-compile-arithcompare) | |
| 3525 (byte-defop-compiler (< byte-lss) byte-compile-arithcompare) | |
| 3526 (byte-defop-compiler (> byte-gtr) byte-compile-arithcompare) | |
| 3527 (byte-defop-compiler (<= byte-leq) byte-compile-arithcompare) | |
| 3528 (byte-defop-compiler (>= byte-geq) byte-compile-arithcompare) | |
| 3529 | |
| 3530 (defun byte-compile-arithcompare (form) | |
| 3531 (case (length (cdr form)) | |
| 3532 (0 (byte-compile-subr-wrong-args form "1 or more")) | |
| 549 | 3533 (1 (if byte-compile-delete-errors |
| 3534 (byte-compile-constant t) | |
| 3535 (byte-compile-normal-call form))) | |
| 428 | 3536 (2 (byte-compile-two-args form)) |
| 3537 (t (byte-compile-normal-call form)))) | |
| 3538 | |
| 3539 (byte-defop-compiler /= byte-compile-/=) | |
| 3540 | |
| 3541 (defun byte-compile-/= (form) | |
| 3542 (case (length (cdr form)) | |
| 3543 (0 (byte-compile-subr-wrong-args form "1 or more")) | |
| 3544 (1 (byte-compile-constant t)) | |
| 3545 ;; optimize (/= X Y) to (not (= X Y)) | |
| 3546 (2 (byte-compile-form-do-effect `(not (= ,@(cdr form))))) | |
| 3547 (t (byte-compile-normal-call form)))) | |
| 3548 | |
| 3549 ;; buffer-substring now has its own function. This used to be | |
| 3550 ;; 2+1, but now all args are optional. | |
| 3551 (byte-defop-compiler buffer-substring) | |
| 3552 | |
| 3553 (defun byte-compile-buffer-substring (form) | |
| 3554 ;; buffer-substring used to take exactly two args, but now takes 0-3. | |
| 3555 ;; convert 0-2 to two args and use special bytecode operand. | |
| 3556 ;; convert 3 args to a normal call. | |
| 3557 (case (length (cdr form)) | |
| 3558 (0 (byte-compile-two-args (append form '(nil nil)))) | |
| 3559 (1 (byte-compile-two-args (append form '(nil)))) | |
| 3560 (2 (byte-compile-two-args form)) | |
| 3561 (3 (byte-compile-normal-call form)) | |
| 3562 (t (byte-compile-subr-wrong-args form "0-3")))) | |
| 3563 | |
| 3564 (defun byte-compile-list (form) | |
| 3565 (let* ((args (cdr form)) | |
| 3566 (nargs (length args))) | |
| 3567 (cond | |
|
5366
f00192e1cd49
Examining the result of #'length: `eql', not `=', it's better style & cheaper
Aidan Kehoe <kehoea@parhasard.net>
parents:
5358
diff
changeset
|
3568 ((eql nargs 0) |
| 428 | 3569 (byte-compile-constant nil)) |
| 3570 ((< nargs 5) | |
|
4783
e29fcfd8df5f
Eliminate most core code byte-compile warnings.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4775
diff
changeset
|
3571 (mapc 'byte-compile-form args) |
| 428 | 3572 (byte-compile-out |
| 3573 (aref [byte-list1 byte-list2 byte-list3 byte-list4] (1- nargs)) | |
| 3574 0)) | |
| 3575 ((< nargs 256) | |
|
4783
e29fcfd8df5f
Eliminate most core code byte-compile warnings.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4775
diff
changeset
|
3576 (mapc 'byte-compile-form args) |
| 428 | 3577 (byte-compile-out 'byte-listN nargs)) |
| 3578 (t (byte-compile-normal-call form))))) | |
| 3579 | |
| 3580 (defun byte-compile-concat (form) | |
| 3581 (let* ((args (cdr form)) | |
| 3582 (nargs (length args))) | |
| 3583 ;; Concat of one arg is not a no-op if arg is not a string. | |
| 3584 (cond | |
| 3585 ((memq nargs '(2 3 4)) | |
|
4783
e29fcfd8df5f
Eliminate most core code byte-compile warnings.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4775
diff
changeset
|
3586 (mapc 'byte-compile-form args) |
| 428 | 3587 (byte-compile-out |
| 3588 (aref [byte-concat2 byte-concat3 byte-concat4] (- nargs 2)) | |
| 3589 0)) | |
| 3590 ((eq nargs 0) | |
| 3591 (byte-compile-form "")) | |
| 3592 ((< nargs 256) | |
|
4783
e29fcfd8df5f
Eliminate most core code byte-compile warnings.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4775
diff
changeset
|
3593 (mapc 'byte-compile-form args) |
| 428 | 3594 (byte-compile-out 'byte-concatN nargs)) |
| 3595 ((byte-compile-normal-call form))))) | |
| 3596 | |
| 446 | 3597 (defun byte-compile-plus (form) |
| 3598 (let ((args (cdr form))) | |
| 3599 (case (length args) | |
| 3600 (0 (byte-compile-constant 0)) | |
| 3601 (1 (byte-compile-plus (append form '(0)))) | |
| 3602 (t (byte-compile-form (car args)) | |
| 3603 (dolist (elt (cdr args)) | |
| 3604 (case elt | |
| 3605 (0 (when (not byte-compile-delete-errors) | |
| 3606 (byte-compile-constant 0) | |
| 3607 (byte-compile-out 'byte-plus 0))) | |
| 3608 (+1 (byte-compile-out 'byte-add1 0)) | |
| 3609 (-1 (byte-compile-out 'byte-sub1 0)) | |
| 3610 (t | |
| 3611 (byte-compile-form elt) | |
| 3612 (byte-compile-out 'byte-plus 0)))))))) | |
| 3613 | |
| 428 | 3614 (defun byte-compile-minus (form) |
| 3615 (let ((args (cdr form))) | |
| 3616 (case (length args) | |
| 3617 (0 (byte-compile-subr-wrong-args form "1 or more")) | |
| 3618 (1 (byte-compile-form (car args)) | |
| 3619 (byte-compile-out 'byte-negate 0)) | |
| 3620 (t (byte-compile-form (car args)) | |
| 3621 (dolist (elt (cdr args)) | |
| 446 | 3622 (case elt |
| 3623 (0 (when (not byte-compile-delete-errors) | |
| 3624 (byte-compile-constant 0) | |
| 3625 (byte-compile-out 'byte-diff 0))) | |
| 3626 (+1 (byte-compile-out 'byte-sub1 0)) | |
| 3627 (-1 (byte-compile-out 'byte-add1 0)) | |
| 3628 (t | |
| 3629 (byte-compile-form elt) | |
| 3630 (byte-compile-out 'byte-diff 0)))))))) | |
| 3631 | |
| 3632 (defun byte-compile-mult (form) | |
| 3633 (let ((args (cdr form))) | |
| 3634 (case (length args) | |
| 3635 (0 (byte-compile-constant 1)) | |
| 3636 (1 (byte-compile-mult (append form '(1)))) | |
| 3637 (t (byte-compile-form (car args)) | |
| 3638 (dolist (elt (cdr args)) | |
| 3639 (case elt | |
| 3640 (1 (when (not byte-compile-delete-errors) | |
| 3641 (byte-compile-constant 1) | |
| 3642 (byte-compile-out 'byte-mult 0))) | |
| 3643 (-1 (byte-compile-out 'byte-negate 0)) | |
| 3644 (2 (byte-compile-out 'byte-dup 0) | |
| 3645 (byte-compile-out 'byte-plus 0)) | |
| 3646 (t | |
| 3647 (byte-compile-form elt) | |
| 3648 (byte-compile-out 'byte-mult 0)))))))) | |
| 428 | 3649 |
| 3650 (defun byte-compile-quo (form) | |
| 3651 (let ((args (cdr form))) | |
| 3652 (case (length args) | |
| 3653 (0 (byte-compile-subr-wrong-args form "1 or more")) | |
| 3654 (1 (byte-compile-constant 1) | |
| 3655 (byte-compile-form (car args)) | |
| 3656 (byte-compile-out 'byte-quo 0)) | |
| 3657 (t (byte-compile-form (car args)) | |
| 3658 (dolist (elt (cdr args)) | |
| 446 | 3659 (case elt |
| 3660 (+1 (when (not byte-compile-delete-errors) | |
| 3661 (byte-compile-constant 1) | |
| 3662 (byte-compile-out 'byte-quo 0))) | |
| 3663 (-1 (byte-compile-out 'byte-negate 0)) | |
| 3664 (t | |
| 3665 (when (and (numberp elt) (= elt 0)) | |
| 3666 (byte-compile-warn "Attempt to divide by zero: %s" form)) | |
| 3667 (byte-compile-form elt) | |
| 3668 (byte-compile-out 'byte-quo 0)))))))) | |
| 428 | 3669 |
| 3670 (defun byte-compile-nconc (form) | |
| 3671 (let ((args (cdr form))) | |
| 3672 (case (length args) | |
| 3673 (0 (byte-compile-constant nil)) | |
| 3674 ;; nconc of one arg is a noop, even if that arg isn't a list. | |
| 3675 (1 (byte-compile-form (car args))) | |
| 3676 (t (byte-compile-form (car args)) | |
| 3677 (dolist (elt (cdr args)) | |
| 3678 (byte-compile-form elt) | |
| 3679 (byte-compile-out 'byte-nconc 0)))))) | |
| 3680 | |
| 3681 (defun byte-compile-fset (form) | |
| 3682 ;; warn about forms like (fset 'foo '(lambda () ...)) | |
| 3683 ;; (where the lambda expression is non-trivial...) | |
| 3684 ;; Except don't warn if the first argument is 'make-byte-code, because | |
| 3685 ;; I'm sick of getting mail asking me whether that warning is a problem. | |
| 3686 (let ((fn (nth 2 form)) | |
| 3687 body) | |
| 3688 (when (and (eq (car-safe fn) 'quote) | |
| 3689 (eq (car-safe (setq fn (nth 1 fn))) 'lambda) | |
| 3690 (not (eq (car-safe (cdr-safe (nth 1 form))) 'make-byte-code))) | |
| 3691 (setq body (cdr (cdr fn))) | |
| 3692 (if (stringp (car body)) (setq body (cdr body))) | |
| 3693 (if (eq 'interactive (car-safe (car body))) (setq body (cdr body))) | |
| 3694 (if (and (consp (car body)) | |
|
4719
bd51ab22afa8
Make it possible to silence warnings issued when #'mapcar's result is discarded.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4716
diff
changeset
|
3695 (not (eq 'byte-code (car (car body)))) |
|
bd51ab22afa8
Make it possible to silence warnings issued when #'mapcar's result is discarded.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4716
diff
changeset
|
3696 (memq 'quoted-lambda byte-compile-warnings)) |
| 428 | 3697 (byte-compile-warn |
| 3698 "A quoted lambda form is the second argument of fset. This is probably | |
| 3699 not what you want, as that lambda cannot be compiled. Consider using | |
| 3700 the syntax (function (lambda (...) ...)) instead.")))) | |
| 3701 (byte-compile-two-args form)) | |
| 3702 | |
|
5089
99f8ebc082d9
Make #'substring an alias of #'subseq; give the latter the byte code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4996
diff
changeset
|
3703 (defun byte-compile-subseq (form) |
|
99f8ebc082d9
Make #'substring an alias of #'subseq; give the latter the byte code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4996
diff
changeset
|
3704 (byte-compile-two-or-three-args form) |
|
99f8ebc082d9
Make #'substring an alias of #'subseq; give the latter the byte code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4996
diff
changeset
|
3705 ;; Check that XEmacs supports the substring-subseq equivalence. |
|
99f8ebc082d9
Make #'substring an alias of #'subseq; give the latter the byte code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4996
diff
changeset
|
3706 (pushnew '(eq 'subseq (symbol-function 'substring)) |
|
99f8ebc082d9
Make #'substring an alias of #'subseq; give the latter the byte code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4996
diff
changeset
|
3707 byte-compile-checks-on-load :test #'equal)) |
|
99f8ebc082d9
Make #'substring an alias of #'subseq; give the latter the byte code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4996
diff
changeset
|
3708 |
|
4743
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3709 (defmacro byte-compile-funarg-n (&rest n) |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3710 `#'(lambda (form) |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3711 ,@(loop |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3712 for en in n |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3713 collect `(let ((fn (nth ,en form))) |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3714 (when (and (eq (car-safe fn) 'quote) |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3715 (eq (car-safe (nth 1 fn)) 'lambda) |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3716 (or |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3717 (null (memq 'quoted-lambda |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3718 byte-compile-warnings)) |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3719 (byte-compile-warn |
|
5182
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5106
diff
changeset
|
3720 "Passing a quoted lambda (arg %d) to #'%s, \ |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5106
diff
changeset
|
3721 forcing function quoting" ,en (car form)))) |
|
4743
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3722 (setcar fn 'function)))) |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3723 (byte-compile-normal-call form))) |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3724 |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3725 ;; (mapcar '(lambda (x) ..) ..) ==> (mapcar (function (lambda (x) ..)) ..) |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3726 ;; for cases where it's guaranteed that first arg will be used as a lambda. |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3727 (defalias 'byte-compile-funarg (byte-compile-funarg-n 1)) |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3728 |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3729 ;; (sort ... '(lambda (x) ..)) ==> (sort ... (function (lambda (x) ..))) |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3730 ;; for cases where it's guaranteed that second arg will be used as a lambda. |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3731 (defalias 'byte-compile-funarg-2 (byte-compile-funarg-n 2)) |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3732 |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3733 ;; For #'merge, basically. |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3734 (defalias 'byte-compile-funarg-4 (byte-compile-funarg-n 4)) |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3735 |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3736 ;; For #'call-with-condition-handler, basically. |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3737 (defalias 'byte-compile-funarg-1-2 (byte-compile-funarg-n 1 2)) |
| 428 | 3738 |
|
4716
dca5bb2adff1
Don't cons with #'mapcar calls where the result is discarded,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4686
diff
changeset
|
3739 ;; XEmacs change; don't cons up the list if it's going to be immediately |
|
4743
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3740 ;; discarded. GNU give a warning in `byte-compile-normal-call' instead, and |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3741 ;; only for #'mapcar. |
|
4719
bd51ab22afa8
Make it possible to silence warnings issued when #'mapcar's result is discarded.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4716
diff
changeset
|
3742 (defun byte-compile-maybe-mapc (form) |
|
bd51ab22afa8
Make it possible to silence warnings issued when #'mapcar's result is discarded.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4716
diff
changeset
|
3743 (and for-effect |
|
bd51ab22afa8
Make it possible to silence warnings issued when #'mapcar's result is discarded.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4716
diff
changeset
|
3744 (or (null (memq 'discarded-consing byte-compile-warnings)) |
|
bd51ab22afa8
Make it possible to silence warnings issued when #'mapcar's result is discarded.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4716
diff
changeset
|
3745 (byte-compile-warn |
|
bd51ab22afa8
Make it possible to silence warnings issued when #'mapcar's result is discarded.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4716
diff
changeset
|
3746 "Discarding the result of #'%s; maybe you meant #'mapc?" |
|
bd51ab22afa8
Make it possible to silence warnings issued when #'mapcar's result is discarded.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4716
diff
changeset
|
3747 (car form))) |
|
4995
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4885
diff
changeset
|
3748 (setq form (cons 'mapc (cdr form)))) |
|
4716
dca5bb2adff1
Don't cons with #'mapcar calls where the result is discarded,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4686
diff
changeset
|
3749 (byte-compile-funarg form)) |
|
dca5bb2adff1
Don't cons with #'mapcar calls where the result is discarded,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4686
diff
changeset
|
3750 |
|
dca5bb2adff1
Don't cons with #'mapcar calls where the result is discarded,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4686
diff
changeset
|
3751 (defun byte-compile-maplist (form) |
|
4719
bd51ab22afa8
Make it possible to silence warnings issued when #'mapcar's result is discarded.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4716
diff
changeset
|
3752 (and for-effect |
|
bd51ab22afa8
Make it possible to silence warnings issued when #'mapcar's result is discarded.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4716
diff
changeset
|
3753 (or (null (memq 'discarded-consing byte-compile-warnings)) |
|
bd51ab22afa8
Make it possible to silence warnings issued when #'mapcar's result is discarded.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4716
diff
changeset
|
3754 (byte-compile-warn |
|
bd51ab22afa8
Make it possible to silence warnings issued when #'mapcar's result is discarded.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4716
diff
changeset
|
3755 "Discarding the result of #'maplist; maybe you meant #'mapl?")) |
|
bd51ab22afa8
Make it possible to silence warnings issued when #'mapcar's result is discarded.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4716
diff
changeset
|
3756 (setq form (cons 'mapl (cdr form)))) |
|
4716
dca5bb2adff1
Don't cons with #'mapcar calls where the result is discarded,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4686
diff
changeset
|
3757 (byte-compile-funarg form)) |
|
dca5bb2adff1
Don't cons with #'mapcar calls where the result is discarded,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4686
diff
changeset
|
3758 |
|
5182
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5106
diff
changeset
|
3759 ;; For when calls to #'sort or #'mapcar have more than two args, something |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5106
diff
changeset
|
3760 ;; recent XEmacs can handle, but GNU and 21.4 can't. |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5106
diff
changeset
|
3761 (defmacro byte-compile-maybe-add-* (complex max) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5106
diff
changeset
|
3762 `#'(lambda (form) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5106
diff
changeset
|
3763 (when (> (length (cdr form)) ,max) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5106
diff
changeset
|
3764 (when (memq 'callargs byte-compile-warnings) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5106
diff
changeset
|
3765 (byte-compile-warn |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5106
diff
changeset
|
3766 "#'%s called with %d arguments, using #'%s instead" |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5106
diff
changeset
|
3767 (car form) (length (cdr form)) ',complex)) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5106
diff
changeset
|
3768 (setq form (cons ',complex (cdr form)))) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5106
diff
changeset
|
3769 (funcall (or (get ',complex 'byte-compile) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5106
diff
changeset
|
3770 'byte-compile-normal-call) form))) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5106
diff
changeset
|
3771 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5106
diff
changeset
|
3772 (defalias 'byte-compile-mapcar (byte-compile-maybe-add-* mapcar* 2)) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5106
diff
changeset
|
3773 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5106
diff
changeset
|
3774 (defalias 'byte-compile-sort (byte-compile-maybe-add-* sort* 2)) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5106
diff
changeset
|
3775 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5106
diff
changeset
|
3776 (defalias 'byte-compile-fillarray (byte-compile-maybe-add-* fill 2)) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5106
diff
changeset
|
3777 |
| 428 | 3778 ;; (function foo) must compile like 'foo, not like (symbol-function 'foo). |
| 3779 ;; Otherwise it will be incompatible with the interpreter, | |
| 3780 ;; and (funcall (function foo)) will lose with autoloads. | |
| 3781 | |
| 3782 (defun byte-compile-function-form (form) | |
|
5265
5663ae9a8989
Warn at compile time, error at runtime, with (quote X Y), (function X Y).
Aidan Kehoe <kehoea@parhasard.net>
parents:
5263
diff
changeset
|
3783 (if (cddr form) |
|
5663ae9a8989
Warn at compile time, error at runtime, with (quote X Y), (function X Y).
Aidan Kehoe <kehoea@parhasard.net>
parents:
5263
diff
changeset
|
3784 (byte-compile-normal-call |
|
5663ae9a8989
Warn at compile time, error at runtime, with (quote X Y), (function X Y).
Aidan Kehoe <kehoea@parhasard.net>
parents:
5263
diff
changeset
|
3785 `(signal 'wrong-number-of-arguments '(function ,(length (cdr form))))) |
|
5574
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
3786 (byte-compile-constant (if (eq 'lambda (car-safe (nth 1 form))) |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
3787 (byte-compile-lambda (nth 1 form)) |
|
d4f334808463
Support inlining labels, bytecomp.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5573
diff
changeset
|
3788 (nth 1 form))))) |
| 428 | 3789 |
| 3790 (defun byte-compile-insert (form) | |
| 3791 (cond ((null (cdr form)) | |
| 3792 (byte-compile-constant nil)) | |
| 3793 ((<= (length form) 256) | |
|
4783
e29fcfd8df5f
Eliminate most core code byte-compile warnings.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4775
diff
changeset
|
3794 (mapc 'byte-compile-form (cdr form)) |
| 428 | 3795 (if (cdr (cdr form)) |
| 3796 (byte-compile-out 'byte-insertN (length (cdr form))) | |
| 3797 (byte-compile-out 'byte-insert 0))) | |
| 3798 ((memq t (mapcar 'consp (cdr (cdr form)))) | |
| 3799 (byte-compile-normal-call form)) | |
| 3800 ;; We can split it; there is no function call after inserting 1st arg. | |
| 3801 (t | |
| 3802 (while (setq form (cdr form)) | |
| 3803 (byte-compile-form (car form)) | |
| 3804 (byte-compile-out 'byte-insert 0) | |
| 3805 (when (cdr form) | |
| 3806 (byte-compile-discard)))))) | |
| 3807 | |
| 3808 ;; alas, the old (pre-19.12, and all existing versions of FSFmacs 19) | |
| 3809 ;; byte compiler will generate incorrect code for | |
| 3810 ;; (beginning-of-line nil buffer) because it buggily doesn't | |
| 3811 ;; check the number of arguments passed to beginning-of-line. | |
| 3812 | |
| 3813 (defun byte-compile-beginning-of-line (form) | |
| 3814 (let ((len (length form))) | |
| 3815 (cond ((> len 3) | |
| 3816 (byte-compile-subr-wrong-args form "0-2")) | |
|
5366
f00192e1cd49
Examining the result of #'length: `eql', not `=', it's better style & cheaper
Aidan Kehoe <kehoea@parhasard.net>
parents:
5358
diff
changeset
|
3817 ((or (eql len 3) (not (byte-compile-constp (nth 1 form)))) |
| 428 | 3818 (byte-compile-normal-call form)) |
| 3819 (t | |
| 3820 (byte-compile-form | |
| 3821 (list 'forward-line | |
| 3822 (if (integerp (setq form (or (eval (nth 1 form)) 1))) | |
| 3823 (1- form) | |
| 3824 (byte-compile-warn | |
| 3825 "Non-numeric arg to beginning-of-line: %s" form) | |
| 3826 (list '1- (list 'quote form)))) | |
| 3827 t) | |
| 3828 (byte-compile-constant nil))))) | |
| 3829 | |
| 3830 | |
| 3831 (byte-defop-compiler set) | |
| 3832 (byte-defop-compiler-1 setq) | |
| 3833 (byte-defop-compiler-1 set-default) | |
| 3834 (byte-defop-compiler-1 setq-default) | |
| 3835 | |
| 3836 (byte-defop-compiler-1 quote) | |
| 3837 (byte-defop-compiler-1 quote-form) | |
| 3838 | |
| 3839 (defun byte-compile-setq (form) | |
| 3840 (let ((args (cdr form)) var val) | |
| 3841 (if (null args) | |
| 3842 ;; (setq), with no arguments. | |
| 3843 (byte-compile-form nil for-effect) | |
| 3844 (while args | |
| 3845 (setq var (pop args)) | |
| 3846 (if (null args) | |
| 3847 ;; Odd number of args? Let `set' get the error. | |
| 3848 (byte-compile-form `(set ',var) for-effect) | |
| 3849 (setq val (pop args)) | |
|
5344
2a54dfbe434f
Don't quote keywords, they've been self-quoting for well over a decade.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5301
diff
changeset
|
3850 (byte-compile-form val) |
|
2a54dfbe434f
Don't quote keywords, they've been self-quoting for well over a decade.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5301
diff
changeset
|
3851 (unless (or args for-effect) |
|
2a54dfbe434f
Don't quote keywords, they've been self-quoting for well over a decade.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5301
diff
changeset
|
3852 (byte-compile-out 'byte-dup 0)) |
|
2a54dfbe434f
Don't quote keywords, they've been self-quoting for well over a decade.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5301
diff
changeset
|
3853 (byte-compile-variable-ref 'byte-varset var))))) |
| 428 | 3854 (setq for-effect nil)) |
| 3855 | |
| 3856 (defun byte-compile-set (form) | |
| 3857 ;; Compile (set 'foo x) as (setq foo x) for trivially better code and so | |
| 3858 ;; that we get applicable warnings. Compile everything else (including | |
| 3859 ;; malformed calls) like a normal 2-arg byte-coded function. | |
| 3860 (let ((symform (nth 1 form)) | |
| 3861 (valform (nth 2 form)) | |
| 3862 sym) | |
|
5344
2a54dfbe434f
Don't quote keywords, they've been self-quoting for well over a decade.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5301
diff
changeset
|
3863 (if (and (eql (length form) 3) |
|
2a54dfbe434f
Don't quote keywords, they've been self-quoting for well over a decade.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5301
diff
changeset
|
3864 (eql (safe-length symform) 2) |
| 428 | 3865 (eq (car symform) 'quote) |
|
5344
2a54dfbe434f
Don't quote keywords, they've been self-quoting for well over a decade.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5301
diff
changeset
|
3866 (symbolp (setq sym (car (cdr symform))))) |
| 428 | 3867 (byte-compile-setq `(setq ,sym ,valform)) |
| 3868 (byte-compile-two-args form)))) | |
| 3869 | |
| 3870 (defun byte-compile-setq-default (form) | |
| 3871 (let ((args (cdr form))) | |
| 3872 (if (null args) | |
| 3873 ;; (setq-default), with no arguments. | |
| 3874 (byte-compile-form nil for-effect) | |
| 3875 ;; emit multiple calls to `set-default' if necessary | |
| 3876 (while args | |
| 3877 (byte-compile-form | |
| 3878 ;; Odd number of args? Let `set-default' get the error. | |
| 3879 `(set-default ',(pop args) ,@(if args (list (pop args)) nil)) | |
| 3880 (if args t for-effect))))) | |
| 3881 (setq for-effect nil)) | |
| 3882 | |
| 3883 (defun byte-compile-set-default (form) | |
| 3884 (let* ((args (cdr form)) | |
| 3885 (nargs (length args)) | |
| 3886 (var (car args))) | |
|
5366
f00192e1cd49
Examining the result of #'length: `eql', not `=', it's better style & cheaper
Aidan Kehoe <kehoea@parhasard.net>
parents:
5358
diff
changeset
|
3887 (when (and (eql (safe-length var) 2) (eq (car var) 'quote)) |
| 428 | 3888 (let ((sym (nth 1 var))) |
| 3889 (cond | |
| 3890 ((not (symbolp sym)) | |
| 3891 (byte-compile-warn "Attempt to set-globally non-symbol %s" sym)) | |
| 3892 ((byte-compile-constant-symbol-p sym) | |
| 3893 (byte-compile-warn "Attempt to set-globally constant symbol %s" sym)) | |
| 3894 ((let ((cell (assq sym byte-compile-bound-variables))) | |
| 3895 (and cell | |
| 3896 (setcdr cell (logior (cdr cell) byte-compile-assigned-bit)) | |
| 3897 t))) | |
| 3898 ;; notice calls to set-default/setq-default for variables which | |
| 3899 ;; have not been declared with defvar/defconst. | |
| 3900 ((globally-boundp sym)) ; OK | |
| 3901 ((not (memq 'free-vars byte-compile-warnings))) ; warnings suppressed? | |
| 3902 ((memq sym byte-compile-free-assignments)) ; already warned about sym | |
| 3903 (t | |
| 3904 (byte-compile-warn "assignment to free variable %s" sym) | |
| 3905 (push sym byte-compile-free-assignments))))) | |
|
5366
f00192e1cd49
Examining the result of #'length: `eql', not `=', it's better style & cheaper
Aidan Kehoe <kehoea@parhasard.net>
parents:
5358
diff
changeset
|
3906 (if (eql nargs 2) |
| 428 | 3907 ;; now emit a normal call to set-default |
| 3908 (byte-compile-normal-call form) | |
| 3909 (byte-compile-subr-wrong-args form 2)))) | |
| 3910 | |
| 3911 | |
| 3912 (defun byte-compile-quote (form) | |
|
5265
5663ae9a8989
Warn at compile time, error at runtime, with (quote X Y), (function X Y).
Aidan Kehoe <kehoea@parhasard.net>
parents:
5263
diff
changeset
|
3913 (if (cddr form) |
|
5663ae9a8989
Warn at compile time, error at runtime, with (quote X Y), (function X Y).
Aidan Kehoe <kehoea@parhasard.net>
parents:
5263
diff
changeset
|
3914 (byte-compile-normal-call |
|
5663ae9a8989
Warn at compile time, error at runtime, with (quote X Y), (function X Y).
Aidan Kehoe <kehoea@parhasard.net>
parents:
5263
diff
changeset
|
3915 `(signal 'wrong-number-of-arguments '(quote ,(length (cdr form))))) |
|
5663ae9a8989
Warn at compile time, error at runtime, with (quote X Y), (function X Y).
Aidan Kehoe <kehoea@parhasard.net>
parents:
5263
diff
changeset
|
3916 (byte-compile-constant (car (cdr form))))) |
| 428 | 3917 |
| 3918 (defun byte-compile-quote-form (form) | |
|
5265
5663ae9a8989
Warn at compile time, error at runtime, with (quote X Y), (function X Y).
Aidan Kehoe <kehoea@parhasard.net>
parents:
5263
diff
changeset
|
3919 (if (cddr form) |
|
5663ae9a8989
Warn at compile time, error at runtime, with (quote X Y), (function X Y).
Aidan Kehoe <kehoea@parhasard.net>
parents:
5263
diff
changeset
|
3920 (byte-compile-normal-call |
|
5663ae9a8989
Warn at compile time, error at runtime, with (quote X Y), (function X Y).
Aidan Kehoe <kehoea@parhasard.net>
parents:
5263
diff
changeset
|
3921 `(signal 'wrong-number-of-arguments '(quote ,(length (cdr form))))) |
|
5663ae9a8989
Warn at compile time, error at runtime, with (quote X Y), (function X Y).
Aidan Kehoe <kehoea@parhasard.net>
parents:
5263
diff
changeset
|
3922 (byte-compile-constant (byte-compile-top-level (nth 1 form))))) |
| 428 | 3923 |
| 3924 ;;; control structures | |
| 3925 | |
| 3926 (defun byte-compile-body (body &optional for-effect) | |
| 3927 (while (cdr body) | |
| 3928 (byte-compile-form (car body) t) | |
| 3929 (setq body (cdr body))) | |
| 3930 (byte-compile-form (car body) for-effect)) | |
| 3931 | |
| 3932 (proclaim-inline byte-compile-body-do-effect) | |
| 3933 (defun byte-compile-body-do-effect (body) | |
| 3934 (byte-compile-body body for-effect) | |
| 3935 (setq for-effect nil)) | |
| 3936 | |
| 3937 (proclaim-inline byte-compile-form-do-effect) | |
| 3938 (defun byte-compile-form-do-effect (form) | |
| 3939 (byte-compile-form form for-effect) | |
| 3940 (setq for-effect nil)) | |
| 3941 | |
| 3942 (byte-defop-compiler-1 inline byte-compile-progn) | |
| 3943 (byte-defop-compiler-1 progn) | |
| 3944 (byte-defop-compiler-1 prog1) | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
3945 (byte-defop-compiler-1 multiple-value-prog1) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
3946 (byte-defop-compiler-1 values) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
3947 (byte-defop-compiler-1 values-list) |
| 428 | 3948 (byte-defop-compiler-1 prog2) |
| 3949 (byte-defop-compiler-1 if) | |
| 3950 (byte-defop-compiler-1 cond) | |
| 3951 (byte-defop-compiler-1 and) | |
| 3952 (byte-defop-compiler-1 or) | |
| 3953 (byte-defop-compiler-1 while) | |
| 3954 (byte-defop-compiler-1 funcall) | |
| 3955 (byte-defop-compiler-1 apply byte-compile-funarg) | |
|
5182
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5106
diff
changeset
|
3956 (byte-defop-compiler-1 mapcar byte-compile-mapcar) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5106
diff
changeset
|
3957 (byte-defop-compiler-1 mapcar* byte-compile-maybe-mapc) |
| 428 | 3958 (byte-defop-compiler-1 mapatoms byte-compile-funarg) |
| 3959 (byte-defop-compiler-1 mapconcat byte-compile-funarg) | |
|
4743
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3960 (byte-defop-compiler-1 mapc byte-compile-funarg) |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3961 (byte-defop-compiler-1 maphash byte-compile-funarg) |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3962 (byte-defop-compiler-1 map-char-table byte-compile-funarg) |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3963 (byte-defop-compiler-1 mapvector byte-compile-maybe-mapc) |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3964 (byte-defop-compiler-1 mapc-internal byte-compile-funarg) |
|
4716
dca5bb2adff1
Don't cons with #'mapcar calls where the result is discarded,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4686
diff
changeset
|
3965 (byte-defop-compiler-1 maplist byte-compile-maplist) |
|
dca5bb2adff1
Don't cons with #'mapcar calls where the result is discarded,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4686
diff
changeset
|
3966 (byte-defop-compiler-1 mapl byte-compile-funarg) |
|
dca5bb2adff1
Don't cons with #'mapcar calls where the result is discarded,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4686
diff
changeset
|
3967 (byte-defop-compiler-1 mapcan byte-compile-funarg) |
|
dca5bb2adff1
Don't cons with #'mapcar calls where the result is discarded,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4686
diff
changeset
|
3968 (byte-defop-compiler-1 mapcon byte-compile-funarg) |
|
4719
bd51ab22afa8
Make it possible to silence warnings issued when #'mapcar's result is discarded.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4716
diff
changeset
|
3969 (byte-defop-compiler-1 map-database byte-compile-funarg) |
|
bd51ab22afa8
Make it possible to silence warnings issued when #'mapcar's result is discarded.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4716
diff
changeset
|
3970 (byte-defop-compiler-1 map-extent-children byte-compile-funarg) |
|
bd51ab22afa8
Make it possible to silence warnings issued when #'mapcar's result is discarded.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4716
diff
changeset
|
3971 (byte-defop-compiler-1 map-extents byte-compile-funarg) |
|
bd51ab22afa8
Make it possible to silence warnings issued when #'mapcar's result is discarded.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4716
diff
changeset
|
3972 (byte-defop-compiler-1 map-plist byte-compile-funarg) |
|
bd51ab22afa8
Make it possible to silence warnings issued when #'mapcar's result is discarded.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4716
diff
changeset
|
3973 (byte-defop-compiler-1 map-range-table byte-compile-funarg) |
|
bd51ab22afa8
Make it possible to silence warnings issued when #'mapcar's result is discarded.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4716
diff
changeset
|
3974 (byte-defop-compiler-1 map-syntax-table byte-compile-funarg) |
|
4743
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3975 |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3976 (byte-defop-compiler-1 remove-if byte-compile-funarg) |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3977 (byte-defop-compiler-1 remove-if-not byte-compile-funarg) |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3978 (byte-defop-compiler-1 delete-if byte-compile-funarg) |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3979 (byte-defop-compiler-1 delete-if-not byte-compile-funarg) |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3980 (byte-defop-compiler-1 find-if byte-compile-funarg) |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3981 (byte-defop-compiler-1 find-if-not byte-compile-funarg) |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3982 (byte-defop-compiler-1 position-if byte-compile-funarg) |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3983 (byte-defop-compiler-1 position-if-not byte-compile-funarg) |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3984 (byte-defop-compiler-1 count-if byte-compile-funarg) |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3985 (byte-defop-compiler-1 count-if-not byte-compile-funarg) |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3986 (byte-defop-compiler-1 member-if byte-compile-funarg) |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3987 (byte-defop-compiler-1 member-if-not byte-compile-funarg) |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3988 (byte-defop-compiler-1 assoc-if byte-compile-funarg) |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3989 (byte-defop-compiler-1 assoc-if-not byte-compile-funarg) |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3990 (byte-defop-compiler-1 rassoc-if byte-compile-funarg) |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3991 (byte-defop-compiler-1 rassoc-if-not byte-compile-funarg) |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3992 (byte-defop-compiler-1 reduce byte-compile-funarg) |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3993 (byte-defop-compiler-1 some byte-compile-funarg) |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3994 (byte-defop-compiler-1 every byte-compile-funarg) |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3995 (byte-defop-compiler-1 notany byte-compile-funarg) |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3996 (byte-defop-compiler-1 notevery byte-compile-funarg) |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3997 |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3998 (byte-defop-compiler-1 walk-windows byte-compile-funarg) |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3999 (byte-defop-compiler-1 get-window-with-predicate byte-compile-funarg) |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
4000 |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
4001 (byte-defop-compiler-1 map byte-compile-funarg-2) |
|
5182
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5106
diff
changeset
|
4002 (byte-defop-compiler-1 map-into byte-compile-funarg-2) |
|
4743
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
4003 (byte-defop-compiler-1 apropos-internal byte-compile-funarg-2) |
|
5182
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5106
diff
changeset
|
4004 (byte-defop-compiler-1 sort byte-compile-sort) |
|
4743
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
4005 (byte-defop-compiler-1 sort* byte-compile-funarg-2) |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
4006 (byte-defop-compiler-1 stable-sort byte-compile-funarg-2) |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
4007 (byte-defop-compiler-1 substitute-if byte-compile-funarg-2) |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
4008 (byte-defop-compiler-1 substitute-if-not byte-compile-funarg-2) |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
4009 (byte-defop-compiler-1 nsubstitute-if byte-compile-funarg-2) |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
4010 (byte-defop-compiler-1 nsubstitute-if-not byte-compile-funarg-2) |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
4011 (byte-defop-compiler-1 subst-if byte-compile-funarg-2) |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
4012 (byte-defop-compiler-1 subst-if-not byte-compile-funarg-2) |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
4013 (byte-defop-compiler-1 nsubst-if byte-compile-funarg-2) |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
4014 (byte-defop-compiler-1 nsubst-if-not byte-compile-funarg-2) |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
4015 |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
4016 (byte-defop-compiler-1 merge byte-compile-funarg-4) |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
4017 |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
4018 (byte-defop-compiler-1 call-with-condition-handler byte-compile-funarg-1-2) |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
4019 (byte-defop-compiler-1 mapcar-extents byte-compile-funarg-1-2) |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
4020 |
| 428 | 4021 (byte-defop-compiler-1 let) |
| 4022 (byte-defop-compiler-1 let*) | |
| 4023 | |
|
4885
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
4024 (byte-defop-compiler-1 integerp) |
|
5301
ec05a30f7148
Fix a bytecomp.el bug compiling #'eql, which was masked by cl-macs.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5294
diff
changeset
|
4025 (byte-defop-compiler-1 eql) |
|
5182
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5106
diff
changeset
|
4026 (byte-defop-compiler-1 fillarray) |
|
4885
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
4027 |
| 428 | 4028 (defun byte-compile-progn (form) |
| 4029 (byte-compile-body-do-effect (cdr form))) | |
| 4030 | |
| 4031 (defun byte-compile-prog1 (form) | |
| 4032 (setq form (cdr form)) | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4033 ;; #'prog1 never returns multiple values: |
|
4686
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
4034 (byte-compile-form-do-effect `(or ,(pop form) nil)) |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4035 (byte-compile-body form t)) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4036 |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4037 (defun byte-compile-multiple-value-prog1 (form) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4038 (setq form (cdr form)) |
| 428 | 4039 (byte-compile-form-do-effect (pop form)) |
| 4040 (byte-compile-body form t)) | |
| 4041 | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4042 (defun byte-compile-values (form) |
|
5366
f00192e1cd49
Examining the result of #'length: `eql', not `=', it's better style & cheaper
Aidan Kehoe <kehoea@parhasard.net>
parents:
5358
diff
changeset
|
4043 (if (eql 2 (length form)) |
|
4686
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
4044 (if (byte-compile-constp (second form)) |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
4045 (byte-compile-form-do-effect (second form)) |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
4046 ;; #'or compiles to bytecode, #'values doesn't: |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
4047 (byte-compile-form-do-effect `(or ,(second form) nil))) |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4048 (byte-compile-normal-call form))) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4049 |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4050 (defun byte-compile-values-list (form) |
|
5366
f00192e1cd49
Examining the result of #'length: `eql', not `=', it's better style & cheaper
Aidan Kehoe <kehoea@parhasard.net>
parents:
5358
diff
changeset
|
4051 (if (and (eql 2 (length form)) |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4052 (or (null (second form)) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4053 (and (consp (second form)) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4054 (eq (car (second form)) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4055 'quote) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4056 (not (symbolp (car-safe (cdr (second form)))))))) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4057 (byte-compile-form-do-effect (car-safe (cdr (second form)))) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4058 (byte-compile-normal-call form))) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4059 |
| 428 | 4060 (defun byte-compile-prog2 (form) |
| 4061 (setq form (cdr form)) | |
| 4062 (byte-compile-form (pop form) t) | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4063 ;; #'prog2 never returns multiple values: |
|
4686
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
4064 (byte-compile-form-do-effect `(or ,(pop form) nil)) |
| 428 | 4065 (byte-compile-body form t)) |
| 4066 | |
| 4067 (defmacro byte-compile-goto-if (cond discard tag) | |
| 4068 `(byte-compile-goto | |
| 4069 (if ,cond | |
| 4070 (if ,discard 'byte-goto-if-not-nil 'byte-goto-if-not-nil-else-pop) | |
| 4071 (if ,discard 'byte-goto-if-nil 'byte-goto-if-nil-else-pop)) | |
| 4072 ,tag)) | |
| 4073 | |
| 4074 (defun byte-compile-if (form) | |
| 4075 (byte-compile-form (car (cdr form))) | |
| 4076 (if (null (nthcdr 3 form)) | |
| 4077 ;; No else-forms | |
| 4078 (let ((donetag (byte-compile-make-tag))) | |
| 4079 (byte-compile-goto-if nil for-effect donetag) | |
| 4080 (byte-compile-form (nth 2 form) for-effect) | |
| 4081 (byte-compile-out-tag donetag)) | |
| 4082 (let ((donetag (byte-compile-make-tag)) (elsetag (byte-compile-make-tag))) | |
| 4083 (byte-compile-goto 'byte-goto-if-nil elsetag) | |
| 4084 (byte-compile-form (nth 2 form) for-effect) | |
| 4085 (byte-compile-goto 'byte-goto donetag) | |
| 4086 (byte-compile-out-tag elsetag) | |
| 4087 (byte-compile-body (cdr (cdr (cdr form))) for-effect) | |
| 4088 (byte-compile-out-tag donetag))) | |
| 4089 (setq for-effect nil)) | |
| 4090 | |
| 4091 (defun byte-compile-cond (clauses) | |
| 4092 (let ((donetag (byte-compile-make-tag)) | |
| 4093 nexttag clause) | |
| 4094 (while (setq clauses (cdr clauses)) | |
| 4095 (setq clause (car clauses)) | |
| 4096 (cond ((or (eq (car clause) t) | |
| 4097 (and (eq (car-safe (car clause)) 'quote) | |
| 4098 (car-safe (cdr-safe (car clause))))) | |
| 4099 ;; Unconditional clause | |
| 4100 (setq clause (cons t clause) | |
| 4101 clauses nil)) | |
| 4102 ((cdr clauses) | |
| 4103 (byte-compile-form (car clause)) | |
| 4104 (if (null (cdr clause)) | |
| 4105 ;; First clause is a singleton. | |
| 4106 (byte-compile-goto-if t for-effect donetag) | |
| 4107 (setq nexttag (byte-compile-make-tag)) | |
| 4108 (byte-compile-goto 'byte-goto-if-nil nexttag) | |
| 4109 (byte-compile-body (cdr clause) for-effect) | |
| 4110 (byte-compile-goto 'byte-goto donetag) | |
| 4111 (byte-compile-out-tag nexttag))))) | |
| 4112 ;; Last clause | |
| 4113 (and (cdr clause) (not (eq (car clause) t)) | |
| 4114 (progn (byte-compile-form (car clause)) | |
| 4115 (byte-compile-goto-if nil for-effect donetag) | |
| 4116 (setq clause (cdr clause)))) | |
| 4117 (byte-compile-body-do-effect clause) | |
| 4118 (byte-compile-out-tag donetag))) | |
| 4119 | |
| 4120 (defun byte-compile-and (form) | |
| 4121 (let ((failtag (byte-compile-make-tag)) | |
| 4122 (args (cdr form))) | |
| 4123 (if (null args) | |
| 4124 (byte-compile-form-do-effect t) | |
| 4125 (while (cdr args) | |
| 4126 (byte-compile-form (car args)) | |
| 4127 (byte-compile-goto-if nil for-effect failtag) | |
| 4128 (setq args (cdr args))) | |
| 4129 (byte-compile-form-do-effect (car args)) | |
| 4130 (byte-compile-out-tag failtag)))) | |
| 4131 | |
| 4132 (defun byte-compile-or (form) | |
| 4133 (let ((wintag (byte-compile-make-tag)) | |
| 4134 (args (cdr form))) | |
| 4135 (if (null args) | |
| 4136 (byte-compile-form-do-effect nil) | |
| 4137 (while (cdr args) | |
| 4138 (byte-compile-form (car args)) | |
| 4139 (byte-compile-goto-if t for-effect wintag) | |
| 4140 (setq args (cdr args))) | |
| 4141 (byte-compile-form-do-effect (car args)) | |
| 4142 (byte-compile-out-tag wintag)))) | |
| 4143 | |
| 4144 (defun byte-compile-while (form) | |
| 4145 (let ((endtag (byte-compile-make-tag)) | |
| 4146 (looptag (byte-compile-make-tag))) | |
| 4147 (byte-compile-out-tag looptag) | |
| 4148 (byte-compile-form (car (cdr form))) | |
| 4149 (byte-compile-goto-if nil for-effect endtag) | |
| 4150 (byte-compile-body (cdr (cdr form)) t) | |
| 4151 (byte-compile-goto 'byte-goto looptag) | |
| 4152 (byte-compile-out-tag endtag) | |
| 4153 (setq for-effect nil))) | |
| 4154 | |
| 4155 (defun byte-compile-funcall (form) | |
|
5566
4654c01af32b
Improve the implementation, documentation of #'labels, #'flet.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5562
diff
changeset
|
4156 (if (and (memq 'callargs byte-compile-warnings) |
|
4654c01af32b
Improve the implementation, documentation of #'labels, #'flet.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5562
diff
changeset
|
4157 (byte-compile-constp (second form))) |
|
4654c01af32b
Improve the implementation, documentation of #'labels, #'flet.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5562
diff
changeset
|
4158 (byte-compile-callargs-warn (cons (cl-const-expr-val (second form)) |
|
4654c01af32b
Improve the implementation, documentation of #'labels, #'flet.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5562
diff
changeset
|
4159 (nthcdr 2 form)))) |
|
4783
e29fcfd8df5f
Eliminate most core code byte-compile warnings.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4775
diff
changeset
|
4160 (mapc 'byte-compile-form (cdr form)) |
| 428 | 4161 (byte-compile-out 'byte-call (length (cdr (cdr form))))) |
| 4162 | |
| 4163 | |
| 4164 (defun byte-compile-let (form) | |
| 4165 ;; First compute the binding values in the old scope. | |
| 4166 (let ((varlist (car (cdr form)))) | |
| 4167 (while varlist | |
| 4168 (if (consp (car varlist)) | |
| 4169 (byte-compile-form (car (cdr (car varlist)))) | |
| 4170 (byte-compile-push-constant nil)) | |
| 4171 (setq varlist (cdr varlist)))) | |
| 4172 (let ((byte-compile-bound-variables | |
| 4173 (cons 'new-scope byte-compile-bound-variables)) | |
| 4174 (varlist (reverse (car (cdr form)))) | |
| 4175 (extra-flags | |
| 4176 ;; If this let is of the form (let (...) (byte-code ...)) | |
| 4177 ;; then assume that it is the result of a transformation of | |
| 4178 ;; ((lambda (...) (byte-code ... )) ...) and thus compile | |
| 4179 ;; the variable bindings as if they were arglist bindings | |
| 4180 ;; (which matters for what warnings.) | |
| 4181 (if (eq 'byte-code (car-safe (nth 2 form))) | |
| 4182 byte-compile-arglist-bit | |
| 4183 nil))) | |
| 4184 (while varlist | |
| 4185 (byte-compile-variable-ref 'byte-varbind | |
| 4186 (if (consp (car varlist)) | |
| 4187 (car (car varlist)) | |
| 4188 (car varlist)) | |
| 4189 extra-flags) | |
| 4190 (setq varlist (cdr varlist))) | |
| 4191 (byte-compile-body-do-effect (cdr (cdr form))) | |
| 4192 (if (memq 'unused-vars byte-compile-warnings) | |
| 4193 ;; done compiling in this scope, warn now. | |
| 4194 (byte-compile-warn-about-unused-variables)) | |
| 4195 (byte-compile-out 'byte-unbind (length (car (cdr form)))))) | |
| 4196 | |
| 4197 (defun byte-compile-let* (form) | |
| 4198 (let ((byte-compile-bound-variables | |
| 4199 (cons 'new-scope byte-compile-bound-variables)) | |
| 4200 (varlist (copy-sequence (car (cdr form))))) | |
| 4201 (while varlist | |
| 4202 (if (atom (car varlist)) | |
| 4203 (byte-compile-push-constant nil) | |
| 4204 (byte-compile-form (car (cdr (car varlist)))) | |
| 4205 (setcar varlist (car (car varlist)))) | |
| 4206 (byte-compile-variable-ref 'byte-varbind (car varlist)) | |
| 4207 (setq varlist (cdr varlist))) | |
| 4208 (byte-compile-body-do-effect (cdr (cdr form))) | |
| 4209 (if (memq 'unused-vars byte-compile-warnings) | |
| 4210 ;; done compiling in this scope, warn now. | |
| 4211 (byte-compile-warn-about-unused-variables)) | |
| 4212 (byte-compile-out 'byte-unbind (length (car (cdr form)))))) | |
| 4213 | |
|
4885
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
4214 ;; We've renamed the integerp bytecode to fixnump, and changed its semantics |
|
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
4215 ;; accordingly. This means #'integerp itself can't be as fast as it used to |
|
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
4216 ;; be, since it no longer has a bytecode to itself. As it happens, though, |
|
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
4217 ;; most of the non-core calls to #'integerp are in contexts where it is |
|
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
4218 ;; either going to receive a fixnum, or something non-numeric entirely; the |
|
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
4219 ;; contexts where it needs to distinguish between an integer and a float are |
|
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
4220 ;; very rare. So, we can have (integerp X) compile to: |
|
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
4221 ;; |
|
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
4222 ;; (or (fixnump X) (and (numberp X) (funcall #'integerp X))) |
|
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
4223 ;; |
|
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
4224 ;; without the multiple evaluation of X, and where #'fixnump and #'numberp |
|
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
4225 ;; both have bytecodes. We ignore for-effect, because byte-optimize.el will |
|
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
4226 ;; delete this call in its presence. |
|
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
4227 ;; |
|
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
4228 ;; This approach is byte-code compatible with 21.4 and with earlier 21.5 |
|
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
4229 ;; (except that earlier 21.5 with bignum support will confuse Bfixnump and |
|
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
4230 ;; Bintegerp; which it did in dealing with byte-compiled code from 21.4 |
|
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
4231 ;; anyway). |
|
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
4232 |
|
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
4233 (defun byte-compile-integerp (form) |
|
5366
f00192e1cd49
Examining the result of #'length: `eql', not `=', it's better style & cheaper
Aidan Kehoe <kehoea@parhasard.net>
parents:
5358
diff
changeset
|
4234 (if (not (eql (length form) 2)) |
|
4885
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
4235 (byte-compile-subr-wrong-args form 1) |
|
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
4236 (let ((donetag (byte-compile-make-tag)) |
|
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
4237 (wintag (byte-compile-make-tag)) |
|
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
4238 (failtag (byte-compile-make-tag))) |
|
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
4239 (byte-compile-constant 'integerp) |
|
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
4240 (byte-compile-form (second form)) |
|
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
4241 (byte-compile-out 'byte-dup 0) |
|
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
4242 (byte-compile-out 'byte-fixnump 0) |
|
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
4243 (byte-compile-goto 'byte-goto-if-not-nil wintag) |
|
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
4244 (byte-compile-out 'byte-dup 0) |
|
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
4245 (byte-compile-out 'byte-numberp 0) |
|
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
4246 (byte-compile-goto 'byte-goto-if-nil failtag) |
|
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
4247 (byte-compile-out 'byte-call 1) |
|
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
4248 ;; At this point, the only thing from this function remaining on the |
|
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
4249 ;; stack is the return value of the called #'integerp, which reflects |
|
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
4250 ;; exactly what we want. Go directly to donetag, do not discard |
|
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
4251 ;; anything. |
|
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
4252 (byte-compile-goto 'byte-goto donetag) |
|
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
4253 (byte-compile-out-tag failtag) |
|
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
4254 (byte-compile-discard) |
|
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
4255 (byte-compile-discard) |
|
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
4256 (byte-compile-constant nil) |
|
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
4257 (byte-compile-goto 'byte-goto donetag) |
|
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
4258 (byte-compile-out-tag wintag) |
|
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
4259 (byte-compile-discard) |
|
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
4260 (byte-compile-discard) |
|
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
4261 (byte-compile-constant t) |
|
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
4262 (byte-compile-out-tag donetag)))) |
| 428 | 4263 |
|
5301
ec05a30f7148
Fix a bytecomp.el bug compiling #'eql, which was masked by cl-macs.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5294
diff
changeset
|
4264 (defun byte-compile-eql (form) |
|
ec05a30f7148
Fix a bytecomp.el bug compiling #'eql, which was masked by cl-macs.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5294
diff
changeset
|
4265 (if (eql 3 (length form)) |
|
ec05a30f7148
Fix a bytecomp.el bug compiling #'eql, which was masked by cl-macs.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5294
diff
changeset
|
4266 (let ((donetag (byte-compile-make-tag)) |
|
ec05a30f7148
Fix a bytecomp.el bug compiling #'eql, which was masked by cl-macs.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5294
diff
changeset
|
4267 (eqtag (byte-compile-make-tag))) |
|
ec05a30f7148
Fix a bytecomp.el bug compiling #'eql, which was masked by cl-macs.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5294
diff
changeset
|
4268 (mapc 'byte-compile-form (cdr form)) |
|
ec05a30f7148
Fix a bytecomp.el bug compiling #'eql, which was masked by cl-macs.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5294
diff
changeset
|
4269 (byte-compile-out 'byte-dup 0) |
|
ec05a30f7148
Fix a bytecomp.el bug compiling #'eql, which was masked by cl-macs.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5294
diff
changeset
|
4270 (byte-compile-out 'byte-numberp 0) |
|
ec05a30f7148
Fix a bytecomp.el bug compiling #'eql, which was masked by cl-macs.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5294
diff
changeset
|
4271 (byte-compile-goto 'byte-goto-if-nil eqtag) |
|
ec05a30f7148
Fix a bytecomp.el bug compiling #'eql, which was masked by cl-macs.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5294
diff
changeset
|
4272 (byte-compile-out 'byte-dup 0) |
|
ec05a30f7148
Fix a bytecomp.el bug compiling #'eql, which was masked by cl-macs.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5294
diff
changeset
|
4273 (byte-compile-out 'byte-fixnump 0) |
|
ec05a30f7148
Fix a bytecomp.el bug compiling #'eql, which was masked by cl-macs.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5294
diff
changeset
|
4274 (byte-compile-goto 'byte-goto-if-not-nil eqtag) |
|
ec05a30f7148
Fix a bytecomp.el bug compiling #'eql, which was masked by cl-macs.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5294
diff
changeset
|
4275 (byte-compile-out 'byte-equal 0) |
|
ec05a30f7148
Fix a bytecomp.el bug compiling #'eql, which was masked by cl-macs.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5294
diff
changeset
|
4276 (byte-compile-goto 'byte-goto donetag) |
|
ec05a30f7148
Fix a bytecomp.el bug compiling #'eql, which was masked by cl-macs.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5294
diff
changeset
|
4277 (byte-compile-out-tag eqtag) |
|
ec05a30f7148
Fix a bytecomp.el bug compiling #'eql, which was masked by cl-macs.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5294
diff
changeset
|
4278 (byte-compile-out 'byte-eq 0) |
|
ec05a30f7148
Fix a bytecomp.el bug compiling #'eql, which was masked by cl-macs.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5294
diff
changeset
|
4279 (byte-compile-out-tag donetag)) |
|
ec05a30f7148
Fix a bytecomp.el bug compiling #'eql, which was masked by cl-macs.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5294
diff
changeset
|
4280 (byte-compile-subr-wrong-args form 2))) |
|
ec05a30f7148
Fix a bytecomp.el bug compiling #'eql, which was masked by cl-macs.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5294
diff
changeset
|
4281 |
| 428 | 4282 ;;(byte-defop-compiler-1 /= byte-compile-negated) |
| 4283 (byte-defop-compiler-1 atom byte-compile-negated) | |
| 4284 (byte-defop-compiler-1 nlistp byte-compile-negated) | |
| 4285 | |
| 4286 ;;(put '/= 'byte-compile-negated-op '=) | |
| 4287 (put 'atom 'byte-compile-negated-op 'consp) | |
| 4288 (put 'nlistp 'byte-compile-negated-op 'listp) | |
| 4289 | |
| 4290 (defun byte-compile-negated (form) | |
| 4291 (byte-compile-form-do-effect (byte-compile-negation-optimizer form))) | |
| 4292 | |
| 4293 ;; Even when optimization is off, atom is optimized to (not (consp ...)). | |
| 4294 (defun byte-compile-negation-optimizer (form) | |
| 4295 ;; an optimizer for forms where <form1> is less efficient than (not <form2>) | |
| 4296 (list 'not | |
| 4297 (cons (or (get (car form) 'byte-compile-negated-op) | |
| 4298 (error | |
| 4299 "Compiler error: `%s' has no `byte-compile-negated-op' property" | |
| 4300 (car form))) | |
| 4301 (cdr form)))) | |
| 4302 | |
|
4905
755ae5b97edb
Change "special form" to "special operator" in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4885
diff
changeset
|
4303 ;;; other tricky macro-like special-operators |
| 428 | 4304 |
| 4305 (byte-defop-compiler-1 catch) | |
| 4306 (byte-defop-compiler-1 unwind-protect) | |
| 4307 (byte-defop-compiler-1 condition-case) | |
| 4308 (byte-defop-compiler-1 save-excursion) | |
| 4309 (byte-defop-compiler-1 save-current-buffer) | |
| 4310 (byte-defop-compiler-1 save-restriction) | |
| 4311 (byte-defop-compiler-1 with-output-to-temp-buffer) | |
| 4312 ;; no track-mouse. | |
| 4313 | |
|
5356
5dd1ba5e0113
Be better about eliminating `block's that are not `return-from'd, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5353
diff
changeset
|
4314 (defvar byte-compile-active-blocks nil) |
|
5dd1ba5e0113
Be better about eliminating `block's that are not `return-from'd, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5353
diff
changeset
|
4315 |
| 428 | 4316 (defun byte-compile-catch (form) |
|
5356
5dd1ba5e0113
Be better about eliminating `block's that are not `return-from'd, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5353
diff
changeset
|
4317 "Byte-compile and return a `catch' from. |
|
5dd1ba5e0113
Be better about eliminating `block's that are not `return-from'd, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5353
diff
changeset
|
4318 |
|
5dd1ba5e0113
Be better about eliminating `block's that are not `return-from'd, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5353
diff
changeset
|
4319 If FORM is the result of macroexpanding a `block' form (the TAG argument is |
|
5376
4b529b940e2e
Eliminate unused blocks named nil, too, cl-macs.el, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5374
diff
changeset
|
4320 a quoted symbol with a `cl-block-name' property) and there is no |
|
5356
5dd1ba5e0113
Be better about eliminating `block's that are not `return-from'd, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5353
diff
changeset
|
4321 corresponding `return-from' within the block--or equivalently, it was |
|
5dd1ba5e0113
Be better about eliminating `block's that are not `return-from'd, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5353
diff
changeset
|
4322 optimized away--just byte compile and return the BODY." |
|
5dd1ba5e0113
Be better about eliminating `block's that are not `return-from'd, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5353
diff
changeset
|
4323 (let* ((symbol (car-safe (cdr-safe (nth 1 form)))) |
|
5376
4b529b940e2e
Eliminate unused blocks named nil, too, cl-macs.el, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5374
diff
changeset
|
4324 (not-present '#:not-present) |
|
4b529b940e2e
Eliminate unused blocks named nil, too, cl-macs.el, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5374
diff
changeset
|
4325 (block (and symbol (symbolp symbol) |
|
4b529b940e2e
Eliminate unused blocks named nil, too, cl-macs.el, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5374
diff
changeset
|
4326 (get symbol 'cl-block-name not-present))) |
|
4b529b940e2e
Eliminate unused blocks named nil, too, cl-macs.el, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5374
diff
changeset
|
4327 (elt (and (not (eq block not-present)) (list block))) |
|
5356
5dd1ba5e0113
Be better about eliminating `block's that are not `return-from'd, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5353
diff
changeset
|
4328 (byte-compile-active-blocks |
|
5376
4b529b940e2e
Eliminate unused blocks named nil, too, cl-macs.el, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5374
diff
changeset
|
4329 (if elt |
|
5356
5dd1ba5e0113
Be better about eliminating `block's that are not `return-from'd, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5353
diff
changeset
|
4330 (cons elt byte-compile-active-blocks) |
|
5dd1ba5e0113
Be better about eliminating `block's that are not `return-from'd, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5353
diff
changeset
|
4331 byte-compile-active-blocks)) |
|
5dd1ba5e0113
Be better about eliminating `block's that are not `return-from'd, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5353
diff
changeset
|
4332 (body |
|
5dd1ba5e0113
Be better about eliminating `block's that are not `return-from'd, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5353
diff
changeset
|
4333 (byte-compile-top-level (cons 'progn (cddr form)) |
|
5377
eac2e6bd5b2c
Correct some minor problems in my last change.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5376
diff
changeset
|
4334 (and (not elt) for-effect)))) |
|
5376
4b529b940e2e
Eliminate unused blocks named nil, too, cl-macs.el, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5374
diff
changeset
|
4335 (if (and elt (not (cdr elt))) |
|
5356
5dd1ba5e0113
Be better about eliminating `block's that are not `return-from'd, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5353
diff
changeset
|
4336 ;; A lexical block without any contained return-from clauses: |
|
5dd1ba5e0113
Be better about eliminating `block's that are not `return-from'd, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5353
diff
changeset
|
4337 (byte-compile-form body) |
|
5dd1ba5e0113
Be better about eliminating `block's that are not `return-from'd, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5353
diff
changeset
|
4338 ;; A normal catch call, or a lexical block with a contained |
|
5dd1ba5e0113
Be better about eliminating `block's that are not `return-from'd, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5353
diff
changeset
|
4339 ;; return-from clause. |
|
5dd1ba5e0113
Be better about eliminating `block's that are not `return-from'd, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5353
diff
changeset
|
4340 (byte-compile-form (car (cdr form))) |
|
5dd1ba5e0113
Be better about eliminating `block's that are not `return-from'd, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5353
diff
changeset
|
4341 (byte-compile-push-constant body) |
|
5dd1ba5e0113
Be better about eliminating `block's that are not `return-from'd, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5353
diff
changeset
|
4342 (byte-compile-out 'byte-catch 0)))) |
|
5353
38e24b8be4ea
Improve the lexical scoping in #'block, #'return-from.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5344
diff
changeset
|
4343 |
| 428 | 4344 (defun byte-compile-unwind-protect (form) |
| 4345 (byte-compile-push-constant | |
| 4346 (byte-compile-top-level-body (cdr (cdr form)) t)) | |
| 4347 (byte-compile-out 'byte-unwind-protect 0) | |
| 4348 (byte-compile-form-do-effect (car (cdr form))) | |
| 4349 (byte-compile-out 'byte-unbind 1)) | |
| 4350 | |
| 4351 ;;(defun byte-compile-track-mouse (form) | |
| 4352 ;; (byte-compile-form | |
| 4353 ;; (list | |
| 4354 ;; 'funcall | |
| 4355 ;; (list 'quote | |
| 4356 ;; (list 'lambda nil | |
| 4357 ;; (cons 'track-mouse | |
| 4358 ;; (byte-compile-top-level-body (cdr form)))))))) | |
| 4359 | |
| 4360 (defun byte-compile-condition-case (form) | |
| 4361 (let* ((var (nth 1 form)) | |
| 4362 (byte-compile-bound-variables | |
| 4363 (if var | |
| 4364 (cons (cons var 0) | |
| 4365 (cons 'new-scope byte-compile-bound-variables)) | |
| 4366 (cons 'new-scope byte-compile-bound-variables)))) | |
| 4367 (or (symbolp var) | |
| 4368 (byte-compile-warn | |
| 4369 "%s is not a variable-name or nil (in condition-case)" | |
| 4370 (prin1-to-string var))) | |
| 4371 (byte-compile-push-constant var) | |
| 4372 (byte-compile-push-constant (byte-compile-top-level | |
| 4373 (nth 2 form) for-effect)) | |
| 4374 (let ((clauses (cdr (cdr (cdr form)))) | |
| 4375 compiled-clauses) | |
| 4376 (while clauses | |
| 4377 (let* ((clause (car clauses)) | |
| 4378 (condition (car clause))) | |
| 4379 (cond ((not (or (symbolp condition) | |
| 4380 (and (listp condition) | |
| 4381 (let ((syms condition) (ok t)) | |
| 4382 (while syms | |
| 4383 (if (not (symbolp (car syms))) | |
| 4384 (setq ok nil)) | |
| 4385 (setq syms (cdr syms))) | |
| 4386 ok)))) | |
| 4387 (byte-compile-warn | |
| 4388 "%s is not a symbol naming a condition or a list of such (in condition-case)" | |
| 4389 (prin1-to-string condition))) | |
| 4390 ;; ((not (or (eq condition 't) | |
| 4391 ;; (and (stringp (get condition 'error-message)) | |
| 4392 ;; (consp (get condition 'error-conditions))))) | |
| 4393 ;; (byte-compile-warn | |
| 4394 ;; "%s is not a known condition name (in condition-case)" | |
| 4395 ;; condition)) | |
| 4396 ) | |
| 4397 (setq compiled-clauses | |
| 4398 (cons (cons condition | |
| 4399 (byte-compile-top-level-body | |
| 4400 (cdr clause) for-effect)) | |
| 4401 compiled-clauses))) | |
| 4402 (setq clauses (cdr clauses))) | |
| 4403 (byte-compile-push-constant (nreverse compiled-clauses))) | |
| 4404 (if (memq 'unused-vars byte-compile-warnings) | |
| 4405 ;; done compiling in this scope, warn now. | |
| 4406 (byte-compile-warn-about-unused-variables)) | |
| 4407 (byte-compile-out 'byte-condition-case 0))) | |
| 4408 | |
| 4409 | |
| 4410 (defun byte-compile-save-excursion (form) | |
| 4411 (byte-compile-out 'byte-save-excursion 0) | |
| 4412 (byte-compile-body-do-effect (cdr form)) | |
| 4413 (byte-compile-out 'byte-unbind 1)) | |
| 4414 | |
| 4415 (defun byte-compile-save-restriction (form) | |
| 4416 (byte-compile-out 'byte-save-restriction 0) | |
| 4417 (byte-compile-body-do-effect (cdr form)) | |
| 4418 (byte-compile-out 'byte-unbind 1)) | |
| 4419 | |
| 4420 (defun byte-compile-save-current-buffer (form) | |
|
5503
7b5946dbfb96
Drop support for generating code appropriate for Emacs 19, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5475
diff
changeset
|
4421 (byte-compile-out 'byte-save-current-buffer 0) |
|
7b5946dbfb96
Drop support for generating code appropriate for Emacs 19, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5475
diff
changeset
|
4422 (byte-compile-body-do-effect (cdr form)) |
|
7b5946dbfb96
Drop support for generating code appropriate for Emacs 19, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5475
diff
changeset
|
4423 (byte-compile-out 'byte-unbind 1)) |
| 428 | 4424 |
| 4425 (defun byte-compile-with-output-to-temp-buffer (form) | |
| 4426 (byte-compile-form (car (cdr form))) | |
| 4427 (byte-compile-out 'byte-temp-output-buffer-setup 0) | |
| 4428 (byte-compile-body (cdr (cdr form))) | |
| 4429 (byte-compile-out 'byte-temp-output-buffer-show 0)) | |
|
5391
f9dc75bdbdc4
Implement #'load-time-value less hackishly, by modifying the byte compiler.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5377
diff
changeset
|
4430 |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4431 (defun byte-compile-multiple-value-call (form) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4432 (if (< (length form) 2) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4433 (progn |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4434 (byte-compile-warn-wrong-args form 1) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4435 (byte-compile-normal-call |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4436 `(signal 'wrong-number-of-arguments '(,(car form) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4437 ,(length (cdr form)))))) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4438 (setq form (cdr form)) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4439 (byte-compile-form (car form)) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4440 (byte-compile-push-constant 0) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4441 (byte-compile-variable-ref 'byte-varref 'multiple-values-limit) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4442 ;; bind-multiple-value-limits leaves two existing values on the stack, |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4443 ;; and pushes a new value, the specpdl_depth() at the time it was |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4444 ;; called. |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4445 (byte-compile-out 'byte-bind-multiple-value-limits 0) |
|
4783
e29fcfd8df5f
Eliminate most core code byte-compile warnings.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4775
diff
changeset
|
4446 (mapc 'byte-compile-form (cdr form)) |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4447 ;; Most of the other code puts this sort of value in the program stream, |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4448 ;; not pushing it on the stack. |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4449 (byte-compile-push-constant (+ 3 (length form))) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4450 (byte-compile-out 'byte-multiple-value-call (+ 3 (length form))) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4451 (pushnew '(subrp (symbol-function 'multiple-value-call)) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4452 byte-compile-checks-on-load |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4453 :test #'equal))) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4454 |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4455 (defun byte-compile-multiple-value-list-internal (form) |
|
5366
f00192e1cd49
Examining the result of #'length: `eql', not `=', it's better style & cheaper
Aidan Kehoe <kehoea@parhasard.net>
parents:
5358
diff
changeset
|
4456 (if (not (eql 4 (length form))) |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4457 (progn |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4458 (byte-compile-warn-wrong-args form 3) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4459 (byte-compile-normal-call |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4460 `(signal 'wrong-number-of-arguments '(,(car form) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4461 ,(length (cdr form)))))) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4462 (byte-compile-form (nth 1 form)) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4463 (byte-compile-form (nth 2 form)) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4464 (byte-compile-out 'byte-bind-multiple-value-limits 0) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4465 (byte-compile-form (nth 3 form)) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4466 (byte-compile-out (get (car form) 'byte-opcode) 0) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4467 (pushnew '(subrp (symbol-function 'multiple-value-call)) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4468 byte-compile-checks-on-load |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4469 :test #'equal))) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4470 |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4471 (defun byte-compile-throw (form) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4472 ;; We can't use byte-compile-two-args for throw because in the event that |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4473 ;; the form does not have two args, it tries to #'funcall it expecting a |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4474 ;; runtime wrong-number-of-arguments error. Now that #'throw is a special |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4475 ;; form, it provokes an invalid-function error instead (or at least it |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4476 ;; should; there's a kludge around for the moment in eval.c that avoids |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4477 ;; that, but this file should not assume that that will always be there). |
|
5366
f00192e1cd49
Examining the result of #'length: `eql', not `=', it's better style & cheaper
Aidan Kehoe <kehoea@parhasard.net>
parents:
5358
diff
changeset
|
4478 (if (not (eql 2 (length (cdr form)))) |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4479 (progn |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4480 (byte-compile-warn-wrong-args form 2) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4481 (byte-compile-normal-call |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4482 `(signal 'wrong-number-of-arguments '(,(car form) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4483 ,(length (cdr form)))))) |
|
5356
5dd1ba5e0113
Be better about eliminating `block's that are not `return-from'd, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5353
diff
changeset
|
4484 ;; If this form was macroexpanded from `return-from', mark the |
|
5dd1ba5e0113
Be better about eliminating `block's that are not `return-from'd, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5353
diff
changeset
|
4485 ;; corresponding block as having been referenced. |
|
5dd1ba5e0113
Be better about eliminating `block's that are not `return-from'd, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5353
diff
changeset
|
4486 (let* ((symbol (car-safe (cdr-safe (nth 1 form)))) |
|
5376
4b529b940e2e
Eliminate unused blocks named nil, too, cl-macs.el, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5374
diff
changeset
|
4487 (not-present '#:not-present) |
|
5377
eac2e6bd5b2c
Correct some minor problems in my last change.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5376
diff
changeset
|
4488 (block (if (and symbol (symbolp symbol)) |
|
eac2e6bd5b2c
Correct some minor problems in my last change.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5376
diff
changeset
|
4489 (get symbol 'cl-block-name not-present) |
|
eac2e6bd5b2c
Correct some minor problems in my last change.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5376
diff
changeset
|
4490 not-present)) |
|
5376
4b529b940e2e
Eliminate unused blocks named nil, too, cl-macs.el, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5374
diff
changeset
|
4491 (assq (and (not (eq block not-present)) |
|
4b529b940e2e
Eliminate unused blocks named nil, too, cl-macs.el, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5374
diff
changeset
|
4492 (assq block byte-compile-active-blocks)))) |
|
5377
eac2e6bd5b2c
Correct some minor problems in my last change.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5376
diff
changeset
|
4493 (if assq |
|
eac2e6bd5b2c
Correct some minor problems in my last change.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5376
diff
changeset
|
4494 (setcdr assq t) |
|
eac2e6bd5b2c
Correct some minor problems in my last change.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5376
diff
changeset
|
4495 (if (not (eq block not-present)) |
|
eac2e6bd5b2c
Correct some minor problems in my last change.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5376
diff
changeset
|
4496 ;; No corresponding enclosing block. |
|
eac2e6bd5b2c
Correct some minor problems in my last change.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5376
diff
changeset
|
4497 (byte-compile-warn "return-from: no enclosing block named `%s'" |
|
eac2e6bd5b2c
Correct some minor problems in my last change.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5376
diff
changeset
|
4498 block)))) |
|
5376
4b529b940e2e
Eliminate unused blocks named nil, too, cl-macs.el, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5374
diff
changeset
|
4499 (mapc 'byte-compile-form (cdr form)) ;; Push the arguments |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4500 (byte-compile-out (get (car form) 'byte-opcode) 0) |
|
5376
4b529b940e2e
Eliminate unused blocks named nil, too, cl-macs.el, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5374
diff
changeset
|
4501 (pushnew '(null (function-max-args 'throw)) byte-compile-checks-on-load |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4502 :test #'equal))) |
| 428 | 4503 |
| 4504 ;;; top-level forms elsewhere | |
| 4505 | |
| 4506 (byte-defop-compiler-1 defun) | |
| 4507 (byte-defop-compiler-1 defmacro) | |
| 4508 (byte-defop-compiler-1 defvar) | |
| 442 | 4509 (byte-defop-compiler-1 defvar byte-compile-defvar-or-defconst) |
| 4510 (byte-defop-compiler-1 defconst byte-compile-defvar-or-defconst) | |
| 428 | 4511 (byte-defop-compiler-1 autoload) |
| 4512 ;; According to Mly this can go now that lambda is a macro | |
| 4513 ;(byte-defop-compiler-1 lambda byte-compile-lambda-form) | |
| 4514 (byte-defop-compiler-1 defalias) | |
| 4515 (byte-defop-compiler-1 define-function) | |
| 4516 | |
| 4517 (defun byte-compile-defun (form) | |
| 4518 ;; This is not used for file-level defuns with doc strings. | |
| 4519 (byte-compile-two-args ; Use this to avoid byte-compile-fset's warning. | |
| 4520 (list 'fset (list 'quote (nth 1 form)) | |
| 4521 (byte-compile-byte-code-maker | |
| 4522 (byte-compile-lambda (cons 'lambda (cdr (cdr form))))))) | |
| 4523 (byte-compile-discard) | |
| 4524 (byte-compile-constant (nth 1 form))) | |
| 4525 | |
| 4526 (defun byte-compile-defmacro (form) | |
| 4527 ;; This is not used for file-level defmacros with doc strings. | |
| 4528 (byte-compile-body-do-effect | |
| 4529 (list (list 'fset (list 'quote (nth 1 form)) | |
| 4530 (let ((code (byte-compile-byte-code-maker | |
| 4531 (byte-compile-lambda | |
| 4532 (cons 'lambda (cdr (cdr form))))))) | |
| 4533 (if (eq (car-safe code) 'make-byte-code) | |
| 4534 (list 'cons ''macro code) | |
| 4535 (list 'quote (cons 'macro (eval code)))))) | |
| 4536 (list 'quote (nth 1 form))))) | |
| 4537 | |
| 442 | 4538 (defun byte-compile-defvar-or-defconst (form) |
| 4539 ;; This is not used for file-level defvar/defconsts with doc strings: | |
| 4540 ;; byte-compile-file-form-defvar-or-defconst will be used in that case. | |
| 4541 ;; (defvar|defconst VAR [VALUE [DOCSTRING]]) | |
| 4542 (let ((fun (nth 0 form)) | |
| 4543 (var (nth 1 form)) | |
| 428 | 4544 (value (nth 2 form)) |
| 4545 (string (nth 3 form))) | |
| 442 | 4546 (when (> (length form) 4) |
| 4547 (byte-compile-warn | |
| 4548 "%s %s called with %d arguments, but accepts only %s" | |
| 4549 fun var (length (cdr form)) 3)) | |
| 4550 (when (memq 'free-vars byte-compile-warnings) | |
| 4551 (push (cons var byte-compile-global-bit) byte-compile-bound-variables)) | |
| 428 | 4552 (byte-compile-body-do-effect |
| 442 | 4553 (list |
| 4554 ;; Put the defined variable in this library's load-history entry | |
| 444 | 4555 ;; just as a real defvar would, but only in top-level forms with values. |
| 4556 (when (and (> (length form) 2) | |
| 4557 (null byte-compile-current-form)) | |
| 442 | 4558 `(push ',var current-load-list)) |
| 4559 (when (> (length form) 3) | |
| 4560 (when (and string (not (stringp string))) | |
| 4561 (byte-compile-warn "Third arg to %s %s is not a string: %s" | |
| 4562 fun var string)) | |
| 4563 `(put ',var 'variable-documentation ,string)) | |
| 4564 (if (cdr (cdr form)) ; `value' provided | |
| 4565 (if (eq fun 'defconst) | |
| 4566 ;; `defconst' sets `var' unconditionally. | |
| 4567 `(setq ,var ,value) | |
| 4568 ;; `defvar' sets `var' only when unbound. | |
| 1672 | 4569 `(if (not (default-boundp ',var)) (set-default ',var ,value)))) |
| 442 | 4570 `',var)))) |
| 428 | 4571 |
| 4572 (defun byte-compile-autoload (form) | |
| 4573 (and (byte-compile-constp (nth 1 form)) | |
| 4574 (byte-compile-constp (nth 5 form)) | |
| 4575 (memq (eval (nth 5 form)) '(t macro)) ; macro-p | |
| 4576 (not (fboundp (eval (nth 1 form)))) | |
| 4577 (byte-compile-warn | |
| 4578 "The compiler ignores `autoload' except at top level. You should | |
| 4579 probably put the autoload of the macro `%s' at top-level." | |
| 4580 (eval (nth 1 form)))) | |
| 4581 (byte-compile-normal-call form)) | |
| 4582 | |
| 4583 ;; Lambda's in valid places are handled as special cases by various code. | |
| 4584 ;; The ones that remain are errors. | |
| 4585 ;; According to Mly this can go now that lambda is a macro | |
| 4586 ;(defun byte-compile-lambda-form (form) | |
| 4587 ; (byte-compile-warn | |
| 4588 ; "`lambda' used in function position is invalid: probably you mean #'%s" | |
| 4589 ; (let ((print-escape-newlines t) | |
| 4590 ; (print-level 4) | |
| 4591 ; (print-length 4)) | |
| 4592 ; (prin1-to-string form))) | |
| 4593 ; (byte-compile-normal-call | |
| 4594 ; (list 'signal ''error | |
| 4595 ; (list 'quote (list "`lambda' used in function position" form))))) | |
| 4596 | |
| 4597 ;; Compile normally, but deal with warnings for the function being defined. | |
| 4598 (defun byte-compile-defalias (form) | |
| 4599 (if (and (consp (cdr form)) (consp (nth 1 form)) | |
| 4600 (eq (car (nth 1 form)) 'quote) | |
| 4601 (consp (cdr (nth 1 form))) | |
| 4602 (symbolp (nth 1 (nth 1 form))) | |
| 4603 (consp (nthcdr 2 form)) | |
| 4604 (consp (nth 2 form)) | |
| 4605 (eq (car (nth 2 form)) 'quote) | |
| 4606 (consp (cdr (nth 2 form))) | |
| 4607 (symbolp (nth 1 (nth 2 form)))) | |
| 4608 (progn | |
| 4609 (byte-compile-defalias-warn (nth 1 (nth 1 form)) | |
| 4610 (nth 1 (nth 2 form))) | |
| 4611 (setq byte-compile-function-environment | |
| 4612 (cons (cons (nth 1 (nth 1 form)) | |
| 4613 (nth 1 (nth 2 form))) | |
| 4614 byte-compile-function-environment)))) | |
| 4615 (byte-compile-normal-call form)) | |
| 4616 | |
| 4617 (defun byte-compile-define-function (form) | |
| 4618 (byte-compile-defalias form)) | |
| 4619 | |
| 4620 ;; Turn off warnings about prior calls to the function being defalias'd. | |
| 4621 ;; This could be smarter and compare those calls with | |
| 4622 ;; the function it is being aliased to. | |
| 4623 (defun byte-compile-defalias-warn (new alias) | |
| 4624 (let ((calls (assq new byte-compile-unresolved-functions))) | |
| 4625 (if calls | |
| 4626 (setq byte-compile-unresolved-functions | |
| 4627 (delq calls byte-compile-unresolved-functions))))) | |
| 4628 | |
| 4629 ;;; tags | |
| 4630 | |
| 4631 ;; Note: Most operations will strip off the 'TAG, but it speeds up | |
| 4632 ;; optimization to have the 'TAG as a part of the tag. | |
| 4633 ;; Tags will be (TAG . (tag-number . stack-depth)). | |
| 4634 (defun byte-compile-make-tag () | |
| 4635 (list 'TAG (setq byte-compile-tag-number (1+ byte-compile-tag-number)))) | |
| 4636 | |
| 4637 | |
| 4638 (defun byte-compile-out-tag (tag) | |
| 4639 (push tag byte-compile-output) | |
| 4640 (if (cdr (cdr tag)) | |
| 4641 (progn | |
| 4642 ;; ## remove this someday | |
| 4643 (and byte-compile-depth | |
| 4644 (not (= (cdr (cdr tag)) byte-compile-depth)) | |
| 4645 (error "Compiler bug: depth conflict at tag %d" (car (cdr tag)))) | |
| 4646 (setq byte-compile-depth (cdr (cdr tag)))) | |
| 4647 (setcdr (cdr tag) byte-compile-depth))) | |
| 4648 | |
| 4649 (defun byte-compile-goto (opcode tag) | |
| 4650 (push (cons opcode tag) byte-compile-output) | |
| 4651 (setcdr (cdr tag) (if (memq opcode byte-goto-always-pop-ops) | |
| 4652 (1- byte-compile-depth) | |
| 4653 byte-compile-depth)) | |
| 4654 (setq byte-compile-depth (and (not (eq opcode 'byte-goto)) | |
| 4655 (1- byte-compile-depth)))) | |
| 4656 | |
| 4657 (defun byte-compile-out (opcode offset) | |
| 4658 (push (cons opcode offset) byte-compile-output) | |
| 4659 (case opcode | |
| 4660 (byte-call | |
| 4661 (setq byte-compile-depth (- byte-compile-depth offset))) | |
| 4662 (byte-return | |
| 4663 ;; This is actually an unnecessary case, because there should be | |
| 4664 ;; no more opcodes behind byte-return. | |
| 4665 (setq byte-compile-depth nil)) | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4666 (byte-multiple-value-call |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4667 (setq byte-compile-depth (- byte-compile-depth offset))) |
| 428 | 4668 (t |
| 4669 (setq byte-compile-depth (+ byte-compile-depth | |
| 4670 (or (aref byte-stack+-info | |
| 4671 (symbol-value opcode)) | |
| 4672 (- (1- offset)))) | |
| 4673 byte-compile-maxdepth (max byte-compile-depth | |
| 4674 byte-compile-maxdepth)))) | |
| 4675 ;;(if (< byte-compile-depth 0) (error "Compiler error: stack underflow")) | |
| 4676 ) | |
| 4677 | |
| 4678 | |
| 4679 ;;; call tree stuff | |
| 4680 | |
| 4681 (defun byte-compile-annotate-call-tree (form) | |
| 4682 (let (entry) | |
| 4683 ;; annotate the current call | |
| 4684 (if (setq entry (assq (car form) byte-compile-call-tree)) | |
| 4685 (or (memq byte-compile-current-form (nth 1 entry)) ;callers | |
| 4686 (setcar (cdr entry) | |
| 4687 (cons byte-compile-current-form (nth 1 entry)))) | |
| 4688 (push (list (car form) (list byte-compile-current-form) nil) | |
| 4689 byte-compile-call-tree)) | |
| 4690 ;; annotate the current function | |
| 4691 (if (setq entry (assq byte-compile-current-form byte-compile-call-tree)) | |
| 4692 (or (memq (car form) (nth 2 entry)) ;called | |
| 4693 (setcar (cdr (cdr entry)) | |
| 4694 (cons (car form) (nth 2 entry)))) | |
| 4695 (push (list byte-compile-current-form nil (list (car form))) | |
| 4696 byte-compile-call-tree)))) | |
| 4697 | |
| 4698 ;; Renamed from byte-compile-report-call-tree | |
| 4699 ;; to avoid interfering with completion of byte-compile-file. | |
| 4700 ;;;###autoload | |
| 4701 (defun display-call-tree (&optional filename) | |
| 4702 "Display a call graph of a specified file. | |
| 4703 This lists which functions have been called, what functions called | |
| 4704 them, and what functions they call. The list includes all functions | |
| 4705 whose definitions have been compiled in this Emacs session, as well as | |
| 4706 all functions called by those functions. | |
| 4707 | |
| 4708 The call graph does not include macros, inline functions, or | |
| 4709 primitives that the byte-code interpreter knows about directly \(eq, | |
| 4710 cons, etc.\). | |
| 4711 | |
| 4712 The call tree also lists those functions which are not known to be called | |
| 4713 \(that is, to which no calls have been compiled\), and which cannot be | |
| 4714 invoked interactively." | |
| 4715 (interactive) | |
| 4716 (message "Generating call tree...") | |
| 4717 (with-output-to-temp-buffer "*Call-Tree*" | |
| 4718 (set-buffer "*Call-Tree*") | |
| 4719 (erase-buffer) | |
| 4720 (message "Generating call tree... (sorting on %s)" | |
| 4721 byte-compile-call-tree-sort) | |
| 4722 (insert "Call tree for " | |
| 4723 (cond ((null byte-compile-current-file) (or filename "???")) | |
| 4724 ((stringp byte-compile-current-file) | |
| 4725 byte-compile-current-file) | |
| 4726 (t (buffer-name byte-compile-current-file))) | |
| 4727 " sorted on " | |
| 4728 (prin1-to-string byte-compile-call-tree-sort) | |
| 4729 ":\n\n") | |
| 4730 (if byte-compile-call-tree-sort | |
| 4731 (setq byte-compile-call-tree | |
| 4732 (sort byte-compile-call-tree | |
| 4733 (cond | |
| 4734 ((eq byte-compile-call-tree-sort 'callers) | |
| 4735 #'(lambda (x y) (< (length (nth 1 x)) | |
| 4736 (length (nth 1 y))))) | |
| 4737 ((eq byte-compile-call-tree-sort 'calls) | |
| 4738 #'(lambda (x y) (< (length (nth 2 x)) | |
| 4739 (length (nth 2 y))))) | |
| 4740 ((eq byte-compile-call-tree-sort 'calls+callers) | |
| 4741 #'(lambda (x y) (< (+ (length (nth 1 x)) | |
| 4742 (length (nth 2 x))) | |
| 4743 (+ (length (nth 1 y)) | |
| 4744 (length (nth 2 y)))))) | |
| 4745 ((eq byte-compile-call-tree-sort 'name) | |
| 4746 #'(lambda (x y) (string< (car x) | |
| 4747 (car y)))) | |
| 4748 (t (error | |
| 4749 "`byte-compile-call-tree-sort': `%s' - unknown sort mode" | |
| 4750 byte-compile-call-tree-sort)))))) | |
| 4751 (message "Generating call tree...") | |
| 4752 (let ((rest byte-compile-call-tree) | |
| 4753 (b (current-buffer)) | |
| 4754 f p | |
| 4755 callers calls) | |
| 4756 (while rest | |
| 4757 (prin1 (car (car rest)) b) | |
| 4758 (setq callers (nth 1 (car rest)) | |
| 4759 calls (nth 2 (car rest))) | |
| 4760 (insert "\t" | |
| 4761 (cond ((not (fboundp (setq f (car (car rest))))) | |
| 4762 (if (null f) | |
| 4763 " <top level>";; shouldn't insert nil then, actually -sk | |
| 4764 " <not defined>")) | |
| 4765 ((subrp (setq f (symbol-function f))) | |
| 4766 " <subr>") | |
| 4767 ((symbolp f) | |
| 4768 (format " ==> %s" f)) | |
| 4769 ((compiled-function-p f) | |
| 4770 "<compiled function>") | |
| 4771 ((not (consp f)) | |
| 4772 "<malformed function>") | |
| 4773 ((eq 'macro (car f)) | |
| 4774 (if (or (compiled-function-p (cdr f)) | |
| 4775 (assq 'byte-code (cdr (cdr (cdr f))))) | |
| 4776 " <compiled macro>" | |
| 4777 " <macro>")) | |
| 4778 ((assq 'byte-code (cdr (cdr f))) | |
| 4779 "<compiled lambda>") | |
| 4780 ((eq 'lambda (car f)) | |
| 4781 "<function>") | |
| 4782 (t "???")) | |
| 4783 (format " (%d callers + %d calls = %d)" | |
| 4784 ;; Does the optimizer eliminate common subexpressions?-sk | |
| 4785 (length callers) | |
| 4786 (length calls) | |
| 4787 (+ (length callers) (length calls))) | |
| 4788 "\n") | |
| 4789 (if callers | |
| 4790 (progn | |
| 4791 (insert " called by:\n") | |
| 4792 (setq p (point)) | |
| 4793 (insert " " (if (car callers) | |
| 4794 (mapconcat 'symbol-name callers ", ") | |
| 4795 "<top level>")) | |
| 4796 (let ((fill-prefix " ")) | |
| 4797 (fill-region-as-paragraph p (point))))) | |
| 4798 (if calls | |
| 4799 (progn | |
| 4800 (insert " calls:\n") | |
| 4801 (setq p (point)) | |
| 4802 (insert " " (mapconcat 'symbol-name calls ", ")) | |
| 4803 (let ((fill-prefix " ")) | |
| 4804 (fill-region-as-paragraph p (point))))) | |
| 4805 (insert "\n") | |
| 4806 (setq rest (cdr rest))) | |
| 4807 | |
| 4808 (message "Generating call tree...(finding uncalled functions...)") | |
| 4809 (setq rest byte-compile-call-tree) | |
| 4810 (let ((uncalled nil)) | |
| 4811 (while rest | |
| 4812 (or (nth 1 (car rest)) | |
| 4813 (null (setq f (car (car rest)))) | |
| 4814 (byte-compile-fdefinition f t) | |
| 4815 (commandp (byte-compile-fdefinition f nil)) | |
| 4816 (setq uncalled (cons f uncalled))) | |
| 4817 (setq rest (cdr rest))) | |
| 4818 (if uncalled | |
| 4819 (let ((fill-prefix " ")) | |
| 4820 (insert "Noninteractive functions not known to be called:\n ") | |
| 4821 (setq p (point)) | |
| 4822 (insert (mapconcat 'symbol-name (nreverse uncalled) ", ")) | |
| 4823 (fill-region-as-paragraph p (point))))) | |
| 4824 ) | |
| 4825 (message "Generating call tree...done.") | |
| 4826 )) | |
| 4827 | |
| 4828 | |
| 4829 ;;; by crl@newton.purdue.edu | |
| 4830 ;;; Only works noninteractively. | |
| 4831 ;;;###autoload | |
| 4832 (defun batch-byte-compile () | |
| 4833 "Run `byte-compile-file' on the files remaining on the command line. | |
| 4834 Use this from the command line, with `-batch'; | |
| 4835 it won't work in an interactive Emacs. | |
| 4836 Each file is processed even if an error occurred previously. | |
| 444 | 4837 For example, invoke \"xemacs -batch -f batch-byte-compile $emacs/ ~/*.el\"." |
| 428 | 4838 ;; command-line-args-left is what is left of the command line (from |
| 4839 ;; startup.el) | |
| 4840 (defvar command-line-args-left) ;Avoid 'free variable' warning | |
| 4841 (if (not noninteractive) | |
| 4842 (error "`batch-byte-compile' is to be used only with -batch")) | |
| 4843 (let ((error nil)) | |
| 4844 (while command-line-args-left | |
| 442 | 4845 (if (null (batch-byte-compile-one-file)) |
| 4846 (setq error t))) | |
| 428 | 4847 (message "Done") |
| 4848 (kill-emacs (if error 1 0)))) | |
| 4849 | |
| 442 | 4850 ;;;###autoload |
| 4851 (defun batch-byte-compile-one-file () | |
| 4852 "Run `byte-compile-file' on a single file remaining on the command line. | |
| 4853 Use this from the command line, with `-batch'; | |
| 4854 it won't work in an interactive Emacs." | |
| 4855 ;; command-line-args-left is what is left of the command line (from | |
| 4856 ;; startup.el) | |
| 4857 (defvar command-line-args-left) ;Avoid 'free variable' warning | |
| 4858 (if (not noninteractive) | |
| 4859 (error "`batch-byte-compile-one-file' is to be used only with -batch")) | |
| 4860 (let (error | |
| 4861 (file-to-process (car command-line-args-left))) | |
| 4862 (setq command-line-args-left (cdr command-line-args-left)) | |
| 4863 (if (file-directory-p (expand-file-name file-to-process)) | |
| 4864 (let ((files (directory-files file-to-process)) | |
| 4865 source dest) | |
| 4866 (while files | |
| 4867 (if (and (string-match emacs-lisp-file-regexp (car files)) | |
| 4868 (not (auto-save-file-name-p (car files))) | |
| 4869 (setq source (expand-file-name | |
| 4870 (car files) | |
| 4871 file-to-process)) | |
| 4872 (setq dest (byte-compile-dest-file source)) | |
| 4873 (file-exists-p dest) | |
| 4874 (file-newer-than-file-p source dest)) | |
| 4875 (if (null (batch-byte-compile-1 source)) | |
| 4876 (setq error t))) | |
| 4877 (setq files (cdr files))) | |
| 4878 (null error)) | |
| 4879 (batch-byte-compile-1 file-to-process)))) | |
| 4880 | |
| 428 | 4881 (defun batch-byte-compile-1 (file) |
| 4882 (condition-case err | |
| 4883 (progn (byte-compile-file file) t) | |
| 4884 (error | |
| 4885 (princ ">>Error occurred processing ") | |
| 4886 (princ file) | |
| 4887 (princ ": ") | |
| 4888 (if (fboundp 'display-error) ; XEmacs 19.8+ | |
| 4889 (display-error err nil) | |
| 4890 (princ (or (get (car err) 'error-message) (car err))) | |
|
4783
e29fcfd8df5f
Eliminate most core code byte-compile warnings.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4775
diff
changeset
|
4891 (mapc #'(lambda (x) (princ " ") (prin1 x)) (cdr err))) |
| 428 | 4892 (princ "\n") |
| 4893 nil))) | |
| 4894 | |
| 4895 ;;;###autoload | |
| 4896 (defun batch-byte-recompile-directory-norecurse () | |
| 4897 "Same as `batch-byte-recompile-directory' but without recursion." | |
| 4898 (setq byte-recompile-directory-recursively nil) | |
| 4899 (batch-byte-recompile-directory)) | |
| 4900 | |
| 4901 ;;;###autoload | |
| 4902 (defun batch-byte-recompile-directory () | |
| 4903 "Runs `byte-recompile-directory' on the dirs remaining on the command line. | |
| 4904 Must be used only with `-batch', and kills Emacs on completion. | |
| 4905 For example, invoke `xemacs -batch -f batch-byte-recompile-directory .'." | |
| 4906 ;; command-line-args-left is what is left of the command line (startup.el) | |
| 4907 (defvar command-line-args-left) ;Avoid 'free variable' warning | |
| 4908 (if (not noninteractive) | |
| 4909 (error "batch-byte-recompile-directory is to be used only with -batch")) | |
| 4910 (or command-line-args-left | |
| 4911 (setq command-line-args-left '("."))) | |
| 4912 (let ((byte-recompile-directory-ignore-errors-p t)) | |
| 4913 (while command-line-args-left | |
| 4914 (byte-recompile-directory (car command-line-args-left)) | |
| 4915 (setq command-line-args-left (cdr command-line-args-left)))) | |
| 4916 (kill-emacs 0)) | |
| 4917 | |
| 4918 (make-obsolete 'elisp-compile-defun 'compile-defun) | |
| 4919 (make-obsolete 'byte-compile-report-call-tree 'display-call-tree) | |
| 4920 | |
| 4921 ;; other make-obsolete calls in obsolete.el. | |
| 4922 | |
| 4923 (provide 'byte-compile) | |
| 4924 (provide 'bytecomp) | |
| 4925 | |
| 4926 | |
| 4927 ;;; report metering (see the hacks in bytecode.c) | |
| 4928 | |
| 4929 (if (boundp 'byte-code-meter) | |
| 4930 (defun byte-compile-report-ops () | |
| 4931 (defvar byte-code-meter) | |
| 4932 (with-output-to-temp-buffer "*Meter*" | |
| 4933 (set-buffer "*Meter*") | |
| 4934 (let ((i 0) n op off) | |
| 4935 (while (< i 256) | |
| 4936 (setq n (aref (aref byte-code-meter 0) i) | |
| 4937 off nil) | |
| 4938 (if t ;(not (zerop n)) | |
| 4939 (progn | |
| 4940 (setq op i) | |
| 4941 (setq off nil) | |
| 4942 (cond ((< op byte-nth) | |
| 4943 (setq off (logand op 7)) | |
| 4944 (setq op (logand op 248))) | |
| 4945 ((>= op byte-constant) | |
| 4946 (setq off (- op byte-constant) | |
| 4947 op byte-constant))) | |
| 4948 (setq op (aref byte-code-vector op)) | |
| 4949 (insert (format "%-4d" i)) | |
| 4950 (insert (symbol-name op)) | |
| 4951 (if off (insert " [" (int-to-string off) "]")) | |
| 4952 (indent-to 40) | |
| 4953 (insert (int-to-string n) "\n"))) | |
| 4954 (setq i (1+ i))))))) | |
| 4955 | |
| 4956 | |
| 4957 ;; To avoid "lisp nesting exceeds max-lisp-eval-depth" when bytecomp compiles | |
| 4958 ;; itself, compile some of its most used recursive functions (at load time). | |
| 4959 ;; | |
| 4960 (eval-when-compile | |
| 4961 (or (compiled-function-p (symbol-function 'byte-compile-form)) | |
| 4962 (let ((byte-optimize nil) ; do it fast | |
| 4963 (byte-compile-warnings nil)) | |
|
5503
7b5946dbfb96
Drop support for generating code appropriate for Emacs 19, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5475
diff
changeset
|
4964 (map nil (if noninteractive |
|
7b5946dbfb96
Drop support for generating code appropriate for Emacs 19, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5475
diff
changeset
|
4965 #'byte-compile |
|
7b5946dbfb96
Drop support for generating code appropriate for Emacs 19, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5475
diff
changeset
|
4966 #'(lambda (x) |
|
7b5946dbfb96
Drop support for generating code appropriate for Emacs 19, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5475
diff
changeset
|
4967 (message "compiling %s..." x) |
|
7b5946dbfb96
Drop support for generating code appropriate for Emacs 19, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5475
diff
changeset
|
4968 (byte-compile x) |
|
7b5946dbfb96
Drop support for generating code appropriate for Emacs 19, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5475
diff
changeset
|
4969 (message "compiling %s...done" x))) |
|
7b5946dbfb96
Drop support for generating code appropriate for Emacs 19, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5475
diff
changeset
|
4970 '(byte-compile-normal-call |
|
7b5946dbfb96
Drop support for generating code appropriate for Emacs 19, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5475
diff
changeset
|
4971 byte-compile-form |
|
7b5946dbfb96
Drop support for generating code appropriate for Emacs 19, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5475
diff
changeset
|
4972 byte-compile-body |
|
7b5946dbfb96
Drop support for generating code appropriate for Emacs 19, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5475
diff
changeset
|
4973 ;; Inserted some more than necessary, to speed it up. |
|
7b5946dbfb96
Drop support for generating code appropriate for Emacs 19, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5475
diff
changeset
|
4974 byte-compile-top-level |
|
7b5946dbfb96
Drop support for generating code appropriate for Emacs 19, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5475
diff
changeset
|
4975 byte-compile-out-toplevel |
|
7b5946dbfb96
Drop support for generating code appropriate for Emacs 19, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5475
diff
changeset
|
4976 byte-compile-constant |
|
7b5946dbfb96
Drop support for generating code appropriate for Emacs 19, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5475
diff
changeset
|
4977 byte-compile-variable-ref))))) |
|
7b5946dbfb96
Drop support for generating code appropriate for Emacs 19, bytecomp.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5475
diff
changeset
|
4978 |
| 428 | 4979 |
|
4683
0cc9d22c3732
Be more reliable about loading cl-macs at byte-compile time, cl.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4677
diff
changeset
|
4980 (run-hooks 'bytecomp-load-hook) |
|
0cc9d22c3732
Be more reliable about loading cl-macs at byte-compile time, cl.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4677
diff
changeset
|
4981 |
| 428 | 4982 ;;; bytecomp.el ends here |