Mercurial > hg > xemacs-beta
annotate lisp/bytecomp.el @ 4885:6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
lisp/ChangeLog addition:
2010-01-24 Aidan Kehoe <kehoea@parhasard.net>
Correct the semantics of #'member*, #'eql, #'assoc* in the
presence of bignums; change the integerp byte code to fixnump
semantics.
* bytecomp.el (fixnump, integerp, byte-compile-integerp):
Change the integerp byte code to fixnump; add a byte-compile
method to integerp using fixnump and numberp and avoiding a
funcall most of the time, since in the non-core contexts where
integerp is used, it's mostly distinguishing between fixnums and
things that are not numbers at all.
* byte-optimize.el (side-effect-free-fns, byte-after-unbind-ops)
(byte-compile-side-effect-and-error-free-ops):
Replace the integerp bytecode with fixnump; add fixnump to the
side-effect-free-fns. Add the other extended number type
predicates to the list in passing.
* obsolete.el (floatp-safe): Mark this as obsolete.
* cl.el (eql): Go into more detail in the docstring here. Don't
bother checking whether both arguments are numbers; one is enough,
#'equal will fail correctly if they have distinct types.
(subst): Replace a call to #'integerp (deciding whether to use
#'memq or not) with one to #'fixnump.
Delete most-positive-fixnum, most-negative-fixnum from this file;
they're now always in C, so they can't be modified from Lisp.
* cl-seq.el (member*, assoc*, rassoc*):
Correct these functions in the presence of bignums.
* cl-macs.el (cl-make-type-test): The type test for a fixnum is
now fixnump. Ditch floatp-safe, use floatp instead.
(eql): Correct this compiler macro in the presence of bignums.
(assoc*): Correct this compiler macro in the presence of bignums.
* simple.el (undo):
Change #'integerp to #'fixnump here, since we use #'delq with the
same value as ELT a few lines down.
src/ChangeLog addition:
2010-01-24 Aidan Kehoe <kehoea@parhasard.net>
Fix problems with #'eql, extended number types, and the hash table
implementation; change the Bintegerp bytecode to fixnump semantics
even on bignum builds, since #'integerp can have a fast
implementation in terms of #'fixnump for most of its extant uses,
but not vice-versa.
* lisp.h: Always #include number.h; we want the macros provided in
it, even if the various number types are not available.
* number.h (NON_FIXNUM_NUMBER_P): New macro, giving 1 when its
argument is of non-immediate number type. Equivalent to FLOATP if
WITH_NUMBER_TYPES is not defined.
* elhash.c (lisp_object_eql_equal, lisp_object_eql_hash):
Use NON_FIXNUM_NUMBER_P in these functions, instead of FLOATP,
giving more correct behaviour in the presence of the extended
number types.
* bytecode.c (Bfixnump, execute_optimized_program):
Rename Bintegerp to Bfixnump; change its semantics to reflect the
new name on builds with bignum support.
* data.c (Ffixnump, Fintegerp, syms_of_data, vars_of_data):
Always make #'fixnump available, even on non-BIGNUM builds;
always implement #'integerp in this file, even on BIGNUM builds.
Move most-positive-fixnum, most-negative-fixnum here from
number.c, so they are Lisp constants even on builds without number
types, and attempts to change or bind them error.
Use the NUMBERP and INTEGERP macros even on builds without
extended number types.
* data.c (fixnum_char_or_marker_to_int):
Rename this function from integer_char_or_marker_to_int, to better
reflect the arguments it accepts.
* number.c (Fevenp, Foddp, syms_of_number):
Never provide #'integerp in this file. Remove #'oddp,
#'evenp; their implementations are overridden by those in cl.el.
* number.c (vars_of_number):
most-positive-fixnum, most-negative-fixnum are no longer here.
man/ChangeLog addition:
2010-01-23 Aidan Kehoe <kehoea@parhasard.net>
Generally: be careful to say fixnum, not integer, when talking
about fixed-precision integral types. I'm sure I've missed
instances, both here and in the docstrings, but this is a decent
start.
* lispref/text.texi (Columns):
Document where only fixnums, not integers generally, are accepted.
(Registers):
Remove some ancient char-int confoundance here.
* lispref/strings.texi (Creating Strings, Creating Strings):
Be more exact in describing where fixnums but not integers in
general are accepted.
(Creating Strings): Use a more contemporary example to illustrate
how concat deals with lists including integers about #xFF. Delete
some obsolete documentation on same.
(Char Table Types): Document that only fixnums are accepted as
values in syntax tables.
* lispref/searching.texi (String Search, Search and Replace):
Be exact in describing where fixnums but not integers in general
are accepted.
* lispref/range-tables.texi (Range Tables): Be exact in describing
them; only fixnums are accepted to describe ranges.
* lispref/os.texi (Killing XEmacs, User Identification)
(Time of Day, Time Conversion):
Be more exact about using fixnum where only fixed-precision
integers are accepted.
* lispref/objects.texi (Integer Type): Be more exact (and
up-to-date) about the possible values for
integers. Cross-reference to documentation of the bignum extension.
(Equality Predicates):
(Range Table Type):
(Array Type): Use fixnum, not integer, to describe a
fixed-precision integer.
(Syntax Table Type): Correct some English syntax here.
* lispref/numbers.texi (Numbers): Change the phrasing here to use
fixnum to mean the fixed-precision integers normal in emacs.
Document that our terminology deviates from that of Common Lisp,
and that we're working on it.
(Compatibility Issues): Reiterate the Common Lisp versus Emacs
Lisp compatibility issues.
(Comparison of Numbers, Arithmetic Operations):
* lispref/commands.texi (Command Loop Info, Working With Events):
* lispref/buffers.texi (Modification Time):
Be more exact in describing where fixnums but not integers in
general are accepted.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Sun, 24 Jan 2010 15:21:27 +0000 |
| parents | e29fcfd8df5f |
| children | 755ae5b97edb 8431b52e43b1 |
| 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 | |
| 17 ;; XEmacs is free software; you can redistribute it and/or modify it | |
| 18 ;; under the terms of the GNU General Public License as published by | |
| 19 ;; the Free Software Foundation; either version 2, or (at your option) | |
| 20 ;; any later version. | |
| 21 | |
| 22 ;; XEmacs is distributed in the hope that it will be useful, but | |
| 23 ;; WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 24 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 25 ;; General Public License for more details. | |
| 26 | |
| 27 ;; You should have received a copy of the GNU General Public License | |
| 28 ;; along with XEmacs; see the file COPYING. If not, write to the | |
| 29 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 30 ;; Boston, MA 02111-1307, USA. | |
| 31 | |
| 32 ;;; Synched up with: FSF 19.30. | |
| 33 | |
| 34 ;;; Commentary: | |
| 35 | |
| 36 ;; The Emacs Lisp byte compiler. This crunches lisp source into a | |
| 442 | 37 ;; sort of p-code (`bytecode') which takes up less space and can be |
| 38 ;; interpreted faster. First, the source code forms are converted to | |
| 39 ;; an intermediate form, `lapcode' [`LAP' == `Lisp Assembly Program'] | |
| 40 ;; which is much easier to manipulate than bytecode. Then the lapcode | |
| 41 ;; is converted to bytecode, which can be considered to be actual | |
| 42 ;; machine language. Optimizations can occur at either the source | |
| 43 ;; level or the lapcode level. | |
| 44 | |
| 45 ;; The user entry points are byte-compile-file, | |
| 428 | 46 ;; byte-recompile-directory and byte-compile-buffer. |
| 47 | |
| 48 ;;; Code: | |
| 49 | |
| 50 ;;; ======================================================================== | |
| 51 ;;; Entry points: | |
| 52 ;;; byte-recompile-directory, byte-compile-file, | |
| 53 ;;; batch-byte-compile, batch-byte-recompile-directory, | |
| 54 ;;; byte-compile, compile-defun, | |
| 55 ;;; display-call-tree | |
| 56 ;;; RMS says: | |
| 57 ;;; (byte-compile-buffer and byte-compile-and-load-file were turned off | |
| 58 ;;; because they are not terribly useful and get in the way of completion.) | |
| 59 ;;; But I'm leaving them. --ben | |
| 60 | |
| 61 ;;; This version of the byte compiler has the following improvements: | |
| 62 ;;; + optimization of compiled code: | |
| 63 ;;; - removal of unreachable code; | |
| 64 ;;; - removal of calls to side-effectless functions whose return-value | |
| 65 ;;; is unused; | |
| 66 ;;; - compile-time evaluation of safe constant forms, such as (consp nil) | |
| 67 ;;; and (ash 1 6); | |
| 68 ;;; - open-coding of literal lambdas; | |
| 69 ;;; - peephole optimization of emitted code; | |
| 70 ;;; - trivial functions are left uncompiled for speed. | |
| 71 ;;; + support for inline functions; | |
| 72 ;;; + compile-time evaluation of arbitrary expressions; | |
| 73 ;;; + compile-time warning messages for: | |
| 74 ;;; - functions being redefined with incompatible arglists; | |
| 75 ;;; - functions being redefined as macros, or vice-versa; | |
| 76 ;;; - functions or macros defined multiple times in the same file; | |
| 77 ;;; - functions being called with the incorrect number of arguments; | |
| 78 ;;; - functions being called which are not defined globally, in the | |
| 79 ;;; file, or as autoloads; | |
| 80 ;;; - assignment and reference of undeclared free variables; | |
| 81 ;;; - various syntax errors; | |
| 82 ;;; + correct compilation of nested defuns, defmacros, defvars and defsubsts; | |
| 83 ;;; + correct compilation of top-level uses of macros; | |
| 84 ;;; + the ability to generate a histogram of functions called. | |
| 85 | |
| 86 ;;; User customization variables: | |
| 87 ;;; | |
| 88 ;;; byte-compile-verbose Whether to report the function currently being | |
| 89 ;;; compiled in the minibuffer; | |
| 90 ;;; byte-optimize Whether to do optimizations; this may be | |
| 91 ;;; t, nil, 'source, or 'byte; | |
| 92 ;;; byte-optimize-log Whether to report (in excruciating detail) | |
| 93 ;;; exactly which optimizations have been made. | |
| 94 ;;; This may be t, nil, 'source, or 'byte; | |
| 95 ;;; byte-compile-error-on-warn Whether to stop compilation when a warning is | |
| 96 ;;; produced; | |
| 97 ;;; byte-compile-delete-errors Whether the optimizer may delete calls or | |
| 98 ;;; variable references that are side-effect-free | |
| 99 ;;; except that they may return an error. | |
| 100 ;;; byte-compile-generate-call-tree Whether to generate a histogram of | |
| 101 ;;; function calls. This can be useful for | |
| 102 ;;; finding unused functions, as well as simple | |
| 103 ;;; performance metering. | |
| 104 ;;; byte-compile-warnings List of warnings to issue, or t. May contain | |
| 105 ;;; 'free-vars (references to variables not in the | |
| 106 ;;; current lexical scope) | |
| 107 ;;; 'unused-vars (non-global variables bound but | |
| 108 ;;; not referenced) | |
| 109 ;;; 'unresolved (calls to unknown functions) | |
| 110 ;;; 'callargs (lambda calls with args that don't | |
| 111 ;;; match the lambda's definition) | |
| 112 ;;; 'subr-callargs (calls to subrs with args that | |
| 113 ;;; don't match the subr's definition) | |
| 114 ;;; 'redefine (function cell redefined from | |
| 115 ;;; a macro to a lambda or vice versa, | |
| 116 ;;; or redefined to take other args) | |
| 117 ;;; 'obsolete (obsolete variables and functions) | |
| 118 ;;; 'pedantic (references to Emacs-compatible | |
| 119 ;;; 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
|
120 ;;; '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
|
121 ;;; 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
|
122 ;;; '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
|
123 ;;; 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
|
124 ;;; 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
|
125 ;;; context ) |
| 428 | 126 ;;; byte-compile-emacs19-compatibility Whether the compiler should |
| 127 ;;; generate .elc files which can be loaded into | |
| 128 ;;; generic emacs 19. | |
| 129 ;;; emacs-lisp-file-regexp Regexp for the extension of source-files; | |
| 444 | 130 ;;; see also the function `byte-compile-dest-file'. |
| 428 | 131 ;;; byte-compile-overwrite-file If nil, delete old .elc files before saving. |
| 132 ;;; | |
| 133 ;;; Most of the above parameters can also be set on a file-by-file basis; see | |
| 134 ;;; the documentation of the `byte-compiler-options' macro. | |
| 135 | |
| 136 ;;; New Features: | |
| 137 ;;; | |
| 138 ;;; o The form `defsubst' is just like `defun', except that the function | |
| 139 ;;; generated will be open-coded in compiled code which uses it. This | |
| 140 ;;; means that no function call will be generated, it will simply be | |
| 141 ;;; spliced in. Lisp functions calls are very slow, so this can be a | |
| 142 ;;; big win. | |
| 143 ;;; | |
| 144 ;;; You can generally accomplish the same thing with `defmacro', but in | |
| 145 ;;; that case, the defined procedure can't be used as an argument to | |
| 146 ;;; mapcar, etc. | |
| 147 ;;; | |
| 148 ;;; o You can make a given function be inline even if it has already been | |
| 149 ;;; defined with `defun' by using the `proclaim-inline' form like so: | |
| 150 ;;; (proclaim-inline my-function) | |
| 151 ;;; This is, in fact, exactly what `defsubst' does. To make a function no | |
| 152 ;;; longer be inline, you must use `proclaim-notinline'. Beware that if | |
| 153 ;;; you define a function with `defsubst' and later redefine it with | |
| 444 | 154 ;;; `defun', it will still be open-coded until you use `proclaim-notinline'. |
| 428 | 155 ;;; |
| 156 ;;; o You can also open-code one particular call to a function without | |
| 157 ;;; open-coding all calls. Use the 'inline' form to do this, like so: | |
| 158 ;;; | |
| 159 ;;; (inline (foo 1 2 3)) ;; `foo' will be open-coded | |
| 160 ;;; or... | |
| 161 ;;; (inline ;; `foo' and `baz' will be | |
| 162 ;;; (foo 1 2 3 (bar 5)) ;; open-coded, but `bar' will not. | |
| 163 ;;; (baz 0)) | |
| 164 ;;; | |
| 165 ;;; o It is possible to open-code a function in the same file it is defined | |
| 166 ;;; in without having to load that file before compiling it. the | |
| 167 ;;; byte-compiler has been modified to remember function definitions in | |
| 168 ;;; the compilation environment in the same way that it remembers macro | |
| 169 ;;; definitions. | |
| 170 ;;; | |
| 171 ;;; o Forms like ((lambda ...) ...) are open-coded. | |
| 172 ;;; | |
| 444 | 173 ;;; o The form `eval-when-compile' is like `progn', except that the body |
| 428 | 174 ;;; is evaluated at compile-time. When it appears at top-level, this |
| 175 ;;; is analogous to the Common Lisp idiom (eval-when (compile) ...). | |
| 176 ;;; When it does not appear at top-level, it is similar to the | |
| 177 ;;; Common Lisp #. reader macro (but not in interpreted code). | |
| 178 ;;; | |
| 444 | 179 ;;; o The form `eval-and-compile' is similar to `eval-when-compile', |
| 180 ;;; but the whole form is evalled both at compile-time and at run-time. | |
| 428 | 181 ;;; |
| 182 ;;; o The command M-x byte-compile-and-load-file does what you'd think. | |
| 183 ;;; | |
| 444 | 184 ;;; o The command `compile-defun' is analogous to `eval-defun'. |
| 428 | 185 ;;; |
| 444 | 186 ;;; o If you run `byte-compile-file' on a filename which is visited in a |
| 428 | 187 ;;; buffer, and that buffer is modified, you are asked whether you want |
| 188 ;;; to save the buffer before compiling. | |
| 189 ;;; | |
| 190 ;;; o You can add this to /etc/magic to make file(1) recognize the files | |
| 191 ;;; generated by this compiler: | |
| 192 ;;; | |
| 613 | 193 ;;; 0 string ;ELC XEmacs Lisp compiled file, |
| 428 | 194 ;;; >4 byte x version %d |
| 195 ;;; | |
| 196 ;;; TO DO: | |
| 197 ;;; | |
| 198 ;;; o Should implement declarations and proclamations, notably special, | |
| 199 ;;; unspecial, and ignore. Do this in such a way as to not break cl.el. | |
| 200 ;;; o The bound-but-not-used warnings are not issued for variables whose | |
| 201 ;;; bindings were established in the arglist, due to the lack of an | |
| 202 ;;; ignore declaration. Once ignore exists, this should be turned on. | |
| 203 ;;; o Warn about functions and variables defined but not used? | |
| 204 ;;; Maybe add some kind of `export' declaration for this? | |
| 205 ;;; (With interactive functions being automatically exported?) | |
| 206 ;;; o Any reference to a variable, even one which is a no-op, will cause | |
| 207 ;;; the warning not to be given. Possibly we could use the for-effect | |
| 208 ;;; flag to determine when this reference is useless; possibly more | |
| 209 ;;; complex flow analysis would be necessary. | |
| 210 ;;; o If the optimizer deletes a variable reference, we might be left with | |
| 211 ;;; a bound-but-not-referenced warning. Generally this is ok, but not if | |
| 212 ;;; it's a synergistic result of macroexpansion. Need some way to note | |
| 213 ;;; that a varref is being optimized away? Of course it would be nice to | |
| 214 ;;; optimize away the binding too, someday, but it's unsafe today. | |
| 215 ;;; o (See byte-optimize.el for the optimization TODO list.) | |
| 216 | |
| 217 (require 'backquote) | |
| 218 | |
| 219 (or (fboundp 'defsubst) | |
| 220 ;; This really ought to be loaded already! | |
| 221 (load-library "bytecomp-runtime")) | |
| 222 | |
| 223 (eval-when-compile | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
224 (defvar byte-compile-single-version t |
| 428 | 225 "If this is true, the choice of emacs version (v19 or v20) byte-codes will |
| 226 be hard-coded into bytecomp when it compiles itself. If the compiler itself | |
| 227 is compiled with optimization, this causes a speedup.") | |
| 228 | |
| 229 (cond | |
| 230 (byte-compile-single-version | |
| 231 (defmacro byte-compile-single-version () t) | |
| 232 (defmacro byte-compile-version-cond (cond) (list 'quote (eval cond)))) | |
| 233 (t | |
| 234 (defmacro byte-compile-single-version () nil) | |
| 235 (defmacro byte-compile-version-cond (cond) cond))) | |
| 236 ) | |
| 237 | |
| 444 | 238 (defvar emacs-lisp-file-regexp "\\.el$" |
| 428 | 239 "*Regexp which matches Emacs Lisp source files. |
| 240 You may want to redefine `byte-compile-dest-file' if you change this.") | |
| 241 | |
| 242 ;; This enables file name handlers such as jka-compr | |
| 243 ;; to remove parts of the file name that should not be copied | |
| 244 ;; through to the output file name. | |
| 245 (defun byte-compiler-base-file-name (filename) | |
| 246 (let ((handler (find-file-name-handler filename | |
| 247 'byte-compiler-base-file-name))) | |
| 248 (if handler | |
| 249 (funcall handler 'byte-compiler-base-file-name filename) | |
| 250 filename))) | |
| 251 | |
| 252 (unless (fboundp 'byte-compile-dest-file) | |
| 253 ;; The user may want to redefine this along with emacs-lisp-file-regexp, | |
| 254 ;; so only define it if it is undefined. | |
| 255 (defun byte-compile-dest-file (filename) | |
| 256 "Convert an Emacs Lisp source file name to a compiled file name." | |
| 257 (setq filename (byte-compiler-base-file-name filename)) | |
| 258 (setq filename (file-name-sans-versions filename)) | |
| 259 (if (string-match emacs-lisp-file-regexp filename) | |
| 260 (concat (substring filename 0 (match-beginning 0)) ".elc") | |
| 261 (concat filename ".elc")))) | |
| 262 | |
| 263 ;; This can be the 'byte-compile property of any symbol. | |
| 264 (autoload 'byte-compile-inline-expand "byte-optimize") | |
| 265 | |
| 266 ;; This is the entrypoint to the lapcode optimizer pass1. | |
| 267 (autoload 'byte-optimize-form "byte-optimize") | |
| 268 ;; This is the entrypoint to the lapcode optimizer pass2. | |
| 269 (autoload 'byte-optimize-lapcode "byte-optimize") | |
| 270 (autoload 'byte-compile-unfold-lambda "byte-optimize") | |
| 271 | |
| 272 ;; This is the entry point to the decompiler, which is used by the | |
| 273 ;; disassembler. The disassembler just requires 'byte-compile, but | |
| 274 ;; that doesn't define this function, so this seems to be a reasonable | |
| 275 ;; thing to do. | |
| 276 (autoload 'byte-decompile-bytecode "byte-optimize") | |
| 277 | |
| 278 (defvar byte-compile-verbose | |
| 279 (and (not noninteractive) (> (device-baud-rate) search-slow-speed)) | |
| 280 "*Non-nil means print messages describing progress of byte-compiler.") | |
| 281 | |
| 282 (defvar byte-compile-emacs19-compatibility | |
| 283 (not (emacs-version>= 20)) | |
| 284 "*Non-nil means generate output that can run in Emacs 19.") | |
| 285 | |
| 286 (defvar byte-compile-print-gensym t | |
| 287 "*Non-nil means generate code that creates unique symbols at run-time. | |
| 288 This is achieved by printing uninterned symbols using the `#:SYMBOL' | |
| 289 notation, so that they will be read uninterned when run. | |
| 290 | |
| 291 With this feature, code that uses uninterned symbols in macros will | |
| 292 not be runnable under pre-21.0 XEmacsen. | |
| 293 | |
| 294 When `byte-compile-emacs19-compatibility' is non-nil, this variable is | |
| 295 ignored and considered to be nil.") | |
| 296 | |
| 297 (defvar byte-optimize t | |
| 298 "*Enables optimization in the byte compiler. | |
| 299 nil means don't do any optimization. | |
| 300 t means do all optimizations. | |
| 301 `source' means do source-level optimizations only. | |
| 302 `byte' means do code-level optimizations only.") | |
| 303 | |
| 304 (defvar byte-compile-delete-errors t | |
| 305 "*If non-nil, the optimizer may delete forms that may signal an error. | |
| 306 This includes variable references and calls to functions such as `car'.") | |
| 307 | |
| 308 ;; XEmacs addition | |
| 309 (defvar byte-compile-new-bytecodes nil | |
| 310 "This is completely ignored. It is only around for backwards | |
| 311 compatibility.") | |
| 312 | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
313 (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
|
314 "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
|
315 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
|
316 reverse order.") |
| 428 | 317 |
| 318 ;; FSF enables byte-compile-dynamic-docstrings but not byte-compile-dynamic | |
| 319 ;; by default. This would be a reasonable conservative approach except | |
| 320 ;; for the fact that if you enable either of these, you get incompatible | |
| 321 ;; byte code that can't be read by XEmacs 19.13 or before or FSF 19.28 or | |
| 322 ;; before. | |
| 323 ;; | |
| 324 ;; Therefore, neither is enabled for 19.14. Both are enabled for 20.0 | |
| 325 ;; because we have no reason to be conservative about changing the | |
| 326 ;; way things work. (Ben) | |
| 327 | |
| 328 ;; However, I don't think that defaulting byte-compile-dynamic to nil | |
| 329 ;; is a compatibility issue - rather it is a performance issue. | |
| 330 ;; Therefore I am setting byte-compile-dynamic back to nil. (mrb) | |
| 331 | |
| 332 (defvar byte-compile-dynamic nil | |
| 333 "*If non-nil, compile function bodies so they load lazily. | |
| 334 They are hidden comments in the compiled file, and brought into core when the | |
| 335 function is called. | |
| 336 | |
| 337 To enable this option, make it a file-local variable | |
| 338 in the source file you want it to apply to. | |
| 339 For example, add -*-byte-compile-dynamic: t;-*- on the first line. | |
| 340 | |
| 341 When this option is true, if you load the compiled file and then move it, | |
| 342 the functions you loaded will not be able to run.") | |
| 343 | |
| 344 (defvar byte-compile-dynamic-docstrings (emacs-version>= 20) | |
| 345 "*If non-nil, compile doc strings for lazy access. | |
| 346 We bury the doc strings of functions and variables | |
| 347 inside comments in the file, and bring them into core only when they | |
| 348 are actually needed. | |
| 349 | |
| 350 When this option is true, if you load the compiled file and then move it, | |
| 351 you won't be able to find the documentation of anything in that file. | |
| 352 | |
| 353 To disable this option for a certain file, make it a file-local variable | |
| 354 in the source file. For example, add this to the first line: | |
| 355 -*-byte-compile-dynamic-docstrings:nil;-*- | |
| 356 You can also set the variable globally. | |
| 357 | |
| 358 This option is enabled by default because it reduces Emacs memory usage.") | |
| 359 | |
| 360 (defvar byte-optimize-log nil | |
| 361 "*If true, the byte-compiler will log its optimizations into *Compile-Log*. | |
| 362 If this is 'source, then only source-level optimizations will be logged. | |
| 363 If it is 'byte, then only byte-level optimizations will be logged.") | |
| 364 | |
| 365 (defvar byte-compile-error-on-warn nil | |
| 366 "*If true, the byte-compiler reports warnings with `error'.") | |
| 367 | |
| 368 ;; byte-compile-warning-types in FSF. | |
| 369 (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
|
370 '(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
|
371 discarded-consing quoted-lambda) |
| 428 | 372 "*The warnings used when byte-compile-warnings is t.") |
| 373 | |
| 374 (defvar byte-compile-warnings t | |
| 375 "*List of warnings that the compiler should issue (t for the default set). | |
| 376 Elements of the list may be: | |
| 377 | |
| 378 free-vars references to variables not in the current lexical scope. | |
| 379 unused-vars references to non-global variables bound but not referenced. | |
| 380 unresolved calls to unknown functions. | |
| 381 callargs lambda calls with args that don't match the definition. | |
| 382 subr-callargs calls to subrs with args that don't match the definition. | |
| 383 redefine function cell redefined from a macro to a lambda or vice | |
| 384 versa, or redefined to take a different number of arguments. | |
| 385 obsolete use of an obsolete function or variable. | |
| 386 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
|
387 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
|
388 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
|
389 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
|
390 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
|
391 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
|
392 function argument |
| 428 | 393 |
| 394 The default set is specified by `byte-compile-default-warnings' and | |
| 395 normally encompasses all possible warnings. | |
| 396 | |
| 397 See also the macro `byte-compiler-options'.") | |
| 398 | |
| 399 (defvar byte-compile-generate-call-tree nil | |
| 400 "*Non-nil means collect call-graph information when compiling. | |
| 401 This records functions that were called and from where. | |
| 402 If the value is t, compilation displays the call graph when it finishes. | |
| 403 If the value is neither t nor nil, compilation asks you whether to display | |
| 404 the graph. | |
| 405 | |
| 406 The call tree only lists functions called, not macros used. Those functions | |
| 407 which the byte-code interpreter knows about directly (eq, cons, etc.) are | |
| 408 not reported. | |
| 409 | |
| 410 The call tree also lists those functions which are not known to be called | |
| 411 \(that is, to which no calls have been compiled). Functions which can be | |
| 412 invoked interactively are excluded from this list.") | |
| 413 | |
| 414 (defconst byte-compile-call-tree nil "Alist of functions and their call tree. | |
| 415 Each element looks like | |
| 416 | |
| 417 \(FUNCTION CALLERS CALLS\) | |
| 418 | |
| 419 where CALLERS is a list of functions that call FUNCTION, and CALLS | |
| 420 is a list of functions for which calls were generated while compiling | |
| 421 FUNCTION.") | |
| 422 | |
| 423 (defvar byte-compile-call-tree-sort 'name | |
| 424 "*If non-nil, sort the call tree. | |
| 425 The values `name', `callers', `calls', `calls+callers' | |
| 426 specify different fields to sort on.") | |
| 427 | |
| 428 (defvar byte-compile-overwrite-file t | |
| 429 "If nil, old .elc files are deleted before the new is saved, and .elc | |
| 430 files will have the same modes as the corresponding .el file. Otherwise, | |
| 431 existing .elc files will simply be overwritten, and the existing modes | |
| 432 will not be changed. If this variable is nil, then an .elc file which | |
| 433 is a symbolic link will be turned into a normal file, instead of the file | |
| 434 which the link points to being overwritten.") | |
| 435 | |
| 436 (defvar byte-recompile-directory-ignore-errors-p nil | |
| 437 "If true, then `byte-recompile-directory' will continue compiling even | |
| 438 when an error occurs in a file. This is bound to t by | |
| 439 `batch-byte-recompile-directory'.") | |
| 440 | |
| 502 | 441 (defvar byte-recompile-ignore-uncompilable-mule-files t |
| 442 "If non-nil, `byte-recompile-*' ignores non-ASCII .el files in a non-Mule | |
| 443 XEmacs. This assumes that such files have a -*- coding: ??? -*- magic | |
| 444 cookie in their first line or a ;;;###coding system: magic cookie | |
| 445 early in the file.") | |
| 446 | |
| 428 | 447 (defvar byte-recompile-directory-recursively t |
| 448 "*If true, then `byte-recompile-directory' will recurse on subdirectories.") | |
| 449 | |
| 450 (defvar byte-compile-constants nil | |
| 451 "list of all constants encountered during compilation of this form") | |
| 452 (defvar byte-compile-variables nil | |
| 453 "list of all variables encountered during compilation of this form") | |
| 454 (defvar byte-compile-bound-variables nil | |
| 455 "Alist of variables bound in the context of the current form, | |
| 456 that is, the current lexical environment. This list lives partly | |
| 457 on the specbind stack. The cdr of each cell is an integer bitmask.") | |
| 458 | |
|
4623
a9f83990e6bf
Fix a byte compiler bug with characters above ?\xFF.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4539
diff
changeset
|
459 (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
|
460 "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
|
461 |
|
a9f83990e6bf
Fix a byte compiler bug with characters above ?\xFF.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4539
diff
changeset
|
462 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
|
463 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
|
464 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
|
465 |
| 428 | 466 (defconst byte-compile-referenced-bit 1) |
| 467 (defconst byte-compile-assigned-bit 2) | |
| 468 (defconst byte-compile-arglist-bit 4) | |
| 469 (defconst byte-compile-global-bit 8) | |
| 470 | |
| 471 (defvar byte-compile-free-references) | |
| 472 (defvar byte-compile-free-assignments) | |
| 473 | |
| 474 (defvar byte-compiler-error-flag) | |
| 475 | |
| 446 | 476 ;;; A form of eval that includes the currently defined macro definitions. |
| 477 ;;; This helps implement the promise made in the Lispref: | |
| 478 ;;; | |
| 479 ;;; "If a file being compiled contains a `defmacro' form, the macro is | |
| 480 ;;; defined temporarily for the rest of the compilation of that file." | |
| 481 (defun byte-compile-eval (form) | |
| 482 (let ((save-macro-environment nil)) | |
| 483 (unwind-protect | |
| 484 (loop for (sym . def) in byte-compile-macro-environment do | |
| 485 (push | |
| 486 (if (fboundp sym) (cons sym (symbol-function sym)) sym) | |
| 487 save-macro-environment) | |
| 488 (fset sym (cons 'macro def)) | |
| 489 finally return (eval form)) | |
| 490 (dolist (elt save-macro-environment) | |
| 491 (if (symbolp elt) | |
| 492 (fmakunbound elt) | |
| 493 (fset (car elt) (cdr elt))))))) | |
| 494 | |
| 428 | 495 (defconst byte-compile-initial-macro-environment |
| 444 | 496 '((byte-compiler-options . (lambda (&rest forms) |
| 497 (apply 'byte-compiler-options-handler forms))) | |
| 498 (eval-when-compile . (lambda (&rest body) | |
| 446 | 499 (list 'quote (byte-compile-eval (cons 'progn body))))) |
| 444 | 500 (eval-and-compile . (lambda (&rest body) |
| 446 | 501 (byte-compile-eval (cons 'progn body)) |
| 444 | 502 (cons 'progn body)))) |
| 428 | 503 "The default macro-environment passed to macroexpand by the compiler. |
| 504 Placing a macro here will cause a macro to have different semantics when | |
| 505 expanded by the compiler as when expanded by the interpreter.") | |
| 506 | |
| 507 (defvar byte-compile-macro-environment byte-compile-initial-macro-environment | |
| 508 "Alist of macros defined in the file being compiled. | |
| 509 Each element looks like (MACRONAME . DEFINITION). It is | |
| 510 \(MACRONAME . nil) when a macro is redefined as a function.") | |
| 511 | |
| 512 (defvar byte-compile-function-environment nil | |
| 513 "Alist of functions defined in the file being compiled. | |
| 514 This is so we can inline them when necessary. | |
| 515 Each element looks like (FUNCTIONNAME . DEFINITION). It is | |
| 516 \(FUNCTIONNAME . nil) when a function is redefined as a macro.") | |
| 517 | |
| 518 (defvar byte-compile-autoload-environment nil | |
| 519 "Alist of functions and macros defined by autoload in the file being compiled. | |
| 520 This is so we can suppress warnings about calls to these functions, even though | |
| 521 they do not have `real' definitions. | |
| 522 Each element looks like (FUNCTIONNAME . CALL-TO-AUTOLOAD).") | |
| 523 | |
| 524 (defvar byte-compile-unresolved-functions nil | |
| 525 "Alist of undefined functions to which calls have been compiled (used for | |
| 526 warnings when the function is later defined with incorrect args).") | |
| 527 | |
| 528 (defvar byte-compile-file-domain) ; domain of file being compiled | |
| 529 | |
| 530 (defvar byte-compile-tag-number 0) | |
| 531 (defvar byte-compile-output nil | |
| 532 "Alist describing contents to put in byte code string. | |
| 533 Each element is (INDEX . VALUE)") | |
| 534 (defvar byte-compile-depth 0 "Current depth of execution stack.") | |
| 535 (defvar byte-compile-maxdepth 0 "Maximum depth of execution stack.") | |
| 536 | |
| 537 | |
| 538 ;;; The byte codes; this information is duplicated in bytecode.c | |
| 539 | |
| 540 (defconst byte-code-vector nil | |
| 541 "An array containing byte-code names indexed by byte-code values.") | |
| 542 | |
| 543 (defconst byte-stack+-info nil | |
| 544 "An array with the stack adjustment for each byte-code.") | |
| 545 | |
| 546 (defmacro byte-defop (opcode stack-adjust opname &optional docstring) | |
| 547 ;; This is a speed-hack for building the byte-code-vector at compile-time. | |
| 548 ;; We fill in the vector at macroexpand-time, and then after the last call | |
| 549 ;; to byte-defop, we write the vector out as a constant instead of writing | |
| 550 ;; out a bunch of calls to aset. | |
| 551 ;; Actually, we don't fill in the vector itself, because that could make | |
| 552 ;; it problematic to compile big changes to this compiler; we store the | |
| 553 ;; values on its plist, and remove them later in -extrude. | |
| 554 (let ((v1 (or (get 'byte-code-vector 'tmp-compile-time-value) | |
| 555 (put 'byte-code-vector 'tmp-compile-time-value | |
| 556 (make-vector 256 nil)))) | |
| 557 (v2 (or (get 'byte-stack+-info 'tmp-compile-time-value) | |
| 558 (put 'byte-stack+-info 'tmp-compile-time-value | |
| 559 (make-vector 256 nil))))) | |
| 560 (aset v1 opcode opname) | |
| 561 (aset v2 opcode stack-adjust)) | |
| 562 (if docstring | |
| 563 (list 'defconst opname opcode (concat "Byte code opcode " docstring ".")) | |
| 564 (list 'defconst opname opcode))) | |
| 565 | |
| 566 (defmacro byte-extrude-byte-code-vectors () | |
| 567 (prog1 (list 'setq 'byte-code-vector | |
| 568 (get 'byte-code-vector 'tmp-compile-time-value) | |
| 569 'byte-stack+-info | |
| 570 (get 'byte-stack+-info 'tmp-compile-time-value)) | |
| 571 (remprop 'byte-code-vector 'tmp-compile-time-value) | |
| 572 (remprop 'byte-stack+-info 'tmp-compile-time-value))) | |
| 573 | |
| 574 | |
| 575 ;; unused: 0-7 | |
| 576 | |
| 577 ;; These opcodes are special in that they pack their argument into the | |
| 578 ;; opcode word. | |
| 579 ;; | |
| 580 (byte-defop 8 1 byte-varref "for variable reference") | |
| 581 (byte-defop 16 -1 byte-varset "for setting a variable") | |
| 582 (byte-defop 24 -1 byte-varbind "for binding a variable") | |
| 583 (byte-defop 32 0 byte-call "for calling a function") | |
| 584 (byte-defop 40 0 byte-unbind "for unbinding special bindings") | |
| 585 ;; codes 8-47 are consumed by the preceding opcodes | |
| 586 | |
| 587 ;; unused: 48-55 | |
| 588 | |
| 589 (byte-defop 56 -1 byte-nth) | |
| 590 (byte-defop 57 0 byte-symbolp) | |
| 591 (byte-defop 58 0 byte-consp) | |
| 592 (byte-defop 59 0 byte-stringp) | |
| 593 (byte-defop 60 0 byte-listp) | |
| 594 (byte-defop 61 -1 byte-old-eq) | |
| 595 (byte-defop 62 -1 byte-old-memq) | |
| 596 (byte-defop 63 0 byte-not) | |
| 597 (byte-defop 64 0 byte-car) | |
| 598 (byte-defop 65 0 byte-cdr) | |
| 599 (byte-defop 66 -1 byte-cons) | |
| 600 (byte-defop 67 0 byte-list1) | |
| 601 (byte-defop 68 -1 byte-list2) | |
| 602 (byte-defop 69 -2 byte-list3) | |
| 603 (byte-defop 70 -3 byte-list4) | |
| 604 (byte-defop 71 0 byte-length) | |
| 605 (byte-defop 72 -1 byte-aref) | |
| 606 (byte-defop 73 -2 byte-aset) | |
| 607 (byte-defop 74 0 byte-symbol-value) | |
| 608 (byte-defop 75 0 byte-symbol-function) ; this was commented out | |
| 609 (byte-defop 76 -1 byte-set) | |
| 610 (byte-defop 77 -1 byte-fset) ; this was commented out | |
| 611 (byte-defop 78 -1 byte-get) | |
| 612 (byte-defop 79 -2 byte-substring) | |
| 613 (byte-defop 80 -1 byte-concat2) | |
| 614 (byte-defop 81 -2 byte-concat3) | |
| 615 (byte-defop 82 -3 byte-concat4) | |
| 616 (byte-defop 83 0 byte-sub1) | |
| 617 (byte-defop 84 0 byte-add1) | |
| 618 (byte-defop 85 -1 byte-eqlsign) | |
| 619 (byte-defop 86 -1 byte-gtr) | |
| 620 (byte-defop 87 -1 byte-lss) | |
| 621 (byte-defop 88 -1 byte-leq) | |
| 622 (byte-defop 89 -1 byte-geq) | |
| 623 (byte-defop 90 -1 byte-diff) | |
| 624 (byte-defop 91 0 byte-negate) | |
| 625 (byte-defop 92 -1 byte-plus) | |
| 626 (byte-defop 93 -1 byte-max) | |
| 627 (byte-defop 94 -1 byte-min) | |
| 628 (byte-defop 95 -1 byte-mult) | |
| 629 (byte-defop 96 1 byte-point) | |
| 630 (byte-defop 97 -1 byte-eq) ; new as of v20 | |
| 631 (byte-defop 98 0 byte-goto-char) | |
| 632 (byte-defop 99 0 byte-insert) | |
| 633 (byte-defop 100 1 byte-point-max) | |
| 634 (byte-defop 101 1 byte-point-min) | |
| 635 (byte-defop 102 0 byte-char-after) | |
| 636 (byte-defop 103 1 byte-following-char) | |
| 637 (byte-defop 104 1 byte-preceding-char) | |
| 638 (byte-defop 105 1 byte-current-column) | |
| 639 (byte-defop 106 0 byte-indent-to) | |
| 640 (byte-defop 107 -1 byte-equal) ; new as of v20 | |
| 641 (byte-defop 108 1 byte-eolp) | |
| 642 (byte-defop 109 1 byte-eobp) | |
| 643 (byte-defop 110 1 byte-bolp) | |
| 644 (byte-defop 111 1 byte-bobp) | |
| 645 (byte-defop 112 1 byte-current-buffer) | |
| 646 (byte-defop 113 0 byte-set-buffer) | |
| 647 (byte-defop 114 0 byte-save-current-buffer | |
| 648 "To make a binding to record the current buffer.") | |
| 649 ;;(byte-defop 114 1 byte-read-char-OBSOLETE) ;obsolete as of v19 | |
| 650 (byte-defop 115 -1 byte-memq) ; new as of v20 | |
| 651 (byte-defop 116 1 byte-interactive-p) | |
| 652 | |
| 653 (byte-defop 117 0 byte-forward-char) | |
| 654 (byte-defop 118 0 byte-forward-word) | |
| 655 (byte-defop 119 -1 byte-skip-chars-forward) | |
| 656 (byte-defop 120 -1 byte-skip-chars-backward) | |
| 657 (byte-defop 121 0 byte-forward-line) | |
| 658 (byte-defop 122 0 byte-char-syntax) | |
| 659 (byte-defop 123 -1 byte-buffer-substring) | |
| 660 (byte-defop 124 -1 byte-delete-region) | |
| 661 (byte-defop 125 -1 byte-narrow-to-region) | |
| 662 (byte-defop 126 1 byte-widen) | |
| 663 (byte-defop 127 0 byte-end-of-line) | |
| 664 | |
| 665 ;; unused: 128 | |
| 666 | |
| 667 ;; These store their argument in the next two bytes | |
| 668 (byte-defop 129 1 byte-constant2 | |
| 669 "for reference to a constant with vector index >= byte-constant-limit") | |
| 670 (byte-defop 130 0 byte-goto "for unconditional jump") | |
| 671 (byte-defop 131 -1 byte-goto-if-nil "to pop value and jump if it's nil") | |
| 672 (byte-defop 132 -1 byte-goto-if-not-nil | |
| 673 "to pop value and jump if it's not nil") | |
| 674 (byte-defop 133 -1 byte-goto-if-nil-else-pop | |
| 675 "to examine top-of-stack, jump and don't pop it if it's nil, | |
| 676 otherwise pop it") | |
| 677 (byte-defop 134 -1 byte-goto-if-not-nil-else-pop | |
| 678 "to examine top-of-stack, jump and don't pop it if it's non-nil, | |
| 679 otherwise pop it") | |
| 680 | |
| 681 (byte-defop 135 -1 byte-return "to pop a value and return it from `byte-code'") | |
| 682 (byte-defop 136 -1 byte-discard "to discard one value from stack") | |
| 683 (byte-defop 137 1 byte-dup "to duplicate the top of the stack") | |
| 684 | |
| 685 (byte-defop 138 0 byte-save-excursion | |
| 686 "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
|
687 (byte-defop 139 0 byte-save-window-excursion ; almost obsolete |
| 428 | 688 "to make a binding to record entire window configuration") |
| 689 (byte-defop 140 0 byte-save-restriction | |
| 690 "to make a binding to record the current buffer clipping restrictions") | |
| 691 (byte-defop 141 -1 byte-catch | |
| 692 "for catch. Takes, on stack, the tag and an expression for the body") | |
| 693 (byte-defop 142 -1 byte-unwind-protect | |
| 694 "for unwind-protect. Takes, on stack, an expression for the unwind-action") | |
| 695 | |
| 696 ;; For condition-case. Takes, on stack, the variable to bind, | |
| 697 ;; an expression for the body, and a list of clauses. | |
| 698 (byte-defop 143 -2 byte-condition-case) | |
| 699 | |
| 700 ;; For entry to with-output-to-temp-buffer. | |
| 701 ;; Takes, on stack, the buffer name. | |
| 702 ;; Binds standard-output and does some other things. | |
| 703 ;; Returns with temp buffer on the stack in place of buffer name. | |
| 704 (byte-defop 144 0 byte-temp-output-buffer-setup) | |
| 705 | |
| 706 ;; For exit from with-output-to-temp-buffer. | |
| 707 ;; Expects the temp buffer on the stack underneath value to return. | |
| 708 ;; Pops them both, then pushes the value back on. | |
| 709 ;; Unbinds standard-output and makes the temp buffer visible. | |
| 710 (byte-defop 145 -1 byte-temp-output-buffer-show) | |
| 711 | |
| 712 ;; To unbind back to the beginning of this frame. | |
| 713 ;; Not used yet, but will be needed for tail-recursion elimination. | |
| 714 (byte-defop 146 0 byte-unbind-all) | |
| 715 | |
| 716 (byte-defop 147 -2 byte-set-marker) | |
| 717 (byte-defop 148 0 byte-match-beginning) | |
| 718 (byte-defop 149 0 byte-match-end) | |
| 719 (byte-defop 150 0 byte-upcase) | |
| 720 (byte-defop 151 0 byte-downcase) | |
| 721 (byte-defop 152 -1 byte-string=) | |
| 722 (byte-defop 153 -1 byte-string<) | |
| 723 (byte-defop 154 -1 byte-old-equal) | |
| 724 (byte-defop 155 -1 byte-nthcdr) | |
| 725 (byte-defop 156 -1 byte-elt) | |
| 726 (byte-defop 157 -1 byte-old-member) | |
| 727 (byte-defop 158 -1 byte-old-assq) | |
| 728 (byte-defop 159 0 byte-nreverse) | |
| 729 (byte-defop 160 -1 byte-setcar) | |
| 730 (byte-defop 161 -1 byte-setcdr) | |
| 731 (byte-defop 162 0 byte-car-safe) | |
| 732 (byte-defop 163 0 byte-cdr-safe) | |
| 733 (byte-defop 164 -1 byte-nconc) | |
| 734 (byte-defop 165 -1 byte-quo) | |
| 735 (byte-defop 166 -1 byte-rem) | |
| 736 (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
|
737 (byte-defop 168 0 byte-fixnump) |
| 428 | 738 |
| 739 ;; unused: 169 | |
| 740 | |
| 741 ;; These are not present in FSF. | |
| 742 ;; | |
| 743 (byte-defop 170 0 byte-rel-goto) | |
| 744 (byte-defop 171 -1 byte-rel-goto-if-nil) | |
| 745 (byte-defop 172 -1 byte-rel-goto-if-not-nil) | |
| 746 (byte-defop 173 -1 byte-rel-goto-if-nil-else-pop) | |
| 747 (byte-defop 174 -1 byte-rel-goto-if-not-nil-else-pop) | |
| 748 | |
| 749 (byte-defop 175 nil byte-listN) | |
| 750 (byte-defop 176 nil byte-concatN) | |
| 751 (byte-defop 177 nil byte-insertN) | |
| 752 | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
753 (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
|
754 (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
|
755 (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
|
756 (byte-defop 181 -1 byte-throw) |
| 428 | 757 |
| 758 ;; these ops are new to v20 | |
| 759 (byte-defop 182 -1 byte-member) | |
| 760 (byte-defop 183 -1 byte-assq) | |
| 761 | |
| 762 ;; unused: 184-191 | |
| 763 | |
| 764 (byte-defop 192 1 byte-constant "for reference to a constant") | |
| 765 ;; codes 193-255 are consumed by byte-constant. | |
| 766 (defconst byte-constant-limit 64 | |
| 767 "Exclusive maximum index usable in the `byte-constant' opcode.") | |
| 768 | |
| 444 | 769 (defconst byte-goto-ops |
| 770 '(byte-goto byte-goto-if-nil byte-goto-if-not-nil | |
| 771 byte-goto-if-nil-else-pop | |
| 772 byte-goto-if-not-nil-else-pop) | |
| 428 | 773 "List of byte-codes whose offset is a pc.") |
| 774 | |
| 775 (defconst byte-goto-always-pop-ops | |
| 444 | 776 '(byte-goto-if-nil byte-goto-if-not-nil)) |
| 428 | 777 |
| 778 (defconst byte-rel-goto-ops | |
| 444 | 779 '(byte-rel-goto byte-rel-goto-if-nil byte-rel-goto-if-not-nil |
| 780 byte-rel-goto-if-nil-else-pop byte-rel-goto-if-not-nil-else-pop) | |
| 428 | 781 "byte-codes for relative jumps.") |
| 782 | |
| 783 (byte-extrude-byte-code-vectors) | |
| 784 | |
| 785 ;;; lapcode generator | |
| 786 ;;; | |
| 787 ;;; the byte-compiler now does source -> lapcode -> bytecode instead of | |
| 788 ;;; source -> bytecode, because it's a lot easier to make optimizations | |
| 789 ;;; on lapcode than on bytecode. | |
| 790 ;;; | |
| 791 ;;; Elements of the lapcode list are of the form (<instruction> . <parameter>) | |
| 792 ;;; where instruction is a symbol naming a byte-code instruction, | |
| 793 ;;; and parameter is an argument to that instruction, if any. | |
| 794 ;;; | |
| 795 ;;; The instruction can be the pseudo-op TAG, which means that this position | |
| 796 ;;; in the instruction stream is a target of a goto. (car PARAMETER) will be | |
| 797 ;;; the PC for this location, and the whole instruction "(TAG pc)" will be the | |
| 798 ;;; parameter for some goto op. | |
| 799 ;;; | |
| 800 ;;; If the operation is varbind, varref, varset or push-constant, then the | |
| 801 ;;; parameter is (variable/constant . index_in_constant_vector). | |
| 802 ;;; | |
| 803 ;;; First, the source code is macroexpanded and optimized in various ways. | |
| 804 ;;; Then the resultant code is compiled into lapcode. Another set of | |
| 805 ;;; optimizations are then run over the lapcode. Then the variables and | |
| 806 ;;; constants referenced by the lapcode are collected and placed in the | |
| 807 ;;; constants-vector. (This happens now so that variables referenced by dead | |
| 808 ;;; code don't consume space.) And finally, the lapcode is transformed into | |
| 809 ;;; compacted byte-code. | |
| 810 ;;; | |
| 811 ;;; A distinction is made between variables and constants because the variable- | |
| 812 ;;; referencing instructions are more sensitive to the variables being near the | |
| 813 ;;; front of the constants-vector than the constant-referencing instructions. | |
| 814 ;;; Also, this lets us notice references to free variables. | |
| 815 | |
| 816 (defun byte-compile-lapcode (lap) | |
| 817 "Turns lapcode into bytecode. The lapcode is destroyed." | |
| 818 ;; Lapcode modifications: changes the ID of a tag to be the tag's PC. | |
| 819 (let ((pc 0) ; Program counter | |
| 820 op off ; Operation & offset | |
| 821 (bytes '()) ; Put the output bytes here | |
| 822 (patchlist nil) ; List of tags and goto's to patch | |
| 823 rest rel tmp) | |
| 824 (while lap | |
| 825 (setq op (car (car lap)) | |
| 826 off (cdr (car lap))) | |
| 827 (cond ((not (symbolp op)) | |
| 828 (error "Non-symbolic opcode `%s'" op)) | |
| 829 ((eq op 'TAG) | |
| 830 (setcar off pc) | |
| 831 (push off patchlist)) | |
| 832 ((memq op byte-goto-ops) | |
| 833 (setq pc (+ pc 3)) | |
| 834 (setq bytes (cons (cons pc (cdr off)) | |
| 835 (cons nil | |
| 836 (cons (symbol-value op) bytes)))) | |
| 837 (push bytes patchlist)) | |
| 838 (t | |
| 839 (setq bytes | |
| 840 (cond ((cond ((consp off) | |
| 841 ;; Variable or constant reference | |
| 842 (setq off (cdr off)) | |
| 843 (eq op 'byte-constant))) | |
| 844 (cond ((< off byte-constant-limit) | |
| 845 (setq pc (1+ pc)) | |
| 846 (cons (+ byte-constant off) bytes)) | |
| 847 (t | |
| 848 (setq pc (+ 3 pc)) | |
| 849 (cons (lsh off -8) | |
| 850 (cons (logand off 255) | |
| 851 (cons byte-constant2 bytes)))))) | |
| 852 ((and (<= byte-listN (symbol-value op)) | |
| 853 (<= (symbol-value op) byte-insertN)) | |
| 854 (setq pc (+ 2 pc)) | |
| 855 (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
|
856 ((= 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
|
857 (setq pc (1+ pc)) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
858 ;; Ignore off. |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
859 (cons (symbol-value op) bytes)) |
| 428 | 860 ((< off 6) |
| 861 (setq pc (1+ pc)) | |
| 862 (cons (+ (symbol-value op) off) bytes)) | |
| 863 ((< off 256) | |
| 864 (setq pc (+ 2 pc)) | |
| 865 (cons off (cons (+ (symbol-value op) 6) bytes))) | |
| 866 (t | |
| 867 (setq pc (+ 3 pc)) | |
| 868 (cons (lsh off -8) | |
| 869 (cons (logand off 255) | |
| 870 (cons (+ (symbol-value op) 7) | |
| 871 bytes)))))))) | |
| 872 (setq lap (cdr lap))) | |
| 873 ;;(if (not (= pc (length bytes))) | |
| 874 ;; (error "Compiler error: pc mismatch - %s %s" pc (length bytes))) | |
| 875 (cond (t ;; starting with Emacs 19. | |
| 876 ;; Make relative jumps | |
| 877 (setq patchlist (nreverse patchlist)) | |
| 878 (while (progn | |
| 879 (setq off 0) ; PC change because of deleted bytes | |
| 880 (setq rest patchlist) | |
| 881 (while rest | |
| 882 (setq tmp (car rest)) | |
| 883 (and (consp (car tmp)) ; Jump | |
| 884 (prog1 (null (nth 1 tmp)) ; Absolute jump | |
| 885 (setq tmp (car tmp))) | |
| 886 (progn | |
| 887 (setq rel (- (car (cdr tmp)) (car tmp))) | |
| 888 (and (<= -129 rel) (< rel 128))) | |
| 889 (progn | |
| 890 ;; Convert to relative jump. | |
| 891 (setcdr (car rest) (cdr (cdr (car rest)))) | |
| 892 (setcar (cdr (car rest)) | |
| 893 (+ (car (cdr (car rest))) | |
| 894 (- byte-rel-goto byte-goto))) | |
| 895 (setq off (1- off)))) | |
| 896 (setcar tmp (+ (car tmp) off)) ; Adjust PC | |
| 897 (setq rest (cdr rest))) | |
| 898 ;; If optimizing, repeat until no change. | |
| 899 (and byte-optimize | |
| 900 (not (zerop off))))))) | |
| 901 ;; Patch PC into jumps | |
| 902 (let (bytes) | |
| 903 (while patchlist | |
| 904 (setq bytes (car patchlist)) | |
| 905 (cond ((atom (car bytes))) ; Tag | |
| 906 ((nth 1 bytes) ; Relative jump | |
| 907 (setcar bytes (+ (- (car (cdr (car bytes))) (car (car bytes))) | |
| 908 128))) | |
| 909 (t ; Absolute jump | |
| 910 (setq pc (car (cdr (car bytes)))) ; Pick PC from tag | |
| 911 (setcar (cdr bytes) (logand pc 255)) | |
| 912 (setcar bytes (lsh pc -8)))) | |
| 913 (setq patchlist (cdr patchlist)))) | |
| 914 (concat (nreverse bytes)))) | |
| 915 | |
| 916 | |
| 917 ;;; byte compiler messages | |
| 918 | |
| 919 (defvar byte-compile-current-form nil) | |
| 920 (defvar byte-compile-current-file nil) | |
| 921 (defvar byte-compile-dest-file nil) | |
| 922 | |
| 923 (defmacro byte-compile-log (format-string &rest args) | |
| 924 `(when (and byte-optimize (memq byte-optimize-log '(t source))) | |
| 925 (let ((print-escape-newlines t) | |
| 926 (print-level 4) | |
| 927 (print-length 4)) | |
| 928 (byte-compile-log-1 (format ,format-string ,@args))))) | |
| 929 | |
| 930 (defconst byte-compile-last-warned-form 'nothing) | |
| 931 | |
| 932 ;; Log a message STRING in *Compile-Log*. | |
| 933 ;; Also log the current function and file if not already done. | |
| 934 (defun byte-compile-log-1 (string &optional fill) | |
| 935 (let* ((this-form (or byte-compile-current-form "toplevel forms")) | |
| 936 (while-compiling-msg | |
| 937 (when (or byte-compile-current-file | |
| 938 (not (eq this-form byte-compile-last-warned-form))) | |
| 939 (format | |
| 940 "While compiling %s%s:" | |
| 941 this-form | |
| 942 (cond | |
| 943 ((stringp byte-compile-current-file) | |
| 944 (concat " in file " byte-compile-current-file)) | |
| 945 ((bufferp byte-compile-current-file) | |
| 946 (concat " in buffer " | |
| 947 (buffer-name byte-compile-current-file))) | |
| 948 ("")))))) | |
| 949 (if noninteractive | |
| 950 (progn | |
| 951 (when while-compiling-msg (message "%s" while-compiling-msg)) | |
| 952 (message " %s" string)) | |
| 953 (with-current-buffer (get-buffer-create "*Compile-Log*") | |
| 954 (goto-char (point-max)) | |
| 955 (when byte-compile-current-file | |
| 956 (when (> (point-max) (point-min)) | |
| 957 (insert "\n\^L\n")) | |
| 958 (insert (current-time-string) "\n")) | |
| 959 (when while-compiling-msg (insert while-compiling-msg "\n")) | |
| 960 (insert " " string "\n") | |
| 961 (when (and fill (not (string-match "\n" string))) | |
| 962 (let ((fill-prefix " ") | |
| 963 (fill-column 78)) | |
| 964 (fill-paragraph nil))))) | |
| 965 (setq byte-compile-current-file nil) | |
| 966 (setq byte-compile-last-warned-form this-form))) | |
| 967 | |
| 968 ;; Log the start of a file in *Compile-Log*, and mark it as done. | |
| 969 ;; But do nothing in batch mode. | |
| 970 (defun byte-compile-log-file () | |
| 971 (when (and byte-compile-current-file (not noninteractive)) | |
| 972 (with-current-buffer (get-buffer-create "*Compile-Log*") | |
| 973 (when (> (point-max) (point-min)) | |
| 974 (goto-char (point-max)) | |
| 975 (insert "\n\^L\n")) | |
| 976 (insert "Compiling " | |
| 977 (if (stringp byte-compile-current-file) | |
| 978 (concat "file " byte-compile-current-file) | |
| 979 (concat "buffer " (buffer-name byte-compile-current-file))) | |
| 980 " at " (current-time-string) "\n") | |
| 981 (setq byte-compile-current-file nil)))) | |
| 982 | |
| 502 | 983 (defvar byte-compile-inbuffer) |
| 984 (defvar byte-compile-outbuffer) | |
| 985 | |
| 428 | 986 (defun byte-compile-warn (format &rest args) |
| 987 (setq format (apply 'format format args)) | |
| 988 (if byte-compile-error-on-warn | |
| 989 (error "%s" format) ; byte-compile-file catches and logs it | |
| 990 (byte-compile-log-1 (concat "** " format) t) | |
| 502 | 991 |
| 992 ;; This was a first attempt to add line numbers to the | |
| 993 ;; byte-compilation output. Unfortunately, it doesn't work | |
| 994 ;; perfectly: it reports the line number at the end of the form | |
| 995 ;; (which may be an entire function), rather than the line number | |
| 996 ;; of the actual problem. Doing this right is hard because we | |
| 997 ;; currently use the built-in Lisp parser to parse the entire form | |
| 998 ;; at once. What we basically need is a whole separate parser | |
| 999 ;; that annotates its output with line numbers. For example, we | |
| 1000 ;; might modify the parser in lread.c so that, with the right | |
| 1001 ;; option set, it replaces every Lisp object contained in the | |
| 1002 ;; structure it returns with a cons of that object and the line | |
| 1003 ;; number it was found on (determined by counting newlines, | |
| 1004 ;; starting from some arbitrary point). You then have two | |
| 1005 ;; options: (a) Modify the byte compiler so that everything that | |
| 1006 ;; compiles a form deals with the new annotated form rather than | |
| 1007 ;; the old one, or (b) The byte compiler saves this structure | |
| 1008 ;; while converting it into a normal structure that's given to the | |
| 1009 ;; various form handlers, which need no (or less) modification. | |
| 1010 ;; In the former case, finding the line number is trivial because | |
| 1011 ;; it's in the form. In the latter case, finding the line number | |
| 1012 ;; depends on having a unique Lisp object that can be looked up in | |
| 1013 ;; the annotated structure -- i.e. a list, vector, or string. | |
| 1014 ;; You'd have to look at the various places where errors are spit | |
| 1015 ;; out (not very many, really), and make sure that such a unique | |
| 1016 ;; object is available. Then you do a depth-first search through | |
| 1017 ;; the annotated structure to find the object. | |
| 1018 ;; | |
| 1019 ;; An alternative way of doing (b) that's probably much more | |
| 1020 ;; efficient (and easier to implement) is simply to have the | |
| 1021 ;; parser in lread.c annotate every unique object using a separate | |
| 1022 ;; hash table. This also eliminates the need for a search to find | |
| 1023 ;; the line number. In order to be fine-grained enough to get at | |
| 1024 ;; every symbol in a form -- e.g. if we want to pinpoint a | |
| 1025 ;; particular undefined variable in a function call -- we need to | |
| 1026 ;; annotate every cons, not just each list. We still have | |
| 1027 ;; (probably unimportant) problems with vectors, since all we have | |
| 1028 ;; is the start of the vector. If we cared about this, we could | |
| 1029 ;; store in the hash table a list of the line numbers for each | |
| 1030 ;; item in the vector, not just its start. | |
| 1031 ;; | |
| 1032 ;; --ben | |
| 1033 | |
| 1034 ; (byte-compile-log-1 (concat "** line: " | |
| 1035 ; (save-excursion | |
| 1036 ; (set-buffer byte-compile-inbuffer) | |
| 1037 ; (int-to-string (line-number))) | |
| 1038 ; " " | |
| 1039 ; format) t) | |
| 428 | 1040 ;;; RMS says: |
| 1041 ;;; It is useless to flash warnings too fast to be read. | |
| 1042 ;;; Besides, they will all be shown at the end. | |
| 1043 ;;; and comments out the next two lines. | |
| 1044 (or noninteractive ; already written on stdout. | |
| 1045 (message "Warning: %s" format)))) | |
| 1046 | |
| 1047 ;;; This function should be used to report errors that have halted | |
| 1048 ;;; compilation of the current file. | |
| 1049 (defun byte-compile-report-error (error-info) | |
| 1050 (setq byte-compiler-error-flag t) | |
| 1051 (byte-compile-log-1 | |
| 1052 (concat "!! " | |
| 1053 (format (if (cdr error-info) "%s (%s)" "%s") | |
| 1054 (get (car error-info) 'error-message) | |
| 442 | 1055 (prin1-to-string (cdr error-info))))) |
| 1056 (if stack-trace-on-error | |
| 1057 (backtrace nil t))) | |
| 428 | 1058 |
| 1059 ;;; Used by make-obsolete. | |
| 1060 (defun byte-compile-obsolete (form) | |
| 1061 (let ((new (get (car form) 'byte-obsolete-info))) | |
| 1062 (if (memq 'obsolete byte-compile-warnings) | |
| 1063 (byte-compile-warn "%s is an obsolete function; %s" (car form) | |
| 1064 (if (stringp (car new)) | |
| 1065 (car new) | |
| 1066 (format "use %s instead." (car new))))) | |
| 1067 (funcall (or (cdr new) 'byte-compile-normal-call) form))) | |
| 1068 | |
| 1069 ;;; Used by make-obsolete. | |
| 1070 (defun byte-compile-compatible (form) | |
| 1071 (let ((new (get (car form) 'byte-compatible-info))) | |
| 1072 (if (memq 'pedantic byte-compile-warnings) | |
| 1073 (byte-compile-warn "%s is provided for compatibility; %s" (car form) | |
| 1074 (if (stringp (car new)) | |
| 1075 (car new) | |
| 1076 (format "use %s instead." (car new))))) | |
| 1077 (funcall (or (cdr new) 'byte-compile-normal-call) form))) | |
| 1078 | |
| 1079 ;; Compiler options | |
| 1080 | |
| 1081 (defconst byte-compiler-legal-options | |
| 1082 '((optimize byte-optimize (t nil source byte) val) | |
| 1083 (file-format byte-compile-emacs19-compatibility (emacs19 emacs20) | |
| 1084 (eq val 'emacs19)) | |
| 1085 (delete-errors byte-compile-delete-errors (t nil) val) | |
| 1086 (verbose byte-compile-verbose (t nil) val) | |
| 1087 (new-bytecodes byte-compile-new-bytecodes (t nil) val) | |
| 1088 (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
|
1089 ((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
|
1090 unresolved discarded-consing quoted-lambda)) |
| 428 | 1091 val))) |
| 1092 | |
| 1093 ;; XEmacs addition | |
| 1094 (defconst byte-compiler-obsolete-options | |
| 1095 '((new-bytecodes t))) | |
| 1096 | |
| 1097 ;; Inhibit v19/v20 selectors if the version is hardcoded. | |
| 1098 ;; #### This should print a warning if the user tries to change something | |
| 1099 ;; than can't be changed because the running compiler doesn't support it. | |
| 1100 (cond | |
| 1101 ((byte-compile-single-version) | |
| 1102 (setcar (cdr (cdr (assq 'file-format byte-compiler-legal-options))) | |
| 1103 (if (byte-compile-version-cond byte-compile-emacs19-compatibility) | |
| 1104 '(emacs19) '(emacs20))))) | |
| 1105 | |
| 1106 ;; now we can copy it. | |
| 444 | 1107 (setq byte-compiler-legal-options byte-compiler-legal-options) |
| 428 | 1108 |
| 1109 (defun byte-compiler-options-handler (&rest args) | |
| 1110 (let (key val desc choices) | |
| 1111 (while args | |
| 1112 (if (or (atom (car args)) (nthcdr 2 (car args)) (null (cdr (car args)))) | |
| 1113 (error "malformed byte-compiler-option %s" (car args))) | |
| 1114 (setq key (car (car args)) | |
| 1115 val (car (cdr (car args))) | |
| 1116 desc (assq key byte-compiler-legal-options)) | |
| 1117 (or desc | |
| 1118 (error "unknown byte-compiler option %s" key)) | |
| 1119 (if (assq key byte-compiler-obsolete-options) | |
| 1120 (byte-compile-warn "%s is an obsolete byte-compiler option." key)) | |
| 1121 (setq choices (nth 2 desc)) | |
| 1122 (if (consp (car choices)) | |
| 1123 (let* (this | |
| 1124 (handler 'cons) | |
| 1125 (var (nth 1 desc)) | |
| 1126 (ret (and (memq (car val) '(+ -)) | |
| 1127 (copy-sequence (if (eq t (symbol-value var)) | |
| 1128 (car choices) | |
| 1129 (symbol-value var)))))) | |
| 1130 (setq choices (car choices)) | |
| 1131 (while val | |
| 1132 (setq this (car val)) | |
| 1133 (cond ((memq this choices) | |
| 1134 (setq ret (funcall handler this ret))) | |
| 1135 ((eq this '+) (setq handler 'cons)) | |
| 1136 ((eq this '-) (setq handler 'delq)) | |
| 1137 ((error "%s only accepts %s." key choices))) | |
| 1138 (setq val (cdr val))) | |
| 1139 (set (nth 1 desc) ret)) | |
| 1140 (or (memq val choices) | |
| 1141 (error "%s must be one of %s." key choices)) | |
| 1142 (set (nth 1 desc) (eval (nth 3 desc)))) | |
| 1143 (setq args (cdr args))) | |
| 1144 nil)) | |
| 1145 | |
| 1146 ;;; sanity-checking arglists | |
| 1147 | |
| 1148 (defun byte-compile-fdefinition (name macro-p) | |
| 1149 (let* ((list (if (memq macro-p '(nil subr)) | |
| 1150 byte-compile-function-environment | |
| 1151 byte-compile-macro-environment)) | |
| 1152 (env (cdr (assq name list)))) | |
| 1153 (or env | |
| 1154 (let ((fn name)) | |
| 1155 (while (and (symbolp fn) | |
| 1156 (fboundp fn) | |
| 1157 (or (symbolp (symbol-function fn)) | |
| 1158 (consp (symbol-function fn)) | |
| 1159 (and (not macro-p) | |
| 1160 (compiled-function-p (symbol-function fn))) | |
| 1161 (and (eq macro-p 'subr) (subrp fn)))) | |
| 1162 (setq fn (symbol-function fn))) | |
| 1163 (if (or (and (not macro-p) (compiled-function-p fn)) | |
| 1164 (and (eq macro-p 'subr) (subrp fn))) | |
| 1165 fn | |
| 1166 (and (consp fn) | |
| 1167 (not (eq macro-p 'subr)) | |
| 1168 (if (eq 'macro (car fn)) | |
| 1169 (cdr fn) | |
| 1170 (if macro-p | |
| 1171 nil | |
| 1172 (if (eq 'autoload (car fn)) | |
| 1173 nil | |
| 1174 fn))))))))) | |
| 1175 | |
| 1176 (defun byte-compile-arglist-signature (arglist) | |
| 1177 (let ((args 0) | |
| 1178 opts | |
| 1179 restp) | |
| 1180 (while arglist | |
| 1181 (cond ((eq (car arglist) '&optional) | |
| 1182 (or opts (setq opts 0))) | |
| 1183 ((eq (car arglist) '&rest) | |
| 1184 (if (cdr arglist) | |
| 1185 (setq restp t | |
| 1186 arglist nil))) | |
| 1187 (t | |
| 1188 (if opts | |
| 1189 (setq opts (1+ opts)) | |
| 1190 (setq args (1+ args))))) | |
| 1191 (setq arglist (cdr arglist))) | |
| 1192 (cons args (if restp nil (if opts (+ args opts) args))))) | |
| 1193 | |
| 1194 | |
| 1195 (defun byte-compile-arglist-signatures-congruent-p (old new) | |
| 1196 (not (or | |
| 1197 (> (car new) (car old)) ; requires more args now | |
| 1198 (and (null (cdr old)) ; tooks rest-args, doesn't any more | |
| 1199 (cdr new)) | |
| 1200 (and (cdr new) (cdr old) ; can't take as many args now | |
| 1201 (< (cdr new) (cdr old))) | |
| 1202 ))) | |
| 1203 | |
| 1204 (defun byte-compile-arglist-signature-string (signature) | |
| 1205 (cond ((null (cdr signature)) | |
| 1206 (format "%d+" (car signature))) | |
| 1207 ((= (car signature) (cdr signature)) | |
| 1208 (format "%d" (car signature))) | |
| 1209 (t (format "%d-%d" (car signature) (cdr signature))))) | |
| 1210 | |
| 1211 | |
| 1212 ;; Warn if the form is calling a function with the wrong number of arguments. | |
| 1213 (defun byte-compile-callargs-warn (form) | |
| 1214 (let* ((def (or (byte-compile-fdefinition (car form) nil) | |
| 1215 (byte-compile-fdefinition (car form) t))) | |
| 1216 (sig (and def (byte-compile-arglist-signature | |
| 1217 (if (eq 'lambda (car-safe def)) | |
| 1218 (nth 1 def) | |
| 1219 (if (compiled-function-p def) | |
| 1220 (compiled-function-arglist def) | |
| 1221 '(&rest def)))))) | |
| 1222 (ncall (length (cdr form)))) | |
| 1223 (if (and (null def) | |
| 1224 (fboundp 'subr-min-args) | |
| 1225 (setq def (byte-compile-fdefinition (car form) 'subr))) | |
| 1226 (setq sig (cons (subr-min-args def) (subr-max-args def)))) | |
| 1227 (if sig | |
| 1228 (if (or (< ncall (car sig)) | |
| 1229 (and (cdr sig) (> ncall (cdr sig)))) | |
| 1230 (byte-compile-warn | |
| 1231 "%s called with %d argument%s, but %s %s" | |
| 1232 (car form) ncall | |
| 1233 (if (= 1 ncall) "" "s") | |
| 1234 (if (< ncall (car sig)) | |
| 1235 "requires" | |
| 1236 "accepts only") | |
| 1237 (byte-compile-arglist-signature-string sig))) | |
| 1238 (or (fboundp (car form)) ; might be a subr or autoload. | |
| 1239 ;; ## this doesn't work with recursion. | |
| 1240 (eq (car form) byte-compile-current-form) | |
| 1241 ;; It's a currently-undefined function. | |
| 1242 ;; Remember number of args in call. | |
| 1243 (let ((cons (assq (car form) byte-compile-unresolved-functions)) | |
| 1244 (n (length (cdr form)))) | |
| 1245 (if cons | |
| 1246 (or (memq n (cdr cons)) | |
| 1247 (setcdr cons (cons n (cdr cons)))) | |
| 1248 (setq byte-compile-unresolved-functions | |
| 1249 (cons (list (car form) n) | |
| 1250 byte-compile-unresolved-functions)))))))) | |
| 1251 | |
| 1252 ;; Warn if the function or macro is being redefined with a different | |
| 1253 ;; number of arguments. | |
| 1254 (defun byte-compile-arglist-warn (form macrop) | |
| 1255 (let ((old (byte-compile-fdefinition (nth 1 form) macrop))) | |
| 1256 (if old | |
| 1257 (let ((sig1 (byte-compile-arglist-signature | |
| 1258 (if (eq 'lambda (car-safe old)) | |
| 1259 (nth 1 old) | |
| 1260 (if (compiled-function-p old) | |
| 1261 (compiled-function-arglist old) | |
| 1262 '(&rest def))))) | |
| 1263 (sig2 (byte-compile-arglist-signature (nth 2 form)))) | |
| 1264 (or (byte-compile-arglist-signatures-congruent-p sig1 sig2) | |
| 1265 (byte-compile-warn "%s %s used to take %s %s, now takes %s" | |
| 1266 (if (eq (car form) 'defun) "function" "macro") | |
| 1267 (nth 1 form) | |
| 1268 (byte-compile-arglist-signature-string sig1) | |
| 1269 (if (equal sig1 '(1 . 1)) "argument" "arguments") | |
| 1270 (byte-compile-arglist-signature-string sig2)))) | |
| 1271 ;; This is the first definition. See if previous calls are compatible. | |
| 1272 (let ((calls (assq (nth 1 form) byte-compile-unresolved-functions)) | |
| 1273 nums sig min max) | |
| 1274 (if calls | |
| 1275 (progn | |
| 1276 (setq sig (byte-compile-arglist-signature (nth 2 form)) | |
| 1277 nums (sort (copy-sequence (cdr calls)) (function <)) | |
| 1278 min (car nums) | |
| 1279 max (car (nreverse nums))) | |
| 1280 (if (or (< min (car sig)) | |
| 1281 (and (cdr sig) (> max (cdr sig)))) | |
| 1282 (byte-compile-warn | |
| 1283 "%s being defined to take %s%s, but was previously called with %s" | |
| 1284 (nth 1 form) | |
| 1285 (byte-compile-arglist-signature-string sig) | |
| 1286 (if (equal sig '(1 . 1)) " arg" " args") | |
| 1287 (byte-compile-arglist-signature-string (cons min max)))) | |
| 1288 | |
| 1289 (setq byte-compile-unresolved-functions | |
| 1290 (delq calls byte-compile-unresolved-functions))))) | |
| 1291 ))) | |
| 1292 | |
| 1293 ;; If we have compiled any calls to functions which are not known to be | |
| 1294 ;; defined, issue a warning enumerating them. | |
| 1295 ;; `unresolved' in the list `byte-compile-warnings' disables this. | |
| 1296 (defun byte-compile-warn-about-unresolved-functions (&optional msg) | |
| 1297 (if (memq 'unresolved byte-compile-warnings) | |
| 1298 (let ((byte-compile-current-form (or msg "the end of the data"))) | |
| 1299 ;; First delete the autoloads from the list. | |
| 1300 (if byte-compile-autoload-environment | |
| 1301 (let ((rest byte-compile-unresolved-functions)) | |
| 1302 (while rest | |
| 1303 (if (assq (car (car rest)) byte-compile-autoload-environment) | |
| 1304 (setq byte-compile-unresolved-functions | |
| 1305 (delq (car rest) byte-compile-unresolved-functions))) | |
| 1306 (setq rest (cdr rest))))) | |
| 1307 ;; Now warn. | |
| 1308 (if (cdr byte-compile-unresolved-functions) | |
| 1309 (let* ((str "The following functions are not known to be defined: ") | |
| 1310 (L (+ (length str) 5)) | |
| 1311 (rest (reverse byte-compile-unresolved-functions)) | |
| 1312 s) | |
| 1313 (while rest | |
| 1314 (setq s (symbol-name (car (car rest))) | |
| 1315 L (+ L (length s) 2) | |
| 1316 rest (cdr rest)) | |
| 1317 (if (<= L (1- fill-column)) | |
| 1318 (setq str (concat str " " s (and rest ","))) | |
| 1319 (setq str (concat str "\n " s (and rest ",")) | |
| 1320 L (+ (length s) 4)))) | |
| 1321 (byte-compile-warn "%s" str)) | |
| 1322 (if byte-compile-unresolved-functions | |
| 1323 (byte-compile-warn "the function %s is not known to be defined." | |
| 1324 (car (car byte-compile-unresolved-functions))))))) | |
| 1325 nil) | |
| 1326 | |
| 1327 (defun byte-compile-defvar-p (var) | |
| 1328 ;; Whether the byte compiler thinks that non-lexical references to this | |
| 1329 ;; variable are ok. | |
| 1330 (or (globally-boundp var) | |
| 1331 (let ((rest byte-compile-bound-variables)) | |
| 1332 (while (and rest var) | |
| 1333 (if (and (eq var (car-safe (car rest))) | |
| 1334 (not (= 0 (logand (cdr (car rest)) | |
| 1335 byte-compile-global-bit)))) | |
| 1336 (setq var nil)) | |
| 1337 (setq rest (cdr rest))) | |
| 1338 ;; if var is nil at this point, it's a defvar in this file. | |
| 444 | 1339 (not var)) |
| 1340 ;; Perhaps (eval-when-compile (defvar foo)) | |
| 1341 (and (boundp 'current-load-list) | |
| 1342 (memq var current-load-list)))) | |
| 428 | 1343 |
| 1344 | |
| 1345 ;;; If we have compiled bindings of variables which have no referents, warn. | |
| 1346 (defun byte-compile-warn-about-unused-variables () | |
| 1347 (let ((rest byte-compile-bound-variables) | |
| 1348 (unreferenced '()) | |
| 1349 cell) | |
| 1350 (while (and rest | |
| 1351 ;; only warn about variables whose lifetime is now ending, | |
| 1352 ;; that is, variables from the lexical scope that is now | |
| 1353 ;; terminating. (Think nested lets.) | |
| 1354 (not (eq (car rest) 'new-scope))) | |
| 1355 (setq cell (car rest)) | |
| 1356 (if (and (= 0 (logand byte-compile-referenced-bit (cdr cell))) | |
| 1357 ;; Don't warn about declared-but-unused arguments, | |
| 1358 ;; for two reasons: first, the arglist structure | |
| 1359 ;; might be imposed by external forces, and we don't | |
| 1360 ;; have (declare (ignore x)) yet; and second, inline | |
| 1361 ;; expansion produces forms like | |
| 1362 ;; ((lambda (arg) (byte-code "..." [arg])) x) | |
| 1363 ;; which we can't (ok, well, don't) recognize as | |
| 1364 ;; containing a reference to arg, so every inline | |
| 1365 ;; expansion would generate a warning. (If we had | |
| 1366 ;; `ignore' then inline expansion could emit an | |
| 1367 ;; ignore declaration.) | |
| 1368 (= 0 (logand byte-compile-arglist-bit (cdr cell))) | |
| 1369 ;; Don't warn about defvars because this is a | |
| 1370 ;; legitimate special binding. | |
| 1371 (not (byte-compile-defvar-p (car cell)))) | |
| 1372 (setq unreferenced (cons (car cell) unreferenced))) | |
| 1373 (setq rest (cdr rest))) | |
| 1374 (setq unreferenced (nreverse unreferenced)) | |
| 1375 (while unreferenced | |
| 1376 (byte-compile-warn | |
| 1377 (format "variable %s bound but not referenced" (car unreferenced))) | |
| 1378 (setq unreferenced (cdr unreferenced))))) | |
| 1379 | |
| 1380 | |
| 1381 (defmacro byte-compile-constant-symbol-p (symbol) | |
| 1382 `(or (keywordp ,symbol) (memq ,symbol '(nil t)))) | |
| 1383 | |
| 1384 (defmacro byte-compile-constp (form) | |
| 1385 ;; Returns non-nil if FORM is a constant. | |
| 1386 `(cond ((consp ,form) (eq (car ,form) 'quote)) | |
| 1387 ((symbolp ,form) (byte-compile-constant-symbol-p ,form)) | |
| 1388 (t))) | |
| 1389 | |
| 1390 (defmacro byte-compile-close-variables (&rest body) | |
| 1391 `(let | |
| 1392 (;; | |
| 1393 ;; Close over these variables to encapsulate the | |
| 1394 ;; compilation state | |
| 1395 ;; | |
| 1396 (byte-compile-macro-environment | |
| 1397 ;; Copy it because the compiler may patch into the | |
| 1398 ;; macroenvironment. | |
| 1399 (copy-alist byte-compile-initial-macro-environment)) | |
| 1400 (byte-compile-function-environment nil) | |
| 1401 (byte-compile-autoload-environment nil) | |
| 1402 (byte-compile-unresolved-functions nil) | |
| 1403 (byte-compile-bound-variables nil) | |
| 1404 (byte-compile-free-references nil) | |
| 1405 (byte-compile-free-assignments nil) | |
| 1406 ;; | |
| 1407 ;; Close over these variables so that `byte-compiler-options' | |
| 1408 ;; can change them on a per-file basis. | |
| 1409 ;; | |
| 1410 (byte-compile-verbose byte-compile-verbose) | |
| 1411 (byte-optimize byte-optimize) | |
| 1412 (byte-compile-emacs19-compatibility | |
| 1413 byte-compile-emacs19-compatibility) | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
1414 (byte-compile-checks-on-load |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
1415 byte-compile-checks-on-load) |
| 428 | 1416 (byte-compile-dynamic byte-compile-dynamic) |
| 1417 (byte-compile-dynamic-docstrings | |
| 1418 byte-compile-dynamic-docstrings) | |
| 1419 (byte-compile-warnings (if (eq byte-compile-warnings t) | |
| 1420 byte-compile-default-warnings | |
| 1421 byte-compile-warnings)) | |
| 1422 (byte-compile-file-domain nil)) | |
| 1423 (prog1 | |
| 1424 (progn ,@body) | |
| 1425 (if (memq 'unused-vars byte-compile-warnings) | |
| 1426 ;; done compiling in this scope, warn now. | |
| 1427 (byte-compile-warn-about-unused-variables))))) | |
| 1428 | |
| 1429 | |
| 1430 (defmacro displaying-byte-compile-warnings (&rest body) | |
| 1431 `(let* ((byte-compile-log-buffer (get-buffer-create "*Compile-Log*")) | |
| 1432 (byte-compile-point-max-prev (point-max byte-compile-log-buffer))) | |
| 1433 ;; Log the file name or buffer name. | |
| 1434 (byte-compile-log-file) | |
| 1435 ;; Record how much is logged now. | |
| 1436 ;; We will display the log buffer if anything more is logged | |
| 1437 ;; before the end of BODY. | |
| 1438 (defvar byte-compile-warnings-beginning) | |
| 1439 (let ((byte-compile-warnings-beginning | |
| 1440 (if (boundp 'byte-compile-warnings-beginning) | |
| 1441 byte-compile-warnings-beginning | |
| 1442 (point-max byte-compile-log-buffer)))) | |
| 1443 | |
| 1444 (unwind-protect | |
| 442 | 1445 (call-with-condition-handler |
| 1446 #'(lambda (error-info) | |
| 1447 (byte-compile-report-error error-info)) | |
| 1448 #'(lambda () | |
| 1449 (progn ,@body))) | |
| 428 | 1450 ;; Always set point in log to start of interesting output. |
| 1451 (with-current-buffer byte-compile-log-buffer | |
| 1452 (let ((show-begin | |
| 1453 (progn (goto-char byte-compile-point-max-prev) | |
| 1454 (skip-chars-forward "\^L\n") | |
| 1455 (point)))) | |
| 1456 ;; If there were compilation warnings, display them. | |
| 1457 (if temp-buffer-show-function | |
| 1458 (let ((show-buffer (get-buffer-create "*Compile-Log-Show*"))) | |
| 1459 ;; Always clean show-buffer, even when not displaying it, | |
| 1460 ;; so that misleading previous messages aren't left around. | |
| 1461 (with-current-buffer show-buffer | |
| 1462 (setq buffer-read-only nil) | |
| 1463 (erase-buffer)) | |
| 1464 (copy-to-buffer show-buffer show-begin (point-max)) | |
| 1465 (when (< byte-compile-warnings-beginning (point-max)) | |
| 1466 (funcall temp-buffer-show-function show-buffer))) | |
| 1467 (when (< byte-compile-warnings-beginning (point-max)) | |
| 1468 (select-window | |
| 1469 (prog1 (selected-window) | |
| 1470 (select-window (display-buffer (current-buffer))) | |
| 1471 (goto-char show-begin) | |
| 1472 (recenter 1))))))))))) | |
| 1473 | |
| 1474 | |
| 1475 ;;;###autoload | |
| 1476 (defun byte-force-recompile (directory) | |
| 1477 "Recompile every `.el' file in DIRECTORY that already has a `.elc' file. | |
| 1478 Files in subdirectories of DIRECTORY are processed also." | |
| 1479 (interactive "DByte force recompile (directory): ") | |
| 442 | 1480 (byte-recompile-directory directory nil nil t)) |
| 428 | 1481 |
| 1482 ;;;###autoload | |
| 1483 (defun byte-recompile-directory (directory &optional arg norecursion force) | |
| 1484 "Recompile every `.el' file in DIRECTORY that needs recompilation. | |
| 1485 This is if a `.elc' file exists but is older than the `.el' file. | |
| 444 | 1486 Files in subdirectories of DIRECTORY are also processed unless |
| 1487 optional argument NORECURSION is non-nil. | |
| 428 | 1488 |
| 1489 If the `.elc' file does not exist, normally the `.el' file is *not* compiled. | |
| 1490 But a prefix argument (optional second arg) means ask user, | |
| 1491 for each such `.el' file, whether to compile it. Prefix argument 0 means | |
| 1492 don't ask and compile the file anyway. | |
| 1493 | |
| 1494 A nonzero prefix argument also means ask about each subdirectory. | |
| 1495 | |
| 444 | 1496 If the fourth optional argument FORCE is non-nil, |
| 428 | 1497 recompile every `.el' file that already has a `.elc' file." |
| 1498 (interactive "DByte recompile directory: \nP") | |
| 1499 (if arg | |
| 1500 (setq arg (prefix-numeric-value arg))) | |
| 1501 (if noninteractive | |
| 1502 nil | |
| 1503 (save-some-buffers) | |
| 1504 (redraw-modeline)) | |
| 1505 (let ((directories (list (expand-file-name directory))) | |
| 1506 (file-count 0) | |
| 1507 (dir-count 0) | |
| 1508 last-dir) | |
| 1509 (displaying-byte-compile-warnings | |
| 1510 (while directories | |
| 1511 (setq directory (file-name-as-directory (car directories))) | |
| 1512 (or noninteractive (message "Checking %s..." directory)) | |
| 1513 (let ((files (directory-files directory)) | |
| 1514 source dest) | |
| 1515 (while files | |
| 1516 (setq source (expand-file-name (car files) directory)) | |
| 1517 (if (and (not (member (car files) '("." ".." "RCS" "CVS" "SCCS"))) | |
| 1518 ;; Stay away from directory back-links, etc: | |
| 1519 (not (file-symlink-p source)) | |
| 1520 (file-directory-p source) | |
| 1521 byte-recompile-directory-recursively) | |
| 1522 ;; This file is a subdirectory. Handle them differently. | |
| 1523 (if (or (null arg) | |
| 1524 (eq arg 0) | |
| 1525 (y-or-n-p (concat "Check " source "? "))) | |
| 1526 (setq directories | |
| 1527 (nconc directories (list source)))) | |
| 1528 ;; It is an ordinary file. Decide whether to compile it. | |
| 1529 (if (and (string-match emacs-lisp-file-regexp source) | |
| 1530 (not (auto-save-file-name-p source)) | |
| 502 | 1531 ;; make sure not a mule file we can't handle. |
| 1532 (or (not byte-recompile-ignore-uncompilable-mule-files) | |
| 1533 (featurep 'mule) | |
| 1534 (not (find-coding-system-magic-cookie-in-file | |
| 1535 source))) | |
| 428 | 1536 (setq dest (byte-compile-dest-file source)) |
| 1537 (if (file-exists-p dest) | |
| 1538 ;; File was already compiled. | |
| 1539 (or force (file-newer-than-file-p source dest)) | |
| 1540 ;; No compiled file exists yet. | |
| 1541 (and arg | |
| 1542 (or (eq 0 arg) | |
| 1543 (y-or-n-p (concat "Compile " source "? ")))))) | |
| 1544 (progn ;(if (and noninteractive (not byte-compile-verbose)) | |
| 1545 ; (message "Compiling %s..." source)) | |
| 1546 ; we do this in byte-compile-file. | |
| 1547 (if byte-recompile-directory-ignore-errors-p | |
| 1548 (batch-byte-compile-1 source) | |
| 1549 (byte-compile-file source)) | |
| 1550 (or noninteractive | |
| 1551 (message "Checking %s..." directory)) | |
| 1552 (setq file-count (1+ file-count)) | |
| 1553 (if (not (eq last-dir directory)) | |
| 1554 (setq last-dir directory | |
| 1555 dir-count (1+ dir-count))) | |
| 1556 ))) | |
| 1557 (setq files (cdr files)))) | |
| 1558 (setq directories (cdr directories)))) | |
| 1559 (message "Done (Total of %d file%s compiled%s)" | |
| 1560 file-count (if (= file-count 1) "" "s") | |
| 1561 (if (> dir-count 1) (format " in %d directories" dir-count) "")))) | |
| 1562 | |
| 1563 ;;;###autoload | |
| 1564 (defun byte-recompile-file (filename &optional force) | |
| 1565 "Recompile a file of Lisp code named FILENAME if it needs recompilation. | |
| 1566 This is if the `.elc' file exists but is older than the `.el' file. | |
| 1567 | |
| 1568 If the `.elc' file does not exist, normally the `.el' file is *not* | |
| 1569 compiled. But a prefix argument (optional second arg) means ask user | |
| 1570 whether to compile it. Prefix argument 0 don't ask and recompile anyway." | |
| 1571 (interactive "fByte recompile file: \nP") | |
| 1572 (let ((dest)) | |
| 1573 (if (and (string-match emacs-lisp-file-regexp filename) | |
| 1574 (not (auto-save-file-name-p filename)) | |
| 1575 (setq dest (byte-compile-dest-file filename)) | |
| 1576 (if (file-exists-p dest) | |
| 1577 (file-newer-than-file-p filename dest) | |
| 1578 (and force | |
| 1579 (or (eq 0 force) | |
| 502 | 1580 (y-or-n-p (concat "Compile " filename "? "))))) |
| 1581 (or (not byte-recompile-ignore-uncompilable-mule-files) | |
| 1582 (featurep 'mule) | |
| 1583 (not (find-coding-system-magic-cookie-in-file filename)))) | |
| 428 | 1584 (byte-compile-file filename)))) |
| 1585 | |
| 1586 ;;;###autoload | |
| 1587 (defun byte-compile-file (filename &optional load) | |
| 1588 "Compile a file of Lisp code named FILENAME into a file of byte code. | |
| 1589 The output file's name is made by appending `c' to the end of FILENAME. | |
| 1590 With prefix arg (noninteractively: 2nd arg), load the file after compiling." | |
| 1591 ;; (interactive "fByte compile file: \nP") | |
| 1592 (interactive | |
| 1593 (let ((file buffer-file-name) | |
| 1594 (file-name nil) | |
| 1595 (file-dir nil)) | |
| 1596 (and file | |
| 1597 (eq (cdr (assq 'major-mode (buffer-local-variables))) | |
| 1598 'emacs-lisp-mode) | |
| 1599 (setq file-name (file-name-nondirectory file) | |
| 1600 file-dir (file-name-directory file))) | |
| 1601 (list (read-file-name (if current-prefix-arg | |
| 1602 "Byte compile and load file: " | |
| 1603 "Byte compile file: ") | |
| 1604 file-dir nil nil file-name) | |
| 1605 current-prefix-arg))) | |
| 1606 ;; Expand now so we get the current buffer's defaults | |
| 1607 (setq filename (expand-file-name filename)) | |
| 1608 | |
| 1609 ;; If we're compiling a file that's in a buffer and is modified, offer | |
| 1610 ;; to save it first. | |
| 1611 (or noninteractive | |
| 1612 (let ((b (get-file-buffer (expand-file-name filename)))) | |
| 1613 (if (and b (buffer-modified-p b) | |
| 1614 (y-or-n-p (format "save buffer %s first? " (buffer-name b)))) | |
| 1615 (save-excursion (set-buffer b) (save-buffer))))) | |
| 1616 | |
| 1617 (if (or noninteractive byte-compile-verbose) ; XEmacs change | |
| 1618 (message "Compiling %s..." filename)) | |
| 1619 (let (;;(byte-compile-current-file (file-name-nondirectory filename)) | |
| 1620 (byte-compile-current-file filename) | |
| 1621 target-file input-buffer output-buffer | |
| 1622 byte-compile-dest-file) | |
| 1623 (setq target-file (byte-compile-dest-file filename)) | |
| 1624 (setq byte-compile-dest-file target-file) | |
| 1625 (save-excursion | |
| 1626 (setq input-buffer (get-buffer-create " *Compiler Input*")) | |
| 1627 (set-buffer input-buffer) | |
| 1628 (erase-buffer) | |
| 1629 (insert-file-contents filename) | |
| 1630 ;; Run hooks including the uncompression hook. | |
| 1631 ;; If they change the file name, then change it for the output also. | |
| 1632 (let ((buffer-file-name filename) | |
| 1633 (default-major-mode 'emacs-lisp-mode) | |
| 1634 (enable-local-eval nil)) | |
| 1635 (normal-mode) | |
| 1636 (setq filename buffer-file-name))) | |
| 1637 (setq byte-compiler-error-flag nil) | |
| 1638 ;; It is important that input-buffer not be current at this call, | |
| 1639 ;; so that the value of point set in input-buffer | |
| 1640 ;; within byte-compile-from-buffer lingers in that buffer. | |
| 1641 (setq output-buffer (byte-compile-from-buffer input-buffer filename)) | |
| 1642 (if byte-compiler-error-flag | |
| 1643 nil | |
| 1644 (if byte-compile-verbose | |
| 1645 (message "Compiling %s...done" filename)) | |
| 1646 (kill-buffer input-buffer) | |
| 1647 (save-excursion | |
| 1648 (set-buffer output-buffer) | |
| 1649 (goto-char (point-max)) | |
| 1650 (insert "\n") ; aaah, unix. | |
| 1651 (setq target-file (byte-compile-dest-file filename)) | |
| 1652 (unless byte-compile-overwrite-file | |
| 1653 (ignore-file-errors (delete-file target-file))) | |
| 1654 (if (file-writable-p target-file) | |
|
4529
6f41fb7f3a65
Protect .elc encoding from latin-unity.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4392
diff
changeset
|
1655 ;; 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
|
1656 ;; 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
|
1657 (let ((write-region-pre-hook nil)) |
|
6f41fb7f3a65
Protect .elc encoding from latin-unity.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4392
diff
changeset
|
1658 (write-region 1 (point-max) target-file)) |
| 428 | 1659 ;; This is just to give a better error message than write-region |
| 1660 (signal 'file-error | |
| 1661 (list "Opening output file" | |
| 1662 (if (file-exists-p target-file) | |
| 1663 "cannot overwrite file" | |
| 1664 "directory not writable or nonexistent") | |
| 1665 target-file))) | |
| 1666 (or byte-compile-overwrite-file | |
| 1667 (condition-case () | |
| 1668 (set-file-modes target-file (file-modes filename)) | |
| 1669 (error nil))) | |
| 1670 (kill-buffer (current-buffer))) | |
| 1671 (if (and byte-compile-generate-call-tree | |
| 1672 (or (eq t byte-compile-generate-call-tree) | |
| 1673 (y-or-n-p (format "Report call tree for %s? " filename)))) | |
| 1674 (save-excursion | |
| 1675 (display-call-tree filename))) | |
| 1676 (if load | |
| 1677 (load target-file)) | |
| 1678 t))) | |
| 1679 | |
| 1680 ;; RMS comments the next two out. | |
| 1681 | |
| 1682 ;;;###autoload | |
| 1683 (defun byte-compile-and-load-file (&optional filename) | |
| 1684 "Compile a file of Lisp code named FILENAME into a file of byte code, | |
| 1685 and then load it. The output file's name is made by appending \"c\" to | |
| 1686 the end of FILENAME." | |
| 1687 (interactive) | |
| 1688 (if filename ; I don't get it, (interactive-p) doesn't always work | |
| 1689 (byte-compile-file filename t) | |
| 1690 (let ((current-prefix-arg '(4))) | |
| 1691 (call-interactively 'byte-compile-file)))) | |
| 1692 | |
| 1693 ;;;###autoload | |
| 1694 (defun byte-compile-buffer (&optional buffer) | |
| 1695 "Byte-compile and evaluate contents of BUFFER (default: the current buffer)." | |
| 1696 (interactive "bByte compile buffer: ") | |
| 1697 (setq buffer (if buffer (get-buffer buffer) (current-buffer))) | |
| 1698 (message "Compiling %s..." buffer) | |
| 1699 (let* ((filename (or (buffer-file-name buffer) | |
| 1700 (prin1-to-string buffer))) | |
| 1701 (byte-compile-current-file buffer)) | |
| 1702 (byte-compile-from-buffer buffer filename t)) | |
| 1703 (message "Compiling %s...done" buffer) | |
| 1704 t) | |
| 1705 | |
| 1706 ;;; compiling a single function | |
| 1707 ;;;###autoload | |
| 1708 (defun compile-defun (&optional arg) | |
| 1709 "Compile and evaluate the current top-level form. | |
| 1710 Print the result in the minibuffer. | |
| 1711 With argument, insert value in current buffer after the form." | |
| 1712 (interactive "P") | |
| 1713 (save-excursion | |
| 1714 (end-of-defun) | |
| 1715 (beginning-of-defun) | |
| 1716 (let* ((byte-compile-current-file (buffer-file-name)) | |
| 1717 (load-file-name (buffer-file-name)) | |
| 1718 (byte-compile-last-warned-form 'nothing) | |
| 1719 (value (eval (displaying-byte-compile-warnings | |
| 1720 (byte-compile-sexp (read (current-buffer)) | |
| 1721 "toplevel forms"))))) | |
| 1722 (cond (arg | |
| 1723 (message "Compiling from buffer... done.") | |
| 1724 (prin1 value (current-buffer)) | |
| 1725 (insert "\n")) | |
| 1726 ((message "%s" (prin1-to-string value))))))) | |
| 1727 | |
| 1728 (defun byte-compile-from-buffer (byte-compile-inbuffer filename &optional eval) | |
| 1729 ;; buffer --> output-buffer, or buffer --> eval form, return nil | |
| 1730 (let (byte-compile-outbuffer | |
| 1731 ;; Prevent truncation of flonums and lists as we read and print them | |
| 1732 (float-output-format nil) | |
| 1733 (case-fold-search nil) | |
| 1734 (print-length nil) | |
| 1735 (print-level nil) | |
| 1736 ;; Simulate entry to byte-compile-top-level | |
| 1737 (byte-compile-constants nil) | |
| 1738 (byte-compile-variables nil) | |
| 1739 (byte-compile-tag-number 0) | |
| 1740 (byte-compile-depth 0) | |
| 1741 (byte-compile-maxdepth 0) | |
| 1742 (byte-compile-output nil) | |
| 1743 ;; #### This is bound in b-c-close-variables. | |
| 1744 ;; (byte-compile-warnings (if (eq byte-compile-warnings t) | |
| 1745 ;; byte-compile-warning-types | |
| 1746 ;; byte-compile-warnings)) | |
|
4623
a9f83990e6bf
Fix a byte compiler bug with characters above ?\xFF.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4539
diff
changeset
|
1747 (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
|
1748 (byte-compile-using-dynamic nil)) |
| 428 | 1749 (byte-compile-close-variables |
| 1750 (save-excursion | |
| 1751 (setq byte-compile-outbuffer | |
| 1752 (set-buffer (get-buffer-create " *Compiler Output*"))) | |
| 1753 (erase-buffer) | |
| 1754 ;; (emacs-lisp-mode) | |
| 1755 (setq case-fold-search nil) | |
| 1756 (and filename | |
| 1757 (not eval) | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
1758 (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
|
1759 byte-compile-outbuffer)) |
|
4623
a9f83990e6bf
Fix a byte compiler bug with characters above ?\xFF.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4539
diff
changeset
|
1760 (setq byte-compile-using-dynamic |
|
a9f83990e6bf
Fix a byte compiler bug with characters above ?\xFF.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4539
diff
changeset
|
1761 (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
|
1762 byte-compile-inbuffer) |
|
a9f83990e6bf
Fix a byte compiler bug with characters above ?\xFF.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4539
diff
changeset
|
1763 (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
|
1764 byte-compile-inbuffer))) |
| 428 | 1765 ;; This is a kludge. Some operating systems (OS/2, DOS) need to |
| 1766 ;; write files containing binary information specially. | |
| 1767 ;; Under most circumstances, such files will be in binary | |
| 1768 ;; overwrite mode, so those OS's use that flag to guess how | |
| 1769 ;; they should write their data. Advise them that .elc files | |
| 1770 ;; need to be written carefully. | |
| 1771 (setq overwrite-mode 'overwrite-mode-binary)) | |
| 1772 (displaying-byte-compile-warnings | |
| 1773 (save-excursion | |
|
4623
a9f83990e6bf
Fix a byte compiler bug with characters above ?\xFF.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4539
diff
changeset
|
1774 ;; 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
|
1775 ;; 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
|
1776 (goto-char (point-max byte-compile-outbuffer) byte-compile-outbuffer) |
| 428 | 1777 (set-buffer byte-compile-inbuffer) |
| 1778 (goto-char 1) | |
| 1779 | |
| 1780 ;; Compile the forms from the input buffer. | |
| 1781 (while (progn | |
| 1782 (while (progn (skip-chars-forward " \t\n\^L") | |
| 1783 (looking-at ";")) | |
| 1784 (forward-line 1)) | |
| 1785 (not (eobp))) | |
| 1786 (byte-compile-file-form (read byte-compile-inbuffer))) | |
| 1787 | |
| 1788 ;; Compile pending forms at end of file. | |
| 1789 (byte-compile-flush-pending) | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
1790 (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
|
1791 byte-compile-outbuffer) |
| 428 | 1792 (byte-compile-warn-about-unresolved-functions) |
| 1793 ;; Should we always do this? When calling multiple files, it | |
| 1794 ;; would be useful to delay this warning until all have | |
| 1795 ;; been compiled. | |
| 1796 (setq byte-compile-unresolved-functions nil))) | |
| 1797 (save-excursion | |
| 1798 (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
|
1799 (goto-char (point-min)) |
|
a9f83990e6bf
Fix a byte compiler bug with characters above ?\xFF.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4539
diff
changeset
|
1800 (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
|
1801 (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
|
1802 (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
|
1803 (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
|
1804 (message |
|
a9f83990e6bf
Fix a byte compiler bug with characters above ?\xFF.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4539
diff
changeset
|
1805 "%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
|
1806 filename)) |
|
a9f83990e6bf
Fix a byte compiler bug with characters above ?\xFF.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4539
diff
changeset
|
1807 (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
|
1808 byte-compile-inbuffer) |
|
a9f83990e6bf
Fix a byte compiler bug with characters above ?\xFF.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4539
diff
changeset
|
1809 (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
|
1810 byte-compile-inbuffer) |
|
a9f83990e6bf
Fix a byte compiler bug with characters above ?\xFF.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4539
diff
changeset
|
1811 (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
|
1812 byte-compile-outbuffer |
|
a9f83990e6bf
Fix a byte compiler bug with characters above ?\xFF.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4539
diff
changeset
|
1813 (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
|
1814 filename eval))))) |
| 428 | 1815 (if (not eval) |
| 1816 byte-compile-outbuffer | |
| 1817 (let (form) | |
| 1818 (while (condition-case nil | |
| 1819 (progn (setq form (read byte-compile-outbuffer)) | |
| 1820 t) | |
| 1821 (end-of-file nil)) | |
| 1822 (eval form))) | |
| 1823 (kill-buffer byte-compile-outbuffer) | |
| 1824 nil))) | |
| 1825 | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
1826 (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
|
1827 "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
|
1828 docstrings code.") |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
1829 |
| 428 | 1830 (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
|
1831 byte-compile-outbuffer) |
| 428 | 1832 (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
|
1833 (let (comments) |
| 428 | 1834 (set-buffer byte-compile-outbuffer) |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
1835 (delete-region 1 (1+ byte-compile-checks-and-comments-space)) |
| 428 | 1836 (goto-char 1) |
| 1837 ;; | |
| 1838 ;; The magic number of .elc files is ";ELC", or 0x3B454C43. After that is | |
| 1839 ;; the file-format version number (19 or 20) as a byte, followed by some | |
| 1840 ;; nulls. The primary motivation for doing this is to get some binary | |
| 1841 ;; characters up in the first line of the file so that `diff' will simply | |
| 1842 ;; say "Binary files differ" instead of actually doing a diff of two .elc | |
| 1843 ;; files. An extra benefit is that you can add this to /etc/magic: | |
| 1844 ;; | |
| 613 | 1845 ;; 0 string ;ELC XEmacs Lisp compiled file, |
| 428 | 1846 ;; >4 byte x version %d |
| 1847 ;; | |
| 1848 (insert | |
| 1849 ";ELC" | |
| 1850 (if (byte-compile-version-cond byte-compile-emacs19-compatibility) 19 20) | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
1851 "\000\000\000\n") |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
1852 (when (not (eq (find-coding-system 'raw-text-unix) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
1853 (find-coding-system buffer-file-coding-system))) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
1854 (insert (format ";;;###coding system: %s\n" |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
1855 (coding-system-name buffer-file-coding-system)))) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
1856 (insert (format |
|
4686
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
1857 "\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
|
1858 (let ((print-readably t)) |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
1859 (prin1-to-string (if (> (length |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
1860 byte-compile-checks-on-load) |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
1861 1) |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
1862 (cons 'and |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
1863 (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
|
1864 (reverse |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
1865 byte-compile-checks-on-load))) |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
1866 (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
|
1867 (loop |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
1868 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
|
1869 with seen-first = nil |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
1870 with res = "" |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
1871 do |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
1872 (if seen-first |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
1873 (setq res (concat res ", ")) |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
1874 (setq seen-first t)) |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
1875 ;; Print featurep calls differently: |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
1876 (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
|
1877 (eq (car (second check)) 'quote) |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
1878 (symbolp (second (second check)))) |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
1879 (setq res (concat res |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
1880 (symbol-name (second (second check))))) |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
1881 (setq res (concat res |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
1882 (let ((print-readably t)) |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
1883 (prin1-to-string check))))) |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
1884 finally return res))) |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
1885 (setq comments |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
1886 (with-string-as-buffer-contents "" |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
1887 (insert "\n;;; compiled by " |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
1888 (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
|
1889 (concat (user-login-name) "@" (system-name))) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
1890 " on " |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
1891 (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
|
1892 (insert ";;; emacs version " emacs-version ".\n") |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
1893 (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
|
1894 (cond |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
1895 ((eq byte-optimize 'source) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
1896 "source-level optimization only") |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
1897 ((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
|
1898 (byte-optimize "optimization is on") |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
1899 (t "optimization is off")) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
1900 "\n"))) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
1901 |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
1902 ;; 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
|
1903 ;; 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
|
1904 (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
|
1905 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
|
1906 |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
1907 (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
|
1908 (+ (point) (length comments)))) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
1909 (insert comments)) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
1910 (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
|
1911 (point))))) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
1912 |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
1913 (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
|
1914 byte-compile-outbuffer) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
1915 ;; 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
|
1916 (goto-char 1) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
1917 (insert-char ?\ byte-compile-checks-and-comments-space) |
| 771 | 1918 (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
|
1919 (and |
|
a9f83990e6bf
Fix a byte compiler bug with characters above ?\xFF.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4539
diff
changeset
|
1920 (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
|
1921 (save-excursion |
|
a9f83990e6bf
Fix a byte compiler bug with characters above ?\xFF.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4539
diff
changeset
|
1922 (set-buffer byte-compile-inbuffer) |
|
a9f83990e6bf
Fix a byte compiler bug with characters above ?\xFF.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4539
diff
changeset
|
1923 (goto-char (point-min)) |
|
a9f83990e6bf
Fix a byte compiler bug with characters above ?\xFF.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4539
diff
changeset
|
1924 ;; 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
|
1925 ;; 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
|
1926 ;; 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
|
1927 ;; not true of ordinary comments. |
|
a9f83990e6bf
Fix a byte compiler bug with characters above ?\xFF.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4539
diff
changeset
|
1928 (let ((non-latin-1-re |
|
a9f83990e6bf
Fix a byte compiler bug with characters above ?\xFF.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4539
diff
changeset
|
1929 (concat "[^\000-\377]" |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
1930 #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
|
1931 "\\{8,8\\}")) |
|
4623
a9f83990e6bf
Fix a byte compiler bug with characters above ?\xFF.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4539
diff
changeset
|
1932 (case-fold-search nil)) |
|
a9f83990e6bf
Fix a byte compiler bug with characters above ?\xFF.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4539
diff
changeset
|
1933 (catch 'need-to-escape-quote |
|
a9f83990e6bf
Fix a byte compiler bug with characters above ?\xFF.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4539
diff
changeset
|
1934 (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
|
1935 (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
|
1936 (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
|
1937 (forward-line 1)) |
|
a9f83990e6bf
Fix a byte compiler bug with characters above ?\xFF.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4539
diff
changeset
|
1938 t))))) |
| 771 | 1939 (setq buffer-file-coding-system 'raw-text-unix) |
| 1940 (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
|
1941 (pushnew '(featurep 'mule) byte-compile-checks-on-load) |
| 771 | 1942 (save-excursion |
| 1943 (set-buffer byte-compile-inbuffer) | |
| 1944 (setq byte-compile-dynamic nil | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
1945 byte-compile-dynamic-docstrings nil)))) |
| 428 | 1946 |
| 1947 (defun byte-compile-output-file-form (form) | |
| 1948 ;; writes the given form to the output buffer, being careful of docstrings | |
| 1949 ;; in defun, defmacro, defvar, defconst and autoload because make-docfile is | |
| 1950 ;; so amazingly stupid. | |
| 1951 ;; defalias calls are output directly by byte-compile-file-form-defmumble; | |
| 1952 ;; it does not pay to first build the defalias in defmumble and then parse | |
| 1953 ;; 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
|
1954 (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
|
1955 custom-declare-variable)) |
| 428 | 1956 (stringp (nth 3 form))) |
| 1957 (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
|
1958 (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
|
1959 '(autoload custom-declare-variable))) |
| 428 | 1960 (let ((print-escape-newlines t) |
| 1961 (print-length nil) | |
| 1962 (print-level nil) | |
| 1963 (print-readably t) ; print #[] for bytecode, 'x for (quote x) | |
| 1964 (print-gensym (if (and byte-compile-print-gensym | |
| 1965 (not byte-compile-emacs19-compatibility)) | |
|
4392
e8f448f997ac
bytecomp.el: bind print-gensym-alist to nil even with non-defvar, defun, [...] forms.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4304
diff
changeset
|
1966 '(t) nil)) |
|
e8f448f997ac
bytecomp.el: bind print-gensym-alist to nil even with non-defvar, defun, [...] forms.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4304
diff
changeset
|
1967 print-gensym-alist) |
| 428 | 1968 (princ "\n" byte-compile-outbuffer) |
| 1969 (prin1 form byte-compile-outbuffer) | |
| 1970 nil))) | |
| 1971 | |
| 1972 (defun byte-compile-output-docform (preface name info form specindex quoted) | |
| 1973 "Print a form with a doc string. INFO is (prefix doc-index postfix). | |
| 1974 If PREFACE and NAME are non-nil, print them too, | |
| 1975 before INFO and the FORM but after the doc string itself. | |
| 1976 If SPECINDEX is non-nil, it is the index in FORM | |
| 1977 of the function bytecode string. In that case, | |
| 1978 we output that argument and the following argument (the constants vector) | |
| 1979 together, for lazy loading. | |
| 1980 QUOTED says that we have to put a quote before the | |
| 1981 list that represents a doc string reference. | |
| 1982 `autoload' needs that." | |
| 1983 ;; We need to examine byte-compile-dynamic-docstrings | |
| 1984 ;; in the input buffer (now current), not in the output buffer. | |
| 1985 (let ((dynamic-docstrings byte-compile-dynamic-docstrings)) | |
| 1986 (set-buffer | |
| 1987 (prog1 (current-buffer) | |
| 1988 (set-buffer byte-compile-outbuffer) | |
| 1989 (let (position) | |
| 1990 | |
| 1991 ;; Insert the doc string, and make it a comment with #@LENGTH. | |
| 1992 (and (>= (nth 1 info) 0) | |
| 1993 dynamic-docstrings | |
| 1994 (progn | |
| 1995 ;; Make the doc string start at beginning of line | |
| 1996 ;; for make-docfile's sake. | |
| 1997 (insert "\n") | |
| 1998 (setq position | |
| 1999 (byte-compile-output-as-comment | |
| 2000 (nth (nth 1 info) form) nil)) | |
| 2001 ;; If the doc string starts with * (a user variable), | |
| 2002 ;; negate POSITION. | |
| 2003 (if (and (stringp (nth (nth 1 info) form)) | |
| 2004 (> (length (nth (nth 1 info) form)) 0) | |
| 2005 (char= (aref (nth (nth 1 info) form) 0) ?*)) | |
| 2006 (setq position (- position))))) | |
| 2007 | |
| 2008 (if preface | |
| 2009 (progn | |
| 2010 (insert preface) | |
| 2011 (prin1 name byte-compile-outbuffer))) | |
| 2012 (insert (car info)) | |
| 2013 (let ((print-escape-newlines t) | |
| 2014 (print-readably t) ; print #[] for bytecode, 'x for (quote x) | |
| 2015 ;; Use a cons cell to say that we want | |
| 2016 ;; print-gensym-alist not to be cleared between calls | |
| 2017 ;; to print functions. | |
| 2018 (print-gensym (if (and byte-compile-print-gensym | |
| 2019 (not byte-compile-emacs19-compatibility)) | |
| 2020 '(t) nil)) | |
| 2021 print-gensym-alist | |
| 2022 (index 0)) | |
| 2023 (prin1 (car form) byte-compile-outbuffer) | |
| 2024 (while (setq form (cdr form)) | |
| 2025 (setq index (1+ index)) | |
| 2026 (insert " ") | |
| 2027 (cond ((and (numberp specindex) (= index specindex)) | |
| 2028 (let ((position | |
| 2029 (byte-compile-output-as-comment | |
| 2030 (cons (car form) (nth 1 form)) | |
| 2031 t))) | |
| 2032 (princ (format "(#$ . %d) nil" position) | |
| 2033 byte-compile-outbuffer) | |
| 2034 (setq form (cdr form)) | |
| 2035 (setq index (1+ index)))) | |
| 2036 ((= index (nth 1 info)) | |
| 2037 (if position | |
| 2038 (princ (format (if quoted "'(#$ . %d)" "(#$ . %d)") | |
| 2039 position) | |
| 2040 byte-compile-outbuffer) | |
| 2041 (let ((print-escape-newlines nil)) | |
| 2042 (goto-char (prog1 (1+ (point)) | |
| 2043 (prin1 (car form) | |
| 2044 byte-compile-outbuffer))) | |
| 2045 (insert "\\\n") | |
| 2046 (goto-char (point-max))))) | |
| 2047 (t | |
| 2048 (prin1 (car form) byte-compile-outbuffer))))) | |
| 2049 (insert (nth 2 info)))))) | |
| 2050 nil) | |
| 2051 | |
| 2052 (defvar for-effect) ; ## Kludge! This should be an arg, not a special. | |
| 2053 | |
| 2054 (defun byte-compile-keep-pending (form &optional handler) | |
| 2055 (if (memq byte-optimize '(t source)) | |
| 2056 (setq form (byte-optimize-form form t))) | |
| 2057 (if handler | |
| 2058 (let ((for-effect t)) | |
| 2059 ;; To avoid consing up monstrously large forms at load time, we split | |
| 2060 ;; the output regularly. | |
| 2061 (and (memq (car-safe form) '(fset defalias define-function)) | |
| 2062 (nthcdr 300 byte-compile-output) | |
| 2063 (byte-compile-flush-pending)) | |
| 2064 (funcall handler form) | |
| 2065 (when for-effect | |
| 2066 (byte-compile-discard))) | |
| 2067 (byte-compile-form form t)) | |
| 2068 nil) | |
| 2069 | |
| 2070 (defun byte-compile-flush-pending () | |
| 2071 (if byte-compile-output | |
| 2072 (let ((form (byte-compile-out-toplevel t 'file))) | |
| 2073 (cond ((eq (car-safe form) 'progn) | |
|
4783
e29fcfd8df5f
Eliminate most core code byte-compile warnings.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4775
diff
changeset
|
2074 (mapc 'byte-compile-output-file-form (cdr form))) |
| 428 | 2075 (form |
| 2076 (byte-compile-output-file-form form))) | |
| 2077 (setq byte-compile-constants nil | |
| 2078 byte-compile-variables nil | |
| 2079 byte-compile-depth 0 | |
| 2080 byte-compile-maxdepth 0 | |
| 2081 byte-compile-output nil)))) | |
| 2082 | |
| 2083 (defun byte-compile-file-form (form) | |
| 2084 (let ((byte-compile-current-form nil) ; close over this for warnings. | |
| 2085 handler) | |
| 2086 (cond | |
| 2087 ((not (consp form)) | |
| 2088 (byte-compile-keep-pending form)) | |
| 2089 ((and (symbolp (car form)) | |
| 2090 (setq handler (get (car form) 'byte-hunk-handler))) | |
| 2091 (cond ((setq form (funcall handler form)) | |
| 2092 (byte-compile-flush-pending) | |
| 2093 (byte-compile-output-file-form form)))) | |
| 2094 ((eq form (setq form (macroexpand form byte-compile-macro-environment))) | |
| 2095 (byte-compile-keep-pending form)) | |
| 2096 (t | |
| 2097 (byte-compile-file-form form))))) | |
| 2098 | |
| 2099 ;; Functions and variables with doc strings must be output separately, | |
| 2100 ;; so make-docfile can recognize them. Most other things can be output | |
| 2101 ;; as byte-code. | |
| 2102 | |
| 2103 (put 'defsubst 'byte-hunk-handler 'byte-compile-file-form-defsubst) | |
| 2104 (defun byte-compile-file-form-defsubst (form) | |
| 2105 (cond ((assq (nth 1 form) byte-compile-unresolved-functions) | |
| 2106 (setq byte-compile-current-form (nth 1 form)) | |
| 2107 (byte-compile-warn "defsubst %s was used before it was defined" | |
| 2108 (nth 1 form)))) | |
| 2109 (byte-compile-file-form | |
| 2110 (macroexpand form byte-compile-macro-environment)) | |
| 2111 ;; Return nil so the form is not output twice. | |
| 2112 nil) | |
| 2113 | |
| 2114 (put 'autoload 'byte-hunk-handler 'byte-compile-file-form-autoload) | |
| 2115 (defun byte-compile-file-form-autoload (form) | |
| 2116 ;; | |
| 2117 ;; If this is an autoload of a macro, and all arguments are constants (that | |
| 2118 ;; is, there is no hairy computation going on here) then evaluate the form | |
| 2119 ;; at compile-time. This is so that we can make use of macros which we | |
| 2120 ;; have autoloaded from the file being compiled. Normal function autoloads | |
| 2121 ;; are not automatically evaluated at compile time, because there's not | |
| 2122 ;; much point to it (so why bother cluttering up the compile-time namespace.) | |
| 2123 ;; | |
| 2124 ;; If this is an autoload of a function, then record its definition in the | |
| 2125 ;; byte-compile-autoload-environment to suppress any `not known to be | |
| 2126 ;; defined' warnings at the end of this file (this only matters for | |
| 2127 ;; functions which are autoloaded and compiled in the same file, if the | |
| 2128 ;; autoload already exists in the compilation environment, we wouldn't have | |
| 2129 ;; warned anyway.) | |
| 2130 ;; | |
| 2131 (let* ((name (if (byte-compile-constp (nth 1 form)) | |
| 2132 (eval (nth 1 form)))) | |
| 2133 ;; In v19, the 5th arg to autoload can be t, nil, 'macro, or 'keymap. | |
| 2134 (macrop (and (byte-compile-constp (nth 5 form)) | |
| 2135 (memq (eval (nth 5 form)) '(t macro)))) | |
| 2136 ;; (functionp (and (byte-compile-constp (nth 5 form)) | |
| 2137 ;; (eq 'nil (eval (nth 5 form))))) | |
| 2138 ) | |
| 2139 (if (and macrop | |
| 2140 (let ((form form)) | |
| 2141 ;; all forms are constant | |
| 2142 (while (if (setq form (cdr form)) | |
| 2143 (byte-compile-constp (car form)))) | |
| 2144 (null form))) | |
| 440 | 2145 ;; eval the macro autoload into the compilation environment |
| 428 | 2146 (eval form)) |
| 2147 | |
| 2148 (if name | |
| 2149 (let ((old (assq name byte-compile-autoload-environment))) | |
| 2150 (cond (old | |
| 2151 (if (memq 'redefine byte-compile-warnings) | |
| 2152 (byte-compile-warn "multiple autoloads for %s" name)) | |
| 2153 (setcdr old form)) | |
| 2154 (t | |
| 2155 ;; We only use the names in the autoload environment, but | |
| 2156 ;; it might be useful to have the bodies some day. | |
| 2157 (setq byte-compile-autoload-environment | |
| 2158 (cons (cons name form) | |
| 2159 byte-compile-autoload-environment))))))) | |
| 2160 ;; | |
| 2161 ;; Now output the form. | |
| 2162 (if (stringp (nth 3 form)) | |
| 2163 form | |
| 2164 ;; No doc string, so we can compile this as a normal form. | |
| 2165 (byte-compile-keep-pending form 'byte-compile-normal-call))) | |
| 2166 | |
| 442 | 2167 (put 'defvar 'byte-hunk-handler 'byte-compile-file-form-defvar-or-defconst) |
| 2168 (put 'defconst 'byte-hunk-handler 'byte-compile-file-form-defvar-or-defconst) | |
| 2169 (defun byte-compile-file-form-defvar-or-defconst (form) | |
| 2170 ;; (defvar|defconst VAR [VALUE [DOCSTRING]]) | |
| 428 | 2171 (if (> (length form) 4) |
| 442 | 2172 (byte-compile-warn |
| 2173 "%s %s called with %d arguments, but accepts only %s" | |
| 2174 (car form) (nth 1 form) (length (cdr form)) 3)) | |
| 428 | 2175 (if (and (> (length form) 3) (not (stringp (nth 3 form)))) |
| 2176 (byte-compile-warn "Third arg to %s %s is not a string: %s" | |
| 2177 (car form) (nth 1 form) (nth 3 form))) | |
| 2178 (if (null (nth 3 form)) | |
| 2179 ;; Since there is no doc string, we can compile this as a normal form, | |
| 2180 ;; and not do a file-boundary. | |
| 2181 (byte-compile-keep-pending form) | |
| 2182 (if (memq 'free-vars byte-compile-warnings) | |
| 2183 (setq byte-compile-bound-variables | |
| 2184 (cons (cons (nth 1 form) byte-compile-global-bit) | |
| 2185 byte-compile-bound-variables))) | |
| 2186 (cond ((consp (nth 2 form)) | |
| 2187 (setq form (copy-sequence form)) | |
| 2188 (setcar (cdr (cdr form)) | |
| 2189 (byte-compile-top-level (nth 2 form) nil 'file)))) | |
| 2190 | |
| 2191 ;; The following turns out not to be necessary, since we emit a call to | |
| 2192 ;; defvar, which can hack Vfile_domain by itself! | |
| 2193 ;; | |
| 2194 ;; If a file domain has been set, emit (put 'VAR 'variable-domain ...) | |
| 2195 ;; after this defvar. | |
| 2196 ; (if byte-compile-file-domain | |
| 2197 ; (progn | |
| 2198 ; ;; Actually, this will emit the (put ...) before the (defvar ...) | |
| 2199 ; ;; but I don't think that can matter in this case. | |
| 2200 ; (byte-compile-keep-pending | |
| 2201 ; (list 'put (list 'quote (nth 1 form)) ''variable-domain | |
| 2202 ; (list 'quote byte-compile-file-domain))))) | |
| 2203 form)) | |
| 2204 | |
| 2205 (put 'require 'byte-hunk-handler 'byte-compile-file-form-eval-boundary) | |
| 2206 (defun byte-compile-file-form-eval-boundary (form) | |
| 2207 (eval form) | |
| 2208 (byte-compile-keep-pending form 'byte-compile-normal-call)) | |
| 2209 | |
|
4686
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
2210 ;; 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
|
2211 (put 'progn 'byte-hunk-handler |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
2212 #'(lambda (form) |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
2213 (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
|
2214 ;; 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
|
2215 nil)) |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
2216 |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
2217 (put 'prog1 'byte-hunk-handler |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
2218 #'(lambda (form) |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
2219 (when (first form) |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
2220 (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
|
2221 (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
|
2222 nil))) |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
2223 |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
2224 (put 'prog2 'byte-hunk-handler |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
2225 #'(lambda (form) |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
2226 (when (first form) |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
2227 (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
|
2228 (when (second form) |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
2229 (setq form (cdr form)) |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
2230 (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
|
2231 (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
|
2232 nil)))) |
| 428 | 2233 |
| 2234 ;; This handler is not necessary, but it makes the output from dont-compile | |
| 2235 ;; and similar macros cleaner. | |
| 2236 (put 'eval 'byte-hunk-handler 'byte-compile-file-form-eval) | |
| 2237 (defun byte-compile-file-form-eval (form) | |
| 2238 (if (eq (car-safe (nth 1 form)) 'quote) | |
| 2239 (nth 1 (nth 1 form)) | |
| 2240 (byte-compile-keep-pending form))) | |
| 2241 | |
| 2242 (put 'defun 'byte-hunk-handler 'byte-compile-file-form-defun) | |
| 2243 (defun byte-compile-file-form-defun (form) | |
| 2244 (byte-compile-file-form-defmumble form nil)) | |
| 2245 | |
| 2246 (put 'defmacro 'byte-hunk-handler 'byte-compile-file-form-defmacro) | |
| 2247 (defun byte-compile-file-form-defmacro (form) | |
| 2248 (byte-compile-file-form-defmumble form t)) | |
| 2249 | |
| 2250 (defun byte-compile-compiled-obj-to-list (obj) | |
| 2251 ;; #### this is fairly disgusting. Rewrite the code instead | |
| 2252 ;; so that it doesn't create compiled objects in the first place! | |
| 2253 ;; Much better than creating them and then "uncreating" them | |
| 2254 ;; like this. | |
| 2255 (read (concat "(" | |
| 2256 (substring (let ((print-readably t) | |
| 2257 (print-gensym | |
| 2258 (if (and byte-compile-print-gensym | |
| 2259 (not byte-compile-emacs19-compatibility)) | |
| 2260 '(t) nil)) | |
| 2261 (print-gensym-alist nil)) | |
| 2262 (prin1-to-string obj)) | |
| 2263 2 -1) | |
| 2264 ")"))) | |
| 2265 | |
| 2266 (defun byte-compile-file-form-defmumble (form macrop) | |
| 2267 (let* ((name (car (cdr form))) | |
| 2268 (this-kind (if macrop 'byte-compile-macro-environment | |
| 2269 'byte-compile-function-environment)) | |
| 2270 (that-kind (if macrop 'byte-compile-function-environment | |
| 2271 'byte-compile-macro-environment)) | |
| 2272 (this-one (assq name (symbol-value this-kind))) | |
| 2273 (that-one (assq name (symbol-value that-kind))) | |
| 2274 (byte-compile-free-references nil) | |
| 2275 (byte-compile-free-assignments nil)) | |
| 2276 | |
| 2277 ;; When a function or macro is defined, add it to the call tree so that | |
| 2278 ;; we can tell when functions are not used. | |
| 2279 (if byte-compile-generate-call-tree | |
| 2280 (or (assq name byte-compile-call-tree) | |
| 2281 (setq byte-compile-call-tree | |
| 2282 (cons (list name nil nil) byte-compile-call-tree)))) | |
| 2283 | |
| 2284 (setq byte-compile-current-form name) ; for warnings | |
| 2285 (when (memq 'redefine byte-compile-warnings) | |
| 2286 (byte-compile-arglist-warn form macrop)) | |
| 2287 (defvar filename) ; #### filename used free | |
| 2288 (when byte-compile-verbose | |
| 2289 (message "Compiling %s... (%s)" | |
| 2290 (if filename (file-name-nondirectory filename) "") | |
| 2291 (nth 1 form))) | |
| 2292 (cond (that-one | |
| 2293 (when (and (memq 'redefine byte-compile-warnings) | |
| 2294 ;; hack hack: don't warn when compiling the stubs in | |
| 2295 ;; bytecomp-runtime... | |
| 2296 (not (assq (nth 1 form) | |
| 2297 byte-compile-initial-macro-environment))) | |
| 2298 (byte-compile-warn | |
| 2299 "%s defined multiple times, as both function and macro" | |
| 2300 (nth 1 form))) | |
| 2301 (setcdr that-one nil)) | |
| 2302 (this-one | |
| 2303 (when (and (memq 'redefine byte-compile-warnings) | |
| 2304 ;; hack: don't warn when compiling the magic internal | |
| 2305 ;; byte-compiler macros in bytecomp-runtime.el... | |
| 2306 (not (assq (nth 1 form) | |
| 2307 byte-compile-initial-macro-environment))) | |
| 2308 (byte-compile-warn "%s %s defined multiple times in this file" | |
| 2309 (if macrop "macro" "function") | |
| 2310 (nth 1 form)))) | |
| 2311 ((and (fboundp name) | |
| 2312 (or (subrp (symbol-function name)) | |
| 2313 (eq (car-safe (symbol-function name)) | |
| 2314 (if macrop 'lambda 'macro)))) | |
| 2315 (if (memq 'redefine byte-compile-warnings) | |
| 2316 (byte-compile-warn "%s %s being redefined as a %s" | |
| 2317 (if (subrp (symbol-function name)) | |
| 2318 "subr" | |
| 2319 (if macrop "function" "macro")) | |
| 2320 (nth 1 form) | |
| 2321 (if macrop "macro" "function"))) | |
| 2322 ;; shadow existing definition | |
| 2323 (set this-kind | |
| 2324 (cons (cons name nil) (symbol-value this-kind))))) | |
| 2325 (let ((body (nthcdr 3 form))) | |
| 2326 (if (and (stringp (car body)) | |
| 2327 (symbolp (car-safe (cdr-safe body))) | |
| 2328 (car-safe (cdr-safe body)) | |
| 2329 (stringp (car-safe (cdr-safe (cdr-safe body))))) | |
| 2330 (byte-compile-warn "Probable `\"' without `\\' in doc string of %s" | |
| 2331 (nth 1 form)))) | |
| 2332 (let* ((new-one (byte-compile-lambda (cons 'lambda (nthcdr 2 form)))) | |
| 2333 (code (byte-compile-byte-code-maker new-one))) | |
| 2334 (if this-one | |
| 2335 (setcdr this-one new-one) | |
| 2336 (set this-kind | |
| 2337 (cons (cons name new-one) (symbol-value this-kind)))) | |
| 2338 (if (and (stringp (nth 3 form)) | |
| 2339 (eq 'quote (car-safe code)) | |
| 2340 (eq 'lambda (car-safe (nth 1 code)))) | |
| 2341 (cons (car form) | |
| 2342 (cons name (cdr (nth 1 code)))) | |
| 2343 (byte-compile-flush-pending) | |
| 2344 (if (not (stringp (nth 3 form))) | |
| 2345 ;; No doc string. Provide -1 as the "doc string index" | |
| 2346 ;; so that no element will be treated as a doc string. | |
| 2347 (byte-compile-output-docform | |
| 2348 "\n(defalias '" | |
| 2349 name | |
| 2350 (cond ((atom code) | |
| 2351 (if macrop '(" '(macro . #[" -1 "])") '(" #[" -1 "]"))) | |
| 2352 ((eq (car code) 'quote) | |
| 2353 (setq code new-one) | |
| 2354 (if macrop '(" '(macro " -1 ")") '(" '(" -1 ")"))) | |
| 2355 ((if macrop '(" (cons 'macro (" -1 "))") '(" (" -1 ")")))) | |
| 2356 ;; FSF just calls `(append code nil)' here but that relies | |
| 2357 ;; on horrible C kludges in concat() that accept byte- | |
| 2358 ;; compiled objects and pretend they're vectors. | |
| 2359 (if (compiled-function-p code) | |
| 2360 (byte-compile-compiled-obj-to-list code) | |
| 2361 (append code nil)) | |
| 2362 (and (atom code) byte-compile-dynamic | |
| 2363 1) | |
| 2364 nil) | |
| 2365 ;; Output the form by hand, that's much simpler than having | |
| 2366 ;; b-c-output-file-form analyze the defalias. | |
| 2367 (byte-compile-output-docform | |
| 2368 "\n(defalias '" | |
| 2369 name | |
| 2370 (cond ((atom code) ; compiled-function-p | |
| 2371 (if macrop '(" '(macro . #[" 4 "])") '(" #[" 4 "]"))) | |
| 2372 ((eq (car code) 'quote) | |
| 2373 (setq code new-one) | |
| 2374 (if macrop '(" '(macro " 2 ")") '(" '(" 2 ")"))) | |
| 2375 ((if macrop '(" (cons 'macro (" 5 "))") '(" (" 5 ")")))) | |
| 2376 ;; The result of byte-compile-byte-code-maker is either a | |
| 2377 ;; compiled-function object, or a list of some kind. If it's | |
| 2378 ;; not a cons, we must coerce it into a list of the elements | |
| 2379 ;; to be printed to the file. | |
| 2380 (if (consp code) | |
| 2381 code | |
| 2382 (nconc (list | |
| 2383 (compiled-function-arglist code) | |
| 2384 (compiled-function-instructions code) | |
| 2385 (compiled-function-constants code) | |
| 2386 (compiled-function-stack-depth code)) | |
| 2387 (let ((doc (documentation code t))) | |
| 2388 (if doc (list doc))) | |
| 2389 (if (commandp code) | |
| 2390 (list (nth 1 (compiled-function-interactive code)))))) | |
| 2391 (and (atom code) byte-compile-dynamic | |
| 2392 1) | |
| 2393 nil)) | |
| 2394 (princ ")" byte-compile-outbuffer) | |
| 2395 nil)))) | |
| 2396 | |
| 2397 ;; Print Lisp object EXP in the output file, inside a comment, | |
| 2398 ;; and return the file position it will have. | |
| 2399 ;; If QUOTED is non-nil, print with quoting; otherwise, print without quoting. | |
| 2400 (defun byte-compile-output-as-comment (exp quoted) | |
| 2401 (let ((position (point))) | |
| 2402 (set-buffer | |
| 2403 (prog1 (current-buffer) | |
| 2404 (set-buffer byte-compile-outbuffer) | |
| 2405 | |
| 2406 ;; Insert EXP, and make it a comment with #@LENGTH. | |
| 2407 (insert " ") | |
| 2408 (if quoted | |
| 2409 (prin1 exp byte-compile-outbuffer) | |
| 2410 (princ exp byte-compile-outbuffer)) | |
| 2411 (goto-char position) | |
| 2412 ;; Quote certain special characters as needed. | |
| 2413 ;; get_doc_string in doc.c does the unquoting. | |
| 2414 (while (search-forward "\^A" nil t) | |
| 2415 (replace-match "\^A\^A" t t)) | |
| 2416 (goto-char position) | |
| 2417 (while (search-forward "\000" nil t) | |
| 2418 (replace-match "\^A0" t t)) | |
| 2419 (goto-char position) | |
| 2420 (while (search-forward "\037" nil t) | |
| 2421 (replace-match "\^A_" t t)) | |
| 2422 (goto-char (point-max)) | |
| 2423 (insert "\037") | |
| 2424 (goto-char position) | |
| 2425 (insert "#@" (format "%d" (- (point-max) position))) | |
| 2426 | |
| 2427 ;; Save the file position of the object. | |
| 2428 ;; Note we should add 1 to skip the space | |
| 2429 ;; that we inserted before the actual doc string, | |
| 2430 ;; and subtract 1 to convert from an 1-origin Emacs position | |
| 2431 ;; to a file position; they cancel. | |
| 2432 (setq position (point)) | |
| 2433 (goto-char (point-max)))) | |
| 2434 position)) | |
| 2435 | |
| 2436 | |
| 2437 | |
| 2438 ;; The `domain' declaration. This is legal only at top-level in a file, and | |
| 2439 ;; should generally be the first form in the file. It is not legal inside | |
| 2440 ;; function bodies. | |
| 2441 | |
| 2442 (put 'domain 'byte-hunk-handler 'byte-compile-file-form-domain) | |
| 2443 (defun byte-compile-file-form-domain (form) | |
| 2444 (if (not (null (cdr (cdr form)))) | |
| 2445 (byte-compile-warn "domain used with too many arguments: %s" form)) | |
| 2446 (let ((domain (nth 1 form))) | |
| 2447 (or (null domain) | |
| 2448 (stringp domain) | |
| 2449 (progn | |
| 2450 (byte-compile-warn | |
| 2451 "argument to `domain' declaration must be a literal string: %s" | |
| 2452 form) | |
| 2453 (setq domain nil))) | |
| 2454 (setq byte-compile-file-domain domain)) | |
| 2455 (byte-compile-keep-pending form 'byte-compile-normal-call)) | |
| 2456 | |
| 2457 (defun byte-compile-domain (form) | |
| 2458 (byte-compile-warn "The `domain' declaration is legal only at top-level: %s" | |
| 2459 (let ((print-escape-newlines t) | |
| 2460 (print-level 4) | |
| 2461 (print-length 4)) | |
| 2462 (prin1-to-string form))) | |
| 2463 (byte-compile-normal-call | |
| 2464 (list 'signal ''error | |
| 2465 (list 'quote (list "`domain' used inside a function" form))))) | |
| 2466 | |
| 2467 ;; This is part of bytecomp.el in 19.35: | |
| 2468 (put 'custom-declare-variable 'byte-hunk-handler | |
| 2469 'byte-compile-file-form-custom-declare-variable) | |
| 2470 (defun byte-compile-file-form-custom-declare-variable (form) | |
| 4289 | 2471 ;; XEmacs change; our implementation byte compiles and gives warnings |
| 2472 ;; about the default value code, which GNU's doesn't. | |
| 2473 (let* ((quoted-default (car-safe (cdr-safe (cdr-safe form)))) | |
| 2474 (to-examine (car-safe (cdr-safe quoted-default)))) | |
| 2475 (if (memq 'free-vars byte-compile-warnings) | |
| 2476 (setq byte-compile-bound-variables | |
| 2477 (cons (cons (nth 1 (nth 1 form)) | |
| 2478 byte-compile-global-bit) | |
| 2479 byte-compile-bound-variables))) | |
| 2480 ;; Byte compile anything that smells like a lambda. I initially | |
| 2481 ;; considered limiting it to the :initialize, :set and :get args, but | |
| 2482 ;; that's not amazingly forward-compatible, and anyone expecting other | |
| 2483 ;; things to be stored as data, not code, is unrealistic. | |
| 2484 (loop | |
| 2485 for entry in-ref (nthcdr 4 form) | |
| 2486 do (cond ((and (eq 'function (car-safe entry)) | |
| 2487 (consp (car-safe (cdr-safe entry)))) | |
| 2488 (setf entry (copy-sequence entry)) | |
| 2489 (setcar (cdr entry) (byte-compile-lambda (car (cdr entry))))) | |
| 2490 ((and (eq 'lambda (car-safe entry))) | |
| 2491 (setf entry (byte-compile-lambda entry))))) | |
| 2492 ;; Byte compile the default value, as we do for defvar. | |
| 2493 (when (consp (cdr-safe to-examine)) | |
| 2494 (setq form (copy-sequence form)) | |
| 2495 (setcdr (third form) | |
| 2496 (list (byte-compile-top-level to-examine nil 'file))) | |
| 2497 ;; And save a value to be examined in the custom UI, if that differs | |
| 2498 ;; from the init value. | |
| 2499 (unless (equal to-examine (car-safe (cdr (third form)))) | |
| 4304 | 2500 (setcdr (third form) |
| 2501 (list (byte-compile-top-level | |
| 2502 ;; This is ugly. custom-declare-variable errors if | |
| 2503 ;; it's passed a keyword it doesn't know about, and | |
| 2504 ;; so to make this code run on 21.4, we add code to | |
| 2505 ;; modify the standard-value property to the | |
| 2506 ;; byte-compiled value for DEFAULT. | |
| 2507 `(prog2 (put ,(second form) 'standard-value | |
| 2508 '(,to-examine)) | |
| 2509 ,to-examine) | |
| 2510 nil 'file))))) | |
| 4289 | 2511 form)) |
| 428 | 2512 |
| 2513 ;;;###autoload | |
| 2514 (defun byte-compile (form) | |
| 2515 "If FORM is a symbol, byte-compile its function definition. | |
| 2516 If FORM is a lambda or a macro, byte-compile it as a function." | |
| 2517 (displaying-byte-compile-warnings | |
| 2518 (byte-compile-close-variables | |
| 2519 (let* ((fun (if (symbolp form) | |
| 2520 (and (fboundp form) (symbol-function form)) | |
| 2521 form)) | |
| 2522 (macro (eq (car-safe fun) 'macro))) | |
| 2523 (if macro | |
| 2524 (setq fun (cdr fun))) | |
| 2525 (cond ((eq (car-safe fun) 'lambda) | |
| 2526 (setq fun (if macro | |
| 2527 (cons 'macro (byte-compile-lambda fun)) | |
| 2528 (byte-compile-lambda fun))) | |
| 2529 (if (symbolp form) | |
| 2530 (defalias form fun) | |
| 2531 fun))))))) | |
| 2532 | |
| 2533 ;;;###autoload | |
| 2534 (defun byte-compile-sexp (sexp &optional msg) | |
| 2535 "Compile and return SEXP." | |
| 2536 (displaying-byte-compile-warnings | |
| 2537 (byte-compile-close-variables | |
| 2538 (prog1 | |
| 2539 (byte-compile-top-level sexp) | |
| 2540 (byte-compile-warn-about-unresolved-functions msg))))) | |
| 2541 | |
| 2542 ;; Given a function made by byte-compile-lambda, make a form which produces it. | |
| 2543 (defun byte-compile-byte-code-maker (fun) | |
| 2544 (cond | |
| 2545 ;; ## atom is faster than compiled-func-p. | |
| 2546 ((atom fun) ; compiled-function-p | |
| 2547 fun) | |
| 2548 ;; b-c-lambda didn't produce a compiled-function, so it must be a trivial | |
| 2549 ;; function. | |
| 2550 ((let (tmp) | |
| 2551 (if (and (setq tmp (assq 'byte-code (cdr-safe (cdr fun)))) | |
| 2552 (null (cdr (memq tmp fun)))) | |
| 2553 ;; Generate a make-byte-code call. | |
| 2554 (let* ((interactive (assq 'interactive (cdr (cdr fun))))) | |
| 2555 (nconc (list 'make-byte-code | |
| 2556 (list 'quote (nth 1 fun)) ;arglist | |
| 2557 (nth 1 tmp) ;instructions | |
| 2558 (nth 2 tmp) ;constants | |
| 2559 (nth 3 tmp)) ;stack-depth | |
| 2560 (cond ((stringp (nth 2 fun)) | |
| 2561 (list (nth 2 fun))) ;docstring | |
| 2562 (interactive | |
| 2563 (list nil))) | |
| 2564 (cond (interactive | |
| 2565 (list (if (or (null (nth 1 interactive)) | |
| 2566 (stringp (nth 1 interactive))) | |
| 2567 (nth 1 interactive) | |
| 2568 ;; Interactive spec is a list or a variable | |
| 2569 ;; (if it is correct). | |
| 2570 (list 'quote (nth 1 interactive)))))))) | |
| 2571 ;; a non-compiled function (probably trivial) | |
| 2572 (list 'quote fun)))))) | |
| 2573 | |
| 2574 ;; Byte-compile a lambda-expression and return a valid function. | |
| 2575 ;; The value is usually a compiled function but may be the original | |
| 2576 ;; lambda-expression. | |
| 2577 (defun byte-compile-lambda (fun) | |
| 2578 (or (eq 'lambda (car-safe fun)) | |
| 2579 (error "not a lambda -- %s" (prin1-to-string fun))) | |
| 2580 (let* ((arglist (nth 1 fun)) | |
| 2581 (byte-compile-bound-variables | |
| 2582 (let ((new-bindings | |
| 2583 (mapcar #'(lambda (x) (cons x byte-compile-arglist-bit)) | |
| 2584 (and (memq 'free-vars byte-compile-warnings) | |
| 2585 (delq '&rest (delq '&optional | |
| 2586 (copy-sequence arglist))))))) | |
| 2587 (nconc new-bindings | |
| 2588 (cons 'new-scope byte-compile-bound-variables)))) | |
| 2589 (body (cdr (cdr fun))) | |
| 2590 (doc (if (stringp (car body)) | |
| 2591 (prog1 (car body) | |
| 1548 | 2592 ;; Discard the doc string |
| 2593 ;; only if it is not the only element of the body. | |
| 2594 (if (cdr body) | |
| 2595 (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
|
2596 (int (assq 'interactive body)) compiled-int) |
| 428 | 2597 (dolist (arg arglist) |
| 2598 (cond ((not (symbolp arg)) | |
| 2599 (byte-compile-warn "non-symbol in arglist: %S" arg)) | |
| 2600 ((byte-compile-constant-symbol-p arg) | |
| 2601 (byte-compile-warn "constant symbol in arglist: %s" arg)) | |
| 2602 ((and (char= ?\& (aref (symbol-name arg) 0)) | |
| 2603 (not (eq arg '&optional)) | |
| 2604 (not (eq arg '&rest))) | |
| 2605 (byte-compile-warn "unrecognized `&' keyword in arglist: %s" | |
| 2606 arg)))) | |
| 2607 (cond (int | |
| 2608 ;; Skip (interactive) if it is in front (the most usual location). | |
| 2609 (if (eq int (car body)) | |
| 2610 (setq body (cdr body))) | |
| 2611 (cond ((consp (cdr int)) | |
| 2612 (if (cdr (cdr int)) | |
| 2613 (byte-compile-warn "malformed interactive spec: %s" | |
| 2614 (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
|
2615 ;; 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
|
2616 ;; 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
|
2617 ;; 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
|
2618 ;; 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
|
2619 ;; useful for warnings. |
| 428 | 2620 (let ((form (nth 1 int))) |
| 2621 (while (or (eq (car-safe form) 'let) | |
| 2622 (eq (car-safe form) 'let*) | |
| 2623 (eq (car-safe form) 'save-excursion)) | |
| 2624 (while (consp (cdr form)) | |
| 2625 (setq form (cdr form))) | |
| 2626 (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
|
2627 (setq compiled-int |
|
7757334005ae
bytecomp.el: always check code in (interactive SEXP) for sanity
Aidan Kehoe <kehoea@parhasard.net>
parents:
4623
diff
changeset
|
2628 (byte-compile-top-level (nth 1 int))) |
| 428 | 2629 (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
|
2630 (setq int (list 'interactive compiled-int))))) |
| 428 | 2631 ((cdr int) |
| 2632 (byte-compile-warn "malformed interactive spec: %s" | |
| 2633 (prin1-to-string int)))))) | |
| 2634 (let ((compiled (byte-compile-top-level (cons 'progn body) nil 'lambda))) | |
| 2635 (if (memq 'unused-vars byte-compile-warnings) | |
| 2636 ;; done compiling in this scope, warn now. | |
| 2637 (byte-compile-warn-about-unused-variables)) | |
| 2638 (if (eq 'byte-code (car-safe compiled)) | |
| 2639 (apply 'make-byte-code | |
| 2640 (append (list arglist) | |
| 2641 ;; byte-string, constants-vector, stack depth | |
| 2642 (cdr compiled) | |
| 2643 ;; optionally, the doc string. | |
| 2644 (if (or doc int) | |
| 2645 (list doc)) | |
| 2646 ;; optionally, the interactive spec. | |
| 2647 (if int | |
| 2648 (list (nth 1 int))))) | |
| 2649 (setq compiled | |
| 2650 (nconc (if int (list int)) | |
| 2651 (cond ((eq (car-safe compiled) 'progn) (cdr compiled)) | |
| 2652 (compiled (list compiled))))) | |
| 2653 (nconc (list 'lambda arglist) | |
| 2654 (if (or doc (stringp (car compiled))) | |
| 2655 (cons doc (cond (compiled) | |
| 2656 (body (list nil)))) | |
| 2657 compiled)))))) | |
| 2658 | |
| 2659 (defun byte-compile-constants-vector () | |
| 2660 ;; Builds the constants-vector from the current variables and constants. | |
| 2661 ;; This modifies the constants from (const . nil) to (const . offset). | |
| 2662 ;; To keep the byte-codes to look up the vector as short as possible: | |
| 2663 ;; First 6 elements are vars, as there are one-byte varref codes for those. | |
| 2664 ;; Next up to byte-constant-limit are constants, still with one-byte codes. | |
| 2665 ;; Next variables again, to get 2-byte codes for variable lookup. | |
| 2666 ;; The rest of the constants and variables need 3-byte byte-codes. | |
| 2667 (let* ((i -1) | |
| 2668 (rest (nreverse byte-compile-variables)) ; nreverse because the first | |
| 2669 (other (nreverse byte-compile-constants)) ; vars often are used most. | |
| 2670 ret tmp | |
| 2671 (limits '(5 ; Use the 1-byte varref codes, | |
| 2672 63 ; 1-constlim ; 1-byte byte-constant codes, | |
| 2673 255 ; 2-byte varref codes, | |
| 2674 65535)) ; 3-byte codes for the rest. | |
| 2675 limit) | |
| 2676 (while (or rest other) | |
| 2677 (setq limit (car limits)) | |
| 2678 (while (and rest (not (eq i limit))) | |
| 2679 (if (setq tmp (assq (car (car rest)) ret)) | |
| 2680 (setcdr (car rest) (cdr tmp)) | |
| 2681 (setcdr (car rest) (setq i (1+ i))) | |
| 2682 (setq ret (cons (car rest) ret))) | |
| 2683 (setq rest (cdr rest))) | |
| 2684 (setq limits (cdr limits) | |
| 2685 rest (prog1 other | |
| 2686 (setq other rest)))) | |
| 2687 (apply 'vector (nreverse (mapcar 'car ret))))) | |
| 2688 | |
| 2689 ;; Given an expression FORM, compile it and return an equivalent byte-code | |
| 2690 ;; expression (a call to the function byte-code). | |
| 2691 (defun byte-compile-top-level (form &optional for-effect output-type) | |
| 2692 ;; OUTPUT-TYPE advises about how form is expected to be used: | |
| 2693 ;; 'eval or nil -> a single form, | |
| 2694 ;; 'progn or t -> a list of forms, | |
| 2695 ;; 'lambda -> body of a lambda, | |
| 2696 ;; 'file -> used at file-level. | |
| 2697 (let ((byte-compile-constants nil) | |
| 2698 (byte-compile-variables nil) | |
| 2699 (byte-compile-tag-number 0) | |
| 2700 (byte-compile-depth 0) | |
| 2701 (byte-compile-maxdepth 0) | |
| 2702 (byte-compile-output nil)) | |
| 2703 (if (memq byte-optimize '(t source)) | |
| 2704 (setq form (byte-optimize-form form for-effect))) | |
| 2705 (while (and (eq (car-safe form) 'progn) (null (cdr (cdr form)))) | |
| 2706 (setq form (nth 1 form))) | |
| 2707 (if (and (eq 'byte-code (car-safe form)) | |
| 2708 (not (memq byte-optimize '(t byte))) | |
| 2709 (stringp (nth 1 form)) | |
| 2710 (vectorp (nth 2 form)) | |
| 2711 (natnump (nth 3 form))) | |
| 2712 form | |
| 2713 (byte-compile-form form for-effect) | |
| 2714 (byte-compile-out-toplevel for-effect output-type)))) | |
| 2715 | |
| 2716 (defun byte-compile-out-toplevel (&optional for-effect output-type) | |
| 2717 (if for-effect | |
| 2718 ;; The stack is empty. Push a value to be returned from (byte-code ..). | |
| 2719 (if (eq (car (car byte-compile-output)) 'byte-discard) | |
| 2720 (setq byte-compile-output (cdr byte-compile-output)) | |
| 2721 (byte-compile-push-constant | |
| 2722 ;; Push any constant - preferably one which already is used, and | |
| 2723 ;; a number or symbol - ie not some big sequence. The return value | |
| 2724 ;; isn't returned, but it would be a shame if some textually large | |
| 2725 ;; constant was not optimized away because we chose to return it. | |
| 2726 (and (not (assq nil byte-compile-constants)) ; Nil is often there. | |
| 2727 (let ((tmp (reverse byte-compile-constants))) | |
| 2728 (while (and tmp (not (or (symbolp (car (car tmp))) | |
| 2729 (numberp (car (car tmp)))))) | |
| 2730 (setq tmp (cdr tmp))) | |
| 2731 (car (car tmp))))))) | |
| 2732 (byte-compile-out 'byte-return 0) | |
| 2733 (setq byte-compile-output (nreverse byte-compile-output)) | |
| 2734 (if (memq byte-optimize '(t byte)) | |
| 2735 (setq byte-compile-output | |
| 2736 (byte-optimize-lapcode byte-compile-output for-effect))) | |
| 2737 | |
| 2738 ;; Decompile trivial functions: | |
| 2739 ;; only constants and variables, or a single funcall except in lambdas. | |
| 2740 ;; Except for Lisp_Compiled objects, forms like (foo "hi") | |
| 2741 ;; are still quicker than (byte-code "..." [foo "hi"] 2). | |
| 2742 ;; Note that even (quote foo) must be parsed just as any subr by the | |
| 2743 ;; interpreter, so quote should be compiled into byte-code in some contexts. | |
| 2744 ;; What to leave uncompiled: | |
| 2745 ;; lambda -> never. we used to leave it uncompiled if the body was | |
| 2746 ;; a single atom, but that causes confusion if the docstring | |
| 2747 ;; uses the (file . pos) syntax. Besides, now that we have | |
| 2748 ;; the Lisp_Compiled type, the compiled form is faster. | |
| 2749 ;; eval -> atom, quote or (function atom atom atom) | |
| 2750 ;; progn -> as <<same-as-eval>> or (progn <<same-as-eval>> atom) | |
| 2751 ;; file -> as progn, but takes both quotes and atoms, and longer forms. | |
| 2752 (let (rest | |
| 2753 (maycall (not (eq output-type 'lambda))) ; t if we may make a funcall. | |
| 2754 tmp body) | |
| 2755 (cond | |
| 2756 ;; #### This should be split out into byte-compile-nontrivial-function-p. | |
| 2757 ((or (eq output-type 'lambda) | |
| 2758 (nthcdr (if (eq output-type 'file) 50 8) byte-compile-output) | |
| 2759 (assq 'TAG byte-compile-output) ; Not necessary, but speeds up a bit. | |
| 2760 (not (setq tmp (assq 'byte-return byte-compile-output))) | |
| 2761 (progn | |
| 2762 (setq rest (nreverse | |
| 2763 (cdr (memq tmp (reverse byte-compile-output))))) | |
| 2764 (while (cond | |
| 2765 ((memq (car (car rest)) '(byte-varref byte-constant)) | |
| 2766 (setq tmp (car (cdr (car rest)))) | |
| 2767 (if (if (eq (car (car rest)) 'byte-constant) | |
| 2768 (or (consp tmp) | |
| 2769 (and (symbolp tmp) | |
| 2770 (not (byte-compile-constant-symbol-p tmp))))) | |
| 2771 (if maycall | |
| 2772 (setq body (cons (list 'quote tmp) body))) | |
| 2773 (setq body (cons tmp body)))) | |
| 2774 ((and maycall | |
| 2775 ;; Allow a funcall if at most one atom follows it. | |
| 2776 (null (nthcdr 3 rest)) | |
| 2777 (setq tmp | |
| 2778 ;; XEmacs change for rms funs | |
| 2779 (or (and | |
| 2780 (byte-compile-version-cond | |
| 2781 byte-compile-emacs19-compatibility) | |
| 2782 (get (car (car rest)) | |
| 2783 'byte-opcode19-invert)) | |
| 2784 (get (car (car rest)) | |
| 2785 'byte-opcode-invert))) | |
| 2786 (or (null (cdr rest)) | |
| 2787 (and (memq output-type '(file progn t)) | |
| 2788 (cdr (cdr rest)) | |
| 2789 (eq (car (nth 1 rest)) 'byte-discard) | |
| 2790 (progn (setq rest (cdr rest)) t)))) | |
| 2791 (setq maycall nil) ; Only allow one real function call. | |
| 2792 (setq body (nreverse body)) | |
| 2793 (setq body (list | |
| 2794 (if (and (eq tmp 'funcall) | |
| 2795 (eq (car-safe (car body)) 'quote)) | |
| 2796 (cons (nth 1 (car body)) (cdr body)) | |
| 2797 (cons tmp body)))) | |
| 2798 (or (eq output-type 'file) | |
| 2799 (not (delq nil (mapcar 'consp (cdr (car body)))))))) | |
| 2800 (setq rest (cdr rest))) | |
| 2801 rest)) | |
| 2802 (let ((byte-compile-vector (byte-compile-constants-vector))) | |
| 2803 (list 'byte-code (byte-compile-lapcode byte-compile-output) | |
| 2804 byte-compile-vector byte-compile-maxdepth))) | |
| 2805 ;; it's a trivial function | |
| 2806 ((cdr body) (cons 'progn (nreverse body))) | |
| 2807 ((car body))))) | |
| 2808 | |
| 2809 ;; Given BODY, compile it and return a new body. | |
| 2810 (defun byte-compile-top-level-body (body &optional for-effect) | |
| 2811 (setq body (byte-compile-top-level (cons 'progn body) for-effect t)) | |
| 2812 (cond ((eq (car-safe body) 'progn) | |
| 2813 (cdr body)) | |
| 2814 (body | |
| 2815 (list body)))) | |
| 2816 | |
| 2817 ;; This is the recursive entry point for compiling each subform of an | |
| 2818 ;; expression. | |
| 2819 ;; If for-effect is non-nil, byte-compile-form will output a byte-discard | |
| 2820 ;; before terminating (ie. no value will be left on the stack). | |
| 2821 ;; A byte-compile handler may, when for-effect is non-nil, choose output code | |
| 2822 ;; which does not leave a value on the stack, and then set for-effect to nil | |
| 2823 ;; (to prevent byte-compile-form from outputting the byte-discard). | |
| 2824 ;; If a handler wants to call another handler, it should do so via | |
| 2825 ;; byte-compile-form, or take extreme care to handle for-effect correctly. | |
| 2826 ;; (Use byte-compile-form-do-effect to reset the for-effect flag too.) | |
| 2827 ;; | |
| 2828 (defun byte-compile-form (form &optional for-effect) | |
| 2829 (setq form (macroexpand form byte-compile-macro-environment)) | |
| 2830 (cond ((not (consp form)) | |
| 2831 (cond ((or (not (symbolp form)) | |
| 2832 (byte-compile-constant-symbol-p form)) | |
| 2833 (byte-compile-constant form)) | |
| 2834 ((and for-effect byte-compile-delete-errors) | |
| 2835 (setq for-effect nil)) | |
| 2836 (t (byte-compile-variable-ref 'byte-varref form)))) | |
| 2837 ((symbolp (car form)) | |
| 2838 (let* ((fn (car form)) | |
| 2839 (handler (get fn 'byte-compile))) | |
| 2840 (if (memq fn '(t nil)) | |
| 2841 (byte-compile-warn "%s called as a function" fn)) | |
| 2842 (if (and handler | |
| 2843 (or (not (byte-compile-version-cond | |
| 2844 byte-compile-emacs19-compatibility)) | |
| 2845 (not (get (get fn 'byte-opcode) 'emacs20-opcode)))) | |
| 2846 (funcall handler form) | |
| 2847 (if (memq 'callargs byte-compile-warnings) | |
| 2848 (byte-compile-callargs-warn form)) | |
| 2849 (byte-compile-normal-call form)))) | |
| 2850 ((and (or (compiled-function-p (car form)) | |
| 2851 (eq (car-safe (car form)) 'lambda)) | |
| 2852 ;; if the form comes out the same way it went in, that's | |
| 2853 ;; because it was malformed, and we couldn't unfold it. | |
| 2854 (not (eq form (setq form (byte-compile-unfold-lambda form))))) | |
| 2855 (byte-compile-form form for-effect) | |
| 2856 (setq for-effect nil)) | |
| 2857 ((byte-compile-normal-call form))) | |
| 2858 (when for-effect | |
| 2859 (byte-compile-discard))) | |
| 2860 | |
| 2861 (defun byte-compile-normal-call (form) | |
| 2862 (if byte-compile-generate-call-tree | |
| 2863 (byte-compile-annotate-call-tree form)) | |
| 2864 (byte-compile-push-constant (car form)) | |
|
4783
e29fcfd8df5f
Eliminate most core code byte-compile warnings.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4775
diff
changeset
|
2865 (mapc 'byte-compile-form (cdr form)) ; wasteful, but faster. |
| 428 | 2866 (byte-compile-out 'byte-call (length (cdr form)))) |
| 2867 | |
| 2868 ;; kludge added to XEmacs to work around the bogosities of a nonlexical lisp. | |
| 2869 (or (fboundp 'globally-boundp) (fset 'globally-boundp 'boundp)) | |
| 2870 | |
| 2871 (defun byte-compile-variable-ref (base-op var &optional varbind-flags) | |
| 2872 (if (or (not (symbolp var)) (byte-compile-constant-symbol-p var)) | |
| 2873 (byte-compile-warn | |
| 2874 (case base-op | |
| 2875 (byte-varref "Variable reference to %s %s") | |
| 2876 (byte-varset "Attempt to set %s %s") | |
| 2877 (byte-varbind "Attempt to let-bind %s %s")) | |
| 2878 (if (symbolp var) "constant symbol" "non-symbol") | |
| 2879 var) | |
| 2880 (if (and (get var 'byte-obsolete-variable) | |
| 2881 (memq 'obsolete byte-compile-warnings)) | |
| 2882 (let ((ob (get var 'byte-obsolete-variable))) | |
| 2883 (byte-compile-warn "%s is an obsolete variable; %s" var | |
| 2884 (if (stringp ob) | |
| 2885 ob | |
| 2886 (format "use %s instead." ob))))) | |
| 2887 (if (and (get var 'byte-compatible-variable) | |
| 2888 (memq 'pedantic byte-compile-warnings)) | |
| 2889 (let ((ob (get var 'byte-compatible-variable))) | |
| 2890 (byte-compile-warn "%s is provided for compatibility; %s" var | |
| 2891 (if (stringp ob) | |
| 2892 ob | |
| 2893 (format "use %s instead." ob))))) | |
| 2894 (if (memq 'free-vars byte-compile-warnings) | |
| 2895 (if (eq base-op 'byte-varbind) | |
| 2896 (setq byte-compile-bound-variables | |
| 2897 (cons (cons var (or varbind-flags 0)) | |
| 2898 byte-compile-bound-variables)) | |
| 2899 (or (globally-boundp var) | |
| 2900 (let ((cell (assq var byte-compile-bound-variables))) | |
| 2901 (if cell (setcdr cell | |
| 2902 (logior (cdr cell) | |
| 2903 (if (eq base-op 'byte-varset) | |
| 2904 byte-compile-assigned-bit | |
| 2905 byte-compile-referenced-bit))))) | |
| 444 | 2906 (and (boundp 'current-load-list) |
| 2907 (memq var current-load-list)) | |
| 428 | 2908 (if (eq base-op 'byte-varset) |
| 2909 (or (memq var byte-compile-free-assignments) | |
| 2910 (progn | |
| 2911 (byte-compile-warn "assignment to free variable %s" | |
| 2912 var) | |
| 2913 (setq byte-compile-free-assignments | |
| 2914 (cons var byte-compile-free-assignments)))) | |
| 2915 (or (memq var byte-compile-free-references) | |
| 2916 (progn | |
| 2917 (byte-compile-warn "reference to free variable %s" var) | |
| 2918 (setq byte-compile-free-references | |
| 2919 (cons var byte-compile-free-references))))))))) | |
| 2920 (let ((tmp (assq var byte-compile-variables))) | |
| 2921 (or tmp | |
| 2922 (setq tmp (list var) | |
| 2923 byte-compile-variables (cons tmp byte-compile-variables))) | |
| 2924 (byte-compile-out base-op tmp))) | |
| 2925 | |
| 2926 (defmacro byte-compile-get-constant (const) | |
| 2927 `(or (if (stringp ,const) | |
| 2928 (assoc ,const byte-compile-constants) | |
| 2929 (assq ,const byte-compile-constants)) | |
| 2930 (car (setq byte-compile-constants | |
| 2931 (cons (list ,const) byte-compile-constants))))) | |
| 2932 | |
| 2933 ;; Use this when the value of a form is a constant. This obeys for-effect. | |
| 2934 (defun byte-compile-constant (const) | |
| 2935 (if for-effect | |
| 2936 (setq for-effect nil) | |
| 2937 (byte-compile-out 'byte-constant (byte-compile-get-constant const)))) | |
| 2938 | |
| 2939 ;; Use this for a constant that is not the value of its containing form. | |
| 2940 ;; This ignores for-effect. | |
| 2941 (defun byte-compile-push-constant (const) | |
| 2942 (let ((for-effect nil)) | |
| 2943 (inline (byte-compile-constant const)))) | |
| 2944 | |
| 2945 | |
| 2946 ;; Compile those primitive ordinary functions | |
| 2947 ;; which have special byte codes just for speed. | |
| 2948 | |
| 2949 (defmacro byte-defop-compiler (function &optional compile-handler) | |
| 2950 ;; add a compiler-form for FUNCTION. | |
| 446 | 2951 ;; If FUNCTION is a symbol, then the variable "byte-SYMBOL" must name |
| 2952 ;; the opcode to be used. If is a list, the first element | |
| 428 | 2953 ;; is the function and the second element is the bytecode-symbol. |
| 2954 ;; COMPILE-HANDLER is the function to use to compile this byte-op, or | |
| 2955 ;; may be the abbreviations 0, 1, 2, 3, 0-1, 1-2, 2-3, 0+1, 1+1, 2+1, | |
| 2956 ;; 0-1+1, 1-2+1, 2-3+1, 0+2, or 1+2. If it is nil, then the handler is | |
| 2957 ;; "byte-compile-SYMBOL." | |
| 2958 (let (opcode) | |
| 2959 (if (symbolp function) | |
| 2960 (setq opcode (intern (concat "byte-" (symbol-name function)))) | |
| 2961 (setq opcode (car (cdr function)) | |
| 2962 function (car function))) | |
| 2963 (let ((fnform | |
| 2964 (list 'put (list 'quote function) ''byte-compile | |
| 2965 (list 'quote | |
| 2966 (or (cdr (assq compile-handler | |
| 2967 '((0 . byte-compile-no-args) | |
| 2968 (1 . byte-compile-one-arg) | |
| 2969 (2 . byte-compile-two-args) | |
| 2970 (3 . byte-compile-three-args) | |
| 2971 (0-1 . byte-compile-zero-or-one-arg) | |
| 2972 (1-2 . byte-compile-one-or-two-args) | |
| 2973 (2-3 . byte-compile-two-or-three-args) | |
| 2974 (0+1 . byte-compile-no-args-with-one-extra) | |
| 2975 (1+1 . byte-compile-one-arg-with-one-extra) | |
| 2976 (2+1 . byte-compile-two-args-with-one-extra) | |
| 2977 (0-1+1 . byte-compile-zero-or-one-arg-with-one-extra) | |
| 2978 (1-2+1 . byte-compile-one-or-two-args-with-one-extra) | |
| 2979 (2-3+1 . byte-compile-two-or-three-args-with-one-extra) | |
| 2980 (0+2 . byte-compile-no-args-with-two-extra) | |
| 2981 (1+2 . byte-compile-one-arg-with-two-extra) | |
| 2982 | |
| 2983 ))) | |
| 2984 compile-handler | |
| 2985 (intern (concat "byte-compile-" | |
| 2986 (symbol-name function)))))))) | |
| 2987 (if opcode | |
| 2988 (list 'progn fnform | |
| 2989 (list 'put (list 'quote function) | |
| 2990 ''byte-opcode (list 'quote opcode)) | |
| 2991 (list 'put (list 'quote opcode) | |
| 2992 ''byte-opcode-invert (list 'quote function))) | |
| 2993 fnform)))) | |
| 2994 | |
| 2995 (defmacro byte-defop-compiler20 (function &optional compile-handler) | |
| 2996 ;; Just like byte-defop-compiler, but defines an opcode that will only | |
| 2997 ;; be used when byte-compile-emacs19-compatibility is false. | |
| 2998 (if (and (byte-compile-single-version) | |
| 2999 byte-compile-emacs19-compatibility) | |
| 3000 ;; #### instead of doing nothing, this should do some remprops, | |
| 3001 ;; #### to protect against the case where a single-version compiler | |
| 3002 ;; #### is loaded into a world that has contained a multi-version one. | |
| 3003 nil | |
| 3004 (list 'progn | |
| 3005 (list 'put | |
| 3006 (list 'quote | |
| 3007 (or (car (cdr-safe function)) | |
| 3008 (intern (concat "byte-" | |
| 3009 (symbol-name (or (car-safe function) function)))))) | |
| 3010 ''emacs20-opcode t) | |
| 3011 (list 'byte-defop-compiler function compile-handler)))) | |
| 3012 | |
| 3013 ;; XEmacs addition: | |
| 3014 (defmacro byte-defop-compiler-rmsfun (function &optional compile-handler) | |
| 3015 ;; for functions like `eq' that compile into different opcodes depending | |
| 3016 ;; on the Emacs version: byte-old-eq for v19, byte-eq for v20. | |
| 3017 (let ((opcode (intern (concat "byte-" (symbol-name function)))) | |
| 3018 (opcode19 (intern (concat "byte-old-" (symbol-name function)))) | |
| 3019 (fnform | |
| 3020 (list 'put (list 'quote function) ''byte-compile | |
| 3021 (list 'quote | |
| 3022 (or (cdr (assq compile-handler | |
| 3023 '((2 . byte-compile-two-args-19->20) | |
| 3024 ))) | |
| 3025 compile-handler | |
| 3026 (intern (concat "byte-compile-" | |
| 3027 (symbol-name function)))))))) | |
| 3028 (list 'progn fnform | |
| 3029 (list 'put (list 'quote function) | |
| 3030 ''byte-opcode (list 'quote opcode)) | |
| 3031 (list 'put (list 'quote function) | |
| 3032 ''byte-opcode19 (list 'quote opcode19)) | |
| 3033 (list 'put (list 'quote opcode) | |
| 3034 ''byte-opcode-invert (list 'quote function)) | |
| 3035 (list 'put (list 'quote opcode19) | |
| 3036 ''byte-opcode19-invert (list 'quote function))))) | |
| 3037 | |
| 3038 (defmacro byte-defop-compiler-1 (function &optional compile-handler) | |
| 3039 (list 'byte-defop-compiler (list function nil) compile-handler)) | |
| 3040 | |
| 3041 | |
| 3042 (put 'byte-call 'byte-opcode-invert 'funcall) | |
| 3043 (put 'byte-list1 'byte-opcode-invert 'list) | |
| 3044 (put 'byte-list2 'byte-opcode-invert 'list) | |
| 3045 (put 'byte-list3 'byte-opcode-invert 'list) | |
| 3046 (put 'byte-list4 'byte-opcode-invert 'list) | |
| 3047 (put 'byte-listN 'byte-opcode-invert 'list) | |
| 3048 (put 'byte-concat2 'byte-opcode-invert 'concat) | |
| 3049 (put 'byte-concat3 'byte-opcode-invert 'concat) | |
| 3050 (put 'byte-concat4 'byte-opcode-invert 'concat) | |
| 3051 (put 'byte-concatN 'byte-opcode-invert 'concat) | |
| 3052 (put 'byte-insertN 'byte-opcode-invert 'insert) | |
| 3053 | |
| 3054 ;; How old is this stuff? -slb | |
| 3055 ;(byte-defop-compiler (dot byte-point) 0+1) | |
| 3056 ;(byte-defop-compiler (dot-max byte-point-max) 0+1) | |
| 3057 ;(byte-defop-compiler (dot-min byte-point-min) 0+1) | |
| 3058 (byte-defop-compiler point 0+1) | |
| 3059 (byte-defop-compiler-rmsfun eq 2) | |
| 3060 (byte-defop-compiler point-max 0+1) | |
| 3061 (byte-defop-compiler point-min 0+1) | |
| 3062 (byte-defop-compiler following-char 0+1) | |
| 3063 (byte-defop-compiler preceding-char 0+1) | |
| 3064 (byte-defop-compiler current-column 0+1) | |
| 3065 ;; FSF has special function here; generalized here by the 1+2 stuff. | |
| 3066 (byte-defop-compiler (indent-to-column byte-indent-to) 1+2) | |
| 3067 (byte-defop-compiler indent-to 1+2) | |
| 3068 (byte-defop-compiler-rmsfun equal 2) | |
| 3069 (byte-defop-compiler eolp 0+1) | |
| 3070 (byte-defop-compiler eobp 0+1) | |
| 3071 (byte-defop-compiler bolp 0+1) | |
| 3072 (byte-defop-compiler bobp 0+1) | |
| 3073 (byte-defop-compiler current-buffer 0) | |
| 3074 ;;(byte-defop-compiler read-char 0) ;; obsolete | |
| 3075 (byte-defop-compiler-rmsfun memq 2) | |
| 3076 (byte-defop-compiler interactive-p 0) | |
| 3077 (byte-defop-compiler widen 0+1) | |
| 3078 (byte-defop-compiler end-of-line 0-1+1) | |
| 3079 (byte-defop-compiler forward-char 0-1+1) | |
| 3080 (byte-defop-compiler forward-line 0-1+1) | |
| 3081 (byte-defop-compiler symbolp 1) | |
| 3082 (byte-defop-compiler consp 1) | |
| 3083 (byte-defop-compiler stringp 1) | |
| 3084 (byte-defop-compiler listp 1) | |
| 3085 (byte-defop-compiler not 1) | |
| 3086 (byte-defop-compiler (null byte-not) 1) | |
| 3087 (byte-defop-compiler car 1) | |
| 3088 (byte-defop-compiler cdr 1) | |
| 3089 (byte-defop-compiler length 1) | |
| 3090 (byte-defop-compiler symbol-value 1) | |
| 3091 (byte-defop-compiler symbol-function 1) | |
| 3092 (byte-defop-compiler (1+ byte-add1) 1) | |
| 3093 (byte-defop-compiler (1- byte-sub1) 1) | |
| 3094 (byte-defop-compiler goto-char 1+1) | |
| 3095 (byte-defop-compiler char-after 0-1+1) | |
| 3096 (byte-defop-compiler set-buffer 1) | |
| 3097 ;;(byte-defop-compiler set-mark 1) ;; obsolete | |
| 2217 | 3098 (byte-defop-compiler forward-word 0-1+1) |
| 428 | 3099 (byte-defop-compiler char-syntax 1+1) |
| 3100 (byte-defop-compiler nreverse 1) | |
| 3101 (byte-defop-compiler car-safe 1) | |
| 3102 (byte-defop-compiler cdr-safe 1) | |
| 3103 (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
|
3104 (byte-defop-compiler fixnump 1) |
| 428 | 3105 (byte-defop-compiler skip-chars-forward 1-2+1) |
| 3106 (byte-defop-compiler skip-chars-backward 1-2+1) | |
| 3107 (byte-defop-compiler (eql byte-eq) 2) | |
| 3108 (byte-defop-compiler20 old-eq 2) | |
| 3109 (byte-defop-compiler20 old-memq 2) | |
| 3110 (byte-defop-compiler cons 2) | |
| 3111 (byte-defop-compiler aref 2) | |
| 3112 (byte-defop-compiler get 2+1) | |
| 3113 (byte-defop-compiler nth 2) | |
| 3114 (byte-defop-compiler substring 2-3) | |
| 3115 (byte-defop-compiler (move-marker byte-set-marker) 2-3) | |
| 3116 (byte-defop-compiler set-marker 2-3) | |
| 3117 (byte-defop-compiler match-beginning 1) | |
| 3118 (byte-defop-compiler match-end 1) | |
| 3119 (byte-defop-compiler upcase 1+1) | |
| 3120 (byte-defop-compiler downcase 1+1) | |
| 3121 (byte-defop-compiler string= 2) | |
| 3122 (byte-defop-compiler string< 2) | |
| 3123 (byte-defop-compiler (string-equal byte-string=) 2) | |
| 3124 (byte-defop-compiler (string-lessp byte-string<) 2) | |
| 3125 (byte-defop-compiler20 old-equal 2) | |
| 3126 (byte-defop-compiler nthcdr 2) | |
| 3127 (byte-defop-compiler elt 2) | |
| 3128 (byte-defop-compiler20 old-member 2) | |
| 3129 (byte-defop-compiler20 old-assq 2) | |
| 3130 (byte-defop-compiler (rplaca byte-setcar) 2) | |
| 3131 (byte-defop-compiler (rplacd byte-setcdr) 2) | |
| 3132 (byte-defop-compiler setcar 2) | |
| 3133 (byte-defop-compiler setcdr 2) | |
| 3134 (byte-defop-compiler delete-region 2+1) | |
| 3135 (byte-defop-compiler narrow-to-region 2+1) | |
| 3136 (byte-defop-compiler (% byte-rem) 2) | |
| 3137 (byte-defop-compiler aset 3) | |
| 3138 | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
3139 (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
|
3140 (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
|
3141 (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
|
3142 (byte-defop-compiler throw) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
3143 |
| 428 | 3144 (byte-defop-compiler-rmsfun member 2) |
| 3145 (byte-defop-compiler-rmsfun assq 2) | |
| 3146 | |
| 3147 ;;####(byte-defop-compiler move-to-column 1) | |
| 3148 (byte-defop-compiler-1 interactive byte-compile-noop) | |
| 3149 (byte-defop-compiler-1 domain byte-compile-domain) | |
| 3150 | |
| 3151 ;; As of GNU Emacs 19.18 and Lucid Emacs 19.8, mod and % are different: `%' | |
| 3152 ;; means integral remainder and may have a negative result; `mod' is always | |
| 3153 ;; positive, and accepts floating point args. All code which uses `mod' and | |
| 3154 ;; requires the new interpretation must be compiled with bytecomp version 2.18 | |
| 3155 ;; or newer, or the emitted code will run the byte-code for `%' instead of an | |
| 3156 ;; actual call to `mod'. So be careful of compiling new code with an old | |
| 3157 ;; compiler. Note also that `%' is more efficient than `mod' because the | |
| 3158 ;; former is byte-coded and the latter is not. | |
| 3159 ;;(byte-defop-compiler (mod byte-rem) 2) | |
| 3160 | |
| 3161 | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
3162 (defun byte-compile-warn-wrong-args (form n) |
| 428 | 3163 (when (memq 'subr-callargs byte-compile-warnings) |
| 3164 (byte-compile-warn "%s called with %d arg%s, but requires %s" | |
| 3165 (car form) (length (cdr form)) | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
3166 (if (= 1 (length (cdr form))) "" "s") n))) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
3167 |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
3168 (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
|
3169 (byte-compile-warn-wrong-args form n) |
| 428 | 3170 ;; get run-time wrong-number-of-args error. |
| 3171 (byte-compile-normal-call form)) | |
| 3172 | |
| 3173 (defun byte-compile-no-args (form) | |
| 3174 (case (length (cdr form)) | |
| 3175 (0 (byte-compile-out (get (car form) 'byte-opcode) 0)) | |
| 3176 (t (byte-compile-subr-wrong-args form "none")))) | |
| 3177 | |
| 3178 (defun byte-compile-one-arg (form) | |
| 3179 (case (length (cdr form)) | |
| 3180 (1 (byte-compile-form (car (cdr form))) ;; Push the argument | |
| 3181 (byte-compile-out (get (car form) 'byte-opcode) 0)) | |
| 3182 (t (byte-compile-subr-wrong-args form 1)))) | |
| 3183 | |
| 3184 (defun byte-compile-two-args (form) | |
| 3185 (case (length (cdr form)) | |
| 3186 (2 (byte-compile-form (nth 1 form)) ;; Push the arguments | |
| 3187 (byte-compile-form (nth 2 form)) | |
| 3188 (byte-compile-out (get (car form) 'byte-opcode) 0)) | |
| 3189 (t (byte-compile-subr-wrong-args form 2)))) | |
| 3190 | |
| 3191 (defun byte-compile-three-args (form) | |
| 3192 (case (length (cdr form)) | |
| 3193 (3 (byte-compile-form (nth 1 form)) ;; Push the arguments | |
| 3194 (byte-compile-form (nth 2 form)) | |
| 3195 (byte-compile-form (nth 3 form)) | |
| 3196 (byte-compile-out (get (car form) 'byte-opcode) 0)) | |
| 3197 (t (byte-compile-subr-wrong-args form 3)))) | |
| 3198 | |
| 3199 (defun byte-compile-zero-or-one-arg (form) | |
| 3200 (case (length (cdr form)) | |
| 3201 (0 (byte-compile-one-arg (append form '(nil)))) | |
| 3202 (1 (byte-compile-one-arg form)) | |
| 3203 (t (byte-compile-subr-wrong-args form "0-1")))) | |
| 3204 | |
| 3205 (defun byte-compile-one-or-two-args (form) | |
| 3206 (case (length (cdr form)) | |
| 3207 (1 (byte-compile-two-args (append form '(nil)))) | |
| 3208 (2 (byte-compile-two-args form)) | |
| 3209 (t (byte-compile-subr-wrong-args form "1-2")))) | |
| 3210 | |
| 3211 (defun byte-compile-two-or-three-args (form) | |
| 3212 (case (length (cdr form)) | |
| 3213 (2 (byte-compile-three-args (append form '(nil)))) | |
| 3214 (3 (byte-compile-three-args form)) | |
| 3215 (t (byte-compile-subr-wrong-args form "2-3")))) | |
| 3216 | |
| 3217 ;; from Ben Wing <ben@xemacs.org>: some inlined functions have extra | |
| 3218 ;; optional args added to them in XEmacs 19.12. Changing the byte | |
| 3219 ;; interpreter to deal with these args would be wrong and cause | |
| 3220 ;; incompatibility, so we generate non-inlined calls for those cases. | |
| 3221 ;; Without the following functions, spurious warnings will be generated; | |
| 3222 ;; however, they would still compile correctly because | |
| 3223 ;; `byte-compile-subr-wrong-args' also converts the call to non-inlined. | |
| 3224 | |
| 3225 (defun byte-compile-no-args-with-one-extra (form) | |
| 3226 (case (length (cdr form)) | |
| 3227 (0 (byte-compile-no-args form)) | |
| 446 | 3228 (1 (if (eq nil (nth 1 form)) |
| 3229 (byte-compile-no-args (butlast form)) | |
| 3230 (byte-compile-normal-call form))) | |
| 428 | 3231 (t (byte-compile-subr-wrong-args form "0-1")))) |
| 3232 | |
| 3233 (defun byte-compile-one-arg-with-one-extra (form) | |
| 3234 (case (length (cdr form)) | |
| 3235 (1 (byte-compile-one-arg form)) | |
| 446 | 3236 (2 (if (eq nil (nth 2 form)) |
| 3237 (byte-compile-one-arg (butlast form)) | |
| 3238 (byte-compile-normal-call form))) | |
| 428 | 3239 (t (byte-compile-subr-wrong-args form "1-2")))) |
| 3240 | |
| 3241 (defun byte-compile-two-args-with-one-extra (form) | |
| 3242 (case (length (cdr form)) | |
| 3243 (2 (byte-compile-two-args form)) | |
| 446 | 3244 (3 (if (eq nil (nth 3 form)) |
| 3245 (byte-compile-two-args (butlast form)) | |
| 3246 (byte-compile-normal-call form))) | |
| 428 | 3247 (t (byte-compile-subr-wrong-args form "2-3")))) |
| 3248 | |
| 3249 (defun byte-compile-zero-or-one-arg-with-one-extra (form) | |
| 3250 (case (length (cdr form)) | |
| 3251 (0 (byte-compile-one-arg (append form '(nil)))) | |
| 3252 (1 (byte-compile-one-arg form)) | |
| 446 | 3253 (2 (if (eq nil (nth 2 form)) |
| 3254 (byte-compile-one-arg (butlast form)) | |
| 3255 (byte-compile-normal-call form))) | |
| 428 | 3256 (t (byte-compile-subr-wrong-args form "0-2")))) |
| 3257 | |
| 3258 (defun byte-compile-one-or-two-args-with-one-extra (form) | |
| 3259 (case (length (cdr form)) | |
| 3260 (1 (byte-compile-two-args (append form '(nil)))) | |
| 3261 (2 (byte-compile-two-args form)) | |
| 446 | 3262 (3 (if (eq nil (nth 3 form)) |
| 3263 (byte-compile-two-args (butlast form)) | |
| 3264 (byte-compile-normal-call form))) | |
| 428 | 3265 (t (byte-compile-subr-wrong-args form "1-3")))) |
| 3266 | |
| 3267 (defun byte-compile-two-or-three-args-with-one-extra (form) | |
| 3268 (case (length (cdr form)) | |
| 3269 (2 (byte-compile-three-args (append form '(nil)))) | |
| 3270 (3 (byte-compile-three-args form)) | |
| 446 | 3271 (4 (if (eq nil (nth 4 form)) |
| 3272 (byte-compile-three-args (butlast form)) | |
| 3273 (byte-compile-normal-call form))) | |
| 428 | 3274 (t (byte-compile-subr-wrong-args form "2-4")))) |
| 3275 | |
| 3276 (defun byte-compile-no-args-with-two-extra (form) | |
| 3277 (case (length (cdr form)) | |
| 3278 (0 (byte-compile-no-args form)) | |
| 3279 ((1 2) (byte-compile-normal-call form)) | |
| 3280 (t (byte-compile-subr-wrong-args form "0-2")))) | |
| 3281 | |
| 3282 (defun byte-compile-one-arg-with-two-extra (form) | |
| 3283 (case (length (cdr form)) | |
| 3284 (1 (byte-compile-one-arg form)) | |
| 3285 ((2 3) (byte-compile-normal-call form)) | |
| 3286 (t (byte-compile-subr-wrong-args form "1-3")))) | |
| 3287 | |
| 3288 ;; XEmacs: used for functions that have a different opcode in v19 than v20. | |
| 3289 ;; this includes `eq', `equal', and other old-ified functions. | |
| 3290 (defun byte-compile-two-args-19->20 (form) | |
| 3291 (if (not (= (length form) 3)) | |
| 3292 (byte-compile-subr-wrong-args form 2) | |
| 3293 (byte-compile-form (car (cdr form))) ;; Push the arguments | |
| 3294 (byte-compile-form (nth 2 form)) | |
| 3295 (if (byte-compile-version-cond byte-compile-emacs19-compatibility) | |
| 3296 (byte-compile-out (get (car form) 'byte-opcode19) 0) | |
| 3297 (byte-compile-out (get (car form) 'byte-opcode) 0)))) | |
| 3298 | |
| 3299 (defun byte-compile-noop (form) | |
| 3300 (byte-compile-constant nil)) | |
| 3301 | |
| 3302 (defun byte-compile-discard () | |
| 3303 (byte-compile-out 'byte-discard 0)) | |
| 3304 | |
| 446 | 3305 (defun byte-compile-max (form) |
| 3306 (let ((args (cdr form))) | |
| 428 | 3307 (case (length args) |
| 446 | 3308 (0 (byte-compile-subr-wrong-args form "1 or more")) |
| 3309 (1 (byte-compile-form (car args)) | |
| 3310 (when (not byte-compile-delete-errors) | |
| 3311 (byte-compile-out 'byte-dup 0) | |
| 3312 (byte-compile-out 'byte-max 0))) | |
| 428 | 3313 (t (byte-compile-form (car args)) |
| 446 | 3314 (dolist (elt (cdr args)) |
| 3315 (byte-compile-form elt) | |
| 3316 (byte-compile-out 'byte-max 0)))))) | |
| 3317 | |
| 3318 (defun byte-compile-min (form) | |
| 3319 (let ((args (cdr form))) | |
| 3320 (case (length args) | |
| 3321 (0 (byte-compile-subr-wrong-args form "1 or more")) | |
| 3322 (1 (byte-compile-form (car args)) | |
| 3323 (when (not byte-compile-delete-errors) | |
| 3324 (byte-compile-out 'byte-dup 0) | |
| 3325 (byte-compile-out 'byte-min 0))) | |
| 3326 (t (byte-compile-form (car args)) | |
| 3327 (dolist (elt (cdr args)) | |
| 3328 (byte-compile-form elt) | |
| 3329 (byte-compile-out 'byte-min 0)))))) | |
| 428 | 3330 |
| 3331 | |
| 3332 ;; more complicated compiler macros | |
| 3333 | |
| 3334 (byte-defop-compiler list) | |
| 3335 (byte-defop-compiler concat) | |
| 3336 (byte-defop-compiler fset) | |
| 3337 (byte-defop-compiler insert) | |
| 3338 (byte-defop-compiler-1 function byte-compile-function-form) | |
| 446 | 3339 (byte-defop-compiler max) |
| 3340 (byte-defop-compiler min) | |
| 3341 (byte-defop-compiler (+ byte-plus) byte-compile-plus) | |
| 3342 (byte-defop-compiler-1 - byte-compile-minus) | |
| 3343 (byte-defop-compiler (* byte-mult) byte-compile-mult) | |
| 3344 (byte-defop-compiler (/ byte-quo) byte-compile-quo) | |
| 428 | 3345 (byte-defop-compiler nconc) |
| 3346 (byte-defop-compiler-1 beginning-of-line) | |
| 3347 | |
| 3348 (byte-defop-compiler (= byte-eqlsign) byte-compile-arithcompare) | |
| 3349 (byte-defop-compiler (< byte-lss) byte-compile-arithcompare) | |
| 3350 (byte-defop-compiler (> byte-gtr) byte-compile-arithcompare) | |
| 3351 (byte-defop-compiler (<= byte-leq) byte-compile-arithcompare) | |
| 3352 (byte-defop-compiler (>= byte-geq) byte-compile-arithcompare) | |
| 3353 | |
| 3354 (defun byte-compile-arithcompare (form) | |
| 3355 (case (length (cdr form)) | |
| 3356 (0 (byte-compile-subr-wrong-args form "1 or more")) | |
| 549 | 3357 (1 (if byte-compile-delete-errors |
| 3358 (byte-compile-constant t) | |
| 3359 (byte-compile-normal-call form))) | |
| 428 | 3360 (2 (byte-compile-two-args form)) |
| 3361 (t (byte-compile-normal-call form)))) | |
| 3362 | |
| 3363 (byte-defop-compiler /= byte-compile-/=) | |
| 3364 | |
| 3365 (defun byte-compile-/= (form) | |
| 3366 (case (length (cdr form)) | |
| 3367 (0 (byte-compile-subr-wrong-args form "1 or more")) | |
| 3368 (1 (byte-compile-constant t)) | |
| 3369 ;; optimize (/= X Y) to (not (= X Y)) | |
| 3370 (2 (byte-compile-form-do-effect `(not (= ,@(cdr form))))) | |
| 3371 (t (byte-compile-normal-call form)))) | |
| 3372 | |
| 3373 ;; buffer-substring now has its own function. This used to be | |
| 3374 ;; 2+1, but now all args are optional. | |
| 3375 (byte-defop-compiler buffer-substring) | |
| 3376 | |
| 3377 (defun byte-compile-buffer-substring (form) | |
| 3378 ;; buffer-substring used to take exactly two args, but now takes 0-3. | |
| 3379 ;; convert 0-2 to two args and use special bytecode operand. | |
| 3380 ;; convert 3 args to a normal call. | |
| 3381 (case (length (cdr form)) | |
| 3382 (0 (byte-compile-two-args (append form '(nil nil)))) | |
| 3383 (1 (byte-compile-two-args (append form '(nil)))) | |
| 3384 (2 (byte-compile-two-args form)) | |
| 3385 (3 (byte-compile-normal-call form)) | |
| 3386 (t (byte-compile-subr-wrong-args form "0-3")))) | |
| 3387 | |
| 3388 (defun byte-compile-list (form) | |
| 3389 (let* ((args (cdr form)) | |
| 3390 (nargs (length args))) | |
| 3391 (cond | |
| 3392 ((= nargs 0) | |
| 3393 (byte-compile-constant nil)) | |
| 3394 ((< nargs 5) | |
|
4783
e29fcfd8df5f
Eliminate most core code byte-compile warnings.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4775
diff
changeset
|
3395 (mapc 'byte-compile-form args) |
| 428 | 3396 (byte-compile-out |
| 3397 (aref [byte-list1 byte-list2 byte-list3 byte-list4] (1- nargs)) | |
| 3398 0)) | |
| 3399 ((< nargs 256) | |
|
4783
e29fcfd8df5f
Eliminate most core code byte-compile warnings.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4775
diff
changeset
|
3400 (mapc 'byte-compile-form args) |
| 428 | 3401 (byte-compile-out 'byte-listN nargs)) |
| 3402 (t (byte-compile-normal-call form))))) | |
| 3403 | |
| 3404 (defun byte-compile-concat (form) | |
| 3405 (let* ((args (cdr form)) | |
| 3406 (nargs (length args))) | |
| 3407 ;; Concat of one arg is not a no-op if arg is not a string. | |
| 3408 (cond | |
| 3409 ((memq nargs '(2 3 4)) | |
|
4783
e29fcfd8df5f
Eliminate most core code byte-compile warnings.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4775
diff
changeset
|
3410 (mapc 'byte-compile-form args) |
| 428 | 3411 (byte-compile-out |
| 3412 (aref [byte-concat2 byte-concat3 byte-concat4] (- nargs 2)) | |
| 3413 0)) | |
| 3414 ((eq nargs 0) | |
| 3415 (byte-compile-form "")) | |
| 3416 ((< nargs 256) | |
|
4783
e29fcfd8df5f
Eliminate most core code byte-compile warnings.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4775
diff
changeset
|
3417 (mapc 'byte-compile-form args) |
| 428 | 3418 (byte-compile-out 'byte-concatN nargs)) |
| 3419 ((byte-compile-normal-call form))))) | |
| 3420 | |
| 446 | 3421 (defun byte-compile-plus (form) |
| 3422 (let ((args (cdr form))) | |
| 3423 (case (length args) | |
| 3424 (0 (byte-compile-constant 0)) | |
| 3425 (1 (byte-compile-plus (append form '(0)))) | |
| 3426 (t (byte-compile-form (car args)) | |
| 3427 (dolist (elt (cdr args)) | |
| 3428 (case elt | |
| 3429 (0 (when (not byte-compile-delete-errors) | |
| 3430 (byte-compile-constant 0) | |
| 3431 (byte-compile-out 'byte-plus 0))) | |
| 3432 (+1 (byte-compile-out 'byte-add1 0)) | |
| 3433 (-1 (byte-compile-out 'byte-sub1 0)) | |
| 3434 (t | |
| 3435 (byte-compile-form elt) | |
| 3436 (byte-compile-out 'byte-plus 0)))))))) | |
| 3437 | |
| 428 | 3438 (defun byte-compile-minus (form) |
| 3439 (let ((args (cdr form))) | |
| 3440 (case (length args) | |
| 3441 (0 (byte-compile-subr-wrong-args form "1 or more")) | |
| 3442 (1 (byte-compile-form (car args)) | |
| 3443 (byte-compile-out 'byte-negate 0)) | |
| 3444 (t (byte-compile-form (car args)) | |
| 3445 (dolist (elt (cdr args)) | |
| 446 | 3446 (case elt |
| 3447 (0 (when (not byte-compile-delete-errors) | |
| 3448 (byte-compile-constant 0) | |
| 3449 (byte-compile-out 'byte-diff 0))) | |
| 3450 (+1 (byte-compile-out 'byte-sub1 0)) | |
| 3451 (-1 (byte-compile-out 'byte-add1 0)) | |
| 3452 (t | |
| 3453 (byte-compile-form elt) | |
| 3454 (byte-compile-out 'byte-diff 0)))))))) | |
| 3455 | |
| 3456 (defun byte-compile-mult (form) | |
| 3457 (let ((args (cdr form))) | |
| 3458 (case (length args) | |
| 3459 (0 (byte-compile-constant 1)) | |
| 3460 (1 (byte-compile-mult (append form '(1)))) | |
| 3461 (t (byte-compile-form (car args)) | |
| 3462 (dolist (elt (cdr args)) | |
| 3463 (case elt | |
| 3464 (1 (when (not byte-compile-delete-errors) | |
| 3465 (byte-compile-constant 1) | |
| 3466 (byte-compile-out 'byte-mult 0))) | |
| 3467 (-1 (byte-compile-out 'byte-negate 0)) | |
| 3468 (2 (byte-compile-out 'byte-dup 0) | |
| 3469 (byte-compile-out 'byte-plus 0)) | |
| 3470 (t | |
| 3471 (byte-compile-form elt) | |
| 3472 (byte-compile-out 'byte-mult 0)))))))) | |
| 428 | 3473 |
| 3474 (defun byte-compile-quo (form) | |
| 3475 (let ((args (cdr form))) | |
| 3476 (case (length args) | |
| 3477 (0 (byte-compile-subr-wrong-args form "1 or more")) | |
| 3478 (1 (byte-compile-constant 1) | |
| 3479 (byte-compile-form (car args)) | |
| 3480 (byte-compile-out 'byte-quo 0)) | |
| 3481 (t (byte-compile-form (car args)) | |
| 3482 (dolist (elt (cdr args)) | |
| 446 | 3483 (case elt |
| 3484 (+1 (when (not byte-compile-delete-errors) | |
| 3485 (byte-compile-constant 1) | |
| 3486 (byte-compile-out 'byte-quo 0))) | |
| 3487 (-1 (byte-compile-out 'byte-negate 0)) | |
| 3488 (t | |
| 3489 (when (and (numberp elt) (= elt 0)) | |
| 3490 (byte-compile-warn "Attempt to divide by zero: %s" form)) | |
| 3491 (byte-compile-form elt) | |
| 3492 (byte-compile-out 'byte-quo 0)))))))) | |
| 428 | 3493 |
| 3494 (defun byte-compile-nconc (form) | |
| 3495 (let ((args (cdr form))) | |
| 3496 (case (length args) | |
| 3497 (0 (byte-compile-constant nil)) | |
| 3498 ;; nconc of one arg is a noop, even if that arg isn't a list. | |
| 3499 (1 (byte-compile-form (car args))) | |
| 3500 (t (byte-compile-form (car args)) | |
| 3501 (dolist (elt (cdr args)) | |
| 3502 (byte-compile-form elt) | |
| 3503 (byte-compile-out 'byte-nconc 0)))))) | |
| 3504 | |
| 3505 (defun byte-compile-fset (form) | |
| 3506 ;; warn about forms like (fset 'foo '(lambda () ...)) | |
| 3507 ;; (where the lambda expression is non-trivial...) | |
| 3508 ;; Except don't warn if the first argument is 'make-byte-code, because | |
| 3509 ;; I'm sick of getting mail asking me whether that warning is a problem. | |
| 3510 (let ((fn (nth 2 form)) | |
| 3511 body) | |
| 3512 (when (and (eq (car-safe fn) 'quote) | |
| 3513 (eq (car-safe (setq fn (nth 1 fn))) 'lambda) | |
| 3514 (not (eq (car-safe (cdr-safe (nth 1 form))) 'make-byte-code))) | |
| 3515 (setq body (cdr (cdr fn))) | |
| 3516 (if (stringp (car body)) (setq body (cdr body))) | |
| 3517 (if (eq 'interactive (car-safe (car body))) (setq body (cdr body))) | |
| 3518 (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
|
3519 (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
|
3520 (memq 'quoted-lambda byte-compile-warnings)) |
| 428 | 3521 (byte-compile-warn |
| 3522 "A quoted lambda form is the second argument of fset. This is probably | |
| 3523 not what you want, as that lambda cannot be compiled. Consider using | |
| 3524 the syntax (function (lambda (...) ...)) instead.")))) | |
| 3525 (byte-compile-two-args form)) | |
| 3526 | |
|
4743
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3527 (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
|
3528 `#'(lambda (form) |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3529 ,@(loop |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3530 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
|
3531 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
|
3532 (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
|
3533 (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
|
3534 (or |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3535 (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
|
3536 byte-compile-warnings)) |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3537 (byte-compile-warn |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3538 "Passing a quoted lambda to #'%s, forcing \ |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3539 function quoting" (car form)))) |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3540 (setcar fn 'function)))) |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3541 (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
|
3542 |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3543 ;; (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
|
3544 ;; 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
|
3545 (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
|
3546 |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3547 ;; (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
|
3548 ;; 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
|
3549 (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
|
3550 |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3551 ;; For #'merge, basically. |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3552 (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
|
3553 |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3554 ;; 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
|
3555 (defalias 'byte-compile-funarg-1-2 (byte-compile-funarg-n 1 2)) |
| 428 | 3556 |
|
4716
dca5bb2adff1
Don't cons with #'mapcar calls where the result is discarded,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4686
diff
changeset
|
3557 ;; 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
|
3558 ;; 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
|
3559 ;; 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
|
3560 (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
|
3561 (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
|
3562 (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
|
3563 (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
|
3564 "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
|
3565 (car form))) |
|
bd51ab22afa8
Make it possible to silence warnings issued when #'mapcar's result is discarded.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4716
diff
changeset
|
3566 (setq form (cons 'mapc-internal (cdr form)))) |
|
4716
dca5bb2adff1
Don't cons with #'mapcar calls where the result is discarded,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4686
diff
changeset
|
3567 (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
|
3568 |
|
dca5bb2adff1
Don't cons with #'mapcar calls where the result is discarded,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4686
diff
changeset
|
3569 (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
|
3570 (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
|
3571 (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
|
3572 (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
|
3573 "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
|
3574 (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
|
3575 (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
|
3576 |
| 428 | 3577 ;; (function foo) must compile like 'foo, not like (symbol-function 'foo). |
| 3578 ;; Otherwise it will be incompatible with the interpreter, | |
| 3579 ;; and (funcall (function foo)) will lose with autoloads. | |
| 3580 | |
| 3581 (defun byte-compile-function-form (form) | |
| 3582 (byte-compile-constant | |
| 3583 (cond ((symbolp (nth 1 form)) | |
| 3584 (nth 1 form)) | |
| 3585 ((byte-compile-lambda (nth 1 form)))))) | |
| 3586 | |
| 3587 (defun byte-compile-insert (form) | |
| 3588 (cond ((null (cdr form)) | |
| 3589 (byte-compile-constant nil)) | |
| 3590 ((<= (length form) 256) | |
|
4783
e29fcfd8df5f
Eliminate most core code byte-compile warnings.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4775
diff
changeset
|
3591 (mapc 'byte-compile-form (cdr form)) |
| 428 | 3592 (if (cdr (cdr form)) |
| 3593 (byte-compile-out 'byte-insertN (length (cdr form))) | |
| 3594 (byte-compile-out 'byte-insert 0))) | |
| 3595 ((memq t (mapcar 'consp (cdr (cdr form)))) | |
| 3596 (byte-compile-normal-call form)) | |
| 3597 ;; We can split it; there is no function call after inserting 1st arg. | |
| 3598 (t | |
| 3599 (while (setq form (cdr form)) | |
| 3600 (byte-compile-form (car form)) | |
| 3601 (byte-compile-out 'byte-insert 0) | |
| 3602 (when (cdr form) | |
| 3603 (byte-compile-discard)))))) | |
| 3604 | |
| 3605 ;; alas, the old (pre-19.12, and all existing versions of FSFmacs 19) | |
| 3606 ;; byte compiler will generate incorrect code for | |
| 3607 ;; (beginning-of-line nil buffer) because it buggily doesn't | |
| 3608 ;; check the number of arguments passed to beginning-of-line. | |
| 3609 | |
| 3610 (defun byte-compile-beginning-of-line (form) | |
| 3611 (let ((len (length form))) | |
| 3612 (cond ((> len 3) | |
| 3613 (byte-compile-subr-wrong-args form "0-2")) | |
| 3614 ((or (= len 3) (not (byte-compile-constp (nth 1 form)))) | |
| 3615 (byte-compile-normal-call form)) | |
| 3616 (t | |
| 3617 (byte-compile-form | |
| 3618 (list 'forward-line | |
| 3619 (if (integerp (setq form (or (eval (nth 1 form)) 1))) | |
| 3620 (1- form) | |
| 3621 (byte-compile-warn | |
| 3622 "Non-numeric arg to beginning-of-line: %s" form) | |
| 3623 (list '1- (list 'quote form)))) | |
| 3624 t) | |
| 3625 (byte-compile-constant nil))))) | |
| 3626 | |
| 3627 | |
| 3628 (byte-defop-compiler set) | |
| 3629 (byte-defop-compiler-1 setq) | |
| 3630 (byte-defop-compiler-1 set-default) | |
| 3631 (byte-defop-compiler-1 setq-default) | |
| 3632 | |
| 3633 (byte-defop-compiler-1 quote) | |
| 3634 (byte-defop-compiler-1 quote-form) | |
| 3635 | |
| 3636 (defun byte-compile-setq (form) | |
| 3637 (let ((args (cdr form)) var val) | |
| 3638 (if (null args) | |
| 3639 ;; (setq), with no arguments. | |
| 3640 (byte-compile-form nil for-effect) | |
| 3641 (while args | |
| 3642 (setq var (pop args)) | |
| 3643 (if (null args) | |
| 3644 ;; Odd number of args? Let `set' get the error. | |
| 3645 (byte-compile-form `(set ',var) for-effect) | |
| 3646 (setq val (pop args)) | |
| 3647 (if (keywordp var) | |
| 3648 ;; (setq :foo ':foo) compatibility kludge | |
| 3649 (byte-compile-form `(set ',var ,val) (if args t for-effect)) | |
| 3650 (byte-compile-form val) | |
| 3651 (unless (or args for-effect) | |
| 3652 (byte-compile-out 'byte-dup 0)) | |
| 3653 (byte-compile-variable-ref 'byte-varset var)))))) | |
| 3654 (setq for-effect nil)) | |
| 3655 | |
| 3656 (defun byte-compile-set (form) | |
| 3657 ;; Compile (set 'foo x) as (setq foo x) for trivially better code and so | |
| 3658 ;; that we get applicable warnings. Compile everything else (including | |
| 3659 ;; malformed calls) like a normal 2-arg byte-coded function. | |
| 3660 (let ((symform (nth 1 form)) | |
| 3661 (valform (nth 2 form)) | |
| 3662 sym) | |
| 3663 (if (and (= (length form) 3) | |
| 3664 (= (safe-length symform) 2) | |
| 3665 (eq (car symform) 'quote) | |
| 3666 (symbolp (setq sym (car (cdr symform)))) | |
| 3667 (not (byte-compile-constant-symbol-p sym))) | |
| 3668 (byte-compile-setq `(setq ,sym ,valform)) | |
| 3669 (byte-compile-two-args form)))) | |
| 3670 | |
| 3671 (defun byte-compile-setq-default (form) | |
| 3672 (let ((args (cdr form))) | |
| 3673 (if (null args) | |
| 3674 ;; (setq-default), with no arguments. | |
| 3675 (byte-compile-form nil for-effect) | |
| 3676 ;; emit multiple calls to `set-default' if necessary | |
| 3677 (while args | |
| 3678 (byte-compile-form | |
| 3679 ;; Odd number of args? Let `set-default' get the error. | |
| 3680 `(set-default ',(pop args) ,@(if args (list (pop args)) nil)) | |
| 3681 (if args t for-effect))))) | |
| 3682 (setq for-effect nil)) | |
| 3683 | |
| 3684 (defun byte-compile-set-default (form) | |
| 3685 (let* ((args (cdr form)) | |
| 3686 (nargs (length args)) | |
| 3687 (var (car args))) | |
| 3688 (when (and (= (safe-length var) 2) | |
| 3689 (eq (car var) 'quote)) | |
| 3690 (let ((sym (nth 1 var))) | |
| 3691 (cond | |
| 3692 ((not (symbolp sym)) | |
| 3693 (byte-compile-warn "Attempt to set-globally non-symbol %s" sym)) | |
| 3694 ((byte-compile-constant-symbol-p sym) | |
| 3695 (byte-compile-warn "Attempt to set-globally constant symbol %s" sym)) | |
| 3696 ((let ((cell (assq sym byte-compile-bound-variables))) | |
| 3697 (and cell | |
| 3698 (setcdr cell (logior (cdr cell) byte-compile-assigned-bit)) | |
| 3699 t))) | |
| 3700 ;; notice calls to set-default/setq-default for variables which | |
| 3701 ;; have not been declared with defvar/defconst. | |
| 3702 ((globally-boundp sym)) ; OK | |
| 3703 ((not (memq 'free-vars byte-compile-warnings))) ; warnings suppressed? | |
| 3704 ((memq sym byte-compile-free-assignments)) ; already warned about sym | |
| 3705 (t | |
| 3706 (byte-compile-warn "assignment to free variable %s" sym) | |
| 3707 (push sym byte-compile-free-assignments))))) | |
| 3708 (if (= nargs 2) | |
| 3709 ;; now emit a normal call to set-default | |
| 3710 (byte-compile-normal-call form) | |
| 3711 (byte-compile-subr-wrong-args form 2)))) | |
| 3712 | |
| 3713 | |
| 3714 (defun byte-compile-quote (form) | |
| 3715 (byte-compile-constant (car (cdr form)))) | |
| 3716 | |
| 3717 (defun byte-compile-quote-form (form) | |
| 3718 (byte-compile-constant (byte-compile-top-level (nth 1 form)))) | |
| 3719 | |
| 3720 | |
| 3721 ;;; control structures | |
| 3722 | |
| 3723 (defun byte-compile-body (body &optional for-effect) | |
| 3724 (while (cdr body) | |
| 3725 (byte-compile-form (car body) t) | |
| 3726 (setq body (cdr body))) | |
| 3727 (byte-compile-form (car body) for-effect)) | |
| 3728 | |
| 3729 (proclaim-inline byte-compile-body-do-effect) | |
| 3730 (defun byte-compile-body-do-effect (body) | |
| 3731 (byte-compile-body body for-effect) | |
| 3732 (setq for-effect nil)) | |
| 3733 | |
| 3734 (proclaim-inline byte-compile-form-do-effect) | |
| 3735 (defun byte-compile-form-do-effect (form) | |
| 3736 (byte-compile-form form for-effect) | |
| 3737 (setq for-effect nil)) | |
| 3738 | |
| 3739 (byte-defop-compiler-1 inline byte-compile-progn) | |
| 3740 (byte-defop-compiler-1 progn) | |
| 3741 (byte-defop-compiler-1 prog1) | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
3742 (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
|
3743 (byte-defop-compiler-1 values) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
3744 (byte-defop-compiler-1 values-list) |
| 428 | 3745 (byte-defop-compiler-1 prog2) |
| 3746 (byte-defop-compiler-1 if) | |
| 3747 (byte-defop-compiler-1 cond) | |
| 3748 (byte-defop-compiler-1 and) | |
| 3749 (byte-defop-compiler-1 or) | |
| 3750 (byte-defop-compiler-1 while) | |
| 3751 (byte-defop-compiler-1 funcall) | |
| 3752 (byte-defop-compiler-1 apply 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
|
3753 (byte-defop-compiler-1 mapcar byte-compile-maybe-mapc) |
| 428 | 3754 (byte-defop-compiler-1 mapatoms byte-compile-funarg) |
| 3755 (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
|
3756 (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
|
3757 (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
|
3758 (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
|
3759 (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
|
3760 (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
|
3761 (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
|
3762 (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
|
3763 (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
|
3764 (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
|
3765 (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
|
3766 (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
|
3767 (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
|
3768 (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
|
3769 (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
|
3770 (byte-defop-compiler-1 map-syntax-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
|
3771 (byte-defop-compiler-1 mapcar* 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
|
3772 |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3773 (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
|
3774 (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
|
3775 (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
|
3776 (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
|
3777 (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
|
3778 (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
|
3779 (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
|
3780 (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
|
3781 (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
|
3782 (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
|
3783 (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
|
3784 (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
|
3785 (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
|
3786 (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
|
3787 (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
|
3788 (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
|
3789 (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
|
3790 (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
|
3791 (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
|
3792 (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
|
3793 (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
|
3794 |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3795 (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
|
3796 (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
|
3797 |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3798 (byte-defop-compiler-1 map 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
|
3799 (byte-defop-compiler-1 apropos-internal 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
|
3800 (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
|
3801 (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
|
3802 (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
|
3803 (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
|
3804 (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
|
3805 (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
|
3806 (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
|
3807 (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
|
3808 (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
|
3809 (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
|
3810 (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
|
3811 |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3812 (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
|
3813 |
|
776bbf454f3a
Be much more comprehensive in our use of byte-compile-funarg.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3814 (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
|
3815 (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
|
3816 |
| 428 | 3817 (byte-defop-compiler-1 let) |
| 3818 (byte-defop-compiler-1 let*) | |
| 3819 | |
|
4885
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
3820 (byte-defop-compiler-1 integerp) |
|
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
3821 |
| 428 | 3822 (defun byte-compile-progn (form) |
| 3823 (byte-compile-body-do-effect (cdr form))) | |
| 3824 | |
| 3825 (defun byte-compile-prog1 (form) | |
| 3826 (setq form (cdr form)) | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
3827 ;; #'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
|
3828 (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
|
3829 (byte-compile-body form t)) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
3830 |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
3831 (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
|
3832 (setq form (cdr form)) |
| 428 | 3833 (byte-compile-form-do-effect (pop form)) |
| 3834 (byte-compile-body form t)) | |
| 3835 | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
3836 (defun byte-compile-values (form) |
|
4686
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
3837 (if (= 2 (length form)) |
|
cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4683
diff
changeset
|
3838 (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
|
3839 (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
|
3840 ;; #'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
|
3841 (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
|
3842 (byte-compile-normal-call form))) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
3843 |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
3844 (defun byte-compile-values-list (form) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
3845 (if (and (= 2 (length form)) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
3846 (or (null (second form)) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
3847 (and (consp (second form)) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
3848 (eq (car (second form)) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
3849 'quote) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
3850 (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
|
3851 (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
|
3852 (byte-compile-normal-call form))) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
3853 |
| 428 | 3854 (defun byte-compile-prog2 (form) |
| 3855 (setq form (cdr form)) | |
| 3856 (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
|
3857 ;; #'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
|
3858 (byte-compile-form-do-effect `(or ,(pop form) nil)) |
| 428 | 3859 (byte-compile-body form t)) |
| 3860 | |
| 3861 (defmacro byte-compile-goto-if (cond discard tag) | |
| 3862 `(byte-compile-goto | |
| 3863 (if ,cond | |
| 3864 (if ,discard 'byte-goto-if-not-nil 'byte-goto-if-not-nil-else-pop) | |
| 3865 (if ,discard 'byte-goto-if-nil 'byte-goto-if-nil-else-pop)) | |
| 3866 ,tag)) | |
| 3867 | |
| 3868 (defun byte-compile-if (form) | |
| 3869 (byte-compile-form (car (cdr form))) | |
| 3870 (if (null (nthcdr 3 form)) | |
| 3871 ;; No else-forms | |
| 3872 (let ((donetag (byte-compile-make-tag))) | |
| 3873 (byte-compile-goto-if nil for-effect donetag) | |
| 3874 (byte-compile-form (nth 2 form) for-effect) | |
| 3875 (byte-compile-out-tag donetag)) | |
| 3876 (let ((donetag (byte-compile-make-tag)) (elsetag (byte-compile-make-tag))) | |
| 3877 (byte-compile-goto 'byte-goto-if-nil elsetag) | |
| 3878 (byte-compile-form (nth 2 form) for-effect) | |
| 3879 (byte-compile-goto 'byte-goto donetag) | |
| 3880 (byte-compile-out-tag elsetag) | |
| 3881 (byte-compile-body (cdr (cdr (cdr form))) for-effect) | |
| 3882 (byte-compile-out-tag donetag))) | |
| 3883 (setq for-effect nil)) | |
| 3884 | |
| 3885 (defun byte-compile-cond (clauses) | |
| 3886 (let ((donetag (byte-compile-make-tag)) | |
| 3887 nexttag clause) | |
| 3888 (while (setq clauses (cdr clauses)) | |
| 3889 (setq clause (car clauses)) | |
| 3890 (cond ((or (eq (car clause) t) | |
| 3891 (and (eq (car-safe (car clause)) 'quote) | |
| 3892 (car-safe (cdr-safe (car clause))))) | |
| 3893 ;; Unconditional clause | |
| 3894 (setq clause (cons t clause) | |
| 3895 clauses nil)) | |
| 3896 ((cdr clauses) | |
| 3897 (byte-compile-form (car clause)) | |
| 3898 (if (null (cdr clause)) | |
| 3899 ;; First clause is a singleton. | |
| 3900 (byte-compile-goto-if t for-effect donetag) | |
| 3901 (setq nexttag (byte-compile-make-tag)) | |
| 3902 (byte-compile-goto 'byte-goto-if-nil nexttag) | |
| 3903 (byte-compile-body (cdr clause) for-effect) | |
| 3904 (byte-compile-goto 'byte-goto donetag) | |
| 3905 (byte-compile-out-tag nexttag))))) | |
| 3906 ;; Last clause | |
| 3907 (and (cdr clause) (not (eq (car clause) t)) | |
| 3908 (progn (byte-compile-form (car clause)) | |
| 3909 (byte-compile-goto-if nil for-effect donetag) | |
| 3910 (setq clause (cdr clause)))) | |
| 3911 (byte-compile-body-do-effect clause) | |
| 3912 (byte-compile-out-tag donetag))) | |
| 3913 | |
| 3914 (defun byte-compile-and (form) | |
| 3915 (let ((failtag (byte-compile-make-tag)) | |
| 3916 (args (cdr form))) | |
| 3917 (if (null args) | |
| 3918 (byte-compile-form-do-effect t) | |
| 3919 (while (cdr args) | |
| 3920 (byte-compile-form (car args)) | |
| 3921 (byte-compile-goto-if nil for-effect failtag) | |
| 3922 (setq args (cdr args))) | |
| 3923 (byte-compile-form-do-effect (car args)) | |
| 3924 (byte-compile-out-tag failtag)))) | |
| 3925 | |
| 3926 (defun byte-compile-or (form) | |
| 3927 (let ((wintag (byte-compile-make-tag)) | |
| 3928 (args (cdr form))) | |
| 3929 (if (null args) | |
| 3930 (byte-compile-form-do-effect nil) | |
| 3931 (while (cdr args) | |
| 3932 (byte-compile-form (car args)) | |
| 3933 (byte-compile-goto-if t for-effect wintag) | |
| 3934 (setq args (cdr args))) | |
| 3935 (byte-compile-form-do-effect (car args)) | |
| 3936 (byte-compile-out-tag wintag)))) | |
| 3937 | |
| 3938 (defun byte-compile-while (form) | |
| 3939 (let ((endtag (byte-compile-make-tag)) | |
| 3940 (looptag (byte-compile-make-tag))) | |
| 3941 (byte-compile-out-tag looptag) | |
| 3942 (byte-compile-form (car (cdr form))) | |
| 3943 (byte-compile-goto-if nil for-effect endtag) | |
| 3944 (byte-compile-body (cdr (cdr form)) t) | |
| 3945 (byte-compile-goto 'byte-goto looptag) | |
| 3946 (byte-compile-out-tag endtag) | |
| 3947 (setq for-effect nil))) | |
| 3948 | |
| 3949 (defun byte-compile-funcall (form) | |
|
4783
e29fcfd8df5f
Eliminate most core code byte-compile warnings.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4775
diff
changeset
|
3950 (mapc 'byte-compile-form (cdr form)) |
| 428 | 3951 (byte-compile-out 'byte-call (length (cdr (cdr form))))) |
| 3952 | |
| 3953 | |
| 3954 (defun byte-compile-let (form) | |
| 3955 ;; First compute the binding values in the old scope. | |
| 3956 (let ((varlist (car (cdr form)))) | |
| 3957 (while varlist | |
| 3958 (if (consp (car varlist)) | |
| 3959 (byte-compile-form (car (cdr (car varlist)))) | |
| 3960 (byte-compile-push-constant nil)) | |
| 3961 (setq varlist (cdr varlist)))) | |
| 3962 (let ((byte-compile-bound-variables | |
| 3963 (cons 'new-scope byte-compile-bound-variables)) | |
| 3964 (varlist (reverse (car (cdr form)))) | |
| 3965 (extra-flags | |
| 3966 ;; If this let is of the form (let (...) (byte-code ...)) | |
| 3967 ;; then assume that it is the result of a transformation of | |
| 3968 ;; ((lambda (...) (byte-code ... )) ...) and thus compile | |
| 3969 ;; the variable bindings as if they were arglist bindings | |
| 3970 ;; (which matters for what warnings.) | |
| 3971 (if (eq 'byte-code (car-safe (nth 2 form))) | |
| 3972 byte-compile-arglist-bit | |
| 3973 nil))) | |
| 3974 (while varlist | |
| 3975 (byte-compile-variable-ref 'byte-varbind | |
| 3976 (if (consp (car varlist)) | |
| 3977 (car (car varlist)) | |
| 3978 (car varlist)) | |
| 3979 extra-flags) | |
| 3980 (setq varlist (cdr varlist))) | |
| 3981 (byte-compile-body-do-effect (cdr (cdr form))) | |
| 3982 (if (memq 'unused-vars byte-compile-warnings) | |
| 3983 ;; done compiling in this scope, warn now. | |
| 3984 (byte-compile-warn-about-unused-variables)) | |
| 3985 (byte-compile-out 'byte-unbind (length (car (cdr form)))))) | |
| 3986 | |
| 3987 (defun byte-compile-let* (form) | |
| 3988 (let ((byte-compile-bound-variables | |
| 3989 (cons 'new-scope byte-compile-bound-variables)) | |
| 3990 (varlist (copy-sequence (car (cdr form))))) | |
| 3991 (while varlist | |
| 3992 (if (atom (car varlist)) | |
| 3993 (byte-compile-push-constant nil) | |
| 3994 (byte-compile-form (car (cdr (car varlist)))) | |
| 3995 (setcar varlist (car (car varlist)))) | |
| 3996 (byte-compile-variable-ref 'byte-varbind (car varlist)) | |
| 3997 (setq varlist (cdr varlist))) | |
| 3998 (byte-compile-body-do-effect (cdr (cdr form))) | |
| 3999 (if (memq 'unused-vars byte-compile-warnings) | |
| 4000 ;; done compiling in this scope, warn now. | |
| 4001 (byte-compile-warn-about-unused-variables)) | |
| 4002 (byte-compile-out 'byte-unbind (length (car (cdr form)))))) | |
| 4003 | |
|
4885
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
4004 ;; 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
|
4005 ;; 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
|
4006 ;; 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
|
4007 ;; 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
|
4008 ;; 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
|
4009 ;; 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
|
4010 ;; 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
|
4011 ;; |
|
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
4012 ;; (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
|
4013 ;; |
|
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
4014 ;; 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
|
4015 ;; 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
|
4016 ;; 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
|
4017 ;; |
|
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
4018 ;; 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
|
4019 ;; (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
|
4020 ;; 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
|
4021 ;; anyway). |
|
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
4022 |
|
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
4023 (defun byte-compile-integerp (form) |
|
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
4024 (if (/= 2 (length form)) |
|
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
4025 (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
|
4026 (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
|
4027 (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
|
4028 (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
|
4029 (byte-compile-constant 'integerp) |
|
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
4030 (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
|
4031 (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
|
4032 (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
|
4033 (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
|
4034 (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
|
4035 (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
|
4036 (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
|
4037 (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
|
4038 ;; 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
|
4039 ;; 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
|
4040 ;; 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
|
4041 ;; anything. |
|
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
4042 (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
|
4043 (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
|
4044 (byte-compile-discard) |
|
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
4045 (byte-compile-discard) |
|
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
4046 (byte-compile-constant nil) |
|
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
4047 (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
|
4048 (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
|
4049 (byte-compile-discard) |
|
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
4050 (byte-compile-discard) |
|
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
4051 (byte-compile-constant t) |
|
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
4052 (byte-compile-out-tag donetag)))) |
| 428 | 4053 |
| 4054 ;;(byte-defop-compiler-1 /= byte-compile-negated) | |
| 4055 (byte-defop-compiler-1 atom byte-compile-negated) | |
| 4056 (byte-defop-compiler-1 nlistp byte-compile-negated) | |
| 4057 | |
| 4058 ;;(put '/= 'byte-compile-negated-op '=) | |
| 4059 (put 'atom 'byte-compile-negated-op 'consp) | |
| 4060 (put 'nlistp 'byte-compile-negated-op 'listp) | |
| 4061 | |
| 4062 (defun byte-compile-negated (form) | |
| 4063 (byte-compile-form-do-effect (byte-compile-negation-optimizer form))) | |
| 4064 | |
| 4065 ;; Even when optimization is off, atom is optimized to (not (consp ...)). | |
| 4066 (defun byte-compile-negation-optimizer (form) | |
| 4067 ;; an optimizer for forms where <form1> is less efficient than (not <form2>) | |
| 4068 (list 'not | |
| 4069 (cons (or (get (car form) 'byte-compile-negated-op) | |
| 4070 (error | |
| 4071 "Compiler error: `%s' has no `byte-compile-negated-op' property" | |
| 4072 (car form))) | |
| 4073 (cdr form)))) | |
| 4074 | |
| 4075 ;;; other tricky macro-like special-forms | |
| 4076 | |
| 4077 (byte-defop-compiler-1 catch) | |
| 4078 (byte-defop-compiler-1 unwind-protect) | |
| 4079 (byte-defop-compiler-1 condition-case) | |
| 4080 (byte-defop-compiler-1 save-excursion) | |
| 4081 (byte-defop-compiler-1 save-current-buffer) | |
| 4082 (byte-defop-compiler-1 save-restriction) | |
| 4083 (byte-defop-compiler-1 with-output-to-temp-buffer) | |
| 4084 ;; no track-mouse. | |
| 4085 | |
| 4086 (defun byte-compile-catch (form) | |
| 4087 (byte-compile-form (car (cdr form))) | |
| 4088 (byte-compile-push-constant | |
| 4089 (byte-compile-top-level (cons 'progn (cdr (cdr form))) for-effect)) | |
| 4090 (byte-compile-out 'byte-catch 0)) | |
| 4091 | |
| 4092 (defun byte-compile-unwind-protect (form) | |
| 4093 (byte-compile-push-constant | |
| 4094 (byte-compile-top-level-body (cdr (cdr form)) t)) | |
| 4095 (byte-compile-out 'byte-unwind-protect 0) | |
| 4096 (byte-compile-form-do-effect (car (cdr form))) | |
| 4097 (byte-compile-out 'byte-unbind 1)) | |
| 4098 | |
| 4099 ;;(defun byte-compile-track-mouse (form) | |
| 4100 ;; (byte-compile-form | |
| 4101 ;; (list | |
| 4102 ;; 'funcall | |
| 4103 ;; (list 'quote | |
| 4104 ;; (list 'lambda nil | |
| 4105 ;; (cons 'track-mouse | |
| 4106 ;; (byte-compile-top-level-body (cdr form)))))))) | |
| 4107 | |
| 4108 (defun byte-compile-condition-case (form) | |
| 4109 (let* ((var (nth 1 form)) | |
| 4110 (byte-compile-bound-variables | |
| 4111 (if var | |
| 4112 (cons (cons var 0) | |
| 4113 (cons 'new-scope byte-compile-bound-variables)) | |
| 4114 (cons 'new-scope byte-compile-bound-variables)))) | |
| 4115 (or (symbolp var) | |
| 4116 (byte-compile-warn | |
| 4117 "%s is not a variable-name or nil (in condition-case)" | |
| 4118 (prin1-to-string var))) | |
| 4119 (byte-compile-push-constant var) | |
| 4120 (byte-compile-push-constant (byte-compile-top-level | |
| 4121 (nth 2 form) for-effect)) | |
| 4122 (let ((clauses (cdr (cdr (cdr form)))) | |
| 4123 compiled-clauses) | |
| 4124 (while clauses | |
| 4125 (let* ((clause (car clauses)) | |
| 4126 (condition (car clause))) | |
| 4127 (cond ((not (or (symbolp condition) | |
| 4128 (and (listp condition) | |
| 4129 (let ((syms condition) (ok t)) | |
| 4130 (while syms | |
| 4131 (if (not (symbolp (car syms))) | |
| 4132 (setq ok nil)) | |
| 4133 (setq syms (cdr syms))) | |
| 4134 ok)))) | |
| 4135 (byte-compile-warn | |
| 4136 "%s is not a symbol naming a condition or a list of such (in condition-case)" | |
| 4137 (prin1-to-string condition))) | |
| 4138 ;; ((not (or (eq condition 't) | |
| 4139 ;; (and (stringp (get condition 'error-message)) | |
| 4140 ;; (consp (get condition 'error-conditions))))) | |
| 4141 ;; (byte-compile-warn | |
| 4142 ;; "%s is not a known condition name (in condition-case)" | |
| 4143 ;; condition)) | |
| 4144 ) | |
| 4145 (setq compiled-clauses | |
| 4146 (cons (cons condition | |
| 4147 (byte-compile-top-level-body | |
| 4148 (cdr clause) for-effect)) | |
| 4149 compiled-clauses))) | |
| 4150 (setq clauses (cdr clauses))) | |
| 4151 (byte-compile-push-constant (nreverse compiled-clauses))) | |
| 4152 (if (memq 'unused-vars byte-compile-warnings) | |
| 4153 ;; done compiling in this scope, warn now. | |
| 4154 (byte-compile-warn-about-unused-variables)) | |
| 4155 (byte-compile-out 'byte-condition-case 0))) | |
| 4156 | |
| 4157 | |
| 4158 (defun byte-compile-save-excursion (form) | |
| 4159 (byte-compile-out 'byte-save-excursion 0) | |
| 4160 (byte-compile-body-do-effect (cdr form)) | |
| 4161 (byte-compile-out 'byte-unbind 1)) | |
| 4162 | |
| 4163 (defun byte-compile-save-restriction (form) | |
| 4164 (byte-compile-out 'byte-save-restriction 0) | |
| 4165 (byte-compile-body-do-effect (cdr form)) | |
| 4166 (byte-compile-out 'byte-unbind 1)) | |
| 4167 | |
| 4168 (defun byte-compile-save-current-buffer (form) | |
| 4169 (if (byte-compile-version-cond byte-compile-emacs19-compatibility) | |
| 4170 ;; `save-current-buffer' special form is not available in XEmacs 19. | |
| 4171 (byte-compile-form | |
| 4172 `(let ((_byte_compiler_save_buffer_emulation_closure_ (current-buffer))) | |
| 4173 (unwind-protect | |
| 4174 (progn ,@(cdr form)) | |
| 4175 (and (buffer-live-p _byte_compiler_save_buffer_emulation_closure_) | |
| 4176 (set-buffer _byte_compiler_save_buffer_emulation_closure_))))) | |
| 4177 (byte-compile-out 'byte-save-current-buffer 0) | |
| 4178 (byte-compile-body-do-effect (cdr form)) | |
| 4179 (byte-compile-out 'byte-unbind 1))) | |
| 4180 | |
| 4181 (defun byte-compile-with-output-to-temp-buffer (form) | |
| 4182 (byte-compile-form (car (cdr form))) | |
| 4183 (byte-compile-out 'byte-temp-output-buffer-setup 0) | |
| 4184 (byte-compile-body (cdr (cdr form))) | |
| 4185 (byte-compile-out 'byte-temp-output-buffer-show 0)) | |
| 4186 | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4187 (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
|
4188 (if (< (length form) 2) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4189 (progn |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4190 (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
|
4191 (byte-compile-normal-call |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4192 `(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
|
4193 ,(length (cdr form)))))) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4194 (setq form (cdr form)) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4195 (byte-compile-form (car form)) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4196 (byte-compile-push-constant 0) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4197 (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
|
4198 ;; 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
|
4199 ;; 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
|
4200 ;; called. |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4201 (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
|
4202 (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
|
4203 ;; 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
|
4204 ;; not pushing it on the stack. |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4205 (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
|
4206 (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
|
4207 (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
|
4208 byte-compile-checks-on-load |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4209 :test #'equal))) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4210 |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4211 (defun byte-compile-multiple-value-list-internal (form) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4212 (if (/= 4 (length form)) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4213 (progn |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4214 (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
|
4215 (byte-compile-normal-call |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4216 `(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
|
4217 ,(length (cdr form)))))) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4218 (byte-compile-form (nth 1 form)) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4219 (byte-compile-form (nth 2 form)) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4220 (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
|
4221 (byte-compile-form (nth 3 form)) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4222 (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
|
4223 (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
|
4224 byte-compile-checks-on-load |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4225 :test #'equal))) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4226 |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4227 (defun byte-compile-throw (form) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4228 ;; 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
|
4229 ;; 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
|
4230 ;; 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
|
4231 ;; 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
|
4232 ;; 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
|
4233 ;; that, but this file should not assume that that will always be there). |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4234 (if (/= 2 (length (cdr form))) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4235 (progn |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4236 (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
|
4237 (byte-compile-normal-call |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4238 `(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
|
4239 ,(length (cdr form)))))) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4240 (byte-compile-form (nth 1 form)) ;; Push the arguments |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4241 (byte-compile-form (nth 2 form)) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4242 (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
|
4243 (pushnew '(null (function-max-args 'throw)) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4244 byte-compile-checks-on-load |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4245 :test #'equal))) |
| 428 | 4246 |
| 4247 ;;; top-level forms elsewhere | |
| 4248 | |
| 4249 (byte-defop-compiler-1 defun) | |
| 4250 (byte-defop-compiler-1 defmacro) | |
| 4251 (byte-defop-compiler-1 defvar) | |
| 442 | 4252 (byte-defop-compiler-1 defvar byte-compile-defvar-or-defconst) |
| 4253 (byte-defop-compiler-1 defconst byte-compile-defvar-or-defconst) | |
| 428 | 4254 (byte-defop-compiler-1 autoload) |
| 4255 ;; According to Mly this can go now that lambda is a macro | |
| 4256 ;(byte-defop-compiler-1 lambda byte-compile-lambda-form) | |
| 4257 (byte-defop-compiler-1 defalias) | |
| 4258 (byte-defop-compiler-1 define-function) | |
| 4259 | |
| 4260 (defun byte-compile-defun (form) | |
| 4261 ;; This is not used for file-level defuns with doc strings. | |
| 4262 (byte-compile-two-args ; Use this to avoid byte-compile-fset's warning. | |
| 4263 (list 'fset (list 'quote (nth 1 form)) | |
| 4264 (byte-compile-byte-code-maker | |
| 4265 (byte-compile-lambda (cons 'lambda (cdr (cdr form))))))) | |
| 4266 (byte-compile-discard) | |
| 4267 (byte-compile-constant (nth 1 form))) | |
| 4268 | |
| 4269 (defun byte-compile-defmacro (form) | |
| 4270 ;; This is not used for file-level defmacros with doc strings. | |
| 4271 (byte-compile-body-do-effect | |
| 4272 (list (list 'fset (list 'quote (nth 1 form)) | |
| 4273 (let ((code (byte-compile-byte-code-maker | |
| 4274 (byte-compile-lambda | |
| 4275 (cons 'lambda (cdr (cdr form))))))) | |
| 4276 (if (eq (car-safe code) 'make-byte-code) | |
| 4277 (list 'cons ''macro code) | |
| 4278 (list 'quote (cons 'macro (eval code)))))) | |
| 4279 (list 'quote (nth 1 form))))) | |
| 4280 | |
| 442 | 4281 (defun byte-compile-defvar-or-defconst (form) |
| 4282 ;; This is not used for file-level defvar/defconsts with doc strings: | |
| 4283 ;; byte-compile-file-form-defvar-or-defconst will be used in that case. | |
| 4284 ;; (defvar|defconst VAR [VALUE [DOCSTRING]]) | |
| 4285 (let ((fun (nth 0 form)) | |
| 4286 (var (nth 1 form)) | |
| 428 | 4287 (value (nth 2 form)) |
| 4288 (string (nth 3 form))) | |
| 442 | 4289 (when (> (length form) 4) |
| 4290 (byte-compile-warn | |
| 4291 "%s %s called with %d arguments, but accepts only %s" | |
| 4292 fun var (length (cdr form)) 3)) | |
| 4293 (when (memq 'free-vars byte-compile-warnings) | |
| 4294 (push (cons var byte-compile-global-bit) byte-compile-bound-variables)) | |
| 428 | 4295 (byte-compile-body-do-effect |
| 442 | 4296 (list |
| 4297 ;; Put the defined variable in this library's load-history entry | |
| 444 | 4298 ;; just as a real defvar would, but only in top-level forms with values. |
| 4299 (when (and (> (length form) 2) | |
| 4300 (null byte-compile-current-form)) | |
| 442 | 4301 `(push ',var current-load-list)) |
| 4302 (when (> (length form) 3) | |
| 4303 (when (and string (not (stringp string))) | |
| 4304 (byte-compile-warn "Third arg to %s %s is not a string: %s" | |
| 4305 fun var string)) | |
| 4306 `(put ',var 'variable-documentation ,string)) | |
| 4307 (if (cdr (cdr form)) ; `value' provided | |
| 4308 (if (eq fun 'defconst) | |
| 4309 ;; `defconst' sets `var' unconditionally. | |
| 4310 `(setq ,var ,value) | |
| 4311 ;; `defvar' sets `var' only when unbound. | |
| 1672 | 4312 `(if (not (default-boundp ',var)) (set-default ',var ,value)))) |
| 442 | 4313 `',var)))) |
| 428 | 4314 |
| 4315 (defun byte-compile-autoload (form) | |
| 4316 (and (byte-compile-constp (nth 1 form)) | |
| 4317 (byte-compile-constp (nth 5 form)) | |
| 4318 (memq (eval (nth 5 form)) '(t macro)) ; macro-p | |
| 4319 (not (fboundp (eval (nth 1 form)))) | |
| 4320 (byte-compile-warn | |
| 4321 "The compiler ignores `autoload' except at top level. You should | |
| 4322 probably put the autoload of the macro `%s' at top-level." | |
| 4323 (eval (nth 1 form)))) | |
| 4324 (byte-compile-normal-call form)) | |
| 4325 | |
| 4326 ;; Lambda's in valid places are handled as special cases by various code. | |
| 4327 ;; The ones that remain are errors. | |
| 4328 ;; According to Mly this can go now that lambda is a macro | |
| 4329 ;(defun byte-compile-lambda-form (form) | |
| 4330 ; (byte-compile-warn | |
| 4331 ; "`lambda' used in function position is invalid: probably you mean #'%s" | |
| 4332 ; (let ((print-escape-newlines t) | |
| 4333 ; (print-level 4) | |
| 4334 ; (print-length 4)) | |
| 4335 ; (prin1-to-string form))) | |
| 4336 ; (byte-compile-normal-call | |
| 4337 ; (list 'signal ''error | |
| 4338 ; (list 'quote (list "`lambda' used in function position" form))))) | |
| 4339 | |
| 4340 ;; Compile normally, but deal with warnings for the function being defined. | |
| 4341 (defun byte-compile-defalias (form) | |
| 4342 (if (and (consp (cdr form)) (consp (nth 1 form)) | |
| 4343 (eq (car (nth 1 form)) 'quote) | |
| 4344 (consp (cdr (nth 1 form))) | |
| 4345 (symbolp (nth 1 (nth 1 form))) | |
| 4346 (consp (nthcdr 2 form)) | |
| 4347 (consp (nth 2 form)) | |
| 4348 (eq (car (nth 2 form)) 'quote) | |
| 4349 (consp (cdr (nth 2 form))) | |
| 4350 (symbolp (nth 1 (nth 2 form)))) | |
| 4351 (progn | |
| 4352 (byte-compile-defalias-warn (nth 1 (nth 1 form)) | |
| 4353 (nth 1 (nth 2 form))) | |
| 4354 (setq byte-compile-function-environment | |
| 4355 (cons (cons (nth 1 (nth 1 form)) | |
| 4356 (nth 1 (nth 2 form))) | |
| 4357 byte-compile-function-environment)))) | |
| 4358 (byte-compile-normal-call form)) | |
| 4359 | |
| 4360 (defun byte-compile-define-function (form) | |
| 4361 (byte-compile-defalias form)) | |
| 4362 | |
| 4363 ;; Turn off warnings about prior calls to the function being defalias'd. | |
| 4364 ;; This could be smarter and compare those calls with | |
| 4365 ;; the function it is being aliased to. | |
| 4366 (defun byte-compile-defalias-warn (new alias) | |
| 4367 (let ((calls (assq new byte-compile-unresolved-functions))) | |
| 4368 (if calls | |
| 4369 (setq byte-compile-unresolved-functions | |
| 4370 (delq calls byte-compile-unresolved-functions))))) | |
| 4371 | |
| 4372 ;;; tags | |
| 4373 | |
| 4374 ;; Note: Most operations will strip off the 'TAG, but it speeds up | |
| 4375 ;; optimization to have the 'TAG as a part of the tag. | |
| 4376 ;; Tags will be (TAG . (tag-number . stack-depth)). | |
| 4377 (defun byte-compile-make-tag () | |
| 4378 (list 'TAG (setq byte-compile-tag-number (1+ byte-compile-tag-number)))) | |
| 4379 | |
| 4380 | |
| 4381 (defun byte-compile-out-tag (tag) | |
| 4382 (push tag byte-compile-output) | |
| 4383 (if (cdr (cdr tag)) | |
| 4384 (progn | |
| 4385 ;; ## remove this someday | |
| 4386 (and byte-compile-depth | |
| 4387 (not (= (cdr (cdr tag)) byte-compile-depth)) | |
| 4388 (error "Compiler bug: depth conflict at tag %d" (car (cdr tag)))) | |
| 4389 (setq byte-compile-depth (cdr (cdr tag)))) | |
| 4390 (setcdr (cdr tag) byte-compile-depth))) | |
| 4391 | |
| 4392 (defun byte-compile-goto (opcode tag) | |
| 4393 (push (cons opcode tag) byte-compile-output) | |
| 4394 (setcdr (cdr tag) (if (memq opcode byte-goto-always-pop-ops) | |
| 4395 (1- byte-compile-depth) | |
| 4396 byte-compile-depth)) | |
| 4397 (setq byte-compile-depth (and (not (eq opcode 'byte-goto)) | |
| 4398 (1- byte-compile-depth)))) | |
| 4399 | |
| 4400 (defun byte-compile-out (opcode offset) | |
| 4401 (push (cons opcode offset) byte-compile-output) | |
| 4402 (case opcode | |
| 4403 (byte-call | |
| 4404 (setq byte-compile-depth (- byte-compile-depth offset))) | |
| 4405 (byte-return | |
| 4406 ;; This is actually an unnecessary case, because there should be | |
| 4407 ;; no more opcodes behind byte-return. | |
| 4408 (setq byte-compile-depth nil)) | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4409 (byte-multiple-value-call |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4639
diff
changeset
|
4410 (setq byte-compile-depth (- byte-compile-depth offset))) |
| 428 | 4411 (t |
| 4412 (setq byte-compile-depth (+ byte-compile-depth | |
| 4413 (or (aref byte-stack+-info | |
| 4414 (symbol-value opcode)) | |
| 4415 (- (1- offset)))) | |
| 4416 byte-compile-maxdepth (max byte-compile-depth | |
| 4417 byte-compile-maxdepth)))) | |
| 4418 ;;(if (< byte-compile-depth 0) (error "Compiler error: stack underflow")) | |
| 4419 ) | |
| 4420 | |
| 4421 | |
| 4422 ;;; call tree stuff | |
| 4423 | |
| 4424 (defun byte-compile-annotate-call-tree (form) | |
| 4425 (let (entry) | |
| 4426 ;; annotate the current call | |
| 4427 (if (setq entry (assq (car form) byte-compile-call-tree)) | |
| 4428 (or (memq byte-compile-current-form (nth 1 entry)) ;callers | |
| 4429 (setcar (cdr entry) | |
| 4430 (cons byte-compile-current-form (nth 1 entry)))) | |
| 4431 (push (list (car form) (list byte-compile-current-form) nil) | |
| 4432 byte-compile-call-tree)) | |
| 4433 ;; annotate the current function | |
| 4434 (if (setq entry (assq byte-compile-current-form byte-compile-call-tree)) | |
| 4435 (or (memq (car form) (nth 2 entry)) ;called | |
| 4436 (setcar (cdr (cdr entry)) | |
| 4437 (cons (car form) (nth 2 entry)))) | |
| 4438 (push (list byte-compile-current-form nil (list (car form))) | |
| 4439 byte-compile-call-tree)))) | |
| 4440 | |
| 4441 ;; Renamed from byte-compile-report-call-tree | |
| 4442 ;; to avoid interfering with completion of byte-compile-file. | |
| 4443 ;;;###autoload | |
| 4444 (defun display-call-tree (&optional filename) | |
| 4445 "Display a call graph of a specified file. | |
| 4446 This lists which functions have been called, what functions called | |
| 4447 them, and what functions they call. The list includes all functions | |
| 4448 whose definitions have been compiled in this Emacs session, as well as | |
| 4449 all functions called by those functions. | |
| 4450 | |
| 4451 The call graph does not include macros, inline functions, or | |
| 4452 primitives that the byte-code interpreter knows about directly \(eq, | |
| 4453 cons, etc.\). | |
| 4454 | |
| 4455 The call tree also lists those functions which are not known to be called | |
| 4456 \(that is, to which no calls have been compiled\), and which cannot be | |
| 4457 invoked interactively." | |
| 4458 (interactive) | |
| 4459 (message "Generating call tree...") | |
| 4460 (with-output-to-temp-buffer "*Call-Tree*" | |
| 4461 (set-buffer "*Call-Tree*") | |
| 4462 (erase-buffer) | |
| 4463 (message "Generating call tree... (sorting on %s)" | |
| 4464 byte-compile-call-tree-sort) | |
| 4465 (insert "Call tree for " | |
| 4466 (cond ((null byte-compile-current-file) (or filename "???")) | |
| 4467 ((stringp byte-compile-current-file) | |
| 4468 byte-compile-current-file) | |
| 4469 (t (buffer-name byte-compile-current-file))) | |
| 4470 " sorted on " | |
| 4471 (prin1-to-string byte-compile-call-tree-sort) | |
| 4472 ":\n\n") | |
| 4473 (if byte-compile-call-tree-sort | |
| 4474 (setq byte-compile-call-tree | |
| 4475 (sort byte-compile-call-tree | |
| 4476 (cond | |
| 4477 ((eq byte-compile-call-tree-sort 'callers) | |
| 4478 #'(lambda (x y) (< (length (nth 1 x)) | |
| 4479 (length (nth 1 y))))) | |
| 4480 ((eq byte-compile-call-tree-sort 'calls) | |
| 4481 #'(lambda (x y) (< (length (nth 2 x)) | |
| 4482 (length (nth 2 y))))) | |
| 4483 ((eq byte-compile-call-tree-sort 'calls+callers) | |
| 4484 #'(lambda (x y) (< (+ (length (nth 1 x)) | |
| 4485 (length (nth 2 x))) | |
| 4486 (+ (length (nth 1 y)) | |
| 4487 (length (nth 2 y)))))) | |
| 4488 ((eq byte-compile-call-tree-sort 'name) | |
| 4489 #'(lambda (x y) (string< (car x) | |
| 4490 (car y)))) | |
| 4491 (t (error | |
| 4492 "`byte-compile-call-tree-sort': `%s' - unknown sort mode" | |
| 4493 byte-compile-call-tree-sort)))))) | |
| 4494 (message "Generating call tree...") | |
| 4495 (let ((rest byte-compile-call-tree) | |
| 4496 (b (current-buffer)) | |
| 4497 f p | |
| 4498 callers calls) | |
| 4499 (while rest | |
| 4500 (prin1 (car (car rest)) b) | |
| 4501 (setq callers (nth 1 (car rest)) | |
| 4502 calls (nth 2 (car rest))) | |
| 4503 (insert "\t" | |
| 4504 (cond ((not (fboundp (setq f (car (car rest))))) | |
| 4505 (if (null f) | |
| 4506 " <top level>";; shouldn't insert nil then, actually -sk | |
| 4507 " <not defined>")) | |
| 4508 ((subrp (setq f (symbol-function f))) | |
| 4509 " <subr>") | |
| 4510 ((symbolp f) | |
| 4511 (format " ==> %s" f)) | |
| 4512 ((compiled-function-p f) | |
| 4513 "<compiled function>") | |
| 4514 ((not (consp f)) | |
| 4515 "<malformed function>") | |
| 4516 ((eq 'macro (car f)) | |
| 4517 (if (or (compiled-function-p (cdr f)) | |
| 4518 (assq 'byte-code (cdr (cdr (cdr f))))) | |
| 4519 " <compiled macro>" | |
| 4520 " <macro>")) | |
| 4521 ((assq 'byte-code (cdr (cdr f))) | |
| 4522 "<compiled lambda>") | |
| 4523 ((eq 'lambda (car f)) | |
| 4524 "<function>") | |
| 4525 (t "???")) | |
| 4526 (format " (%d callers + %d calls = %d)" | |
| 4527 ;; Does the optimizer eliminate common subexpressions?-sk | |
| 4528 (length callers) | |
| 4529 (length calls) | |
| 4530 (+ (length callers) (length calls))) | |
| 4531 "\n") | |
| 4532 (if callers | |
| 4533 (progn | |
| 4534 (insert " called by:\n") | |
| 4535 (setq p (point)) | |
| 4536 (insert " " (if (car callers) | |
| 4537 (mapconcat 'symbol-name callers ", ") | |
| 4538 "<top level>")) | |
| 4539 (let ((fill-prefix " ")) | |
| 4540 (fill-region-as-paragraph p (point))))) | |
| 4541 (if calls | |
| 4542 (progn | |
| 4543 (insert " calls:\n") | |
| 4544 (setq p (point)) | |
| 4545 (insert " " (mapconcat 'symbol-name calls ", ")) | |
| 4546 (let ((fill-prefix " ")) | |
| 4547 (fill-region-as-paragraph p (point))))) | |
| 4548 (insert "\n") | |
| 4549 (setq rest (cdr rest))) | |
| 4550 | |
| 4551 (message "Generating call tree...(finding uncalled functions...)") | |
| 4552 (setq rest byte-compile-call-tree) | |
| 4553 (let ((uncalled nil)) | |
| 4554 (while rest | |
| 4555 (or (nth 1 (car rest)) | |
| 4556 (null (setq f (car (car rest)))) | |
| 4557 (byte-compile-fdefinition f t) | |
| 4558 (commandp (byte-compile-fdefinition f nil)) | |
| 4559 (setq uncalled (cons f uncalled))) | |
| 4560 (setq rest (cdr rest))) | |
| 4561 (if uncalled | |
| 4562 (let ((fill-prefix " ")) | |
| 4563 (insert "Noninteractive functions not known to be called:\n ") | |
| 4564 (setq p (point)) | |
| 4565 (insert (mapconcat 'symbol-name (nreverse uncalled) ", ")) | |
| 4566 (fill-region-as-paragraph p (point))))) | |
| 4567 ) | |
| 4568 (message "Generating call tree...done.") | |
| 4569 )) | |
| 4570 | |
| 4571 | |
| 4572 ;;; by crl@newton.purdue.edu | |
| 4573 ;;; Only works noninteractively. | |
| 4574 ;;;###autoload | |
| 4575 (defun batch-byte-compile () | |
| 4576 "Run `byte-compile-file' on the files remaining on the command line. | |
| 4577 Use this from the command line, with `-batch'; | |
| 4578 it won't work in an interactive Emacs. | |
| 4579 Each file is processed even if an error occurred previously. | |
| 444 | 4580 For example, invoke \"xemacs -batch -f batch-byte-compile $emacs/ ~/*.el\"." |
| 428 | 4581 ;; command-line-args-left is what is left of the command line (from |
| 4582 ;; startup.el) | |
| 4583 (defvar command-line-args-left) ;Avoid 'free variable' warning | |
| 4584 (if (not noninteractive) | |
| 4585 (error "`batch-byte-compile' is to be used only with -batch")) | |
| 4586 (let ((error nil)) | |
| 4587 (while command-line-args-left | |
| 442 | 4588 (if (null (batch-byte-compile-one-file)) |
| 4589 (setq error t))) | |
| 428 | 4590 (message "Done") |
| 4591 (kill-emacs (if error 1 0)))) | |
| 4592 | |
| 442 | 4593 ;;;###autoload |
| 4594 (defun batch-byte-compile-one-file () | |
| 4595 "Run `byte-compile-file' on a single file remaining on the command line. | |
| 4596 Use this from the command line, with `-batch'; | |
| 4597 it won't work in an interactive Emacs." | |
| 4598 ;; command-line-args-left is what is left of the command line (from | |
| 4599 ;; startup.el) | |
| 4600 (defvar command-line-args-left) ;Avoid 'free variable' warning | |
| 4601 (if (not noninteractive) | |
| 4602 (error "`batch-byte-compile-one-file' is to be used only with -batch")) | |
| 4603 (let (error | |
| 4604 (file-to-process (car command-line-args-left))) | |
| 4605 (setq command-line-args-left (cdr command-line-args-left)) | |
| 4606 (if (file-directory-p (expand-file-name file-to-process)) | |
| 4607 (let ((files (directory-files file-to-process)) | |
| 4608 source dest) | |
| 4609 (while files | |
| 4610 (if (and (string-match emacs-lisp-file-regexp (car files)) | |
| 4611 (not (auto-save-file-name-p (car files))) | |
| 4612 (setq source (expand-file-name | |
| 4613 (car files) | |
| 4614 file-to-process)) | |
| 4615 (setq dest (byte-compile-dest-file source)) | |
| 4616 (file-exists-p dest) | |
| 4617 (file-newer-than-file-p source dest)) | |
| 4618 (if (null (batch-byte-compile-1 source)) | |
| 4619 (setq error t))) | |
| 4620 (setq files (cdr files))) | |
| 4621 (null error)) | |
| 4622 (batch-byte-compile-1 file-to-process)))) | |
| 4623 | |
| 428 | 4624 (defun batch-byte-compile-1 (file) |
| 4625 (condition-case err | |
| 4626 (progn (byte-compile-file file) t) | |
| 4627 (error | |
| 4628 (princ ">>Error occurred processing ") | |
| 4629 (princ file) | |
| 4630 (princ ": ") | |
| 4631 (if (fboundp 'display-error) ; XEmacs 19.8+ | |
| 4632 (display-error err nil) | |
| 4633 (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
|
4634 (mapc #'(lambda (x) (princ " ") (prin1 x)) (cdr err))) |
| 428 | 4635 (princ "\n") |
| 4636 nil))) | |
| 4637 | |
| 4638 ;;;###autoload | |
| 4639 (defun batch-byte-recompile-directory-norecurse () | |
| 4640 "Same as `batch-byte-recompile-directory' but without recursion." | |
| 4641 (setq byte-recompile-directory-recursively nil) | |
| 4642 (batch-byte-recompile-directory)) | |
| 4643 | |
| 4644 ;;;###autoload | |
| 4645 (defun batch-byte-recompile-directory () | |
| 4646 "Runs `byte-recompile-directory' on the dirs remaining on the command line. | |
| 4647 Must be used only with `-batch', and kills Emacs on completion. | |
| 4648 For example, invoke `xemacs -batch -f batch-byte-recompile-directory .'." | |
| 4649 ;; command-line-args-left is what is left of the command line (startup.el) | |
| 4650 (defvar command-line-args-left) ;Avoid 'free variable' warning | |
| 4651 (if (not noninteractive) | |
| 4652 (error "batch-byte-recompile-directory is to be used only with -batch")) | |
| 4653 (or command-line-args-left | |
| 4654 (setq command-line-args-left '("."))) | |
| 4655 (let ((byte-recompile-directory-ignore-errors-p t)) | |
| 4656 (while command-line-args-left | |
| 4657 (byte-recompile-directory (car command-line-args-left)) | |
| 4658 (setq command-line-args-left (cdr command-line-args-left)))) | |
| 4659 (kill-emacs 0)) | |
| 4660 | |
| 4661 (make-obsolete 'elisp-compile-defun 'compile-defun) | |
| 4662 (make-obsolete 'byte-compile-report-call-tree 'display-call-tree) | |
| 4663 | |
| 4664 ;; other make-obsolete calls in obsolete.el. | |
| 4665 | |
| 4666 (provide 'byte-compile) | |
| 4667 (provide 'bytecomp) | |
| 4668 | |
| 4669 | |
| 4670 ;;; report metering (see the hacks in bytecode.c) | |
| 4671 | |
| 4672 (if (boundp 'byte-code-meter) | |
| 4673 (defun byte-compile-report-ops () | |
| 4674 (defvar byte-code-meter) | |
| 4675 (with-output-to-temp-buffer "*Meter*" | |
| 4676 (set-buffer "*Meter*") | |
| 4677 (let ((i 0) n op off) | |
| 4678 (while (< i 256) | |
| 4679 (setq n (aref (aref byte-code-meter 0) i) | |
| 4680 off nil) | |
| 4681 (if t ;(not (zerop n)) | |
| 4682 (progn | |
| 4683 (setq op i) | |
| 4684 (setq off nil) | |
| 4685 (cond ((< op byte-nth) | |
| 4686 (setq off (logand op 7)) | |
| 4687 (setq op (logand op 248))) | |
| 4688 ((>= op byte-constant) | |
| 4689 (setq off (- op byte-constant) | |
| 4690 op byte-constant))) | |
| 4691 (setq op (aref byte-code-vector op)) | |
| 4692 (insert (format "%-4d" i)) | |
| 4693 (insert (symbol-name op)) | |
| 4694 (if off (insert " [" (int-to-string off) "]")) | |
| 4695 (indent-to 40) | |
| 4696 (insert (int-to-string n) "\n"))) | |
| 4697 (setq i (1+ i))))))) | |
| 4698 | |
| 4699 | |
| 4700 ;; To avoid "lisp nesting exceeds max-lisp-eval-depth" when bytecomp compiles | |
| 4701 ;; itself, compile some of its most used recursive functions (at load time). | |
| 4702 ;; | |
| 4703 (eval-when-compile | |
| 4704 (or (compiled-function-p (symbol-function 'byte-compile-form)) | |
| 4705 (assq 'byte-code (symbol-function 'byte-compile-form)) | |
| 4706 (let ((byte-optimize nil) ; do it fast | |
| 4707 (byte-compile-warnings nil)) | |
| 4708 (mapcar #'(lambda (x) | |
| 4709 (or noninteractive (message "compiling %s..." x)) | |
| 4710 (byte-compile x) | |
| 4711 (or noninteractive (message "compiling %s...done" x))) | |
| 4712 '(byte-compile-normal-call | |
| 4713 byte-compile-form | |
| 4714 byte-compile-body | |
| 4715 ;; Inserted some more than necessary, to speed it up. | |
| 4716 byte-compile-top-level | |
| 4717 byte-compile-out-toplevel | |
| 4718 byte-compile-constant | |
| 4719 byte-compile-variable-ref)))) | |
| 4720 nil) | |
| 4721 | |
|
4683
0cc9d22c3732
Be more reliable about loading cl-macs at byte-compile time, cl.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4677
diff
changeset
|
4722 (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
|
4723 |
| 428 | 4724 ;;; bytecomp.el ends here |