2011-03-10 19:40:48 +00:00
|
|
|
|
;;; bytecomp.el --- compilation of Lisp code into byte code -*- lexical-binding: t -*-
|
1992-07-19 01:07:07 +00:00
|
|
|
|
|
2014-01-01 07:43:34 +00:00
|
|
|
|
;; Copyright (C) 1985-1987, 1992, 1994, 1998, 2000-2014 Free Software
|
|
|
|
|
;; Foundation, Inc.
|
1992-07-22 04:22:42 +00:00
|
|
|
|
|
1992-07-19 01:07:07 +00:00
|
|
|
|
;; Author: Jamie Zawinski <jwz@lucid.com>
|
|
|
|
|
;; Hallvard Furuseth <hbf@ulrik.uio.no>
|
2014-02-10 01:34:22 +00:00
|
|
|
|
;; Maintainer: emacs-devel@gnu.org
|
1998-01-26 10:28:01 +00:00
|
|
|
|
;; Keywords: lisp
|
2010-08-29 16:17:13 +00:00
|
|
|
|
;; Package: emacs
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
|
|
2008-05-06 03:21:21 +00:00
|
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
1992-07-10 22:06:47 +00:00
|
|
|
|
;; it under the terms of the GNU General Public License as published by
|
2008-05-06 03:21:21 +00:00
|
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
|
;; (at your option) any later version.
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
|
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
;; GNU General Public License for more details.
|
|
|
|
|
|
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
2008-05-06 03:21:21 +00:00
|
|
|
|
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
1993-03-22 03:27:18 +00:00
|
|
|
|
;;; Commentary:
|
|
|
|
|
|
|
|
|
|
;; The Emacs Lisp byte compiler. This crunches lisp source into a sort
|
2000-03-24 18:37:48 +00:00
|
|
|
|
;; of p-code (`lapcode') which takes up less space and can be interpreted
|
|
|
|
|
;; faster. [`LAP' == `Lisp Assembly Program'.]
|
1993-03-22 03:27:18 +00:00
|
|
|
|
;; The user entry points are byte-compile-file and byte-recompile-directory.
|
|
|
|
|
|
1992-07-19 01:07:07 +00:00
|
|
|
|
;;; Code:
|
|
|
|
|
|
1996-01-14 07:34:30 +00:00
|
|
|
|
;; ========================================================================
|
|
|
|
|
;; Entry points:
|
|
|
|
|
;; byte-recompile-directory, byte-compile-file,
|
2010-10-31 19:25:39 +00:00
|
|
|
|
;; byte-recompile-file,
|
1996-01-14 07:34:30 +00:00
|
|
|
|
;; batch-byte-compile, batch-byte-recompile-directory,
|
|
|
|
|
;; byte-compile, compile-defun,
|
|
|
|
|
;; display-call-tree
|
|
|
|
|
;; (byte-compile-buffer and byte-compile-and-load-file were turned off
|
|
|
|
|
;; because they are not terribly useful and get in the way of completion.)
|
|
|
|
|
|
|
|
|
|
;; This version of the byte compiler has the following improvements:
|
|
|
|
|
;; + optimization of compiled code:
|
|
|
|
|
;; - removal of unreachable code;
|
|
|
|
|
;; - removal of calls to side-effectless functions whose return-value
|
|
|
|
|
;; is unused;
|
|
|
|
|
;; - compile-time evaluation of safe constant forms, such as (consp nil)
|
|
|
|
|
;; and (ash 1 6);
|
|
|
|
|
;; - open-coding of literal lambdas;
|
|
|
|
|
;; - peephole optimization of emitted code;
|
|
|
|
|
;; - trivial functions are left uncompiled for speed.
|
|
|
|
|
;; + support for inline functions;
|
|
|
|
|
;; + compile-time evaluation of arbitrary expressions;
|
|
|
|
|
;; + compile-time warning messages for:
|
|
|
|
|
;; - functions being redefined with incompatible arglists;
|
|
|
|
|
;; - functions being redefined as macros, or vice-versa;
|
|
|
|
|
;; - functions or macros defined multiple times in the same file;
|
|
|
|
|
;; - functions being called with the incorrect number of arguments;
|
2000-03-29 21:32:57 +00:00
|
|
|
|
;; - functions being called which are not defined globally, in the
|
1996-01-14 07:34:30 +00:00
|
|
|
|
;; file, or as autoloads;
|
|
|
|
|
;; - assignment and reference of undeclared free variables;
|
|
|
|
|
;; - various syntax errors;
|
|
|
|
|
;; + correct compilation of nested defuns, defmacros, defvars and defsubsts;
|
|
|
|
|
;; + correct compilation of top-level uses of macros;
|
|
|
|
|
;; + the ability to generate a histogram of functions called.
|
|
|
|
|
|
2009-10-31 02:10:43 +00:00
|
|
|
|
;; User customization variables: M-x customize-group bytecomp
|
1996-01-14 07:34:30 +00:00
|
|
|
|
|
|
|
|
|
;; New Features:
|
|
|
|
|
;;
|
|
|
|
|
;; o The form `defsubst' is just like `defun', except that the function
|
|
|
|
|
;; generated will be open-coded in compiled code which uses it. This
|
|
|
|
|
;; means that no function call will be generated, it will simply be
|
|
|
|
|
;; spliced in. Lisp functions calls are very slow, so this can be a
|
|
|
|
|
;; big win.
|
|
|
|
|
;;
|
|
|
|
|
;; You can generally accomplish the same thing with `defmacro', but in
|
|
|
|
|
;; that case, the defined procedure can't be used as an argument to
|
|
|
|
|
;; mapcar, etc.
|
|
|
|
|
;;
|
|
|
|
|
;; o You can also open-code one particular call to a function without
|
|
|
|
|
;; open-coding all calls. Use the 'inline' form to do this, like so:
|
|
|
|
|
;;
|
|
|
|
|
;; (inline (foo 1 2 3)) ;; `foo' will be open-coded
|
|
|
|
|
;; or...
|
2000-03-29 21:32:57 +00:00
|
|
|
|
;; (inline ;; `foo' and `baz' will be
|
1996-01-14 07:34:30 +00:00
|
|
|
|
;; (foo 1 2 3 (bar 5)) ;; open-coded, but `bar' will not.
|
|
|
|
|
;; (baz 0))
|
|
|
|
|
;;
|
|
|
|
|
;; o It is possible to open-code a function in the same file it is defined
|
2004-04-16 12:51:06 +00:00
|
|
|
|
;; in without having to load that file before compiling it. The
|
1996-01-14 07:34:30 +00:00
|
|
|
|
;; byte-compiler has been modified to remember function definitions in
|
|
|
|
|
;; the compilation environment in the same way that it remembers macro
|
|
|
|
|
;; definitions.
|
|
|
|
|
;;
|
|
|
|
|
;; o Forms like ((lambda ...) ...) are open-coded.
|
|
|
|
|
;;
|
|
|
|
|
;; o The form `eval-when-compile' is like progn, except that the body
|
|
|
|
|
;; is evaluated at compile-time. When it appears at top-level, this
|
|
|
|
|
;; is analogous to the Common Lisp idiom (eval-when (compile) ...).
|
|
|
|
|
;; When it does not appear at top-level, it is similar to the
|
|
|
|
|
;; Common Lisp #. reader macro (but not in interpreted code).
|
|
|
|
|
;;
|
|
|
|
|
;; o The form `eval-and-compile' is similar to eval-when-compile, but
|
|
|
|
|
;; the whole form is evalled both at compile-time and at run-time.
|
|
|
|
|
;;
|
|
|
|
|
;; o The command compile-defun is analogous to eval-defun.
|
|
|
|
|
;;
|
2000-03-29 21:32:57 +00:00
|
|
|
|
;; o If you run byte-compile-file on a filename which is visited in a
|
1996-01-14 07:34:30 +00:00
|
|
|
|
;; buffer, and that buffer is modified, you are asked whether you want
|
|
|
|
|
;; to save the buffer before compiling.
|
|
|
|
|
;;
|
|
|
|
|
;; o byte-compiled files now start with the string `;ELC'.
|
|
|
|
|
;; Some versions of `file' can be customized to recognize that.
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
1992-11-16 01:21:50 +00:00
|
|
|
|
(require 'backquote)
|
2010-06-13 20:36:17 +00:00
|
|
|
|
(require 'macroexp)
|
2011-02-10 18:53:49 +00:00
|
|
|
|
(require 'cconv)
|
2012-06-10 13:28:26 +00:00
|
|
|
|
(eval-when-compile (require 'cl-lib))
|
1992-11-16 01:21:50 +00:00
|
|
|
|
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(or (fboundp 'defsubst)
|
|
|
|
|
;; This really ought to be loaded already!
|
2003-04-12 20:28:10 +00:00
|
|
|
|
(load "byte-run"))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
2010-06-13 20:36:17 +00:00
|
|
|
|
;; The feature of compiling in a specific target Emacs version
|
|
|
|
|
;; has been turned off because compile time options are a bad idea.
|
1998-01-26 10:28:01 +00:00
|
|
|
|
(defgroup bytecomp nil
|
2005-07-04 02:41:08 +00:00
|
|
|
|
"Emacs Lisp byte-compiler."
|
1998-01-26 10:28:01 +00:00
|
|
|
|
:group 'lisp)
|
|
|
|
|
|
2009-02-02 03:27:30 +00:00
|
|
|
|
(defcustom emacs-lisp-file-regexp "\\.el\\'"
|
2008-11-20 12:13:49 +00:00
|
|
|
|
"Regexp which matches Emacs Lisp source files.
|
2009-09-05 19:10:37 +00:00
|
|
|
|
If you change this, you might want to set `byte-compile-dest-file-function'."
|
1998-01-26 10:28:01 +00:00
|
|
|
|
:group 'bytecomp
|
|
|
|
|
:type 'regexp)
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
2009-09-05 19:10:37 +00:00
|
|
|
|
(defcustom byte-compile-dest-file-function nil
|
|
|
|
|
"Function for the function `byte-compile-dest-file' to call.
|
|
|
|
|
It should take one argument, the name of an Emacs Lisp source
|
|
|
|
|
file name, and return the name of the compiled file."
|
|
|
|
|
:group 'bytecomp
|
|
|
|
|
:type '(choice (const nil) function)
|
|
|
|
|
:version "23.2")
|
|
|
|
|
|
1995-08-22 18:52:47 +00:00
|
|
|
|
;; This enables file name handlers such as jka-compr
|
|
|
|
|
;; to remove parts of the file name that should not be copied
|
|
|
|
|
;; through to the output file name.
|
|
|
|
|
(defun byte-compiler-base-file-name (filename)
|
|
|
|
|
(let ((handler (find-file-name-handler filename
|
|
|
|
|
'byte-compiler-base-file-name)))
|
|
|
|
|
(if handler
|
|
|
|
|
(funcall handler 'byte-compiler-base-file-name filename)
|
|
|
|
|
filename)))
|
|
|
|
|
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(or (fboundp 'byte-compile-dest-file)
|
1993-06-11 16:19:49 +00:00
|
|
|
|
;; The user may want to redefine this along with emacs-lisp-file-regexp,
|
1992-07-10 22:06:47 +00:00
|
|
|
|
;; so only define it if it is undefined.
|
2009-09-05 19:10:37 +00:00
|
|
|
|
;; Note - redefining this function is obsolete as of 23.2.
|
|
|
|
|
;; Customize byte-compile-dest-file-function instead.
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(defun byte-compile-dest-file (filename)
|
2007-02-13 12:07:26 +00:00
|
|
|
|
"Convert an Emacs Lisp source file name to a compiled file name.
|
2009-09-05 19:10:37 +00:00
|
|
|
|
If `byte-compile-dest-file-function' is non-nil, uses that
|
|
|
|
|
function to do the work. Otherwise, if FILENAME matches
|
|
|
|
|
`emacs-lisp-file-regexp' (by default, files with the extension `.el'),
|
|
|
|
|
adds `c' to it; otherwise adds `.elc'."
|
|
|
|
|
(if byte-compile-dest-file-function
|
|
|
|
|
(funcall byte-compile-dest-file-function filename)
|
|
|
|
|
(setq filename (file-name-sans-versions
|
|
|
|
|
(byte-compiler-base-file-name filename)))
|
|
|
|
|
(cond ((string-match emacs-lisp-file-regexp filename)
|
|
|
|
|
(concat (substring filename 0 (match-beginning 0)) ".elc"))
|
|
|
|
|
(t (concat filename ".elc"))))))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
|
|
|
|
;; This can be the 'byte-compile property of any symbol.
|
1992-07-15 20:26:37 +00:00
|
|
|
|
(autoload 'byte-compile-inline-expand "byte-opt")
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
2011-11-27 04:43:11 +00:00
|
|
|
|
;; This is the entry point to the lapcode optimizer pass1.
|
1992-07-15 20:26:37 +00:00
|
|
|
|
(autoload 'byte-optimize-form "byte-opt")
|
2011-11-27 04:43:11 +00:00
|
|
|
|
;; This is the entry point to the lapcode optimizer pass2.
|
1992-07-15 20:26:37 +00:00
|
|
|
|
(autoload 'byte-optimize-lapcode "byte-opt")
|
|
|
|
|
(autoload 'byte-compile-unfold-lambda "byte-opt")
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
* disass.el (disassemble): Add autoload cookie for this.
* bytecomp.el (byte-decompile-bytecode): Add an autoload for this.
compiled-function-p has been renamed to byte-code-function-p.
* subr.el: Define compiled-function-p as an alias for it.
* bytecomp.el: Register compiled-function-p as obsolete.
* bytecomp.el, byte-opt.el, disass.el, help.el, map-ynp.el: Change
uses.
unread-command-event has been replaced by unread-command-events.
* simple.el (prefix-arg-internal): Use this to push back all
key sequences for processing by the main command loop, instead of
trying to simulate its behavior ourselves.
* bytecomp.el: Document unread-command-event as an obsolete
variable, although nothing but the GNU Emacs 19 sources use it.
Adjust obsolescence message for unread-command-char.
* comint.el (comint-dynamic-list-completions): Change uses of
unread-command-event to work with unread-command-events.
* ebuff-menu.el (electric-buffer-list, Electric-buffer-menu-exit):
Same.
* edebug.el (edebug-outside-excursion): Same.
* ehelp.el (electric-help-command-loop): Same.
* electric.el (Electric-command-loop): Same.
* emerge.el (emerge-show-file-name): Same.
* fortran.el (fortran-abbrev-start,
fortran-window-create-momentarily): Same.
* gnus.el (gnus-Subject-next-article): Same.
* info.el (Info-summary): Same.
* isearch-mode.el (isearch-update, isearch-unread): Same.
* map-ynp.el (map-y-or-n-p): Same.
* mlsupport.el (push-back-character): Same.
* replace.el (perform-replace): Same.
* simula.el (simula-electric-label): Same.
* subr.el (read-quoted-char, momentary-string-display): Same.
* sun-mouse.el (mouse-second-hit): Same.
* terminal.el (te-escape-extended-command-unread): Same.
* vip.el (vip-escape-to-emacs, vip-prefix-arg-value,
vip-prefix-arg-com): Same.
1993-01-26 01:36:02 +00:00
|
|
|
|
;; This is the entry point to the decompiler, which is used by the
|
|
|
|
|
;; disassembler. The disassembler just requires 'byte-compile, but
|
|
|
|
|
;; that doesn't define this function, so this seems to be a reasonable
|
|
|
|
|
;; thing to do.
|
|
|
|
|
(autoload 'byte-decompile-bytecode "byte-opt")
|
|
|
|
|
|
1998-01-26 10:28:01 +00:00
|
|
|
|
(defcustom byte-compile-verbose
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(and (not noninteractive) (> baud-rate search-slow-speed))
|
2008-11-20 12:13:49 +00:00
|
|
|
|
"Non-nil means print messages describing progress of byte-compiler."
|
1998-01-26 10:28:01 +00:00
|
|
|
|
:group 'bytecomp
|
|
|
|
|
:type 'boolean)
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
1998-01-26 10:28:01 +00:00
|
|
|
|
(defcustom byte-optimize t
|
2008-11-20 12:13:49 +00:00
|
|
|
|
"Enable optimization in the byte compiler.
|
2006-11-30 16:26:37 +00:00
|
|
|
|
Possible values are:
|
|
|
|
|
nil - no optimization
|
|
|
|
|
t - all optimizations
|
|
|
|
|
`source' - source-level optimizations only
|
|
|
|
|
`byte' - code-level optimizations only"
|
1998-01-26 10:28:01 +00:00
|
|
|
|
:group 'bytecomp
|
|
|
|
|
:type '(choice (const :tag "none" nil)
|
|
|
|
|
(const :tag "all" t)
|
|
|
|
|
(const :tag "source-level" source)
|
|
|
|
|
(const :tag "byte-level" byte)))
|
|
|
|
|
|
2002-09-09 00:28:38 +00:00
|
|
|
|
(defcustom byte-compile-delete-errors nil
|
2008-11-20 12:13:49 +00:00
|
|
|
|
"If non-nil, the optimizer may delete forms that may signal an error.
|
1998-01-26 10:28:01 +00:00
|
|
|
|
This includes variable references and calls to functions such as `car'."
|
|
|
|
|
:group 'bytecomp
|
|
|
|
|
:type 'boolean)
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
1994-12-24 05:58:05 +00:00
|
|
|
|
(defvar byte-compile-dynamic nil
|
1998-01-26 10:28:01 +00:00
|
|
|
|
"If non-nil, compile function bodies so they load lazily.
|
1998-09-28 13:32:44 +00:00
|
|
|
|
They are hidden in comments in the compiled file,
|
|
|
|
|
and each one is brought into core when the
|
1994-12-24 05:58:05 +00:00
|
|
|
|
function is called.
|
|
|
|
|
|
|
|
|
|
To enable this option, make it a file-local variable
|
|
|
|
|
in the source file you want it to apply to.
|
|
|
|
|
For example, add -*-byte-compile-dynamic: t;-*- on the first line.
|
|
|
|
|
|
|
|
|
|
When this option is true, if you load the compiled file and then move it,
|
|
|
|
|
the functions you loaded will not be able to run.")
|
2006-05-11 15:01:41 +00:00
|
|
|
|
;;;###autoload(put 'byte-compile-dynamic 'safe-local-variable 'booleanp)
|
1994-12-24 05:58:05 +00:00
|
|
|
|
|
2007-01-29 01:22:53 +00:00
|
|
|
|
(defvar byte-compile-disable-print-circle nil
|
|
|
|
|
"If non-nil, disable `print-circle' on printing a byte-compiled code.")
|
2011-02-23 15:22:28 +00:00
|
|
|
|
(make-obsolete-variable 'byte-compile-disable-print-circle nil "24.1")
|
2007-01-29 01:22:53 +00:00
|
|
|
|
;;;###autoload(put 'byte-compile-disable-print-circle 'safe-local-variable 'booleanp)
|
|
|
|
|
|
1998-01-26 10:28:01 +00:00
|
|
|
|
(defcustom byte-compile-dynamic-docstrings t
|
2008-11-20 12:13:49 +00:00
|
|
|
|
"If non-nil, compile doc strings for lazy access.
|
|
|
|
|
We bury the doc strings of functions and variables inside comments in
|
|
|
|
|
the file, and bring them into core only when they are actually needed.
|
1994-12-24 05:58:05 +00:00
|
|
|
|
|
|
|
|
|
When this option is true, if you load the compiled file and then move it,
|
|
|
|
|
you won't be able to find the documentation of anything in that file.
|
|
|
|
|
|
1995-05-18 20:04:09 +00:00
|
|
|
|
To disable this option for a certain file, make it a file-local variable
|
|
|
|
|
in the source file. For example, add this to the first line:
|
|
|
|
|
-*-byte-compile-dynamic-docstrings:nil;-*-
|
|
|
|
|
You can also set the variable globally.
|
|
|
|
|
|
1998-01-26 10:28:01 +00:00
|
|
|
|
This option is enabled by default because it reduces Emacs memory usage."
|
|
|
|
|
:group 'bytecomp
|
|
|
|
|
:type 'boolean)
|
2006-05-11 15:01:41 +00:00
|
|
|
|
;;;###autoload(put 'byte-compile-dynamic-docstrings 'safe-local-variable 'booleanp)
|
1994-12-24 05:58:05 +00:00
|
|
|
|
|
2010-11-12 03:21:38 +00:00
|
|
|
|
(defconst byte-compile-log-buffer "*Compile-Log*"
|
|
|
|
|
"Name of the byte-compiler's log buffer.")
|
|
|
|
|
|
1998-01-26 10:28:01 +00:00
|
|
|
|
(defcustom byte-optimize-log nil
|
2010-11-12 03:21:38 +00:00
|
|
|
|
"If non-nil, the byte-compiler will log its optimizations.
|
1992-07-10 22:06:47 +00:00
|
|
|
|
If this is 'source, then only source-level optimizations will be logged.
|
2010-11-12 03:21:38 +00:00
|
|
|
|
If it is 'byte, then only byte-level optimizations will be logged.
|
|
|
|
|
The information is logged to `byte-compile-log-buffer'."
|
1998-01-26 10:28:01 +00:00
|
|
|
|
:group 'bytecomp
|
|
|
|
|
:type '(choice (const :tag "none" nil)
|
|
|
|
|
(const :tag "all" t)
|
|
|
|
|
(const :tag "source-level" source)
|
|
|
|
|
(const :tag "byte-level" byte)))
|
|
|
|
|
|
|
|
|
|
(defcustom byte-compile-error-on-warn nil
|
2008-11-20 12:13:49 +00:00
|
|
|
|
"If true, the byte-compiler reports warnings with `error'."
|
1998-01-26 10:28:01 +00:00
|
|
|
|
:group 'bytecomp
|
|
|
|
|
:type 'boolean)
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
1994-12-26 01:28:59 +00:00
|
|
|
|
(defconst byte-compile-warning-types
|
2004-11-02 09:22:16 +00:00
|
|
|
|
'(redefine callargs free-vars unresolved
|
2007-09-21 07:17:23 +00:00
|
|
|
|
obsolete noruntime cl-functions interactive-only
|
2010-09-15 15:30:43 +00:00
|
|
|
|
make-local mapcar constants suspicious lexical)
|
2002-07-02 18:48:34 +00:00
|
|
|
|
"The list of warning types used when `byte-compile-warnings' is t.")
|
1998-01-26 10:28:01 +00:00
|
|
|
|
(defcustom byte-compile-warnings t
|
2008-11-20 12:13:49 +00:00
|
|
|
|
"List of warnings that the byte-compiler should issue (t for all).
|
2002-07-02 18:48:34 +00:00
|
|
|
|
|
2006-11-30 16:26:37 +00:00
|
|
|
|
Elements of the list may be:
|
1992-08-12 12:57:12 +00:00
|
|
|
|
|
|
|
|
|
free-vars references to variables not in the current lexical scope.
|
|
|
|
|
unresolved calls to unknown functions.
|
2005-05-14 12:30:08 +00:00
|
|
|
|
callargs function calls with args that don't match the definition.
|
|
|
|
|
redefine function name redefined from a macro to ordinary function or vice
|
1992-08-12 12:57:12 +00:00
|
|
|
|
versa, or redefined to take a different number of arguments.
|
2002-07-02 18:48:34 +00:00
|
|
|
|
obsolete obsolete variables and functions.
|
|
|
|
|
noruntime functions that may not be defined at runtime (typically
|
|
|
|
|
defined only under `eval-when-compile').
|
2013-05-28 06:52:51 +00:00
|
|
|
|
cl-functions calls to runtime functions (as distinguished from macros and
|
|
|
|
|
aliases) from the old CL package (not the newer cl-lib).
|
2004-11-02 09:22:16 +00:00
|
|
|
|
interactive-only
|
2007-06-07 07:00:00 +00:00
|
|
|
|
commands that normally shouldn't be called from Lisp code.
|
2013-05-28 06:52:51 +00:00
|
|
|
|
lexical global/dynamic variables lacking a prefix.
|
2007-09-21 07:13:28 +00:00
|
|
|
|
make-local calls to make-variable-buffer-local that may be incorrect.
|
2007-10-28 23:53:06 +00:00
|
|
|
|
mapcar mapcar called for effect.
|
2009-10-31 02:10:43 +00:00
|
|
|
|
constants let-binding of, or assignment to, constants/nonvariables.
|
2009-11-27 22:03:04 +00:00
|
|
|
|
suspicious constructs that usually don't do what the coder wanted.
|
2007-10-28 23:53:06 +00:00
|
|
|
|
|
|
|
|
|
If the list begins with `not', then the remaining elements specify warnings to
|
|
|
|
|
suppress. For example, (not mapcar) will suppress warnings about mapcar."
|
1998-01-26 10:28:01 +00:00
|
|
|
|
:group 'bytecomp
|
2002-07-02 18:48:34 +00:00
|
|
|
|
:type `(choice (const :tag "All" t)
|
1998-04-14 10:43:27 +00:00
|
|
|
|
(set :menu-tag "Some"
|
2009-11-27 22:03:04 +00:00
|
|
|
|
,@(mapcar (lambda (x) `(const ,x))
|
|
|
|
|
byte-compile-warning-types))))
|
2007-10-26 07:35:31 +00:00
|
|
|
|
|
2006-05-16 10:05:09 +00:00
|
|
|
|
;;;###autoload
|
2010-11-11 22:19:01 +00:00
|
|
|
|
(put 'byte-compile-warnings 'safe-local-variable
|
|
|
|
|
(lambda (v)
|
|
|
|
|
(or (symbolp v)
|
|
|
|
|
(null (delq nil (mapcar (lambda (x) (not (symbolp x))) v))))))
|
2004-11-02 09:22:16 +00:00
|
|
|
|
|
2007-10-28 23:53:06 +00:00
|
|
|
|
(defun byte-compile-warning-enabled-p (warning)
|
|
|
|
|
"Return non-nil if WARNING is enabled, according to `byte-compile-warnings'."
|
|
|
|
|
(or (eq byte-compile-warnings t)
|
|
|
|
|
(if (eq (car byte-compile-warnings) 'not)
|
|
|
|
|
(not (memq warning byte-compile-warnings))
|
|
|
|
|
(memq warning byte-compile-warnings))))
|
|
|
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
|
(defun byte-compile-disable-warning (warning)
|
|
|
|
|
"Change `byte-compile-warnings' to disable WARNING.
|
|
|
|
|
If `byte-compile-warnings' is t, set it to `(not WARNING)'.
|
2007-10-30 06:23:06 +00:00
|
|
|
|
Otherwise, if the first element is `not', add WARNING, else remove it.
|
|
|
|
|
Normally you should let-bind `byte-compile-warnings' before calling this,
|
|
|
|
|
else the global value will be modified."
|
2007-10-28 23:53:06 +00:00
|
|
|
|
(setq byte-compile-warnings
|
|
|
|
|
(cond ((eq byte-compile-warnings t)
|
|
|
|
|
(list 'not warning))
|
|
|
|
|
((eq (car byte-compile-warnings) 'not)
|
|
|
|
|
(if (memq warning byte-compile-warnings)
|
|
|
|
|
byte-compile-warnings
|
|
|
|
|
(append byte-compile-warnings (list warning))))
|
|
|
|
|
(t
|
|
|
|
|
(delq warning byte-compile-warnings)))))
|
|
|
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
|
(defun byte-compile-enable-warning (warning)
|
|
|
|
|
"Change `byte-compile-warnings' to enable WARNING.
|
|
|
|
|
If `byte-compile-warnings' is `t', do nothing. Otherwise, if the
|
2007-10-30 06:23:06 +00:00
|
|
|
|
first element is `not', remove WARNING, else add it.
|
|
|
|
|
Normally you should let-bind `byte-compile-warnings' before calling this,
|
|
|
|
|
else the global value will be modified."
|
2007-10-28 23:53:06 +00:00
|
|
|
|
(or (eq byte-compile-warnings t)
|
|
|
|
|
(setq byte-compile-warnings
|
|
|
|
|
(cond ((eq (car byte-compile-warnings) 'not)
|
|
|
|
|
(delq warning byte-compile-warnings))
|
|
|
|
|
((memq warning byte-compile-warnings)
|
|
|
|
|
byte-compile-warnings)
|
|
|
|
|
(t
|
|
|
|
|
(append byte-compile-warnings (list warning)))))))
|
|
|
|
|
|
2013-11-25 17:16:32 +00:00
|
|
|
|
(defvar byte-compile-interactive-only-functions nil
|
2004-11-02 09:22:16 +00:00
|
|
|
|
"List of commands that are not meant to be called from Lisp.")
|
2013-11-25 17:16:32 +00:00
|
|
|
|
(make-obsolete-variable 'byte-compile-interactive-only-functions
|
2014-02-07 03:23:46 +00:00
|
|
|
|
"use the `interactive-only' symbol property instead."
|
2013-11-25 17:16:32 +00:00
|
|
|
|
"24.4")
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
2009-09-16 03:13:03 +00:00
|
|
|
|
(defvar byte-compile-not-obsolete-vars nil
|
2011-11-20 04:33:36 +00:00
|
|
|
|
"List of variables that shouldn't be reported as obsolete.")
|
|
|
|
|
(defvar byte-compile-global-not-obsolete-vars nil
|
|
|
|
|
"Global list of variables that shouldn't be reported as obsolete.")
|
2009-09-16 03:13:03 +00:00
|
|
|
|
|
|
|
|
|
(defvar byte-compile-not-obsolete-funcs nil
|
2011-11-20 04:33:36 +00:00
|
|
|
|
"List of functions that shouldn't be reported as obsolete.")
|
2004-04-16 12:51:06 +00:00
|
|
|
|
|
1998-01-26 10:28:01 +00:00
|
|
|
|
(defcustom byte-compile-generate-call-tree nil
|
2008-11-20 12:13:49 +00:00
|
|
|
|
"Non-nil means collect call-graph information when compiling.
|
2004-09-08 12:04:22 +00:00
|
|
|
|
This records which functions were called and from where.
|
1992-07-15 20:26:37 +00:00
|
|
|
|
If the value is t, compilation displays the call graph when it finishes.
|
|
|
|
|
If the value is neither t nor nil, compilation asks you whether to display
|
|
|
|
|
the graph.
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
|
|
|
|
The call tree only lists functions called, not macros used. Those functions
|
|
|
|
|
which the byte-code interpreter knows about directly (eq, cons, etc.) are
|
|
|
|
|
not reported.
|
|
|
|
|
|
|
|
|
|
The call tree also lists those functions which are not known to be called
|
1995-01-09 23:10:10 +00:00
|
|
|
|
\(that is, to which no calls have been compiled). Functions which can be
|
1998-01-26 10:28:01 +00:00
|
|
|
|
invoked interactively are excluded from this list."
|
|
|
|
|
:group 'bytecomp
|
|
|
|
|
:type '(choice (const :tag "Yes" t) (const :tag "No" nil)
|
1998-06-24 09:02:58 +00:00
|
|
|
|
(other :tag "Ask" lambda)))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
2008-11-20 12:13:49 +00:00
|
|
|
|
(defvar byte-compile-call-tree nil
|
|
|
|
|
"Alist of functions and their call tree.
|
1992-07-10 22:06:47 +00:00
|
|
|
|
Each element looks like
|
|
|
|
|
|
|
|
|
|
\(FUNCTION CALLERS CALLS\)
|
|
|
|
|
|
|
|
|
|
where CALLERS is a list of functions that call FUNCTION, and CALLS
|
|
|
|
|
is a list of functions for which calls were generated while compiling
|
|
|
|
|
FUNCTION.")
|
|
|
|
|
|
1998-01-26 10:28:01 +00:00
|
|
|
|
(defcustom byte-compile-call-tree-sort 'name
|
2008-11-20 12:13:49 +00:00
|
|
|
|
"If non-nil, sort the call tree.
|
1992-07-15 20:26:37 +00:00
|
|
|
|
The values `name', `callers', `calls', `calls+callers'
|
1998-01-26 10:28:01 +00:00
|
|
|
|
specify different fields to sort on."
|
|
|
|
|
:group 'bytecomp
|
|
|
|
|
:type '(choice (const name) (const callers) (const calls)
|
|
|
|
|
(const calls+callers) (const nil)))
|
1992-07-15 20:26:37 +00:00
|
|
|
|
|
2002-05-28 17:40:47 +00:00
|
|
|
|
(defvar byte-compile-debug nil)
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(defvar byte-compile-constants nil
|
2000-03-24 18:37:48 +00:00
|
|
|
|
"List of all constants encountered during compilation of this form.")
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(defvar byte-compile-variables nil
|
2000-03-24 18:37:48 +00:00
|
|
|
|
"List of all variables encountered during compilation of this form.")
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(defvar byte-compile-bound-variables nil
|
* lisp/emacs-lisp/byte-lexbind.el: Delete.
* lisp/emacs-lisp/bytecomp.el (byte-compile-current-heap-environment)
(byte-compile-current-num-closures): Remove vars.
(byte-vec-ref, byte-vec-set): Remove byte codes.
(byte-compile-arglist-vars, byte-compile-make-lambda-lexenv): Move from
byte-lexbind.el.
(byte-compile-lambda): Never build a closure.
(byte-compile-closure-code-p, byte-compile-make-closure): Remove.
(byte-compile-closure): Simplify.
(byte-compile-top-level): Don't mess with heap environments.
(byte-compile-dynamic-variable-bind): Always maintain
byte-compile-bound-variables.
(byte-compile-variable-ref, byte-compile-variable-set): Always just use
the stack for lexical vars.
(byte-compile-push-binding-init): Simplify.
(byte-compile-not-lexical-var-p): New function, moved from cconv.el.
(byte-compile-bind, byte-compile-unbind): New functions, moved and
simplified from byte-lexbind.el.
(byte-compile-let, byte-compile-let*): Simplify.
(byte-compile-condition-case): Don't add :fun-body to the bound vars.
(byte-compile-defmacro): Simplify.
* lisp/emacs-lisp/byte-opt.el (byte-compile-side-effect-free-ops)
(byte-optimize-lapcode): Remove byte-vec-ref and byte-vec-set.
* lisp/emacs-lisp/cconv.el (cconv-not-lexical-var-p): Remove.
(cconv-freevars, cconv-analyse-function, cconv-analyse-form):
Use byte-compile-not-lexical-var-p instead.
* src/bytecode.c (Bvec_ref, Bvec_set): Remove.
(exec_byte_code): Don't handle them.
* lisp/help-fns.el (describe-function-1): Fix paren typo.
2011-02-12 05:53:30 +00:00
|
|
|
|
"List of dynamic variables bound in the context of the current form.
|
1999-12-16 15:26:03 +00:00
|
|
|
|
This list lives partly on the stack.")
|
2013-06-05 02:35:40 +00:00
|
|
|
|
(defvar byte-compile-lexical-variables nil
|
|
|
|
|
"List of variables that have been treated as lexical.
|
|
|
|
|
Filled in `cconv-analyse-form' but initialized and consulted here.")
|
2003-04-12 20:28:10 +00:00
|
|
|
|
(defvar byte-compile-const-variables nil
|
|
|
|
|
"List of variables declared as constants during compilation of this file.")
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(defvar byte-compile-free-references)
|
|
|
|
|
(defvar byte-compile-free-assignments)
|
|
|
|
|
|
1992-09-13 19:05:13 +00:00
|
|
|
|
(defvar byte-compiler-error-flag)
|
|
|
|
|
|
2014-04-21 09:34:21 +00:00
|
|
|
|
(defun byte-compile-recurse-toplevel (form &optional non-toplevel-case)
|
|
|
|
|
"Implement `eval-when-compile' and `eval-and-compile'.
|
|
|
|
|
Return the compile-time value of FORM."
|
|
|
|
|
;; Macroexpand (not macroexpand-all!) form at toplevel in case it
|
|
|
|
|
;; expands into a toplevel-equivalent `progn'. See CLHS section
|
|
|
|
|
;; 3.2.3.1, "Processing of Top Level Forms". The semantics are very
|
|
|
|
|
;; subtle: see test/automated/bytecomp-tests.el for interesting
|
|
|
|
|
;; cases.
|
|
|
|
|
(setf form (macroexpand form byte-compile-macro-environment))
|
|
|
|
|
(if (eq (car-safe form) 'progn)
|
|
|
|
|
(cons 'progn
|
|
|
|
|
(mapcar (lambda (subform)
|
|
|
|
|
(byte-compile-recurse-toplevel
|
|
|
|
|
subform non-toplevel-case))
|
|
|
|
|
(cdr form)))
|
|
|
|
|
(funcall non-toplevel-case form)))
|
|
|
|
|
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(defconst byte-compile-initial-macro-environment
|
1992-07-15 20:26:37 +00:00
|
|
|
|
'(
|
2012-11-08 14:58:15 +00:00
|
|
|
|
;; (byte-compiler-options . (lambda (&rest forms)
|
|
|
|
|
;; (apply 'byte-compiler-options-handler forms)))
|
2011-02-26 15:19:08 +00:00
|
|
|
|
(declare-function . byte-compile-macroexpand-declare-function)
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(eval-when-compile . (lambda (&rest body)
|
2014-04-21 09:34:21 +00:00
|
|
|
|
(let ((result nil))
|
|
|
|
|
(byte-compile-recurse-toplevel
|
|
|
|
|
(cons 'progn body)
|
|
|
|
|
(lambda (form)
|
|
|
|
|
(setf result
|
|
|
|
|
(byte-compile-eval
|
|
|
|
|
(byte-compile-top-level
|
|
|
|
|
(byte-compile-preprocess form))))))
|
|
|
|
|
(list 'quote result))))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(eval-and-compile . (lambda (&rest body)
|
2014-04-21 09:34:21 +00:00
|
|
|
|
(byte-compile-recurse-toplevel
|
|
|
|
|
(cons 'progn body)
|
|
|
|
|
(lambda (form)
|
|
|
|
|
(let ((compiled (byte-compile-top-level
|
|
|
|
|
(byte-compile-preprocess form))))
|
|
|
|
|
(eval compiled)
|
|
|
|
|
compiled))))))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
"The default macro-environment passed to macroexpand by the compiler.
|
|
|
|
|
Placing a macro here will cause a macro to have different semantics when
|
|
|
|
|
expanded by the compiler as when expanded by the interpreter.")
|
|
|
|
|
|
|
|
|
|
(defvar byte-compile-macro-environment byte-compile-initial-macro-environment
|
1992-07-15 20:26:37 +00:00
|
|
|
|
"Alist of macros defined in the file being compiled.
|
|
|
|
|
Each element looks like (MACRONAME . DEFINITION). It is
|
1993-06-11 16:19:49 +00:00
|
|
|
|
\(MACRONAME . nil) when a macro is redefined as a function.")
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
|
|
|
|
(defvar byte-compile-function-environment nil
|
1992-07-15 20:26:37 +00:00
|
|
|
|
"Alist of functions defined in the file being compiled.
|
|
|
|
|
This is so we can inline them when necessary.
|
|
|
|
|
Each element looks like (FUNCTIONNAME . DEFINITION). It is
|
2004-11-09 10:33:23 +00:00
|
|
|
|
\(FUNCTIONNAME . nil) when a function is redefined as a macro.
|
|
|
|
|
It is \(FUNCTIONNAME . t) when all we know is that it was defined,
|
2009-09-10 06:22:30 +00:00
|
|
|
|
and we don't know the definition. For an autoloaded function, DEFINITION
|
|
|
|
|
has the form (autoload . FILENAME).")
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
|
|
|
|
(defvar byte-compile-unresolved-functions nil
|
2000-03-24 18:37:48 +00:00
|
|
|
|
"Alist of undefined functions to which calls have been compiled.
|
2007-07-24 08:18:12 +00:00
|
|
|
|
This variable is only significant whilst compiling an entire buffer.
|
|
|
|
|
Used for warnings when a function is not known to be defined or is later
|
2000-03-24 18:37:48 +00:00
|
|
|
|
defined with incorrect args.")
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
2004-04-16 12:51:06 +00:00
|
|
|
|
(defvar byte-compile-noruntime-functions nil
|
|
|
|
|
"Alist of functions called that may not be defined when the compiled code is run.
|
|
|
|
|
Used for warnings about calling a function that is defined during compilation
|
|
|
|
|
but won't necessarily be defined when the compiled file is loaded.")
|
|
|
|
|
|
2010-06-13 20:36:17 +00:00
|
|
|
|
;; Variables for lexical binding
|
2011-04-01 15:16:50 +00:00
|
|
|
|
(defvar byte-compile--lexical-environment nil
|
2010-06-13 20:36:17 +00:00
|
|
|
|
"The current lexical environment.")
|
|
|
|
|
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(defvar byte-compile-tag-number 0)
|
|
|
|
|
(defvar byte-compile-output nil
|
|
|
|
|
"Alist describing contents to put in byte code string.
|
|
|
|
|
Each element is (INDEX . VALUE)")
|
|
|
|
|
(defvar byte-compile-depth 0 "Current depth of execution stack.")
|
|
|
|
|
(defvar byte-compile-maxdepth 0 "Maximum depth of execution stack.")
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;; The byte codes; this information is duplicated in bytecomp.c
|
|
|
|
|
|
2001-11-17 00:54:36 +00:00
|
|
|
|
(defvar byte-code-vector nil
|
1992-07-10 22:06:47 +00:00
|
|
|
|
"An array containing byte-code names indexed by byte-code values.")
|
|
|
|
|
|
2001-11-17 00:54:36 +00:00
|
|
|
|
(defvar byte-stack+-info nil
|
1992-07-10 22:06:47 +00:00
|
|
|
|
"An array with the stack adjustment for each byte-code.")
|
|
|
|
|
|
|
|
|
|
(defmacro byte-defop (opcode stack-adjust opname &optional docstring)
|
|
|
|
|
;; This is a speed-hack for building the byte-code-vector at compile-time.
|
|
|
|
|
;; We fill in the vector at macroexpand-time, and then after the last call
|
|
|
|
|
;; to byte-defop, we write the vector out as a constant instead of writing
|
|
|
|
|
;; out a bunch of calls to aset.
|
|
|
|
|
;; Actually, we don't fill in the vector itself, because that could make
|
|
|
|
|
;; it problematic to compile big changes to this compiler; we store the
|
|
|
|
|
;; values on its plist, and remove them later in -extrude.
|
|
|
|
|
(let ((v1 (or (get 'byte-code-vector 'tmp-compile-time-value)
|
|
|
|
|
(put 'byte-code-vector 'tmp-compile-time-value
|
|
|
|
|
(make-vector 256 nil))))
|
|
|
|
|
(v2 (or (get 'byte-stack+-info 'tmp-compile-time-value)
|
|
|
|
|
(put 'byte-stack+-info 'tmp-compile-time-value
|
|
|
|
|
(make-vector 256 nil)))))
|
|
|
|
|
(aset v1 opcode opname)
|
|
|
|
|
(aset v2 opcode stack-adjust))
|
|
|
|
|
(if docstring
|
|
|
|
|
(list 'defconst opname opcode (concat "Byte code opcode " docstring "."))
|
|
|
|
|
(list 'defconst opname opcode)))
|
|
|
|
|
|
|
|
|
|
(defmacro byte-extrude-byte-code-vectors ()
|
|
|
|
|
(prog1 (list 'setq 'byte-code-vector
|
|
|
|
|
(get 'byte-code-vector 'tmp-compile-time-value)
|
|
|
|
|
'byte-stack+-info
|
|
|
|
|
(get 'byte-stack+-info 'tmp-compile-time-value))
|
2000-01-06 23:38:46 +00:00
|
|
|
|
(put 'byte-code-vector 'tmp-compile-time-value nil)
|
|
|
|
|
(put 'byte-stack+-info 'tmp-compile-time-value nil)))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;; These opcodes are special in that they pack their argument into the
|
|
|
|
|
;; opcode word.
|
|
|
|
|
;;
|
2010-06-13 20:36:17 +00:00
|
|
|
|
(byte-defop 0 1 byte-stack-ref "for stack reference")
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(byte-defop 8 1 byte-varref "for variable reference")
|
|
|
|
|
(byte-defop 16 -1 byte-varset "for setting a variable")
|
|
|
|
|
(byte-defop 24 -1 byte-varbind "for binding a variable")
|
|
|
|
|
(byte-defop 32 0 byte-call "for calling a function")
|
|
|
|
|
(byte-defop 40 0 byte-unbind "for unbinding special bindings")
|
1993-06-09 11:59:12 +00:00
|
|
|
|
;; codes 8-47 are consumed by the preceding opcodes
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
Introduce new bytecodes for efficient catch/condition-case in lexbind.
* lisp/emacs-lisp/byte-opt.el (byte-optimize-form-code-walker):
Optimize under `condition-case' and `catch' if
byte-compile--use-old-handlers is nil.
(disassemble-offset): Handle new bytecodes.
* lisp/emacs-lisp/bytecomp.el (byte-pushcatch, byte-pushconditioncase)
(byte-pophandler): New byte codes.
(byte-goto-ops): Adjust accordingly.
(byte-compile--use-old-handlers): New var.
(byte-compile-catch): Use new byte codes depending on
byte-compile--use-old-handlers.
(byte-compile-condition-case--old): Rename from
byte-compile-condition-case.
(byte-compile-condition-case--new): New function.
(byte-compile-condition-case): New function that dispatches depending
on byte-compile--use-old-handlers.
(byte-compile-unwind-protect): Pass a function to byte-unwind-protect
when we can.
* lisp/emacs-lisp/cconv.el (cconv-convert, cconv-analyse-form): Adjust for
the new compilation scheme using the new byte-codes.
* src/alloc.c (Fgarbage_collect): Merge scans of handlerlist and catchlist,
and make them unconditional now that they're heap-allocated.
* src/bytecode.c (BYTE_CODES): Add Bpushcatch, Bpushconditioncase
and Bpophandler.
(bcall0): New function.
(exec_byte_code): Add corresponding cases. Improve error message when
encountering an invalid byte-code. Let Bunwind_protect accept
a function (rather than a list of expressions) as argument.
* src/eval.c (catchlist): Remove (merge with handlerlist).
(handlerlist, lisp_eval_depth): Not static any more.
(internal_catch, internal_condition_case, internal_condition_case_1)
(internal_condition_case_2, internal_condition_case_n):
Use PUSH_HANDLER.
(unwind_to_catch, Fthrow, Fsignal): Adjust to merged
handlerlist/catchlist.
(internal_lisp_condition_case): Use PUSH_HANDLER. Adjust to new
handlerlist which can only handle a single condition-case handler at
a time.
(find_handler_clause): Simplify since we only a single branch here
any more.
* src/lisp.h (struct handler): Merge struct handler and struct catchtag.
(PUSH_HANDLER): New macro.
(catchlist): Remove.
(handlerlist): Always declare.
2013-10-03 04:58:56 +00:00
|
|
|
|
;; New (in Emacs-24.4) bytecodes for more efficient handling of non-local exits
|
|
|
|
|
;; (especially useful in lexical-binding code).
|
|
|
|
|
(byte-defop 48 0 byte-pophandler)
|
|
|
|
|
(byte-defop 50 -1 byte-pushcatch)
|
|
|
|
|
(byte-defop 49 -1 byte-pushconditioncase)
|
|
|
|
|
|
|
|
|
|
;; unused: 51-55
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
|
|
|
|
(byte-defop 56 -1 byte-nth)
|
|
|
|
|
(byte-defop 57 0 byte-symbolp)
|
|
|
|
|
(byte-defop 58 0 byte-consp)
|
|
|
|
|
(byte-defop 59 0 byte-stringp)
|
|
|
|
|
(byte-defop 60 0 byte-listp)
|
|
|
|
|
(byte-defop 61 -1 byte-eq)
|
|
|
|
|
(byte-defop 62 -1 byte-memq)
|
|
|
|
|
(byte-defop 63 0 byte-not)
|
|
|
|
|
(byte-defop 64 0 byte-car)
|
|
|
|
|
(byte-defop 65 0 byte-cdr)
|
|
|
|
|
(byte-defop 66 -1 byte-cons)
|
|
|
|
|
(byte-defop 67 0 byte-list1)
|
|
|
|
|
(byte-defop 68 -1 byte-list2)
|
|
|
|
|
(byte-defop 69 -2 byte-list3)
|
|
|
|
|
(byte-defop 70 -3 byte-list4)
|
|
|
|
|
(byte-defop 71 0 byte-length)
|
|
|
|
|
(byte-defop 72 -1 byte-aref)
|
|
|
|
|
(byte-defop 73 -2 byte-aset)
|
|
|
|
|
(byte-defop 74 0 byte-symbol-value)
|
|
|
|
|
(byte-defop 75 0 byte-symbol-function) ; this was commented out
|
|
|
|
|
(byte-defop 76 -1 byte-set)
|
|
|
|
|
(byte-defop 77 -1 byte-fset) ; this was commented out
|
|
|
|
|
(byte-defop 78 -1 byte-get)
|
|
|
|
|
(byte-defop 79 -2 byte-substring)
|
|
|
|
|
(byte-defop 80 -1 byte-concat2)
|
|
|
|
|
(byte-defop 81 -2 byte-concat3)
|
|
|
|
|
(byte-defop 82 -3 byte-concat4)
|
|
|
|
|
(byte-defop 83 0 byte-sub1)
|
|
|
|
|
(byte-defop 84 0 byte-add1)
|
|
|
|
|
(byte-defop 85 -1 byte-eqlsign)
|
|
|
|
|
(byte-defop 86 -1 byte-gtr)
|
|
|
|
|
(byte-defop 87 -1 byte-lss)
|
|
|
|
|
(byte-defop 88 -1 byte-leq)
|
|
|
|
|
(byte-defop 89 -1 byte-geq)
|
|
|
|
|
(byte-defop 90 -1 byte-diff)
|
|
|
|
|
(byte-defop 91 0 byte-negate)
|
|
|
|
|
(byte-defop 92 -1 byte-plus)
|
|
|
|
|
(byte-defop 93 -1 byte-max)
|
|
|
|
|
(byte-defop 94 -1 byte-min)
|
|
|
|
|
(byte-defop 95 -1 byte-mult) ; v19 only
|
|
|
|
|
(byte-defop 96 1 byte-point)
|
|
|
|
|
(byte-defop 98 0 byte-goto-char)
|
|
|
|
|
(byte-defop 99 0 byte-insert)
|
|
|
|
|
(byte-defop 100 1 byte-point-max)
|
|
|
|
|
(byte-defop 101 1 byte-point-min)
|
|
|
|
|
(byte-defop 102 0 byte-char-after)
|
|
|
|
|
(byte-defop 103 1 byte-following-char)
|
|
|
|
|
(byte-defop 104 1 byte-preceding-char)
|
|
|
|
|
(byte-defop 105 1 byte-current-column)
|
|
|
|
|
(byte-defop 106 0 byte-indent-to)
|
|
|
|
|
(byte-defop 107 0 byte-scan-buffer-OBSOLETE) ; no longer generated as of v18
|
|
|
|
|
(byte-defop 108 1 byte-eolp)
|
|
|
|
|
(byte-defop 109 1 byte-eobp)
|
|
|
|
|
(byte-defop 110 1 byte-bolp)
|
|
|
|
|
(byte-defop 111 1 byte-bobp)
|
|
|
|
|
(byte-defop 112 1 byte-current-buffer)
|
|
|
|
|
(byte-defop 113 0 byte-set-buffer)
|
1997-06-15 23:05:19 +00:00
|
|
|
|
(byte-defop 114 0 byte-save-current-buffer
|
|
|
|
|
"To make a binding to record the current buffer")
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(byte-defop 115 0 byte-set-mark-OBSOLETE)
|
2011-04-15 12:30:15 +00:00
|
|
|
|
(byte-defop 116 1 byte-interactive-p-OBSOLETE)
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
|
|
|
|
;; These ops are new to v19
|
|
|
|
|
(byte-defop 117 0 byte-forward-char)
|
|
|
|
|
(byte-defop 118 0 byte-forward-word)
|
|
|
|
|
(byte-defop 119 -1 byte-skip-chars-forward)
|
|
|
|
|
(byte-defop 120 -1 byte-skip-chars-backward)
|
|
|
|
|
(byte-defop 121 0 byte-forward-line)
|
|
|
|
|
(byte-defop 122 0 byte-char-syntax)
|
|
|
|
|
(byte-defop 123 -1 byte-buffer-substring)
|
|
|
|
|
(byte-defop 124 -1 byte-delete-region)
|
|
|
|
|
(byte-defop 125 -1 byte-narrow-to-region)
|
|
|
|
|
(byte-defop 126 1 byte-widen)
|
|
|
|
|
(byte-defop 127 0 byte-end-of-line)
|
|
|
|
|
|
|
|
|
|
;; unused: 128
|
|
|
|
|
|
|
|
|
|
;; These store their argument in the next two bytes
|
|
|
|
|
(byte-defop 129 1 byte-constant2
|
|
|
|
|
"for reference to a constant with vector index >= byte-constant-limit")
|
|
|
|
|
(byte-defop 130 0 byte-goto "for unconditional jump")
|
|
|
|
|
(byte-defop 131 -1 byte-goto-if-nil "to pop value and jump if it's nil")
|
|
|
|
|
(byte-defop 132 -1 byte-goto-if-not-nil "to pop value and jump if it's not nil")
|
|
|
|
|
(byte-defop 133 -1 byte-goto-if-nil-else-pop
|
2000-03-29 21:32:57 +00:00
|
|
|
|
"to examine top-of-stack, jump and don't pop it if it's nil,
|
1992-07-10 22:06:47 +00:00
|
|
|
|
otherwise pop it")
|
|
|
|
|
(byte-defop 134 -1 byte-goto-if-not-nil-else-pop
|
2000-03-29 21:32:57 +00:00
|
|
|
|
"to examine top-of-stack, jump and don't pop it if it's non nil,
|
1992-07-10 22:06:47 +00:00
|
|
|
|
otherwise pop it")
|
|
|
|
|
|
|
|
|
|
(byte-defop 135 -1 byte-return "to pop a value and return it from `byte-code'")
|
|
|
|
|
(byte-defop 136 -1 byte-discard "to discard one value from stack")
|
|
|
|
|
(byte-defop 137 1 byte-dup "to duplicate the top of the stack")
|
|
|
|
|
|
|
|
|
|
(byte-defop 138 0 byte-save-excursion
|
|
|
|
|
"to make a binding to record the buffer, point and mark")
|
2011-04-15 12:30:15 +00:00
|
|
|
|
(byte-defop 139 0 byte-save-window-excursion-OBSOLETE
|
|
|
|
|
"to make a binding to record entire window configuration")
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(byte-defop 140 0 byte-save-restriction
|
|
|
|
|
"to make a binding to record the current buffer clipping restrictions")
|
|
|
|
|
(byte-defop 141 -1 byte-catch
|
|
|
|
|
"for catch. Takes, on stack, the tag and an expression for the body")
|
|
|
|
|
(byte-defop 142 -1 byte-unwind-protect
|
|
|
|
|
"for unwind-protect. Takes, on stack, an expression for the unwind-action")
|
|
|
|
|
|
2000-03-29 21:32:57 +00:00
|
|
|
|
;; For condition-case. Takes, on stack, the variable to bind,
|
1992-07-15 20:26:37 +00:00
|
|
|
|
;; an expression for the body, and a list of clauses.
|
|
|
|
|
(byte-defop 143 -2 byte-condition-case)
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
2011-04-15 12:30:15 +00:00
|
|
|
|
(byte-defop 144 0 byte-temp-output-buffer-setup-OBSOLETE)
|
|
|
|
|
(byte-defop 145 -1 byte-temp-output-buffer-show-OBSOLETE)
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
|
|
|
|
;; these ops are new to v19
|
1992-07-15 20:26:37 +00:00
|
|
|
|
|
|
|
|
|
;; To unbind back to the beginning of this frame.
|
1995-03-24 23:43:21 +00:00
|
|
|
|
;; Not used yet, but will be needed for tail-recursion elimination.
|
1992-07-15 20:26:37 +00:00
|
|
|
|
(byte-defop 146 0 byte-unbind-all)
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
|
|
|
|
;; these ops are new to v19
|
|
|
|
|
(byte-defop 147 -2 byte-set-marker)
|
|
|
|
|
(byte-defop 148 0 byte-match-beginning)
|
|
|
|
|
(byte-defop 149 0 byte-match-end)
|
|
|
|
|
(byte-defop 150 0 byte-upcase)
|
|
|
|
|
(byte-defop 151 0 byte-downcase)
|
|
|
|
|
(byte-defop 152 -1 byte-string=)
|
|
|
|
|
(byte-defop 153 -1 byte-string<)
|
|
|
|
|
(byte-defop 154 -1 byte-equal)
|
|
|
|
|
(byte-defop 155 -1 byte-nthcdr)
|
|
|
|
|
(byte-defop 156 -1 byte-elt)
|
|
|
|
|
(byte-defop 157 -1 byte-member)
|
|
|
|
|
(byte-defop 158 -1 byte-assq)
|
|
|
|
|
(byte-defop 159 0 byte-nreverse)
|
|
|
|
|
(byte-defop 160 -1 byte-setcar)
|
|
|
|
|
(byte-defop 161 -1 byte-setcdr)
|
|
|
|
|
(byte-defop 162 0 byte-car-safe)
|
|
|
|
|
(byte-defop 163 0 byte-cdr-safe)
|
|
|
|
|
(byte-defop 164 -1 byte-nconc)
|
|
|
|
|
(byte-defop 165 -1 byte-quo)
|
|
|
|
|
(byte-defop 166 -1 byte-rem)
|
|
|
|
|
(byte-defop 167 0 byte-numberp)
|
|
|
|
|
(byte-defop 168 0 byte-integerp)
|
|
|
|
|
|
1992-07-22 16:55:01 +00:00
|
|
|
|
;; unused: 169-174
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(byte-defop 175 nil byte-listN)
|
|
|
|
|
(byte-defop 176 nil byte-concatN)
|
|
|
|
|
(byte-defop 177 nil byte-insertN)
|
|
|
|
|
|
2011-04-01 15:16:50 +00:00
|
|
|
|
(byte-defop 178 -1 byte-stack-set) ; Stack offset in following one byte.
|
|
|
|
|
(byte-defop 179 -1 byte-stack-set2) ; Stack offset in following two bytes.
|
2010-06-13 20:36:17 +00:00
|
|
|
|
|
2011-04-01 15:16:50 +00:00
|
|
|
|
;; If (following one byte & 0x80) == 0
|
2010-06-13 20:36:17 +00:00
|
|
|
|
;; discard (following one byte & 0x7F) stack entries
|
|
|
|
|
;; else
|
Try and fix w32 build; misc cleanup.
* lisp/subr.el (apply-partially): Move from subr.el; don't use lexical-let.
(eval-after-load): Obey lexical-binding.
* lisp/simple.el (apply-partially): Move to subr.el.
* lisp/makefile.w32-in: Match changes in Makefile.in.
(BIG_STACK_DEPTH, BIG_STACK_OPTS, BYTE_COMPILE_FLAGS): New vars.
(.el.elc, compile-CMD, compile-SH, compile-always-CMD)
(compile-always-SH, compile-calc-CMD, compile-calc-SH): Use them.
(COMPILE_FIRST): Add pcase, macroexp, and cconv.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Silence warning about
calling CL's `compiler-macroexpand'.
* lisp/emacs-lisp/bytecomp.el (byte-compile-preprocess): New function.
(byte-compile-initial-macro-environment)
(byte-compile-toplevel-file-form, byte-compile, byte-compile-sexp): Use it.
(byte-compile-eval, byte-compile-eval-before-compile): Obey lexical-binding.
(byte-compile--for-effect): Rename from `for-effect'.
(display-call-tree): Use case.
* lisp/emacs-lisp/byte-opt.el (for-effect): Don't declare as dynamic.
(byte-optimize-form-code-walker, byte-optimize-form):
Revert to old arg name.
* lisp/Makefile.in (BYTE_COMPILE_FLAGS): New var.
(compile-onefile, .el.elc, compile-calc, recompile): Use it.
2011-03-12 03:32:43 +00:00
|
|
|
|
;; discard (following one byte & 0x7F) stack entries _underneath_ TOS
|
2010-06-13 20:36:17 +00:00
|
|
|
|
;; (that is, if the operand = 0x83, ... X Y Z T => ... T)
|
|
|
|
|
(byte-defop 182 nil byte-discardN)
|
|
|
|
|
;; `byte-discardN-preserve-tos' is a pseudo-op that gets turned into
|
|
|
|
|
;; `byte-discardN' with the high bit in the operand set (by
|
|
|
|
|
;; `byte-compile-lapcode').
|
|
|
|
|
(defconst byte-discardN-preserve-tos byte-discardN)
|
|
|
|
|
|
|
|
|
|
;; unused: 182-191
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
|
|
|
|
(byte-defop 192 1 byte-constant "for reference to a constant")
|
|
|
|
|
;; codes 193-255 are consumed by byte-constant.
|
|
|
|
|
(defconst byte-constant-limit 64
|
|
|
|
|
"Exclusive maximum index usable in the `byte-constant' opcode.")
|
|
|
|
|
|
|
|
|
|
(defconst byte-goto-ops '(byte-goto byte-goto-if-nil byte-goto-if-not-nil
|
|
|
|
|
byte-goto-if-nil-else-pop
|
Introduce new bytecodes for efficient catch/condition-case in lexbind.
* lisp/emacs-lisp/byte-opt.el (byte-optimize-form-code-walker):
Optimize under `condition-case' and `catch' if
byte-compile--use-old-handlers is nil.
(disassemble-offset): Handle new bytecodes.
* lisp/emacs-lisp/bytecomp.el (byte-pushcatch, byte-pushconditioncase)
(byte-pophandler): New byte codes.
(byte-goto-ops): Adjust accordingly.
(byte-compile--use-old-handlers): New var.
(byte-compile-catch): Use new byte codes depending on
byte-compile--use-old-handlers.
(byte-compile-condition-case--old): Rename from
byte-compile-condition-case.
(byte-compile-condition-case--new): New function.
(byte-compile-condition-case): New function that dispatches depending
on byte-compile--use-old-handlers.
(byte-compile-unwind-protect): Pass a function to byte-unwind-protect
when we can.
* lisp/emacs-lisp/cconv.el (cconv-convert, cconv-analyse-form): Adjust for
the new compilation scheme using the new byte-codes.
* src/alloc.c (Fgarbage_collect): Merge scans of handlerlist and catchlist,
and make them unconditional now that they're heap-allocated.
* src/bytecode.c (BYTE_CODES): Add Bpushcatch, Bpushconditioncase
and Bpophandler.
(bcall0): New function.
(exec_byte_code): Add corresponding cases. Improve error message when
encountering an invalid byte-code. Let Bunwind_protect accept
a function (rather than a list of expressions) as argument.
* src/eval.c (catchlist): Remove (merge with handlerlist).
(handlerlist, lisp_eval_depth): Not static any more.
(internal_catch, internal_condition_case, internal_condition_case_1)
(internal_condition_case_2, internal_condition_case_n):
Use PUSH_HANDLER.
(unwind_to_catch, Fthrow, Fsignal): Adjust to merged
handlerlist/catchlist.
(internal_lisp_condition_case): Use PUSH_HANDLER. Adjust to new
handlerlist which can only handle a single condition-case handler at
a time.
(find_handler_clause): Simplify since we only a single branch here
any more.
* src/lisp.h (struct handler): Merge struct handler and struct catchtag.
(PUSH_HANDLER): New macro.
(catchlist): Remove.
(handlerlist): Always declare.
2013-10-03 04:58:56 +00:00
|
|
|
|
byte-goto-if-not-nil-else-pop
|
|
|
|
|
byte-pushcatch byte-pushconditioncase)
|
1992-07-15 20:26:37 +00:00
|
|
|
|
"List of byte-codes whose offset is a pc.")
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
|
|
|
|
(defconst byte-goto-always-pop-ops '(byte-goto-if-nil byte-goto-if-not-nil))
|
|
|
|
|
|
|
|
|
|
(byte-extrude-byte-code-vectors)
|
|
|
|
|
|
|
|
|
|
;;; lapcode generator
|
2001-10-05 09:29:51 +00:00
|
|
|
|
;;
|
|
|
|
|
;; the byte-compiler now does source -> lapcode -> bytecode instead of
|
|
|
|
|
;; source -> bytecode, because it's a lot easier to make optimizations
|
|
|
|
|
;; on lapcode than on bytecode.
|
|
|
|
|
;;
|
|
|
|
|
;; Elements of the lapcode list are of the form (<instruction> . <parameter>)
|
|
|
|
|
;; where instruction is a symbol naming a byte-code instruction,
|
|
|
|
|
;; and parameter is an argument to that instruction, if any.
|
|
|
|
|
;;
|
|
|
|
|
;; The instruction can be the pseudo-op TAG, which means that this position
|
|
|
|
|
;; in the instruction stream is a target of a goto. (car PARAMETER) will be
|
|
|
|
|
;; the PC for this location, and the whole instruction "(TAG pc)" will be the
|
|
|
|
|
;; parameter for some goto op.
|
|
|
|
|
;;
|
|
|
|
|
;; If the operation is varbind, varref, varset or push-constant, then the
|
|
|
|
|
;; parameter is (variable/constant . index_in_constant_vector).
|
|
|
|
|
;;
|
|
|
|
|
;; First, the source code is macroexpanded and optimized in various ways.
|
|
|
|
|
;; Then the resultant code is compiled into lapcode. Another set of
|
|
|
|
|
;; optimizations are then run over the lapcode. Then the variables and
|
|
|
|
|
;; constants referenced by the lapcode are collected and placed in the
|
|
|
|
|
;; constants-vector. (This happens now so that variables referenced by dead
|
|
|
|
|
;; code don't consume space.) And finally, the lapcode is transformed into
|
|
|
|
|
;; compacted byte-code.
|
|
|
|
|
;;
|
|
|
|
|
;; A distinction is made between variables and constants because the variable-
|
|
|
|
|
;; referencing instructions are more sensitive to the variables being near the
|
|
|
|
|
;; front of the constants-vector than the constant-referencing instructions.
|
|
|
|
|
;; Also, this lets us notice references to free variables.
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
2010-06-13 20:36:17 +00:00
|
|
|
|
(defmacro byte-compile-push-bytecodes (&rest args)
|
2012-11-08 14:58:15 +00:00
|
|
|
|
"Push bytes onto BVAR, and increment CVAR by the number of bytes pushed.
|
|
|
|
|
BVAR and CVAR are variables which are updated after evaluating
|
|
|
|
|
all the arguments.
|
|
|
|
|
|
|
|
|
|
\(fn BYTE1 BYTE2 ... BYTEn BVAR CVAR)"
|
2010-06-13 20:36:17 +00:00
|
|
|
|
(let ((byte-exprs (butlast args 2))
|
|
|
|
|
(bytes-var (car (last args 2)))
|
|
|
|
|
(pc-var (car (last args))))
|
|
|
|
|
`(setq ,bytes-var ,(if (null (cdr byte-exprs))
|
2012-06-10 13:28:26 +00:00
|
|
|
|
`(progn (cl-assert (<= 0 ,(car byte-exprs)))
|
2011-02-17 21:19:13 +00:00
|
|
|
|
(cons ,@byte-exprs ,bytes-var))
|
|
|
|
|
`(nconc (list ,@(reverse byte-exprs)) ,bytes-var))
|
|
|
|
|
,pc-var (+ ,(length byte-exprs) ,pc-var))))
|
2010-06-13 20:36:17 +00:00
|
|
|
|
|
|
|
|
|
(defmacro byte-compile-push-bytecode-const2 (opcode const2 bytes pc)
|
|
|
|
|
"Push OPCODE and the two-byte constant CONST2 onto BYTES, and add 3 to PC.
|
2011-11-17 09:09:20 +00:00
|
|
|
|
CONST2 may be evaluated multiple times."
|
2010-06-13 20:36:17 +00:00
|
|
|
|
`(byte-compile-push-bytecodes ,opcode (logand ,const2 255) (lsh ,const2 -8)
|
|
|
|
|
,bytes ,pc))
|
|
|
|
|
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(defun byte-compile-lapcode (lap)
|
|
|
|
|
"Turns lapcode into bytecode. The lapcode is destroyed."
|
|
|
|
|
;; Lapcode modifications: changes the ID of a tag to be the tag's PC.
|
|
|
|
|
(let ((pc 0) ; Program counter
|
|
|
|
|
op off ; Operation & offset
|
2010-06-13 20:36:17 +00:00
|
|
|
|
opcode ; numeric value of OP
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(bytes '()) ; Put the output bytes here
|
2010-06-13 20:36:17 +00:00
|
|
|
|
(patchlist nil)) ; List of gotos to patch
|
|
|
|
|
(dolist (lap-entry lap)
|
|
|
|
|
(setq op (car lap-entry)
|
|
|
|
|
off (cdr lap-entry))
|
* lisp/emacs-lisp/byte-lexbind.el: Delete.
* lisp/emacs-lisp/bytecomp.el (byte-compile-current-heap-environment)
(byte-compile-current-num-closures): Remove vars.
(byte-vec-ref, byte-vec-set): Remove byte codes.
(byte-compile-arglist-vars, byte-compile-make-lambda-lexenv): Move from
byte-lexbind.el.
(byte-compile-lambda): Never build a closure.
(byte-compile-closure-code-p, byte-compile-make-closure): Remove.
(byte-compile-closure): Simplify.
(byte-compile-top-level): Don't mess with heap environments.
(byte-compile-dynamic-variable-bind): Always maintain
byte-compile-bound-variables.
(byte-compile-variable-ref, byte-compile-variable-set): Always just use
the stack for lexical vars.
(byte-compile-push-binding-init): Simplify.
(byte-compile-not-lexical-var-p): New function, moved from cconv.el.
(byte-compile-bind, byte-compile-unbind): New functions, moved and
simplified from byte-lexbind.el.
(byte-compile-let, byte-compile-let*): Simplify.
(byte-compile-condition-case): Don't add :fun-body to the bound vars.
(byte-compile-defmacro): Simplify.
* lisp/emacs-lisp/byte-opt.el (byte-compile-side-effect-free-ops)
(byte-optimize-lapcode): Remove byte-vec-ref and byte-vec-set.
* lisp/emacs-lisp/cconv.el (cconv-not-lexical-var-p): Remove.
(cconv-freevars, cconv-analyse-function, cconv-analyse-form):
Use byte-compile-not-lexical-var-p instead.
* src/bytecode.c (Bvec_ref, Bvec_set): Remove.
(exec_byte_code): Don't handle them.
* lisp/help-fns.el (describe-function-1): Fix paren typo.
2011-02-12 05:53:30 +00:00
|
|
|
|
(cond
|
|
|
|
|
((not (symbolp op))
|
|
|
|
|
(error "Non-symbolic opcode `%s'" op))
|
|
|
|
|
((eq op 'TAG)
|
|
|
|
|
(setcar off pc))
|
|
|
|
|
(t
|
|
|
|
|
(setq opcode
|
|
|
|
|
(if (eq op 'byte-discardN-preserve-tos)
|
|
|
|
|
;; byte-discardN-preserve-tos is a pseudo op, which
|
|
|
|
|
;; is actually the same as byte-discardN
|
|
|
|
|
;; with a modified argument.
|
|
|
|
|
byte-discardN
|
|
|
|
|
(symbol-value op)))
|
|
|
|
|
(cond ((memq op byte-goto-ops)
|
|
|
|
|
;; goto
|
|
|
|
|
(byte-compile-push-bytecodes opcode nil (cdr off) bytes pc)
|
2011-04-01 15:16:50 +00:00
|
|
|
|
(push bytes patchlist))
|
Get rid of funvec.
* lisp/emacs-lisp/bytecomp.el (byte-compile-lapcode): Handle new form of
`byte-constant'.
(byte-compile-close-variables, displaying-byte-compile-warnings):
Add edebug spec.
(byte-compile-toplevel-file-form): New fun, split out of
byte-compile-file-form.
(byte-compile-from-buffer): Use it to avoid applying cconv
multiple times.
(byte-compile): Only strip `function' if it's present.
(byte-compile-lambda): Add `reserved-csts' argument.
Use new lexenv arg of byte-compile-top-level.
(byte-compile-reserved-constants): New var.
(byte-compile-constants-vector): Obey it.
(byte-compile-constants-vector): Handle new `byte-constant' form.
(byte-compile-top-level): Add args `lexenv' and `reserved-csts'.
(byte-compile-form): Don't check callargs here.
(byte-compile-normal-call): Do it here instead.
(byte-compile-push-unknown-constant)
(byte-compile-resolve-unknown-constant): Remove, unused.
(byte-compile-make-closure): Use `make-byte-code' rather than `curry',
putting the environment into the "constant" pool.
(byte-compile-get-closed-var): Use special byte-constant.
* lisp/emacs-lisp/byte-opt.el (byte-optimize-form-code-walker): Handle new
intermediate special form `internal-make-vector'.
(byte-optimize-lapcode): Handle new form of `byte-constant'.
* lisp/help-fns.el (describe-function-1): Don't handle funvecs.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Only convert quote to
function if the content is a lambda expression, not if it's a closure.
* emacs-lisp/eieio-come.el: Remove.
* lisp/emacs-lisp/eieio.el: Don't require eieio-comp.
(defmethod): Do a bit more work to find the body and wrap it into
a function before passing it to eieio-defmethod.
(eieio-defmethod): New arg `code' for it.
* lisp/emacs-lisp/debug.el (debugger-setup-buffer): Don't hide things in
debugger backtrace.
* lisp/emacs-lisp/cl-extra.el (cl-macroexpand-all): Use backquotes, and be
more careful when quoting a function value.
* lisp/emacs-lisp/cconv.el (cconv-freevars): Accept defvar/defconst.
(cconv-closure-convert-rec): Catch stray `internal-make-closure'.
* lisp/Makefile.in (COMPILE_FIRST): Compile pcase and cconv early.
* src/eval.c (Qcurry): Remove.
(funcall_funvec): Remove.
(funcall_lambda): Move new byte-code handling to reduce impact.
Treat all args as lexical in the case of lexbind.
(Fcurry): Remove.
* src/data.c (Qfunction_vector): Remove.
(Ffunvecp): Remove.
* src/lread.c (read1): Revert to calling make_byte_code here.
(read_vector): Don't call make_byte_code any more.
* src/lisp.h (enum pvec_type): Rename back to PVEC_COMPILED.
(XSETCOMPILED): Rename back from XSETFUNVEC.
(FUNVEC_SIZE): Remove.
(FUNVEC_COMPILED_TAG_P, FUNVEC_COMPILED_P): Remove.
(COMPILEDP): Rename back from FUNVECP.
* src/fns.c (Felt): Remove unexplained FUNVEC check.
* src/doc.c (Fdocumentation): Don't handle funvec.
* src/alloc.c (make_funvec, Ffunvec): Remove.
* doc/lispref/vol2.texi (Top):
* doc/lispref/vol1.texi (Top):
* doc/lispref/objects.texi (Programming Types, Funvec Type, Type Predicates):
* doc/lispref/functions.texi (Functions, What Is a Function, FunctionCurrying):
* doc/lispref/elisp.texi (Top): Remove mentions of funvec and curry.
2011-02-25 03:27:45 +00:00
|
|
|
|
((or (and (consp off)
|
|
|
|
|
;; Variable or constant reference
|
|
|
|
|
(progn
|
|
|
|
|
(setq off (cdr off))
|
|
|
|
|
(eq op 'byte-constant)))
|
2011-04-01 15:16:50 +00:00
|
|
|
|
(and (eq op 'byte-constant)
|
Get rid of funvec.
* lisp/emacs-lisp/bytecomp.el (byte-compile-lapcode): Handle new form of
`byte-constant'.
(byte-compile-close-variables, displaying-byte-compile-warnings):
Add edebug spec.
(byte-compile-toplevel-file-form): New fun, split out of
byte-compile-file-form.
(byte-compile-from-buffer): Use it to avoid applying cconv
multiple times.
(byte-compile): Only strip `function' if it's present.
(byte-compile-lambda): Add `reserved-csts' argument.
Use new lexenv arg of byte-compile-top-level.
(byte-compile-reserved-constants): New var.
(byte-compile-constants-vector): Obey it.
(byte-compile-constants-vector): Handle new `byte-constant' form.
(byte-compile-top-level): Add args `lexenv' and `reserved-csts'.
(byte-compile-form): Don't check callargs here.
(byte-compile-normal-call): Do it here instead.
(byte-compile-push-unknown-constant)
(byte-compile-resolve-unknown-constant): Remove, unused.
(byte-compile-make-closure): Use `make-byte-code' rather than `curry',
putting the environment into the "constant" pool.
(byte-compile-get-closed-var): Use special byte-constant.
* lisp/emacs-lisp/byte-opt.el (byte-optimize-form-code-walker): Handle new
intermediate special form `internal-make-vector'.
(byte-optimize-lapcode): Handle new form of `byte-constant'.
* lisp/help-fns.el (describe-function-1): Don't handle funvecs.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Only convert quote to
function if the content is a lambda expression, not if it's a closure.
* emacs-lisp/eieio-come.el: Remove.
* lisp/emacs-lisp/eieio.el: Don't require eieio-comp.
(defmethod): Do a bit more work to find the body and wrap it into
a function before passing it to eieio-defmethod.
(eieio-defmethod): New arg `code' for it.
* lisp/emacs-lisp/debug.el (debugger-setup-buffer): Don't hide things in
debugger backtrace.
* lisp/emacs-lisp/cl-extra.el (cl-macroexpand-all): Use backquotes, and be
more careful when quoting a function value.
* lisp/emacs-lisp/cconv.el (cconv-freevars): Accept defvar/defconst.
(cconv-closure-convert-rec): Catch stray `internal-make-closure'.
* lisp/Makefile.in (COMPILE_FIRST): Compile pcase and cconv early.
* src/eval.c (Qcurry): Remove.
(funcall_funvec): Remove.
(funcall_lambda): Move new byte-code handling to reduce impact.
Treat all args as lexical in the case of lexbind.
(Fcurry): Remove.
* src/data.c (Qfunction_vector): Remove.
(Ffunvecp): Remove.
* src/lread.c (read1): Revert to calling make_byte_code here.
(read_vector): Don't call make_byte_code any more.
* src/lisp.h (enum pvec_type): Rename back to PVEC_COMPILED.
(XSETCOMPILED): Rename back from XSETFUNVEC.
(FUNVEC_SIZE): Remove.
(FUNVEC_COMPILED_TAG_P, FUNVEC_COMPILED_P): Remove.
(COMPILEDP): Rename back from FUNVECP.
* src/fns.c (Felt): Remove unexplained FUNVEC check.
* src/doc.c (Fdocumentation): Don't handle funvec.
* src/alloc.c (make_funvec, Ffunvec): Remove.
* doc/lispref/vol2.texi (Top):
* doc/lispref/vol1.texi (Top):
* doc/lispref/objects.texi (Programming Types, Funvec Type, Type Predicates):
* doc/lispref/functions.texi (Functions, What Is a Function, FunctionCurrying):
* doc/lispref/elisp.texi (Top): Remove mentions of funvec and curry.
2011-02-25 03:27:45 +00:00
|
|
|
|
(integerp off)))
|
* lisp/emacs-lisp/byte-lexbind.el: Delete.
* lisp/emacs-lisp/bytecomp.el (byte-compile-current-heap-environment)
(byte-compile-current-num-closures): Remove vars.
(byte-vec-ref, byte-vec-set): Remove byte codes.
(byte-compile-arglist-vars, byte-compile-make-lambda-lexenv): Move from
byte-lexbind.el.
(byte-compile-lambda): Never build a closure.
(byte-compile-closure-code-p, byte-compile-make-closure): Remove.
(byte-compile-closure): Simplify.
(byte-compile-top-level): Don't mess with heap environments.
(byte-compile-dynamic-variable-bind): Always maintain
byte-compile-bound-variables.
(byte-compile-variable-ref, byte-compile-variable-set): Always just use
the stack for lexical vars.
(byte-compile-push-binding-init): Simplify.
(byte-compile-not-lexical-var-p): New function, moved from cconv.el.
(byte-compile-bind, byte-compile-unbind): New functions, moved and
simplified from byte-lexbind.el.
(byte-compile-let, byte-compile-let*): Simplify.
(byte-compile-condition-case): Don't add :fun-body to the bound vars.
(byte-compile-defmacro): Simplify.
* lisp/emacs-lisp/byte-opt.el (byte-compile-side-effect-free-ops)
(byte-optimize-lapcode): Remove byte-vec-ref and byte-vec-set.
* lisp/emacs-lisp/cconv.el (cconv-not-lexical-var-p): Remove.
(cconv-freevars, cconv-analyse-function, cconv-analyse-form):
Use byte-compile-not-lexical-var-p instead.
* src/bytecode.c (Bvec_ref, Bvec_set): Remove.
(exec_byte_code): Don't handle them.
* lisp/help-fns.el (describe-function-1): Fix paren typo.
2011-02-12 05:53:30 +00:00
|
|
|
|
;; constant ref
|
|
|
|
|
(if (< off byte-constant-limit)
|
|
|
|
|
(byte-compile-push-bytecodes (+ byte-constant off)
|
|
|
|
|
bytes pc)
|
|
|
|
|
(byte-compile-push-bytecode-const2 byte-constant2 off
|
|
|
|
|
bytes pc)))
|
|
|
|
|
((and (= opcode byte-stack-set)
|
|
|
|
|
(> off 255))
|
|
|
|
|
;; Use the two-byte version of byte-stack-set if the
|
|
|
|
|
;; offset is too large for the normal version.
|
|
|
|
|
(byte-compile-push-bytecode-const2 byte-stack-set2 off
|
|
|
|
|
bytes pc))
|
|
|
|
|
((and (>= opcode byte-listN)
|
|
|
|
|
(< opcode byte-discardN))
|
|
|
|
|
;; These insns all put their operand into one extra byte.
|
|
|
|
|
(byte-compile-push-bytecodes opcode off bytes pc))
|
|
|
|
|
((= opcode byte-discardN)
|
2011-02-17 21:19:13 +00:00
|
|
|
|
;; byte-discardN is weird in that it encodes a flag in the
|
* lisp/emacs-lisp/byte-lexbind.el: Delete.
* lisp/emacs-lisp/bytecomp.el (byte-compile-current-heap-environment)
(byte-compile-current-num-closures): Remove vars.
(byte-vec-ref, byte-vec-set): Remove byte codes.
(byte-compile-arglist-vars, byte-compile-make-lambda-lexenv): Move from
byte-lexbind.el.
(byte-compile-lambda): Never build a closure.
(byte-compile-closure-code-p, byte-compile-make-closure): Remove.
(byte-compile-closure): Simplify.
(byte-compile-top-level): Don't mess with heap environments.
(byte-compile-dynamic-variable-bind): Always maintain
byte-compile-bound-variables.
(byte-compile-variable-ref, byte-compile-variable-set): Always just use
the stack for lexical vars.
(byte-compile-push-binding-init): Simplify.
(byte-compile-not-lexical-var-p): New function, moved from cconv.el.
(byte-compile-bind, byte-compile-unbind): New functions, moved and
simplified from byte-lexbind.el.
(byte-compile-let, byte-compile-let*): Simplify.
(byte-compile-condition-case): Don't add :fun-body to the bound vars.
(byte-compile-defmacro): Simplify.
* lisp/emacs-lisp/byte-opt.el (byte-compile-side-effect-free-ops)
(byte-optimize-lapcode): Remove byte-vec-ref and byte-vec-set.
* lisp/emacs-lisp/cconv.el (cconv-not-lexical-var-p): Remove.
(cconv-freevars, cconv-analyse-function, cconv-analyse-form):
Use byte-compile-not-lexical-var-p instead.
* src/bytecode.c (Bvec_ref, Bvec_set): Remove.
(exec_byte_code): Don't handle them.
* lisp/help-fns.el (describe-function-1): Fix paren typo.
2011-02-12 05:53:30 +00:00
|
|
|
|
;; top bit of its one-byte argument. If the argument is
|
|
|
|
|
;; too large to fit in 7 bits, the opcode can be repeated.
|
|
|
|
|
(let ((flag (if (eq op 'byte-discardN-preserve-tos) #x80 0)))
|
|
|
|
|
(while (> off #x7f)
|
Try and fix w32 build; misc cleanup.
* lisp/subr.el (apply-partially): Move from subr.el; don't use lexical-let.
(eval-after-load): Obey lexical-binding.
* lisp/simple.el (apply-partially): Move to subr.el.
* lisp/makefile.w32-in: Match changes in Makefile.in.
(BIG_STACK_DEPTH, BIG_STACK_OPTS, BYTE_COMPILE_FLAGS): New vars.
(.el.elc, compile-CMD, compile-SH, compile-always-CMD)
(compile-always-SH, compile-calc-CMD, compile-calc-SH): Use them.
(COMPILE_FIRST): Add pcase, macroexp, and cconv.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Silence warning about
calling CL's `compiler-macroexpand'.
* lisp/emacs-lisp/bytecomp.el (byte-compile-preprocess): New function.
(byte-compile-initial-macro-environment)
(byte-compile-toplevel-file-form, byte-compile, byte-compile-sexp): Use it.
(byte-compile-eval, byte-compile-eval-before-compile): Obey lexical-binding.
(byte-compile--for-effect): Rename from `for-effect'.
(display-call-tree): Use case.
* lisp/emacs-lisp/byte-opt.el (for-effect): Don't declare as dynamic.
(byte-optimize-form-code-walker, byte-optimize-form):
Revert to old arg name.
* lisp/Makefile.in (BYTE_COMPILE_FLAGS): New var.
(compile-onefile, .el.elc, compile-calc, recompile): Use it.
2011-03-12 03:32:43 +00:00
|
|
|
|
(byte-compile-push-bytecodes opcode (logior #x7f flag)
|
|
|
|
|
bytes pc)
|
* lisp/emacs-lisp/byte-lexbind.el: Delete.
* lisp/emacs-lisp/bytecomp.el (byte-compile-current-heap-environment)
(byte-compile-current-num-closures): Remove vars.
(byte-vec-ref, byte-vec-set): Remove byte codes.
(byte-compile-arglist-vars, byte-compile-make-lambda-lexenv): Move from
byte-lexbind.el.
(byte-compile-lambda): Never build a closure.
(byte-compile-closure-code-p, byte-compile-make-closure): Remove.
(byte-compile-closure): Simplify.
(byte-compile-top-level): Don't mess with heap environments.
(byte-compile-dynamic-variable-bind): Always maintain
byte-compile-bound-variables.
(byte-compile-variable-ref, byte-compile-variable-set): Always just use
the stack for lexical vars.
(byte-compile-push-binding-init): Simplify.
(byte-compile-not-lexical-var-p): New function, moved from cconv.el.
(byte-compile-bind, byte-compile-unbind): New functions, moved and
simplified from byte-lexbind.el.
(byte-compile-let, byte-compile-let*): Simplify.
(byte-compile-condition-case): Don't add :fun-body to the bound vars.
(byte-compile-defmacro): Simplify.
* lisp/emacs-lisp/byte-opt.el (byte-compile-side-effect-free-ops)
(byte-optimize-lapcode): Remove byte-vec-ref and byte-vec-set.
* lisp/emacs-lisp/cconv.el (cconv-not-lexical-var-p): Remove.
(cconv-freevars, cconv-analyse-function, cconv-analyse-form):
Use byte-compile-not-lexical-var-p instead.
* src/bytecode.c (Bvec_ref, Bvec_set): Remove.
(exec_byte_code): Don't handle them.
* lisp/help-fns.el (describe-function-1): Fix paren typo.
2011-02-12 05:53:30 +00:00
|
|
|
|
(setq off (- off #x7f)))
|
Try and fix w32 build; misc cleanup.
* lisp/subr.el (apply-partially): Move from subr.el; don't use lexical-let.
(eval-after-load): Obey lexical-binding.
* lisp/simple.el (apply-partially): Move to subr.el.
* lisp/makefile.w32-in: Match changes in Makefile.in.
(BIG_STACK_DEPTH, BIG_STACK_OPTS, BYTE_COMPILE_FLAGS): New vars.
(.el.elc, compile-CMD, compile-SH, compile-always-CMD)
(compile-always-SH, compile-calc-CMD, compile-calc-SH): Use them.
(COMPILE_FIRST): Add pcase, macroexp, and cconv.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Silence warning about
calling CL's `compiler-macroexpand'.
* lisp/emacs-lisp/bytecomp.el (byte-compile-preprocess): New function.
(byte-compile-initial-macro-environment)
(byte-compile-toplevel-file-form, byte-compile, byte-compile-sexp): Use it.
(byte-compile-eval, byte-compile-eval-before-compile): Obey lexical-binding.
(byte-compile--for-effect): Rename from `for-effect'.
(display-call-tree): Use case.
* lisp/emacs-lisp/byte-opt.el (for-effect): Don't declare as dynamic.
(byte-optimize-form-code-walker, byte-optimize-form):
Revert to old arg name.
* lisp/Makefile.in (BYTE_COMPILE_FLAGS): New var.
(compile-onefile, .el.elc, compile-calc, recompile): Use it.
2011-03-12 03:32:43 +00:00
|
|
|
|
(byte-compile-push-bytecodes opcode (logior off flag)
|
|
|
|
|
bytes pc)))
|
* lisp/emacs-lisp/byte-lexbind.el: Delete.
* lisp/emacs-lisp/bytecomp.el (byte-compile-current-heap-environment)
(byte-compile-current-num-closures): Remove vars.
(byte-vec-ref, byte-vec-set): Remove byte codes.
(byte-compile-arglist-vars, byte-compile-make-lambda-lexenv): Move from
byte-lexbind.el.
(byte-compile-lambda): Never build a closure.
(byte-compile-closure-code-p, byte-compile-make-closure): Remove.
(byte-compile-closure): Simplify.
(byte-compile-top-level): Don't mess with heap environments.
(byte-compile-dynamic-variable-bind): Always maintain
byte-compile-bound-variables.
(byte-compile-variable-ref, byte-compile-variable-set): Always just use
the stack for lexical vars.
(byte-compile-push-binding-init): Simplify.
(byte-compile-not-lexical-var-p): New function, moved from cconv.el.
(byte-compile-bind, byte-compile-unbind): New functions, moved and
simplified from byte-lexbind.el.
(byte-compile-let, byte-compile-let*): Simplify.
(byte-compile-condition-case): Don't add :fun-body to the bound vars.
(byte-compile-defmacro): Simplify.
* lisp/emacs-lisp/byte-opt.el (byte-compile-side-effect-free-ops)
(byte-optimize-lapcode): Remove byte-vec-ref and byte-vec-set.
* lisp/emacs-lisp/cconv.el (cconv-not-lexical-var-p): Remove.
(cconv-freevars, cconv-analyse-function, cconv-analyse-form):
Use byte-compile-not-lexical-var-p instead.
* src/bytecode.c (Bvec_ref, Bvec_set): Remove.
(exec_byte_code): Don't handle them.
* lisp/help-fns.el (describe-function-1): Fix paren typo.
2011-02-12 05:53:30 +00:00
|
|
|
|
((null off)
|
|
|
|
|
;; opcode that doesn't use OFF
|
|
|
|
|
(byte-compile-push-bytecodes opcode bytes pc))
|
2011-02-21 20:12:44 +00:00
|
|
|
|
((and (eq opcode byte-stack-ref) (eq off 0))
|
|
|
|
|
;; (stack-ref 0) is really just another name for `dup'.
|
|
|
|
|
(debug) ;FIXME: When would this happen?
|
|
|
|
|
(byte-compile-push-bytecodes byte-dup bytes pc))
|
* lisp/emacs-lisp/byte-lexbind.el: Delete.
* lisp/emacs-lisp/bytecomp.el (byte-compile-current-heap-environment)
(byte-compile-current-num-closures): Remove vars.
(byte-vec-ref, byte-vec-set): Remove byte codes.
(byte-compile-arglist-vars, byte-compile-make-lambda-lexenv): Move from
byte-lexbind.el.
(byte-compile-lambda): Never build a closure.
(byte-compile-closure-code-p, byte-compile-make-closure): Remove.
(byte-compile-closure): Simplify.
(byte-compile-top-level): Don't mess with heap environments.
(byte-compile-dynamic-variable-bind): Always maintain
byte-compile-bound-variables.
(byte-compile-variable-ref, byte-compile-variable-set): Always just use
the stack for lexical vars.
(byte-compile-push-binding-init): Simplify.
(byte-compile-not-lexical-var-p): New function, moved from cconv.el.
(byte-compile-bind, byte-compile-unbind): New functions, moved and
simplified from byte-lexbind.el.
(byte-compile-let, byte-compile-let*): Simplify.
(byte-compile-condition-case): Don't add :fun-body to the bound vars.
(byte-compile-defmacro): Simplify.
* lisp/emacs-lisp/byte-opt.el (byte-compile-side-effect-free-ops)
(byte-optimize-lapcode): Remove byte-vec-ref and byte-vec-set.
* lisp/emacs-lisp/cconv.el (cconv-not-lexical-var-p): Remove.
(cconv-freevars, cconv-analyse-function, cconv-analyse-form):
Use byte-compile-not-lexical-var-p instead.
* src/bytecode.c (Bvec_ref, Bvec_set): Remove.
(exec_byte_code): Don't handle them.
* lisp/help-fns.el (describe-function-1): Fix paren typo.
2011-02-12 05:53:30 +00:00
|
|
|
|
;; The following three cases are for the special
|
|
|
|
|
;; insns that encode their operand into 0, 1, or 2
|
|
|
|
|
;; extra bytes depending on its magnitude.
|
|
|
|
|
((< off 6)
|
|
|
|
|
(byte-compile-push-bytecodes (+ opcode off) bytes pc))
|
|
|
|
|
((< off 256)
|
|
|
|
|
(byte-compile-push-bytecodes (+ opcode 6) off bytes pc))
|
|
|
|
|
(t
|
|
|
|
|
(byte-compile-push-bytecode-const2 (+ opcode 7) off
|
|
|
|
|
bytes pc))))))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
;;(if (not (= pc (length bytes)))
|
1992-07-15 20:26:37 +00:00
|
|
|
|
;; (error "Compiler error: pc mismatch - %s %s" pc (length bytes)))
|
2011-04-01 15:16:50 +00:00
|
|
|
|
;; Patch tag PCs into absolute jumps.
|
2010-06-13 20:36:17 +00:00
|
|
|
|
(dolist (bytes-tail patchlist)
|
2011-04-01 15:16:50 +00:00
|
|
|
|
(setq pc (caar bytes-tail)) ; Pick PC from goto's tag.
|
2010-06-13 20:36:17 +00:00
|
|
|
|
(setcar (cdr bytes-tail) (logand pc 255))
|
|
|
|
|
(setcar bytes-tail (lsh pc -8))
|
|
|
|
|
;; FIXME: Replace this by some workaround.
|
2011-09-17 09:29:01 +00:00
|
|
|
|
(if (> (car bytes-tail) 255) (error "Bytecode overflow")))
|
2010-06-13 20:36:17 +00:00
|
|
|
|
|
2008-02-12 11:25:01 +00:00
|
|
|
|
(apply 'unibyte-string (nreverse bytes))))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
2000-03-24 18:37:48 +00:00
|
|
|
|
|
|
|
|
|
;;; compile-time evaluation
|
|
|
|
|
|
2009-09-05 19:10:37 +00:00
|
|
|
|
(defun byte-compile-cl-file-p (file)
|
|
|
|
|
"Return non-nil if FILE is one of the CL files."
|
|
|
|
|
(and (stringp file)
|
2012-09-28 23:30:52 +00:00
|
|
|
|
(string-match "^cl\\.el" (file-name-nondirectory file))))
|
2009-09-05 19:10:37 +00:00
|
|
|
|
|
2000-03-26 19:52:27 +00:00
|
|
|
|
(defun byte-compile-eval (form)
|
|
|
|
|
"Eval FORM and mark the functions defined therein.
|
2004-04-16 12:51:06 +00:00
|
|
|
|
Each function's symbol gets added to `byte-compile-noruntime-functions'."
|
2000-03-24 18:37:48 +00:00
|
|
|
|
(let ((hist-orig load-history)
|
|
|
|
|
(hist-nil-orig current-load-list))
|
Try and fix w32 build; misc cleanup.
* lisp/subr.el (apply-partially): Move from subr.el; don't use lexical-let.
(eval-after-load): Obey lexical-binding.
* lisp/simple.el (apply-partially): Move to subr.el.
* lisp/makefile.w32-in: Match changes in Makefile.in.
(BIG_STACK_DEPTH, BIG_STACK_OPTS, BYTE_COMPILE_FLAGS): New vars.
(.el.elc, compile-CMD, compile-SH, compile-always-CMD)
(compile-always-SH, compile-calc-CMD, compile-calc-SH): Use them.
(COMPILE_FIRST): Add pcase, macroexp, and cconv.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Silence warning about
calling CL's `compiler-macroexpand'.
* lisp/emacs-lisp/bytecomp.el (byte-compile-preprocess): New function.
(byte-compile-initial-macro-environment)
(byte-compile-toplevel-file-form, byte-compile, byte-compile-sexp): Use it.
(byte-compile-eval, byte-compile-eval-before-compile): Obey lexical-binding.
(byte-compile--for-effect): Rename from `for-effect'.
(display-call-tree): Use case.
* lisp/emacs-lisp/byte-opt.el (for-effect): Don't declare as dynamic.
(byte-optimize-form-code-walker, byte-optimize-form):
Revert to old arg name.
* lisp/Makefile.in (BYTE_COMPILE_FLAGS): New var.
(compile-onefile, .el.elc, compile-calc, recompile): Use it.
2011-03-12 03:32:43 +00:00
|
|
|
|
(prog1 (eval form lexical-binding)
|
2007-10-28 23:53:06 +00:00
|
|
|
|
(when (byte-compile-warning-enabled-p 'noruntime)
|
2000-03-24 18:37:48 +00:00
|
|
|
|
(let ((hist-new load-history)
|
|
|
|
|
(hist-nil-new current-load-list))
|
2000-03-26 19:52:27 +00:00
|
|
|
|
;; Go through load-history, look for newly loaded files
|
|
|
|
|
;; and mark all the functions defined therein.
|
|
|
|
|
(while (and hist-new (not (eq hist-new hist-orig)))
|
2002-12-07 21:33:19 +00:00
|
|
|
|
(let ((xs (pop hist-new))
|
|
|
|
|
old-autoloads)
|
2000-03-26 19:52:27 +00:00
|
|
|
|
;; Make sure the file was not already loaded before.
|
2012-11-02 22:35:01 +00:00
|
|
|
|
(unless (assoc (car xs) hist-orig)
|
2000-03-26 19:52:27 +00:00
|
|
|
|
(dolist (s xs)
|
|
|
|
|
(cond
|
2002-12-07 21:33:19 +00:00
|
|
|
|
((and (consp s) (eq t (car s)))
|
2003-04-12 20:28:10 +00:00
|
|
|
|
(push (cdr s) old-autoloads))
|
2012-10-11 20:08:38 +00:00
|
|
|
|
((and (consp s) (memq (car s) '(autoload defun)))
|
|
|
|
|
(unless (memq (cdr s) old-autoloads)
|
|
|
|
|
(push (cdr s) byte-compile-noruntime-functions))))))))
|
2000-03-26 19:52:27 +00:00
|
|
|
|
;; Go through current-load-list for the locally defined funs.
|
2002-12-07 21:33:19 +00:00
|
|
|
|
(let (old-autoloads)
|
|
|
|
|
(while (and hist-nil-new (not (eq hist-nil-new hist-nil-orig)))
|
|
|
|
|
(let ((s (pop hist-nil-new)))
|
|
|
|
|
(when (and (symbolp s) (not (memq s old-autoloads)))
|
2004-04-16 12:51:06 +00:00
|
|
|
|
(push s byte-compile-noruntime-functions))
|
2002-12-07 21:33:19 +00:00
|
|
|
|
(when (and (consp s) (eq t (car s)))
|
2004-10-16 15:20:24 +00:00
|
|
|
|
(push (cdr s) old-autoloads)))))))
|
2007-10-28 23:53:06 +00:00
|
|
|
|
(when (byte-compile-warning-enabled-p 'cl-functions)
|
2007-06-12 21:03:32 +00:00
|
|
|
|
(let ((hist-new load-history))
|
2009-09-05 19:10:37 +00:00
|
|
|
|
;; Go through load-history, looking for the cl files.
|
|
|
|
|
;; Since new files are added at the start of load-history,
|
|
|
|
|
;; we scan the new history until the tail matches the old.
|
|
|
|
|
(while (and (not byte-compile-cl-functions)
|
|
|
|
|
hist-new (not (eq hist-new hist-orig)))
|
|
|
|
|
;; We used to check if the file had already been loaded,
|
|
|
|
|
;; but it is better to check non-nil byte-compile-cl-functions.
|
|
|
|
|
(and (byte-compile-cl-file-p (car (pop hist-new)))
|
|
|
|
|
(byte-compile-find-cl-functions))))))))
|
2000-03-24 18:37:48 +00:00
|
|
|
|
|
2002-07-02 18:48:34 +00:00
|
|
|
|
(defun byte-compile-eval-before-compile (form)
|
|
|
|
|
"Evaluate FORM for `eval-and-compile'."
|
|
|
|
|
(let ((hist-nil-orig current-load-list))
|
Try and fix w32 build; misc cleanup.
* lisp/subr.el (apply-partially): Move from subr.el; don't use lexical-let.
(eval-after-load): Obey lexical-binding.
* lisp/simple.el (apply-partially): Move to subr.el.
* lisp/makefile.w32-in: Match changes in Makefile.in.
(BIG_STACK_DEPTH, BIG_STACK_OPTS, BYTE_COMPILE_FLAGS): New vars.
(.el.elc, compile-CMD, compile-SH, compile-always-CMD)
(compile-always-SH, compile-calc-CMD, compile-calc-SH): Use them.
(COMPILE_FIRST): Add pcase, macroexp, and cconv.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Silence warning about
calling CL's `compiler-macroexpand'.
* lisp/emacs-lisp/bytecomp.el (byte-compile-preprocess): New function.
(byte-compile-initial-macro-environment)
(byte-compile-toplevel-file-form, byte-compile, byte-compile-sexp): Use it.
(byte-compile-eval, byte-compile-eval-before-compile): Obey lexical-binding.
(byte-compile--for-effect): Rename from `for-effect'.
(display-call-tree): Use case.
* lisp/emacs-lisp/byte-opt.el (for-effect): Don't declare as dynamic.
(byte-optimize-form-code-walker, byte-optimize-form):
Revert to old arg name.
* lisp/Makefile.in (BYTE_COMPILE_FLAGS): New var.
(compile-onefile, .el.elc, compile-calc, recompile): Use it.
2011-03-12 03:32:43 +00:00
|
|
|
|
(prog1 (eval form lexical-binding)
|
2002-07-02 18:48:34 +00:00
|
|
|
|
;; (eval-and-compile (require 'cl) turns off warnings for cl functions.
|
2009-09-05 19:10:37 +00:00
|
|
|
|
;; FIXME Why does it do that - just as a hack?
|
|
|
|
|
;; There are other ways to do this nowadays.
|
2002-07-02 18:48:34 +00:00
|
|
|
|
(let ((tem current-load-list))
|
|
|
|
|
(while (not (eq tem hist-nil-orig))
|
|
|
|
|
(when (equal (car tem) '(require . cl))
|
2007-10-28 23:53:06 +00:00
|
|
|
|
(byte-compile-disable-warning 'cl-functions))
|
2002-07-02 18:48:34 +00:00
|
|
|
|
(setq tem (cdr tem)))))))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
|
|
|
|
;;; byte compiler messages
|
|
|
|
|
|
1994-12-24 05:58:05 +00:00
|
|
|
|
(defvar byte-compile-current-form nil)
|
|
|
|
|
(defvar byte-compile-dest-file nil)
|
2000-11-09 23:01:40 +00:00
|
|
|
|
(defvar byte-compile-current-file nil)
|
2008-06-08 02:07:25 +00:00
|
|
|
|
(defvar byte-compile-current-group nil)
|
2002-05-28 17:40:47 +00:00
|
|
|
|
(defvar byte-compile-current-buffer nil)
|
2000-11-09 16:07:56 +00:00
|
|
|
|
|
2002-07-20 22:01:19 +00:00
|
|
|
|
;; Log something that isn't a warning.
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(defmacro byte-compile-log (format-string &rest args)
|
2004-05-19 18:53:13 +00:00
|
|
|
|
`(and
|
|
|
|
|
byte-optimize
|
|
|
|
|
(memq byte-optimize-log '(t source))
|
|
|
|
|
(let ((print-escape-newlines t)
|
|
|
|
|
(print-level 4)
|
|
|
|
|
(print-length 4))
|
|
|
|
|
(byte-compile-log-1
|
|
|
|
|
(format
|
|
|
|
|
,format-string
|
|
|
|
|
,@(mapcar
|
|
|
|
|
(lambda (x) (if (symbolp x) (list 'prin1-to-string x) x))
|
|
|
|
|
args))))))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
2002-07-20 22:01:19 +00:00
|
|
|
|
;; Log something that isn't a warning.
|
|
|
|
|
(defun byte-compile-log-1 (string)
|
2010-11-12 03:21:38 +00:00
|
|
|
|
(with-current-buffer byte-compile-log-buffer
|
2004-10-16 15:20:24 +00:00
|
|
|
|
(let ((inhibit-read-only t))
|
|
|
|
|
(goto-char (point-max))
|
|
|
|
|
(byte-compile-warning-prefix nil nil)
|
|
|
|
|
(cond (noninteractive
|
|
|
|
|
(message " %s" string))
|
|
|
|
|
(t
|
|
|
|
|
(insert (format "%s\n" string)))))))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
2002-05-28 17:40:47 +00:00
|
|
|
|
(defvar byte-compile-read-position nil
|
|
|
|
|
"Character position we began the last `read' from.")
|
|
|
|
|
(defvar byte-compile-last-position nil
|
|
|
|
|
"Last known character position in the input.")
|
|
|
|
|
|
|
|
|
|
;; copied from gnus-util.el
|
2002-07-25 18:18:10 +00:00
|
|
|
|
(defsubst byte-compile-delete-first (elt list)
|
2002-05-28 17:40:47 +00:00
|
|
|
|
(if (eq (car list) elt)
|
|
|
|
|
(cdr list)
|
|
|
|
|
(let ((total list))
|
|
|
|
|
(while (and (cdr list)
|
|
|
|
|
(not (eq (cadr list) elt)))
|
|
|
|
|
(setq list (cdr list)))
|
|
|
|
|
(when (cdr list)
|
|
|
|
|
(setcdr list (cddr list)))
|
|
|
|
|
total)))
|
|
|
|
|
|
|
|
|
|
;; The purpose of this function is to iterate through the
|
|
|
|
|
;; `read-symbol-positions-list'. Each time we process, say, a
|
|
|
|
|
;; function definition (`defun') we remove `defun' from
|
|
|
|
|
;; `read-symbol-positions-list', and set `byte-compile-last-position'
|
|
|
|
|
;; to that symbol's character position. Similarly, if we encounter a
|
|
|
|
|
;; variable reference, like in (1+ foo), we remove `foo' from the
|
|
|
|
|
;; list. If our current position is after the symbol's position, we
|
|
|
|
|
;; assume we've already passed that point, and look for the next
|
2002-10-17 15:32:26 +00:00
|
|
|
|
;; occurrence of the symbol.
|
2005-10-23 07:33:45 +00:00
|
|
|
|
;;
|
|
|
|
|
;; This function should not be called twice for the same occurrence of
|
|
|
|
|
;; a symbol, and it should not be called for symbols generated by the
|
|
|
|
|
;; byte compiler itself; because rather than just fail looking up the
|
|
|
|
|
;; symbol, we may find an occurrence of the symbol further ahead, and
|
|
|
|
|
;; then `byte-compile-last-position' as advanced too far.
|
|
|
|
|
;;
|
2002-10-17 15:32:26 +00:00
|
|
|
|
;; So your're probably asking yourself: Isn't this function a
|
2002-05-28 17:40:47 +00:00
|
|
|
|
;; gross hack? And the answer, of course, would be yes.
|
|
|
|
|
(defun byte-compile-set-symbol-position (sym &optional allow-previous)
|
|
|
|
|
(when byte-compile-read-position
|
2002-07-25 18:18:10 +00:00
|
|
|
|
(let (last entry)
|
2002-05-28 17:40:47 +00:00
|
|
|
|
(while (progn
|
2004-11-21 00:47:13 +00:00
|
|
|
|
(setq last byte-compile-last-position
|
|
|
|
|
entry (assq sym read-symbol-positions-list))
|
|
|
|
|
(when entry
|
|
|
|
|
(setq byte-compile-last-position
|
|
|
|
|
(+ byte-compile-read-position (cdr entry))
|
|
|
|
|
read-symbol-positions-list
|
|
|
|
|
(byte-compile-delete-first
|
|
|
|
|
entry read-symbol-positions-list)))
|
Try and fix w32 build; misc cleanup.
* lisp/subr.el (apply-partially): Move from subr.el; don't use lexical-let.
(eval-after-load): Obey lexical-binding.
* lisp/simple.el (apply-partially): Move to subr.el.
* lisp/makefile.w32-in: Match changes in Makefile.in.
(BIG_STACK_DEPTH, BIG_STACK_OPTS, BYTE_COMPILE_FLAGS): New vars.
(.el.elc, compile-CMD, compile-SH, compile-always-CMD)
(compile-always-SH, compile-calc-CMD, compile-calc-SH): Use them.
(COMPILE_FIRST): Add pcase, macroexp, and cconv.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Silence warning about
calling CL's `compiler-macroexpand'.
* lisp/emacs-lisp/bytecomp.el (byte-compile-preprocess): New function.
(byte-compile-initial-macro-environment)
(byte-compile-toplevel-file-form, byte-compile, byte-compile-sexp): Use it.
(byte-compile-eval, byte-compile-eval-before-compile): Obey lexical-binding.
(byte-compile--for-effect): Rename from `for-effect'.
(display-call-tree): Use case.
* lisp/emacs-lisp/byte-opt.el (for-effect): Don't declare as dynamic.
(byte-optimize-form-code-walker, byte-optimize-form):
Revert to old arg name.
* lisp/Makefile.in (BYTE_COMPILE_FLAGS): New var.
(compile-onefile, .el.elc, compile-calc, recompile): Use it.
2011-03-12 03:32:43 +00:00
|
|
|
|
(or (and allow-previous
|
|
|
|
|
(not (= last byte-compile-last-position)))
|
2002-05-28 17:40:47 +00:00
|
|
|
|
(> last byte-compile-last-position)))))))
|
2001-10-11 12:57:18 +00:00
|
|
|
|
|
2002-07-20 22:01:19 +00:00
|
|
|
|
(defvar byte-compile-last-warned-form nil)
|
|
|
|
|
(defvar byte-compile-last-logged-file nil)
|
2012-05-19 18:28:32 +00:00
|
|
|
|
(defvar byte-compile-root-dir nil
|
|
|
|
|
"Directory relative to which file names in error messages are written.")
|
2002-07-20 22:01:19 +00:00
|
|
|
|
|
2012-10-01 04:45:32 +00:00
|
|
|
|
;; FIXME: We should maybe extend abbreviate-file-name with an optional DIR
|
|
|
|
|
;; argument to try and use a relative file-name.
|
|
|
|
|
(defun byte-compile-abbreviate-file (file &optional dir)
|
|
|
|
|
(let ((f1 (abbreviate-file-name file))
|
|
|
|
|
(f2 (file-relative-name file dir)))
|
|
|
|
|
(if (< (length f2) (length f1)) f2 f1)))
|
|
|
|
|
|
2002-07-20 22:01:19 +00:00
|
|
|
|
;; This is used as warning-prefix for the compiler.
|
2002-08-29 17:26:47 +00:00
|
|
|
|
;; It is always called with the warnings buffer current.
|
2002-07-20 22:01:19 +00:00
|
|
|
|
(defun byte-compile-warning-prefix (level entry)
|
2004-10-16 15:20:24 +00:00
|
|
|
|
(let* ((inhibit-read-only t)
|
2012-05-19 18:28:32 +00:00
|
|
|
|
(dir (or byte-compile-root-dir default-directory))
|
2002-08-29 17:26:47 +00:00
|
|
|
|
(file (cond ((stringp byte-compile-current-file)
|
2012-10-01 04:45:32 +00:00
|
|
|
|
(format "%s:" (byte-compile-abbreviate-file
|
Try and fix w32 build; misc cleanup.
* lisp/subr.el (apply-partially): Move from subr.el; don't use lexical-let.
(eval-after-load): Obey lexical-binding.
* lisp/simple.el (apply-partially): Move to subr.el.
* lisp/makefile.w32-in: Match changes in Makefile.in.
(BIG_STACK_DEPTH, BIG_STACK_OPTS, BYTE_COMPILE_FLAGS): New vars.
(.el.elc, compile-CMD, compile-SH, compile-always-CMD)
(compile-always-SH, compile-calc-CMD, compile-calc-SH): Use them.
(COMPILE_FIRST): Add pcase, macroexp, and cconv.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Silence warning about
calling CL's `compiler-macroexpand'.
* lisp/emacs-lisp/bytecomp.el (byte-compile-preprocess): New function.
(byte-compile-initial-macro-environment)
(byte-compile-toplevel-file-form, byte-compile, byte-compile-sexp): Use it.
(byte-compile-eval, byte-compile-eval-before-compile): Obey lexical-binding.
(byte-compile--for-effect): Rename from `for-effect'.
(display-call-tree): Use case.
* lisp/emacs-lisp/byte-opt.el (for-effect): Don't declare as dynamic.
(byte-optimize-form-code-walker, byte-optimize-form):
Revert to old arg name.
* lisp/Makefile.in (BYTE_COMPILE_FLAGS): New var.
(compile-onefile, .el.elc, compile-calc, recompile): Use it.
2011-03-12 03:32:43 +00:00
|
|
|
|
byte-compile-current-file dir)))
|
2001-10-11 12:57:18 +00:00
|
|
|
|
((bufferp byte-compile-current-file)
|
2001-10-18 21:05:16 +00:00
|
|
|
|
(format "Buffer %s:"
|
2001-10-11 12:57:18 +00:00
|
|
|
|
(buffer-name byte-compile-current-file)))
|
2012-09-13 02:41:46 +00:00
|
|
|
|
;; We might be simply loading a file that
|
|
|
|
|
;; contains explicit calls to byte-compile functions.
|
|
|
|
|
((stringp load-file-name)
|
2012-10-01 04:45:32 +00:00
|
|
|
|
(format "%s:" (byte-compile-abbreviate-file
|
|
|
|
|
load-file-name dir)))
|
2001-10-11 12:57:18 +00:00
|
|
|
|
(t "")))
|
2001-10-18 21:05:16 +00:00
|
|
|
|
(pos (if (and byte-compile-current-file
|
2002-05-28 17:40:47 +00:00
|
|
|
|
(integerp byte-compile-read-position))
|
|
|
|
|
(with-current-buffer byte-compile-current-buffer
|
2007-09-01 23:33:15 +00:00
|
|
|
|
(format "%d:%d:"
|
2007-03-11 21:16:09 +00:00
|
|
|
|
(save-excursion
|
|
|
|
|
(goto-char byte-compile-last-position)
|
|
|
|
|
(1+ (count-lines (point-min) (point-at-bol))))
|
2002-05-28 17:40:47 +00:00
|
|
|
|
(save-excursion
|
|
|
|
|
(goto-char byte-compile-last-position)
|
|
|
|
|
(1+ (current-column)))))
|
2001-10-11 12:57:18 +00:00
|
|
|
|
""))
|
2002-08-29 17:26:47 +00:00
|
|
|
|
(form (if (eq byte-compile-current-form :end) "end of data"
|
|
|
|
|
(or byte-compile-current-form "toplevel form"))))
|
|
|
|
|
(when (or (and byte-compile-current-file
|
|
|
|
|
(not (equal byte-compile-current-file
|
|
|
|
|
byte-compile-last-logged-file)))
|
2004-04-16 12:51:06 +00:00
|
|
|
|
(and byte-compile-current-form
|
2002-08-29 17:26:47 +00:00
|
|
|
|
(not (eq byte-compile-current-form
|
|
|
|
|
byte-compile-last-warned-form))))
|
2002-07-20 22:01:19 +00:00
|
|
|
|
(insert (format "\nIn %s:\n" form)))
|
2002-08-29 17:26:47 +00:00
|
|
|
|
(when level
|
|
|
|
|
(insert (format "%s%s" file pos))))
|
2000-10-23 09:16:47 +00:00
|
|
|
|
(setq byte-compile-last-logged-file byte-compile-current-file
|
2002-07-20 22:01:19 +00:00
|
|
|
|
byte-compile-last-warned-form byte-compile-current-form)
|
|
|
|
|
entry)
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
2002-08-29 17:26:47 +00:00
|
|
|
|
;; This no-op function is used as the value of warning-series
|
|
|
|
|
;; to tell inner calls to displaying-byte-compile-warnings
|
|
|
|
|
;; not to bind warning-series.
|
2011-03-10 19:40:48 +00:00
|
|
|
|
(defun byte-compile-warning-series (&rest _ignore)
|
2002-08-29 17:26:47 +00:00
|
|
|
|
nil)
|
|
|
|
|
|
2007-11-19 00:10:38 +00:00
|
|
|
|
;; (compile-mode) will cause this to be loaded.
|
2007-12-06 04:05:51 +00:00
|
|
|
|
(declare-function compilation-forget-errors "compile" ())
|
2007-11-19 00:10:38 +00:00
|
|
|
|
|
2010-11-12 03:21:38 +00:00
|
|
|
|
;; Log the start of a file in `byte-compile-log-buffer', and mark it as done.
|
2002-07-20 22:01:19 +00:00
|
|
|
|
;; Return the position of the start of the page in the log buffer.
|
1995-04-09 05:32:47 +00:00
|
|
|
|
;; But do nothing in batch mode.
|
|
|
|
|
(defun byte-compile-log-file ()
|
2002-08-29 17:26:47 +00:00
|
|
|
|
(and (not (equal byte-compile-current-file byte-compile-last-logged-file))
|
2000-10-23 09:16:47 +00:00
|
|
|
|
(not noninteractive)
|
2010-11-12 03:21:38 +00:00
|
|
|
|
(with-current-buffer (get-buffer-create byte-compile-log-buffer)
|
1995-04-13 22:20:11 +00:00
|
|
|
|
(goto-char (point-max))
|
2004-10-16 15:20:24 +00:00
|
|
|
|
(let* ((inhibit-read-only t)
|
|
|
|
|
(dir (and byte-compile-current-file
|
2002-08-29 17:26:47 +00:00
|
|
|
|
(file-name-directory byte-compile-current-file)))
|
|
|
|
|
(was-same (equal default-directory dir))
|
|
|
|
|
pt)
|
|
|
|
|
(when dir
|
|
|
|
|
(unless was-same
|
|
|
|
|
(insert (format "Leaving directory `%s'\n" default-directory))))
|
|
|
|
|
(unless (bolp)
|
|
|
|
|
(insert "\n"))
|
|
|
|
|
(setq pt (point-marker))
|
|
|
|
|
(if byte-compile-current-file
|
|
|
|
|
(insert "\f\nCompiling "
|
|
|
|
|
(if (stringp byte-compile-current-file)
|
|
|
|
|
(concat "file " byte-compile-current-file)
|
Try and fix w32 build; misc cleanup.
* lisp/subr.el (apply-partially): Move from subr.el; don't use lexical-let.
(eval-after-load): Obey lexical-binding.
* lisp/simple.el (apply-partially): Move to subr.el.
* lisp/makefile.w32-in: Match changes in Makefile.in.
(BIG_STACK_DEPTH, BIG_STACK_OPTS, BYTE_COMPILE_FLAGS): New vars.
(.el.elc, compile-CMD, compile-SH, compile-always-CMD)
(compile-always-SH, compile-calc-CMD, compile-calc-SH): Use them.
(COMPILE_FIRST): Add pcase, macroexp, and cconv.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Silence warning about
calling CL's `compiler-macroexpand'.
* lisp/emacs-lisp/bytecomp.el (byte-compile-preprocess): New function.
(byte-compile-initial-macro-environment)
(byte-compile-toplevel-file-form, byte-compile, byte-compile-sexp): Use it.
(byte-compile-eval, byte-compile-eval-before-compile): Obey lexical-binding.
(byte-compile--for-effect): Rename from `for-effect'.
(display-call-tree): Use case.
* lisp/emacs-lisp/byte-opt.el (for-effect): Don't declare as dynamic.
(byte-optimize-form-code-walker, byte-optimize-form):
Revert to old arg name.
* lisp/Makefile.in (BYTE_COMPILE_FLAGS): New var.
(compile-onefile, .el.elc, compile-calc, recompile): Use it.
2011-03-12 03:32:43 +00:00
|
|
|
|
(concat "buffer "
|
|
|
|
|
(buffer-name byte-compile-current-file)))
|
2002-08-29 17:26:47 +00:00
|
|
|
|
" at " (current-time-string) "\n")
|
|
|
|
|
(insert "\f\nCompiling no file at " (current-time-string) "\n"))
|
|
|
|
|
(when dir
|
|
|
|
|
(setq default-directory dir)
|
|
|
|
|
(unless was-same
|
Try and fix w32 build; misc cleanup.
* lisp/subr.el (apply-partially): Move from subr.el; don't use lexical-let.
(eval-after-load): Obey lexical-binding.
* lisp/simple.el (apply-partially): Move to subr.el.
* lisp/makefile.w32-in: Match changes in Makefile.in.
(BIG_STACK_DEPTH, BIG_STACK_OPTS, BYTE_COMPILE_FLAGS): New vars.
(.el.elc, compile-CMD, compile-SH, compile-always-CMD)
(compile-always-SH, compile-calc-CMD, compile-calc-SH): Use them.
(COMPILE_FIRST): Add pcase, macroexp, and cconv.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Silence warning about
calling CL's `compiler-macroexpand'.
* lisp/emacs-lisp/bytecomp.el (byte-compile-preprocess): New function.
(byte-compile-initial-macro-environment)
(byte-compile-toplevel-file-form, byte-compile, byte-compile-sexp): Use it.
(byte-compile-eval, byte-compile-eval-before-compile): Obey lexical-binding.
(byte-compile--for-effect): Rename from `for-effect'.
(display-call-tree): Use case.
* lisp/emacs-lisp/byte-opt.el (for-effect): Don't declare as dynamic.
(byte-optimize-form-code-walker, byte-optimize-form):
Revert to old arg name.
* lisp/Makefile.in (BYTE_COMPILE_FLAGS): New var.
(compile-onefile, .el.elc, compile-calc, recompile): Use it.
2011-03-12 03:32:43 +00:00
|
|
|
|
(insert (format "Entering directory `%s'\n"
|
|
|
|
|
default-directory))))
|
2004-04-16 12:51:06 +00:00
|
|
|
|
(setq byte-compile-last-logged-file byte-compile-current-file
|
|
|
|
|
byte-compile-last-warned-form nil)
|
2003-04-19 04:18:37 +00:00
|
|
|
|
;; Do this after setting default-directory.
|
2007-09-07 15:04:09 +00:00
|
|
|
|
(unless (derived-mode-p 'compilation-mode) (compilation-mode))
|
2004-05-19 18:53:13 +00:00
|
|
|
|
(compilation-forget-errors)
|
2002-07-20 22:01:19 +00:00
|
|
|
|
pt))))
|
|
|
|
|
|
2010-11-12 03:21:38 +00:00
|
|
|
|
;; Log a message STRING in `byte-compile-log-buffer'.
|
2002-07-20 22:01:19 +00:00
|
|
|
|
;; Also log the current function and file if not already done.
|
|
|
|
|
(defun byte-compile-log-warning (string &optional fill level)
|
|
|
|
|
(let ((warning-prefix-function 'byte-compile-warning-prefix)
|
2004-04-16 12:51:06 +00:00
|
|
|
|
(warning-type-format "")
|
2012-11-08 14:58:15 +00:00
|
|
|
|
(warning-fill-prefix (if fill " ")))
|
2010-11-12 03:21:38 +00:00
|
|
|
|
(display-warning 'bytecomp string level byte-compile-log-buffer)))
|
1995-04-09 05:32:47 +00:00
|
|
|
|
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(defun byte-compile-warn (format &rest args)
|
2002-07-20 22:01:19 +00:00
|
|
|
|
"Issue a byte compiler warning; use (format FORMAT ARGS...) for message."
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(setq format (apply 'format format args))
|
|
|
|
|
(if byte-compile-error-on-warn
|
|
|
|
|
(error "%s" format) ; byte-compile-file catches and logs it
|
2002-07-20 22:01:19 +00:00
|
|
|
|
(byte-compile-log-warning format t :warning)))
|
|
|
|
|
|
2008-04-26 02:32:51 +00:00
|
|
|
|
(defun byte-compile-warn-obsolete (symbol)
|
|
|
|
|
"Warn that SYMBOL (a variable or function) is obsolete."
|
|
|
|
|
(when (byte-compile-warning-enabled-p 'obsolete)
|
|
|
|
|
(let* ((funcp (get symbol 'byte-obsolete-info))
|
2012-09-20 13:46:36 +00:00
|
|
|
|
(msg (macroexp--obsolete-warning
|
|
|
|
|
symbol
|
|
|
|
|
(or funcp (get symbol 'byte-obsolete-variable))
|
|
|
|
|
(if funcp "function" "variable"))))
|
2009-09-16 03:13:03 +00:00
|
|
|
|
(unless (and funcp (memq symbol byte-compile-not-obsolete-funcs))
|
2012-09-20 13:46:36 +00:00
|
|
|
|
(byte-compile-warn "%s" msg)))))
|
2008-04-26 02:32:51 +00:00
|
|
|
|
|
1992-08-04 04:09:07 +00:00
|
|
|
|
(defun byte-compile-report-error (error-info)
|
2002-07-20 22:01:19 +00:00
|
|
|
|
"Report Lisp error in compilation. ERROR-INFO is the error data."
|
1992-09-13 19:05:13 +00:00
|
|
|
|
(setq byte-compiler-error-flag t)
|
2002-07-20 22:01:19 +00:00
|
|
|
|
(byte-compile-log-warning
|
|
|
|
|
(error-message-string error-info)
|
|
|
|
|
nil :error))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
|
|
|
|
;;; sanity-checking arglists
|
|
|
|
|
|
|
|
|
|
(defun byte-compile-fdefinition (name macro-p)
|
2009-10-01 16:54:21 +00:00
|
|
|
|
;; If a function has an entry saying (FUNCTION . t).
|
|
|
|
|
;; that means we know it is defined but we don't know how.
|
|
|
|
|
;; If a function has an entry saying (FUNCTION . nil),
|
|
|
|
|
;; that means treat it as not defined.
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(let* ((list (if macro-p
|
|
|
|
|
byte-compile-macro-environment
|
1994-06-29 18:06:09 +00:00
|
|
|
|
byte-compile-function-environment))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(env (cdr (assq name list))))
|
|
|
|
|
(or env
|
|
|
|
|
(let ((fn name))
|
|
|
|
|
(while (and (symbolp fn)
|
|
|
|
|
(fboundp fn)
|
|
|
|
|
(or (symbolp (symbol-function fn))
|
|
|
|
|
(consp (symbol-function fn))
|
|
|
|
|
(and (not macro-p)
|
* disass.el (disassemble): Add autoload cookie for this.
* bytecomp.el (byte-decompile-bytecode): Add an autoload for this.
compiled-function-p has been renamed to byte-code-function-p.
* subr.el: Define compiled-function-p as an alias for it.
* bytecomp.el: Register compiled-function-p as obsolete.
* bytecomp.el, byte-opt.el, disass.el, help.el, map-ynp.el: Change
uses.
unread-command-event has been replaced by unread-command-events.
* simple.el (prefix-arg-internal): Use this to push back all
key sequences for processing by the main command loop, instead of
trying to simulate its behavior ourselves.
* bytecomp.el: Document unread-command-event as an obsolete
variable, although nothing but the GNU Emacs 19 sources use it.
Adjust obsolescence message for unread-command-char.
* comint.el (comint-dynamic-list-completions): Change uses of
unread-command-event to work with unread-command-events.
* ebuff-menu.el (electric-buffer-list, Electric-buffer-menu-exit):
Same.
* edebug.el (edebug-outside-excursion): Same.
* ehelp.el (electric-help-command-loop): Same.
* electric.el (Electric-command-loop): Same.
* emerge.el (emerge-show-file-name): Same.
* fortran.el (fortran-abbrev-start,
fortran-window-create-momentarily): Same.
* gnus.el (gnus-Subject-next-article): Same.
* info.el (Info-summary): Same.
* isearch-mode.el (isearch-update, isearch-unread): Same.
* map-ynp.el (map-y-or-n-p): Same.
* mlsupport.el (push-back-character): Same.
* replace.el (perform-replace): Same.
* simula.el (simula-electric-label): Same.
* subr.el (read-quoted-char, momentary-string-display): Same.
* sun-mouse.el (mouse-second-hit): Same.
* terminal.el (te-escape-extended-command-unread): Same.
* vip.el (vip-escape-to-emacs, vip-prefix-arg-value,
vip-prefix-arg-com): Same.
1993-01-26 01:36:02 +00:00
|
|
|
|
(byte-code-function-p (symbol-function fn)))))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(setq fn (symbol-function fn)))
|
2009-10-01 17:47:38 +00:00
|
|
|
|
(let ((advertised (gethash (if (and (symbolp fn) (fboundp fn))
|
|
|
|
|
;; Could be a subr.
|
|
|
|
|
(symbol-function fn)
|
|
|
|
|
fn)
|
|
|
|
|
advertised-signature-table t)))
|
2009-10-01 16:54:21 +00:00
|
|
|
|
(cond
|
|
|
|
|
((listp advertised)
|
|
|
|
|
(if macro-p
|
|
|
|
|
`(macro lambda ,advertised)
|
|
|
|
|
`(lambda ,advertised)))
|
|
|
|
|
((and (not macro-p) (byte-code-function-p fn)) fn)
|
|
|
|
|
((not (consp fn)) nil)
|
|
|
|
|
((eq 'macro (car fn)) (cdr fn))
|
|
|
|
|
(macro-p nil)
|
|
|
|
|
((eq 'autoload (car fn)) nil)
|
|
|
|
|
(t fn)))))))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
|
|
|
|
(defun byte-compile-arglist-signature (arglist)
|
2012-05-30 03:59:42 +00:00
|
|
|
|
(cond
|
|
|
|
|
;; New style byte-code arglist.
|
|
|
|
|
((integerp arglist)
|
|
|
|
|
(cons (logand arglist 127) ;Mandatory.
|
|
|
|
|
(if (zerop (logand arglist 128)) ;No &rest.
|
|
|
|
|
(lsh arglist -8)))) ;Nonrest.
|
|
|
|
|
;; Old style byte-code, or interpreted function.
|
|
|
|
|
((listp arglist)
|
2011-03-06 04:48:17 +00:00
|
|
|
|
(let ((args 0)
|
|
|
|
|
opts
|
|
|
|
|
restp)
|
|
|
|
|
(while arglist
|
|
|
|
|
(cond ((eq (car arglist) '&optional)
|
|
|
|
|
(or opts (setq opts 0)))
|
|
|
|
|
((eq (car arglist) '&rest)
|
|
|
|
|
(if (cdr arglist)
|
|
|
|
|
(setq restp t
|
|
|
|
|
arglist nil)))
|
|
|
|
|
(t
|
|
|
|
|
(if opts
|
|
|
|
|
(setq opts (1+ opts))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(setq args (1+ args)))))
|
2011-03-06 04:48:17 +00:00
|
|
|
|
(setq arglist (cdr arglist)))
|
2012-05-30 03:59:42 +00:00
|
|
|
|
(cons args (if restp nil (if opts (+ args opts) args)))))
|
|
|
|
|
;; Unknown arglist.
|
|
|
|
|
(t '(0))))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
(defun byte-compile-arglist-signatures-congruent-p (old new)
|
|
|
|
|
(not (or
|
|
|
|
|
(> (car new) (car old)) ; requires more args now
|
1996-01-05 22:21:28 +00:00
|
|
|
|
(and (null (cdr old)) ; took rest-args, doesn't any more
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(cdr new))
|
|
|
|
|
(and (cdr new) (cdr old) ; can't take as many args now
|
|
|
|
|
(< (cdr new) (cdr old)))
|
|
|
|
|
)))
|
|
|
|
|
|
|
|
|
|
(defun byte-compile-arglist-signature-string (signature)
|
|
|
|
|
(cond ((null (cdr signature))
|
|
|
|
|
(format "%d+" (car signature)))
|
|
|
|
|
((= (car signature) (cdr signature))
|
|
|
|
|
(format "%d" (car signature)))
|
|
|
|
|
(t (format "%d-%d" (car signature) (cdr signature)))))
|
|
|
|
|
|
2013-08-08 01:37:47 +00:00
|
|
|
|
(defun byte-compile-function-warn (f nargs def)
|
|
|
|
|
(when (get f 'byte-obsolete-info)
|
|
|
|
|
(byte-compile-warn-obsolete f))
|
|
|
|
|
|
|
|
|
|
;; Check to see if the function will be available at runtime
|
|
|
|
|
;; and/or remember its arity if it's unknown.
|
|
|
|
|
(or (and (or def (fboundp f)) ; might be a subr or autoload.
|
|
|
|
|
(not (memq f byte-compile-noruntime-functions)))
|
|
|
|
|
(eq f byte-compile-current-form) ; ## This doesn't work
|
|
|
|
|
; with recursion.
|
|
|
|
|
;; It's a currently-undefined function.
|
|
|
|
|
;; Remember number of args in call.
|
|
|
|
|
(let ((cons (assq f byte-compile-unresolved-functions)))
|
|
|
|
|
(if cons
|
|
|
|
|
(or (memq nargs (cdr cons))
|
|
|
|
|
(push nargs (cdr cons)))
|
|
|
|
|
(push (list f nargs)
|
|
|
|
|
byte-compile-unresolved-functions)))))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
1992-07-15 20:26:37 +00:00
|
|
|
|
;; Warn if the form is calling a function with the wrong number of arguments.
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(defun byte-compile-callargs-warn (form)
|
|
|
|
|
(let* ((def (or (byte-compile-fdefinition (car form) nil)
|
|
|
|
|
(byte-compile-fdefinition (car form) t)))
|
2004-11-09 10:33:23 +00:00
|
|
|
|
(sig (if (and def (not (eq def t)))
|
2009-10-31 02:10:43 +00:00
|
|
|
|
(progn
|
|
|
|
|
(and (eq (car-safe def) 'macro)
|
|
|
|
|
(eq (car-safe (cdr-safe def)) 'lambda)
|
|
|
|
|
(setq def (cdr def)))
|
|
|
|
|
(byte-compile-arglist-signature
|
|
|
|
|
(if (memq (car-safe def) '(declared lambda))
|
|
|
|
|
(nth 1 def)
|
|
|
|
|
(if (byte-code-function-p def)
|
|
|
|
|
(aref def 0)
|
|
|
|
|
'(&rest def)))))
|
2014-01-06 23:34:05 +00:00
|
|
|
|
(if (subrp (symbol-function (car form)))
|
2000-05-26 10:35:38 +00:00
|
|
|
|
(subr-arity (symbol-function (car form))))))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(ncall (length (cdr form))))
|
2000-05-26 10:35:38 +00:00
|
|
|
|
;; Check many or unevalled from subr-arity.
|
|
|
|
|
(if (and (cdr-safe sig)
|
|
|
|
|
(not (numberp (cdr sig))))
|
|
|
|
|
(setcdr sig nil))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(if sig
|
2002-05-28 17:40:47 +00:00
|
|
|
|
(when (or (< ncall (car sig))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(and (cdr sig) (> ncall (cdr sig))))
|
2002-05-28 17:40:47 +00:00
|
|
|
|
(byte-compile-set-symbol-position (car form))
|
|
|
|
|
(byte-compile-warn
|
|
|
|
|
"%s called with %d argument%s, but %s %s"
|
|
|
|
|
(car form) ncall
|
|
|
|
|
(if (= 1 ncall) "" "s")
|
|
|
|
|
(if (< ncall (car sig))
|
|
|
|
|
"requires"
|
|
|
|
|
"accepts only")
|
2002-06-25 01:09:52 +00:00
|
|
|
|
(byte-compile-arglist-signature-string sig))))
|
2004-04-16 12:51:06 +00:00
|
|
|
|
(byte-compile-format-warn form)
|
2013-08-08 01:37:47 +00:00
|
|
|
|
(byte-compile-function-warn (car form) (length (cdr form)) def)))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
2004-04-16 12:51:06 +00:00
|
|
|
|
(defun byte-compile-format-warn (form)
|
|
|
|
|
"Warn if FORM is `format'-like with inconsistent args.
|
|
|
|
|
Applies if head of FORM is a symbol with non-nil property
|
|
|
|
|
`byte-compile-format-like' and first arg is a constant string.
|
|
|
|
|
Then check the number of format fields matches the number of
|
|
|
|
|
extra args."
|
|
|
|
|
(when (and (symbolp (car form))
|
|
|
|
|
(stringp (nth 1 form))
|
|
|
|
|
(get (car form) 'byte-compile-format-like))
|
|
|
|
|
(let ((nfields (with-temp-buffer
|
|
|
|
|
(insert (nth 1 form))
|
2007-06-12 21:03:32 +00:00
|
|
|
|
(goto-char (point-min))
|
2004-04-16 12:51:06 +00:00
|
|
|
|
(let ((n 0))
|
|
|
|
|
(while (re-search-forward "%." nil t)
|
|
|
|
|
(unless (eq ?% (char-after (1+ (match-beginning 0))))
|
|
|
|
|
(setq n (1+ n))))
|
|
|
|
|
n)))
|
|
|
|
|
(nargs (- (length form) 2)))
|
|
|
|
|
(unless (= nargs nfields)
|
|
|
|
|
(byte-compile-warn
|
|
|
|
|
"`%s' called with %d args to fill %d format field(s)" (car form)
|
|
|
|
|
nargs nfields)))))
|
|
|
|
|
|
|
|
|
|
(dolist (elt '(format message error))
|
|
|
|
|
(put elt 'byte-compile-format-like t))
|
|
|
|
|
|
2005-05-14 12:30:08 +00:00
|
|
|
|
;; Warn if a custom definition fails to specify :group.
|
|
|
|
|
(defun byte-compile-nogroup-warn (form)
|
2008-06-08 02:07:25 +00:00
|
|
|
|
(if (and (memq (car form) '(custom-declare-face custom-declare-variable))
|
|
|
|
|
byte-compile-current-group)
|
|
|
|
|
;; The group will be provided implicitly.
|
|
|
|
|
nil
|
|
|
|
|
(let ((keyword-args (cdr (cdr (cdr (cdr form)))))
|
|
|
|
|
(name (cadr form)))
|
|
|
|
|
(or (not (eq (car-safe name) 'quote))
|
2007-06-14 21:25:12 +00:00
|
|
|
|
(and (eq (car form) 'custom-declare-group)
|
|
|
|
|
(equal name ''emacs))
|
|
|
|
|
(plist-get keyword-args :group)
|
|
|
|
|
(not (and (consp name) (eq (car name) 'quote)))
|
|
|
|
|
(byte-compile-warn
|
|
|
|
|
"%s for `%s' fails to specify containing group"
|
|
|
|
|
(cdr (assq (car form)
|
2008-06-08 02:07:25 +00:00
|
|
|
|
'((custom-declare-group . defgroup)
|
|
|
|
|
(custom-declare-face . defface)
|
|
|
|
|
(custom-declare-variable . defcustom))))
|
|
|
|
|
(cadr name)))
|
|
|
|
|
;; Update the current group, if needed.
|
Try and fix w32 build; misc cleanup.
* lisp/subr.el (apply-partially): Move from subr.el; don't use lexical-let.
(eval-after-load): Obey lexical-binding.
* lisp/simple.el (apply-partially): Move to subr.el.
* lisp/makefile.w32-in: Match changes in Makefile.in.
(BIG_STACK_DEPTH, BIG_STACK_OPTS, BYTE_COMPILE_FLAGS): New vars.
(.el.elc, compile-CMD, compile-SH, compile-always-CMD)
(compile-always-SH, compile-calc-CMD, compile-calc-SH): Use them.
(COMPILE_FIRST): Add pcase, macroexp, and cconv.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Silence warning about
calling CL's `compiler-macroexpand'.
* lisp/emacs-lisp/bytecomp.el (byte-compile-preprocess): New function.
(byte-compile-initial-macro-environment)
(byte-compile-toplevel-file-form, byte-compile, byte-compile-sexp): Use it.
(byte-compile-eval, byte-compile-eval-before-compile): Obey lexical-binding.
(byte-compile--for-effect): Rename from `for-effect'.
(display-call-tree): Use case.
* lisp/emacs-lisp/byte-opt.el (for-effect): Don't declare as dynamic.
(byte-optimize-form-code-walker, byte-optimize-form):
Revert to old arg name.
* lisp/Makefile.in (BYTE_COMPILE_FLAGS): New var.
(compile-onefile, .el.elc, compile-calc, recompile): Use it.
2011-03-12 03:32:43 +00:00
|
|
|
|
(if (and byte-compile-current-file ;Only when compiling a whole file.
|
2008-06-08 02:07:25 +00:00
|
|
|
|
(eq (car form) 'custom-declare-group)
|
|
|
|
|
(eq (car-safe name) 'quote))
|
|
|
|
|
(setq byte-compile-current-group (cadr name))))))
|
2005-05-14 12:30:08 +00:00
|
|
|
|
|
1992-07-15 20:26:37 +00:00
|
|
|
|
;; Warn if the function or macro is being redefined with a different
|
|
|
|
|
;; number of arguments.
|
2012-05-30 03:59:42 +00:00
|
|
|
|
(defun byte-compile-arglist-warn (name arglist macrop)
|
|
|
|
|
(let* ((old (byte-compile-fdefinition name macrop))
|
2011-05-11 16:31:33 +00:00
|
|
|
|
(initial (and macrop
|
|
|
|
|
(cdr (assq name
|
|
|
|
|
byte-compile-initial-macro-environment)))))
|
|
|
|
|
;; Assumes an element of b-c-i-macro-env that is a symbol points
|
|
|
|
|
;; to a defined function. (Bug#8646)
|
|
|
|
|
(and initial (symbolp initial)
|
2011-05-11 17:32:38 +00:00
|
|
|
|
(setq old (byte-compile-fdefinition initial nil)))
|
2004-11-09 10:33:23 +00:00
|
|
|
|
(if (and old (not (eq old t)))
|
2009-10-31 02:10:43 +00:00
|
|
|
|
(progn
|
|
|
|
|
(and (eq 'macro (car-safe old))
|
|
|
|
|
(eq 'lambda (car-safe (cdr-safe old)))
|
|
|
|
|
(setq old (cdr old)))
|
|
|
|
|
(let ((sig1 (byte-compile-arglist-signature
|
2011-02-17 21:19:13 +00:00
|
|
|
|
(pcase old
|
|
|
|
|
(`(lambda ,args . ,_) args)
|
2011-03-13 22:31:49 +00:00
|
|
|
|
(`(closure ,_ ,args . ,_) args)
|
2011-02-17 21:19:13 +00:00
|
|
|
|
((pred byte-code-function-p) (aref old 0))
|
|
|
|
|
(t '(&rest def)))))
|
2012-05-30 03:59:42 +00:00
|
|
|
|
(sig2 (byte-compile-arglist-signature arglist)))
|
2009-10-31 02:10:43 +00:00
|
|
|
|
(unless (byte-compile-arglist-signatures-congruent-p sig1 sig2)
|
2011-02-26 15:19:08 +00:00
|
|
|
|
(byte-compile-set-symbol-position name)
|
2009-10-31 02:10:43 +00:00
|
|
|
|
(byte-compile-warn
|
|
|
|
|
"%s %s used to take %s %s, now takes %s"
|
2012-05-30 03:59:42 +00:00
|
|
|
|
(if macrop "macro" "function")
|
2011-02-26 15:19:08 +00:00
|
|
|
|
name
|
2009-10-31 02:10:43 +00:00
|
|
|
|
(byte-compile-arglist-signature-string sig1)
|
|
|
|
|
(if (equal sig1 '(1 . 1)) "argument" "arguments")
|
|
|
|
|
(byte-compile-arglist-signature-string sig2)))))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
;; This is the first definition. See if previous calls are compatible.
|
2011-02-26 15:19:08 +00:00
|
|
|
|
(let ((calls (assq name byte-compile-unresolved-functions))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
nums sig min max)
|
2013-08-07 17:33:30 +00:00
|
|
|
|
(setq byte-compile-unresolved-functions
|
|
|
|
|
(delq calls byte-compile-unresolved-functions))
|
|
|
|
|
(setq calls (delq t calls)) ;Ignore higher-order uses of the function.
|
|
|
|
|
(when (cdr calls)
|
2011-02-26 15:19:08 +00:00
|
|
|
|
(when (and (symbolp name)
|
2012-07-26 01:27:33 +00:00
|
|
|
|
(eq (function-get name 'byte-optimizer)
|
2011-02-26 15:19:08 +00:00
|
|
|
|
'byte-compile-inline-expand))
|
|
|
|
|
(byte-compile-warn "defsubst `%s' was used before it was defined"
|
|
|
|
|
name))
|
2012-05-30 03:59:42 +00:00
|
|
|
|
(setq sig (byte-compile-arglist-signature arglist)
|
2011-02-26 15:19:08 +00:00
|
|
|
|
nums (sort (copy-sequence (cdr calls)) (function <))
|
|
|
|
|
min (car nums)
|
|
|
|
|
max (car (nreverse nums)))
|
|
|
|
|
(when (or (< min (car sig))
|
|
|
|
|
(and (cdr sig) (> max (cdr sig))))
|
|
|
|
|
(byte-compile-set-symbol-position name)
|
|
|
|
|
(byte-compile-warn
|
|
|
|
|
"%s being defined to take %s%s, but was previously called with %s"
|
|
|
|
|
name
|
|
|
|
|
(byte-compile-arglist-signature-string sig)
|
|
|
|
|
(if (equal sig '(1 . 1)) " arg" " args")
|
2013-08-07 17:33:30 +00:00
|
|
|
|
(byte-compile-arglist-signature-string (cons min max)))))))))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
2002-07-24 03:58:02 +00:00
|
|
|
|
(defvar byte-compile-cl-functions nil
|
|
|
|
|
"List of functions defined in CL.")
|
|
|
|
|
|
2009-09-05 19:10:37 +00:00
|
|
|
|
;; Can't just add this to cl-load-hook, because that runs just before
|
|
|
|
|
;; the forms from cl.el get added to load-history.
|
2002-07-24 03:58:02 +00:00
|
|
|
|
(defun byte-compile-find-cl-functions ()
|
|
|
|
|
(unless byte-compile-cl-functions
|
|
|
|
|
(dolist (elt load-history)
|
2009-09-05 19:10:37 +00:00
|
|
|
|
(and (byte-compile-cl-file-p (car elt))
|
|
|
|
|
(dolist (e (cdr elt))
|
|
|
|
|
;; Includes the cl-foo functions that cl autoloads.
|
|
|
|
|
(when (memq (car-safe e) '(autoload defun))
|
|
|
|
|
(push (cdr e) byte-compile-cl-functions)))))))
|
2002-07-24 03:58:02 +00:00
|
|
|
|
|
2002-07-02 18:48:34 +00:00
|
|
|
|
(defun byte-compile-cl-warn (form)
|
|
|
|
|
"Warn if FORM is a call of a function from the CL package."
|
2002-07-24 03:58:02 +00:00
|
|
|
|
(let ((func (car-safe form)))
|
|
|
|
|
(if (and byte-compile-cl-functions
|
|
|
|
|
(memq func byte-compile-cl-functions)
|
2004-04-16 12:51:06 +00:00
|
|
|
|
;; Aliases which won't have been expanded at this point.
|
2002-07-02 18:48:34 +00:00
|
|
|
|
;; These aren't all aliases of subrs, so not trivial to
|
|
|
|
|
;; avoid hardwiring the list.
|
|
|
|
|
(not (memq func
|
Use lexical-binding for all of CL, and clean up its namespace.
* lisp/emacs-lisp/cl-lib.el: Use lexical-binding.
(cl-map-extents, cl-maclisp-member): Remove.
(cl--set-elt, cl--set-nthcdr, cl--set-buffer-substring)
(cl--set-substring, cl--block-wrapper, cl--block-throw)
(cl--compiling-file, cl--mapcar-many, cl--do-subst): Use "cl--" prefix.
* lisp/emacs-lisp/cl-extra.el: Use lexical-binding.
(cl--mapcar-many, cl--map-keymap-recursively, cl--map-intervals)
(cl--map-overlays, cl--set-frame-visible-p, cl--progv-save)
(cl--progv-before, cl--progv-after, cl--finite-do, cl--set-getf)
(cl--do-remf, cl--do-prettyprint): Use "cl--" prefix.
* lisp/emacs-lisp/cl-seq.el: Use lexical-binding.
(cl--parsing-keywords, cl--check-key, cl--check-test-nokey)
(cl--check-test, cl--check-match): Use "cl--" prefix and backquotes.
(cl--alist, cl--sublis-rec, cl--nsublis-rec, cl--tree-equal-rec):
* lisp/emacs-lisp/cl-macs.el (cl--lambda-list-keywords): Use "cl--" prefix.
* lisp/edmacro.el (edmacro-mismatch): Simplify to remove dependence on
CL's internals.
2012-06-11 15:52:50 +00:00
|
|
|
|
'(cl--block-wrapper cl--block-throw
|
2002-07-19 23:01:24 +00:00
|
|
|
|
multiple-value-call nth-value
|
2002-07-24 03:58:02 +00:00
|
|
|
|
copy-seq first second rest endp cl-member
|
2002-12-07 21:33:19 +00:00
|
|
|
|
;; These are included in generated code
|
|
|
|
|
;; that can't be called except at compile time
|
|
|
|
|
;; or unless cl is loaded anyway.
|
Use lexical-binding for all of CL, and clean up its namespace.
* lisp/emacs-lisp/cl-lib.el: Use lexical-binding.
(cl-map-extents, cl-maclisp-member): Remove.
(cl--set-elt, cl--set-nthcdr, cl--set-buffer-substring)
(cl--set-substring, cl--block-wrapper, cl--block-throw)
(cl--compiling-file, cl--mapcar-many, cl--do-subst): Use "cl--" prefix.
* lisp/emacs-lisp/cl-extra.el: Use lexical-binding.
(cl--mapcar-many, cl--map-keymap-recursively, cl--map-intervals)
(cl--map-overlays, cl--set-frame-visible-p, cl--progv-save)
(cl--progv-before, cl--progv-after, cl--finite-do, cl--set-getf)
(cl--do-remf, cl--do-prettyprint): Use "cl--" prefix.
* lisp/emacs-lisp/cl-seq.el: Use lexical-binding.
(cl--parsing-keywords, cl--check-key, cl--check-test-nokey)
(cl--check-test, cl--check-match): Use "cl--" prefix and backquotes.
(cl--alist, cl--sublis-rec, cl--nsublis-rec, cl--tree-equal-rec):
* lisp/emacs-lisp/cl-macs.el (cl--lambda-list-keywords): Use "cl--" prefix.
* lisp/edmacro.el (edmacro-mismatch): Simplify to remove dependence on
CL's internals.
2012-06-11 15:52:50 +00:00
|
|
|
|
cl--defsubst-expand cl-struct-setf-expander
|
2002-08-29 14:49:48 +00:00
|
|
|
|
;; These would sometimes be warned about
|
|
|
|
|
;; but such warnings are never useful,
|
|
|
|
|
;; so don't warn about them.
|
2003-04-28 22:05:17 +00:00
|
|
|
|
macroexpand cl-macroexpand-all
|
Use lexical-binding for all of CL, and clean up its namespace.
* lisp/emacs-lisp/cl-lib.el: Use lexical-binding.
(cl-map-extents, cl-maclisp-member): Remove.
(cl--set-elt, cl--set-nthcdr, cl--set-buffer-substring)
(cl--set-substring, cl--block-wrapper, cl--block-throw)
(cl--compiling-file, cl--mapcar-many, cl--do-subst): Use "cl--" prefix.
* lisp/emacs-lisp/cl-extra.el: Use lexical-binding.
(cl--mapcar-many, cl--map-keymap-recursively, cl--map-intervals)
(cl--map-overlays, cl--set-frame-visible-p, cl--progv-save)
(cl--progv-before, cl--progv-after, cl--finite-do, cl--set-getf)
(cl--do-remf, cl--do-prettyprint): Use "cl--" prefix.
* lisp/emacs-lisp/cl-seq.el: Use lexical-binding.
(cl--parsing-keywords, cl--check-key, cl--check-test-nokey)
(cl--check-test, cl--check-match): Use "cl--" prefix and backquotes.
(cl--alist, cl--sublis-rec, cl--nsublis-rec, cl--tree-equal-rec):
* lisp/emacs-lisp/cl-macs.el (cl--lambda-list-keywords): Use "cl--" prefix.
* lisp/edmacro.el (edmacro-mismatch): Simplify to remove dependence on
CL's internals.
2012-06-11 15:52:50 +00:00
|
|
|
|
cl--compiling-file))))
|
2010-09-23 07:55:01 +00:00
|
|
|
|
(byte-compile-warn "function `%s' from cl package called at runtime"
|
2002-07-02 18:48:34 +00:00
|
|
|
|
func)))
|
|
|
|
|
form)
|
|
|
|
|
|
2000-03-24 18:37:48 +00:00
|
|
|
|
(defun byte-compile-print-syms (str1 strn syms)
|
2002-05-28 17:40:47 +00:00
|
|
|
|
(when syms
|
|
|
|
|
(byte-compile-set-symbol-position (car syms) t))
|
2001-10-11 12:57:18 +00:00
|
|
|
|
(cond ((and (cdr syms) (not noninteractive))
|
|
|
|
|
(let* ((str strn)
|
|
|
|
|
(L (length str))
|
|
|
|
|
s)
|
|
|
|
|
(while syms
|
|
|
|
|
(setq s (symbol-name (pop syms))
|
|
|
|
|
L (+ L (length s) 2))
|
|
|
|
|
(if (< L (1- fill-column))
|
|
|
|
|
(setq str (concat str " " s (and syms ",")))
|
|
|
|
|
(setq str (concat str "\n " s (and syms ","))
|
|
|
|
|
L (+ (length s) 4))))
|
|
|
|
|
(byte-compile-warn "%s" str)))
|
|
|
|
|
((cdr syms)
|
2001-10-18 21:05:16 +00:00
|
|
|
|
(byte-compile-warn "%s %s"
|
2001-10-11 12:57:18 +00:00
|
|
|
|
strn
|
|
|
|
|
(mapconcat #'symbol-name syms ", ")))
|
|
|
|
|
|
|
|
|
|
(syms
|
|
|
|
|
(byte-compile-warn str1 (car syms)))))
|
2000-03-24 18:37:48 +00:00
|
|
|
|
|
2001-10-18 21:05:16 +00:00
|
|
|
|
;; If we have compiled any calls to functions which are not known to be
|
1992-07-15 20:26:37 +00:00
|
|
|
|
;; defined, issue a warning enumerating them.
|
|
|
|
|
;; `unresolved' in the list `byte-compile-warnings' disables this.
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(defun byte-compile-warn-about-unresolved-functions ()
|
2007-10-28 23:53:06 +00:00
|
|
|
|
(when (byte-compile-warning-enabled-p 'unresolved)
|
2001-10-11 12:57:18 +00:00
|
|
|
|
(let ((byte-compile-current-form :end)
|
2000-03-24 18:37:48 +00:00
|
|
|
|
(noruntime nil)
|
|
|
|
|
(unresolved nil))
|
|
|
|
|
;; Separate the functions that will not be available at runtime
|
|
|
|
|
;; from the truly unresolved ones.
|
|
|
|
|
(dolist (f byte-compile-unresolved-functions)
|
|
|
|
|
(setq f (car f))
|
|
|
|
|
(if (fboundp f) (push f noruntime) (push f unresolved)))
|
|
|
|
|
;; Complain about the no-run-time functions
|
|
|
|
|
(byte-compile-print-syms
|
2001-10-11 12:57:18 +00:00
|
|
|
|
"the function `%s' might not be defined at runtime."
|
|
|
|
|
"the following functions might not be defined at runtime:"
|
2000-03-24 18:37:48 +00:00
|
|
|
|
noruntime)
|
|
|
|
|
;; Complain about the unresolved functions
|
|
|
|
|
(byte-compile-print-syms
|
2001-10-11 12:57:18 +00:00
|
|
|
|
"the function `%s' is not known to be defined."
|
|
|
|
|
"the following functions are not known to be defined:"
|
2000-03-24 18:37:48 +00:00
|
|
|
|
unresolved)))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
nil)
|
|
|
|
|
|
|
|
|
|
|
2012-05-29 14:28:02 +00:00
|
|
|
|
;; Dynamically bound in byte-compile-from-buffer.
|
|
|
|
|
;; NB also used in cl.el and cl-macs.el.
|
|
|
|
|
(defvar byte-compile--outbuffer)
|
|
|
|
|
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(defmacro byte-compile-close-variables (&rest body)
|
Get rid of funvec.
* lisp/emacs-lisp/bytecomp.el (byte-compile-lapcode): Handle new form of
`byte-constant'.
(byte-compile-close-variables, displaying-byte-compile-warnings):
Add edebug spec.
(byte-compile-toplevel-file-form): New fun, split out of
byte-compile-file-form.
(byte-compile-from-buffer): Use it to avoid applying cconv
multiple times.
(byte-compile): Only strip `function' if it's present.
(byte-compile-lambda): Add `reserved-csts' argument.
Use new lexenv arg of byte-compile-top-level.
(byte-compile-reserved-constants): New var.
(byte-compile-constants-vector): Obey it.
(byte-compile-constants-vector): Handle new `byte-constant' form.
(byte-compile-top-level): Add args `lexenv' and `reserved-csts'.
(byte-compile-form): Don't check callargs here.
(byte-compile-normal-call): Do it here instead.
(byte-compile-push-unknown-constant)
(byte-compile-resolve-unknown-constant): Remove, unused.
(byte-compile-make-closure): Use `make-byte-code' rather than `curry',
putting the environment into the "constant" pool.
(byte-compile-get-closed-var): Use special byte-constant.
* lisp/emacs-lisp/byte-opt.el (byte-optimize-form-code-walker): Handle new
intermediate special form `internal-make-vector'.
(byte-optimize-lapcode): Handle new form of `byte-constant'.
* lisp/help-fns.el (describe-function-1): Don't handle funvecs.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Only convert quote to
function if the content is a lambda expression, not if it's a closure.
* emacs-lisp/eieio-come.el: Remove.
* lisp/emacs-lisp/eieio.el: Don't require eieio-comp.
(defmethod): Do a bit more work to find the body and wrap it into
a function before passing it to eieio-defmethod.
(eieio-defmethod): New arg `code' for it.
* lisp/emacs-lisp/debug.el (debugger-setup-buffer): Don't hide things in
debugger backtrace.
* lisp/emacs-lisp/cl-extra.el (cl-macroexpand-all): Use backquotes, and be
more careful when quoting a function value.
* lisp/emacs-lisp/cconv.el (cconv-freevars): Accept defvar/defconst.
(cconv-closure-convert-rec): Catch stray `internal-make-closure'.
* lisp/Makefile.in (COMPILE_FIRST): Compile pcase and cconv early.
* src/eval.c (Qcurry): Remove.
(funcall_funvec): Remove.
(funcall_lambda): Move new byte-code handling to reduce impact.
Treat all args as lexical in the case of lexbind.
(Fcurry): Remove.
* src/data.c (Qfunction_vector): Remove.
(Ffunvecp): Remove.
* src/lread.c (read1): Revert to calling make_byte_code here.
(read_vector): Don't call make_byte_code any more.
* src/lisp.h (enum pvec_type): Rename back to PVEC_COMPILED.
(XSETCOMPILED): Rename back from XSETFUNVEC.
(FUNVEC_SIZE): Remove.
(FUNVEC_COMPILED_TAG_P, FUNVEC_COMPILED_P): Remove.
(COMPILEDP): Rename back from FUNVECP.
* src/fns.c (Felt): Remove unexplained FUNVEC check.
* src/doc.c (Fdocumentation): Don't handle funvec.
* src/alloc.c (make_funvec, Ffunvec): Remove.
* doc/lispref/vol2.texi (Top):
* doc/lispref/vol1.texi (Top):
* doc/lispref/objects.texi (Programming Types, Funvec Type, Type Predicates):
* doc/lispref/functions.texi (Functions, What Is a Function, FunctionCurrying):
* doc/lispref/elisp.texi (Top): Remove mentions of funvec and curry.
2011-02-25 03:27:45 +00:00
|
|
|
|
(declare (debug t))
|
2012-05-29 14:28:02 +00:00
|
|
|
|
`(let (;;
|
|
|
|
|
;; Close over these variables to encapsulate the
|
|
|
|
|
;; compilation state
|
|
|
|
|
;;
|
|
|
|
|
(byte-compile-macro-environment
|
|
|
|
|
;; Copy it because the compiler may patch into the
|
|
|
|
|
;; macroenvironment.
|
|
|
|
|
(copy-alist byte-compile-initial-macro-environment))
|
|
|
|
|
(byte-compile--outbuffer nil)
|
|
|
|
|
(byte-compile-function-environment nil)
|
|
|
|
|
(byte-compile-bound-variables nil)
|
2013-06-05 02:35:40 +00:00
|
|
|
|
(byte-compile-lexical-variables nil)
|
2012-05-29 14:28:02 +00:00
|
|
|
|
(byte-compile-const-variables nil)
|
|
|
|
|
(byte-compile-free-references nil)
|
|
|
|
|
(byte-compile-free-assignments nil)
|
|
|
|
|
;;
|
|
|
|
|
;; Close over these variables so that `byte-compiler-options'
|
|
|
|
|
;; can change them on a per-file basis.
|
|
|
|
|
;;
|
|
|
|
|
(byte-compile-verbose byte-compile-verbose)
|
|
|
|
|
(byte-optimize byte-optimize)
|
|
|
|
|
(byte-compile-dynamic byte-compile-dynamic)
|
|
|
|
|
(byte-compile-dynamic-docstrings
|
|
|
|
|
byte-compile-dynamic-docstrings)
|
|
|
|
|
;; (byte-compile-generate-emacs19-bytecodes
|
|
|
|
|
;; byte-compile-generate-emacs19-bytecodes)
|
|
|
|
|
(byte-compile-warnings byte-compile-warnings)
|
|
|
|
|
)
|
|
|
|
|
,@body))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
|
|
|
|
(defmacro displaying-byte-compile-warnings (&rest body)
|
Get rid of funvec.
* lisp/emacs-lisp/bytecomp.el (byte-compile-lapcode): Handle new form of
`byte-constant'.
(byte-compile-close-variables, displaying-byte-compile-warnings):
Add edebug spec.
(byte-compile-toplevel-file-form): New fun, split out of
byte-compile-file-form.
(byte-compile-from-buffer): Use it to avoid applying cconv
multiple times.
(byte-compile): Only strip `function' if it's present.
(byte-compile-lambda): Add `reserved-csts' argument.
Use new lexenv arg of byte-compile-top-level.
(byte-compile-reserved-constants): New var.
(byte-compile-constants-vector): Obey it.
(byte-compile-constants-vector): Handle new `byte-constant' form.
(byte-compile-top-level): Add args `lexenv' and `reserved-csts'.
(byte-compile-form): Don't check callargs here.
(byte-compile-normal-call): Do it here instead.
(byte-compile-push-unknown-constant)
(byte-compile-resolve-unknown-constant): Remove, unused.
(byte-compile-make-closure): Use `make-byte-code' rather than `curry',
putting the environment into the "constant" pool.
(byte-compile-get-closed-var): Use special byte-constant.
* lisp/emacs-lisp/byte-opt.el (byte-optimize-form-code-walker): Handle new
intermediate special form `internal-make-vector'.
(byte-optimize-lapcode): Handle new form of `byte-constant'.
* lisp/help-fns.el (describe-function-1): Don't handle funvecs.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Only convert quote to
function if the content is a lambda expression, not if it's a closure.
* emacs-lisp/eieio-come.el: Remove.
* lisp/emacs-lisp/eieio.el: Don't require eieio-comp.
(defmethod): Do a bit more work to find the body and wrap it into
a function before passing it to eieio-defmethod.
(eieio-defmethod): New arg `code' for it.
* lisp/emacs-lisp/debug.el (debugger-setup-buffer): Don't hide things in
debugger backtrace.
* lisp/emacs-lisp/cl-extra.el (cl-macroexpand-all): Use backquotes, and be
more careful when quoting a function value.
* lisp/emacs-lisp/cconv.el (cconv-freevars): Accept defvar/defconst.
(cconv-closure-convert-rec): Catch stray `internal-make-closure'.
* lisp/Makefile.in (COMPILE_FIRST): Compile pcase and cconv early.
* src/eval.c (Qcurry): Remove.
(funcall_funvec): Remove.
(funcall_lambda): Move new byte-code handling to reduce impact.
Treat all args as lexical in the case of lexbind.
(Fcurry): Remove.
* src/data.c (Qfunction_vector): Remove.
(Ffunvecp): Remove.
* src/lread.c (read1): Revert to calling make_byte_code here.
(read_vector): Don't call make_byte_code any more.
* src/lisp.h (enum pvec_type): Rename back to PVEC_COMPILED.
(XSETCOMPILED): Rename back from XSETFUNVEC.
(FUNVEC_SIZE): Remove.
(FUNVEC_COMPILED_TAG_P, FUNVEC_COMPILED_P): Remove.
(COMPILEDP): Rename back from FUNVECP.
* src/fns.c (Felt): Remove unexplained FUNVEC check.
* src/doc.c (Fdocumentation): Don't handle funvec.
* src/alloc.c (make_funvec, Ffunvec): Remove.
* doc/lispref/vol2.texi (Top):
* doc/lispref/vol1.texi (Top):
* doc/lispref/objects.texi (Programming Types, Funvec Type, Type Predicates):
* doc/lispref/functions.texi (Functions, What Is a Function, FunctionCurrying):
* doc/lispref/elisp.texi (Top): Remove mentions of funvec and curry.
2011-02-25 03:27:45 +00:00
|
|
|
|
(declare (debug t))
|
2002-08-29 17:26:47 +00:00
|
|
|
|
`(let* ((--displaying-byte-compile-warnings-fn (lambda () ,@body))
|
|
|
|
|
(warning-series-started
|
|
|
|
|
(and (markerp warning-series)
|
|
|
|
|
(eq (marker-buffer warning-series)
|
2010-11-12 03:21:38 +00:00
|
|
|
|
(get-buffer byte-compile-log-buffer)))))
|
2002-07-24 03:58:02 +00:00
|
|
|
|
(byte-compile-find-cl-functions)
|
2002-08-29 17:26:47 +00:00
|
|
|
|
(if (or (eq warning-series 'byte-compile-warning-series)
|
|
|
|
|
warning-series-started)
|
|
|
|
|
;; warning-series does come from compilation,
|
|
|
|
|
;; so don't bind it, but maybe do set it.
|
|
|
|
|
(let (tem)
|
|
|
|
|
;; Log the file name. Record position of that text.
|
|
|
|
|
(setq tem (byte-compile-log-file))
|
|
|
|
|
(unless warning-series-started
|
|
|
|
|
(setq warning-series (or tem 'byte-compile-warning-series)))
|
|
|
|
|
(if byte-compile-debug
|
|
|
|
|
(funcall --displaying-byte-compile-warnings-fn)
|
|
|
|
|
(condition-case error-info
|
|
|
|
|
(funcall --displaying-byte-compile-warnings-fn)
|
|
|
|
|
(error (byte-compile-report-error error-info)))))
|
|
|
|
|
;; warning-series does not come from compilation, so bind it.
|
|
|
|
|
(let ((warning-series
|
|
|
|
|
;; Log the file name. Record position of that text.
|
|
|
|
|
(or (byte-compile-log-file) 'byte-compile-warning-series)))
|
|
|
|
|
(if byte-compile-debug
|
2002-07-20 22:01:19 +00:00
|
|
|
|
(funcall --displaying-byte-compile-warnings-fn)
|
2002-08-29 17:26:47 +00:00
|
|
|
|
(condition-case error-info
|
|
|
|
|
(funcall --displaying-byte-compile-warnings-fn)
|
|
|
|
|
(error (byte-compile-report-error error-info))))))))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
1992-07-19 01:07:07 +00:00
|
|
|
|
;;;###autoload
|
1995-10-30 18:01:22 +00:00
|
|
|
|
(defun byte-force-recompile (directory)
|
|
|
|
|
"Recompile every `.el' file in DIRECTORY that already has a `.elc' file.
|
|
|
|
|
Files in subdirectories of DIRECTORY are processed also."
|
1995-11-10 17:16:57 +00:00
|
|
|
|
(interactive "DByte force recompile (directory): ")
|
1995-10-30 18:01:22 +00:00
|
|
|
|
(byte-recompile-directory directory nil t))
|
|
|
|
|
|
|
|
|
|
;;;###autoload
|
2011-03-16 20:08:39 +00:00
|
|
|
|
(defun byte-recompile-directory (directory &optional arg force)
|
|
|
|
|
"Recompile every `.el' file in DIRECTORY that needs recompilation.
|
2008-11-20 12:13:49 +00:00
|
|
|
|
This happens when a `.elc' file exists but is older than the `.el' file.
|
2011-03-16 20:08:39 +00:00
|
|
|
|
Files in subdirectories of DIRECTORY are processed also.
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
2002-06-15 20:37:01 +00:00
|
|
|
|
If the `.elc' file does not exist, normally this function *does not*
|
2008-03-01 21:11:37 +00:00
|
|
|
|
compile the corresponding `.el' file. However, if the prefix argument
|
2011-03-16 20:08:39 +00:00
|
|
|
|
ARG is 0, that means do compile all those files. A nonzero
|
|
|
|
|
ARG means ask the user, for each such `.el' file, whether to
|
|
|
|
|
compile it. A nonzero ARG also means ask about each subdirectory
|
2008-03-01 21:11:37 +00:00
|
|
|
|
before scanning it.
|
|
|
|
|
|
2011-03-16 20:08:39 +00:00
|
|
|
|
If the third argument FORCE is non-nil, recompile every `.el' file
|
2008-03-01 21:11:37 +00:00
|
|
|
|
that already has a `.elc' file."
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(interactive "DByte recompile directory: \nP")
|
2011-03-16 20:08:39 +00:00
|
|
|
|
(if arg (setq arg (prefix-numeric-value arg)))
|
1993-06-11 16:19:49 +00:00
|
|
|
|
(if noninteractive
|
|
|
|
|
nil
|
|
|
|
|
(save-some-buffers)
|
1995-04-25 22:32:49 +00:00
|
|
|
|
(force-mode-line-update))
|
2010-11-12 03:21:38 +00:00
|
|
|
|
(with-current-buffer (get-buffer-create byte-compile-log-buffer)
|
2011-03-16 20:08:39 +00:00
|
|
|
|
(setq default-directory (expand-file-name directory))
|
2003-04-19 04:18:37 +00:00
|
|
|
|
;; compilation-mode copies value of default-directory.
|
|
|
|
|
(unless (eq major-mode 'compilation-mode)
|
|
|
|
|
(compilation-mode))
|
2011-03-16 20:08:39 +00:00
|
|
|
|
(let ((directories (list default-directory))
|
2002-09-09 19:35:57 +00:00
|
|
|
|
(default-directory default-directory)
|
|
|
|
|
(skip-count 0)
|
|
|
|
|
(fail-count 0)
|
|
|
|
|
(file-count 0)
|
|
|
|
|
(dir-count 0)
|
|
|
|
|
last-dir)
|
|
|
|
|
(displaying-byte-compile-warnings
|
2011-03-16 20:08:39 +00:00
|
|
|
|
(while directories
|
|
|
|
|
(setq directory (car directories))
|
|
|
|
|
(message "Checking %s..." directory)
|
|
|
|
|
(dolist (file (directory-files directory))
|
|
|
|
|
(let ((source (expand-file-name file directory)))
|
2013-08-30 17:40:39 +00:00
|
|
|
|
(if (file-directory-p source)
|
|
|
|
|
(and (not (member file '("RCS" "CVS")))
|
|
|
|
|
(not (eq ?\. (aref file 0)))
|
|
|
|
|
(not (file-symlink-p source))
|
|
|
|
|
;; This file is a subdirectory. Handle them differently.
|
|
|
|
|
(or (null arg) (eq 0 arg)
|
|
|
|
|
(y-or-n-p (concat "Check " source "? ")))
|
|
|
|
|
(setq directories (nconc directories (list source))))
|
2011-03-16 20:08:39 +00:00
|
|
|
|
;; It is an ordinary file. Decide whether to compile it.
|
|
|
|
|
(if (and (string-match emacs-lisp-file-regexp source)
|
2013-02-25 17:36:03 +00:00
|
|
|
|
;; The next 2 tests avoid compiling lock files
|
2011-03-16 20:08:39 +00:00
|
|
|
|
(file-readable-p source)
|
2013-02-25 17:36:03 +00:00
|
|
|
|
(not (string-match "\\`\\.#" file))
|
2011-03-16 20:08:39 +00:00
|
|
|
|
(not (auto-save-file-name-p source))
|
|
|
|
|
(not (string-equal dir-locals-file
|
|
|
|
|
(file-name-nondirectory source))))
|
2012-07-12 11:33:55 +00:00
|
|
|
|
(progn (cl-incf
|
Reduce use of (require 'cl).
* admin/bzrmerge.el: Use cl-lib.
* leim/quail/hangul.el: Don't require CL.
* leim/quail/ipa.el: Use cl-lib.
* vc/smerge-mode.el, vc/pcvs.el, vc/pcvs-util.el, vc/pcvs-info.el:
* vc/diff-mode.el, vc/cvs-status.el, uniquify.el, scroll-bar.el:
* register.el, progmodes/sh-script.el, net/gnutls.el, net/dbus.el:
* msb.el, mpc.el, minibuffer.el, international/ucs-normalize.el:
* international/quail.el, info-xref.el, imenu.el, image-mode.el:
* font-lock.el, filesets.el, edmacro.el, doc-view.el, bookmark.el:
* battery.el, avoid.el, abbrev.el: Use cl-lib.
* vc/pcvs-parse.el, vc/pcvs-defs.el, vc/log-view.el, vc/log-edit.el:
* vc/diff.el, simple.el, pcomplete.el, lpr.el, comint.el, loadhist.el:
* jit-lock.el, international/iso-ascii.el, info.el, frame.el, bs.el:
* emulation/crisp.el, electric.el, dired.el, cus-dep.el, composite.el:
* calculator.el, autorevert.el, apropos.el: Don't require CL.
* emacs-bytecomp.el (byte-recompile-directory, display-call-tree)
(byte-compile-unfold-bcf, byte-compile-check-variable):
* emacs-byte-opt.el (byte-compile-trueconstp)
(byte-compile-nilconstp):
* emacs-autoload.el (make-autoload): Use pcase.
* face-remap.el (text-scale-adjust): Simplify pcase patterns.
2012-07-10 11:51:54 +00:00
|
|
|
|
(pcase (byte-recompile-file source force arg)
|
|
|
|
|
(`no-byte-compile skip-count)
|
|
|
|
|
(`t file-count)
|
|
|
|
|
(_ fail-count)))
|
2011-03-16 20:08:39 +00:00
|
|
|
|
(or noninteractive
|
|
|
|
|
(message "Checking %s..." directory))
|
|
|
|
|
(if (not (eq last-dir directory))
|
|
|
|
|
(setq last-dir directory
|
|
|
|
|
dir-count (1+ dir-count)))
|
|
|
|
|
)))))
|
|
|
|
|
(setq directories (cdr directories))))
|
2002-09-09 19:35:57 +00:00
|
|
|
|
(message "Done (Total of %d file%s compiled%s%s%s)"
|
|
|
|
|
file-count (if (= file-count 1) "" "s")
|
|
|
|
|
(if (> fail-count 0) (format ", %d failed" fail-count) "")
|
|
|
|
|
(if (> skip-count 0) (format ", %d skipped" skip-count) "")
|
2008-03-01 21:11:37 +00:00
|
|
|
|
(if (> dir-count 1)
|
|
|
|
|
(format " in %d directories" dir-count) "")))))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
2001-11-17 00:54:36 +00:00
|
|
|
|
(defvar no-byte-compile nil
|
2008-11-20 12:13:49 +00:00
|
|
|
|
"Non-nil to prevent byte-compiling of Emacs Lisp code.
|
2001-11-17 00:54:36 +00:00
|
|
|
|
This is normally set in local file variables at the end of the elisp file:
|
|
|
|
|
|
* lisp/emacs-lisp/byte-lexbind.el: Delete.
* lisp/emacs-lisp/bytecomp.el (byte-compile-current-heap-environment)
(byte-compile-current-num-closures): Remove vars.
(byte-vec-ref, byte-vec-set): Remove byte codes.
(byte-compile-arglist-vars, byte-compile-make-lambda-lexenv): Move from
byte-lexbind.el.
(byte-compile-lambda): Never build a closure.
(byte-compile-closure-code-p, byte-compile-make-closure): Remove.
(byte-compile-closure): Simplify.
(byte-compile-top-level): Don't mess with heap environments.
(byte-compile-dynamic-variable-bind): Always maintain
byte-compile-bound-variables.
(byte-compile-variable-ref, byte-compile-variable-set): Always just use
the stack for lexical vars.
(byte-compile-push-binding-init): Simplify.
(byte-compile-not-lexical-var-p): New function, moved from cconv.el.
(byte-compile-bind, byte-compile-unbind): New functions, moved and
simplified from byte-lexbind.el.
(byte-compile-let, byte-compile-let*): Simplify.
(byte-compile-condition-case): Don't add :fun-body to the bound vars.
(byte-compile-defmacro): Simplify.
* lisp/emacs-lisp/byte-opt.el (byte-compile-side-effect-free-ops)
(byte-optimize-lapcode): Remove byte-vec-ref and byte-vec-set.
* lisp/emacs-lisp/cconv.el (cconv-not-lexical-var-p): Remove.
(cconv-freevars, cconv-analyse-function, cconv-analyse-form):
Use byte-compile-not-lexical-var-p instead.
* src/bytecode.c (Bvec_ref, Bvec_set): Remove.
(exec_byte_code): Don't handle them.
* lisp/help-fns.el (describe-function-1): Fix paren typo.
2011-02-12 05:53:30 +00:00
|
|
|
|
\;; Local Variables:\n;; no-byte-compile: t\n;; End: ") ;Backslash for compile-main.
|
2006-05-11 15:01:41 +00:00
|
|
|
|
;;;###autoload(put 'no-byte-compile 'safe-local-variable 'booleanp)
|
2001-11-17 00:54:36 +00:00
|
|
|
|
|
2011-03-16 20:08:39 +00:00
|
|
|
|
(defun byte-recompile-file (filename &optional force arg load)
|
|
|
|
|
"Recompile FILENAME file if it needs recompilation.
|
2010-10-31 19:25:39 +00:00
|
|
|
|
This happens when its `.elc' file is older than itself.
|
|
|
|
|
|
2012-08-14 15:58:46 +00:00
|
|
|
|
If the `.elc' file exists and is up-to-date, normally this function
|
|
|
|
|
*does not* compile FILENAME. If the prefix argument FORCE is non-nil,
|
|
|
|
|
however, it compiles FILENAME even if the destination already
|
|
|
|
|
exists and is up-to-date.
|
2010-10-31 19:25:39 +00:00
|
|
|
|
|
2012-08-14 15:58:46 +00:00
|
|
|
|
If the `.elc' file does not exist, normally this function *does not*
|
|
|
|
|
compile FILENAME. If optional argument ARG is 0, it compiles
|
|
|
|
|
the input file even if the `.elc' file does not exist.
|
|
|
|
|
Any other non-nil value of ARG means to ask the user.
|
2010-10-31 19:25:39 +00:00
|
|
|
|
|
2012-08-14 15:58:46 +00:00
|
|
|
|
If optional argument LOAD is non-nil, loads the file after compiling.
|
2010-10-31 19:25:39 +00:00
|
|
|
|
|
2012-08-14 15:58:46 +00:00
|
|
|
|
If compilation is needed, this functions returns the result of
|
|
|
|
|
`byte-compile-file'; otherwise it returns 'no-byte-compile."
|
2010-10-31 19:25:39 +00:00
|
|
|
|
(interactive
|
2011-03-16 20:08:39 +00:00
|
|
|
|
(let ((file buffer-file-name)
|
|
|
|
|
(file-name nil)
|
|
|
|
|
(file-dir nil))
|
|
|
|
|
(and file
|
|
|
|
|
(derived-mode-p 'emacs-lisp-mode)
|
|
|
|
|
(setq file-name (file-name-nondirectory file)
|
|
|
|
|
file-dir (file-name-directory file)))
|
2010-10-31 19:25:39 +00:00
|
|
|
|
(list (read-file-name (if current-prefix-arg
|
|
|
|
|
"Byte compile file: "
|
|
|
|
|
"Byte recompile file: ")
|
2011-03-16 20:08:39 +00:00
|
|
|
|
file-dir file-name nil)
|
2010-10-31 19:25:39 +00:00
|
|
|
|
current-prefix-arg)))
|
2011-03-16 20:08:39 +00:00
|
|
|
|
(let ((dest (byte-compile-dest-file filename))
|
2010-10-31 19:25:39 +00:00
|
|
|
|
;; Expand now so we get the current buffer's defaults
|
2011-03-16 20:08:39 +00:00
|
|
|
|
(filename (expand-file-name filename)))
|
|
|
|
|
(if (if (file-exists-p dest)
|
2010-10-31 19:25:39 +00:00
|
|
|
|
;; File was already compiled
|
|
|
|
|
;; Compile if forced to, or filename newer
|
2011-03-16 20:08:39 +00:00
|
|
|
|
(or force
|
|
|
|
|
(file-newer-than-file-p filename dest))
|
|
|
|
|
(and arg
|
|
|
|
|
(or (eq 0 arg)
|
2010-11-02 22:51:25 +00:00
|
|
|
|
(y-or-n-p (concat "Compile "
|
2011-03-16 20:08:39 +00:00
|
|
|
|
filename "? ")))))
|
2010-10-31 19:25:39 +00:00
|
|
|
|
(progn
|
|
|
|
|
(if (and noninteractive (not byte-compile-verbose))
|
2011-03-16 20:08:39 +00:00
|
|
|
|
(message "Compiling %s..." filename))
|
|
|
|
|
(byte-compile-file filename load))
|
2012-08-14 08:37:41 +00:00
|
|
|
|
(when load
|
|
|
|
|
(load (if (file-exists-p dest) dest filename)))
|
2010-10-31 19:25:39 +00:00
|
|
|
|
'no-byte-compile)))
|
|
|
|
|
|
2013-02-23 21:14:36 +00:00
|
|
|
|
(defvar byte-compile-level 0 ; bug#13787
|
|
|
|
|
"Depth of a recursive byte compilation.")
|
|
|
|
|
|
1992-07-19 01:07:07 +00:00
|
|
|
|
;;;###autoload
|
2011-03-16 20:08:39 +00:00
|
|
|
|
(defun byte-compile-file (filename &optional load)
|
|
|
|
|
"Compile a file of Lisp code named FILENAME into a file of byte code.
|
|
|
|
|
The output file's name is generated by passing FILENAME to the
|
2008-04-27 01:41:46 +00:00
|
|
|
|
function `byte-compile-dest-file' (which see).
|
2001-10-05 09:29:51 +00:00
|
|
|
|
With prefix arg (noninteractively: 2nd arg), LOAD the file after compiling.
|
2001-10-29 17:26:26 +00:00
|
|
|
|
The value is non-nil if there were no errors, nil if errors."
|
1992-07-10 22:06:47 +00:00
|
|
|
|
;; (interactive "fByte compile file: \nP")
|
|
|
|
|
(interactive
|
2011-03-16 20:08:39 +00:00
|
|
|
|
(let ((file buffer-file-name)
|
|
|
|
|
(file-dir nil))
|
|
|
|
|
(and file
|
2011-03-10 19:40:48 +00:00
|
|
|
|
(derived-mode-p 'emacs-lisp-mode)
|
2014-01-24 04:13:35 +00:00
|
|
|
|
(setq file-dir (file-name-directory file)))
|
1992-07-15 20:26:37 +00:00
|
|
|
|
(list (read-file-name (if current-prefix-arg
|
|
|
|
|
"Byte compile and load file: "
|
|
|
|
|
"Byte compile file: ")
|
2014-01-15 23:49:40 +00:00
|
|
|
|
file-dir buffer-file-name nil)
|
1992-07-19 01:07:07 +00:00
|
|
|
|
current-prefix-arg)))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
;; Expand now so we get the current buffer's defaults
|
2011-03-16 20:08:39 +00:00
|
|
|
|
(setq filename (expand-file-name filename))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
|
|
|
|
;; If we're compiling a file that's in a buffer and is modified, offer
|
|
|
|
|
;; to save it first.
|
|
|
|
|
(or noninteractive
|
2011-03-16 20:08:39 +00:00
|
|
|
|
(let ((b (get-file-buffer (expand-file-name filename))))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(if (and b (buffer-modified-p b)
|
2000-03-24 18:37:48 +00:00
|
|
|
|
(y-or-n-p (format "Save buffer %s first? " (buffer-name b))))
|
2007-08-22 15:51:13 +00:00
|
|
|
|
(with-current-buffer b (save-buffer)))))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
2002-08-29 17:26:47 +00:00
|
|
|
|
;; Force logging of the file name for each file compiled.
|
|
|
|
|
(setq byte-compile-last-logged-file nil)
|
2011-03-16 20:08:39 +00:00
|
|
|
|
(let ((byte-compile-current-file filename)
|
2008-06-08 02:07:25 +00:00
|
|
|
|
(byte-compile-current-group nil)
|
1998-07-05 20:30:39 +00:00
|
|
|
|
(set-auto-coding-for-load t)
|
1994-12-24 05:58:05 +00:00
|
|
|
|
target-file input-buffer output-buffer
|
|
|
|
|
byte-compile-dest-file)
|
2011-03-16 20:08:39 +00:00
|
|
|
|
(setq target-file (byte-compile-dest-file filename))
|
1994-12-24 05:58:05 +00:00
|
|
|
|
(setq byte-compile-dest-file target-file)
|
2007-09-01 23:33:15 +00:00
|
|
|
|
(with-current-buffer
|
2013-02-23 21:14:36 +00:00
|
|
|
|
;; It would be cleaner to use a temp buffer, but if there was
|
|
|
|
|
;; an error, we leave this buffer around for diagnostics.
|
|
|
|
|
;; Its name is documented in the lispref.
|
|
|
|
|
(setq input-buffer (get-buffer-create
|
|
|
|
|
(concat " *Compiler Input*"
|
|
|
|
|
(if (zerop byte-compile-level) ""
|
|
|
|
|
(format "-%s" byte-compile-level)))))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(erase-buffer)
|
1999-04-06 19:56:24 +00:00
|
|
|
|
(setq buffer-file-coding-system nil)
|
1998-04-23 21:24:29 +00:00
|
|
|
|
;; Always compile an Emacs Lisp file as multibyte
|
1999-12-16 15:26:03 +00:00
|
|
|
|
;; unless the file itself forces unibyte with -*-coding: raw-text;-*-
|
1998-04-23 21:24:29 +00:00
|
|
|
|
(set-buffer-multibyte t)
|
2011-03-16 20:08:39 +00:00
|
|
|
|
(insert-file-contents filename)
|
2003-05-06 05:10:59 +00:00
|
|
|
|
;; Mimic the way after-insert-file-set-coding can make the
|
|
|
|
|
;; buffer unibyte when visiting this file.
|
1999-04-06 19:56:24 +00:00
|
|
|
|
(when (or (eq last-coding-system-used 'no-conversion)
|
|
|
|
|
(eq (coding-system-type last-coding-system-used) 5))
|
|
|
|
|
;; For coding systems no-conversion and raw-text...,
|
|
|
|
|
;; edit the buffer as unibyte.
|
|
|
|
|
(set-buffer-multibyte nil))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
;; Run hooks including the uncompression hook.
|
|
|
|
|
;; If they change the file name, then change it for the output also.
|
Provide generalized variables in core Elisp.
* lisp/emacs-lisp/gv.el: New file.
* lisp/subr.el (push, pop): Extend to generalized variables.
* lisp/loadup.el (macroexp): Unload if preloaded and uncompiled.
* lisp/emacs-lisp/cl-lib.el (cl-pop, cl-push, cl--set-nthcdr): Remove.
* lisp/emacs-lisp/cl-macs.el: Require gv. Use gv-define-setter,
gv-define-simple-setter, and gv-define-expander.
Remove setf-methods defined in gv. Rename cl-setf -> setf.
(cl-setf, cl-do-pop, cl-get-setf-method): Remove.
(cl-letf, cl-letf*, cl-define-modify-macro, cl-defsetf)
(cl-define-setf-expander, cl-struct-setf-expander): Move to cl.el.
(cl-remf, cl-shiftf, cl-rotatef, cl-callf, cl-callf2): Rewrite with
gv-letplace.
(cl-defstruct): Don't define setf-method any more.
* lisp/emacs-lisp/cl.el (flet): Don't autoload.
(cl--letf, letf, cl--letf*, letf*, cl--gv-adapt)
(define-setf-expander, defsetf, define-modify-macro)
(cl-struct-setf-expander): Move from cl-lib.el.
* lisp/emacs-lisp/syntax.el:
* lisp/emacs-lisp/ewoc.el:
* lisp/emacs-lisp/smie.el:
* lisp/emacs-lisp/cconv.el:
* lisp/emacs-lisp/timer.el: Rename cl-setf -> setf, cl-push -> push.
(timer--time): Use gv-define-simple-setter.
* lisp/emacs-lisp/macroexp.el (macroexp-let2): Rename from macroexp-let²
to avoid coding-system problems in subr.el. Adjust all users.
(macroexp--maxsize, macroexp-small-p): New functions.
* lisp/emacs-lisp/bytecomp.el (byte-compile-file): Don't use cl-letf.
* lisp/scroll-bar.el (scroll-bar-mode):
* lisp/simple.el (auto-fill-mode, overwrite-mode, binary-overwrite-mode)
(normal-erase-is-backspace-mode): Don't use the `eq' place.
* lisp/winner.el (winner-configuration, winner-make-point-alist)
(winner-set-conf, winner-get-point, winner-set): Don't abuse letf.
* lisp/files.el (locate-file-completion-table): Avoid list*.
Fixes: debbugs:11657
2012-06-22 13:42:38 +00:00
|
|
|
|
(let ((buffer-file-name filename)
|
|
|
|
|
(dmm (default-value 'major-mode))
|
|
|
|
|
;; Ignore unsafe local variables.
|
|
|
|
|
;; We only care about a few of them for our purposes.
|
|
|
|
|
(enable-local-variables :safe)
|
|
|
|
|
(enable-local-eval nil))
|
|
|
|
|
(unwind-protect
|
|
|
|
|
(progn
|
|
|
|
|
(setq-default major-mode 'emacs-lisp-mode)
|
|
|
|
|
;; Arg of t means don't alter enable-local-variables.
|
|
|
|
|
(normal-mode t))
|
|
|
|
|
(setq-default major-mode dmm))
|
2012-01-06 07:37:01 +00:00
|
|
|
|
;; There may be a file local variable setting (bug#10419).
|
|
|
|
|
(setq buffer-read-only nil
|
|
|
|
|
filename buffer-file-name))
|
2012-11-23 21:49:13 +00:00
|
|
|
|
;; Don't inherit lexical-binding from caller (bug#12938).
|
|
|
|
|
(unless (local-variable-p 'lexical-binding)
|
|
|
|
|
(setq-local lexical-binding nil))
|
1996-12-30 18:52:14 +00:00
|
|
|
|
;; Set the default directory, in case an eval-when-compile uses it.
|
2011-03-16 20:08:39 +00:00
|
|
|
|
(setq default-directory (file-name-directory filename)))
|
2001-10-05 09:29:51 +00:00
|
|
|
|
;; Check if the file's local variables explicitly specify not to
|
|
|
|
|
;; compile this file.
|
2001-11-17 00:54:36 +00:00
|
|
|
|
(if (with-current-buffer input-buffer no-byte-compile)
|
2001-10-05 09:29:51 +00:00
|
|
|
|
(progn
|
2004-04-16 12:51:06 +00:00
|
|
|
|
;; (message "%s not compiled because of `no-byte-compile: %s'"
|
2012-10-01 04:45:32 +00:00
|
|
|
|
;; (byte-compile-abbreviate-file filename)
|
2004-04-16 12:51:06 +00:00
|
|
|
|
;; (with-current-buffer input-buffer no-byte-compile))
|
|
|
|
|
(when (file-exists-p target-file)
|
|
|
|
|
(message "%s deleted because of `no-byte-compile: %s'"
|
2012-10-01 04:45:32 +00:00
|
|
|
|
(byte-compile-abbreviate-file target-file)
|
2004-04-16 12:51:06 +00:00
|
|
|
|
(buffer-local-value 'no-byte-compile input-buffer))
|
|
|
|
|
(condition-case nil (delete-file target-file) (error nil)))
|
2001-10-07 23:34:07 +00:00
|
|
|
|
;; We successfully didn't compile this file.
|
2001-10-29 17:26:26 +00:00
|
|
|
|
'no-byte-compile)
|
2002-05-28 17:40:47 +00:00
|
|
|
|
(when byte-compile-verbose
|
2011-03-16 20:08:39 +00:00
|
|
|
|
(message "Compiling %s..." filename))
|
2001-10-07 23:34:07 +00:00
|
|
|
|
(setq byte-compiler-error-flag nil)
|
|
|
|
|
;; It is important that input-buffer not be current at this call,
|
|
|
|
|
;; so that the value of point set in input-buffer
|
|
|
|
|
;; within byte-compile-from-buffer lingers in that buffer.
|
2002-09-09 21:41:34 +00:00
|
|
|
|
(setq output-buffer
|
|
|
|
|
(save-current-buffer
|
2013-02-25 23:27:50 +00:00
|
|
|
|
(let ((byte-compile-level (1+ byte-compile-level)))
|
|
|
|
|
(byte-compile-from-buffer input-buffer))))
|
2001-10-07 23:34:07 +00:00
|
|
|
|
(if byte-compiler-error-flag
|
|
|
|
|
nil
|
2002-05-28 17:40:47 +00:00
|
|
|
|
(when byte-compile-verbose
|
2011-03-16 20:08:39 +00:00
|
|
|
|
(message "Compiling %s...done" filename))
|
2001-10-07 23:34:07 +00:00
|
|
|
|
(kill-buffer input-buffer)
|
|
|
|
|
(with-current-buffer output-buffer
|
|
|
|
|
(goto-char (point-max))
|
|
|
|
|
(insert "\n") ; aaah, unix.
|
2011-12-31 14:43:38 +00:00
|
|
|
|
(if (file-writable-p target-file)
|
|
|
|
|
;; We must disable any code conversion here.
|
|
|
|
|
(let* ((coding-system-for-write 'no-conversion)
|
|
|
|
|
;; Write to a tempfile so that if another Emacs
|
|
|
|
|
;; process is trying to load target-file (eg in a
|
|
|
|
|
;; parallel bootstrap), it does not risk getting a
|
|
|
|
|
;; half-finished file. (Bug#4196)
|
|
|
|
|
(tempfile (make-temp-name target-file))
|
|
|
|
|
(kill-emacs-hook
|
|
|
|
|
(cons (lambda () (ignore-errors (delete-file tempfile)))
|
|
|
|
|
kill-emacs-hook)))
|
|
|
|
|
(write-region (point-min) (point-max) tempfile nil 1)
|
|
|
|
|
;; This has the intentional side effect that any
|
|
|
|
|
;; hard-links to target-file continue to
|
|
|
|
|
;; point to the old file (this makes it possible
|
|
|
|
|
;; for installed files to share disk space with
|
|
|
|
|
;; the build tree, without causing problems when
|
|
|
|
|
;; emacs-lisp files in the build tree are
|
|
|
|
|
;; recompiled). Previously this was accomplished by
|
|
|
|
|
;; deleting target-file before writing it.
|
|
|
|
|
(rename-file tempfile target-file t)
|
|
|
|
|
(message "Wrote %s" target-file))
|
|
|
|
|
;; This is just to give a better error message than write-region
|
|
|
|
|
(signal 'file-error
|
|
|
|
|
(list "Opening output file"
|
|
|
|
|
(if (file-exists-p target-file)
|
|
|
|
|
"cannot overwrite file"
|
|
|
|
|
"directory not writable or nonexistent")
|
|
|
|
|
target-file)))
|
2001-10-07 23:34:07 +00:00
|
|
|
|
(kill-buffer (current-buffer)))
|
|
|
|
|
(if (and byte-compile-generate-call-tree
|
|
|
|
|
(or (eq t byte-compile-generate-call-tree)
|
2008-03-01 21:11:37 +00:00
|
|
|
|
(y-or-n-p (format "Report call tree for %s? "
|
2011-03-16 20:08:39 +00:00
|
|
|
|
filename))))
|
2001-10-07 23:34:07 +00:00
|
|
|
|
(save-excursion
|
2011-03-16 20:08:39 +00:00
|
|
|
|
(display-call-tree filename)))
|
2001-10-07 23:34:07 +00:00
|
|
|
|
(if load
|
|
|
|
|
(load target-file))
|
|
|
|
|
t))))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
|
|
|
|
;;; compiling a single function
|
1992-07-19 01:07:07 +00:00
|
|
|
|
;;;###autoload
|
1992-07-15 20:26:37 +00:00
|
|
|
|
(defun compile-defun (&optional arg)
|
1992-07-10 22:06:47 +00:00
|
|
|
|
"Compile and evaluate the current top-level form.
|
2004-04-16 12:51:06 +00:00
|
|
|
|
Print the result in the echo area.
|
2008-11-20 12:13:49 +00:00
|
|
|
|
With argument ARG, insert value in current buffer after the form."
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(interactive "P")
|
|
|
|
|
(save-excursion
|
|
|
|
|
(end-of-defun)
|
|
|
|
|
(beginning-of-defun)
|
|
|
|
|
(let* ((byte-compile-current-file nil)
|
2002-05-28 17:40:47 +00:00
|
|
|
|
(byte-compile-current-buffer (current-buffer))
|
|
|
|
|
(byte-compile-read-position (point))
|
|
|
|
|
(byte-compile-last-position byte-compile-read-position)
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(byte-compile-last-warned-form 'nothing)
|
2002-05-28 17:40:47 +00:00
|
|
|
|
(value (eval
|
2002-07-19 23:01:24 +00:00
|
|
|
|
(let ((read-with-symbol-positions (current-buffer))
|
2002-05-28 17:40:47 +00:00
|
|
|
|
(read-symbol-positions-list nil))
|
|
|
|
|
(displaying-byte-compile-warnings
|
Try and fix w32 build; misc cleanup.
* lisp/subr.el (apply-partially): Move from subr.el; don't use lexical-let.
(eval-after-load): Obey lexical-binding.
* lisp/simple.el (apply-partially): Move to subr.el.
* lisp/makefile.w32-in: Match changes in Makefile.in.
(BIG_STACK_DEPTH, BIG_STACK_OPTS, BYTE_COMPILE_FLAGS): New vars.
(.el.elc, compile-CMD, compile-SH, compile-always-CMD)
(compile-always-SH, compile-calc-CMD, compile-calc-SH): Use them.
(COMPILE_FIRST): Add pcase, macroexp, and cconv.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Silence warning about
calling CL's `compiler-macroexpand'.
* lisp/emacs-lisp/bytecomp.el (byte-compile-preprocess): New function.
(byte-compile-initial-macro-environment)
(byte-compile-toplevel-file-form, byte-compile, byte-compile-sexp): Use it.
(byte-compile-eval, byte-compile-eval-before-compile): Obey lexical-binding.
(byte-compile--for-effect): Rename from `for-effect'.
(display-call-tree): Use case.
* lisp/emacs-lisp/byte-opt.el (for-effect): Don't declare as dynamic.
(byte-optimize-form-code-walker, byte-optimize-form):
Revert to old arg name.
* lisp/Makefile.in (BYTE_COMPILE_FLAGS): New var.
(compile-onefile, .el.elc, compile-calc, recompile): Use it.
2011-03-12 03:32:43 +00:00
|
|
|
|
(byte-compile-sexp (read (current-buffer)))))
|
|
|
|
|
lexical-binding)))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(cond (arg
|
|
|
|
|
(message "Compiling from buffer... done.")
|
|
|
|
|
(prin1 value (current-buffer))
|
|
|
|
|
(insert "\n"))
|
|
|
|
|
((message "%s" (prin1-to-string value)))))))
|
|
|
|
|
|
2011-03-16 20:08:39 +00:00
|
|
|
|
(defun byte-compile-from-buffer (inbuffer)
|
2012-05-29 14:28:02 +00:00
|
|
|
|
(let ((byte-compile-current-buffer inbuffer)
|
2002-05-28 17:40:47 +00:00
|
|
|
|
(byte-compile-read-position nil)
|
|
|
|
|
(byte-compile-last-position nil)
|
1994-12-24 05:58:05 +00:00
|
|
|
|
;; Prevent truncation of flonums and lists as we read and print them
|
|
|
|
|
(float-output-format nil)
|
|
|
|
|
(case-fold-search nil)
|
|
|
|
|
(print-length nil)
|
1995-10-06 22:42:19 +00:00
|
|
|
|
(print-level nil)
|
1998-02-02 01:21:18 +00:00
|
|
|
|
;; Prevent edebug from interfering when we compile
|
|
|
|
|
;; and put the output into a file.
|
2002-05-28 17:40:47 +00:00
|
|
|
|
;; (edebug-all-defs nil)
|
|
|
|
|
;; (edebug-all-forms nil)
|
1994-12-24 05:58:05 +00:00
|
|
|
|
;; Simulate entry to byte-compile-top-level
|
|
|
|
|
(byte-compile-constants nil)
|
|
|
|
|
(byte-compile-variables nil)
|
|
|
|
|
(byte-compile-tag-number 0)
|
|
|
|
|
(byte-compile-depth 0)
|
|
|
|
|
(byte-compile-maxdepth 0)
|
|
|
|
|
(byte-compile-output nil)
|
2002-05-28 17:40:47 +00:00
|
|
|
|
;; This allows us to get the positions of symbols read; it's
|
2005-02-09 15:50:47 +00:00
|
|
|
|
;; new in Emacs 22.1.
|
2011-03-16 20:08:39 +00:00
|
|
|
|
(read-with-symbol-positions inbuffer)
|
2002-05-28 17:40:47 +00:00
|
|
|
|
(read-symbol-positions-list nil)
|
1994-12-24 05:58:05 +00:00
|
|
|
|
;; #### This is bound in b-c-close-variables.
|
2007-10-28 23:53:06 +00:00
|
|
|
|
;; (byte-compile-warnings byte-compile-warnings)
|
1994-12-24 05:58:05 +00:00
|
|
|
|
)
|
|
|
|
|
(byte-compile-close-variables
|
2007-06-12 21:03:32 +00:00
|
|
|
|
(with-current-buffer
|
2011-04-01 15:16:50 +00:00
|
|
|
|
(setq byte-compile--outbuffer
|
2013-02-23 21:14:36 +00:00
|
|
|
|
(get-buffer-create
|
|
|
|
|
(concat " *Compiler Output*"
|
|
|
|
|
(if (<= byte-compile-level 1) ""
|
|
|
|
|
(format "-%s" (1- byte-compile-level))))))
|
1998-08-05 17:59:36 +00:00
|
|
|
|
(set-buffer-multibyte t)
|
1994-12-24 05:58:05 +00:00
|
|
|
|
(erase-buffer)
|
|
|
|
|
;; (emacs-lisp-mode)
|
2010-10-03 04:31:59 +00:00
|
|
|
|
(setq case-fold-search nil))
|
1994-12-24 05:58:05 +00:00
|
|
|
|
(displaying-byte-compile-warnings
|
2011-03-16 20:08:39 +00:00
|
|
|
|
(with-current-buffer inbuffer
|
2011-03-10 19:40:48 +00:00
|
|
|
|
(and byte-compile-current-file
|
|
|
|
|
(byte-compile-insert-header byte-compile-current-file
|
2011-04-01 15:16:50 +00:00
|
|
|
|
byte-compile--outbuffer))
|
2007-06-12 21:03:32 +00:00
|
|
|
|
(goto-char (point-min))
|
2007-07-24 08:18:12 +00:00
|
|
|
|
;; Should we always do this? When calling multiple files, it
|
|
|
|
|
;; would be useful to delay this warning until all have been
|
|
|
|
|
;; compiled. A: Yes! b-c-u-f might contain dross from a
|
|
|
|
|
;; previous byte-compile.
|
|
|
|
|
(setq byte-compile-unresolved-functions nil)
|
1994-12-24 05:58:05 +00:00
|
|
|
|
|
|
|
|
|
;; Compile the forms from the input buffer.
|
|
|
|
|
(while (progn
|
|
|
|
|
(while (progn (skip-chars-forward " \t\n\^l")
|
|
|
|
|
(looking-at ";"))
|
|
|
|
|
(forward-line 1))
|
|
|
|
|
(not (eobp)))
|
2002-05-28 17:40:47 +00:00
|
|
|
|
(setq byte-compile-read-position (point)
|
|
|
|
|
byte-compile-last-position byte-compile-read-position)
|
2007-08-23 18:19:56 +00:00
|
|
|
|
(let* ((old-style-backquotes nil)
|
2011-03-16 20:08:39 +00:00
|
|
|
|
(form (read inbuffer)))
|
2007-08-23 18:19:56 +00:00
|
|
|
|
;; Warn about the use of old-style backquotes.
|
|
|
|
|
(when old-style-backquotes
|
|
|
|
|
(byte-compile-warn "!! The file uses old-style backquotes !!
|
|
|
|
|
This functionality has been obsolete for more than 10 years already
|
|
|
|
|
and will be removed soon. See (elisp)Backquote in the manual."))
|
Get rid of funvec.
* lisp/emacs-lisp/bytecomp.el (byte-compile-lapcode): Handle new form of
`byte-constant'.
(byte-compile-close-variables, displaying-byte-compile-warnings):
Add edebug spec.
(byte-compile-toplevel-file-form): New fun, split out of
byte-compile-file-form.
(byte-compile-from-buffer): Use it to avoid applying cconv
multiple times.
(byte-compile): Only strip `function' if it's present.
(byte-compile-lambda): Add `reserved-csts' argument.
Use new lexenv arg of byte-compile-top-level.
(byte-compile-reserved-constants): New var.
(byte-compile-constants-vector): Obey it.
(byte-compile-constants-vector): Handle new `byte-constant' form.
(byte-compile-top-level): Add args `lexenv' and `reserved-csts'.
(byte-compile-form): Don't check callargs here.
(byte-compile-normal-call): Do it here instead.
(byte-compile-push-unknown-constant)
(byte-compile-resolve-unknown-constant): Remove, unused.
(byte-compile-make-closure): Use `make-byte-code' rather than `curry',
putting the environment into the "constant" pool.
(byte-compile-get-closed-var): Use special byte-constant.
* lisp/emacs-lisp/byte-opt.el (byte-optimize-form-code-walker): Handle new
intermediate special form `internal-make-vector'.
(byte-optimize-lapcode): Handle new form of `byte-constant'.
* lisp/help-fns.el (describe-function-1): Don't handle funvecs.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Only convert quote to
function if the content is a lambda expression, not if it's a closure.
* emacs-lisp/eieio-come.el: Remove.
* lisp/emacs-lisp/eieio.el: Don't require eieio-comp.
(defmethod): Do a bit more work to find the body and wrap it into
a function before passing it to eieio-defmethod.
(eieio-defmethod): New arg `code' for it.
* lisp/emacs-lisp/debug.el (debugger-setup-buffer): Don't hide things in
debugger backtrace.
* lisp/emacs-lisp/cl-extra.el (cl-macroexpand-all): Use backquotes, and be
more careful when quoting a function value.
* lisp/emacs-lisp/cconv.el (cconv-freevars): Accept defvar/defconst.
(cconv-closure-convert-rec): Catch stray `internal-make-closure'.
* lisp/Makefile.in (COMPILE_FIRST): Compile pcase and cconv early.
* src/eval.c (Qcurry): Remove.
(funcall_funvec): Remove.
(funcall_lambda): Move new byte-code handling to reduce impact.
Treat all args as lexical in the case of lexbind.
(Fcurry): Remove.
* src/data.c (Qfunction_vector): Remove.
(Ffunvecp): Remove.
* src/lread.c (read1): Revert to calling make_byte_code here.
(read_vector): Don't call make_byte_code any more.
* src/lisp.h (enum pvec_type): Rename back to PVEC_COMPILED.
(XSETCOMPILED): Rename back from XSETFUNVEC.
(FUNVEC_SIZE): Remove.
(FUNVEC_COMPILED_TAG_P, FUNVEC_COMPILED_P): Remove.
(COMPILEDP): Rename back from FUNVECP.
* src/fns.c (Felt): Remove unexplained FUNVEC check.
* src/doc.c (Fdocumentation): Don't handle funvec.
* src/alloc.c (make_funvec, Ffunvec): Remove.
* doc/lispref/vol2.texi (Top):
* doc/lispref/vol1.texi (Top):
* doc/lispref/objects.texi (Programming Types, Funvec Type, Type Predicates):
* doc/lispref/functions.texi (Functions, What Is a Function, FunctionCurrying):
* doc/lispref/elisp.texi (Top): Remove mentions of funvec and curry.
2011-02-25 03:27:45 +00:00
|
|
|
|
(byte-compile-toplevel-file-form form)))
|
1994-12-24 05:58:05 +00:00
|
|
|
|
;; Compile pending forms at end of file.
|
|
|
|
|
(byte-compile-flush-pending)
|
2003-04-19 04:18:37 +00:00
|
|
|
|
;; Make warnings about unresolved functions
|
|
|
|
|
;; give the end of the file as their position.
|
|
|
|
|
(setq byte-compile-last-position (point-max))
|
2007-07-24 08:18:12 +00:00
|
|
|
|
(byte-compile-warn-about-unresolved-functions))
|
1998-05-19 02:59:42 +00:00
|
|
|
|
;; Fix up the header at the front of the output
|
|
|
|
|
;; if the buffer contains multibyte characters.
|
2011-03-10 19:40:48 +00:00
|
|
|
|
(and byte-compile-current-file
|
2011-04-01 15:16:50 +00:00
|
|
|
|
(with-current-buffer byte-compile--outbuffer
|
2012-05-29 14:28:02 +00:00
|
|
|
|
(byte-compile-fix-header byte-compile-current-file))))
|
|
|
|
|
byte-compile--outbuffer)))
|
1994-03-04 04:03:46 +00:00
|
|
|
|
|
2012-05-31 05:56:57 +00:00
|
|
|
|
(defun byte-compile-fix-header (_filename)
|
2009-11-05 03:25:41 +00:00
|
|
|
|
"If the current buffer has any multibyte characters, insert a version test."
|
|
|
|
|
(when (< (point-max) (position-bytes (point-max)))
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
;; Find the comment that describes the version condition.
|
|
|
|
|
(search-forward "\n;;; This file uses")
|
|
|
|
|
(narrow-to-region (line-beginning-position) (point-max))
|
|
|
|
|
;; Find the first line of ballast semicolons.
|
|
|
|
|
(search-forward ";;;;;;;;;;")
|
|
|
|
|
(beginning-of-line)
|
|
|
|
|
(narrow-to-region (point-min) (point))
|
|
|
|
|
(let ((old-header-end (point))
|
|
|
|
|
(minimum-version "23")
|
|
|
|
|
delta)
|
|
|
|
|
(delete-region (point-min) (point-max))
|
|
|
|
|
(insert
|
|
|
|
|
";;; This file contains utf-8 non-ASCII characters,\n"
|
|
|
|
|
";;; and so cannot be loaded into Emacs 22 or earlier.\n"
|
|
|
|
|
;; Have to check if emacs-version is bound so that this works
|
|
|
|
|
;; in files loaded early in loadup.el.
|
|
|
|
|
"(and (boundp 'emacs-version)\n"
|
|
|
|
|
;; If there is a name at the end of emacs-version,
|
|
|
|
|
;; don't try to check the version number.
|
|
|
|
|
" (< (aref emacs-version (1- (length emacs-version))) ?A)\n"
|
|
|
|
|
(format " (string-lessp emacs-version \"%s\")\n" minimum-version)
|
2012-05-31 05:56:57 +00:00
|
|
|
|
;; Because the header must fit in a fixed width, we cannot
|
|
|
|
|
;; insert arbitrary-length file names (Bug#11585).
|
|
|
|
|
" (error \"`%s' was compiled for "
|
2012-06-01 19:47:54 +00:00
|
|
|
|
(format "Emacs %s or later\" #$))\n\n" minimum-version))
|
2009-11-05 03:25:41 +00:00
|
|
|
|
;; Now compensate for any change in size, to make sure all
|
|
|
|
|
;; positions in the file remain valid.
|
|
|
|
|
(setq delta (- (point-max) old-header-end))
|
|
|
|
|
(goto-char (point-max))
|
|
|
|
|
(widen)
|
|
|
|
|
(delete-char delta))))
|
|
|
|
|
|
2013-05-08 15:06:28 +00:00
|
|
|
|
(defun byte-compile-insert-header (_filename outbuffer)
|
2009-11-05 03:25:41 +00:00
|
|
|
|
"Insert a header at the start of OUTBUFFER.
|
|
|
|
|
Call from the source buffer."
|
|
|
|
|
(let ((dynamic-docstrings byte-compile-dynamic-docstrings)
|
|
|
|
|
(dynamic byte-compile-dynamic)
|
|
|
|
|
(optimize byte-optimize))
|
|
|
|
|
(with-current-buffer outbuffer
|
2008-01-04 05:35:12 +00:00
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
;; The magic number of .elc files is ";ELC", or 0x3B454C43. After
|
2008-01-09 01:21:15 +00:00
|
|
|
|
;; that is the file-format version number (18, 19, 20, or 23) as a
|
2008-01-04 05:35:12 +00:00
|
|
|
|
;; byte, followed by some nulls. The primary motivation for doing
|
|
|
|
|
;; this is to get some binary characters up in the first line of
|
|
|
|
|
;; the file so that `diff' will simply say "Binary files differ"
|
|
|
|
|
;; instead of actually doing a diff of two .elc files. An extra
|
|
|
|
|
;; benefit is that you can add this to /etc/magic:
|
|
|
|
|
;; 0 string ;ELC GNU Emacs Lisp compiled file,
|
|
|
|
|
;; >4 byte x version %d
|
2009-11-05 03:25:41 +00:00
|
|
|
|
(insert
|
|
|
|
|
";ELC" 23 "\000\000\000\n"
|
2013-04-20 19:48:04 +00:00
|
|
|
|
";;; Compiled\n"
|
2009-12-07 06:21:27 +00:00
|
|
|
|
";;; in Emacs version " emacs-version "\n"
|
|
|
|
|
";;; with"
|
2009-11-05 03:25:41 +00:00
|
|
|
|
(cond
|
|
|
|
|
((eq optimize 'source) " source-level optimization only")
|
|
|
|
|
((eq optimize 'byte) " byte-level optimization only")
|
|
|
|
|
(optimize " all optimizations")
|
|
|
|
|
(t "out optimization"))
|
|
|
|
|
".\n"
|
|
|
|
|
(if dynamic ";;; Function definitions are lazy-loaded.\n"
|
|
|
|
|
"")
|
|
|
|
|
"\n;;; This file uses "
|
|
|
|
|
(if dynamic-docstrings
|
|
|
|
|
"dynamic docstrings, first added in Emacs 19.29"
|
|
|
|
|
"opcodes that do not exist in Emacs 18")
|
|
|
|
|
".\n\n"
|
|
|
|
|
;; Note that byte-compile-fix-header may change this.
|
|
|
|
|
";;; This file does not contain utf-8 non-ASCII characters,\n"
|
|
|
|
|
";;; and so can be loaded in Emacs versions earlier than 23.\n\n"
|
|
|
|
|
;; Insert semicolons as ballast, so that byte-compile-fix-header
|
|
|
|
|
;; can delete them so as to keep the buffer positions
|
|
|
|
|
;; constant for the actual compiled code.
|
|
|
|
|
";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;\n"
|
|
|
|
|
";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;\n\n"))))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
|
|
|
|
(defun byte-compile-output-file-form (form)
|
2012-05-30 03:59:42 +00:00
|
|
|
|
;; Write the given form to the output buffer, being careful of docstrings
|
2012-06-01 19:47:54 +00:00
|
|
|
|
;; in defvar, defvaralias, defconst, autoload and
|
1997-08-31 17:07:28 +00:00
|
|
|
|
;; custom-declare-variable because make-docfile is so amazingly stupid.
|
1993-04-23 03:43:33 +00:00
|
|
|
|
;; defalias calls are output directly by byte-compile-file-form-defmumble;
|
|
|
|
|
;; it does not pay to first build the defalias in defmumble and then parse
|
|
|
|
|
;; it here.
|
2012-05-30 03:59:42 +00:00
|
|
|
|
(let ((print-escape-newlines t)
|
|
|
|
|
(print-length nil)
|
|
|
|
|
(print-level nil)
|
|
|
|
|
(print-quoted t)
|
|
|
|
|
(print-gensym t)
|
|
|
|
|
(print-circle ; Handle circular data structures.
|
|
|
|
|
(not byte-compile-disable-print-circle)))
|
2012-06-01 19:47:54 +00:00
|
|
|
|
(if (and (memq (car-safe form) '(defvar defvaralias defconst
|
2012-05-30 03:59:42 +00:00
|
|
|
|
autoload custom-declare-variable))
|
|
|
|
|
(stringp (nth 3 form)))
|
|
|
|
|
(byte-compile-output-docform nil nil '("\n(" 3 ")") form nil
|
|
|
|
|
(memq (car form)
|
|
|
|
|
'(defvaralias autoload
|
|
|
|
|
custom-declare-variable)))
|
2011-04-01 15:16:50 +00:00
|
|
|
|
(princ "\n" byte-compile--outbuffer)
|
|
|
|
|
(prin1 form byte-compile--outbuffer)
|
1992-07-10 22:06:47 +00:00
|
|
|
|
nil)))
|
|
|
|
|
|
Try and fix w32 build; misc cleanup.
* lisp/subr.el (apply-partially): Move from subr.el; don't use lexical-let.
(eval-after-load): Obey lexical-binding.
* lisp/simple.el (apply-partially): Move to subr.el.
* lisp/makefile.w32-in: Match changes in Makefile.in.
(BIG_STACK_DEPTH, BIG_STACK_OPTS, BYTE_COMPILE_FLAGS): New vars.
(.el.elc, compile-CMD, compile-SH, compile-always-CMD)
(compile-always-SH, compile-calc-CMD, compile-calc-SH): Use them.
(COMPILE_FIRST): Add pcase, macroexp, and cconv.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Silence warning about
calling CL's `compiler-macroexpand'.
* lisp/emacs-lisp/bytecomp.el (byte-compile-preprocess): New function.
(byte-compile-initial-macro-environment)
(byte-compile-toplevel-file-form, byte-compile, byte-compile-sexp): Use it.
(byte-compile-eval, byte-compile-eval-before-compile): Obey lexical-binding.
(byte-compile--for-effect): Rename from `for-effect'.
(display-call-tree): Use case.
* lisp/emacs-lisp/byte-opt.el (for-effect): Don't declare as dynamic.
(byte-optimize-form-code-walker, byte-optimize-form):
Revert to old arg name.
* lisp/Makefile.in (BYTE_COMPILE_FLAGS): New var.
(compile-onefile, .el.elc, compile-calc, recompile): Use it.
2011-03-12 03:32:43 +00:00
|
|
|
|
(defvar byte-compile--for-effect)
|
2003-04-12 20:28:10 +00:00
|
|
|
|
|
1994-12-24 05:58:05 +00:00
|
|
|
|
(defun byte-compile-output-docform (preface name info form specindex quoted)
|
1995-08-07 08:45:00 +00:00
|
|
|
|
"Print a form with a doc string. INFO is (prefix doc-index postfix).
|
|
|
|
|
If PREFACE and NAME are non-nil, print them too,
|
|
|
|
|
before INFO and the FORM but after the doc string itself.
|
|
|
|
|
If SPECINDEX is non-nil, it is the index in FORM
|
|
|
|
|
of the function bytecode string. In that case,
|
2008-11-20 12:13:49 +00:00
|
|
|
|
we output that argument and the following argument
|
|
|
|
|
\(the constants vector) together, for lazy loading.
|
1995-08-07 08:45:00 +00:00
|
|
|
|
QUOTED says that we have to put a quote before the
|
|
|
|
|
list that represents a doc string reference.
|
2009-11-16 04:06:12 +00:00
|
|
|
|
`defvaralias', `autoload' and `custom-declare-variable' need that."
|
1995-08-07 08:45:00 +00:00
|
|
|
|
;; We need to examine byte-compile-dynamic-docstrings
|
|
|
|
|
;; in the input buffer (now current), not in the output buffer.
|
|
|
|
|
(let ((dynamic-docstrings byte-compile-dynamic-docstrings))
|
2011-04-01 15:16:50 +00:00
|
|
|
|
(with-current-buffer byte-compile--outbuffer
|
2007-08-23 19:58:31 +00:00
|
|
|
|
(let (position)
|
|
|
|
|
|
|
|
|
|
;; Insert the doc string, and make it a comment with #@LENGTH.
|
|
|
|
|
(and (>= (nth 1 info) 0)
|
|
|
|
|
dynamic-docstrings
|
|
|
|
|
(progn
|
|
|
|
|
;; Make the doc string start at beginning of line
|
|
|
|
|
;; for make-docfile's sake.
|
|
|
|
|
(insert "\n")
|
|
|
|
|
(setq position
|
|
|
|
|
(byte-compile-output-as-comment
|
|
|
|
|
(nth (nth 1 info) form) nil))
|
|
|
|
|
;; If the doc string starts with * (a user variable),
|
|
|
|
|
;; negate POSITION.
|
|
|
|
|
(if (and (stringp (nth (nth 1 info) form))
|
|
|
|
|
(> (length (nth (nth 1 info) form)) 0)
|
|
|
|
|
(eq (aref (nth (nth 1 info) form) 0) ?*))
|
|
|
|
|
(setq position (- position)))))
|
|
|
|
|
|
|
|
|
|
(if preface
|
|
|
|
|
(progn
|
|
|
|
|
(insert preface)
|
2011-04-01 15:16:50 +00:00
|
|
|
|
(prin1 name byte-compile--outbuffer)))
|
2007-08-23 19:58:31 +00:00
|
|
|
|
(insert (car info))
|
2012-05-30 03:59:42 +00:00
|
|
|
|
(let ((print-continuous-numbering t)
|
2007-08-23 19:58:31 +00:00
|
|
|
|
print-number-table
|
2012-06-01 19:47:54 +00:00
|
|
|
|
(index 0)
|
|
|
|
|
;; FIXME: The bindings below are only needed for when we're
|
|
|
|
|
;; called from ...-defmumble.
|
|
|
|
|
(print-escape-newlines t)
|
|
|
|
|
(print-length nil)
|
|
|
|
|
(print-level nil)
|
|
|
|
|
(print-quoted t)
|
|
|
|
|
(print-gensym t)
|
|
|
|
|
(print-circle ; Handle circular data structures.
|
|
|
|
|
(not byte-compile-disable-print-circle)))
|
2011-04-01 15:16:50 +00:00
|
|
|
|
(prin1 (car form) byte-compile--outbuffer)
|
2007-08-23 19:58:31 +00:00
|
|
|
|
(while (setq form (cdr form))
|
|
|
|
|
(setq index (1+ index))
|
|
|
|
|
(insert " ")
|
|
|
|
|
(cond ((and (numberp specindex) (= index specindex)
|
|
|
|
|
;; Don't handle the definition dynamically
|
|
|
|
|
;; if it refers (or might refer)
|
|
|
|
|
;; to objects already output
|
|
|
|
|
;; (for instance, gensyms in the arg list).
|
|
|
|
|
(let (non-nil)
|
2010-12-23 00:00:12 +00:00
|
|
|
|
(when (hash-table-p print-number-table)
|
2011-03-10 19:40:48 +00:00
|
|
|
|
(maphash (lambda (_k v) (if v (setq non-nil t)))
|
2010-12-23 00:00:12 +00:00
|
|
|
|
print-number-table))
|
2007-08-23 19:58:31 +00:00
|
|
|
|
(not non-nil)))
|
|
|
|
|
;; Output the byte code and constants specially
|
|
|
|
|
;; for lazy dynamic loading.
|
|
|
|
|
(let ((position
|
|
|
|
|
(byte-compile-output-as-comment
|
|
|
|
|
(cons (car form) (nth 1 form))
|
|
|
|
|
t)))
|
Try and fix w32 build; misc cleanup.
* lisp/subr.el (apply-partially): Move from subr.el; don't use lexical-let.
(eval-after-load): Obey lexical-binding.
* lisp/simple.el (apply-partially): Move to subr.el.
* lisp/makefile.w32-in: Match changes in Makefile.in.
(BIG_STACK_DEPTH, BIG_STACK_OPTS, BYTE_COMPILE_FLAGS): New vars.
(.el.elc, compile-CMD, compile-SH, compile-always-CMD)
(compile-always-SH, compile-calc-CMD, compile-calc-SH): Use them.
(COMPILE_FIRST): Add pcase, macroexp, and cconv.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Silence warning about
calling CL's `compiler-macroexpand'.
* lisp/emacs-lisp/bytecomp.el (byte-compile-preprocess): New function.
(byte-compile-initial-macro-environment)
(byte-compile-toplevel-file-form, byte-compile, byte-compile-sexp): Use it.
(byte-compile-eval, byte-compile-eval-before-compile): Obey lexical-binding.
(byte-compile--for-effect): Rename from `for-effect'.
(display-call-tree): Use case.
* lisp/emacs-lisp/byte-opt.el (for-effect): Don't declare as dynamic.
(byte-optimize-form-code-walker, byte-optimize-form):
Revert to old arg name.
* lisp/Makefile.in (BYTE_COMPILE_FLAGS): New var.
(compile-onefile, .el.elc, compile-calc, recompile): Use it.
2011-03-12 03:32:43 +00:00
|
|
|
|
(princ (format "(#$ . %d) nil" position)
|
2011-04-01 15:16:50 +00:00
|
|
|
|
byte-compile--outbuffer)
|
2007-08-23 19:58:31 +00:00
|
|
|
|
(setq form (cdr form))
|
|
|
|
|
(setq index (1+ index))))
|
|
|
|
|
((= index (nth 1 info))
|
|
|
|
|
(if position
|
|
|
|
|
(princ (format (if quoted "'(#$ . %d)" "(#$ . %d)")
|
|
|
|
|
position)
|
2011-04-01 15:16:50 +00:00
|
|
|
|
byte-compile--outbuffer)
|
2007-08-23 19:58:31 +00:00
|
|
|
|
(let ((print-escape-newlines nil))
|
|
|
|
|
(goto-char (prog1 (1+ (point))
|
2011-04-01 15:16:50 +00:00
|
|
|
|
(prin1 (car form)
|
|
|
|
|
byte-compile--outbuffer)))
|
2007-08-23 19:58:31 +00:00
|
|
|
|
(insert "\\\n")
|
|
|
|
|
(goto-char (point-max)))))
|
|
|
|
|
(t
|
2011-04-01 15:16:50 +00:00
|
|
|
|
(prin1 (car form) byte-compile--outbuffer)))))
|
2007-08-23 19:58:31 +00:00
|
|
|
|
(insert (nth 2 info)))))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
nil)
|
|
|
|
|
|
2011-03-16 20:08:39 +00:00
|
|
|
|
(defun byte-compile-keep-pending (form &optional handler)
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(if (memq byte-optimize '(t source))
|
|
|
|
|
(setq form (byte-optimize-form form t)))
|
2011-03-16 20:08:39 +00:00
|
|
|
|
(if handler
|
Try and fix w32 build; misc cleanup.
* lisp/subr.el (apply-partially): Move from subr.el; don't use lexical-let.
(eval-after-load): Obey lexical-binding.
* lisp/simple.el (apply-partially): Move to subr.el.
* lisp/makefile.w32-in: Match changes in Makefile.in.
(BIG_STACK_DEPTH, BIG_STACK_OPTS, BYTE_COMPILE_FLAGS): New vars.
(.el.elc, compile-CMD, compile-SH, compile-always-CMD)
(compile-always-SH, compile-calc-CMD, compile-calc-SH): Use them.
(COMPILE_FIRST): Add pcase, macroexp, and cconv.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Silence warning about
calling CL's `compiler-macroexpand'.
* lisp/emacs-lisp/bytecomp.el (byte-compile-preprocess): New function.
(byte-compile-initial-macro-environment)
(byte-compile-toplevel-file-form, byte-compile, byte-compile-sexp): Use it.
(byte-compile-eval, byte-compile-eval-before-compile): Obey lexical-binding.
(byte-compile--for-effect): Rename from `for-effect'.
(display-call-tree): Use case.
* lisp/emacs-lisp/byte-opt.el (for-effect): Don't declare as dynamic.
(byte-optimize-form-code-walker, byte-optimize-form):
Revert to old arg name.
* lisp/Makefile.in (BYTE_COMPILE_FLAGS): New var.
(compile-onefile, .el.elc, compile-calc, recompile): Use it.
2011-03-12 03:32:43 +00:00
|
|
|
|
(let ((byte-compile--for-effect t))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
;; To avoid consing up monstrously large forms at load time, we split
|
|
|
|
|
;; the output regularly.
|
1993-07-02 17:46:43 +00:00
|
|
|
|
(and (memq (car-safe form) '(fset defalias))
|
|
|
|
|
(nthcdr 300 byte-compile-output)
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(byte-compile-flush-pending))
|
2011-03-16 20:08:39 +00:00
|
|
|
|
(funcall handler form)
|
Try and fix w32 build; misc cleanup.
* lisp/subr.el (apply-partially): Move from subr.el; don't use lexical-let.
(eval-after-load): Obey lexical-binding.
* lisp/simple.el (apply-partially): Move to subr.el.
* lisp/makefile.w32-in: Match changes in Makefile.in.
(BIG_STACK_DEPTH, BIG_STACK_OPTS, BYTE_COMPILE_FLAGS): New vars.
(.el.elc, compile-CMD, compile-SH, compile-always-CMD)
(compile-always-SH, compile-calc-CMD, compile-calc-SH): Use them.
(COMPILE_FIRST): Add pcase, macroexp, and cconv.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Silence warning about
calling CL's `compiler-macroexpand'.
* lisp/emacs-lisp/bytecomp.el (byte-compile-preprocess): New function.
(byte-compile-initial-macro-environment)
(byte-compile-toplevel-file-form, byte-compile, byte-compile-sexp): Use it.
(byte-compile-eval, byte-compile-eval-before-compile): Obey lexical-binding.
(byte-compile--for-effect): Rename from `for-effect'.
(display-call-tree): Use case.
* lisp/emacs-lisp/byte-opt.el (for-effect): Don't declare as dynamic.
(byte-optimize-form-code-walker, byte-optimize-form):
Revert to old arg name.
* lisp/Makefile.in (BYTE_COMPILE_FLAGS): New var.
(compile-onefile, .el.elc, compile-calc, recompile): Use it.
2011-03-12 03:32:43 +00:00
|
|
|
|
(if byte-compile--for-effect
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(byte-compile-discard)))
|
|
|
|
|
(byte-compile-form form t))
|
|
|
|
|
nil)
|
|
|
|
|
|
|
|
|
|
(defun byte-compile-flush-pending ()
|
|
|
|
|
(if byte-compile-output
|
|
|
|
|
(let ((form (byte-compile-out-toplevel t 'file)))
|
|
|
|
|
(cond ((eq (car-safe form) 'progn)
|
2000-05-26 10:35:38 +00:00
|
|
|
|
(mapc 'byte-compile-output-file-form (cdr form)))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(form
|
|
|
|
|
(byte-compile-output-file-form form)))
|
|
|
|
|
(setq byte-compile-constants nil
|
|
|
|
|
byte-compile-variables nil
|
|
|
|
|
byte-compile-depth 0
|
|
|
|
|
byte-compile-maxdepth 0
|
|
|
|
|
byte-compile-output nil))))
|
|
|
|
|
|
2013-06-14 02:31:28 +00:00
|
|
|
|
(defvar byte-compile-force-lexical-warnings nil)
|
|
|
|
|
|
Try and fix w32 build; misc cleanup.
* lisp/subr.el (apply-partially): Move from subr.el; don't use lexical-let.
(eval-after-load): Obey lexical-binding.
* lisp/simple.el (apply-partially): Move to subr.el.
* lisp/makefile.w32-in: Match changes in Makefile.in.
(BIG_STACK_DEPTH, BIG_STACK_OPTS, BYTE_COMPILE_FLAGS): New vars.
(.el.elc, compile-CMD, compile-SH, compile-always-CMD)
(compile-always-SH, compile-calc-CMD, compile-calc-SH): Use them.
(COMPILE_FIRST): Add pcase, macroexp, and cconv.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Silence warning about
calling CL's `compiler-macroexpand'.
* lisp/emacs-lisp/bytecomp.el (byte-compile-preprocess): New function.
(byte-compile-initial-macro-environment)
(byte-compile-toplevel-file-form, byte-compile, byte-compile-sexp): Use it.
(byte-compile-eval, byte-compile-eval-before-compile): Obey lexical-binding.
(byte-compile--for-effect): Rename from `for-effect'.
(display-call-tree): Use case.
* lisp/emacs-lisp/byte-opt.el (for-effect): Don't declare as dynamic.
(byte-optimize-form-code-walker, byte-optimize-form):
Revert to old arg name.
* lisp/Makefile.in (BYTE_COMPILE_FLAGS): New var.
(compile-onefile, .el.elc, compile-calc, recompile): Use it.
2011-03-12 03:32:43 +00:00
|
|
|
|
(defun byte-compile-preprocess (form &optional _for-effect)
|
|
|
|
|
(setq form (macroexpand-all form byte-compile-macro-environment))
|
|
|
|
|
;; FIXME: We should run byte-optimize-form here, but it currently does not
|
|
|
|
|
;; recurse through all the code, so we'd have to fix this first.
|
|
|
|
|
;; Maybe a good fix would be to merge byte-optimize-form into
|
|
|
|
|
;; macroexpand-all.
|
|
|
|
|
;; (if (memq byte-optimize '(t source))
|
|
|
|
|
;; (setq form (byte-optimize-form form for-effect)))
|
2013-06-14 02:31:28 +00:00
|
|
|
|
(cond
|
|
|
|
|
(lexical-binding (cconv-closure-convert form))
|
|
|
|
|
(byte-compile-force-lexical-warnings (cconv-warnings-only form))
|
|
|
|
|
(t form)))
|
Try and fix w32 build; misc cleanup.
* lisp/subr.el (apply-partially): Move from subr.el; don't use lexical-let.
(eval-after-load): Obey lexical-binding.
* lisp/simple.el (apply-partially): Move to subr.el.
* lisp/makefile.w32-in: Match changes in Makefile.in.
(BIG_STACK_DEPTH, BIG_STACK_OPTS, BYTE_COMPILE_FLAGS): New vars.
(.el.elc, compile-CMD, compile-SH, compile-always-CMD)
(compile-always-SH, compile-calc-CMD, compile-calc-SH): Use them.
(COMPILE_FIRST): Add pcase, macroexp, and cconv.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Silence warning about
calling CL's `compiler-macroexpand'.
* lisp/emacs-lisp/bytecomp.el (byte-compile-preprocess): New function.
(byte-compile-initial-macro-environment)
(byte-compile-toplevel-file-form, byte-compile, byte-compile-sexp): Use it.
(byte-compile-eval, byte-compile-eval-before-compile): Obey lexical-binding.
(byte-compile--for-effect): Rename from `for-effect'.
(display-call-tree): Use case.
* lisp/emacs-lisp/byte-opt.el (for-effect): Don't declare as dynamic.
(byte-optimize-form-code-walker, byte-optimize-form):
Revert to old arg name.
* lisp/Makefile.in (BYTE_COMPILE_FLAGS): New var.
(compile-onefile, .el.elc, compile-calc, recompile): Use it.
2011-03-12 03:32:43 +00:00
|
|
|
|
|
Get rid of funvec.
* lisp/emacs-lisp/bytecomp.el (byte-compile-lapcode): Handle new form of
`byte-constant'.
(byte-compile-close-variables, displaying-byte-compile-warnings):
Add edebug spec.
(byte-compile-toplevel-file-form): New fun, split out of
byte-compile-file-form.
(byte-compile-from-buffer): Use it to avoid applying cconv
multiple times.
(byte-compile): Only strip `function' if it's present.
(byte-compile-lambda): Add `reserved-csts' argument.
Use new lexenv arg of byte-compile-top-level.
(byte-compile-reserved-constants): New var.
(byte-compile-constants-vector): Obey it.
(byte-compile-constants-vector): Handle new `byte-constant' form.
(byte-compile-top-level): Add args `lexenv' and `reserved-csts'.
(byte-compile-form): Don't check callargs here.
(byte-compile-normal-call): Do it here instead.
(byte-compile-push-unknown-constant)
(byte-compile-resolve-unknown-constant): Remove, unused.
(byte-compile-make-closure): Use `make-byte-code' rather than `curry',
putting the environment into the "constant" pool.
(byte-compile-get-closed-var): Use special byte-constant.
* lisp/emacs-lisp/byte-opt.el (byte-optimize-form-code-walker): Handle new
intermediate special form `internal-make-vector'.
(byte-optimize-lapcode): Handle new form of `byte-constant'.
* lisp/help-fns.el (describe-function-1): Don't handle funvecs.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Only convert quote to
function if the content is a lambda expression, not if it's a closure.
* emacs-lisp/eieio-come.el: Remove.
* lisp/emacs-lisp/eieio.el: Don't require eieio-comp.
(defmethod): Do a bit more work to find the body and wrap it into
a function before passing it to eieio-defmethod.
(eieio-defmethod): New arg `code' for it.
* lisp/emacs-lisp/debug.el (debugger-setup-buffer): Don't hide things in
debugger backtrace.
* lisp/emacs-lisp/cl-extra.el (cl-macroexpand-all): Use backquotes, and be
more careful when quoting a function value.
* lisp/emacs-lisp/cconv.el (cconv-freevars): Accept defvar/defconst.
(cconv-closure-convert-rec): Catch stray `internal-make-closure'.
* lisp/Makefile.in (COMPILE_FIRST): Compile pcase and cconv early.
* src/eval.c (Qcurry): Remove.
(funcall_funvec): Remove.
(funcall_lambda): Move new byte-code handling to reduce impact.
Treat all args as lexical in the case of lexbind.
(Fcurry): Remove.
* src/data.c (Qfunction_vector): Remove.
(Ffunvecp): Remove.
* src/lread.c (read1): Revert to calling make_byte_code here.
(read_vector): Don't call make_byte_code any more.
* src/lisp.h (enum pvec_type): Rename back to PVEC_COMPILED.
(XSETCOMPILED): Rename back from XSETFUNVEC.
(FUNVEC_SIZE): Remove.
(FUNVEC_COMPILED_TAG_P, FUNVEC_COMPILED_P): Remove.
(COMPILEDP): Rename back from FUNVECP.
* src/fns.c (Felt): Remove unexplained FUNVEC check.
* src/doc.c (Fdocumentation): Don't handle funvec.
* src/alloc.c (make_funvec, Ffunvec): Remove.
* doc/lispref/vol2.texi (Top):
* doc/lispref/vol1.texi (Top):
* doc/lispref/objects.texi (Programming Types, Funvec Type, Type Predicates):
* doc/lispref/functions.texi (Functions, What Is a Function, FunctionCurrying):
* doc/lispref/elisp.texi (Top): Remove mentions of funvec and curry.
2011-02-25 03:27:45 +00:00
|
|
|
|
;; byte-hunk-handlers cannot call this!
|
2014-04-21 09:34:21 +00:00
|
|
|
|
(defun byte-compile-toplevel-file-form (top-level-form)
|
|
|
|
|
(byte-compile-recurse-toplevel
|
|
|
|
|
top-level-form
|
|
|
|
|
(lambda (form)
|
|
|
|
|
(let ((byte-compile-current-form nil)) ; close over this for warnings.
|
|
|
|
|
(byte-compile-file-form (byte-compile-preprocess form t))))))
|
Get rid of funvec.
* lisp/emacs-lisp/bytecomp.el (byte-compile-lapcode): Handle new form of
`byte-constant'.
(byte-compile-close-variables, displaying-byte-compile-warnings):
Add edebug spec.
(byte-compile-toplevel-file-form): New fun, split out of
byte-compile-file-form.
(byte-compile-from-buffer): Use it to avoid applying cconv
multiple times.
(byte-compile): Only strip `function' if it's present.
(byte-compile-lambda): Add `reserved-csts' argument.
Use new lexenv arg of byte-compile-top-level.
(byte-compile-reserved-constants): New var.
(byte-compile-constants-vector): Obey it.
(byte-compile-constants-vector): Handle new `byte-constant' form.
(byte-compile-top-level): Add args `lexenv' and `reserved-csts'.
(byte-compile-form): Don't check callargs here.
(byte-compile-normal-call): Do it here instead.
(byte-compile-push-unknown-constant)
(byte-compile-resolve-unknown-constant): Remove, unused.
(byte-compile-make-closure): Use `make-byte-code' rather than `curry',
putting the environment into the "constant" pool.
(byte-compile-get-closed-var): Use special byte-constant.
* lisp/emacs-lisp/byte-opt.el (byte-optimize-form-code-walker): Handle new
intermediate special form `internal-make-vector'.
(byte-optimize-lapcode): Handle new form of `byte-constant'.
* lisp/help-fns.el (describe-function-1): Don't handle funvecs.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Only convert quote to
function if the content is a lambda expression, not if it's a closure.
* emacs-lisp/eieio-come.el: Remove.
* lisp/emacs-lisp/eieio.el: Don't require eieio-comp.
(defmethod): Do a bit more work to find the body and wrap it into
a function before passing it to eieio-defmethod.
(eieio-defmethod): New arg `code' for it.
* lisp/emacs-lisp/debug.el (debugger-setup-buffer): Don't hide things in
debugger backtrace.
* lisp/emacs-lisp/cl-extra.el (cl-macroexpand-all): Use backquotes, and be
more careful when quoting a function value.
* lisp/emacs-lisp/cconv.el (cconv-freevars): Accept defvar/defconst.
(cconv-closure-convert-rec): Catch stray `internal-make-closure'.
* lisp/Makefile.in (COMPILE_FIRST): Compile pcase and cconv early.
* src/eval.c (Qcurry): Remove.
(funcall_funvec): Remove.
(funcall_lambda): Move new byte-code handling to reduce impact.
Treat all args as lexical in the case of lexbind.
(Fcurry): Remove.
* src/data.c (Qfunction_vector): Remove.
(Ffunvecp): Remove.
* src/lread.c (read1): Revert to calling make_byte_code here.
(read_vector): Don't call make_byte_code any more.
* src/lisp.h (enum pvec_type): Rename back to PVEC_COMPILED.
(XSETCOMPILED): Rename back from XSETFUNVEC.
(FUNVEC_SIZE): Remove.
(FUNVEC_COMPILED_TAG_P, FUNVEC_COMPILED_P): Remove.
(COMPILEDP): Rename back from FUNVECP.
* src/fns.c (Felt): Remove unexplained FUNVEC check.
* src/doc.c (Fdocumentation): Don't handle funvec.
* src/alloc.c (make_funvec, Ffunvec): Remove.
* doc/lispref/vol2.texi (Top):
* doc/lispref/vol1.texi (Top):
* doc/lispref/objects.texi (Programming Types, Funvec Type, Type Predicates):
* doc/lispref/functions.texi (Functions, What Is a Function, FunctionCurrying):
* doc/lispref/elisp.texi (Top): Remove mentions of funvec and curry.
2011-02-25 03:27:45 +00:00
|
|
|
|
|
|
|
|
|
;; byte-hunk-handlers can call this.
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(defun byte-compile-file-form (form)
|
2011-03-16 20:08:39 +00:00
|
|
|
|
(let (handler)
|
2011-02-26 15:19:08 +00:00
|
|
|
|
(cond ((and (consp form)
|
|
|
|
|
(symbolp (car form))
|
2011-03-16 20:08:39 +00:00
|
|
|
|
(setq handler (get (car form) 'byte-hunk-handler)))
|
|
|
|
|
(cond ((setq form (funcall handler form))
|
2010-06-13 20:36:17 +00:00
|
|
|
|
(byte-compile-flush-pending)
|
|
|
|
|
(byte-compile-output-file-form form))))
|
|
|
|
|
(t
|
|
|
|
|
(byte-compile-keep-pending form)))))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
|
|
|
|
;; Functions and variables with doc strings must be output separately,
|
2011-11-20 02:29:42 +00:00
|
|
|
|
;; so make-docfile can recognize them. Most other things can be output
|
1992-07-10 22:06:47 +00:00
|
|
|
|
;; as byte-code.
|
|
|
|
|
|
|
|
|
|
(put 'autoload 'byte-hunk-handler 'byte-compile-file-form-autoload)
|
|
|
|
|
(defun byte-compile-file-form-autoload (form)
|
|
|
|
|
(and (let ((form form))
|
2012-06-07 19:25:48 +00:00
|
|
|
|
(while (if (setq form (cdr form)) (macroexp-const-p (car form))))
|
2013-08-07 17:33:30 +00:00
|
|
|
|
(null form)) ;Constants only
|
2013-06-19 07:35:00 +00:00
|
|
|
|
(memq (eval (nth 5 form)) '(t macro)) ;Macro
|
2013-08-07 17:33:30 +00:00
|
|
|
|
(eval form)) ;Define the autoload.
|
2000-03-29 21:32:57 +00:00
|
|
|
|
;; Avoid undefined function warnings for the autoload.
|
2013-08-07 17:33:30 +00:00
|
|
|
|
(pcase (nth 1 form)
|
|
|
|
|
(`',(and (pred symbolp) funsym)
|
|
|
|
|
;; Don't add it if it's already defined. Otherwise, it might
|
|
|
|
|
;; hide the actual definition. However, do remove any entry from
|
|
|
|
|
;; byte-compile-noruntime-functions, in case we have an autoload
|
|
|
|
|
;; of foo-func following an (eval-when-compile (require 'foo)).
|
|
|
|
|
(unless (fboundp funsym)
|
|
|
|
|
(push (cons funsym (cons 'autoload (cdr (cdr form))))
|
|
|
|
|
byte-compile-function-environment))
|
|
|
|
|
;; If an autoload occurs _before_ the first call to a function,
|
|
|
|
|
;; byte-compile-callargs-warn does not add an entry to
|
|
|
|
|
;; byte-compile-unresolved-functions. Here we mimic the logic
|
|
|
|
|
;; of byte-compile-callargs-warn so as not to warn if the
|
|
|
|
|
;; autoload comes _after_ the function call.
|
|
|
|
|
;; Alternatively, similar logic could go in
|
|
|
|
|
;; byte-compile-warn-about-unresolved-functions.
|
|
|
|
|
(if (memq funsym byte-compile-noruntime-functions)
|
|
|
|
|
(setq byte-compile-noruntime-functions
|
|
|
|
|
(delq funsym byte-compile-noruntime-functions)
|
|
|
|
|
byte-compile-noruntime-functions)
|
|
|
|
|
(setq byte-compile-unresolved-functions
|
|
|
|
|
(delq (assq funsym byte-compile-unresolved-functions)
|
|
|
|
|
byte-compile-unresolved-functions)))))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(if (stringp (nth 3 form))
|
|
|
|
|
form
|
|
|
|
|
;; No doc string, so we can compile this as a normal form.
|
|
|
|
|
(byte-compile-keep-pending form 'byte-compile-normal-call)))
|
|
|
|
|
|
|
|
|
|
(put 'defvar 'byte-hunk-handler 'byte-compile-file-form-defvar)
|
|
|
|
|
(put 'defconst 'byte-hunk-handler 'byte-compile-file-form-defvar)
|
2013-06-05 02:35:40 +00:00
|
|
|
|
|
|
|
|
|
(defun byte-compile--declare-var (sym)
|
|
|
|
|
(when (and (symbolp sym)
|
|
|
|
|
(not (string-match "[-*/:$]" (symbol-name sym)))
|
2012-02-09 21:51:03 +00:00
|
|
|
|
(byte-compile-warning-enabled-p 'lexical))
|
|
|
|
|
(byte-compile-warn "global/dynamic var `%s' lacks a prefix"
|
2013-06-05 02:35:40 +00:00
|
|
|
|
sym))
|
|
|
|
|
(when (memq sym byte-compile-lexical-variables)
|
|
|
|
|
(setq byte-compile-lexical-variables
|
|
|
|
|
(delq sym byte-compile-lexical-variables))
|
|
|
|
|
(byte-compile-warn "Variable `%S' declared after its first use" sym))
|
|
|
|
|
(push sym byte-compile-bound-variables))
|
|
|
|
|
|
|
|
|
|
(defun byte-compile-file-form-defvar (form)
|
|
|
|
|
(let ((sym (nth 1 form)))
|
|
|
|
|
(byte-compile--declare-var sym)
|
|
|
|
|
(if (eq (car form) 'defconst)
|
|
|
|
|
(push sym byte-compile-const-variables)))
|
2012-02-09 21:51:03 +00:00
|
|
|
|
(if (and (null (cddr form)) ;No `value' provided.
|
|
|
|
|
(eq (car form) 'defvar)) ;Just a declaration.
|
|
|
|
|
nil
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(cond ((consp (nth 2 form))
|
2012-02-09 21:51:03 +00:00
|
|
|
|
(setq form (copy-sequence form))
|
|
|
|
|
(setcar (cdr (cdr form))
|
|
|
|
|
(byte-compile-top-level (nth 2 form) nil 'file))))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
form))
|
|
|
|
|
|
Try and fix w32 build; misc cleanup.
* lisp/subr.el (apply-partially): Move from subr.el; don't use lexical-let.
(eval-after-load): Obey lexical-binding.
* lisp/simple.el (apply-partially): Move to subr.el.
* lisp/makefile.w32-in: Match changes in Makefile.in.
(BIG_STACK_DEPTH, BIG_STACK_OPTS, BYTE_COMPILE_FLAGS): New vars.
(.el.elc, compile-CMD, compile-SH, compile-always-CMD)
(compile-always-SH, compile-calc-CMD, compile-calc-SH): Use them.
(COMPILE_FIRST): Add pcase, macroexp, and cconv.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Silence warning about
calling CL's `compiler-macroexpand'.
* lisp/emacs-lisp/bytecomp.el (byte-compile-preprocess): New function.
(byte-compile-initial-macro-environment)
(byte-compile-toplevel-file-form, byte-compile, byte-compile-sexp): Use it.
(byte-compile-eval, byte-compile-eval-before-compile): Obey lexical-binding.
(byte-compile--for-effect): Rename from `for-effect'.
(display-call-tree): Use case.
* lisp/emacs-lisp/byte-opt.el (for-effect): Don't declare as dynamic.
(byte-optimize-form-code-walker, byte-optimize-form):
Revert to old arg name.
* lisp/Makefile.in (BYTE_COMPILE_FLAGS): New var.
(compile-onefile, .el.elc, compile-calc, recompile): Use it.
2011-03-12 03:32:43 +00:00
|
|
|
|
(put 'define-abbrev-table 'byte-hunk-handler
|
|
|
|
|
'byte-compile-file-form-define-abbrev-table)
|
2007-11-09 15:57:46 +00:00
|
|
|
|
(defun byte-compile-file-form-define-abbrev-table (form)
|
2009-11-03 03:16:23 +00:00
|
|
|
|
(if (eq 'quote (car-safe (car-safe (cdr form))))
|
2013-06-05 02:35:40 +00:00
|
|
|
|
(byte-compile--declare-var (car-safe (cdr (cadr form)))))
|
2007-11-09 15:57:46 +00:00
|
|
|
|
(byte-compile-keep-pending form))
|
|
|
|
|
|
1997-05-08 16:28:07 +00:00
|
|
|
|
(put 'custom-declare-variable 'byte-hunk-handler
|
|
|
|
|
'byte-compile-file-form-custom-declare-variable)
|
|
|
|
|
(defun byte-compile-file-form-custom-declare-variable (form)
|
2007-10-28 23:53:06 +00:00
|
|
|
|
(when (byte-compile-warning-enabled-p 'callargs)
|
2005-05-19 15:39:21 +00:00
|
|
|
|
(byte-compile-nogroup-warn form))
|
2013-06-05 02:35:40 +00:00
|
|
|
|
(byte-compile--declare-var (nth 1 (nth 1 form)))
|
2012-05-03 02:39:23 +00:00
|
|
|
|
(byte-compile-keep-pending form))
|
1997-05-08 16:28:07 +00:00
|
|
|
|
|
2004-10-16 15:20:24 +00:00
|
|
|
|
(put 'require 'byte-hunk-handler 'byte-compile-file-form-require)
|
|
|
|
|
(defun byte-compile-file-form-require (form)
|
2009-09-05 19:10:37 +00:00
|
|
|
|
(let ((args (mapcar 'eval (cdr form)))
|
|
|
|
|
(hist-orig load-history)
|
|
|
|
|
hist-new)
|
2004-10-16 15:20:24 +00:00
|
|
|
|
(apply 'require args)
|
2009-09-05 19:10:37 +00:00
|
|
|
|
(when (byte-compile-warning-enabled-p 'cl-functions)
|
|
|
|
|
;; Detect (require 'cl) in a way that works even if cl is already loaded.
|
|
|
|
|
(if (member (car args) '("cl" cl))
|
|
|
|
|
(progn
|
|
|
|
|
(byte-compile-warn "cl package required at runtime")
|
|
|
|
|
(byte-compile-disable-warning 'cl-functions))
|
|
|
|
|
;; We may have required something that causes cl to be loaded, eg
|
|
|
|
|
;; the uncompiled version of a file that requires cl when compiling.
|
|
|
|
|
(setq hist-new load-history)
|
|
|
|
|
(while (and (not byte-compile-cl-functions)
|
|
|
|
|
hist-new (not (eq hist-new hist-orig)))
|
|
|
|
|
(and (byte-compile-cl-file-p (car (pop hist-new)))
|
|
|
|
|
(byte-compile-find-cl-functions))))))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(byte-compile-keep-pending form 'byte-compile-normal-call))
|
|
|
|
|
|
|
|
|
|
(put 'progn 'byte-hunk-handler 'byte-compile-file-form-progn)
|
|
|
|
|
(put 'prog1 'byte-hunk-handler 'byte-compile-file-form-progn)
|
|
|
|
|
(put 'prog2 'byte-hunk-handler 'byte-compile-file-form-progn)
|
|
|
|
|
(defun byte-compile-file-form-progn (form)
|
2000-05-26 10:35:38 +00:00
|
|
|
|
(mapc 'byte-compile-file-form (cdr form))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
;; Return nil so the forms are not output twice.
|
|
|
|
|
nil)
|
|
|
|
|
|
2009-09-10 06:22:30 +00:00
|
|
|
|
(put 'with-no-warnings 'byte-hunk-handler
|
|
|
|
|
'byte-compile-file-form-with-no-warnings)
|
|
|
|
|
(defun byte-compile-file-form-with-no-warnings (form)
|
|
|
|
|
;; cf byte-compile-file-form-progn.
|
|
|
|
|
(let (byte-compile-warnings)
|
|
|
|
|
(mapc 'byte-compile-file-form (cdr form))
|
|
|
|
|
nil))
|
|
|
|
|
|
1992-07-10 22:06:47 +00:00
|
|
|
|
;; This handler is not necessary, but it makes the output from dont-compile
|
|
|
|
|
;; and similar macros cleaner.
|
|
|
|
|
(put 'eval 'byte-hunk-handler 'byte-compile-file-form-eval)
|
|
|
|
|
(defun byte-compile-file-form-eval (form)
|
|
|
|
|
(if (eq (car-safe (nth 1 form)) 'quote)
|
|
|
|
|
(nth 1 (nth 1 form))
|
|
|
|
|
(byte-compile-keep-pending form)))
|
|
|
|
|
|
2012-05-30 03:59:42 +00:00
|
|
|
|
(defun byte-compile-file-form-defmumble (name macro arglist body rest)
|
|
|
|
|
"Process a `defalias' for NAME.
|
|
|
|
|
If MACRO is non-nil, the definition is known to be a macro.
|
|
|
|
|
ARGLIST is the list of arguments, if it was recognized or t otherwise.
|
|
|
|
|
BODY of the definition, or t if not recognized.
|
|
|
|
|
Return non-nil if everything went as planned, or nil to imply that it decided
|
|
|
|
|
not to take responsibility for the actual compilation of the code."
|
|
|
|
|
(let* ((this-kind (if macro 'byte-compile-macro-environment
|
|
|
|
|
'byte-compile-function-environment))
|
|
|
|
|
(that-kind (if macro 'byte-compile-function-environment
|
|
|
|
|
'byte-compile-macro-environment))
|
|
|
|
|
(this-one (assq name (symbol-value this-kind)))
|
|
|
|
|
(that-one (assq name (symbol-value that-kind)))
|
|
|
|
|
(byte-compile-current-form name)) ; For warnings.
|
|
|
|
|
|
2011-03-16 20:08:39 +00:00
|
|
|
|
(byte-compile-set-symbol-position name)
|
1992-07-10 22:06:47 +00:00
|
|
|
|
;; When a function or macro is defined, add it to the call tree so that
|
|
|
|
|
;; we can tell when functions are not used.
|
|
|
|
|
(if byte-compile-generate-call-tree
|
2012-05-30 03:59:42 +00:00
|
|
|
|
(or (assq name byte-compile-call-tree)
|
|
|
|
|
(setq byte-compile-call-tree
|
|
|
|
|
(cons (list name nil nil) byte-compile-call-tree))))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
2007-10-28 23:53:06 +00:00
|
|
|
|
(if (byte-compile-warning-enabled-p 'redefine)
|
2012-05-30 03:59:42 +00:00
|
|
|
|
(byte-compile-arglist-warn name arglist macro))
|
|
|
|
|
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(if byte-compile-verbose
|
2012-05-30 03:59:42 +00:00
|
|
|
|
(message "Compiling %s... (%s)"
|
|
|
|
|
(or byte-compile-current-file "") name))
|
|
|
|
|
(cond ((not (or macro (listp body)))
|
|
|
|
|
;; We do not know positively if the definition is a macro
|
|
|
|
|
;; or a function, so we shouldn't emit warnings.
|
|
|
|
|
;; This also silences "multiple definition" warnings for defmethods.
|
|
|
|
|
nil)
|
|
|
|
|
(that-one
|
|
|
|
|
(if (and (byte-compile-warning-enabled-p 'redefine)
|
|
|
|
|
;; Don't warn when compiling the stubs in byte-run...
|
|
|
|
|
(not (assq name byte-compile-initial-macro-environment)))
|
|
|
|
|
(byte-compile-warn
|
2011-03-23 00:53:36 +00:00
|
|
|
|
"`%s' defined multiple times, as both function and macro"
|
2012-05-30 03:59:42 +00:00
|
|
|
|
name))
|
|
|
|
|
(setcdr that-one nil))
|
|
|
|
|
(this-one
|
|
|
|
|
(when (and (byte-compile-warning-enabled-p 'redefine)
|
|
|
|
|
;; Hack: Don't warn when compiling the magic internal
|
2011-03-23 00:53:36 +00:00
|
|
|
|
;; byte-compiler macros in byte-run.el...
|
2012-05-30 03:59:42 +00:00
|
|
|
|
(not (assq name byte-compile-initial-macro-environment)))
|
|
|
|
|
(byte-compile-warn "%s `%s' defined multiple times in this file"
|
|
|
|
|
(if macro "macro" "function")
|
|
|
|
|
name)))
|
2014-01-06 23:34:05 +00:00
|
|
|
|
((eq (car-safe (symbol-function name))
|
|
|
|
|
(if macro 'lambda 'macro))
|
2012-05-30 03:59:42 +00:00
|
|
|
|
(when (byte-compile-warning-enabled-p 'redefine)
|
|
|
|
|
(byte-compile-warn "%s `%s' being redefined as a %s"
|
|
|
|
|
(if macro "function" "macro")
|
|
|
|
|
name
|
|
|
|
|
(if macro "macro" "function")))
|
|
|
|
|
;; Shadow existing definition.
|
|
|
|
|
(set this-kind
|
|
|
|
|
(cons (cons name nil)
|
|
|
|
|
(symbol-value this-kind))))
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
(when (and (listp body)
|
|
|
|
|
(stringp (car body))
|
|
|
|
|
(symbolp (car-safe (cdr-safe body)))
|
|
|
|
|
(car-safe (cdr-safe body))
|
|
|
|
|
(stringp (car-safe (cdr-safe (cdr-safe body)))))
|
|
|
|
|
;; FIXME: We've done that already just above, so this looks wrong!
|
|
|
|
|
;;(byte-compile-set-symbol-position name)
|
|
|
|
|
(byte-compile-warn "probable `\"' without `\\' in doc string of %s"
|
|
|
|
|
name))
|
2012-07-02 08:00:05 +00:00
|
|
|
|
|
2012-05-30 03:59:42 +00:00
|
|
|
|
(if (not (listp body))
|
|
|
|
|
;; The precise definition requires evaluation to find out, so it
|
|
|
|
|
;; will only be known at runtime.
|
|
|
|
|
;; For a macro, that means we can't use that macro in the same file.
|
|
|
|
|
(progn
|
|
|
|
|
(unless macro
|
|
|
|
|
(push (cons name (if (listp arglist) `(declared ,arglist) t))
|
|
|
|
|
byte-compile-function-environment))
|
|
|
|
|
;; Tell the caller that we didn't compile it yet.
|
|
|
|
|
nil)
|
|
|
|
|
|
|
|
|
|
(let* ((code (byte-compile-lambda (cons arglist body) t)))
|
|
|
|
|
(if this-one
|
|
|
|
|
;; A definition in b-c-initial-m-e should always take precedence
|
|
|
|
|
;; during compilation, so don't let it be redefined. (Bug#8647)
|
|
|
|
|
(or (and macro
|
|
|
|
|
(assq name byte-compile-initial-macro-environment))
|
|
|
|
|
(setcdr this-one code))
|
|
|
|
|
(set this-kind
|
|
|
|
|
(cons (cons name code)
|
|
|
|
|
(symbol-value this-kind))))
|
|
|
|
|
|
|
|
|
|
(if rest
|
|
|
|
|
;; There are additional args to `defalias' (like maybe a docstring)
|
|
|
|
|
;; that the code below can't handle: punt!
|
|
|
|
|
nil
|
|
|
|
|
;; Otherwise, we have a bona-fide defun/defmacro definition, and use
|
|
|
|
|
;; special code to allow dynamic docstrings and byte-code.
|
|
|
|
|
(byte-compile-flush-pending)
|
|
|
|
|
(let ((index
|
|
|
|
|
;; If there's no doc string, provide -1 as the "doc string
|
|
|
|
|
;; index" so that no element will be treated as a doc string.
|
|
|
|
|
(if (not (stringp (car body))) -1 4)))
|
|
|
|
|
;; Output the form by hand, that's much simpler than having
|
|
|
|
|
;; b-c-output-file-form analyze the defalias.
|
|
|
|
|
(byte-compile-output-docform
|
|
|
|
|
"\n(defalias '"
|
|
|
|
|
name
|
|
|
|
|
(if macro `(" '(macro . #[" ,index "])") `(" #[" ,index "]"))
|
|
|
|
|
(append code nil) ; Turn byte-code-function-p into list.
|
|
|
|
|
(and (atom code) byte-compile-dynamic
|
|
|
|
|
1)
|
|
|
|
|
nil))
|
|
|
|
|
(princ ")" byte-compile--outbuffer)
|
|
|
|
|
t)))))
|
1994-12-24 05:58:05 +00:00
|
|
|
|
|
|
|
|
|
(defun byte-compile-output-as-comment (exp quoted)
|
2012-05-30 03:59:42 +00:00
|
|
|
|
"Print Lisp object EXP in the output file, inside a comment,
|
|
|
|
|
and return the file (byte) position it will have.
|
|
|
|
|
If QUOTED is non-nil, print with quoting; otherwise, print without quoting."
|
|
|
|
|
(with-current-buffer byte-compile--outbuffer
|
|
|
|
|
(let ((position (point)))
|
2007-08-23 19:58:31 +00:00
|
|
|
|
|
|
|
|
|
;; Insert EXP, and make it a comment with #@LENGTH.
|
|
|
|
|
(insert " ")
|
|
|
|
|
(if quoted
|
2011-04-01 15:16:50 +00:00
|
|
|
|
(prin1 exp byte-compile--outbuffer)
|
|
|
|
|
(princ exp byte-compile--outbuffer))
|
2007-08-23 19:58:31 +00:00
|
|
|
|
(goto-char position)
|
|
|
|
|
;; Quote certain special characters as needed.
|
|
|
|
|
;; get_doc_string in doc.c does the unquoting.
|
|
|
|
|
(while (search-forward "\^A" nil t)
|
|
|
|
|
(replace-match "\^A\^A" t t))
|
|
|
|
|
(goto-char position)
|
|
|
|
|
(while (search-forward "\000" nil t)
|
|
|
|
|
(replace-match "\^A0" t t))
|
|
|
|
|
(goto-char position)
|
|
|
|
|
(while (search-forward "\037" nil t)
|
|
|
|
|
(replace-match "\^A_" t t))
|
|
|
|
|
(goto-char (point-max))
|
|
|
|
|
(insert "\037")
|
|
|
|
|
(goto-char position)
|
|
|
|
|
(insert "#@" (format "%d" (- (position-bytes (point-max))
|
|
|
|
|
(position-bytes position))))
|
|
|
|
|
|
|
|
|
|
;; Save the file position of the object.
|
2012-05-30 03:59:42 +00:00
|
|
|
|
;; Note we add 1 to skip the space that we inserted before the actual doc
|
|
|
|
|
;; string, and subtract point-min to convert from an 1-origin Emacs
|
|
|
|
|
;; position to a file position.
|
|
|
|
|
(prog1
|
|
|
|
|
(- (position-bytes (point)) (point-min) -1)
|
|
|
|
|
(goto-char (point-max))))))
|
1994-12-24 05:58:05 +00:00
|
|
|
|
|
2012-07-02 08:00:05 +00:00
|
|
|
|
(defun byte-compile--reify-function (fun)
|
2012-06-28 03:31:27 +00:00
|
|
|
|
"Return an expression which will evaluate to a function value FUN.
|
|
|
|
|
FUN should be either a `lambda' value or a `closure' value."
|
|
|
|
|
(pcase-let* (((or (and `(lambda ,args . ,body) (let env nil))
|
|
|
|
|
`(closure ,env ,args . ,body)) fun)
|
|
|
|
|
(renv ()))
|
|
|
|
|
;; Turn the function's closed vars (if any) into local let bindings.
|
|
|
|
|
(dolist (binding env)
|
|
|
|
|
(cond
|
|
|
|
|
((consp binding)
|
|
|
|
|
;; We check shadowing by the args, so that the `let' can be moved
|
|
|
|
|
;; within the lambda, which can then be unfolded. FIXME: Some of those
|
|
|
|
|
;; bindings might be unused in `body'.
|
|
|
|
|
(unless (memq (car binding) args) ;Shadowed.
|
|
|
|
|
(push `(,(car binding) ',(cdr binding)) renv)))
|
|
|
|
|
((eq binding t))
|
|
|
|
|
(t (push `(defvar ,binding) body))))
|
|
|
|
|
(if (null renv)
|
|
|
|
|
`(lambda ,args ,@body)
|
|
|
|
|
`(lambda ,args (let ,(nreverse renv) ,@body)))))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
1992-07-19 01:07:07 +00:00
|
|
|
|
;;;###autoload
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(defun byte-compile (form)
|
|
|
|
|
"If FORM is a symbol, byte-compile its function definition.
|
|
|
|
|
If FORM is a lambda or a macro, byte-compile it as a function."
|
|
|
|
|
(displaying-byte-compile-warnings
|
|
|
|
|
(byte-compile-close-variables
|
2012-06-28 03:31:27 +00:00
|
|
|
|
(let* ((lexical-binding lexical-binding)
|
|
|
|
|
(fun (if (symbolp form)
|
2014-01-06 23:34:05 +00:00
|
|
|
|
(symbol-function form)
|
1992-07-10 22:06:47 +00:00
|
|
|
|
form))
|
|
|
|
|
(macro (eq (car-safe fun) 'macro)))
|
|
|
|
|
(if macro
|
|
|
|
|
(setq fun (cdr fun)))
|
2012-07-04 14:42:59 +00:00
|
|
|
|
(cond
|
|
|
|
|
;; Up until Emacs-24.1, byte-compile silently did nothing when asked to
|
|
|
|
|
;; compile something invalid. So let's tune down the complaint from an
|
|
|
|
|
;; error to a simple message for the known case where signaling an error
|
|
|
|
|
;; causes problems.
|
|
|
|
|
((byte-code-function-p fun)
|
|
|
|
|
(message "Function %s is already compiled"
|
|
|
|
|
(if (symbolp form) form "provided"))
|
|
|
|
|
fun)
|
|
|
|
|
(t
|
|
|
|
|
(when (symbolp form)
|
|
|
|
|
(unless (memq (car-safe fun) '(closure lambda))
|
|
|
|
|
(error "Don't know how to compile %S" fun))
|
2012-11-20 19:05:20 +00:00
|
|
|
|
(setq lexical-binding (eq (car fun) 'closure))
|
|
|
|
|
(setq fun (byte-compile--reify-function fun)))
|
2012-07-04 14:42:59 +00:00
|
|
|
|
(unless (eq (car-safe fun) 'lambda)
|
2012-06-28 03:31:27 +00:00
|
|
|
|
(error "Don't know how to compile %S" fun))
|
2012-07-04 14:42:59 +00:00
|
|
|
|
;; Expand macros.
|
|
|
|
|
(setq fun (byte-compile-preprocess fun))
|
|
|
|
|
;; Get rid of the `function' quote added by the `lambda' macro.
|
|
|
|
|
(if (eq (car-safe fun) 'function) (setq fun (cadr fun)))
|
|
|
|
|
(setq fun (byte-compile-lambda fun))
|
|
|
|
|
(if macro (push 'macro fun))
|
|
|
|
|
(if (symbolp form)
|
|
|
|
|
(fset form fun)
|
|
|
|
|
fun)))))))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
|
|
|
|
(defun byte-compile-sexp (sexp)
|
|
|
|
|
"Compile and return SEXP."
|
|
|
|
|
(displaying-byte-compile-warnings
|
|
|
|
|
(byte-compile-close-variables
|
Try and fix w32 build; misc cleanup.
* lisp/subr.el (apply-partially): Move from subr.el; don't use lexical-let.
(eval-after-load): Obey lexical-binding.
* lisp/simple.el (apply-partially): Move to subr.el.
* lisp/makefile.w32-in: Match changes in Makefile.in.
(BIG_STACK_DEPTH, BIG_STACK_OPTS, BYTE_COMPILE_FLAGS): New vars.
(.el.elc, compile-CMD, compile-SH, compile-always-CMD)
(compile-always-SH, compile-calc-CMD, compile-calc-SH): Use them.
(COMPILE_FIRST): Add pcase, macroexp, and cconv.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Silence warning about
calling CL's `compiler-macroexpand'.
* lisp/emacs-lisp/bytecomp.el (byte-compile-preprocess): New function.
(byte-compile-initial-macro-environment)
(byte-compile-toplevel-file-form, byte-compile, byte-compile-sexp): Use it.
(byte-compile-eval, byte-compile-eval-before-compile): Obey lexical-binding.
(byte-compile--for-effect): Rename from `for-effect'.
(display-call-tree): Use case.
* lisp/emacs-lisp/byte-opt.el (for-effect): Don't declare as dynamic.
(byte-optimize-form-code-walker, byte-optimize-form):
Revert to old arg name.
* lisp/Makefile.in (BYTE_COMPILE_FLAGS): New var.
(compile-onefile, .el.elc, compile-calc, recompile): Use it.
2011-03-12 03:32:43 +00:00
|
|
|
|
(byte-compile-top-level (byte-compile-preprocess sexp)))))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
2001-10-12 14:20:14 +00:00
|
|
|
|
(defun byte-compile-check-lambda-list (list)
|
|
|
|
|
"Check lambda-list LIST for errors."
|
|
|
|
|
(let (vars)
|
|
|
|
|
(while list
|
|
|
|
|
(let ((arg (car list)))
|
2002-05-28 17:40:47 +00:00
|
|
|
|
(when (symbolp arg)
|
|
|
|
|
(byte-compile-set-symbol-position arg))
|
2001-10-18 21:05:16 +00:00
|
|
|
|
(cond ((or (not (symbolp arg))
|
2012-06-07 19:25:48 +00:00
|
|
|
|
(macroexp--const-symbol-p arg t))
|
2001-10-12 14:20:14 +00:00
|
|
|
|
(error "Invalid lambda variable %s" arg))
|
|
|
|
|
((eq arg '&rest)
|
|
|
|
|
(unless (cdr list)
|
|
|
|
|
(error "&rest without variable name"))
|
|
|
|
|
(when (cddr list)
|
|
|
|
|
(error "Garbage following &rest VAR in lambda-list")))
|
|
|
|
|
((eq arg '&optional)
|
|
|
|
|
(unless (cdr list)
|
|
|
|
|
(error "Variable name missing after &optional")))
|
|
|
|
|
((memq arg vars)
|
2001-10-12 21:59:38 +00:00
|
|
|
|
(byte-compile-warn "repeated variable %s in lambda-list" arg))
|
2001-10-18 21:05:16 +00:00
|
|
|
|
(t
|
2001-10-12 14:20:14 +00:00
|
|
|
|
(push arg vars))))
|
|
|
|
|
(setq list (cdr list)))))
|
|
|
|
|
|
|
|
|
|
|
* lisp/emacs-lisp/byte-lexbind.el: Delete.
* lisp/emacs-lisp/bytecomp.el (byte-compile-current-heap-environment)
(byte-compile-current-num-closures): Remove vars.
(byte-vec-ref, byte-vec-set): Remove byte codes.
(byte-compile-arglist-vars, byte-compile-make-lambda-lexenv): Move from
byte-lexbind.el.
(byte-compile-lambda): Never build a closure.
(byte-compile-closure-code-p, byte-compile-make-closure): Remove.
(byte-compile-closure): Simplify.
(byte-compile-top-level): Don't mess with heap environments.
(byte-compile-dynamic-variable-bind): Always maintain
byte-compile-bound-variables.
(byte-compile-variable-ref, byte-compile-variable-set): Always just use
the stack for lexical vars.
(byte-compile-push-binding-init): Simplify.
(byte-compile-not-lexical-var-p): New function, moved from cconv.el.
(byte-compile-bind, byte-compile-unbind): New functions, moved and
simplified from byte-lexbind.el.
(byte-compile-let, byte-compile-let*): Simplify.
(byte-compile-condition-case): Don't add :fun-body to the bound vars.
(byte-compile-defmacro): Simplify.
* lisp/emacs-lisp/byte-opt.el (byte-compile-side-effect-free-ops)
(byte-optimize-lapcode): Remove byte-vec-ref and byte-vec-set.
* lisp/emacs-lisp/cconv.el (cconv-not-lexical-var-p): Remove.
(cconv-freevars, cconv-analyse-function, cconv-analyse-form):
Use byte-compile-not-lexical-var-p instead.
* src/bytecode.c (Bvec_ref, Bvec_set): Remove.
(exec_byte_code): Don't handle them.
* lisp/help-fns.el (describe-function-1): Fix paren typo.
2011-02-12 05:53:30 +00:00
|
|
|
|
(defun byte-compile-arglist-vars (arglist)
|
|
|
|
|
"Return a list of the variables in the lambda argument list ARGLIST."
|
|
|
|
|
(remq '&rest (remq '&optional arglist)))
|
|
|
|
|
|
2013-06-05 02:35:40 +00:00
|
|
|
|
(defun byte-compile-make-lambda-lexenv (args)
|
* lisp/emacs-lisp/byte-lexbind.el: Delete.
* lisp/emacs-lisp/bytecomp.el (byte-compile-current-heap-environment)
(byte-compile-current-num-closures): Remove vars.
(byte-vec-ref, byte-vec-set): Remove byte codes.
(byte-compile-arglist-vars, byte-compile-make-lambda-lexenv): Move from
byte-lexbind.el.
(byte-compile-lambda): Never build a closure.
(byte-compile-closure-code-p, byte-compile-make-closure): Remove.
(byte-compile-closure): Simplify.
(byte-compile-top-level): Don't mess with heap environments.
(byte-compile-dynamic-variable-bind): Always maintain
byte-compile-bound-variables.
(byte-compile-variable-ref, byte-compile-variable-set): Always just use
the stack for lexical vars.
(byte-compile-push-binding-init): Simplify.
(byte-compile-not-lexical-var-p): New function, moved from cconv.el.
(byte-compile-bind, byte-compile-unbind): New functions, moved and
simplified from byte-lexbind.el.
(byte-compile-let, byte-compile-let*): Simplify.
(byte-compile-condition-case): Don't add :fun-body to the bound vars.
(byte-compile-defmacro): Simplify.
* lisp/emacs-lisp/byte-opt.el (byte-compile-side-effect-free-ops)
(byte-optimize-lapcode): Remove byte-vec-ref and byte-vec-set.
* lisp/emacs-lisp/cconv.el (cconv-not-lexical-var-p): Remove.
(cconv-freevars, cconv-analyse-function, cconv-analyse-form):
Use byte-compile-not-lexical-var-p instead.
* src/bytecode.c (Bvec_ref, Bvec_set): Remove.
(exec_byte_code): Don't handle them.
* lisp/help-fns.el (describe-function-1): Fix paren typo.
2011-02-12 05:53:30 +00:00
|
|
|
|
"Return a new lexical environment for a lambda expression FORM."
|
2013-06-05 02:35:40 +00:00
|
|
|
|
(let* ((lexenv nil)
|
|
|
|
|
(stackpos 0))
|
|
|
|
|
;; Add entries for each argument.
|
|
|
|
|
(dolist (arg args)
|
|
|
|
|
(push (cons arg stackpos) lexenv)
|
|
|
|
|
(setq stackpos (1+ stackpos)))
|
|
|
|
|
;; Return the new lexical environment.
|
|
|
|
|
lexenv))
|
2010-06-13 20:36:17 +00:00
|
|
|
|
|
2011-03-06 04:48:17 +00:00
|
|
|
|
(defun byte-compile-make-args-desc (arglist)
|
|
|
|
|
(let ((mandatory 0)
|
|
|
|
|
nonrest (rest 0))
|
|
|
|
|
(while (and arglist (not (memq (car arglist) '(&optional &rest))))
|
|
|
|
|
(setq mandatory (1+ mandatory))
|
|
|
|
|
(setq arglist (cdr arglist)))
|
|
|
|
|
(setq nonrest mandatory)
|
|
|
|
|
(when (eq (car arglist) '&optional)
|
|
|
|
|
(setq arglist (cdr arglist))
|
|
|
|
|
(while (and arglist (not (eq (car arglist) '&rest)))
|
|
|
|
|
(setq nonrest (1+ nonrest))
|
|
|
|
|
(setq arglist (cdr arglist))))
|
|
|
|
|
(when arglist
|
|
|
|
|
(setq rest 1))
|
|
|
|
|
(if (> mandatory 127)
|
|
|
|
|
(byte-compile-report-error "Too many (>127) mandatory arguments")
|
|
|
|
|
(logior mandatory
|
|
|
|
|
(lsh nonrest 8)
|
|
|
|
|
(lsh rest 7)))))
|
|
|
|
|
|
2012-05-30 03:59:42 +00:00
|
|
|
|
|
2011-03-16 20:08:39 +00:00
|
|
|
|
(defun byte-compile-lambda (fun &optional add-lambda reserved-csts)
|
2012-05-30 03:59:42 +00:00
|
|
|
|
"Byte-compile a lambda-expression and return a valid function.
|
|
|
|
|
The value is usually a compiled function but may be the original
|
|
|
|
|
lambda-expression.
|
|
|
|
|
When ADD-LAMBDA is non-nil, the symbol `lambda' is added as head
|
|
|
|
|
of the list FUN and `byte-compile-set-symbol-position' is not called.
|
|
|
|
|
Use this feature to avoid calling `byte-compile-set-symbol-position'
|
|
|
|
|
for symbols generated by the byte compiler itself."
|
2005-10-23 07:33:45 +00:00
|
|
|
|
(if add-lambda
|
2011-03-16 20:08:39 +00:00
|
|
|
|
(setq fun (cons 'lambda fun))
|
|
|
|
|
(unless (eq 'lambda (car-safe fun))
|
|
|
|
|
(error "Not a lambda list: %S" fun))
|
2005-10-23 07:33:45 +00:00
|
|
|
|
(byte-compile-set-symbol-position 'lambda))
|
2011-03-16 20:08:39 +00:00
|
|
|
|
(byte-compile-check-lambda-list (nth 1 fun))
|
|
|
|
|
(let* ((arglist (nth 1 fun))
|
2013-06-05 02:35:40 +00:00
|
|
|
|
(arglistvars (byte-compile-arglist-vars arglist))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(byte-compile-bound-variables
|
2013-06-05 02:35:40 +00:00
|
|
|
|
(append (if (not lexical-binding) arglistvars)
|
* lisp/emacs-lisp/byte-lexbind.el: Delete.
* lisp/emacs-lisp/bytecomp.el (byte-compile-current-heap-environment)
(byte-compile-current-num-closures): Remove vars.
(byte-vec-ref, byte-vec-set): Remove byte codes.
(byte-compile-arglist-vars, byte-compile-make-lambda-lexenv): Move from
byte-lexbind.el.
(byte-compile-lambda): Never build a closure.
(byte-compile-closure-code-p, byte-compile-make-closure): Remove.
(byte-compile-closure): Simplify.
(byte-compile-top-level): Don't mess with heap environments.
(byte-compile-dynamic-variable-bind): Always maintain
byte-compile-bound-variables.
(byte-compile-variable-ref, byte-compile-variable-set): Always just use
the stack for lexical vars.
(byte-compile-push-binding-init): Simplify.
(byte-compile-not-lexical-var-p): New function, moved from cconv.el.
(byte-compile-bind, byte-compile-unbind): New functions, moved and
simplified from byte-lexbind.el.
(byte-compile-let, byte-compile-let*): Simplify.
(byte-compile-condition-case): Don't add :fun-body to the bound vars.
(byte-compile-defmacro): Simplify.
* lisp/emacs-lisp/byte-opt.el (byte-compile-side-effect-free-ops)
(byte-optimize-lapcode): Remove byte-vec-ref and byte-vec-set.
* lisp/emacs-lisp/cconv.el (cconv-not-lexical-var-p): Remove.
(cconv-freevars, cconv-analyse-function, cconv-analyse-form):
Use byte-compile-not-lexical-var-p instead.
* src/bytecode.c (Bvec_ref, Bvec_set): Remove.
(exec_byte_code): Don't handle them.
* lisp/help-fns.el (describe-function-1): Fix paren typo.
2011-02-12 05:53:30 +00:00
|
|
|
|
byte-compile-bound-variables))
|
2011-03-16 20:08:39 +00:00
|
|
|
|
(body (cdr (cdr fun)))
|
|
|
|
|
(doc (if (stringp (car body))
|
|
|
|
|
(prog1 (car body)
|
|
|
|
|
;; Discard the doc string
|
|
|
|
|
;; unless it is the last element of the body.
|
|
|
|
|
(if (cdr body)
|
|
|
|
|
(setq body (cdr body))))))
|
|
|
|
|
(int (assq 'interactive body)))
|
2003-04-12 20:28:10 +00:00
|
|
|
|
;; Process the interactive spec.
|
2011-03-16 20:08:39 +00:00
|
|
|
|
(when int
|
2003-04-12 20:28:10 +00:00
|
|
|
|
(byte-compile-set-symbol-position 'interactive)
|
|
|
|
|
;; Skip (interactive) if it is in front (the most usual location).
|
2011-03-16 20:08:39 +00:00
|
|
|
|
(if (eq int (car body))
|
|
|
|
|
(setq body (cdr body)))
|
|
|
|
|
(cond ((consp (cdr int))
|
|
|
|
|
(if (cdr (cdr int))
|
2003-04-12 20:28:10 +00:00
|
|
|
|
(byte-compile-warn "malformed interactive spec: %s"
|
2011-03-16 20:08:39 +00:00
|
|
|
|
(prin1-to-string int)))
|
2004-04-16 12:51:06 +00:00
|
|
|
|
;; If the interactive spec is a call to `list', don't
|
|
|
|
|
;; compile it, because `call-interactively' looks at the
|
|
|
|
|
;; args of `list'. Actually, compile it to get warnings,
|
|
|
|
|
;; but don't use the result.
|
2011-03-16 20:08:39 +00:00
|
|
|
|
(let* ((form (nth 1 int))
|
2011-03-01 05:03:24 +00:00
|
|
|
|
(newform (byte-compile-top-level form)))
|
2003-04-12 20:28:10 +00:00
|
|
|
|
(while (memq (car-safe form) '(let let* progn save-excursion))
|
|
|
|
|
(while (consp (cdr form))
|
|
|
|
|
(setq form (cdr form)))
|
|
|
|
|
(setq form (car form)))
|
2011-03-01 05:03:24 +00:00
|
|
|
|
(if (and (eq (car-safe form) 'list)
|
2011-12-19 06:21:24 +00:00
|
|
|
|
;; The spec is evalled in callint.c in dynamic-scoping
|
2011-03-01 05:03:24 +00:00
|
|
|
|
;; mode, so just leaving the form unchanged would mean
|
|
|
|
|
;; it won't be eval'd in the right mode.
|
|
|
|
|
(not lexical-binding))
|
|
|
|
|
nil
|
2011-03-16 20:08:39 +00:00
|
|
|
|
(setq int `(interactive ,newform)))))
|
|
|
|
|
((cdr int)
|
2003-04-12 20:28:10 +00:00
|
|
|
|
(byte-compile-warn "malformed interactive spec: %s"
|
2011-03-16 20:08:39 +00:00
|
|
|
|
(prin1-to-string int)))))
|
2003-04-12 20:28:10 +00:00
|
|
|
|
;; Process the body.
|
2011-03-11 20:04:22 +00:00
|
|
|
|
(let ((compiled
|
2011-03-16 20:08:39 +00:00
|
|
|
|
(byte-compile-top-level (cons 'progn body) nil 'lambda
|
2011-03-11 20:04:22 +00:00
|
|
|
|
;; If doing lexical binding, push a new
|
|
|
|
|
;; lexical environment containing just the
|
|
|
|
|
;; args (since lambda expressions should be
|
|
|
|
|
;; closed by now).
|
|
|
|
|
(and lexical-binding
|
2013-06-05 02:35:40 +00:00
|
|
|
|
(byte-compile-make-lambda-lexenv
|
|
|
|
|
arglistvars))
|
2011-03-11 20:04:22 +00:00
|
|
|
|
reserved-csts)))
|
2003-04-12 20:28:10 +00:00
|
|
|
|
;; Build the actual byte-coded function.
|
2012-06-10 13:28:26 +00:00
|
|
|
|
(cl-assert (eq 'byte-code (car-safe compiled)))
|
2012-05-30 03:59:42 +00:00
|
|
|
|
(apply #'make-byte-code
|
|
|
|
|
(if lexical-binding
|
|
|
|
|
(byte-compile-make-args-desc arglist)
|
|
|
|
|
arglist)
|
|
|
|
|
(append
|
|
|
|
|
;; byte-string, constants-vector, stack depth
|
|
|
|
|
(cdr compiled)
|
|
|
|
|
;; optionally, the doc string.
|
|
|
|
|
(cond (lexical-binding
|
|
|
|
|
(list (help-add-fundoc-usage doc arglist)))
|
|
|
|
|
((or doc int)
|
|
|
|
|
(list doc)))
|
|
|
|
|
;; optionally, the interactive spec.
|
|
|
|
|
(if int
|
|
|
|
|
(list (nth 1 int))))))))
|
2010-06-13 20:36:17 +00:00
|
|
|
|
|
Get rid of funvec.
* lisp/emacs-lisp/bytecomp.el (byte-compile-lapcode): Handle new form of
`byte-constant'.
(byte-compile-close-variables, displaying-byte-compile-warnings):
Add edebug spec.
(byte-compile-toplevel-file-form): New fun, split out of
byte-compile-file-form.
(byte-compile-from-buffer): Use it to avoid applying cconv
multiple times.
(byte-compile): Only strip `function' if it's present.
(byte-compile-lambda): Add `reserved-csts' argument.
Use new lexenv arg of byte-compile-top-level.
(byte-compile-reserved-constants): New var.
(byte-compile-constants-vector): Obey it.
(byte-compile-constants-vector): Handle new `byte-constant' form.
(byte-compile-top-level): Add args `lexenv' and `reserved-csts'.
(byte-compile-form): Don't check callargs here.
(byte-compile-normal-call): Do it here instead.
(byte-compile-push-unknown-constant)
(byte-compile-resolve-unknown-constant): Remove, unused.
(byte-compile-make-closure): Use `make-byte-code' rather than `curry',
putting the environment into the "constant" pool.
(byte-compile-get-closed-var): Use special byte-constant.
* lisp/emacs-lisp/byte-opt.el (byte-optimize-form-code-walker): Handle new
intermediate special form `internal-make-vector'.
(byte-optimize-lapcode): Handle new form of `byte-constant'.
* lisp/help-fns.el (describe-function-1): Don't handle funvecs.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Only convert quote to
function if the content is a lambda expression, not if it's a closure.
* emacs-lisp/eieio-come.el: Remove.
* lisp/emacs-lisp/eieio.el: Don't require eieio-comp.
(defmethod): Do a bit more work to find the body and wrap it into
a function before passing it to eieio-defmethod.
(eieio-defmethod): New arg `code' for it.
* lisp/emacs-lisp/debug.el (debugger-setup-buffer): Don't hide things in
debugger backtrace.
* lisp/emacs-lisp/cl-extra.el (cl-macroexpand-all): Use backquotes, and be
more careful when quoting a function value.
* lisp/emacs-lisp/cconv.el (cconv-freevars): Accept defvar/defconst.
(cconv-closure-convert-rec): Catch stray `internal-make-closure'.
* lisp/Makefile.in (COMPILE_FIRST): Compile pcase and cconv early.
* src/eval.c (Qcurry): Remove.
(funcall_funvec): Remove.
(funcall_lambda): Move new byte-code handling to reduce impact.
Treat all args as lexical in the case of lexbind.
(Fcurry): Remove.
* src/data.c (Qfunction_vector): Remove.
(Ffunvecp): Remove.
* src/lread.c (read1): Revert to calling make_byte_code here.
(read_vector): Don't call make_byte_code any more.
* src/lisp.h (enum pvec_type): Rename back to PVEC_COMPILED.
(XSETCOMPILED): Rename back from XSETFUNVEC.
(FUNVEC_SIZE): Remove.
(FUNVEC_COMPILED_TAG_P, FUNVEC_COMPILED_P): Remove.
(COMPILEDP): Rename back from FUNVECP.
* src/fns.c (Felt): Remove unexplained FUNVEC check.
* src/doc.c (Fdocumentation): Don't handle funvec.
* src/alloc.c (make_funvec, Ffunvec): Remove.
* doc/lispref/vol2.texi (Top):
* doc/lispref/vol1.texi (Top):
* doc/lispref/objects.texi (Programming Types, Funvec Type, Type Predicates):
* doc/lispref/functions.texi (Functions, What Is a Function, FunctionCurrying):
* doc/lispref/elisp.texi (Top): Remove mentions of funvec and curry.
2011-02-25 03:27:45 +00:00
|
|
|
|
(defvar byte-compile-reserved-constants 0)
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
|
|
|
|
(defun byte-compile-constants-vector ()
|
|
|
|
|
;; Builds the constants-vector from the current variables and constants.
|
|
|
|
|
;; This modifies the constants from (const . nil) to (const . offset).
|
|
|
|
|
;; To keep the byte-codes to look up the vector as short as possible:
|
|
|
|
|
;; First 6 elements are vars, as there are one-byte varref codes for those.
|
|
|
|
|
;; Next up to byte-constant-limit are constants, still with one-byte codes.
|
|
|
|
|
;; Next variables again, to get 2-byte codes for variable lookup.
|
|
|
|
|
;; The rest of the constants and variables need 3-byte byte-codes.
|
Get rid of funvec.
* lisp/emacs-lisp/bytecomp.el (byte-compile-lapcode): Handle new form of
`byte-constant'.
(byte-compile-close-variables, displaying-byte-compile-warnings):
Add edebug spec.
(byte-compile-toplevel-file-form): New fun, split out of
byte-compile-file-form.
(byte-compile-from-buffer): Use it to avoid applying cconv
multiple times.
(byte-compile): Only strip `function' if it's present.
(byte-compile-lambda): Add `reserved-csts' argument.
Use new lexenv arg of byte-compile-top-level.
(byte-compile-reserved-constants): New var.
(byte-compile-constants-vector): Obey it.
(byte-compile-constants-vector): Handle new `byte-constant' form.
(byte-compile-top-level): Add args `lexenv' and `reserved-csts'.
(byte-compile-form): Don't check callargs here.
(byte-compile-normal-call): Do it here instead.
(byte-compile-push-unknown-constant)
(byte-compile-resolve-unknown-constant): Remove, unused.
(byte-compile-make-closure): Use `make-byte-code' rather than `curry',
putting the environment into the "constant" pool.
(byte-compile-get-closed-var): Use special byte-constant.
* lisp/emacs-lisp/byte-opt.el (byte-optimize-form-code-walker): Handle new
intermediate special form `internal-make-vector'.
(byte-optimize-lapcode): Handle new form of `byte-constant'.
* lisp/help-fns.el (describe-function-1): Don't handle funvecs.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Only convert quote to
function if the content is a lambda expression, not if it's a closure.
* emacs-lisp/eieio-come.el: Remove.
* lisp/emacs-lisp/eieio.el: Don't require eieio-comp.
(defmethod): Do a bit more work to find the body and wrap it into
a function before passing it to eieio-defmethod.
(eieio-defmethod): New arg `code' for it.
* lisp/emacs-lisp/debug.el (debugger-setup-buffer): Don't hide things in
debugger backtrace.
* lisp/emacs-lisp/cl-extra.el (cl-macroexpand-all): Use backquotes, and be
more careful when quoting a function value.
* lisp/emacs-lisp/cconv.el (cconv-freevars): Accept defvar/defconst.
(cconv-closure-convert-rec): Catch stray `internal-make-closure'.
* lisp/Makefile.in (COMPILE_FIRST): Compile pcase and cconv early.
* src/eval.c (Qcurry): Remove.
(funcall_funvec): Remove.
(funcall_lambda): Move new byte-code handling to reduce impact.
Treat all args as lexical in the case of lexbind.
(Fcurry): Remove.
* src/data.c (Qfunction_vector): Remove.
(Ffunvecp): Remove.
* src/lread.c (read1): Revert to calling make_byte_code here.
(read_vector): Don't call make_byte_code any more.
* src/lisp.h (enum pvec_type): Rename back to PVEC_COMPILED.
(XSETCOMPILED): Rename back from XSETFUNVEC.
(FUNVEC_SIZE): Remove.
(FUNVEC_COMPILED_TAG_P, FUNVEC_COMPILED_P): Remove.
(COMPILEDP): Rename back from FUNVECP.
* src/fns.c (Felt): Remove unexplained FUNVEC check.
* src/doc.c (Fdocumentation): Don't handle funvec.
* src/alloc.c (make_funvec, Ffunvec): Remove.
* doc/lispref/vol2.texi (Top):
* doc/lispref/vol1.texi (Top):
* doc/lispref/objects.texi (Programming Types, Funvec Type, Type Predicates):
* doc/lispref/functions.texi (Functions, What Is a Function, FunctionCurrying):
* doc/lispref/elisp.texi (Top): Remove mentions of funvec and curry.
2011-02-25 03:27:45 +00:00
|
|
|
|
(let* ((i (1- byte-compile-reserved-constants))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(rest (nreverse byte-compile-variables)) ; nreverse because the first
|
|
|
|
|
(other (nreverse byte-compile-constants)) ; vars often are used most.
|
|
|
|
|
ret tmp
|
|
|
|
|
(limits '(5 ; Use the 1-byte varref codes,
|
|
|
|
|
63 ; 1-constlim ; 1-byte byte-constant codes,
|
|
|
|
|
255 ; 2-byte varref codes,
|
2012-03-26 19:10:00 +00:00
|
|
|
|
65535 ; 3-byte codes for the rest.
|
|
|
|
|
65535)) ; twice since we step when we swap.
|
1992-07-10 22:06:47 +00:00
|
|
|
|
limit)
|
|
|
|
|
(while (or rest other)
|
|
|
|
|
(setq limit (car limits))
|
Get rid of funvec.
* lisp/emacs-lisp/bytecomp.el (byte-compile-lapcode): Handle new form of
`byte-constant'.
(byte-compile-close-variables, displaying-byte-compile-warnings):
Add edebug spec.
(byte-compile-toplevel-file-form): New fun, split out of
byte-compile-file-form.
(byte-compile-from-buffer): Use it to avoid applying cconv
multiple times.
(byte-compile): Only strip `function' if it's present.
(byte-compile-lambda): Add `reserved-csts' argument.
Use new lexenv arg of byte-compile-top-level.
(byte-compile-reserved-constants): New var.
(byte-compile-constants-vector): Obey it.
(byte-compile-constants-vector): Handle new `byte-constant' form.
(byte-compile-top-level): Add args `lexenv' and `reserved-csts'.
(byte-compile-form): Don't check callargs here.
(byte-compile-normal-call): Do it here instead.
(byte-compile-push-unknown-constant)
(byte-compile-resolve-unknown-constant): Remove, unused.
(byte-compile-make-closure): Use `make-byte-code' rather than `curry',
putting the environment into the "constant" pool.
(byte-compile-get-closed-var): Use special byte-constant.
* lisp/emacs-lisp/byte-opt.el (byte-optimize-form-code-walker): Handle new
intermediate special form `internal-make-vector'.
(byte-optimize-lapcode): Handle new form of `byte-constant'.
* lisp/help-fns.el (describe-function-1): Don't handle funvecs.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Only convert quote to
function if the content is a lambda expression, not if it's a closure.
* emacs-lisp/eieio-come.el: Remove.
* lisp/emacs-lisp/eieio.el: Don't require eieio-comp.
(defmethod): Do a bit more work to find the body and wrap it into
a function before passing it to eieio-defmethod.
(eieio-defmethod): New arg `code' for it.
* lisp/emacs-lisp/debug.el (debugger-setup-buffer): Don't hide things in
debugger backtrace.
* lisp/emacs-lisp/cl-extra.el (cl-macroexpand-all): Use backquotes, and be
more careful when quoting a function value.
* lisp/emacs-lisp/cconv.el (cconv-freevars): Accept defvar/defconst.
(cconv-closure-convert-rec): Catch stray `internal-make-closure'.
* lisp/Makefile.in (COMPILE_FIRST): Compile pcase and cconv early.
* src/eval.c (Qcurry): Remove.
(funcall_funvec): Remove.
(funcall_lambda): Move new byte-code handling to reduce impact.
Treat all args as lexical in the case of lexbind.
(Fcurry): Remove.
* src/data.c (Qfunction_vector): Remove.
(Ffunvecp): Remove.
* src/lread.c (read1): Revert to calling make_byte_code here.
(read_vector): Don't call make_byte_code any more.
* src/lisp.h (enum pvec_type): Rename back to PVEC_COMPILED.
(XSETCOMPILED): Rename back from XSETFUNVEC.
(FUNVEC_SIZE): Remove.
(FUNVEC_COMPILED_TAG_P, FUNVEC_COMPILED_P): Remove.
(COMPILEDP): Rename back from FUNVECP.
* src/fns.c (Felt): Remove unexplained FUNVEC check.
* src/doc.c (Fdocumentation): Don't handle funvec.
* src/alloc.c (make_funvec, Ffunvec): Remove.
* doc/lispref/vol2.texi (Top):
* doc/lispref/vol1.texi (Top):
* doc/lispref/objects.texi (Programming Types, Funvec Type, Type Predicates):
* doc/lispref/functions.texi (Functions, What Is a Function, FunctionCurrying):
* doc/lispref/elisp.texi (Top): Remove mentions of funvec and curry.
2011-02-25 03:27:45 +00:00
|
|
|
|
(while (and rest (< i limit))
|
|
|
|
|
(cond
|
|
|
|
|
((numberp (car rest))
|
2012-06-10 13:28:26 +00:00
|
|
|
|
(cl-assert (< (car rest) byte-compile-reserved-constants)))
|
Get rid of funvec.
* lisp/emacs-lisp/bytecomp.el (byte-compile-lapcode): Handle new form of
`byte-constant'.
(byte-compile-close-variables, displaying-byte-compile-warnings):
Add edebug spec.
(byte-compile-toplevel-file-form): New fun, split out of
byte-compile-file-form.
(byte-compile-from-buffer): Use it to avoid applying cconv
multiple times.
(byte-compile): Only strip `function' if it's present.
(byte-compile-lambda): Add `reserved-csts' argument.
Use new lexenv arg of byte-compile-top-level.
(byte-compile-reserved-constants): New var.
(byte-compile-constants-vector): Obey it.
(byte-compile-constants-vector): Handle new `byte-constant' form.
(byte-compile-top-level): Add args `lexenv' and `reserved-csts'.
(byte-compile-form): Don't check callargs here.
(byte-compile-normal-call): Do it here instead.
(byte-compile-push-unknown-constant)
(byte-compile-resolve-unknown-constant): Remove, unused.
(byte-compile-make-closure): Use `make-byte-code' rather than `curry',
putting the environment into the "constant" pool.
(byte-compile-get-closed-var): Use special byte-constant.
* lisp/emacs-lisp/byte-opt.el (byte-optimize-form-code-walker): Handle new
intermediate special form `internal-make-vector'.
(byte-optimize-lapcode): Handle new form of `byte-constant'.
* lisp/help-fns.el (describe-function-1): Don't handle funvecs.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Only convert quote to
function if the content is a lambda expression, not if it's a closure.
* emacs-lisp/eieio-come.el: Remove.
* lisp/emacs-lisp/eieio.el: Don't require eieio-comp.
(defmethod): Do a bit more work to find the body and wrap it into
a function before passing it to eieio-defmethod.
(eieio-defmethod): New arg `code' for it.
* lisp/emacs-lisp/debug.el (debugger-setup-buffer): Don't hide things in
debugger backtrace.
* lisp/emacs-lisp/cl-extra.el (cl-macroexpand-all): Use backquotes, and be
more careful when quoting a function value.
* lisp/emacs-lisp/cconv.el (cconv-freevars): Accept defvar/defconst.
(cconv-closure-convert-rec): Catch stray `internal-make-closure'.
* lisp/Makefile.in (COMPILE_FIRST): Compile pcase and cconv early.
* src/eval.c (Qcurry): Remove.
(funcall_funvec): Remove.
(funcall_lambda): Move new byte-code handling to reduce impact.
Treat all args as lexical in the case of lexbind.
(Fcurry): Remove.
* src/data.c (Qfunction_vector): Remove.
(Ffunvecp): Remove.
* src/lread.c (read1): Revert to calling make_byte_code here.
(read_vector): Don't call make_byte_code any more.
* src/lisp.h (enum pvec_type): Rename back to PVEC_COMPILED.
(XSETCOMPILED): Rename back from XSETFUNVEC.
(FUNVEC_SIZE): Remove.
(FUNVEC_COMPILED_TAG_P, FUNVEC_COMPILED_P): Remove.
(COMPILEDP): Rename back from FUNVECP.
* src/fns.c (Felt): Remove unexplained FUNVEC check.
* src/doc.c (Fdocumentation): Don't handle funvec.
* src/alloc.c (make_funvec, Ffunvec): Remove.
* doc/lispref/vol2.texi (Top):
* doc/lispref/vol1.texi (Top):
* doc/lispref/objects.texi (Programming Types, Funvec Type, Type Predicates):
* doc/lispref/functions.texi (Functions, What Is a Function, FunctionCurrying):
* doc/lispref/elisp.texi (Top): Remove mentions of funvec and curry.
2011-02-25 03:27:45 +00:00
|
|
|
|
((setq tmp (assq (car (car rest)) ret))
|
|
|
|
|
(setcdr (car rest) (cdr tmp)))
|
|
|
|
|
(t
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(setcdr (car rest) (setq i (1+ i)))
|
Get rid of funvec.
* lisp/emacs-lisp/bytecomp.el (byte-compile-lapcode): Handle new form of
`byte-constant'.
(byte-compile-close-variables, displaying-byte-compile-warnings):
Add edebug spec.
(byte-compile-toplevel-file-form): New fun, split out of
byte-compile-file-form.
(byte-compile-from-buffer): Use it to avoid applying cconv
multiple times.
(byte-compile): Only strip `function' if it's present.
(byte-compile-lambda): Add `reserved-csts' argument.
Use new lexenv arg of byte-compile-top-level.
(byte-compile-reserved-constants): New var.
(byte-compile-constants-vector): Obey it.
(byte-compile-constants-vector): Handle new `byte-constant' form.
(byte-compile-top-level): Add args `lexenv' and `reserved-csts'.
(byte-compile-form): Don't check callargs here.
(byte-compile-normal-call): Do it here instead.
(byte-compile-push-unknown-constant)
(byte-compile-resolve-unknown-constant): Remove, unused.
(byte-compile-make-closure): Use `make-byte-code' rather than `curry',
putting the environment into the "constant" pool.
(byte-compile-get-closed-var): Use special byte-constant.
* lisp/emacs-lisp/byte-opt.el (byte-optimize-form-code-walker): Handle new
intermediate special form `internal-make-vector'.
(byte-optimize-lapcode): Handle new form of `byte-constant'.
* lisp/help-fns.el (describe-function-1): Don't handle funvecs.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Only convert quote to
function if the content is a lambda expression, not if it's a closure.
* emacs-lisp/eieio-come.el: Remove.
* lisp/emacs-lisp/eieio.el: Don't require eieio-comp.
(defmethod): Do a bit more work to find the body and wrap it into
a function before passing it to eieio-defmethod.
(eieio-defmethod): New arg `code' for it.
* lisp/emacs-lisp/debug.el (debugger-setup-buffer): Don't hide things in
debugger backtrace.
* lisp/emacs-lisp/cl-extra.el (cl-macroexpand-all): Use backquotes, and be
more careful when quoting a function value.
* lisp/emacs-lisp/cconv.el (cconv-freevars): Accept defvar/defconst.
(cconv-closure-convert-rec): Catch stray `internal-make-closure'.
* lisp/Makefile.in (COMPILE_FIRST): Compile pcase and cconv early.
* src/eval.c (Qcurry): Remove.
(funcall_funvec): Remove.
(funcall_lambda): Move new byte-code handling to reduce impact.
Treat all args as lexical in the case of lexbind.
(Fcurry): Remove.
* src/data.c (Qfunction_vector): Remove.
(Ffunvecp): Remove.
* src/lread.c (read1): Revert to calling make_byte_code here.
(read_vector): Don't call make_byte_code any more.
* src/lisp.h (enum pvec_type): Rename back to PVEC_COMPILED.
(XSETCOMPILED): Rename back from XSETFUNVEC.
(FUNVEC_SIZE): Remove.
(FUNVEC_COMPILED_TAG_P, FUNVEC_COMPILED_P): Remove.
(COMPILEDP): Rename back from FUNVECP.
* src/fns.c (Felt): Remove unexplained FUNVEC check.
* src/doc.c (Fdocumentation): Don't handle funvec.
* src/alloc.c (make_funvec, Ffunvec): Remove.
* doc/lispref/vol2.texi (Top):
* doc/lispref/vol1.texi (Top):
* doc/lispref/objects.texi (Programming Types, Funvec Type, Type Predicates):
* doc/lispref/functions.texi (Functions, What Is a Function, FunctionCurrying):
* doc/lispref/elisp.texi (Top): Remove mentions of funvec and curry.
2011-02-25 03:27:45 +00:00
|
|
|
|
(setq ret (cons (car rest) ret))))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(setq rest (cdr rest)))
|
2012-03-26 19:10:00 +00:00
|
|
|
|
(setq limits (cdr limits) ;Step
|
|
|
|
|
rest (prog1 other ;&Swap.
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(setq other rest))))
|
|
|
|
|
(apply 'vector (nreverse (mapcar 'car ret)))))
|
|
|
|
|
|
|
|
|
|
;; Given an expression FORM, compile it and return an equivalent byte-code
|
|
|
|
|
;; expression (a call to the function byte-code).
|
Try and fix w32 build; misc cleanup.
* lisp/subr.el (apply-partially): Move from subr.el; don't use lexical-let.
(eval-after-load): Obey lexical-binding.
* lisp/simple.el (apply-partially): Move to subr.el.
* lisp/makefile.w32-in: Match changes in Makefile.in.
(BIG_STACK_DEPTH, BIG_STACK_OPTS, BYTE_COMPILE_FLAGS): New vars.
(.el.elc, compile-CMD, compile-SH, compile-always-CMD)
(compile-always-SH, compile-calc-CMD, compile-calc-SH): Use them.
(COMPILE_FIRST): Add pcase, macroexp, and cconv.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Silence warning about
calling CL's `compiler-macroexpand'.
* lisp/emacs-lisp/bytecomp.el (byte-compile-preprocess): New function.
(byte-compile-initial-macro-environment)
(byte-compile-toplevel-file-form, byte-compile, byte-compile-sexp): Use it.
(byte-compile-eval, byte-compile-eval-before-compile): Obey lexical-binding.
(byte-compile--for-effect): Rename from `for-effect'.
(display-call-tree): Use case.
* lisp/emacs-lisp/byte-opt.el (for-effect): Don't declare as dynamic.
(byte-optimize-form-code-walker, byte-optimize-form):
Revert to old arg name.
* lisp/Makefile.in (BYTE_COMPILE_FLAGS): New var.
(compile-onefile, .el.elc, compile-calc, recompile): Use it.
2011-03-12 03:32:43 +00:00
|
|
|
|
(defun byte-compile-top-level (form &optional for-effect output-type
|
Get rid of funvec.
* lisp/emacs-lisp/bytecomp.el (byte-compile-lapcode): Handle new form of
`byte-constant'.
(byte-compile-close-variables, displaying-byte-compile-warnings):
Add edebug spec.
(byte-compile-toplevel-file-form): New fun, split out of
byte-compile-file-form.
(byte-compile-from-buffer): Use it to avoid applying cconv
multiple times.
(byte-compile): Only strip `function' if it's present.
(byte-compile-lambda): Add `reserved-csts' argument.
Use new lexenv arg of byte-compile-top-level.
(byte-compile-reserved-constants): New var.
(byte-compile-constants-vector): Obey it.
(byte-compile-constants-vector): Handle new `byte-constant' form.
(byte-compile-top-level): Add args `lexenv' and `reserved-csts'.
(byte-compile-form): Don't check callargs here.
(byte-compile-normal-call): Do it here instead.
(byte-compile-push-unknown-constant)
(byte-compile-resolve-unknown-constant): Remove, unused.
(byte-compile-make-closure): Use `make-byte-code' rather than `curry',
putting the environment into the "constant" pool.
(byte-compile-get-closed-var): Use special byte-constant.
* lisp/emacs-lisp/byte-opt.el (byte-optimize-form-code-walker): Handle new
intermediate special form `internal-make-vector'.
(byte-optimize-lapcode): Handle new form of `byte-constant'.
* lisp/help-fns.el (describe-function-1): Don't handle funvecs.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Only convert quote to
function if the content is a lambda expression, not if it's a closure.
* emacs-lisp/eieio-come.el: Remove.
* lisp/emacs-lisp/eieio.el: Don't require eieio-comp.
(defmethod): Do a bit more work to find the body and wrap it into
a function before passing it to eieio-defmethod.
(eieio-defmethod): New arg `code' for it.
* lisp/emacs-lisp/debug.el (debugger-setup-buffer): Don't hide things in
debugger backtrace.
* lisp/emacs-lisp/cl-extra.el (cl-macroexpand-all): Use backquotes, and be
more careful when quoting a function value.
* lisp/emacs-lisp/cconv.el (cconv-freevars): Accept defvar/defconst.
(cconv-closure-convert-rec): Catch stray `internal-make-closure'.
* lisp/Makefile.in (COMPILE_FIRST): Compile pcase and cconv early.
* src/eval.c (Qcurry): Remove.
(funcall_funvec): Remove.
(funcall_lambda): Move new byte-code handling to reduce impact.
Treat all args as lexical in the case of lexbind.
(Fcurry): Remove.
* src/data.c (Qfunction_vector): Remove.
(Ffunvecp): Remove.
* src/lread.c (read1): Revert to calling make_byte_code here.
(read_vector): Don't call make_byte_code any more.
* src/lisp.h (enum pvec_type): Rename back to PVEC_COMPILED.
(XSETCOMPILED): Rename back from XSETFUNVEC.
(FUNVEC_SIZE): Remove.
(FUNVEC_COMPILED_TAG_P, FUNVEC_COMPILED_P): Remove.
(COMPILEDP): Rename back from FUNVECP.
* src/fns.c (Felt): Remove unexplained FUNVEC check.
* src/doc.c (Fdocumentation): Don't handle funvec.
* src/alloc.c (make_funvec, Ffunvec): Remove.
* doc/lispref/vol2.texi (Top):
* doc/lispref/vol1.texi (Top):
* doc/lispref/objects.texi (Programming Types, Funvec Type, Type Predicates):
* doc/lispref/functions.texi (Functions, What Is a Function, FunctionCurrying):
* doc/lispref/elisp.texi (Top): Remove mentions of funvec and curry.
2011-02-25 03:27:45 +00:00
|
|
|
|
lexenv reserved-csts)
|
1992-07-10 22:06:47 +00:00
|
|
|
|
;; OUTPUT-TYPE advises about how form is expected to be used:
|
|
|
|
|
;; 'eval or nil -> a single form,
|
|
|
|
|
;; 'progn or t -> a list of forms,
|
|
|
|
|
;; 'lambda -> body of a lambda,
|
|
|
|
|
;; 'file -> used at file-level.
|
Try and fix w32 build; misc cleanup.
* lisp/subr.el (apply-partially): Move from subr.el; don't use lexical-let.
(eval-after-load): Obey lexical-binding.
* lisp/simple.el (apply-partially): Move to subr.el.
* lisp/makefile.w32-in: Match changes in Makefile.in.
(BIG_STACK_DEPTH, BIG_STACK_OPTS, BYTE_COMPILE_FLAGS): New vars.
(.el.elc, compile-CMD, compile-SH, compile-always-CMD)
(compile-always-SH, compile-calc-CMD, compile-calc-SH): Use them.
(COMPILE_FIRST): Add pcase, macroexp, and cconv.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Silence warning about
calling CL's `compiler-macroexpand'.
* lisp/emacs-lisp/bytecomp.el (byte-compile-preprocess): New function.
(byte-compile-initial-macro-environment)
(byte-compile-toplevel-file-form, byte-compile, byte-compile-sexp): Use it.
(byte-compile-eval, byte-compile-eval-before-compile): Obey lexical-binding.
(byte-compile--for-effect): Rename from `for-effect'.
(display-call-tree): Use case.
* lisp/emacs-lisp/byte-opt.el (for-effect): Don't declare as dynamic.
(byte-optimize-form-code-walker, byte-optimize-form):
Revert to old arg name.
* lisp/Makefile.in (BYTE_COMPILE_FLAGS): New var.
(compile-onefile, .el.elc, compile-calc, recompile): Use it.
2011-03-12 03:32:43 +00:00
|
|
|
|
(let ((byte-compile--for-effect for-effect)
|
2011-03-10 19:40:48 +00:00
|
|
|
|
(byte-compile-constants nil)
|
1994-08-04 21:47:55 +00:00
|
|
|
|
(byte-compile-variables nil)
|
|
|
|
|
(byte-compile-tag-number 0)
|
|
|
|
|
(byte-compile-depth 0)
|
|
|
|
|
(byte-compile-maxdepth 0)
|
2011-04-01 15:16:50 +00:00
|
|
|
|
(byte-compile--lexical-environment lexenv)
|
Get rid of funvec.
* lisp/emacs-lisp/bytecomp.el (byte-compile-lapcode): Handle new form of
`byte-constant'.
(byte-compile-close-variables, displaying-byte-compile-warnings):
Add edebug spec.
(byte-compile-toplevel-file-form): New fun, split out of
byte-compile-file-form.
(byte-compile-from-buffer): Use it to avoid applying cconv
multiple times.
(byte-compile): Only strip `function' if it's present.
(byte-compile-lambda): Add `reserved-csts' argument.
Use new lexenv arg of byte-compile-top-level.
(byte-compile-reserved-constants): New var.
(byte-compile-constants-vector): Obey it.
(byte-compile-constants-vector): Handle new `byte-constant' form.
(byte-compile-top-level): Add args `lexenv' and `reserved-csts'.
(byte-compile-form): Don't check callargs here.
(byte-compile-normal-call): Do it here instead.
(byte-compile-push-unknown-constant)
(byte-compile-resolve-unknown-constant): Remove, unused.
(byte-compile-make-closure): Use `make-byte-code' rather than `curry',
putting the environment into the "constant" pool.
(byte-compile-get-closed-var): Use special byte-constant.
* lisp/emacs-lisp/byte-opt.el (byte-optimize-form-code-walker): Handle new
intermediate special form `internal-make-vector'.
(byte-optimize-lapcode): Handle new form of `byte-constant'.
* lisp/help-fns.el (describe-function-1): Don't handle funvecs.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Only convert quote to
function if the content is a lambda expression, not if it's a closure.
* emacs-lisp/eieio-come.el: Remove.
* lisp/emacs-lisp/eieio.el: Don't require eieio-comp.
(defmethod): Do a bit more work to find the body and wrap it into
a function before passing it to eieio-defmethod.
(eieio-defmethod): New arg `code' for it.
* lisp/emacs-lisp/debug.el (debugger-setup-buffer): Don't hide things in
debugger backtrace.
* lisp/emacs-lisp/cl-extra.el (cl-macroexpand-all): Use backquotes, and be
more careful when quoting a function value.
* lisp/emacs-lisp/cconv.el (cconv-freevars): Accept defvar/defconst.
(cconv-closure-convert-rec): Catch stray `internal-make-closure'.
* lisp/Makefile.in (COMPILE_FIRST): Compile pcase and cconv early.
* src/eval.c (Qcurry): Remove.
(funcall_funvec): Remove.
(funcall_lambda): Move new byte-code handling to reduce impact.
Treat all args as lexical in the case of lexbind.
(Fcurry): Remove.
* src/data.c (Qfunction_vector): Remove.
(Ffunvecp): Remove.
* src/lread.c (read1): Revert to calling make_byte_code here.
(read_vector): Don't call make_byte_code any more.
* src/lisp.h (enum pvec_type): Rename back to PVEC_COMPILED.
(XSETCOMPILED): Rename back from XSETFUNVEC.
(FUNVEC_SIZE): Remove.
(FUNVEC_COMPILED_TAG_P, FUNVEC_COMPILED_P): Remove.
(COMPILEDP): Rename back from FUNVECP.
* src/fns.c (Felt): Remove unexplained FUNVEC check.
* src/doc.c (Fdocumentation): Don't handle funvec.
* src/alloc.c (make_funvec, Ffunvec): Remove.
* doc/lispref/vol2.texi (Top):
* doc/lispref/vol1.texi (Top):
* doc/lispref/objects.texi (Programming Types, Funvec Type, Type Predicates):
* doc/lispref/functions.texi (Functions, What Is a Function, FunctionCurrying):
* doc/lispref/elisp.texi (Top): Remove mentions of funvec and curry.
2011-02-25 03:27:45 +00:00
|
|
|
|
(byte-compile-reserved-constants (or reserved-csts 0))
|
1994-08-04 21:47:55 +00:00
|
|
|
|
(byte-compile-output nil))
|
2010-06-13 20:36:17 +00:00
|
|
|
|
(if (memq byte-optimize '(t source))
|
Try and fix w32 build; misc cleanup.
* lisp/subr.el (apply-partially): Move from subr.el; don't use lexical-let.
(eval-after-load): Obey lexical-binding.
* lisp/simple.el (apply-partially): Move to subr.el.
* lisp/makefile.w32-in: Match changes in Makefile.in.
(BIG_STACK_DEPTH, BIG_STACK_OPTS, BYTE_COMPILE_FLAGS): New vars.
(.el.elc, compile-CMD, compile-SH, compile-always-CMD)
(compile-always-SH, compile-calc-CMD, compile-calc-SH): Use them.
(COMPILE_FIRST): Add pcase, macroexp, and cconv.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Silence warning about
calling CL's `compiler-macroexpand'.
* lisp/emacs-lisp/bytecomp.el (byte-compile-preprocess): New function.
(byte-compile-initial-macro-environment)
(byte-compile-toplevel-file-form, byte-compile, byte-compile-sexp): Use it.
(byte-compile-eval, byte-compile-eval-before-compile): Obey lexical-binding.
(byte-compile--for-effect): Rename from `for-effect'.
(display-call-tree): Use case.
* lisp/emacs-lisp/byte-opt.el (for-effect): Don't declare as dynamic.
(byte-optimize-form-code-walker, byte-optimize-form):
Revert to old arg name.
* lisp/Makefile.in (BYTE_COMPILE_FLAGS): New var.
(compile-onefile, .el.elc, compile-calc, recompile): Use it.
2011-03-12 03:32:43 +00:00
|
|
|
|
(setq form (byte-optimize-form form byte-compile--for-effect)))
|
2010-06-13 20:36:17 +00:00
|
|
|
|
(while (and (eq (car-safe form) 'progn) (null (cdr (cdr form))))
|
|
|
|
|
(setq form (nth 1 form)))
|
2011-03-23 00:53:36 +00:00
|
|
|
|
;; Set up things for a lexically-bound function.
|
|
|
|
|
(when (and lexical-binding (eq output-type 'lambda))
|
|
|
|
|
;; See how many arguments there are, and set the current stack depth
|
|
|
|
|
;; accordingly.
|
2011-04-01 15:16:50 +00:00
|
|
|
|
(setq byte-compile-depth (length byte-compile--lexical-environment))
|
2011-03-23 00:53:36 +00:00
|
|
|
|
;; If there are args, output a tag to record the initial
|
|
|
|
|
;; stack-depth for the optimizer.
|
|
|
|
|
(when (> byte-compile-depth 0)
|
|
|
|
|
(byte-compile-out-tag (byte-compile-make-tag))))
|
|
|
|
|
;; Now compile FORM
|
|
|
|
|
(byte-compile-form form byte-compile--for-effect)
|
|
|
|
|
(byte-compile-out-toplevel byte-compile--for-effect output-type)))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
|
|
|
|
(defun byte-compile-out-toplevel (&optional for-effect output-type)
|
|
|
|
|
(if for-effect
|
|
|
|
|
;; The stack is empty. Push a value to be returned from (byte-code ..).
|
|
|
|
|
(if (eq (car (car byte-compile-output)) 'byte-discard)
|
|
|
|
|
(setq byte-compile-output (cdr byte-compile-output))
|
|
|
|
|
(byte-compile-push-constant
|
|
|
|
|
;; Push any constant - preferably one which already is used, and
|
|
|
|
|
;; a number or symbol - ie not some big sequence. The return value
|
|
|
|
|
;; isn't returned, but it would be a shame if some textually large
|
|
|
|
|
;; constant was not optimized away because we chose to return it.
|
|
|
|
|
(and (not (assq nil byte-compile-constants)) ; Nil is often there.
|
|
|
|
|
(let ((tmp (reverse byte-compile-constants)))
|
2002-06-25 01:09:52 +00:00
|
|
|
|
(while (and tmp (not (or (symbolp (caar tmp))
|
|
|
|
|
(numberp (caar tmp)))))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(setq tmp (cdr tmp)))
|
2002-06-25 01:09:52 +00:00
|
|
|
|
(caar tmp))))))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(byte-compile-out 'byte-return 0)
|
|
|
|
|
(setq byte-compile-output (nreverse byte-compile-output))
|
|
|
|
|
(if (memq byte-optimize '(t byte))
|
|
|
|
|
(setq byte-compile-output
|
2011-03-10 19:40:48 +00:00
|
|
|
|
(byte-optimize-lapcode byte-compile-output)))
|
2001-10-18 21:05:16 +00:00
|
|
|
|
|
1992-07-10 22:06:47 +00:00
|
|
|
|
;; Decompile trivial functions:
|
|
|
|
|
;; only constants and variables, or a single funcall except in lambdas.
|
|
|
|
|
;; Except for Lisp_Compiled objects, forms like (foo "hi")
|
|
|
|
|
;; are still quicker than (byte-code "..." [foo "hi"] 2).
|
|
|
|
|
;; Note that even (quote foo) must be parsed just as any subr by the
|
|
|
|
|
;; interpreter, so quote should be compiled into byte-code in some contexts.
|
|
|
|
|
;; What to leave uncompiled:
|
1995-03-24 23:43:21 +00:00
|
|
|
|
;; lambda -> never. we used to leave it uncompiled if the body was
|
|
|
|
|
;; a single atom, but that causes confusion if the docstring
|
|
|
|
|
;; uses the (file . pos) syntax. Besides, now that we have
|
|
|
|
|
;; the Lisp_Compiled type, the compiled form is faster.
|
1992-07-10 22:06:47 +00:00
|
|
|
|
;; eval -> atom, quote or (function atom atom atom)
|
|
|
|
|
;; progn -> as <<same-as-eval>> or (progn <<same-as-eval>> atom)
|
|
|
|
|
;; file -> as progn, but takes both quotes and atoms, and longer forms.
|
|
|
|
|
(let (rest
|
|
|
|
|
(maycall (not (eq output-type 'lambda))) ; t if we may make a funcall.
|
|
|
|
|
tmp body)
|
|
|
|
|
(cond
|
|
|
|
|
;; #### This should be split out into byte-compile-nontrivial-function-p.
|
1995-03-24 23:43:21 +00:00
|
|
|
|
((or (eq output-type 'lambda)
|
|
|
|
|
(nthcdr (if (eq output-type 'file) 50 8) byte-compile-output)
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(assq 'TAG byte-compile-output) ; Not necessary, but speeds up a bit.
|
|
|
|
|
(not (setq tmp (assq 'byte-return byte-compile-output)))
|
|
|
|
|
(progn
|
|
|
|
|
(setq rest (nreverse
|
|
|
|
|
(cdr (memq tmp (reverse byte-compile-output)))))
|
Try and fix w32 build; misc cleanup.
* lisp/subr.el (apply-partially): Move from subr.el; don't use lexical-let.
(eval-after-load): Obey lexical-binding.
* lisp/simple.el (apply-partially): Move to subr.el.
* lisp/makefile.w32-in: Match changes in Makefile.in.
(BIG_STACK_DEPTH, BIG_STACK_OPTS, BYTE_COMPILE_FLAGS): New vars.
(.el.elc, compile-CMD, compile-SH, compile-always-CMD)
(compile-always-SH, compile-calc-CMD, compile-calc-SH): Use them.
(COMPILE_FIRST): Add pcase, macroexp, and cconv.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Silence warning about
calling CL's `compiler-macroexpand'.
* lisp/emacs-lisp/bytecomp.el (byte-compile-preprocess): New function.
(byte-compile-initial-macro-environment)
(byte-compile-toplevel-file-form, byte-compile, byte-compile-sexp): Use it.
(byte-compile-eval, byte-compile-eval-before-compile): Obey lexical-binding.
(byte-compile--for-effect): Rename from `for-effect'.
(display-call-tree): Use case.
* lisp/emacs-lisp/byte-opt.el (for-effect): Don't declare as dynamic.
(byte-optimize-form-code-walker, byte-optimize-form):
Revert to old arg name.
* lisp/Makefile.in (BYTE_COMPILE_FLAGS): New var.
(compile-onefile, .el.elc, compile-calc, recompile): Use it.
2011-03-12 03:32:43 +00:00
|
|
|
|
(while
|
|
|
|
|
(cond
|
|
|
|
|
((memq (car (car rest)) '(byte-varref byte-constant))
|
|
|
|
|
(setq tmp (car (cdr (car rest))))
|
|
|
|
|
(if (if (eq (car (car rest)) 'byte-constant)
|
|
|
|
|
(or (consp tmp)
|
|
|
|
|
(and (symbolp tmp)
|
2012-06-07 19:25:48 +00:00
|
|
|
|
(not (macroexp--const-symbol-p tmp)))))
|
Try and fix w32 build; misc cleanup.
* lisp/subr.el (apply-partially): Move from subr.el; don't use lexical-let.
(eval-after-load): Obey lexical-binding.
* lisp/simple.el (apply-partially): Move to subr.el.
* lisp/makefile.w32-in: Match changes in Makefile.in.
(BIG_STACK_DEPTH, BIG_STACK_OPTS, BYTE_COMPILE_FLAGS): New vars.
(.el.elc, compile-CMD, compile-SH, compile-always-CMD)
(compile-always-SH, compile-calc-CMD, compile-calc-SH): Use them.
(COMPILE_FIRST): Add pcase, macroexp, and cconv.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Silence warning about
calling CL's `compiler-macroexpand'.
* lisp/emacs-lisp/bytecomp.el (byte-compile-preprocess): New function.
(byte-compile-initial-macro-environment)
(byte-compile-toplevel-file-form, byte-compile, byte-compile-sexp): Use it.
(byte-compile-eval, byte-compile-eval-before-compile): Obey lexical-binding.
(byte-compile--for-effect): Rename from `for-effect'.
(display-call-tree): Use case.
* lisp/emacs-lisp/byte-opt.el (for-effect): Don't declare as dynamic.
(byte-optimize-form-code-walker, byte-optimize-form):
Revert to old arg name.
* lisp/Makefile.in (BYTE_COMPILE_FLAGS): New var.
(compile-onefile, .el.elc, compile-calc, recompile): Use it.
2011-03-12 03:32:43 +00:00
|
|
|
|
(if maycall
|
|
|
|
|
(setq body (cons (list 'quote tmp) body)))
|
|
|
|
|
(setq body (cons tmp body))))
|
|
|
|
|
((and maycall
|
|
|
|
|
;; Allow a funcall if at most one atom follows it.
|
|
|
|
|
(null (nthcdr 3 rest))
|
|
|
|
|
(setq tmp (get (car (car rest)) 'byte-opcode-invert))
|
|
|
|
|
(or (null (cdr rest))
|
|
|
|
|
(and (memq output-type '(file progn t))
|
|
|
|
|
(cdr (cdr rest))
|
|
|
|
|
(eq (car (nth 1 rest)) 'byte-discard)
|
|
|
|
|
(progn (setq rest (cdr rest)) t))))
|
|
|
|
|
(setq maycall nil) ; Only allow one real function call.
|
|
|
|
|
(setq body (nreverse body))
|
|
|
|
|
(setq body (list
|
|
|
|
|
(if (and (eq tmp 'funcall)
|
2012-11-09 15:56:51 +00:00
|
|
|
|
(eq (car-safe (car body)) 'quote)
|
|
|
|
|
(symbolp (nth 1 (car body))))
|
Try and fix w32 build; misc cleanup.
* lisp/subr.el (apply-partially): Move from subr.el; don't use lexical-let.
(eval-after-load): Obey lexical-binding.
* lisp/simple.el (apply-partially): Move to subr.el.
* lisp/makefile.w32-in: Match changes in Makefile.in.
(BIG_STACK_DEPTH, BIG_STACK_OPTS, BYTE_COMPILE_FLAGS): New vars.
(.el.elc, compile-CMD, compile-SH, compile-always-CMD)
(compile-always-SH, compile-calc-CMD, compile-calc-SH): Use them.
(COMPILE_FIRST): Add pcase, macroexp, and cconv.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Silence warning about
calling CL's `compiler-macroexpand'.
* lisp/emacs-lisp/bytecomp.el (byte-compile-preprocess): New function.
(byte-compile-initial-macro-environment)
(byte-compile-toplevel-file-form, byte-compile, byte-compile-sexp): Use it.
(byte-compile-eval, byte-compile-eval-before-compile): Obey lexical-binding.
(byte-compile--for-effect): Rename from `for-effect'.
(display-call-tree): Use case.
* lisp/emacs-lisp/byte-opt.el (for-effect): Don't declare as dynamic.
(byte-optimize-form-code-walker, byte-optimize-form):
Revert to old arg name.
* lisp/Makefile.in (BYTE_COMPILE_FLAGS): New var.
(compile-onefile, .el.elc, compile-calc, recompile): Use it.
2011-03-12 03:32:43 +00:00
|
|
|
|
(cons (nth 1 (car body)) (cdr body))
|
|
|
|
|
(cons tmp body))))
|
|
|
|
|
(or (eq output-type 'file)
|
|
|
|
|
(not (delq nil (mapcar 'consp (cdr (car body))))))))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(setq rest (cdr rest)))
|
1995-03-24 23:43:21 +00:00
|
|
|
|
rest))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(let ((byte-compile-vector (byte-compile-constants-vector)))
|
|
|
|
|
(list 'byte-code (byte-compile-lapcode byte-compile-output)
|
|
|
|
|
byte-compile-vector byte-compile-maxdepth)))
|
|
|
|
|
;; it's a trivial function
|
|
|
|
|
((cdr body) (cons 'progn (nreverse body)))
|
|
|
|
|
((car body)))))
|
|
|
|
|
|
2011-03-16 20:08:39 +00:00
|
|
|
|
;; Given BODY, compile it and return a new body.
|
|
|
|
|
(defun byte-compile-top-level-body (body &optional for-effect)
|
|
|
|
|
(setq body
|
|
|
|
|
(byte-compile-top-level (cons 'progn body) for-effect t))
|
|
|
|
|
(cond ((eq (car-safe body) 'progn)
|
|
|
|
|
(cdr body))
|
|
|
|
|
(body
|
|
|
|
|
(list body))))
|
2007-11-17 03:46:23 +00:00
|
|
|
|
|
2011-02-26 15:19:08 +00:00
|
|
|
|
;; Special macro-expander used during byte-compilation.
|
|
|
|
|
(defun byte-compile-macroexpand-declare-function (fn file &rest args)
|
|
|
|
|
(push (cons fn
|
|
|
|
|
(if (and (consp args) (listp (car args)))
|
|
|
|
|
(list 'declared (car args))
|
2012-06-01 19:47:54 +00:00
|
|
|
|
t)) ; Arglist not specified.
|
2007-11-17 03:46:23 +00:00
|
|
|
|
byte-compile-function-environment)
|
2007-12-05 03:36:23 +00:00
|
|
|
|
;; We are stating that it _will_ be defined at runtime.
|
|
|
|
|
(setq byte-compile-noruntime-functions
|
2011-02-26 15:19:08 +00:00
|
|
|
|
(delq fn byte-compile-noruntime-functions))
|
|
|
|
|
;; Delegate the rest to the normal macro definition.
|
|
|
|
|
(macroexpand `(declare-function ,fn ,file ,@args)))
|
2007-11-17 03:46:23 +00:00
|
|
|
|
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
2000-03-29 21:32:57 +00:00
|
|
|
|
;; This is the recursive entry point for compiling each subform of an
|
1992-07-10 22:06:47 +00:00
|
|
|
|
;; expression.
|
|
|
|
|
;; If for-effect is non-nil, byte-compile-form will output a byte-discard
|
|
|
|
|
;; before terminating (ie no value will be left on the stack).
|
Try and fix w32 build; misc cleanup.
* lisp/subr.el (apply-partially): Move from subr.el; don't use lexical-let.
(eval-after-load): Obey lexical-binding.
* lisp/simple.el (apply-partially): Move to subr.el.
* lisp/makefile.w32-in: Match changes in Makefile.in.
(BIG_STACK_DEPTH, BIG_STACK_OPTS, BYTE_COMPILE_FLAGS): New vars.
(.el.elc, compile-CMD, compile-SH, compile-always-CMD)
(compile-always-SH, compile-calc-CMD, compile-calc-SH): Use them.
(COMPILE_FIRST): Add pcase, macroexp, and cconv.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Silence warning about
calling CL's `compiler-macroexpand'.
* lisp/emacs-lisp/bytecomp.el (byte-compile-preprocess): New function.
(byte-compile-initial-macro-environment)
(byte-compile-toplevel-file-form, byte-compile, byte-compile-sexp): Use it.
(byte-compile-eval, byte-compile-eval-before-compile): Obey lexical-binding.
(byte-compile--for-effect): Rename from `for-effect'.
(display-call-tree): Use case.
* lisp/emacs-lisp/byte-opt.el (for-effect): Don't declare as dynamic.
(byte-optimize-form-code-walker, byte-optimize-form):
Revert to old arg name.
* lisp/Makefile.in (BYTE_COMPILE_FLAGS): New var.
(compile-onefile, .el.elc, compile-calc, recompile): Use it.
2011-03-12 03:32:43 +00:00
|
|
|
|
;; A byte-compile handler may, when byte-compile--for-effect is non-nil, choose
|
|
|
|
|
;; output code which does not leave a value on the stack, and then set
|
|
|
|
|
;; byte-compile--for-effect to nil (to prevent byte-compile-form from
|
|
|
|
|
;; outputting the byte-discard).
|
1992-07-10 22:06:47 +00:00
|
|
|
|
;; If a handler wants to call another handler, it should do so via
|
Try and fix w32 build; misc cleanup.
* lisp/subr.el (apply-partially): Move from subr.el; don't use lexical-let.
(eval-after-load): Obey lexical-binding.
* lisp/simple.el (apply-partially): Move to subr.el.
* lisp/makefile.w32-in: Match changes in Makefile.in.
(BIG_STACK_DEPTH, BIG_STACK_OPTS, BYTE_COMPILE_FLAGS): New vars.
(.el.elc, compile-CMD, compile-SH, compile-always-CMD)
(compile-always-SH, compile-calc-CMD, compile-calc-SH): Use them.
(COMPILE_FIRST): Add pcase, macroexp, and cconv.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Silence warning about
calling CL's `compiler-macroexpand'.
* lisp/emacs-lisp/bytecomp.el (byte-compile-preprocess): New function.
(byte-compile-initial-macro-environment)
(byte-compile-toplevel-file-form, byte-compile, byte-compile-sexp): Use it.
(byte-compile-eval, byte-compile-eval-before-compile): Obey lexical-binding.
(byte-compile--for-effect): Rename from `for-effect'.
(display-call-tree): Use case.
* lisp/emacs-lisp/byte-opt.el (for-effect): Don't declare as dynamic.
(byte-optimize-form-code-walker, byte-optimize-form):
Revert to old arg name.
* lisp/Makefile.in (BYTE_COMPILE_FLAGS): New var.
(compile-onefile, .el.elc, compile-calc, recompile): Use it.
2011-03-12 03:32:43 +00:00
|
|
|
|
;; byte-compile-form, or take extreme care to handle byte-compile--for-effect
|
|
|
|
|
;; correctly. (Use byte-compile-form-do-effect to reset the
|
|
|
|
|
;; byte-compile--for-effect flag too.)
|
1992-07-10 22:06:47 +00:00
|
|
|
|
;;
|
|
|
|
|
(defun byte-compile-form (form &optional for-effect)
|
Try and fix w32 build; misc cleanup.
* lisp/subr.el (apply-partially): Move from subr.el; don't use lexical-let.
(eval-after-load): Obey lexical-binding.
* lisp/simple.el (apply-partially): Move to subr.el.
* lisp/makefile.w32-in: Match changes in Makefile.in.
(BIG_STACK_DEPTH, BIG_STACK_OPTS, BYTE_COMPILE_FLAGS): New vars.
(.el.elc, compile-CMD, compile-SH, compile-always-CMD)
(compile-always-SH, compile-calc-CMD, compile-calc-SH): Use them.
(COMPILE_FIRST): Add pcase, macroexp, and cconv.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Silence warning about
calling CL's `compiler-macroexpand'.
* lisp/emacs-lisp/bytecomp.el (byte-compile-preprocess): New function.
(byte-compile-initial-macro-environment)
(byte-compile-toplevel-file-form, byte-compile, byte-compile-sexp): Use it.
(byte-compile-eval, byte-compile-eval-before-compile): Obey lexical-binding.
(byte-compile--for-effect): Rename from `for-effect'.
(display-call-tree): Use case.
* lisp/emacs-lisp/byte-opt.el (for-effect): Don't declare as dynamic.
(byte-optimize-form-code-walker, byte-optimize-form):
Revert to old arg name.
* lisp/Makefile.in (BYTE_COMPILE_FLAGS): New var.
(compile-onefile, .el.elc, compile-calc, recompile): Use it.
2011-03-12 03:32:43 +00:00
|
|
|
|
(let ((byte-compile--for-effect for-effect))
|
2011-03-10 19:40:48 +00:00
|
|
|
|
(cond
|
|
|
|
|
((not (consp form))
|
2012-06-07 19:25:48 +00:00
|
|
|
|
(cond ((or (not (symbolp form)) (macroexp--const-symbol-p form))
|
2011-03-10 19:40:48 +00:00
|
|
|
|
(when (symbolp form)
|
|
|
|
|
(byte-compile-set-symbol-position form))
|
|
|
|
|
(byte-compile-constant form))
|
Try and fix w32 build; misc cleanup.
* lisp/subr.el (apply-partially): Move from subr.el; don't use lexical-let.
(eval-after-load): Obey lexical-binding.
* lisp/simple.el (apply-partially): Move to subr.el.
* lisp/makefile.w32-in: Match changes in Makefile.in.
(BIG_STACK_DEPTH, BIG_STACK_OPTS, BYTE_COMPILE_FLAGS): New vars.
(.el.elc, compile-CMD, compile-SH, compile-always-CMD)
(compile-always-SH, compile-calc-CMD, compile-calc-SH): Use them.
(COMPILE_FIRST): Add pcase, macroexp, and cconv.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Silence warning about
calling CL's `compiler-macroexpand'.
* lisp/emacs-lisp/bytecomp.el (byte-compile-preprocess): New function.
(byte-compile-initial-macro-environment)
(byte-compile-toplevel-file-form, byte-compile, byte-compile-sexp): Use it.
(byte-compile-eval, byte-compile-eval-before-compile): Obey lexical-binding.
(byte-compile--for-effect): Rename from `for-effect'.
(display-call-tree): Use case.
* lisp/emacs-lisp/byte-opt.el (for-effect): Don't declare as dynamic.
(byte-optimize-form-code-walker, byte-optimize-form):
Revert to old arg name.
* lisp/Makefile.in (BYTE_COMPILE_FLAGS): New var.
(compile-onefile, .el.elc, compile-calc, recompile): Use it.
2011-03-12 03:32:43 +00:00
|
|
|
|
((and byte-compile--for-effect byte-compile-delete-errors)
|
2011-03-10 19:40:48 +00:00
|
|
|
|
(when (symbolp form)
|
|
|
|
|
(byte-compile-set-symbol-position form))
|
Try and fix w32 build; misc cleanup.
* lisp/subr.el (apply-partially): Move from subr.el; don't use lexical-let.
(eval-after-load): Obey lexical-binding.
* lisp/simple.el (apply-partially): Move to subr.el.
* lisp/makefile.w32-in: Match changes in Makefile.in.
(BIG_STACK_DEPTH, BIG_STACK_OPTS, BYTE_COMPILE_FLAGS): New vars.
(.el.elc, compile-CMD, compile-SH, compile-always-CMD)
(compile-always-SH, compile-calc-CMD, compile-calc-SH): Use them.
(COMPILE_FIRST): Add pcase, macroexp, and cconv.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Silence warning about
calling CL's `compiler-macroexpand'.
* lisp/emacs-lisp/bytecomp.el (byte-compile-preprocess): New function.
(byte-compile-initial-macro-environment)
(byte-compile-toplevel-file-form, byte-compile, byte-compile-sexp): Use it.
(byte-compile-eval, byte-compile-eval-before-compile): Obey lexical-binding.
(byte-compile--for-effect): Rename from `for-effect'.
(display-call-tree): Use case.
* lisp/emacs-lisp/byte-opt.el (for-effect): Don't declare as dynamic.
(byte-optimize-form-code-walker, byte-optimize-form):
Revert to old arg name.
* lisp/Makefile.in (BYTE_COMPILE_FLAGS): New var.
(compile-onefile, .el.elc, compile-calc, recompile): Use it.
2011-03-12 03:32:43 +00:00
|
|
|
|
(setq byte-compile--for-effect nil))
|
2011-03-10 19:40:48 +00:00
|
|
|
|
(t
|
|
|
|
|
(byte-compile-variable-ref form))))
|
|
|
|
|
((symbolp (car form))
|
2011-03-16 20:08:39 +00:00
|
|
|
|
(let* ((fn (car form))
|
2013-11-25 17:16:32 +00:00
|
|
|
|
(handler (get fn 'byte-compile))
|
2013-11-30 08:42:28 +00:00
|
|
|
|
(interactive-only
|
|
|
|
|
(or (get fn 'interactive-only)
|
|
|
|
|
(memq fn byte-compile-interactive-only-functions))))
|
2012-06-07 19:25:48 +00:00
|
|
|
|
(when (macroexp--const-symbol-p fn)
|
2011-03-16 20:08:39 +00:00
|
|
|
|
(byte-compile-warn "`%s' called as a function" fn))
|
2013-11-25 17:16:32 +00:00
|
|
|
|
(when (and (byte-compile-warning-enabled-p 'interactive-only)
|
|
|
|
|
interactive-only)
|
2013-11-30 08:42:28 +00:00
|
|
|
|
(byte-compile-warn "`%s' is for interactive use only%s"
|
|
|
|
|
fn
|
|
|
|
|
(cond ((stringp interactive-only)
|
|
|
|
|
(format "; %s" interactive-only))
|
|
|
|
|
((and (symbolp 'interactive-only)
|
|
|
|
|
(not (eq interactive-only t)))
|
|
|
|
|
(format "; use `%s' instead."
|
|
|
|
|
interactive-only))
|
|
|
|
|
(t "."))))
|
2014-01-06 23:34:05 +00:00
|
|
|
|
(if (eq (car-safe (symbol-function (car form))) 'macro)
|
2014-04-21 09:34:21 +00:00
|
|
|
|
(progn
|
|
|
|
|
(debug)
|
|
|
|
|
(byte-compile-log-warning
|
|
|
|
|
(format "Forgot to expand macro %s in %S" (car form) form)
|
|
|
|
|
nil :error)))
|
2011-03-16 20:08:39 +00:00
|
|
|
|
(if (and handler
|
2012-06-05 15:41:12 +00:00
|
|
|
|
;; Make sure that function exists.
|
|
|
|
|
(and (functionp handler)
|
|
|
|
|
;; Ignore obsolete byte-compile function used by former
|
|
|
|
|
;; CL code to handle compiler macros (we do it
|
|
|
|
|
;; differently now).
|
|
|
|
|
(not (eq handler 'cl-byte-compile-compiler-macro))))
|
2011-03-16 20:08:39 +00:00
|
|
|
|
(funcall handler form)
|
2011-03-10 19:40:48 +00:00
|
|
|
|
(byte-compile-normal-call form))
|
|
|
|
|
(if (byte-compile-warning-enabled-p 'cl-functions)
|
|
|
|
|
(byte-compile-cl-warn form))))
|
2011-03-23 00:53:36 +00:00
|
|
|
|
((and (byte-code-function-p (car form))
|
|
|
|
|
(memq byte-optimize '(t lap)))
|
|
|
|
|
(byte-compile-unfold-bcf form))
|
|
|
|
|
((and (eq (car-safe (car form)) 'lambda)
|
2011-03-10 19:40:48 +00:00
|
|
|
|
;; if the form comes out the same way it went in, that's
|
|
|
|
|
;; because it was malformed, and we couldn't unfold it.
|
|
|
|
|
(not (eq form (setq form (byte-compile-unfold-lambda form)))))
|
Try and fix w32 build; misc cleanup.
* lisp/subr.el (apply-partially): Move from subr.el; don't use lexical-let.
(eval-after-load): Obey lexical-binding.
* lisp/simple.el (apply-partially): Move to subr.el.
* lisp/makefile.w32-in: Match changes in Makefile.in.
(BIG_STACK_DEPTH, BIG_STACK_OPTS, BYTE_COMPILE_FLAGS): New vars.
(.el.elc, compile-CMD, compile-SH, compile-always-CMD)
(compile-always-SH, compile-calc-CMD, compile-calc-SH): Use them.
(COMPILE_FIRST): Add pcase, macroexp, and cconv.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Silence warning about
calling CL's `compiler-macroexpand'.
* lisp/emacs-lisp/bytecomp.el (byte-compile-preprocess): New function.
(byte-compile-initial-macro-environment)
(byte-compile-toplevel-file-form, byte-compile, byte-compile-sexp): Use it.
(byte-compile-eval, byte-compile-eval-before-compile): Obey lexical-binding.
(byte-compile--for-effect): Rename from `for-effect'.
(display-call-tree): Use case.
* lisp/emacs-lisp/byte-opt.el (for-effect): Don't declare as dynamic.
(byte-optimize-form-code-walker, byte-optimize-form):
Revert to old arg name.
* lisp/Makefile.in (BYTE_COMPILE_FLAGS): New var.
(compile-onefile, .el.elc, compile-calc, recompile): Use it.
2011-03-12 03:32:43 +00:00
|
|
|
|
(byte-compile-form form byte-compile--for-effect)
|
|
|
|
|
(setq byte-compile--for-effect nil))
|
2011-03-10 19:40:48 +00:00
|
|
|
|
((byte-compile-normal-call form)))
|
Try and fix w32 build; misc cleanup.
* lisp/subr.el (apply-partially): Move from subr.el; don't use lexical-let.
(eval-after-load): Obey lexical-binding.
* lisp/simple.el (apply-partially): Move to subr.el.
* lisp/makefile.w32-in: Match changes in Makefile.in.
(BIG_STACK_DEPTH, BIG_STACK_OPTS, BYTE_COMPILE_FLAGS): New vars.
(.el.elc, compile-CMD, compile-SH, compile-always-CMD)
(compile-always-SH, compile-calc-CMD, compile-calc-SH): Use them.
(COMPILE_FIRST): Add pcase, macroexp, and cconv.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Silence warning about
calling CL's `compiler-macroexpand'.
* lisp/emacs-lisp/bytecomp.el (byte-compile-preprocess): New function.
(byte-compile-initial-macro-environment)
(byte-compile-toplevel-file-form, byte-compile, byte-compile-sexp): Use it.
(byte-compile-eval, byte-compile-eval-before-compile): Obey lexical-binding.
(byte-compile--for-effect): Rename from `for-effect'.
(display-call-tree): Use case.
* lisp/emacs-lisp/byte-opt.el (for-effect): Don't declare as dynamic.
(byte-optimize-form-code-walker, byte-optimize-form):
Revert to old arg name.
* lisp/Makefile.in (BYTE_COMPILE_FLAGS): New var.
(compile-onefile, .el.elc, compile-calc, recompile): Use it.
2011-03-12 03:32:43 +00:00
|
|
|
|
(if byte-compile--for-effect
|
2011-03-10 19:40:48 +00:00
|
|
|
|
(byte-compile-discard))))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
|
|
|
|
(defun byte-compile-normal-call (form)
|
Get rid of funvec.
* lisp/emacs-lisp/bytecomp.el (byte-compile-lapcode): Handle new form of
`byte-constant'.
(byte-compile-close-variables, displaying-byte-compile-warnings):
Add edebug spec.
(byte-compile-toplevel-file-form): New fun, split out of
byte-compile-file-form.
(byte-compile-from-buffer): Use it to avoid applying cconv
multiple times.
(byte-compile): Only strip `function' if it's present.
(byte-compile-lambda): Add `reserved-csts' argument.
Use new lexenv arg of byte-compile-top-level.
(byte-compile-reserved-constants): New var.
(byte-compile-constants-vector): Obey it.
(byte-compile-constants-vector): Handle new `byte-constant' form.
(byte-compile-top-level): Add args `lexenv' and `reserved-csts'.
(byte-compile-form): Don't check callargs here.
(byte-compile-normal-call): Do it here instead.
(byte-compile-push-unknown-constant)
(byte-compile-resolve-unknown-constant): Remove, unused.
(byte-compile-make-closure): Use `make-byte-code' rather than `curry',
putting the environment into the "constant" pool.
(byte-compile-get-closed-var): Use special byte-constant.
* lisp/emacs-lisp/byte-opt.el (byte-optimize-form-code-walker): Handle new
intermediate special form `internal-make-vector'.
(byte-optimize-lapcode): Handle new form of `byte-constant'.
* lisp/help-fns.el (describe-function-1): Don't handle funvecs.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Only convert quote to
function if the content is a lambda expression, not if it's a closure.
* emacs-lisp/eieio-come.el: Remove.
* lisp/emacs-lisp/eieio.el: Don't require eieio-comp.
(defmethod): Do a bit more work to find the body and wrap it into
a function before passing it to eieio-defmethod.
(eieio-defmethod): New arg `code' for it.
* lisp/emacs-lisp/debug.el (debugger-setup-buffer): Don't hide things in
debugger backtrace.
* lisp/emacs-lisp/cl-extra.el (cl-macroexpand-all): Use backquotes, and be
more careful when quoting a function value.
* lisp/emacs-lisp/cconv.el (cconv-freevars): Accept defvar/defconst.
(cconv-closure-convert-rec): Catch stray `internal-make-closure'.
* lisp/Makefile.in (COMPILE_FIRST): Compile pcase and cconv early.
* src/eval.c (Qcurry): Remove.
(funcall_funvec): Remove.
(funcall_lambda): Move new byte-code handling to reduce impact.
Treat all args as lexical in the case of lexbind.
(Fcurry): Remove.
* src/data.c (Qfunction_vector): Remove.
(Ffunvecp): Remove.
* src/lread.c (read1): Revert to calling make_byte_code here.
(read_vector): Don't call make_byte_code any more.
* src/lisp.h (enum pvec_type): Rename back to PVEC_COMPILED.
(XSETCOMPILED): Rename back from XSETFUNVEC.
(FUNVEC_SIZE): Remove.
(FUNVEC_COMPILED_TAG_P, FUNVEC_COMPILED_P): Remove.
(COMPILEDP): Rename back from FUNVECP.
* src/fns.c (Felt): Remove unexplained FUNVEC check.
* src/doc.c (Fdocumentation): Don't handle funvec.
* src/alloc.c (make_funvec, Ffunvec): Remove.
* doc/lispref/vol2.texi (Top):
* doc/lispref/vol1.texi (Top):
* doc/lispref/objects.texi (Programming Types, Funvec Type, Type Predicates):
* doc/lispref/functions.texi (Functions, What Is a Function, FunctionCurrying):
* doc/lispref/elisp.texi (Top): Remove mentions of funvec and curry.
2011-02-25 03:27:45 +00:00
|
|
|
|
(when (and (byte-compile-warning-enabled-p 'callargs)
|
|
|
|
|
(symbolp (car form)))
|
|
|
|
|
(if (memq (car form)
|
Merge from lexical-binding branch.
* doc/lispref/eval.texi (Eval): Discourage the use of `eval'.
Document its new `lexical' argument.
* doc/lispref/variables.texi (Defining Variables): Mention the new meaning of `defvar'.
(Lexical Binding): New sub-section.
* lisp/Makefile.in (BIG_STACK_DEPTH, BIG_STACK_OPTS, BYTE_COMPILE_FLAGS):
New variables.
(compile-onefile, .el.elc, compile-calc, recompile): Use them.
(COMPILE_FIRST): Add macroexp and cconv.
* lisp/makefile.w32-in: Mirror changes in Makefile.in.
* lisp/vc/cvs-status.el:
* lisp/vc/diff-mode.el:
* lisp/vc/log-edit.el:
* lisp/vc/log-view.el:
* lisp/vc/smerge-mode.el:
* lisp/textmodes/bibtex-style.el:
* textmodes/css.el:
* lisp/startup.el:
* lisp/uniquify.el:
* lisp/minibuffer.el:
* lisp/newcomment.el:
* lisp/reveal.el:
* lisp/server.el:
* lisp/mpc.el:
* lisp/emacs-lisp/smie.el:
* lisp/doc-view.el:
* lisp/dired.el:
* lisp/abbrev.el: Use lexical binding.
* lisp/custom.el (custom-initialize-default, custom-declare-variable):
Use `defvar'.
* lisp/files.el (lexical-binding): Declare safe.
* lisp/help-fns.el (help-split-fundoc): Return nil if there's nothing else
than the arglist.
(help-add-fundoc-usage): Don't add `Not documented'.
(help-function-arglist): Handle closures, subroutines, and new
byte-code-functions.
(help-make-usage): Remove leading underscores.
(describe-function-1): Handle closures.
(describe-variable): Use special-variable-p for completion.
* lisp/simple.el (with-wrapper-hook, apply-partially): Move to subr.el.
* lisp/subr.el (apply-partially): Use new closures rather than CL.
(--dolist-tail--, --dotimes-limit--): Don't declare dynamic.
(dolist, dotimes): Use slightly different expansion for lexical code.
(functionp): Move to C.
(letrec): New macro.
(with-wrapper-hook): Use it and apply-partially instead of CL.
(eval-after-load): Preserve lexical-binding.
(save-window-excursion, with-output-to-temp-buffer): Turn them
into macros.
* lisp/emacs-lisp/advice.el (ad-arglist): Use help-function-arglist.
* lisp/emacs-lisp/autoload.el (make-autoload): Don't burp on trivial macros.
* lisp/emacs-lisp/byte-opt.el: Use lexical binding.
(byte-inline-lapcode): Remove (to bytecomp).
(byte-compile-inline-expand): Pay attention to inlining to/from
lexically bound code.
(byte-compile-unfold-lambda): Don't handle byte-code-functions
any more.
(byte-optimize-form-code-walker): Don't handle save-window-excursion
any more and don't call compiler-macros.
(byte-compile-splice-in-already-compiled-code): Remove.
(byte-code): Don't inline any more.
(disassemble-offset): Receive `bytes' as argument rather than via
dynamic scoping.
(byte-compile-tag-number): Declare before first use.
(byte-decompile-bytecode-1): Handle new byte-codes, don't change
`return' even if make-spliceable.
(byte-compile-side-effect-and-error-free-ops): Add stack-ref, remove
obsolete interactive-p.
(byte-optimize-lapcode): Optimize new lap-codes.
Don't trip up on new form of `byte-constant' lap code.
* lisp/emacs-lisp/byte-run.el (make-obsolete): Don't set the `byte-compile'
handler any more.
* lisp/emacs-lisp/bytecomp.el: Use lexical binding instead of
a "bytecomp-" prefix. Macroexpand everything as a separate phase.
(byte-compile-initial-macro-environment):
Handle declare-function here.
(byte-compile--lexical-environment): New var.
(byte-stack-ref, byte-stack-set, byte-discardN)
(byte-discardN-preserve-tos): New lap codes.
(byte-interactive-p): Don't use any more.
(byte-compile-push-bytecodes, byte-compile-push-bytecode-const2):
New macros.
(byte-compile-lapcode): Use them and handle new lap codes.
(byte-compile-obsolete): Remove.
(byte-compile-arglist-signature): Handle new byte-code arg"lists".
(byte-compile-arglist-warn): Check late def of inlinable funs.
(byte-compile-cl-warn): Don't silence warnings for compiler-macros
since they should have been expanded by now.
(byte-compile--outbuffer): Rename from bytecomp-outbuffer.
(byte-compile-from-buffer): Remove unused second arg.
(byte-compile-preprocess): New function.
(byte-compile-toplevel-file-form): New function to distinguish
file-form calls from outside from file-form calls from hunk-handlers.
(byte-compile-file-form): Simplify.
(byte-compile-file-form-defsubst): Remove.
(byte-compile-file-form-defmumble): Simplify now that
byte-compile-lambda always returns a byte-code-function.
(byte-compile): Preprocess.
(byte-compile-byte-code-maker, byte-compile-byte-code-unmake):
Remove, not used any more.
(byte-compile-arglist-vars, byte-compile-make-lambda-lexenv)
(byte-compile-make-args-desc): New funs.
(byte-compile-lambda): Handle lexical functions. Always return
a byte-code-function.
(byte-compile-reserved-constants): New var, to make up room for
closed-over variables.
(byte-compile-constants-vector): Obey it.
(byte-compile-top-level): New args `lexenv' and `reserved-csts'.
(byte-compile-macroexpand-declare-function): New function.
(byte-compile-form): Call byte-compile-unfold-bcf to inline immediate
byte-code-functions.
(byte-compile-form): Check obsolescence here.
(byte-compile-inline-lapcode, byte-compile-unfold-bcf): New functions.
(byte-compile-variable-ref): Remove.
(byte-compile-dynamic-variable-op): New fun.
(byte-compile-dynamic-variable-bind, byte-compile-variable-ref)
(byte-compile-variable-set): New funs.
(byte-compile-discard): Add 2 args.
(byte-compile-stack-ref, byte-compile-stack-set)
(byte-compile-make-closure, byte-compile-get-closed-var): New funs.
(byte-compile-funarg, byte-compile-funarg-2): Remove, handled in
macroexpand-all instead.
(byte-compile-quote-form): Remove.
(byte-compile-push-binding-init, byte-compile-not-lexical-var-p)
(byte-compile-bind, byte-compile-unbind): New funs.
(byte-compile-let): Handle let* and lexical binding.
(byte-compile-let*): Remove.
(byte-compile-catch, byte-compile-unwind-protect)
(byte-compile-track-mouse, byte-compile-condition-case):
Handle a new :fun-body form, used for lexical scoping.
(byte-compile-save-window-excursion)
(byte-compile-with-output-to-temp-buffer): Remove.
(byte-compile-defun): Simplify.
(byte-compile-stack-adjustment): New fun.
(byte-compile-out): Use it.
(byte-compile-refresh-preloaded): Don't reload byte-compiler files.
* lisp/emacs-lisp/cconv.el: New file.
* lisp/emacs-lisp/cl-extra.el (cl-macroexpand-all): Properly quote CL
closures.
* lisp/emacs-lisp/cl-macs.el (cl-byte-compile-block)
(cl-byte-compile-throw): Remove.
(cl-block-wrapper, cl-block-throw): Use compiler-macros instead.
* lisp/emacs-lisp/cl.el (pushnew): Silence warning.
* lisp/emacs-lisp/disass.el (disassemble-internal): Handle new
`closure' objects.
(disassemble-1): Handle new byte codes.
* lisp/emacs-lisp/edebug.el (edebug-eval-defun)
(edebug-eval-top-level-form): Use eval-sexp-add-defvars.
(edebug-toggle): Avoid `eval'.
* lisp/emacs-lisp/eieio-comp.el: Remove.
* lisp/emacs-lisp/eieio.el (byte-compile-file-form-defmethod):
Don't autoload.
(eieio-defgeneric-form-primary-only-one): Use `byte-compile' rather
than the internal `byte-compile-lambda'.
(defmethod): Don't hide code under quotes.
(eieio-defmethod): New `code' argument.
* lisp/emacs-lisp/float-sup.el (pi): Don't declare as dynamically bound.
* lisp/emacs-lisp/lisp-mode.el (eval-last-sexp-1):
Use eval-sexp-add-defvars.
(eval-sexp-add-defvars): New fun.
* lisp/emacs-lisp/macroexp.el: Use lexical binding.
(macroexpand-all-1): Check obsolete macros. Expand compiler-macros.
Don't convert ' to #' without checking that it's indeed quoting
a lambda.
* lisp/emacs-lisp/pcase.el: Don't use destructuring-bind.
(pcase--memoize): Rename from pcase-memoize. Change weakness.
(pcase): Add `let' pattern.
Change memoization so it actually works.
(pcase-mutually-exclusive-predicates): Add byte-code-function-p.
(pcase--u1) <guard, pred>: Fix possible shadowing problem.
<let>: New case.
* src/alloc.c (Fmake_symbol): Init new `declared_special' field.
* src/buffer.c (defvar_per_buffer): Set new `declared_special' field.
* src/bytecode.c (Bstack_ref, Bstack_set, Bstack_set2, BdiscardN):
New byte-codes.
(exec_byte_code): New function extracted from Fbyte_code to handle new
calling convention for byte-code-functions. Add new byte-codes.
* src/callint.c (Fcall_interactively): Preserve lexical-binding mode for
interactive spec.
* src/doc.c (Fdocumentation, store_function_docstring):
* src/data.c (Finteractive_form): Handle closures.
* src/eval.c (Fsetq): Handle lexical vars.
(Fdefun, Fdefmacro, Ffunction): Make closures when needed.
(Fdefconst, Fdefvaralias, Fdefvar): Mark as dynamic.
(FletX, Flet): Obey lexical binding.
(Fcommandp): Handle closures.
(Feval): New `lexical' arg.
(eval_sub): New function extracted from Feval. Use it almost
everywhere where Feval was used. Look up vars in lexical env.
Handle closures.
(Ffunctionp): Move from subr.el.
(Ffuncall): Handle closures.
(apply_lambda): Remove `eval_flags'.
(funcall_lambda): Handle closures and new byte-code-functions.
(Fspecial_variable_p): New function.
(syms_of_eval): Initialize the Vinternal_interpreter_environment var,
but without exporting it to Lisp.
* src/fns.c (concat, mapcar1): Accept byte-code-functions.
* src/image.c (parse_image_spec): Use Ffunctionp.
* src/keyboard.c (eval_dyn): New fun.
(menu_item_eval_property): Use it.
* src/lisp.h (struct Lisp_Symbol): New field `declared_special'.
* src/lread.c (lisp_file_lexically_bound_p): New function.
(Fload): Bind Qlexical_binding.
(readevalloop): Remove `evalfun' arg.
Bind Qinternal_interpreter_environment.
(Feval_buffer): Bind Qlexical_binding.
(defvar_int, defvar_bool, defvar_lisp_nopro, defvar_kboard):
Mark as dynamic.
(syms_of_lread): Declare `lexical-binding'.
* src/window.c (Ftemp_output_buffer_show): New fun.
(Fsave_window_excursion):
* src/print.c (Fwith_output_to_temp_buffer): Move to subr.el.
2011-04-01 17:19:52 +00:00
|
|
|
|
'(custom-declare-group custom-declare-variable
|
|
|
|
|
custom-declare-face))
|
Get rid of funvec.
* lisp/emacs-lisp/bytecomp.el (byte-compile-lapcode): Handle new form of
`byte-constant'.
(byte-compile-close-variables, displaying-byte-compile-warnings):
Add edebug spec.
(byte-compile-toplevel-file-form): New fun, split out of
byte-compile-file-form.
(byte-compile-from-buffer): Use it to avoid applying cconv
multiple times.
(byte-compile): Only strip `function' if it's present.
(byte-compile-lambda): Add `reserved-csts' argument.
Use new lexenv arg of byte-compile-top-level.
(byte-compile-reserved-constants): New var.
(byte-compile-constants-vector): Obey it.
(byte-compile-constants-vector): Handle new `byte-constant' form.
(byte-compile-top-level): Add args `lexenv' and `reserved-csts'.
(byte-compile-form): Don't check callargs here.
(byte-compile-normal-call): Do it here instead.
(byte-compile-push-unknown-constant)
(byte-compile-resolve-unknown-constant): Remove, unused.
(byte-compile-make-closure): Use `make-byte-code' rather than `curry',
putting the environment into the "constant" pool.
(byte-compile-get-closed-var): Use special byte-constant.
* lisp/emacs-lisp/byte-opt.el (byte-optimize-form-code-walker): Handle new
intermediate special form `internal-make-vector'.
(byte-optimize-lapcode): Handle new form of `byte-constant'.
* lisp/help-fns.el (describe-function-1): Don't handle funvecs.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Only convert quote to
function if the content is a lambda expression, not if it's a closure.
* emacs-lisp/eieio-come.el: Remove.
* lisp/emacs-lisp/eieio.el: Don't require eieio-comp.
(defmethod): Do a bit more work to find the body and wrap it into
a function before passing it to eieio-defmethod.
(eieio-defmethod): New arg `code' for it.
* lisp/emacs-lisp/debug.el (debugger-setup-buffer): Don't hide things in
debugger backtrace.
* lisp/emacs-lisp/cl-extra.el (cl-macroexpand-all): Use backquotes, and be
more careful when quoting a function value.
* lisp/emacs-lisp/cconv.el (cconv-freevars): Accept defvar/defconst.
(cconv-closure-convert-rec): Catch stray `internal-make-closure'.
* lisp/Makefile.in (COMPILE_FIRST): Compile pcase and cconv early.
* src/eval.c (Qcurry): Remove.
(funcall_funvec): Remove.
(funcall_lambda): Move new byte-code handling to reduce impact.
Treat all args as lexical in the case of lexbind.
(Fcurry): Remove.
* src/data.c (Qfunction_vector): Remove.
(Ffunvecp): Remove.
* src/lread.c (read1): Revert to calling make_byte_code here.
(read_vector): Don't call make_byte_code any more.
* src/lisp.h (enum pvec_type): Rename back to PVEC_COMPILED.
(XSETCOMPILED): Rename back from XSETFUNVEC.
(FUNVEC_SIZE): Remove.
(FUNVEC_COMPILED_TAG_P, FUNVEC_COMPILED_P): Remove.
(COMPILEDP): Rename back from FUNVECP.
* src/fns.c (Felt): Remove unexplained FUNVEC check.
* src/doc.c (Fdocumentation): Don't handle funvec.
* src/alloc.c (make_funvec, Ffunvec): Remove.
* doc/lispref/vol2.texi (Top):
* doc/lispref/vol1.texi (Top):
* doc/lispref/objects.texi (Programming Types, Funvec Type, Type Predicates):
* doc/lispref/functions.texi (Functions, What Is a Function, FunctionCurrying):
* doc/lispref/elisp.texi (Top): Remove mentions of funvec and curry.
2011-02-25 03:27:45 +00:00
|
|
|
|
(byte-compile-nogroup-warn form))
|
|
|
|
|
(byte-compile-callargs-warn form))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(if byte-compile-generate-call-tree
|
|
|
|
|
(byte-compile-annotate-call-tree form))
|
Try and fix w32 build; misc cleanup.
* lisp/subr.el (apply-partially): Move from subr.el; don't use lexical-let.
(eval-after-load): Obey lexical-binding.
* lisp/simple.el (apply-partially): Move to subr.el.
* lisp/makefile.w32-in: Match changes in Makefile.in.
(BIG_STACK_DEPTH, BIG_STACK_OPTS, BYTE_COMPILE_FLAGS): New vars.
(.el.elc, compile-CMD, compile-SH, compile-always-CMD)
(compile-always-SH, compile-calc-CMD, compile-calc-SH): Use them.
(COMPILE_FIRST): Add pcase, macroexp, and cconv.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Silence warning about
calling CL's `compiler-macroexpand'.
* lisp/emacs-lisp/bytecomp.el (byte-compile-preprocess): New function.
(byte-compile-initial-macro-environment)
(byte-compile-toplevel-file-form, byte-compile, byte-compile-sexp): Use it.
(byte-compile-eval, byte-compile-eval-before-compile): Obey lexical-binding.
(byte-compile--for-effect): Rename from `for-effect'.
(display-call-tree): Use case.
* lisp/emacs-lisp/byte-opt.el (for-effect): Don't declare as dynamic.
(byte-optimize-form-code-walker, byte-optimize-form):
Revert to old arg name.
* lisp/Makefile.in (BYTE_COMPILE_FLAGS): New var.
(compile-onefile, .el.elc, compile-calc, recompile): Use it.
2011-03-12 03:32:43 +00:00
|
|
|
|
(when (and byte-compile--for-effect (eq (car form) 'mapcar)
|
2007-10-28 23:53:06 +00:00
|
|
|
|
(byte-compile-warning-enabled-p 'mapcar))
|
2007-09-21 04:24:53 +00:00
|
|
|
|
(byte-compile-set-symbol-position 'mapcar)
|
|
|
|
|
(byte-compile-warn
|
|
|
|
|
"`mapcar' called for effect; use `mapc' or `dolist' instead"))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(byte-compile-push-constant (car form))
|
2000-05-26 10:35:38 +00:00
|
|
|
|
(mapc 'byte-compile-form (cdr form)) ; wasteful, but faster.
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(byte-compile-out 'byte-call (length (cdr form))))
|
|
|
|
|
|
2011-03-23 00:53:36 +00:00
|
|
|
|
|
|
|
|
|
;; Splice the given lap code into the current instruction stream.
|
|
|
|
|
;; If it has any labels in it, you're responsible for making sure there
|
|
|
|
|
;; are no collisions, and that byte-compile-tag-number is reasonable
|
|
|
|
|
;; after this is spliced in. The provided list is destroyed.
|
|
|
|
|
(defun byte-compile-inline-lapcode (lap end-depth)
|
|
|
|
|
;; "Replay" the operations: we used to just do
|
|
|
|
|
;; (setq byte-compile-output (nconc (nreverse lap) byte-compile-output))
|
|
|
|
|
;; but that fails to update byte-compile-depth, so we had to assume
|
|
|
|
|
;; that `lap' ends up adding exactly 1 element to the stack. This
|
|
|
|
|
;; happens to be true for byte-code generated by bytecomp.el without
|
|
|
|
|
;; lexical-binding, but it's not true in general, and it's not true for
|
|
|
|
|
;; code output by bytecomp.el with lexical-binding.
|
|
|
|
|
(let ((endtag (byte-compile-make-tag)))
|
|
|
|
|
(dolist (op lap)
|
|
|
|
|
(cond
|
|
|
|
|
((eq (car op) 'TAG) (byte-compile-out-tag op))
|
|
|
|
|
((memq (car op) byte-goto-ops) (byte-compile-goto (car op) (cdr op)))
|
|
|
|
|
((eq (car op) 'byte-return)
|
|
|
|
|
(byte-compile-discard (- byte-compile-depth end-depth) t)
|
|
|
|
|
(byte-compile-goto 'byte-goto endtag))
|
|
|
|
|
(t (byte-compile-out (car op) (cdr op)))))
|
|
|
|
|
(byte-compile-out-tag endtag)))
|
|
|
|
|
|
|
|
|
|
(defun byte-compile-unfold-bcf (form)
|
2011-04-01 15:16:50 +00:00
|
|
|
|
"Inline call to byte-code-functions."
|
2011-03-23 00:53:36 +00:00
|
|
|
|
(let* ((byte-compile-bound-variables byte-compile-bound-variables)
|
|
|
|
|
(fun (car form))
|
|
|
|
|
(fargs (aref fun 0))
|
|
|
|
|
(start-depth byte-compile-depth)
|
|
|
|
|
(fmax2 (if (numberp fargs) (lsh fargs -7))) ;2*max+rest.
|
|
|
|
|
;; (fmin (if (numberp fargs) (logand fargs 127)))
|
|
|
|
|
(alen (length (cdr form)))
|
|
|
|
|
(dynbinds ()))
|
|
|
|
|
(fetch-bytecode fun)
|
|
|
|
|
(mapc 'byte-compile-form (cdr form))
|
|
|
|
|
(unless fmax2
|
|
|
|
|
;; Old-style byte-code.
|
2012-06-10 13:28:26 +00:00
|
|
|
|
(cl-assert (listp fargs))
|
2011-03-23 00:53:36 +00:00
|
|
|
|
(while fargs
|
Reduce use of (require 'cl).
* admin/bzrmerge.el: Use cl-lib.
* leim/quail/hangul.el: Don't require CL.
* leim/quail/ipa.el: Use cl-lib.
* vc/smerge-mode.el, vc/pcvs.el, vc/pcvs-util.el, vc/pcvs-info.el:
* vc/diff-mode.el, vc/cvs-status.el, uniquify.el, scroll-bar.el:
* register.el, progmodes/sh-script.el, net/gnutls.el, net/dbus.el:
* msb.el, mpc.el, minibuffer.el, international/ucs-normalize.el:
* international/quail.el, info-xref.el, imenu.el, image-mode.el:
* font-lock.el, filesets.el, edmacro.el, doc-view.el, bookmark.el:
* battery.el, avoid.el, abbrev.el: Use cl-lib.
* vc/pcvs-parse.el, vc/pcvs-defs.el, vc/log-view.el, vc/log-edit.el:
* vc/diff.el, simple.el, pcomplete.el, lpr.el, comint.el, loadhist.el:
* jit-lock.el, international/iso-ascii.el, info.el, frame.el, bs.el:
* emulation/crisp.el, electric.el, dired.el, cus-dep.el, composite.el:
* calculator.el, autorevert.el, apropos.el: Don't require CL.
* emacs-bytecomp.el (byte-recompile-directory, display-call-tree)
(byte-compile-unfold-bcf, byte-compile-check-variable):
* emacs-byte-opt.el (byte-compile-trueconstp)
(byte-compile-nilconstp):
* emacs-autoload.el (make-autoload): Use pcase.
* face-remap.el (text-scale-adjust): Simplify pcase patterns.
2012-07-10 11:51:54 +00:00
|
|
|
|
(pcase (car fargs)
|
|
|
|
|
(`&optional (setq fargs (cdr fargs)))
|
|
|
|
|
(`&rest (setq fmax2 (+ (* 2 (length dynbinds)) 1))
|
2011-03-23 00:53:36 +00:00
|
|
|
|
(push (cadr fargs) dynbinds)
|
|
|
|
|
(setq fargs nil))
|
Reduce use of (require 'cl).
* admin/bzrmerge.el: Use cl-lib.
* leim/quail/hangul.el: Don't require CL.
* leim/quail/ipa.el: Use cl-lib.
* vc/smerge-mode.el, vc/pcvs.el, vc/pcvs-util.el, vc/pcvs-info.el:
* vc/diff-mode.el, vc/cvs-status.el, uniquify.el, scroll-bar.el:
* register.el, progmodes/sh-script.el, net/gnutls.el, net/dbus.el:
* msb.el, mpc.el, minibuffer.el, international/ucs-normalize.el:
* international/quail.el, info-xref.el, imenu.el, image-mode.el:
* font-lock.el, filesets.el, edmacro.el, doc-view.el, bookmark.el:
* battery.el, avoid.el, abbrev.el: Use cl-lib.
* vc/pcvs-parse.el, vc/pcvs-defs.el, vc/log-view.el, vc/log-edit.el:
* vc/diff.el, simple.el, pcomplete.el, lpr.el, comint.el, loadhist.el:
* jit-lock.el, international/iso-ascii.el, info.el, frame.el, bs.el:
* emulation/crisp.el, electric.el, dired.el, cus-dep.el, composite.el:
* calculator.el, autorevert.el, apropos.el: Don't require CL.
* emacs-bytecomp.el (byte-recompile-directory, display-call-tree)
(byte-compile-unfold-bcf, byte-compile-check-variable):
* emacs-byte-opt.el (byte-compile-trueconstp)
(byte-compile-nilconstp):
* emacs-autoload.el (make-autoload): Use pcase.
* face-remap.el (text-scale-adjust): Simplify pcase patterns.
2012-07-10 11:51:54 +00:00
|
|
|
|
(_ (push (pop fargs) dynbinds))))
|
2011-03-23 00:53:36 +00:00
|
|
|
|
(unless fmax2 (setq fmax2 (* 2 (length dynbinds)))))
|
|
|
|
|
(cond
|
|
|
|
|
((<= (+ alen alen) fmax2)
|
|
|
|
|
;; Add missing &optional (or &rest) arguments.
|
2011-06-01 14:19:45 +00:00
|
|
|
|
(dotimes (_ (- (/ (1+ fmax2) 2) alen))
|
2011-03-23 00:53:36 +00:00
|
|
|
|
(byte-compile-push-constant nil)))
|
|
|
|
|
((zerop (logand fmax2 1))
|
|
|
|
|
(byte-compile-log-warning "Too many arguments for inlined function"
|
|
|
|
|
nil :error)
|
|
|
|
|
(byte-compile-discard (- alen (/ fmax2 2))))
|
|
|
|
|
(t
|
|
|
|
|
;; Turn &rest args into a list.
|
|
|
|
|
(let ((n (- alen (/ (1- fmax2) 2))))
|
2012-06-10 13:28:26 +00:00
|
|
|
|
(cl-assert (> n 0) nil "problem: fmax2=%S alen=%S n=%S" fmax2 alen n)
|
2011-03-23 00:53:36 +00:00
|
|
|
|
(if (< n 5)
|
|
|
|
|
(byte-compile-out
|
|
|
|
|
(aref [byte-list1 byte-list2 byte-list3 byte-list4] (1- n))
|
|
|
|
|
0)
|
|
|
|
|
(byte-compile-out 'byte-listN n)))))
|
|
|
|
|
(mapc #'byte-compile-dynamic-variable-bind dynbinds)
|
|
|
|
|
(byte-compile-inline-lapcode
|
|
|
|
|
(byte-decompile-bytecode-1 (aref fun 1) (aref fun 2) t)
|
|
|
|
|
(1+ start-depth))
|
|
|
|
|
;; Unbind dynamic variables.
|
|
|
|
|
(when dynbinds
|
|
|
|
|
(byte-compile-out 'byte-unbind (length dynbinds)))
|
2012-06-10 13:28:26 +00:00
|
|
|
|
(cl-assert (eq byte-compile-depth (1+ start-depth))
|
2011-03-23 00:53:36 +00:00
|
|
|
|
nil "Wrong depth start=%s end=%s" start-depth byte-compile-depth)))
|
|
|
|
|
|
2011-06-01 19:32:04 +00:00
|
|
|
|
(defun byte-compile-check-variable (var access-type)
|
|
|
|
|
"Do various error checks before a use of the variable VAR."
|
2010-06-13 20:36:17 +00:00
|
|
|
|
(when (symbolp var)
|
|
|
|
|
(byte-compile-set-symbol-position var))
|
2012-06-07 19:25:48 +00:00
|
|
|
|
(cond ((or (not (symbolp var)) (macroexp--const-symbol-p var))
|
2010-06-13 20:36:17 +00:00
|
|
|
|
(when (byte-compile-warning-enabled-p 'constants)
|
2011-06-01 19:32:04 +00:00
|
|
|
|
(byte-compile-warn (if (eq access-type 'let-bind)
|
2010-06-13 20:36:17 +00:00
|
|
|
|
"attempt to let-bind %s `%s`"
|
|
|
|
|
"variable reference to %s `%s'")
|
|
|
|
|
(if (symbolp var) "constant" "nonvariable")
|
|
|
|
|
(prin1-to-string var))))
|
2011-06-01 19:32:04 +00:00
|
|
|
|
((let ((od (get var 'byte-obsolete-variable)))
|
|
|
|
|
(and od
|
|
|
|
|
(not (memq var byte-compile-not-obsolete-vars))
|
2011-11-20 04:33:36 +00:00
|
|
|
|
(not (memq var byte-compile-global-not-obsolete-vars))
|
Reduce use of (require 'cl).
* admin/bzrmerge.el: Use cl-lib.
* leim/quail/hangul.el: Don't require CL.
* leim/quail/ipa.el: Use cl-lib.
* vc/smerge-mode.el, vc/pcvs.el, vc/pcvs-util.el, vc/pcvs-info.el:
* vc/diff-mode.el, vc/cvs-status.el, uniquify.el, scroll-bar.el:
* register.el, progmodes/sh-script.el, net/gnutls.el, net/dbus.el:
* msb.el, mpc.el, minibuffer.el, international/ucs-normalize.el:
* international/quail.el, info-xref.el, imenu.el, image-mode.el:
* font-lock.el, filesets.el, edmacro.el, doc-view.el, bookmark.el:
* battery.el, avoid.el, abbrev.el: Use cl-lib.
* vc/pcvs-parse.el, vc/pcvs-defs.el, vc/log-view.el, vc/log-edit.el:
* vc/diff.el, simple.el, pcomplete.el, lpr.el, comint.el, loadhist.el:
* jit-lock.el, international/iso-ascii.el, info.el, frame.el, bs.el:
* emulation/crisp.el, electric.el, dired.el, cus-dep.el, composite.el:
* calculator.el, autorevert.el, apropos.el: Don't require CL.
* emacs-bytecomp.el (byte-recompile-directory, display-call-tree)
(byte-compile-unfold-bcf, byte-compile-check-variable):
* emacs-byte-opt.el (byte-compile-trueconstp)
(byte-compile-nilconstp):
* emacs-autoload.el (make-autoload): Use pcase.
* face-remap.el (text-scale-adjust): Simplify pcase patterns.
2012-07-10 11:51:54 +00:00
|
|
|
|
(or (pcase (nth 1 od)
|
|
|
|
|
(`set (not (eq access-type 'reference)))
|
|
|
|
|
(`get (eq access-type 'reference))
|
|
|
|
|
(_ t)))))
|
2010-06-13 20:36:17 +00:00
|
|
|
|
(byte-compile-warn-obsolete var))))
|
|
|
|
|
|
|
|
|
|
(defsubst byte-compile-dynamic-variable-op (base-op var)
|
|
|
|
|
(let ((tmp (assq var byte-compile-variables)))
|
2003-04-12 20:28:10 +00:00
|
|
|
|
(unless tmp
|
2010-06-13 20:36:17 +00:00
|
|
|
|
(setq tmp (list var))
|
2003-04-12 20:28:10 +00:00
|
|
|
|
(push tmp byte-compile-variables))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(byte-compile-out base-op tmp)))
|
|
|
|
|
|
2010-06-13 20:36:17 +00:00
|
|
|
|
(defun byte-compile-dynamic-variable-bind (var)
|
|
|
|
|
"Generate code to bind the lexical variable VAR to the top-of-stack value."
|
2011-06-01 19:32:04 +00:00
|
|
|
|
(byte-compile-check-variable var 'let-bind)
|
* lisp/emacs-lisp/byte-lexbind.el: Delete.
* lisp/emacs-lisp/bytecomp.el (byte-compile-current-heap-environment)
(byte-compile-current-num-closures): Remove vars.
(byte-vec-ref, byte-vec-set): Remove byte codes.
(byte-compile-arglist-vars, byte-compile-make-lambda-lexenv): Move from
byte-lexbind.el.
(byte-compile-lambda): Never build a closure.
(byte-compile-closure-code-p, byte-compile-make-closure): Remove.
(byte-compile-closure): Simplify.
(byte-compile-top-level): Don't mess with heap environments.
(byte-compile-dynamic-variable-bind): Always maintain
byte-compile-bound-variables.
(byte-compile-variable-ref, byte-compile-variable-set): Always just use
the stack for lexical vars.
(byte-compile-push-binding-init): Simplify.
(byte-compile-not-lexical-var-p): New function, moved from cconv.el.
(byte-compile-bind, byte-compile-unbind): New functions, moved and
simplified from byte-lexbind.el.
(byte-compile-let, byte-compile-let*): Simplify.
(byte-compile-condition-case): Don't add :fun-body to the bound vars.
(byte-compile-defmacro): Simplify.
* lisp/emacs-lisp/byte-opt.el (byte-compile-side-effect-free-ops)
(byte-optimize-lapcode): Remove byte-vec-ref and byte-vec-set.
* lisp/emacs-lisp/cconv.el (cconv-not-lexical-var-p): Remove.
(cconv-freevars, cconv-analyse-function, cconv-analyse-form):
Use byte-compile-not-lexical-var-p instead.
* src/bytecode.c (Bvec_ref, Bvec_set): Remove.
(exec_byte_code): Don't handle them.
* lisp/help-fns.el (describe-function-1): Fix paren typo.
2011-02-12 05:53:30 +00:00
|
|
|
|
(push var byte-compile-bound-variables)
|
2010-06-13 20:36:17 +00:00
|
|
|
|
(byte-compile-dynamic-variable-op 'byte-varbind var))
|
|
|
|
|
|
|
|
|
|
(defun byte-compile-variable-ref (var)
|
|
|
|
|
"Generate code to push the value of the variable VAR on the stack."
|
2011-06-01 19:32:04 +00:00
|
|
|
|
(byte-compile-check-variable var 'reference)
|
2011-04-01 15:16:50 +00:00
|
|
|
|
(let ((lex-binding (assq var byte-compile--lexical-environment)))
|
2010-06-13 20:36:17 +00:00
|
|
|
|
(if lex-binding
|
|
|
|
|
;; VAR is lexically bound
|
* lisp/emacs-lisp/byte-lexbind.el: Delete.
* lisp/emacs-lisp/bytecomp.el (byte-compile-current-heap-environment)
(byte-compile-current-num-closures): Remove vars.
(byte-vec-ref, byte-vec-set): Remove byte codes.
(byte-compile-arglist-vars, byte-compile-make-lambda-lexenv): Move from
byte-lexbind.el.
(byte-compile-lambda): Never build a closure.
(byte-compile-closure-code-p, byte-compile-make-closure): Remove.
(byte-compile-closure): Simplify.
(byte-compile-top-level): Don't mess with heap environments.
(byte-compile-dynamic-variable-bind): Always maintain
byte-compile-bound-variables.
(byte-compile-variable-ref, byte-compile-variable-set): Always just use
the stack for lexical vars.
(byte-compile-push-binding-init): Simplify.
(byte-compile-not-lexical-var-p): New function, moved from cconv.el.
(byte-compile-bind, byte-compile-unbind): New functions, moved and
simplified from byte-lexbind.el.
(byte-compile-let, byte-compile-let*): Simplify.
(byte-compile-condition-case): Don't add :fun-body to the bound vars.
(byte-compile-defmacro): Simplify.
* lisp/emacs-lisp/byte-opt.el (byte-compile-side-effect-free-ops)
(byte-optimize-lapcode): Remove byte-vec-ref and byte-vec-set.
* lisp/emacs-lisp/cconv.el (cconv-not-lexical-var-p): Remove.
(cconv-freevars, cconv-analyse-function, cconv-analyse-form):
Use byte-compile-not-lexical-var-p instead.
* src/bytecode.c (Bvec_ref, Bvec_set): Remove.
(exec_byte_code): Don't handle them.
* lisp/help-fns.el (describe-function-1): Fix paren typo.
2011-02-12 05:53:30 +00:00
|
|
|
|
(byte-compile-stack-ref (cdr lex-binding))
|
2010-06-13 20:36:17 +00:00
|
|
|
|
;; VAR is dynamically bound
|
|
|
|
|
(unless (or (not (byte-compile-warning-enabled-p 'free-vars))
|
|
|
|
|
(boundp var)
|
|
|
|
|
(memq var byte-compile-bound-variables)
|
|
|
|
|
(memq var byte-compile-free-references))
|
Get rid of funvec.
* lisp/emacs-lisp/bytecomp.el (byte-compile-lapcode): Handle new form of
`byte-constant'.
(byte-compile-close-variables, displaying-byte-compile-warnings):
Add edebug spec.
(byte-compile-toplevel-file-form): New fun, split out of
byte-compile-file-form.
(byte-compile-from-buffer): Use it to avoid applying cconv
multiple times.
(byte-compile): Only strip `function' if it's present.
(byte-compile-lambda): Add `reserved-csts' argument.
Use new lexenv arg of byte-compile-top-level.
(byte-compile-reserved-constants): New var.
(byte-compile-constants-vector): Obey it.
(byte-compile-constants-vector): Handle new `byte-constant' form.
(byte-compile-top-level): Add args `lexenv' and `reserved-csts'.
(byte-compile-form): Don't check callargs here.
(byte-compile-normal-call): Do it here instead.
(byte-compile-push-unknown-constant)
(byte-compile-resolve-unknown-constant): Remove, unused.
(byte-compile-make-closure): Use `make-byte-code' rather than `curry',
putting the environment into the "constant" pool.
(byte-compile-get-closed-var): Use special byte-constant.
* lisp/emacs-lisp/byte-opt.el (byte-optimize-form-code-walker): Handle new
intermediate special form `internal-make-vector'.
(byte-optimize-lapcode): Handle new form of `byte-constant'.
* lisp/help-fns.el (describe-function-1): Don't handle funvecs.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Only convert quote to
function if the content is a lambda expression, not if it's a closure.
* emacs-lisp/eieio-come.el: Remove.
* lisp/emacs-lisp/eieio.el: Don't require eieio-comp.
(defmethod): Do a bit more work to find the body and wrap it into
a function before passing it to eieio-defmethod.
(eieio-defmethod): New arg `code' for it.
* lisp/emacs-lisp/debug.el (debugger-setup-buffer): Don't hide things in
debugger backtrace.
* lisp/emacs-lisp/cl-extra.el (cl-macroexpand-all): Use backquotes, and be
more careful when quoting a function value.
* lisp/emacs-lisp/cconv.el (cconv-freevars): Accept defvar/defconst.
(cconv-closure-convert-rec): Catch stray `internal-make-closure'.
* lisp/Makefile.in (COMPILE_FIRST): Compile pcase and cconv early.
* src/eval.c (Qcurry): Remove.
(funcall_funvec): Remove.
(funcall_lambda): Move new byte-code handling to reduce impact.
Treat all args as lexical in the case of lexbind.
(Fcurry): Remove.
* src/data.c (Qfunction_vector): Remove.
(Ffunvecp): Remove.
* src/lread.c (read1): Revert to calling make_byte_code here.
(read_vector): Don't call make_byte_code any more.
* src/lisp.h (enum pvec_type): Rename back to PVEC_COMPILED.
(XSETCOMPILED): Rename back from XSETFUNVEC.
(FUNVEC_SIZE): Remove.
(FUNVEC_COMPILED_TAG_P, FUNVEC_COMPILED_P): Remove.
(COMPILEDP): Rename back from FUNVECP.
* src/fns.c (Felt): Remove unexplained FUNVEC check.
* src/doc.c (Fdocumentation): Don't handle funvec.
* src/alloc.c (make_funvec, Ffunvec): Remove.
* doc/lispref/vol2.texi (Top):
* doc/lispref/vol1.texi (Top):
* doc/lispref/objects.texi (Programming Types, Funvec Type, Type Predicates):
* doc/lispref/functions.texi (Functions, What Is a Function, FunctionCurrying):
* doc/lispref/elisp.texi (Top): Remove mentions of funvec and curry.
2011-02-25 03:27:45 +00:00
|
|
|
|
(byte-compile-warn "reference to free variable `%S'" var)
|
2010-06-13 20:36:17 +00:00
|
|
|
|
(push var byte-compile-free-references))
|
|
|
|
|
(byte-compile-dynamic-variable-op 'byte-varref var))))
|
|
|
|
|
|
|
|
|
|
(defun byte-compile-variable-set (var)
|
|
|
|
|
"Generate code to set the variable VAR from the top-of-stack value."
|
2011-06-01 19:32:04 +00:00
|
|
|
|
(byte-compile-check-variable var 'assign)
|
2011-04-01 15:16:50 +00:00
|
|
|
|
(let ((lex-binding (assq var byte-compile--lexical-environment)))
|
2010-06-13 20:36:17 +00:00
|
|
|
|
(if lex-binding
|
2012-05-30 03:59:42 +00:00
|
|
|
|
;; VAR is lexically bound.
|
* lisp/emacs-lisp/byte-lexbind.el: Delete.
* lisp/emacs-lisp/bytecomp.el (byte-compile-current-heap-environment)
(byte-compile-current-num-closures): Remove vars.
(byte-vec-ref, byte-vec-set): Remove byte codes.
(byte-compile-arglist-vars, byte-compile-make-lambda-lexenv): Move from
byte-lexbind.el.
(byte-compile-lambda): Never build a closure.
(byte-compile-closure-code-p, byte-compile-make-closure): Remove.
(byte-compile-closure): Simplify.
(byte-compile-top-level): Don't mess with heap environments.
(byte-compile-dynamic-variable-bind): Always maintain
byte-compile-bound-variables.
(byte-compile-variable-ref, byte-compile-variable-set): Always just use
the stack for lexical vars.
(byte-compile-push-binding-init): Simplify.
(byte-compile-not-lexical-var-p): New function, moved from cconv.el.
(byte-compile-bind, byte-compile-unbind): New functions, moved and
simplified from byte-lexbind.el.
(byte-compile-let, byte-compile-let*): Simplify.
(byte-compile-condition-case): Don't add :fun-body to the bound vars.
(byte-compile-defmacro): Simplify.
* lisp/emacs-lisp/byte-opt.el (byte-compile-side-effect-free-ops)
(byte-optimize-lapcode): Remove byte-vec-ref and byte-vec-set.
* lisp/emacs-lisp/cconv.el (cconv-not-lexical-var-p): Remove.
(cconv-freevars, cconv-analyse-function, cconv-analyse-form):
Use byte-compile-not-lexical-var-p instead.
* src/bytecode.c (Bvec_ref, Bvec_set): Remove.
(exec_byte_code): Don't handle them.
* lisp/help-fns.el (describe-function-1): Fix paren typo.
2011-02-12 05:53:30 +00:00
|
|
|
|
(byte-compile-stack-set (cdr lex-binding))
|
2012-05-30 03:59:42 +00:00
|
|
|
|
;; VAR is dynamically bound.
|
2010-06-13 20:36:17 +00:00
|
|
|
|
(unless (or (not (byte-compile-warning-enabled-p 'free-vars))
|
|
|
|
|
(boundp var)
|
|
|
|
|
(memq var byte-compile-bound-variables)
|
|
|
|
|
(memq var byte-compile-free-assignments))
|
|
|
|
|
(byte-compile-warn "assignment to free variable `%s'" var)
|
|
|
|
|
(push var byte-compile-free-assignments))
|
|
|
|
|
(byte-compile-dynamic-variable-op 'byte-varset var))))
|
|
|
|
|
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(defmacro byte-compile-get-constant (const)
|
2000-02-23 12:29:05 +00:00
|
|
|
|
`(or (if (stringp ,const)
|
2006-11-28 02:22:17 +00:00
|
|
|
|
;; In a string constant, treat properties as significant.
|
|
|
|
|
(let (result)
|
|
|
|
|
(dolist (elt byte-compile-constants)
|
|
|
|
|
(if (equal-including-properties (car elt) ,const)
|
|
|
|
|
(setq result elt)))
|
|
|
|
|
result)
|
2000-02-23 12:29:05 +00:00
|
|
|
|
(assq ,const byte-compile-constants))
|
|
|
|
|
(car (setq byte-compile-constants
|
|
|
|
|
(cons (list ,const) byte-compile-constants)))))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
Try and fix w32 build; misc cleanup.
* lisp/subr.el (apply-partially): Move from subr.el; don't use lexical-let.
(eval-after-load): Obey lexical-binding.
* lisp/simple.el (apply-partially): Move to subr.el.
* lisp/makefile.w32-in: Match changes in Makefile.in.
(BIG_STACK_DEPTH, BIG_STACK_OPTS, BYTE_COMPILE_FLAGS): New vars.
(.el.elc, compile-CMD, compile-SH, compile-always-CMD)
(compile-always-SH, compile-calc-CMD, compile-calc-SH): Use them.
(COMPILE_FIRST): Add pcase, macroexp, and cconv.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Silence warning about
calling CL's `compiler-macroexpand'.
* lisp/emacs-lisp/bytecomp.el (byte-compile-preprocess): New function.
(byte-compile-initial-macro-environment)
(byte-compile-toplevel-file-form, byte-compile, byte-compile-sexp): Use it.
(byte-compile-eval, byte-compile-eval-before-compile): Obey lexical-binding.
(byte-compile--for-effect): Rename from `for-effect'.
(display-call-tree): Use case.
* lisp/emacs-lisp/byte-opt.el (for-effect): Don't declare as dynamic.
(byte-optimize-form-code-walker, byte-optimize-form):
Revert to old arg name.
* lisp/Makefile.in (BYTE_COMPILE_FLAGS): New var.
(compile-onefile, .el.elc, compile-calc, recompile): Use it.
2011-03-12 03:32:43 +00:00
|
|
|
|
;; Use this when the value of a form is a constant.
|
|
|
|
|
;; This obeys byte-compile--for-effect.
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(defun byte-compile-constant (const)
|
Try and fix w32 build; misc cleanup.
* lisp/subr.el (apply-partially): Move from subr.el; don't use lexical-let.
(eval-after-load): Obey lexical-binding.
* lisp/simple.el (apply-partially): Move to subr.el.
* lisp/makefile.w32-in: Match changes in Makefile.in.
(BIG_STACK_DEPTH, BIG_STACK_OPTS, BYTE_COMPILE_FLAGS): New vars.
(.el.elc, compile-CMD, compile-SH, compile-always-CMD)
(compile-always-SH, compile-calc-CMD, compile-calc-SH): Use them.
(COMPILE_FIRST): Add pcase, macroexp, and cconv.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Silence warning about
calling CL's `compiler-macroexpand'.
* lisp/emacs-lisp/bytecomp.el (byte-compile-preprocess): New function.
(byte-compile-initial-macro-environment)
(byte-compile-toplevel-file-form, byte-compile, byte-compile-sexp): Use it.
(byte-compile-eval, byte-compile-eval-before-compile): Obey lexical-binding.
(byte-compile--for-effect): Rename from `for-effect'.
(display-call-tree): Use case.
* lisp/emacs-lisp/byte-opt.el (for-effect): Don't declare as dynamic.
(byte-optimize-form-code-walker, byte-optimize-form):
Revert to old arg name.
* lisp/Makefile.in (BYTE_COMPILE_FLAGS): New var.
(compile-onefile, .el.elc, compile-calc, recompile): Use it.
2011-03-12 03:32:43 +00:00
|
|
|
|
(if byte-compile--for-effect
|
|
|
|
|
(setq byte-compile--for-effect nil)
|
2002-05-28 17:40:47 +00:00
|
|
|
|
(when (symbolp const)
|
|
|
|
|
(byte-compile-set-symbol-position const))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(byte-compile-out 'byte-constant (byte-compile-get-constant const))))
|
|
|
|
|
|
|
|
|
|
;; Use this for a constant that is not the value of its containing form.
|
Try and fix w32 build; misc cleanup.
* lisp/subr.el (apply-partially): Move from subr.el; don't use lexical-let.
(eval-after-load): Obey lexical-binding.
* lisp/simple.el (apply-partially): Move to subr.el.
* lisp/makefile.w32-in: Match changes in Makefile.in.
(BIG_STACK_DEPTH, BIG_STACK_OPTS, BYTE_COMPILE_FLAGS): New vars.
(.el.elc, compile-CMD, compile-SH, compile-always-CMD)
(compile-always-SH, compile-calc-CMD, compile-calc-SH): Use them.
(COMPILE_FIRST): Add pcase, macroexp, and cconv.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Silence warning about
calling CL's `compiler-macroexpand'.
* lisp/emacs-lisp/bytecomp.el (byte-compile-preprocess): New function.
(byte-compile-initial-macro-environment)
(byte-compile-toplevel-file-form, byte-compile, byte-compile-sexp): Use it.
(byte-compile-eval, byte-compile-eval-before-compile): Obey lexical-binding.
(byte-compile--for-effect): Rename from `for-effect'.
(display-call-tree): Use case.
* lisp/emacs-lisp/byte-opt.el (for-effect): Don't declare as dynamic.
(byte-optimize-form-code-walker, byte-optimize-form):
Revert to old arg name.
* lisp/Makefile.in (BYTE_COMPILE_FLAGS): New var.
(compile-onefile, .el.elc, compile-calc, recompile): Use it.
2011-03-12 03:32:43 +00:00
|
|
|
|
;; This ignores byte-compile--for-effect.
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(defun byte-compile-push-constant (const)
|
Try and fix w32 build; misc cleanup.
* lisp/subr.el (apply-partially): Move from subr.el; don't use lexical-let.
(eval-after-load): Obey lexical-binding.
* lisp/simple.el (apply-partially): Move to subr.el.
* lisp/makefile.w32-in: Match changes in Makefile.in.
(BIG_STACK_DEPTH, BIG_STACK_OPTS, BYTE_COMPILE_FLAGS): New vars.
(.el.elc, compile-CMD, compile-SH, compile-always-CMD)
(compile-always-SH, compile-calc-CMD, compile-calc-SH): Use them.
(COMPILE_FIRST): Add pcase, macroexp, and cconv.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Silence warning about
calling CL's `compiler-macroexpand'.
* lisp/emacs-lisp/bytecomp.el (byte-compile-preprocess): New function.
(byte-compile-initial-macro-environment)
(byte-compile-toplevel-file-form, byte-compile, byte-compile-sexp): Use it.
(byte-compile-eval, byte-compile-eval-before-compile): Obey lexical-binding.
(byte-compile--for-effect): Rename from `for-effect'.
(display-call-tree): Use case.
* lisp/emacs-lisp/byte-opt.el (for-effect): Don't declare as dynamic.
(byte-optimize-form-code-walker, byte-optimize-form):
Revert to old arg name.
* lisp/Makefile.in (BYTE_COMPILE_FLAGS): New var.
(compile-onefile, .el.elc, compile-calc, recompile): Use it.
2011-03-12 03:32:43 +00:00
|
|
|
|
(let ((byte-compile--for-effect nil))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(inline (byte-compile-constant const))))
|
|
|
|
|
|
|
|
|
|
;; Compile those primitive ordinary functions
|
|
|
|
|
;; which have special byte codes just for speed.
|
|
|
|
|
|
|
|
|
|
(defmacro byte-defop-compiler (function &optional compile-handler)
|
2009-10-01 17:47:38 +00:00
|
|
|
|
"Add a compiler-form for FUNCTION.
|
|
|
|
|
If function is a symbol, then the variable \"byte-SYMBOL\" must name
|
|
|
|
|
the opcode to be used. If function is a list, the first element
|
|
|
|
|
is the function and the second element is the bytecode-symbol.
|
|
|
|
|
The second element may be nil, meaning there is no opcode.
|
|
|
|
|
COMPILE-HANDLER is the function to use to compile this byte-op, or
|
|
|
|
|
may be the abbreviations 0, 1, 2, 3, 0-1, or 1-2.
|
|
|
|
|
If it is nil, then the handler is \"byte-compile-SYMBOL.\""
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(let (opcode)
|
|
|
|
|
(if (symbolp function)
|
|
|
|
|
(setq opcode (intern (concat "byte-" (symbol-name function))))
|
|
|
|
|
(setq opcode (car (cdr function))
|
|
|
|
|
function (car function)))
|
|
|
|
|
(let ((fnform
|
|
|
|
|
(list 'put (list 'quote function) ''byte-compile
|
|
|
|
|
(list 'quote
|
|
|
|
|
(or (cdr (assq compile-handler
|
|
|
|
|
'((0 . byte-compile-no-args)
|
|
|
|
|
(1 . byte-compile-one-arg)
|
|
|
|
|
(2 . byte-compile-two-args)
|
Cleanup namespace of dos-w32.el.
* lisp/dos-w32.el (minibuffer-history-case-insensitive-variables)
(path-separator, null-device, buffer-file-coding-system)
(lpr-headers-switches): Check system-type before modifying them.
(find-buffer-file-type-coding-system): Mark obsolete.
(w32-find-file-not-found-set-buffer-file-coding-system): Rename from
find-file-not-found-set-buffer-file-coding-system.
(w32-untranslated-filesystem-list, w32-untranslated-canonical-name):
(w32-add-untranslated-filesystem, w32-remove-untranslated-filesystem)
(w32-direct-print-region-use-command-dot-com, w32-untranslated-file-p):
(w32-direct-print-region-helper, w32-direct-print-region-function)
(w32-direct-ps-print-region-function): Rename by adding a "w32-" prefix.
* lisp/startup.el (normal-top-level-add-subdirs-to-load-path):
* lisp/ps-print.el (ps-print-region-function):
* lisp/lpr.el (print-region-function): Use new name.
* lisp/simple.el (copy-region-as-kill): Fix call to region-extract-function.
* lisp/emacs-lisp/bytecomp.el (byte-defop-compiler): Add new `2-and' handler.
(byte-compile-and-folded): New function.
(=, <, >, <=, >=): Use it.
2013-10-30 02:45:53 +00:00
|
|
|
|
(2-and . byte-compile-and-folded)
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(3 . byte-compile-three-args)
|
|
|
|
|
(0-1 . byte-compile-zero-or-one-arg)
|
|
|
|
|
(1-2 . byte-compile-one-or-two-args)
|
|
|
|
|
(2-3 . byte-compile-two-or-three-args)
|
|
|
|
|
)))
|
|
|
|
|
compile-handler
|
|
|
|
|
(intern (concat "byte-compile-"
|
|
|
|
|
(symbol-name function))))))))
|
|
|
|
|
(if opcode
|
|
|
|
|
(list 'progn fnform
|
|
|
|
|
(list 'put (list 'quote function)
|
|
|
|
|
''byte-opcode (list 'quote opcode))
|
|
|
|
|
(list 'put (list 'quote opcode)
|
|
|
|
|
''byte-opcode-invert (list 'quote function)))
|
|
|
|
|
fnform))))
|
|
|
|
|
|
|
|
|
|
(defmacro byte-defop-compiler-1 (function &optional compile-handler)
|
|
|
|
|
(list 'byte-defop-compiler (list function nil) compile-handler))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
(put 'byte-call 'byte-opcode-invert 'funcall)
|
|
|
|
|
(put 'byte-list1 'byte-opcode-invert 'list)
|
|
|
|
|
(put 'byte-list2 'byte-opcode-invert 'list)
|
|
|
|
|
(put 'byte-list3 'byte-opcode-invert 'list)
|
|
|
|
|
(put 'byte-list4 'byte-opcode-invert 'list)
|
|
|
|
|
(put 'byte-listN 'byte-opcode-invert 'list)
|
|
|
|
|
(put 'byte-concat2 'byte-opcode-invert 'concat)
|
|
|
|
|
(put 'byte-concat3 'byte-opcode-invert 'concat)
|
|
|
|
|
(put 'byte-concat4 'byte-opcode-invert 'concat)
|
|
|
|
|
(put 'byte-concatN 'byte-opcode-invert 'concat)
|
|
|
|
|
(put 'byte-insertN 'byte-opcode-invert 'insert)
|
|
|
|
|
|
|
|
|
|
(byte-defop-compiler point 0)
|
|
|
|
|
;;(byte-defop-compiler mark 0) ;; obsolete
|
|
|
|
|
(byte-defop-compiler point-max 0)
|
|
|
|
|
(byte-defop-compiler point-min 0)
|
|
|
|
|
(byte-defop-compiler following-char 0)
|
|
|
|
|
(byte-defop-compiler preceding-char 0)
|
|
|
|
|
(byte-defop-compiler current-column 0)
|
|
|
|
|
(byte-defop-compiler eolp 0)
|
|
|
|
|
(byte-defop-compiler eobp 0)
|
|
|
|
|
(byte-defop-compiler bolp 0)
|
|
|
|
|
(byte-defop-compiler bobp 0)
|
|
|
|
|
(byte-defop-compiler current-buffer 0)
|
|
|
|
|
;;(byte-defop-compiler read-char 0) ;; obsolete
|
2011-04-01 15:16:50 +00:00
|
|
|
|
;; (byte-defop-compiler interactive-p 0) ;; Obsolete.
|
2009-11-04 03:17:15 +00:00
|
|
|
|
(byte-defop-compiler widen 0)
|
|
|
|
|
(byte-defop-compiler end-of-line 0-1)
|
|
|
|
|
(byte-defop-compiler forward-char 0-1)
|
|
|
|
|
(byte-defop-compiler forward-line 0-1)
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(byte-defop-compiler symbolp 1)
|
|
|
|
|
(byte-defop-compiler consp 1)
|
|
|
|
|
(byte-defop-compiler stringp 1)
|
|
|
|
|
(byte-defop-compiler listp 1)
|
|
|
|
|
(byte-defop-compiler not 1)
|
|
|
|
|
(byte-defop-compiler (null byte-not) 1)
|
|
|
|
|
(byte-defop-compiler car 1)
|
|
|
|
|
(byte-defop-compiler cdr 1)
|
|
|
|
|
(byte-defop-compiler length 1)
|
|
|
|
|
(byte-defop-compiler symbol-value 1)
|
|
|
|
|
(byte-defop-compiler symbol-function 1)
|
|
|
|
|
(byte-defop-compiler (1+ byte-add1) 1)
|
|
|
|
|
(byte-defop-compiler (1- byte-sub1) 1)
|
|
|
|
|
(byte-defop-compiler goto-char 1)
|
1997-07-10 10:55:23 +00:00
|
|
|
|
(byte-defop-compiler char-after 0-1)
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(byte-defop-compiler set-buffer 1)
|
|
|
|
|
;;(byte-defop-compiler set-mark 1) ;; obsolete
|
2009-11-04 03:17:15 +00:00
|
|
|
|
(byte-defop-compiler forward-word 0-1)
|
|
|
|
|
(byte-defop-compiler char-syntax 1)
|
|
|
|
|
(byte-defop-compiler nreverse 1)
|
|
|
|
|
(byte-defop-compiler car-safe 1)
|
|
|
|
|
(byte-defop-compiler cdr-safe 1)
|
|
|
|
|
(byte-defop-compiler numberp 1)
|
|
|
|
|
(byte-defop-compiler integerp 1)
|
|
|
|
|
(byte-defop-compiler skip-chars-forward 1-2)
|
|
|
|
|
(byte-defop-compiler skip-chars-backward 1-2)
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(byte-defop-compiler eq 2)
|
|
|
|
|
(byte-defop-compiler memq 2)
|
|
|
|
|
(byte-defop-compiler cons 2)
|
|
|
|
|
(byte-defop-compiler aref 2)
|
|
|
|
|
(byte-defop-compiler set 2)
|
Cleanup namespace of dos-w32.el.
* lisp/dos-w32.el (minibuffer-history-case-insensitive-variables)
(path-separator, null-device, buffer-file-coding-system)
(lpr-headers-switches): Check system-type before modifying them.
(find-buffer-file-type-coding-system): Mark obsolete.
(w32-find-file-not-found-set-buffer-file-coding-system): Rename from
find-file-not-found-set-buffer-file-coding-system.
(w32-untranslated-filesystem-list, w32-untranslated-canonical-name):
(w32-add-untranslated-filesystem, w32-remove-untranslated-filesystem)
(w32-direct-print-region-use-command-dot-com, w32-untranslated-file-p):
(w32-direct-print-region-helper, w32-direct-print-region-function)
(w32-direct-ps-print-region-function): Rename by adding a "w32-" prefix.
* lisp/startup.el (normal-top-level-add-subdirs-to-load-path):
* lisp/ps-print.el (ps-print-region-function):
* lisp/lpr.el (print-region-function): Use new name.
* lisp/simple.el (copy-region-as-kill): Fix call to region-extract-function.
* lisp/emacs-lisp/bytecomp.el (byte-defop-compiler): Add new `2-and' handler.
(byte-compile-and-folded): New function.
(=, <, >, <=, >=): Use it.
2013-10-30 02:45:53 +00:00
|
|
|
|
(byte-defop-compiler (= byte-eqlsign) 2-and)
|
|
|
|
|
(byte-defop-compiler (< byte-lss) 2-and)
|
|
|
|
|
(byte-defop-compiler (> byte-gtr) 2-and)
|
|
|
|
|
(byte-defop-compiler (<= byte-leq) 2-and)
|
|
|
|
|
(byte-defop-compiler (>= byte-geq) 2-and)
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(byte-defop-compiler get 2)
|
|
|
|
|
(byte-defop-compiler nth 2)
|
|
|
|
|
(byte-defop-compiler substring 2-3)
|
2009-11-04 03:17:15 +00:00
|
|
|
|
(byte-defop-compiler (move-marker byte-set-marker) 2-3)
|
|
|
|
|
(byte-defop-compiler set-marker 2-3)
|
|
|
|
|
(byte-defop-compiler match-beginning 1)
|
|
|
|
|
(byte-defop-compiler match-end 1)
|
|
|
|
|
(byte-defop-compiler upcase 1)
|
|
|
|
|
(byte-defop-compiler downcase 1)
|
|
|
|
|
(byte-defop-compiler string= 2)
|
|
|
|
|
(byte-defop-compiler string< 2)
|
|
|
|
|
(byte-defop-compiler (string-equal byte-string=) 2)
|
|
|
|
|
(byte-defop-compiler (string-lessp byte-string<) 2)
|
|
|
|
|
(byte-defop-compiler equal 2)
|
|
|
|
|
(byte-defop-compiler nthcdr 2)
|
|
|
|
|
(byte-defop-compiler elt 2)
|
|
|
|
|
(byte-defop-compiler member 2)
|
|
|
|
|
(byte-defop-compiler assq 2)
|
|
|
|
|
(byte-defop-compiler (rplaca byte-setcar) 2)
|
|
|
|
|
(byte-defop-compiler (rplacd byte-setcdr) 2)
|
|
|
|
|
(byte-defop-compiler setcar 2)
|
|
|
|
|
(byte-defop-compiler setcdr 2)
|
|
|
|
|
(byte-defop-compiler buffer-substring 2)
|
|
|
|
|
(byte-defop-compiler delete-region 2)
|
|
|
|
|
(byte-defop-compiler narrow-to-region 2)
|
|
|
|
|
(byte-defop-compiler (% byte-rem) 2)
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(byte-defop-compiler aset 3)
|
|
|
|
|
|
|
|
|
|
(byte-defop-compiler max byte-compile-associative)
|
|
|
|
|
(byte-defop-compiler min byte-compile-associative)
|
|
|
|
|
(byte-defop-compiler (+ byte-plus) byte-compile-associative)
|
2009-11-04 03:17:15 +00:00
|
|
|
|
(byte-defop-compiler (* byte-mult) byte-compile-associative)
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
2009-11-04 03:17:15 +00:00
|
|
|
|
;;####(byte-defop-compiler move-to-column 1)
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(byte-defop-compiler-1 interactive byte-compile-noop)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
(defun byte-compile-subr-wrong-args (form n)
|
2002-05-28 17:40:47 +00:00
|
|
|
|
(byte-compile-set-symbol-position (car form))
|
2004-06-13 22:01:36 +00:00
|
|
|
|
(byte-compile-warn "`%s' called with %d arg%s, but requires %s"
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(car form) (length (cdr form))
|
|
|
|
|
(if (= 1 (length (cdr form))) "" "s") n)
|
2011-03-23 00:53:36 +00:00
|
|
|
|
;; Get run-time wrong-number-of-args error.
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(byte-compile-normal-call form))
|
|
|
|
|
|
|
|
|
|
(defun byte-compile-no-args (form)
|
|
|
|
|
(if (not (= (length form) 1))
|
|
|
|
|
(byte-compile-subr-wrong-args form "none")
|
|
|
|
|
(byte-compile-out (get (car form) 'byte-opcode) 0)))
|
|
|
|
|
|
|
|
|
|
(defun byte-compile-one-arg (form)
|
|
|
|
|
(if (not (= (length form) 2))
|
|
|
|
|
(byte-compile-subr-wrong-args form 1)
|
|
|
|
|
(byte-compile-form (car (cdr form))) ;; Push the argument
|
|
|
|
|
(byte-compile-out (get (car form) 'byte-opcode) 0)))
|
|
|
|
|
|
|
|
|
|
(defun byte-compile-two-args (form)
|
|
|
|
|
(if (not (= (length form) 3))
|
|
|
|
|
(byte-compile-subr-wrong-args form 2)
|
|
|
|
|
(byte-compile-form (car (cdr form))) ;; Push the arguments
|
|
|
|
|
(byte-compile-form (nth 2 form))
|
|
|
|
|
(byte-compile-out (get (car form) 'byte-opcode) 0)))
|
|
|
|
|
|
Cleanup namespace of dos-w32.el.
* lisp/dos-w32.el (minibuffer-history-case-insensitive-variables)
(path-separator, null-device, buffer-file-coding-system)
(lpr-headers-switches): Check system-type before modifying them.
(find-buffer-file-type-coding-system): Mark obsolete.
(w32-find-file-not-found-set-buffer-file-coding-system): Rename from
find-file-not-found-set-buffer-file-coding-system.
(w32-untranslated-filesystem-list, w32-untranslated-canonical-name):
(w32-add-untranslated-filesystem, w32-remove-untranslated-filesystem)
(w32-direct-print-region-use-command-dot-com, w32-untranslated-file-p):
(w32-direct-print-region-helper, w32-direct-print-region-function)
(w32-direct-ps-print-region-function): Rename by adding a "w32-" prefix.
* lisp/startup.el (normal-top-level-add-subdirs-to-load-path):
* lisp/ps-print.el (ps-print-region-function):
* lisp/lpr.el (print-region-function): Use new name.
* lisp/simple.el (copy-region-as-kill): Fix call to region-extract-function.
* lisp/emacs-lisp/bytecomp.el (byte-defop-compiler): Add new `2-and' handler.
(byte-compile-and-folded): New function.
(=, <, >, <=, >=): Use it.
2013-10-30 02:45:53 +00:00
|
|
|
|
(defun byte-compile-and-folded (form)
|
|
|
|
|
"Compile calls to functions like `<='.
|
|
|
|
|
These implicitly `and' together a bunch of two-arg bytecodes."
|
|
|
|
|
(let ((l (length form)))
|
|
|
|
|
(cond
|
|
|
|
|
((< l 3) (byte-compile-form `(progn ,(nth 1 form) t)))
|
|
|
|
|
((= l 3) (byte-compile-two-args form))
|
|
|
|
|
(t (byte-compile-form `(and (,(car form) ,(nth 1 form) ,(nth 2 form))
|
|
|
|
|
(,(car form) ,@(nthcdr 2 form))))))))
|
|
|
|
|
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(defun byte-compile-three-args (form)
|
|
|
|
|
(if (not (= (length form) 4))
|
|
|
|
|
(byte-compile-subr-wrong-args form 3)
|
|
|
|
|
(byte-compile-form (car (cdr form))) ;; Push the arguments
|
|
|
|
|
(byte-compile-form (nth 2 form))
|
|
|
|
|
(byte-compile-form (nth 3 form))
|
|
|
|
|
(byte-compile-out (get (car form) 'byte-opcode) 0)))
|
|
|
|
|
|
|
|
|
|
(defun byte-compile-zero-or-one-arg (form)
|
|
|
|
|
(let ((len (length form)))
|
|
|
|
|
(cond ((= len 1) (byte-compile-one-arg (append form '(nil))))
|
|
|
|
|
((= len 2) (byte-compile-one-arg form))
|
|
|
|
|
(t (byte-compile-subr-wrong-args form "0-1")))))
|
|
|
|
|
|
|
|
|
|
(defun byte-compile-one-or-two-args (form)
|
|
|
|
|
(let ((len (length form)))
|
|
|
|
|
(cond ((= len 2) (byte-compile-two-args (append form '(nil))))
|
|
|
|
|
((= len 3) (byte-compile-two-args form))
|
|
|
|
|
(t (byte-compile-subr-wrong-args form "1-2")))))
|
|
|
|
|
|
|
|
|
|
(defun byte-compile-two-or-three-args (form)
|
|
|
|
|
(let ((len (length form)))
|
|
|
|
|
(cond ((= len 3) (byte-compile-three-args (append form '(nil))))
|
|
|
|
|
((= len 4) (byte-compile-three-args form))
|
|
|
|
|
(t (byte-compile-subr-wrong-args form "2-3")))))
|
|
|
|
|
|
2011-03-10 19:40:48 +00:00
|
|
|
|
(defun byte-compile-noop (_form)
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(byte-compile-constant nil))
|
|
|
|
|
|
2010-06-13 20:36:17 +00:00
|
|
|
|
(defun byte-compile-discard (&optional num preserve-tos)
|
Try and fix w32 build; misc cleanup.
* lisp/subr.el (apply-partially): Move from subr.el; don't use lexical-let.
(eval-after-load): Obey lexical-binding.
* lisp/simple.el (apply-partially): Move to subr.el.
* lisp/makefile.w32-in: Match changes in Makefile.in.
(BIG_STACK_DEPTH, BIG_STACK_OPTS, BYTE_COMPILE_FLAGS): New vars.
(.el.elc, compile-CMD, compile-SH, compile-always-CMD)
(compile-always-SH, compile-calc-CMD, compile-calc-SH): Use them.
(COMPILE_FIRST): Add pcase, macroexp, and cconv.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Silence warning about
calling CL's `compiler-macroexpand'.
* lisp/emacs-lisp/bytecomp.el (byte-compile-preprocess): New function.
(byte-compile-initial-macro-environment)
(byte-compile-toplevel-file-form, byte-compile, byte-compile-sexp): Use it.
(byte-compile-eval, byte-compile-eval-before-compile): Obey lexical-binding.
(byte-compile--for-effect): Rename from `for-effect'.
(display-call-tree): Use case.
* lisp/emacs-lisp/byte-opt.el (for-effect): Don't declare as dynamic.
(byte-optimize-form-code-walker, byte-optimize-form):
Revert to old arg name.
* lisp/Makefile.in (BYTE_COMPILE_FLAGS): New var.
(compile-onefile, .el.elc, compile-calc, recompile): Use it.
2011-03-12 03:32:43 +00:00
|
|
|
|
"Output byte codes to discard the NUM entries at the top of the stack.
|
|
|
|
|
NUM defaults to 1.
|
2010-06-13 20:36:17 +00:00
|
|
|
|
If PRESERVE-TOS is non-nil, preserve the top-of-stack value, as if it were
|
|
|
|
|
popped before discarding the num values, and then pushed back again after
|
|
|
|
|
discarding."
|
|
|
|
|
(if (and (null num) (not preserve-tos))
|
|
|
|
|
;; common case
|
|
|
|
|
(byte-compile-out 'byte-discard)
|
|
|
|
|
;; general case
|
|
|
|
|
(unless num
|
|
|
|
|
(setq num 1))
|
|
|
|
|
(when (and preserve-tos (> num 0))
|
|
|
|
|
;; Preserve the top-of-stack value by writing it directly to the stack
|
|
|
|
|
;; location which will be at the top-of-stack after popping.
|
|
|
|
|
(byte-compile-stack-set (1- (- byte-compile-depth num)))
|
|
|
|
|
;; Now we actually discard one less value, since we want to keep
|
|
|
|
|
;; the eventual TOS
|
|
|
|
|
(setq num (1- num)))
|
|
|
|
|
(while (> num 0)
|
|
|
|
|
(byte-compile-out 'byte-discard)
|
|
|
|
|
(setq num (1- num)))))
|
|
|
|
|
|
|
|
|
|
(defun byte-compile-stack-ref (stack-pos)
|
Try and fix w32 build; misc cleanup.
* lisp/subr.el (apply-partially): Move from subr.el; don't use lexical-let.
(eval-after-load): Obey lexical-binding.
* lisp/simple.el (apply-partially): Move to subr.el.
* lisp/makefile.w32-in: Match changes in Makefile.in.
(BIG_STACK_DEPTH, BIG_STACK_OPTS, BYTE_COMPILE_FLAGS): New vars.
(.el.elc, compile-CMD, compile-SH, compile-always-CMD)
(compile-always-SH, compile-calc-CMD, compile-calc-SH): Use them.
(COMPILE_FIRST): Add pcase, macroexp, and cconv.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Silence warning about
calling CL's `compiler-macroexpand'.
* lisp/emacs-lisp/bytecomp.el (byte-compile-preprocess): New function.
(byte-compile-initial-macro-environment)
(byte-compile-toplevel-file-form, byte-compile, byte-compile-sexp): Use it.
(byte-compile-eval, byte-compile-eval-before-compile): Obey lexical-binding.
(byte-compile--for-effect): Rename from `for-effect'.
(display-call-tree): Use case.
* lisp/emacs-lisp/byte-opt.el (for-effect): Don't declare as dynamic.
(byte-optimize-form-code-walker, byte-optimize-form):
Revert to old arg name.
* lisp/Makefile.in (BYTE_COMPILE_FLAGS): New var.
(compile-onefile, .el.elc, compile-calc, recompile): Use it.
2011-03-12 03:32:43 +00:00
|
|
|
|
"Output byte codes to push the value at stack position STACK-POS."
|
2011-02-21 20:12:44 +00:00
|
|
|
|
(let ((dist (- byte-compile-depth (1+ stack-pos))))
|
|
|
|
|
(if (zerop dist)
|
|
|
|
|
;; A simple optimization
|
|
|
|
|
(byte-compile-out 'byte-dup)
|
|
|
|
|
;; normal case
|
|
|
|
|
(byte-compile-out 'byte-stack-ref dist))))
|
2010-06-13 20:36:17 +00:00
|
|
|
|
|
|
|
|
|
(defun byte-compile-stack-set (stack-pos)
|
Try and fix w32 build; misc cleanup.
* lisp/subr.el (apply-partially): Move from subr.el; don't use lexical-let.
(eval-after-load): Obey lexical-binding.
* lisp/simple.el (apply-partially): Move to subr.el.
* lisp/makefile.w32-in: Match changes in Makefile.in.
(BIG_STACK_DEPTH, BIG_STACK_OPTS, BYTE_COMPILE_FLAGS): New vars.
(.el.elc, compile-CMD, compile-SH, compile-always-CMD)
(compile-always-SH, compile-calc-CMD, compile-calc-SH): Use them.
(COMPILE_FIRST): Add pcase, macroexp, and cconv.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Silence warning about
calling CL's `compiler-macroexpand'.
* lisp/emacs-lisp/bytecomp.el (byte-compile-preprocess): New function.
(byte-compile-initial-macro-environment)
(byte-compile-toplevel-file-form, byte-compile, byte-compile-sexp): Use it.
(byte-compile-eval, byte-compile-eval-before-compile): Obey lexical-binding.
(byte-compile--for-effect): Rename from `for-effect'.
(display-call-tree): Use case.
* lisp/emacs-lisp/byte-opt.el (for-effect): Don't declare as dynamic.
(byte-optimize-form-code-walker, byte-optimize-form):
Revert to old arg name.
* lisp/Makefile.in (BYTE_COMPILE_FLAGS): New var.
(compile-onefile, .el.elc, compile-calc, recompile): Use it.
2011-03-12 03:32:43 +00:00
|
|
|
|
"Output byte codes to store the TOS value at stack position STACK-POS."
|
2011-02-21 20:12:44 +00:00
|
|
|
|
(byte-compile-out 'byte-stack-set (- byte-compile-depth (1+ stack-pos))))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
2011-02-21 23:40:54 +00:00
|
|
|
|
(byte-defop-compiler-1 internal-make-closure byte-compile-make-closure)
|
|
|
|
|
(byte-defop-compiler-1 internal-get-closed-var byte-compile-get-closed-var)
|
|
|
|
|
|
|
|
|
|
(defun byte-compile-make-closure (form)
|
2011-04-01 15:16:50 +00:00
|
|
|
|
"Byte-compile the special `internal-make-closure' form."
|
Try and fix w32 build; misc cleanup.
* lisp/subr.el (apply-partially): Move from subr.el; don't use lexical-let.
(eval-after-load): Obey lexical-binding.
* lisp/simple.el (apply-partially): Move to subr.el.
* lisp/makefile.w32-in: Match changes in Makefile.in.
(BIG_STACK_DEPTH, BIG_STACK_OPTS, BYTE_COMPILE_FLAGS): New vars.
(.el.elc, compile-CMD, compile-SH, compile-always-CMD)
(compile-always-SH, compile-calc-CMD, compile-calc-SH): Use them.
(COMPILE_FIRST): Add pcase, macroexp, and cconv.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Silence warning about
calling CL's `compiler-macroexpand'.
* lisp/emacs-lisp/bytecomp.el (byte-compile-preprocess): New function.
(byte-compile-initial-macro-environment)
(byte-compile-toplevel-file-form, byte-compile, byte-compile-sexp): Use it.
(byte-compile-eval, byte-compile-eval-before-compile): Obey lexical-binding.
(byte-compile--for-effect): Rename from `for-effect'.
(display-call-tree): Use case.
* lisp/emacs-lisp/byte-opt.el (for-effect): Don't declare as dynamic.
(byte-optimize-form-code-walker, byte-optimize-form):
Revert to old arg name.
* lisp/Makefile.in (BYTE_COMPILE_FLAGS): New var.
(compile-onefile, .el.elc, compile-calc, recompile): Use it.
2011-03-12 03:32:43 +00:00
|
|
|
|
(if byte-compile--for-effect (setq byte-compile--for-effect nil)
|
Get rid of funvec.
* lisp/emacs-lisp/bytecomp.el (byte-compile-lapcode): Handle new form of
`byte-constant'.
(byte-compile-close-variables, displaying-byte-compile-warnings):
Add edebug spec.
(byte-compile-toplevel-file-form): New fun, split out of
byte-compile-file-form.
(byte-compile-from-buffer): Use it to avoid applying cconv
multiple times.
(byte-compile): Only strip `function' if it's present.
(byte-compile-lambda): Add `reserved-csts' argument.
Use new lexenv arg of byte-compile-top-level.
(byte-compile-reserved-constants): New var.
(byte-compile-constants-vector): Obey it.
(byte-compile-constants-vector): Handle new `byte-constant' form.
(byte-compile-top-level): Add args `lexenv' and `reserved-csts'.
(byte-compile-form): Don't check callargs here.
(byte-compile-normal-call): Do it here instead.
(byte-compile-push-unknown-constant)
(byte-compile-resolve-unknown-constant): Remove, unused.
(byte-compile-make-closure): Use `make-byte-code' rather than `curry',
putting the environment into the "constant" pool.
(byte-compile-get-closed-var): Use special byte-constant.
* lisp/emacs-lisp/byte-opt.el (byte-optimize-form-code-walker): Handle new
intermediate special form `internal-make-vector'.
(byte-optimize-lapcode): Handle new form of `byte-constant'.
* lisp/help-fns.el (describe-function-1): Don't handle funvecs.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Only convert quote to
function if the content is a lambda expression, not if it's a closure.
* emacs-lisp/eieio-come.el: Remove.
* lisp/emacs-lisp/eieio.el: Don't require eieio-comp.
(defmethod): Do a bit more work to find the body and wrap it into
a function before passing it to eieio-defmethod.
(eieio-defmethod): New arg `code' for it.
* lisp/emacs-lisp/debug.el (debugger-setup-buffer): Don't hide things in
debugger backtrace.
* lisp/emacs-lisp/cl-extra.el (cl-macroexpand-all): Use backquotes, and be
more careful when quoting a function value.
* lisp/emacs-lisp/cconv.el (cconv-freevars): Accept defvar/defconst.
(cconv-closure-convert-rec): Catch stray `internal-make-closure'.
* lisp/Makefile.in (COMPILE_FIRST): Compile pcase and cconv early.
* src/eval.c (Qcurry): Remove.
(funcall_funvec): Remove.
(funcall_lambda): Move new byte-code handling to reduce impact.
Treat all args as lexical in the case of lexbind.
(Fcurry): Remove.
* src/data.c (Qfunction_vector): Remove.
(Ffunvecp): Remove.
* src/lread.c (read1): Revert to calling make_byte_code here.
(read_vector): Don't call make_byte_code any more.
* src/lisp.h (enum pvec_type): Rename back to PVEC_COMPILED.
(XSETCOMPILED): Rename back from XSETFUNVEC.
(FUNVEC_SIZE): Remove.
(FUNVEC_COMPILED_TAG_P, FUNVEC_COMPILED_P): Remove.
(COMPILEDP): Rename back from FUNVECP.
* src/fns.c (Felt): Remove unexplained FUNVEC check.
* src/doc.c (Fdocumentation): Don't handle funvec.
* src/alloc.c (make_funvec, Ffunvec): Remove.
* doc/lispref/vol2.texi (Top):
* doc/lispref/vol1.texi (Top):
* doc/lispref/objects.texi (Programming Types, Funvec Type, Type Predicates):
* doc/lispref/functions.texi (Functions, What Is a Function, FunctionCurrying):
* doc/lispref/elisp.texi (Top): Remove mentions of funvec and curry.
2011-02-25 03:27:45 +00:00
|
|
|
|
(let* ((vars (nth 1 form))
|
|
|
|
|
(env (nth 2 form))
|
|
|
|
|
(body (nthcdr 3 form))
|
|
|
|
|
(fun
|
|
|
|
|
(byte-compile-lambda `(lambda ,vars . ,body) nil (length env))))
|
2012-06-10 13:28:26 +00:00
|
|
|
|
(cl-assert (> (length env) 0)) ;Otherwise, we don't need a closure.
|
|
|
|
|
(cl-assert (byte-code-function-p fun))
|
Get rid of funvec.
* lisp/emacs-lisp/bytecomp.el (byte-compile-lapcode): Handle new form of
`byte-constant'.
(byte-compile-close-variables, displaying-byte-compile-warnings):
Add edebug spec.
(byte-compile-toplevel-file-form): New fun, split out of
byte-compile-file-form.
(byte-compile-from-buffer): Use it to avoid applying cconv
multiple times.
(byte-compile): Only strip `function' if it's present.
(byte-compile-lambda): Add `reserved-csts' argument.
Use new lexenv arg of byte-compile-top-level.
(byte-compile-reserved-constants): New var.
(byte-compile-constants-vector): Obey it.
(byte-compile-constants-vector): Handle new `byte-constant' form.
(byte-compile-top-level): Add args `lexenv' and `reserved-csts'.
(byte-compile-form): Don't check callargs here.
(byte-compile-normal-call): Do it here instead.
(byte-compile-push-unknown-constant)
(byte-compile-resolve-unknown-constant): Remove, unused.
(byte-compile-make-closure): Use `make-byte-code' rather than `curry',
putting the environment into the "constant" pool.
(byte-compile-get-closed-var): Use special byte-constant.
* lisp/emacs-lisp/byte-opt.el (byte-optimize-form-code-walker): Handle new
intermediate special form `internal-make-vector'.
(byte-optimize-lapcode): Handle new form of `byte-constant'.
* lisp/help-fns.el (describe-function-1): Don't handle funvecs.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Only convert quote to
function if the content is a lambda expression, not if it's a closure.
* emacs-lisp/eieio-come.el: Remove.
* lisp/emacs-lisp/eieio.el: Don't require eieio-comp.
(defmethod): Do a bit more work to find the body and wrap it into
a function before passing it to eieio-defmethod.
(eieio-defmethod): New arg `code' for it.
* lisp/emacs-lisp/debug.el (debugger-setup-buffer): Don't hide things in
debugger backtrace.
* lisp/emacs-lisp/cl-extra.el (cl-macroexpand-all): Use backquotes, and be
more careful when quoting a function value.
* lisp/emacs-lisp/cconv.el (cconv-freevars): Accept defvar/defconst.
(cconv-closure-convert-rec): Catch stray `internal-make-closure'.
* lisp/Makefile.in (COMPILE_FIRST): Compile pcase and cconv early.
* src/eval.c (Qcurry): Remove.
(funcall_funvec): Remove.
(funcall_lambda): Move new byte-code handling to reduce impact.
Treat all args as lexical in the case of lexbind.
(Fcurry): Remove.
* src/data.c (Qfunction_vector): Remove.
(Ffunvecp): Remove.
* src/lread.c (read1): Revert to calling make_byte_code here.
(read_vector): Don't call make_byte_code any more.
* src/lisp.h (enum pvec_type): Rename back to PVEC_COMPILED.
(XSETCOMPILED): Rename back from XSETFUNVEC.
(FUNVEC_SIZE): Remove.
(FUNVEC_COMPILED_TAG_P, FUNVEC_COMPILED_P): Remove.
(COMPILEDP): Rename back from FUNVECP.
* src/fns.c (Felt): Remove unexplained FUNVEC check.
* src/doc.c (Fdocumentation): Don't handle funvec.
* src/alloc.c (make_funvec, Ffunvec): Remove.
* doc/lispref/vol2.texi (Top):
* doc/lispref/vol1.texi (Top):
* doc/lispref/objects.texi (Programming Types, Funvec Type, Type Predicates):
* doc/lispref/functions.texi (Functions, What Is a Function, FunctionCurrying):
* doc/lispref/elisp.texi (Top): Remove mentions of funvec and curry.
2011-02-25 03:27:45 +00:00
|
|
|
|
(byte-compile-form `(make-byte-code
|
|
|
|
|
',(aref fun 0) ',(aref fun 1)
|
|
|
|
|
(vconcat (vector . ,env) ',(aref fun 2))
|
|
|
|
|
,@(nthcdr 3 (mapcar (lambda (x) `',x) fun)))))))
|
2011-02-21 23:40:54 +00:00
|
|
|
|
|
|
|
|
|
(defun byte-compile-get-closed-var (form)
|
2011-04-01 15:16:50 +00:00
|
|
|
|
"Byte-compile the special `internal-get-closed-var' form."
|
Try and fix w32 build; misc cleanup.
* lisp/subr.el (apply-partially): Move from subr.el; don't use lexical-let.
(eval-after-load): Obey lexical-binding.
* lisp/simple.el (apply-partially): Move to subr.el.
* lisp/makefile.w32-in: Match changes in Makefile.in.
(BIG_STACK_DEPTH, BIG_STACK_OPTS, BYTE_COMPILE_FLAGS): New vars.
(.el.elc, compile-CMD, compile-SH, compile-always-CMD)
(compile-always-SH, compile-calc-CMD, compile-calc-SH): Use them.
(COMPILE_FIRST): Add pcase, macroexp, and cconv.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Silence warning about
calling CL's `compiler-macroexpand'.
* lisp/emacs-lisp/bytecomp.el (byte-compile-preprocess): New function.
(byte-compile-initial-macro-environment)
(byte-compile-toplevel-file-form, byte-compile, byte-compile-sexp): Use it.
(byte-compile-eval, byte-compile-eval-before-compile): Obey lexical-binding.
(byte-compile--for-effect): Rename from `for-effect'.
(display-call-tree): Use case.
* lisp/emacs-lisp/byte-opt.el (for-effect): Don't declare as dynamic.
(byte-optimize-form-code-walker, byte-optimize-form):
Revert to old arg name.
* lisp/Makefile.in (BYTE_COMPILE_FLAGS): New var.
(compile-onefile, .el.elc, compile-calc, recompile): Use it.
2011-03-12 03:32:43 +00:00
|
|
|
|
(if byte-compile--for-effect (setq byte-compile--for-effect nil)
|
2011-04-01 15:16:50 +00:00
|
|
|
|
(byte-compile-out 'byte-constant (nth 1 form))))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
|
|
|
|
;; Compile a function that accepts one or more args and is right-associative.
|
1995-11-10 17:16:57 +00:00
|
|
|
|
;; We do it by left-associativity so that the operations
|
|
|
|
|
;; are done in the same order as in interpreted code.
|
1996-08-29 06:20:21 +00:00
|
|
|
|
;; We treat the one-arg case, as in (+ x), like (+ x 0).
|
|
|
|
|
;; in order to convert markers to numbers, and trigger expected errors.
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(defun byte-compile-associative (form)
|
|
|
|
|
(if (cdr form)
|
1995-11-10 17:16:57 +00:00
|
|
|
|
(let ((opcode (get (car form) 'byte-opcode))
|
2008-11-14 18:08:10 +00:00
|
|
|
|
args)
|
|
|
|
|
(if (and (< 3 (length form))
|
|
|
|
|
(memq opcode (list (get '+ 'byte-opcode)
|
|
|
|
|
(get '* 'byte-opcode))))
|
|
|
|
|
;; Don't use binary operations for > 2 operands, as that
|
|
|
|
|
;; may cause overflow/truncation in float operations.
|
|
|
|
|
(byte-compile-normal-call form)
|
|
|
|
|
(setq args (copy-sequence (cdr form)))
|
|
|
|
|
(byte-compile-form (car args))
|
|
|
|
|
(setq args (cdr args))
|
|
|
|
|
(or args (setq args '(0)
|
|
|
|
|
opcode (get '+ 'byte-opcode)))
|
|
|
|
|
(dolist (arg args)
|
|
|
|
|
(byte-compile-form arg)
|
|
|
|
|
(byte-compile-out opcode 0))))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(byte-compile-constant (eval form))))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;; more complicated compiler macros
|
|
|
|
|
|
2007-04-10 03:54:36 +00:00
|
|
|
|
(byte-defop-compiler char-before)
|
2007-04-11 03:59:20 +00:00
|
|
|
|
(byte-defop-compiler backward-char)
|
|
|
|
|
(byte-defop-compiler backward-word)
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(byte-defop-compiler list)
|
|
|
|
|
(byte-defop-compiler concat)
|
|
|
|
|
(byte-defop-compiler fset)
|
|
|
|
|
(byte-defop-compiler (indent-to-column byte-indent-to) byte-compile-indent-to)
|
|
|
|
|
(byte-defop-compiler indent-to)
|
|
|
|
|
(byte-defop-compiler insert)
|
|
|
|
|
(byte-defop-compiler-1 function byte-compile-function-form)
|
|
|
|
|
(byte-defop-compiler-1 - byte-compile-minus)
|
2009-11-04 03:17:15 +00:00
|
|
|
|
(byte-defop-compiler (/ byte-quo) byte-compile-quo)
|
|
|
|
|
(byte-defop-compiler nconc)
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
2013-06-08 01:35:47 +00:00
|
|
|
|
;; Is this worth it? Both -before and -after are written in C.
|
2007-04-10 03:54:36 +00:00
|
|
|
|
(defun byte-compile-char-before (form)
|
2013-06-06 21:04:43 +00:00
|
|
|
|
(cond ((or (= 1 (length form))
|
|
|
|
|
(and (= 2 (length form)) (not (nth 1 form))))
|
|
|
|
|
(byte-compile-form '(char-after (1- (point)))))
|
|
|
|
|
((= 2 (length form))
|
2007-04-11 03:59:20 +00:00
|
|
|
|
(byte-compile-form (list 'char-after (if (numberp (nth 1 form))
|
|
|
|
|
(1- (nth 1 form))
|
2013-06-08 01:35:47 +00:00
|
|
|
|
`(1- (or ,(nth 1 form)
|
|
|
|
|
(point)))))))
|
2007-04-11 03:59:20 +00:00
|
|
|
|
(t (byte-compile-subr-wrong-args form "0-1"))))
|
|
|
|
|
|
|
|
|
|
;; backward-... ==> forward-... with negated argument.
|
2013-06-08 01:35:47 +00:00
|
|
|
|
;; Is this worth it? Both -backward and -forward are written in C.
|
2007-04-11 03:59:20 +00:00
|
|
|
|
(defun byte-compile-backward-char (form)
|
2013-06-06 21:04:43 +00:00
|
|
|
|
(cond ((or (= 1 (length form))
|
|
|
|
|
(and (= 2 (length form)) (not (nth 1 form))))
|
|
|
|
|
(byte-compile-form '(forward-char -1)))
|
|
|
|
|
((= 2 (length form))
|
2007-04-11 03:59:20 +00:00
|
|
|
|
(byte-compile-form (list 'forward-char (if (numberp (nth 1 form))
|
|
|
|
|
(- (nth 1 form))
|
2013-06-08 01:35:47 +00:00
|
|
|
|
`(- (or ,(nth 1 form) 1))))))
|
2007-04-11 03:59:20 +00:00
|
|
|
|
(t (byte-compile-subr-wrong-args form "0-1"))))
|
|
|
|
|
|
|
|
|
|
(defun byte-compile-backward-word (form)
|
2013-06-06 21:04:43 +00:00
|
|
|
|
(cond ((or (= 1 (length form))
|
|
|
|
|
(and (= 2 (length form)) (not (nth 1 form))))
|
|
|
|
|
(byte-compile-form '(forward-word -1)))
|
|
|
|
|
((= 2 (length form))
|
2007-04-11 03:59:20 +00:00
|
|
|
|
(byte-compile-form (list 'forward-word (if (numberp (nth 1 form))
|
|
|
|
|
(- (nth 1 form))
|
2013-06-08 01:35:47 +00:00
|
|
|
|
`(- (or ,(nth 1 form) 1))))))
|
2007-04-11 03:59:20 +00:00
|
|
|
|
(t (byte-compile-subr-wrong-args form "0-1"))))
|
2007-04-10 03:54:36 +00:00
|
|
|
|
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(defun byte-compile-list (form)
|
|
|
|
|
(let ((count (length (cdr form))))
|
|
|
|
|
(cond ((= count 0)
|
|
|
|
|
(byte-compile-constant nil))
|
|
|
|
|
((< count 5)
|
2000-05-26 10:35:38 +00:00
|
|
|
|
(mapc 'byte-compile-form (cdr form))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(byte-compile-out
|
|
|
|
|
(aref [byte-list1 byte-list2 byte-list3 byte-list4] (1- count)) 0))
|
2009-11-04 03:15:14 +00:00
|
|
|
|
((< count 256)
|
2000-05-26 10:35:38 +00:00
|
|
|
|
(mapc 'byte-compile-form (cdr form))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(byte-compile-out 'byte-listN count))
|
|
|
|
|
(t (byte-compile-normal-call form)))))
|
|
|
|
|
|
|
|
|
|
(defun byte-compile-concat (form)
|
|
|
|
|
(let ((count (length (cdr form))))
|
|
|
|
|
(cond ((and (< 1 count) (< count 5))
|
2000-05-26 10:35:38 +00:00
|
|
|
|
(mapc 'byte-compile-form (cdr form))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(byte-compile-out
|
|
|
|
|
(aref [byte-concat2 byte-concat3 byte-concat4] (- count 2))
|
|
|
|
|
0))
|
|
|
|
|
;; Concat of one arg is not a no-op if arg is not a string.
|
|
|
|
|
((= count 0)
|
|
|
|
|
(byte-compile-form ""))
|
2009-11-04 03:15:14 +00:00
|
|
|
|
((< count 256)
|
2000-05-26 10:35:38 +00:00
|
|
|
|
(mapc 'byte-compile-form (cdr form))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(byte-compile-out 'byte-concatN count))
|
|
|
|
|
((byte-compile-normal-call form)))))
|
|
|
|
|
|
|
|
|
|
(defun byte-compile-minus (form)
|
2008-11-14 18:08:10 +00:00
|
|
|
|
(let ((len (length form)))
|
|
|
|
|
(cond
|
|
|
|
|
((= 1 len) (byte-compile-constant 0))
|
|
|
|
|
((= 2 len)
|
|
|
|
|
(byte-compile-form (cadr form))
|
|
|
|
|
(byte-compile-out 'byte-negate 0))
|
2008-11-20 12:13:49 +00:00
|
|
|
|
((= 3 len)
|
2008-11-14 18:08:10 +00:00
|
|
|
|
(byte-compile-form (nth 1 form))
|
|
|
|
|
(byte-compile-form (nth 2 form))
|
|
|
|
|
(byte-compile-out 'byte-diff 0))
|
|
|
|
|
;; Don't use binary operations for > 2 operands, as that may
|
|
|
|
|
;; cause overflow/truncation in float operations.
|
|
|
|
|
(t (byte-compile-normal-call form)))))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
|
|
|
|
(defun byte-compile-quo (form)
|
|
|
|
|
(let ((len (length form)))
|
|
|
|
|
(cond ((<= len 2)
|
|
|
|
|
(byte-compile-subr-wrong-args form "2 or more"))
|
2008-11-14 18:08:10 +00:00
|
|
|
|
((= len 3)
|
|
|
|
|
(byte-compile-two-args form))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(t
|
2008-11-14 18:08:10 +00:00
|
|
|
|
;; Don't use binary operations for > 2 operands, as that
|
|
|
|
|
;; may cause overflow/truncation in float operations.
|
|
|
|
|
(byte-compile-normal-call form)))))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
|
|
|
|
(defun byte-compile-nconc (form)
|
|
|
|
|
(let ((len (length form)))
|
|
|
|
|
(cond ((= len 1)
|
|
|
|
|
(byte-compile-constant nil))
|
|
|
|
|
((= len 2)
|
|
|
|
|
;; nconc of one arg is a noop, even if that arg isn't a list.
|
|
|
|
|
(byte-compile-form (nth 1 form)))
|
|
|
|
|
(t
|
|
|
|
|
(byte-compile-form (car (setq form (cdr form))))
|
|
|
|
|
(while (setq form (cdr form))
|
|
|
|
|
(byte-compile-form (car form))
|
|
|
|
|
(byte-compile-out 'byte-nconc 0))))))
|
|
|
|
|
|
|
|
|
|
(defun byte-compile-fset (form)
|
|
|
|
|
;; warn about forms like (fset 'foo '(lambda () ...))
|
|
|
|
|
;; (where the lambda expression is non-trivial...)
|
|
|
|
|
(let ((fn (nth 2 form))
|
|
|
|
|
body)
|
|
|
|
|
(if (and (eq (car-safe fn) 'quote)
|
|
|
|
|
(eq (car-safe (setq fn (nth 1 fn))) 'lambda))
|
|
|
|
|
(progn
|
|
|
|
|
(setq body (cdr (cdr fn)))
|
|
|
|
|
(if (stringp (car body)) (setq body (cdr body)))
|
|
|
|
|
(if (eq 'interactive (car-safe (car body))) (setq body (cdr body)))
|
|
|
|
|
(if (and (consp (car body))
|
|
|
|
|
(not (eq 'byte-code (car (car body)))))
|
|
|
|
|
(byte-compile-warn
|
2004-06-13 22:01:36 +00:00
|
|
|
|
"A quoted lambda form is the second argument of `fset'. This is probably
|
1992-07-10 22:06:47 +00:00
|
|
|
|
not what you want, as that lambda cannot be compiled. Consider using
|
2011-03-23 00:53:36 +00:00
|
|
|
|
the syntax #'(lambda (...) ...) instead.")))))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(byte-compile-two-args form))
|
|
|
|
|
|
|
|
|
|
;; (function foo) must compile like 'foo, not like (symbol-function 'foo).
|
|
|
|
|
;; Otherwise it will be incompatible with the interpreter,
|
|
|
|
|
;; and (funcall (function foo)) will lose with autoloads.
|
|
|
|
|
|
|
|
|
|
(defun byte-compile-function-form (form)
|
2013-08-07 17:33:30 +00:00
|
|
|
|
(let ((f (nth 1 form)))
|
|
|
|
|
(when (and (symbolp f)
|
|
|
|
|
(byte-compile-warning-enabled-p 'callargs))
|
2013-08-08 01:37:47 +00:00
|
|
|
|
(byte-compile-function-warn f t (byte-compile-fdefinition f nil)))
|
2013-08-07 17:33:30 +00:00
|
|
|
|
|
|
|
|
|
(byte-compile-constant (if (eq 'lambda (car-safe f))
|
|
|
|
|
(byte-compile-lambda f)
|
|
|
|
|
f))))
|
2013-11-25 17:16:32 +00:00
|
|
|
|
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(defun byte-compile-indent-to (form)
|
|
|
|
|
(let ((len (length form)))
|
|
|
|
|
(cond ((= len 2)
|
|
|
|
|
(byte-compile-form (car (cdr form)))
|
|
|
|
|
(byte-compile-out 'byte-indent-to 0))
|
|
|
|
|
((= len 3)
|
|
|
|
|
;; no opcode for 2-arg case.
|
|
|
|
|
(byte-compile-normal-call form))
|
|
|
|
|
(t
|
|
|
|
|
(byte-compile-subr-wrong-args form "1-2")))))
|
|
|
|
|
|
|
|
|
|
(defun byte-compile-insert (form)
|
|
|
|
|
(cond ((null (cdr form))
|
|
|
|
|
(byte-compile-constant nil))
|
2009-11-04 03:15:14 +00:00
|
|
|
|
((<= (length form) 256)
|
2000-05-26 10:35:38 +00:00
|
|
|
|
(mapc 'byte-compile-form (cdr form))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(if (cdr (cdr form))
|
|
|
|
|
(byte-compile-out 'byte-insertN (length (cdr form)))
|
|
|
|
|
(byte-compile-out 'byte-insert 0)))
|
|
|
|
|
((memq t (mapcar 'consp (cdr (cdr form))))
|
|
|
|
|
(byte-compile-normal-call form))
|
|
|
|
|
;; We can split it; there is no function call after inserting 1st arg.
|
|
|
|
|
(t
|
|
|
|
|
(while (setq form (cdr form))
|
|
|
|
|
(byte-compile-form (car form))
|
|
|
|
|
(byte-compile-out 'byte-insert 0)
|
|
|
|
|
(if (cdr form)
|
|
|
|
|
(byte-compile-discard))))))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
(byte-defop-compiler-1 setq)
|
|
|
|
|
(byte-defop-compiler-1 setq-default)
|
|
|
|
|
(byte-defop-compiler-1 quote)
|
|
|
|
|
|
|
|
|
|
(defun byte-compile-setq (form)
|
2011-03-16 20:08:39 +00:00
|
|
|
|
(let ((args (cdr form)))
|
|
|
|
|
(if args
|
|
|
|
|
(while args
|
|
|
|
|
(byte-compile-form (car (cdr args)))
|
|
|
|
|
(or byte-compile--for-effect (cdr (cdr args))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(byte-compile-out 'byte-dup 0))
|
2011-03-16 20:08:39 +00:00
|
|
|
|
(byte-compile-variable-set (car args))
|
|
|
|
|
(setq args (cdr (cdr args))))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
;; (setq), with no arguments.
|
Try and fix w32 build; misc cleanup.
* lisp/subr.el (apply-partially): Move from subr.el; don't use lexical-let.
(eval-after-load): Obey lexical-binding.
* lisp/simple.el (apply-partially): Move to subr.el.
* lisp/makefile.w32-in: Match changes in Makefile.in.
(BIG_STACK_DEPTH, BIG_STACK_OPTS, BYTE_COMPILE_FLAGS): New vars.
(.el.elc, compile-CMD, compile-SH, compile-always-CMD)
(compile-always-SH, compile-calc-CMD, compile-calc-SH): Use them.
(COMPILE_FIRST): Add pcase, macroexp, and cconv.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Silence warning about
calling CL's `compiler-macroexpand'.
* lisp/emacs-lisp/bytecomp.el (byte-compile-preprocess): New function.
(byte-compile-initial-macro-environment)
(byte-compile-toplevel-file-form, byte-compile, byte-compile-sexp): Use it.
(byte-compile-eval, byte-compile-eval-before-compile): Obey lexical-binding.
(byte-compile--for-effect): Rename from `for-effect'.
(display-call-tree): Use case.
* lisp/emacs-lisp/byte-opt.el (for-effect): Don't declare as dynamic.
(byte-optimize-form-code-walker, byte-optimize-form):
Revert to old arg name.
* lisp/Makefile.in (BYTE_COMPILE_FLAGS): New var.
(compile-onefile, .el.elc, compile-calc, recompile): Use it.
2011-03-12 03:32:43 +00:00
|
|
|
|
(byte-compile-form nil byte-compile--for-effect))
|
|
|
|
|
(setq byte-compile--for-effect nil)))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
|
|
|
|
(defun byte-compile-setq-default (form)
|
2010-04-23 16:26:11 +00:00
|
|
|
|
(setq form (cdr form))
|
2012-08-14 18:23:10 +00:00
|
|
|
|
(if (null form) ; (setq-default), with no arguments
|
|
|
|
|
(byte-compile-form nil byte-compile--for-effect)
|
|
|
|
|
(if (> (length form) 2)
|
|
|
|
|
(let ((setters ()))
|
|
|
|
|
(while (consp form)
|
|
|
|
|
(push `(setq-default ,(pop form) ,(pop form)) setters))
|
|
|
|
|
(byte-compile-form (cons 'progn (nreverse setters))))
|
|
|
|
|
(let ((var (car form)))
|
|
|
|
|
(and (or (not (symbolp var))
|
|
|
|
|
(macroexp--const-symbol-p var t))
|
|
|
|
|
(byte-compile-warning-enabled-p 'constants)
|
|
|
|
|
(byte-compile-warn
|
|
|
|
|
"variable assignment to %s `%s'"
|
|
|
|
|
(if (symbolp var) "constant" "nonvariable")
|
|
|
|
|
(prin1-to-string var)))
|
|
|
|
|
(byte-compile-normal-call `(set-default ',var ,@(cdr form)))))))
|
2010-04-23 16:26:11 +00:00
|
|
|
|
|
|
|
|
|
(byte-defop-compiler-1 set-default)
|
|
|
|
|
(defun byte-compile-set-default (form)
|
|
|
|
|
(let ((varexp (car-safe (cdr-safe form))))
|
|
|
|
|
(if (eq (car-safe varexp) 'quote)
|
|
|
|
|
;; If the varexp is constant, compile it as a setq-default
|
|
|
|
|
;; so we get more warnings.
|
|
|
|
|
(byte-compile-setq-default `(setq-default ,(car-safe (cdr varexp))
|
|
|
|
|
,@(cddr form)))
|
|
|
|
|
(byte-compile-normal-call form))))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
|
|
|
|
(defun byte-compile-quote (form)
|
|
|
|
|
(byte-compile-constant (car (cdr form))))
|
|
|
|
|
|
|
|
|
|
;;; control structures
|
|
|
|
|
|
2011-03-16 20:08:39 +00:00
|
|
|
|
(defun byte-compile-body (body &optional for-effect)
|
|
|
|
|
(while (cdr body)
|
|
|
|
|
(byte-compile-form (car body) t)
|
|
|
|
|
(setq body (cdr body)))
|
|
|
|
|
(byte-compile-form (car body) for-effect))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
2011-03-16 20:08:39 +00:00
|
|
|
|
(defsubst byte-compile-body-do-effect (body)
|
|
|
|
|
(byte-compile-body body byte-compile--for-effect)
|
Try and fix w32 build; misc cleanup.
* lisp/subr.el (apply-partially): Move from subr.el; don't use lexical-let.
(eval-after-load): Obey lexical-binding.
* lisp/simple.el (apply-partially): Move to subr.el.
* lisp/makefile.w32-in: Match changes in Makefile.in.
(BIG_STACK_DEPTH, BIG_STACK_OPTS, BYTE_COMPILE_FLAGS): New vars.
(.el.elc, compile-CMD, compile-SH, compile-always-CMD)
(compile-always-SH, compile-calc-CMD, compile-calc-SH): Use them.
(COMPILE_FIRST): Add pcase, macroexp, and cconv.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Silence warning about
calling CL's `compiler-macroexpand'.
* lisp/emacs-lisp/bytecomp.el (byte-compile-preprocess): New function.
(byte-compile-initial-macro-environment)
(byte-compile-toplevel-file-form, byte-compile, byte-compile-sexp): Use it.
(byte-compile-eval, byte-compile-eval-before-compile): Obey lexical-binding.
(byte-compile--for-effect): Rename from `for-effect'.
(display-call-tree): Use case.
* lisp/emacs-lisp/byte-opt.el (for-effect): Don't declare as dynamic.
(byte-optimize-form-code-walker, byte-optimize-form):
Revert to old arg name.
* lisp/Makefile.in (BYTE_COMPILE_FLAGS): New var.
(compile-onefile, .el.elc, compile-calc, recompile): Use it.
2011-03-12 03:32:43 +00:00
|
|
|
|
(setq byte-compile--for-effect nil))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
1992-07-15 20:26:37 +00:00
|
|
|
|
(defsubst byte-compile-form-do-effect (form)
|
Try and fix w32 build; misc cleanup.
* lisp/subr.el (apply-partially): Move from subr.el; don't use lexical-let.
(eval-after-load): Obey lexical-binding.
* lisp/simple.el (apply-partially): Move to subr.el.
* lisp/makefile.w32-in: Match changes in Makefile.in.
(BIG_STACK_DEPTH, BIG_STACK_OPTS, BYTE_COMPILE_FLAGS): New vars.
(.el.elc, compile-CMD, compile-SH, compile-always-CMD)
(compile-always-SH, compile-calc-CMD, compile-calc-SH): Use them.
(COMPILE_FIRST): Add pcase, macroexp, and cconv.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Silence warning about
calling CL's `compiler-macroexpand'.
* lisp/emacs-lisp/bytecomp.el (byte-compile-preprocess): New function.
(byte-compile-initial-macro-environment)
(byte-compile-toplevel-file-form, byte-compile, byte-compile-sexp): Use it.
(byte-compile-eval, byte-compile-eval-before-compile): Obey lexical-binding.
(byte-compile--for-effect): Rename from `for-effect'.
(display-call-tree): Use case.
* lisp/emacs-lisp/byte-opt.el (for-effect): Don't declare as dynamic.
(byte-optimize-form-code-walker, byte-optimize-form):
Revert to old arg name.
* lisp/Makefile.in (BYTE_COMPILE_FLAGS): New var.
(compile-onefile, .el.elc, compile-calc, recompile): Use it.
2011-03-12 03:32:43 +00:00
|
|
|
|
(byte-compile-form form byte-compile--for-effect)
|
|
|
|
|
(setq byte-compile--for-effect nil))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
|
|
|
|
(byte-defop-compiler-1 inline byte-compile-progn)
|
|
|
|
|
(byte-defop-compiler-1 progn)
|
|
|
|
|
(byte-defop-compiler-1 prog1)
|
|
|
|
|
(byte-defop-compiler-1 prog2)
|
|
|
|
|
(byte-defop-compiler-1 if)
|
|
|
|
|
(byte-defop-compiler-1 cond)
|
|
|
|
|
(byte-defop-compiler-1 and)
|
|
|
|
|
(byte-defop-compiler-1 or)
|
|
|
|
|
(byte-defop-compiler-1 while)
|
|
|
|
|
(byte-defop-compiler-1 funcall)
|
|
|
|
|
(byte-defop-compiler-1 let)
|
2011-02-17 21:19:13 +00:00
|
|
|
|
(byte-defop-compiler-1 let* byte-compile-let)
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
|
|
|
|
(defun byte-compile-progn (form)
|
|
|
|
|
(byte-compile-body-do-effect (cdr form)))
|
|
|
|
|
|
|
|
|
|
(defun byte-compile-prog1 (form)
|
|
|
|
|
(byte-compile-form-do-effect (car (cdr form)))
|
|
|
|
|
(byte-compile-body (cdr (cdr form)) t))
|
|
|
|
|
|
|
|
|
|
(defun byte-compile-prog2 (form)
|
|
|
|
|
(byte-compile-form (nth 1 form) t)
|
|
|
|
|
(byte-compile-form-do-effect (nth 2 form))
|
|
|
|
|
(byte-compile-body (cdr (cdr (cdr form))) t))
|
|
|
|
|
|
|
|
|
|
(defmacro byte-compile-goto-if (cond discard tag)
|
2000-02-23 12:29:05 +00:00
|
|
|
|
`(byte-compile-goto
|
|
|
|
|
(if ,cond
|
|
|
|
|
(if ,discard 'byte-goto-if-not-nil 'byte-goto-if-not-nil-else-pop)
|
|
|
|
|
(if ,discard 'byte-goto-if-nil 'byte-goto-if-nil-else-pop))
|
|
|
|
|
,tag))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
2007-11-10 08:05:15 +00:00
|
|
|
|
;; Return the list of items in CONDITION-PARAM that match PRED-LIST.
|
|
|
|
|
;; Only return items that are not in ONLY-IF-NOT-PRESENT.
|
2007-11-26 15:38:18 +00:00
|
|
|
|
(defun byte-compile-find-bound-condition (condition-param
|
|
|
|
|
pred-list
|
2007-11-10 08:05:15 +00:00
|
|
|
|
&optional only-if-not-present)
|
|
|
|
|
(let ((result nil)
|
|
|
|
|
(nth-one nil)
|
2007-11-26 15:38:18 +00:00
|
|
|
|
(cond-list
|
2007-11-10 08:05:15 +00:00
|
|
|
|
(if (memq (car-safe condition-param) pred-list)
|
|
|
|
|
;; The condition appears by itself.
|
|
|
|
|
(list condition-param)
|
|
|
|
|
;; If the condition is an `and', look for matches among the
|
|
|
|
|
;; `and' arguments.
|
|
|
|
|
(when (eq 'and (car-safe condition-param))
|
|
|
|
|
(cdr condition-param)))))
|
2007-11-26 15:38:18 +00:00
|
|
|
|
|
2007-11-10 08:05:15 +00:00
|
|
|
|
(dolist (crt cond-list)
|
|
|
|
|
(when (and (memq (car-safe crt) pred-list)
|
|
|
|
|
(eq 'quote (car-safe (setq nth-one (nth 1 crt))))
|
|
|
|
|
;; Ignore if the symbol is already on the unresolved
|
|
|
|
|
;; list.
|
|
|
|
|
(not (assq (nth 1 nth-one) ; the relevant symbol
|
|
|
|
|
only-if-not-present)))
|
|
|
|
|
(push (nth 1 (nth 1 crt)) result)))
|
|
|
|
|
result))
|
|
|
|
|
|
2004-04-16 12:51:06 +00:00
|
|
|
|
(defmacro byte-compile-maybe-guarded (condition &rest body)
|
|
|
|
|
"Execute forms in BODY, potentially guarded by CONDITION.
|
2005-07-08 22:49:47 +00:00
|
|
|
|
CONDITION is a variable whose value is a test in an `if' or `cond'.
|
2008-06-13 04:16:23 +00:00
|
|
|
|
BODY is the code to compile in the first arm of the if or the body of
|
|
|
|
|
the cond clause. If CONDITION's value is of the form (fboundp 'foo)
|
2005-07-16 19:04:57 +00:00
|
|
|
|
or (boundp 'foo), the relevant warnings from BODY about foo's
|
2009-09-16 03:13:03 +00:00
|
|
|
|
being undefined (or obsolete) will be suppressed.
|
2005-07-08 22:49:47 +00:00
|
|
|
|
|
2005-07-16 21:17:10 +00:00
|
|
|
|
If CONDITION's value is (not (featurep 'emacs)) or (featurep 'xemacs),
|
2005-07-16 19:04:57 +00:00
|
|
|
|
that suppresses all warnings during execution of BODY."
|
2004-04-16 12:51:06 +00:00
|
|
|
|
(declare (indent 1) (debug t))
|
2007-11-26 15:38:18 +00:00
|
|
|
|
`(let* ((fbound-list (byte-compile-find-bound-condition
|
2012-11-08 14:58:15 +00:00
|
|
|
|
,condition '(fboundp functionp)
|
2007-11-10 08:05:15 +00:00
|
|
|
|
byte-compile-unresolved-functions))
|
2007-11-26 15:38:18 +00:00
|
|
|
|
(bound-list (byte-compile-find-bound-condition
|
2012-11-08 14:58:15 +00:00
|
|
|
|
,condition '(boundp default-boundp)))
|
2004-04-16 12:51:06 +00:00
|
|
|
|
;; Maybe add to the bound list.
|
|
|
|
|
(byte-compile-bound-variables
|
* lisp/emacs-lisp/byte-lexbind.el: Delete.
* lisp/emacs-lisp/bytecomp.el (byte-compile-current-heap-environment)
(byte-compile-current-num-closures): Remove vars.
(byte-vec-ref, byte-vec-set): Remove byte codes.
(byte-compile-arglist-vars, byte-compile-make-lambda-lexenv): Move from
byte-lexbind.el.
(byte-compile-lambda): Never build a closure.
(byte-compile-closure-code-p, byte-compile-make-closure): Remove.
(byte-compile-closure): Simplify.
(byte-compile-top-level): Don't mess with heap environments.
(byte-compile-dynamic-variable-bind): Always maintain
byte-compile-bound-variables.
(byte-compile-variable-ref, byte-compile-variable-set): Always just use
the stack for lexical vars.
(byte-compile-push-binding-init): Simplify.
(byte-compile-not-lexical-var-p): New function, moved from cconv.el.
(byte-compile-bind, byte-compile-unbind): New functions, moved and
simplified from byte-lexbind.el.
(byte-compile-let, byte-compile-let*): Simplify.
(byte-compile-condition-case): Don't add :fun-body to the bound vars.
(byte-compile-defmacro): Simplify.
* lisp/emacs-lisp/byte-opt.el (byte-compile-side-effect-free-ops)
(byte-optimize-lapcode): Remove byte-vec-ref and byte-vec-set.
* lisp/emacs-lisp/cconv.el (cconv-not-lexical-var-p): Remove.
(cconv-freevars, cconv-analyse-function, cconv-analyse-form):
Use byte-compile-not-lexical-var-p instead.
* src/bytecode.c (Bvec_ref, Bvec_set): Remove.
(exec_byte_code): Don't handle them.
* lisp/help-fns.el (describe-function-1): Fix paren typo.
2011-02-12 05:53:30 +00:00
|
|
|
|
(append bound-list byte-compile-bound-variables)))
|
2005-07-08 22:49:47 +00:00
|
|
|
|
(unwind-protect
|
Try and fix w32 build; misc cleanup.
* lisp/subr.el (apply-partially): Move from subr.el; don't use lexical-let.
(eval-after-load): Obey lexical-binding.
* lisp/simple.el (apply-partially): Move to subr.el.
* lisp/makefile.w32-in: Match changes in Makefile.in.
(BIG_STACK_DEPTH, BIG_STACK_OPTS, BYTE_COMPILE_FLAGS): New vars.
(.el.elc, compile-CMD, compile-SH, compile-always-CMD)
(compile-always-SH, compile-calc-CMD, compile-calc-SH): Use them.
(COMPILE_FIRST): Add pcase, macroexp, and cconv.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Silence warning about
calling CL's `compiler-macroexpand'.
* lisp/emacs-lisp/bytecomp.el (byte-compile-preprocess): New function.
(byte-compile-initial-macro-environment)
(byte-compile-toplevel-file-form, byte-compile, byte-compile-sexp): Use it.
(byte-compile-eval, byte-compile-eval-before-compile): Obey lexical-binding.
(byte-compile--for-effect): Rename from `for-effect'.
(display-call-tree): Use case.
* lisp/emacs-lisp/byte-opt.el (for-effect): Don't declare as dynamic.
(byte-optimize-form-code-walker, byte-optimize-form):
Revert to old arg name.
* lisp/Makefile.in (BYTE_COMPILE_FLAGS): New var.
(compile-onefile, .el.elc, compile-calc, recompile): Use it.
2011-03-12 03:32:43 +00:00
|
|
|
|
;; If things not being bound at all is ok, so must them being
|
|
|
|
|
;; obsolete. Note that we add to the existing lists since Tramp
|
|
|
|
|
;; (ab)uses this feature.
|
2009-09-16 03:13:03 +00:00
|
|
|
|
(let ((byte-compile-not-obsolete-vars
|
|
|
|
|
(append byte-compile-not-obsolete-vars bound-list))
|
|
|
|
|
(byte-compile-not-obsolete-funcs
|
|
|
|
|
(append byte-compile-not-obsolete-funcs fbound-list)))
|
|
|
|
|
,@body)
|
2005-07-08 22:49:47 +00:00
|
|
|
|
;; Maybe remove the function symbol from the unresolved list.
|
2007-11-10 08:05:15 +00:00
|
|
|
|
(dolist (fbound fbound-list)
|
|
|
|
|
(when fbound
|
2005-07-08 22:49:47 +00:00
|
|
|
|
(setq byte-compile-unresolved-functions
|
|
|
|
|
(delq (assq fbound byte-compile-unresolved-functions)
|
2007-11-10 08:05:15 +00:00
|
|
|
|
byte-compile-unresolved-functions)))))))
|
2004-04-16 12:51:06 +00:00
|
|
|
|
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(defun byte-compile-if (form)
|
|
|
|
|
(byte-compile-form (car (cdr form)))
|
2002-12-12 20:27:43 +00:00
|
|
|
|
;; Check whether we have `(if (fboundp ...' or `(if (boundp ...'
|
2011-12-30 02:52:49 +00:00
|
|
|
|
;; and avoid warnings about the relevant symbols in the consequent.
|
2004-04-16 12:51:06 +00:00
|
|
|
|
(let ((clause (nth 1 form))
|
|
|
|
|
(donetag (byte-compile-make-tag)))
|
2002-12-12 20:27:43 +00:00
|
|
|
|
(if (null (nthcdr 3 form))
|
|
|
|
|
;; No else-forms
|
|
|
|
|
(progn
|
Try and fix w32 build; misc cleanup.
* lisp/subr.el (apply-partially): Move from subr.el; don't use lexical-let.
(eval-after-load): Obey lexical-binding.
* lisp/simple.el (apply-partially): Move to subr.el.
* lisp/makefile.w32-in: Match changes in Makefile.in.
(BIG_STACK_DEPTH, BIG_STACK_OPTS, BYTE_COMPILE_FLAGS): New vars.
(.el.elc, compile-CMD, compile-SH, compile-always-CMD)
(compile-always-SH, compile-calc-CMD, compile-calc-SH): Use them.
(COMPILE_FIRST): Add pcase, macroexp, and cconv.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Silence warning about
calling CL's `compiler-macroexpand'.
* lisp/emacs-lisp/bytecomp.el (byte-compile-preprocess): New function.
(byte-compile-initial-macro-environment)
(byte-compile-toplevel-file-form, byte-compile, byte-compile-sexp): Use it.
(byte-compile-eval, byte-compile-eval-before-compile): Obey lexical-binding.
(byte-compile--for-effect): Rename from `for-effect'.
(display-call-tree): Use case.
* lisp/emacs-lisp/byte-opt.el (for-effect): Don't declare as dynamic.
(byte-optimize-form-code-walker, byte-optimize-form):
Revert to old arg name.
* lisp/Makefile.in (BYTE_COMPILE_FLAGS): New var.
(compile-onefile, .el.elc, compile-calc, recompile): Use it.
2011-03-12 03:32:43 +00:00
|
|
|
|
(byte-compile-goto-if nil byte-compile--for-effect donetag)
|
2004-04-16 12:51:06 +00:00
|
|
|
|
(byte-compile-maybe-guarded clause
|
Try and fix w32 build; misc cleanup.
* lisp/subr.el (apply-partially): Move from subr.el; don't use lexical-let.
(eval-after-load): Obey lexical-binding.
* lisp/simple.el (apply-partially): Move to subr.el.
* lisp/makefile.w32-in: Match changes in Makefile.in.
(BIG_STACK_DEPTH, BIG_STACK_OPTS, BYTE_COMPILE_FLAGS): New vars.
(.el.elc, compile-CMD, compile-SH, compile-always-CMD)
(compile-always-SH, compile-calc-CMD, compile-calc-SH): Use them.
(COMPILE_FIRST): Add pcase, macroexp, and cconv.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Silence warning about
calling CL's `compiler-macroexpand'.
* lisp/emacs-lisp/bytecomp.el (byte-compile-preprocess): New function.
(byte-compile-initial-macro-environment)
(byte-compile-toplevel-file-form, byte-compile, byte-compile-sexp): Use it.
(byte-compile-eval, byte-compile-eval-before-compile): Obey lexical-binding.
(byte-compile--for-effect): Rename from `for-effect'.
(display-call-tree): Use case.
* lisp/emacs-lisp/byte-opt.el (for-effect): Don't declare as dynamic.
(byte-optimize-form-code-walker, byte-optimize-form):
Revert to old arg name.
* lisp/Makefile.in (BYTE_COMPILE_FLAGS): New var.
(compile-onefile, .el.elc, compile-calc, recompile): Use it.
2011-03-12 03:32:43 +00:00
|
|
|
|
(byte-compile-form (nth 2 form) byte-compile--for-effect))
|
2002-12-12 20:27:43 +00:00
|
|
|
|
(byte-compile-out-tag donetag))
|
|
|
|
|
(let ((elsetag (byte-compile-make-tag)))
|
|
|
|
|
(byte-compile-goto 'byte-goto-if-nil elsetag)
|
2004-04-16 12:51:06 +00:00
|
|
|
|
(byte-compile-maybe-guarded clause
|
Try and fix w32 build; misc cleanup.
* lisp/subr.el (apply-partially): Move from subr.el; don't use lexical-let.
(eval-after-load): Obey lexical-binding.
* lisp/simple.el (apply-partially): Move to subr.el.
* lisp/makefile.w32-in: Match changes in Makefile.in.
(BIG_STACK_DEPTH, BIG_STACK_OPTS, BYTE_COMPILE_FLAGS): New vars.
(.el.elc, compile-CMD, compile-SH, compile-always-CMD)
(compile-always-SH, compile-calc-CMD, compile-calc-SH): Use them.
(COMPILE_FIRST): Add pcase, macroexp, and cconv.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Silence warning about
calling CL's `compiler-macroexpand'.
* lisp/emacs-lisp/bytecomp.el (byte-compile-preprocess): New function.
(byte-compile-initial-macro-environment)
(byte-compile-toplevel-file-form, byte-compile, byte-compile-sexp): Use it.
(byte-compile-eval, byte-compile-eval-before-compile): Obey lexical-binding.
(byte-compile--for-effect): Rename from `for-effect'.
(display-call-tree): Use case.
* lisp/emacs-lisp/byte-opt.el (for-effect): Don't declare as dynamic.
(byte-optimize-form-code-walker, byte-optimize-form):
Revert to old arg name.
* lisp/Makefile.in (BYTE_COMPILE_FLAGS): New var.
(compile-onefile, .el.elc, compile-calc, recompile): Use it.
2011-03-12 03:32:43 +00:00
|
|
|
|
(byte-compile-form (nth 2 form) byte-compile--for-effect))
|
2002-12-12 20:27:43 +00:00
|
|
|
|
(byte-compile-goto 'byte-goto donetag)
|
|
|
|
|
(byte-compile-out-tag elsetag)
|
2005-07-16 18:39:14 +00:00
|
|
|
|
(byte-compile-maybe-guarded (list 'not clause)
|
Try and fix w32 build; misc cleanup.
* lisp/subr.el (apply-partially): Move from subr.el; don't use lexical-let.
(eval-after-load): Obey lexical-binding.
* lisp/simple.el (apply-partially): Move to subr.el.
* lisp/makefile.w32-in: Match changes in Makefile.in.
(BIG_STACK_DEPTH, BIG_STACK_OPTS, BYTE_COMPILE_FLAGS): New vars.
(.el.elc, compile-CMD, compile-SH, compile-always-CMD)
(compile-always-SH, compile-calc-CMD, compile-calc-SH): Use them.
(COMPILE_FIRST): Add pcase, macroexp, and cconv.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Silence warning about
calling CL's `compiler-macroexpand'.
* lisp/emacs-lisp/bytecomp.el (byte-compile-preprocess): New function.
(byte-compile-initial-macro-environment)
(byte-compile-toplevel-file-form, byte-compile, byte-compile-sexp): Use it.
(byte-compile-eval, byte-compile-eval-before-compile): Obey lexical-binding.
(byte-compile--for-effect): Rename from `for-effect'.
(display-call-tree): Use case.
* lisp/emacs-lisp/byte-opt.el (for-effect): Don't declare as dynamic.
(byte-optimize-form-code-walker, byte-optimize-form):
Revert to old arg name.
* lisp/Makefile.in (BYTE_COMPILE_FLAGS): New var.
(compile-onefile, .el.elc, compile-calc, recompile): Use it.
2011-03-12 03:32:43 +00:00
|
|
|
|
(byte-compile-body (cdr (cdr (cdr form))) byte-compile--for-effect))
|
2002-12-12 20:27:43 +00:00
|
|
|
|
(byte-compile-out-tag donetag))))
|
Try and fix w32 build; misc cleanup.
* lisp/subr.el (apply-partially): Move from subr.el; don't use lexical-let.
(eval-after-load): Obey lexical-binding.
* lisp/simple.el (apply-partially): Move to subr.el.
* lisp/makefile.w32-in: Match changes in Makefile.in.
(BIG_STACK_DEPTH, BIG_STACK_OPTS, BYTE_COMPILE_FLAGS): New vars.
(.el.elc, compile-CMD, compile-SH, compile-always-CMD)
(compile-always-SH, compile-calc-CMD, compile-calc-SH): Use them.
(COMPILE_FIRST): Add pcase, macroexp, and cconv.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Silence warning about
calling CL's `compiler-macroexpand'.
* lisp/emacs-lisp/bytecomp.el (byte-compile-preprocess): New function.
(byte-compile-initial-macro-environment)
(byte-compile-toplevel-file-form, byte-compile, byte-compile-sexp): Use it.
(byte-compile-eval, byte-compile-eval-before-compile): Obey lexical-binding.
(byte-compile--for-effect): Rename from `for-effect'.
(display-call-tree): Use case.
* lisp/emacs-lisp/byte-opt.el (for-effect): Don't declare as dynamic.
(byte-optimize-form-code-walker, byte-optimize-form):
Revert to old arg name.
* lisp/Makefile.in (BYTE_COMPILE_FLAGS): New var.
(compile-onefile, .el.elc, compile-calc, recompile): Use it.
2011-03-12 03:32:43 +00:00
|
|
|
|
(setq byte-compile--for-effect nil))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
|
|
|
|
(defun byte-compile-cond (clauses)
|
|
|
|
|
(let ((donetag (byte-compile-make-tag))
|
|
|
|
|
nexttag clause)
|
|
|
|
|
(while (setq clauses (cdr clauses))
|
|
|
|
|
(setq clause (car clauses))
|
|
|
|
|
(cond ((or (eq (car clause) t)
|
|
|
|
|
(and (eq (car-safe (car clause)) 'quote)
|
|
|
|
|
(car-safe (cdr-safe (car clause)))))
|
|
|
|
|
;; Unconditional clause
|
|
|
|
|
(setq clause (cons t clause)
|
|
|
|
|
clauses nil))
|
|
|
|
|
((cdr clauses)
|
|
|
|
|
(byte-compile-form (car clause))
|
|
|
|
|
(if (null (cdr clause))
|
|
|
|
|
;; First clause is a singleton.
|
Try and fix w32 build; misc cleanup.
* lisp/subr.el (apply-partially): Move from subr.el; don't use lexical-let.
(eval-after-load): Obey lexical-binding.
* lisp/simple.el (apply-partially): Move to subr.el.
* lisp/makefile.w32-in: Match changes in Makefile.in.
(BIG_STACK_DEPTH, BIG_STACK_OPTS, BYTE_COMPILE_FLAGS): New vars.
(.el.elc, compile-CMD, compile-SH, compile-always-CMD)
(compile-always-SH, compile-calc-CMD, compile-calc-SH): Use them.
(COMPILE_FIRST): Add pcase, macroexp, and cconv.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Silence warning about
calling CL's `compiler-macroexpand'.
* lisp/emacs-lisp/bytecomp.el (byte-compile-preprocess): New function.
(byte-compile-initial-macro-environment)
(byte-compile-toplevel-file-form, byte-compile, byte-compile-sexp): Use it.
(byte-compile-eval, byte-compile-eval-before-compile): Obey lexical-binding.
(byte-compile--for-effect): Rename from `for-effect'.
(display-call-tree): Use case.
* lisp/emacs-lisp/byte-opt.el (for-effect): Don't declare as dynamic.
(byte-optimize-form-code-walker, byte-optimize-form):
Revert to old arg name.
* lisp/Makefile.in (BYTE_COMPILE_FLAGS): New var.
(compile-onefile, .el.elc, compile-calc, recompile): Use it.
2011-03-12 03:32:43 +00:00
|
|
|
|
(byte-compile-goto-if t byte-compile--for-effect donetag)
|
2005-07-08 22:49:47 +00:00
|
|
|
|
(setq nexttag (byte-compile-make-tag))
|
|
|
|
|
(byte-compile-goto 'byte-goto-if-nil nexttag)
|
|
|
|
|
(byte-compile-maybe-guarded (car clause)
|
Try and fix w32 build; misc cleanup.
* lisp/subr.el (apply-partially): Move from subr.el; don't use lexical-let.
(eval-after-load): Obey lexical-binding.
* lisp/simple.el (apply-partially): Move to subr.el.
* lisp/makefile.w32-in: Match changes in Makefile.in.
(BIG_STACK_DEPTH, BIG_STACK_OPTS, BYTE_COMPILE_FLAGS): New vars.
(.el.elc, compile-CMD, compile-SH, compile-always-CMD)
(compile-always-SH, compile-calc-CMD, compile-calc-SH): Use them.
(COMPILE_FIRST): Add pcase, macroexp, and cconv.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Silence warning about
calling CL's `compiler-macroexpand'.
* lisp/emacs-lisp/bytecomp.el (byte-compile-preprocess): New function.
(byte-compile-initial-macro-environment)
(byte-compile-toplevel-file-form, byte-compile, byte-compile-sexp): Use it.
(byte-compile-eval, byte-compile-eval-before-compile): Obey lexical-binding.
(byte-compile--for-effect): Rename from `for-effect'.
(display-call-tree): Use case.
* lisp/emacs-lisp/byte-opt.el (for-effect): Don't declare as dynamic.
(byte-optimize-form-code-walker, byte-optimize-form):
Revert to old arg name.
* lisp/Makefile.in (BYTE_COMPILE_FLAGS): New var.
(compile-onefile, .el.elc, compile-calc, recompile): Use it.
2011-03-12 03:32:43 +00:00
|
|
|
|
(byte-compile-body (cdr clause) byte-compile--for-effect))
|
2005-07-08 22:49:47 +00:00
|
|
|
|
(byte-compile-goto 'byte-goto donetag)
|
|
|
|
|
(byte-compile-out-tag nexttag)))))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
;; Last clause
|
2004-04-16 12:51:06 +00:00
|
|
|
|
(let ((guard (car clause)))
|
|
|
|
|
(and (cdr clause) (not (eq guard t))
|
|
|
|
|
(progn (byte-compile-form guard)
|
Try and fix w32 build; misc cleanup.
* lisp/subr.el (apply-partially): Move from subr.el; don't use lexical-let.
(eval-after-load): Obey lexical-binding.
* lisp/simple.el (apply-partially): Move to subr.el.
* lisp/makefile.w32-in: Match changes in Makefile.in.
(BIG_STACK_DEPTH, BIG_STACK_OPTS, BYTE_COMPILE_FLAGS): New vars.
(.el.elc, compile-CMD, compile-SH, compile-always-CMD)
(compile-always-SH, compile-calc-CMD, compile-calc-SH): Use them.
(COMPILE_FIRST): Add pcase, macroexp, and cconv.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Silence warning about
calling CL's `compiler-macroexpand'.
* lisp/emacs-lisp/bytecomp.el (byte-compile-preprocess): New function.
(byte-compile-initial-macro-environment)
(byte-compile-toplevel-file-form, byte-compile, byte-compile-sexp): Use it.
(byte-compile-eval, byte-compile-eval-before-compile): Obey lexical-binding.
(byte-compile--for-effect): Rename from `for-effect'.
(display-call-tree): Use case.
* lisp/emacs-lisp/byte-opt.el (for-effect): Don't declare as dynamic.
(byte-optimize-form-code-walker, byte-optimize-form):
Revert to old arg name.
* lisp/Makefile.in (BYTE_COMPILE_FLAGS): New var.
(compile-onefile, .el.elc, compile-calc, recompile): Use it.
2011-03-12 03:32:43 +00:00
|
|
|
|
(byte-compile-goto-if nil byte-compile--for-effect donetag)
|
2004-04-16 12:51:06 +00:00
|
|
|
|
(setq clause (cdr clause))))
|
|
|
|
|
(byte-compile-maybe-guarded guard
|
|
|
|
|
(byte-compile-body-do-effect clause)))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(byte-compile-out-tag donetag)))
|
|
|
|
|
|
|
|
|
|
(defun byte-compile-and (form)
|
|
|
|
|
(let ((failtag (byte-compile-make-tag))
|
2011-03-16 20:08:39 +00:00
|
|
|
|
(args (cdr form)))
|
|
|
|
|
(if (null args)
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(byte-compile-form-do-effect t)
|
2011-03-16 20:08:39 +00:00
|
|
|
|
(byte-compile-and-recursion args failtag))))
|
2005-07-16 18:02:07 +00:00
|
|
|
|
|
2005-07-16 18:27:25 +00:00
|
|
|
|
;; Handle compilation of a nontrivial `and' call.
|
2005-07-16 18:02:07 +00:00
|
|
|
|
;; We use tail recursion so we can use byte-compile-maybe-guarded.
|
|
|
|
|
(defun byte-compile-and-recursion (rest failtag)
|
|
|
|
|
(if (cdr rest)
|
|
|
|
|
(progn
|
|
|
|
|
(byte-compile-form (car rest))
|
Try and fix w32 build; misc cleanup.
* lisp/subr.el (apply-partially): Move from subr.el; don't use lexical-let.
(eval-after-load): Obey lexical-binding.
* lisp/simple.el (apply-partially): Move to subr.el.
* lisp/makefile.w32-in: Match changes in Makefile.in.
(BIG_STACK_DEPTH, BIG_STACK_OPTS, BYTE_COMPILE_FLAGS): New vars.
(.el.elc, compile-CMD, compile-SH, compile-always-CMD)
(compile-always-SH, compile-calc-CMD, compile-calc-SH): Use them.
(COMPILE_FIRST): Add pcase, macroexp, and cconv.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Silence warning about
calling CL's `compiler-macroexpand'.
* lisp/emacs-lisp/bytecomp.el (byte-compile-preprocess): New function.
(byte-compile-initial-macro-environment)
(byte-compile-toplevel-file-form, byte-compile, byte-compile-sexp): Use it.
(byte-compile-eval, byte-compile-eval-before-compile): Obey lexical-binding.
(byte-compile--for-effect): Rename from `for-effect'.
(display-call-tree): Use case.
* lisp/emacs-lisp/byte-opt.el (for-effect): Don't declare as dynamic.
(byte-optimize-form-code-walker, byte-optimize-form):
Revert to old arg name.
* lisp/Makefile.in (BYTE_COMPILE_FLAGS): New var.
(compile-onefile, .el.elc, compile-calc, recompile): Use it.
2011-03-12 03:32:43 +00:00
|
|
|
|
(byte-compile-goto-if nil byte-compile--for-effect failtag)
|
2005-07-16 18:02:07 +00:00
|
|
|
|
(byte-compile-maybe-guarded (car rest)
|
|
|
|
|
(byte-compile-and-recursion (cdr rest) failtag)))
|
|
|
|
|
(byte-compile-form-do-effect (car rest))
|
|
|
|
|
(byte-compile-out-tag failtag)))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
|
|
|
|
(defun byte-compile-or (form)
|
|
|
|
|
(let ((wintag (byte-compile-make-tag))
|
2011-03-16 20:08:39 +00:00
|
|
|
|
(args (cdr form)))
|
|
|
|
|
(if (null args)
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(byte-compile-form-do-effect nil)
|
2011-03-16 20:08:39 +00:00
|
|
|
|
(byte-compile-or-recursion args wintag))))
|
2005-07-16 18:27:25 +00:00
|
|
|
|
|
|
|
|
|
;; Handle compilation of a nontrivial `or' call.
|
|
|
|
|
;; We use tail recursion so we can use byte-compile-maybe-guarded.
|
|
|
|
|
(defun byte-compile-or-recursion (rest wintag)
|
|
|
|
|
(if (cdr rest)
|
|
|
|
|
(progn
|
|
|
|
|
(byte-compile-form (car rest))
|
Try and fix w32 build; misc cleanup.
* lisp/subr.el (apply-partially): Move from subr.el; don't use lexical-let.
(eval-after-load): Obey lexical-binding.
* lisp/simple.el (apply-partially): Move to subr.el.
* lisp/makefile.w32-in: Match changes in Makefile.in.
(BIG_STACK_DEPTH, BIG_STACK_OPTS, BYTE_COMPILE_FLAGS): New vars.
(.el.elc, compile-CMD, compile-SH, compile-always-CMD)
(compile-always-SH, compile-calc-CMD, compile-calc-SH): Use them.
(COMPILE_FIRST): Add pcase, macroexp, and cconv.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Silence warning about
calling CL's `compiler-macroexpand'.
* lisp/emacs-lisp/bytecomp.el (byte-compile-preprocess): New function.
(byte-compile-initial-macro-environment)
(byte-compile-toplevel-file-form, byte-compile, byte-compile-sexp): Use it.
(byte-compile-eval, byte-compile-eval-before-compile): Obey lexical-binding.
(byte-compile--for-effect): Rename from `for-effect'.
(display-call-tree): Use case.
* lisp/emacs-lisp/byte-opt.el (for-effect): Don't declare as dynamic.
(byte-optimize-form-code-walker, byte-optimize-form):
Revert to old arg name.
* lisp/Makefile.in (BYTE_COMPILE_FLAGS): New var.
(compile-onefile, .el.elc, compile-calc, recompile): Use it.
2011-03-12 03:32:43 +00:00
|
|
|
|
(byte-compile-goto-if t byte-compile--for-effect wintag)
|
2005-07-16 18:27:25 +00:00
|
|
|
|
(byte-compile-maybe-guarded (list 'not (car rest))
|
|
|
|
|
(byte-compile-or-recursion (cdr rest) wintag)))
|
|
|
|
|
(byte-compile-form-do-effect (car rest))
|
|
|
|
|
(byte-compile-out-tag wintag)))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
|
|
|
|
(defun byte-compile-while (form)
|
|
|
|
|
(let ((endtag (byte-compile-make-tag))
|
|
|
|
|
(looptag (byte-compile-make-tag)))
|
|
|
|
|
(byte-compile-out-tag looptag)
|
|
|
|
|
(byte-compile-form (car (cdr form)))
|
Try and fix w32 build; misc cleanup.
* lisp/subr.el (apply-partially): Move from subr.el; don't use lexical-let.
(eval-after-load): Obey lexical-binding.
* lisp/simple.el (apply-partially): Move to subr.el.
* lisp/makefile.w32-in: Match changes in Makefile.in.
(BIG_STACK_DEPTH, BIG_STACK_OPTS, BYTE_COMPILE_FLAGS): New vars.
(.el.elc, compile-CMD, compile-SH, compile-always-CMD)
(compile-always-SH, compile-calc-CMD, compile-calc-SH): Use them.
(COMPILE_FIRST): Add pcase, macroexp, and cconv.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Silence warning about
calling CL's `compiler-macroexpand'.
* lisp/emacs-lisp/bytecomp.el (byte-compile-preprocess): New function.
(byte-compile-initial-macro-environment)
(byte-compile-toplevel-file-form, byte-compile, byte-compile-sexp): Use it.
(byte-compile-eval, byte-compile-eval-before-compile): Obey lexical-binding.
(byte-compile--for-effect): Rename from `for-effect'.
(display-call-tree): Use case.
* lisp/emacs-lisp/byte-opt.el (for-effect): Don't declare as dynamic.
(byte-optimize-form-code-walker, byte-optimize-form):
Revert to old arg name.
* lisp/Makefile.in (BYTE_COMPILE_FLAGS): New var.
(compile-onefile, .el.elc, compile-calc, recompile): Use it.
2011-03-12 03:32:43 +00:00
|
|
|
|
(byte-compile-goto-if nil byte-compile--for-effect endtag)
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(byte-compile-body (cdr (cdr form)) t)
|
|
|
|
|
(byte-compile-goto 'byte-goto looptag)
|
|
|
|
|
(byte-compile-out-tag endtag)
|
Try and fix w32 build; misc cleanup.
* lisp/subr.el (apply-partially): Move from subr.el; don't use lexical-let.
(eval-after-load): Obey lexical-binding.
* lisp/simple.el (apply-partially): Move to subr.el.
* lisp/makefile.w32-in: Match changes in Makefile.in.
(BIG_STACK_DEPTH, BIG_STACK_OPTS, BYTE_COMPILE_FLAGS): New vars.
(.el.elc, compile-CMD, compile-SH, compile-always-CMD)
(compile-always-SH, compile-calc-CMD, compile-calc-SH): Use them.
(COMPILE_FIRST): Add pcase, macroexp, and cconv.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Silence warning about
calling CL's `compiler-macroexpand'.
* lisp/emacs-lisp/bytecomp.el (byte-compile-preprocess): New function.
(byte-compile-initial-macro-environment)
(byte-compile-toplevel-file-form, byte-compile, byte-compile-sexp): Use it.
(byte-compile-eval, byte-compile-eval-before-compile): Obey lexical-binding.
(byte-compile--for-effect): Rename from `for-effect'.
(display-call-tree): Use case.
* lisp/emacs-lisp/byte-opt.el (for-effect): Don't declare as dynamic.
(byte-optimize-form-code-walker, byte-optimize-form):
Revert to old arg name.
* lisp/Makefile.in (BYTE_COMPILE_FLAGS): New var.
(compile-onefile, .el.elc, compile-calc, recompile): Use it.
2011-03-12 03:32:43 +00:00
|
|
|
|
(setq byte-compile--for-effect nil)))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
|
|
|
|
(defun byte-compile-funcall (form)
|
2000-05-26 10:35:38 +00:00
|
|
|
|
(mapc 'byte-compile-form (cdr form))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(byte-compile-out 'byte-call (length (cdr (cdr form)))))
|
|
|
|
|
|
2010-06-13 20:36:17 +00:00
|
|
|
|
|
|
|
|
|
;; let binding
|
|
|
|
|
|
* lisp/emacs-lisp/byte-lexbind.el: Delete.
* lisp/emacs-lisp/bytecomp.el (byte-compile-current-heap-environment)
(byte-compile-current-num-closures): Remove vars.
(byte-vec-ref, byte-vec-set): Remove byte codes.
(byte-compile-arglist-vars, byte-compile-make-lambda-lexenv): Move from
byte-lexbind.el.
(byte-compile-lambda): Never build a closure.
(byte-compile-closure-code-p, byte-compile-make-closure): Remove.
(byte-compile-closure): Simplify.
(byte-compile-top-level): Don't mess with heap environments.
(byte-compile-dynamic-variable-bind): Always maintain
byte-compile-bound-variables.
(byte-compile-variable-ref, byte-compile-variable-set): Always just use
the stack for lexical vars.
(byte-compile-push-binding-init): Simplify.
(byte-compile-not-lexical-var-p): New function, moved from cconv.el.
(byte-compile-bind, byte-compile-unbind): New functions, moved and
simplified from byte-lexbind.el.
(byte-compile-let, byte-compile-let*): Simplify.
(byte-compile-condition-case): Don't add :fun-body to the bound vars.
(byte-compile-defmacro): Simplify.
* lisp/emacs-lisp/byte-opt.el (byte-compile-side-effect-free-ops)
(byte-optimize-lapcode): Remove byte-vec-ref and byte-vec-set.
* lisp/emacs-lisp/cconv.el (cconv-not-lexical-var-p): Remove.
(cconv-freevars, cconv-analyse-function, cconv-analyse-form):
Use byte-compile-not-lexical-var-p instead.
* src/bytecode.c (Bvec_ref, Bvec_set): Remove.
(exec_byte_code): Don't handle them.
* lisp/help-fns.el (describe-function-1): Fix paren typo.
2011-02-12 05:53:30 +00:00
|
|
|
|
(defun byte-compile-push-binding-init (clause)
|
2010-06-13 20:36:17 +00:00
|
|
|
|
"Emit byte-codes to push the initialization value for CLAUSE on the stack.
|
* lisp/emacs-lisp/byte-lexbind.el: Delete.
* lisp/emacs-lisp/bytecomp.el (byte-compile-current-heap-environment)
(byte-compile-current-num-closures): Remove vars.
(byte-vec-ref, byte-vec-set): Remove byte codes.
(byte-compile-arglist-vars, byte-compile-make-lambda-lexenv): Move from
byte-lexbind.el.
(byte-compile-lambda): Never build a closure.
(byte-compile-closure-code-p, byte-compile-make-closure): Remove.
(byte-compile-closure): Simplify.
(byte-compile-top-level): Don't mess with heap environments.
(byte-compile-dynamic-variable-bind): Always maintain
byte-compile-bound-variables.
(byte-compile-variable-ref, byte-compile-variable-set): Always just use
the stack for lexical vars.
(byte-compile-push-binding-init): Simplify.
(byte-compile-not-lexical-var-p): New function, moved from cconv.el.
(byte-compile-bind, byte-compile-unbind): New functions, moved and
simplified from byte-lexbind.el.
(byte-compile-let, byte-compile-let*): Simplify.
(byte-compile-condition-case): Don't add :fun-body to the bound vars.
(byte-compile-defmacro): Simplify.
* lisp/emacs-lisp/byte-opt.el (byte-compile-side-effect-free-ops)
(byte-optimize-lapcode): Remove byte-vec-ref and byte-vec-set.
* lisp/emacs-lisp/cconv.el (cconv-not-lexical-var-p): Remove.
(cconv-freevars, cconv-analyse-function, cconv-analyse-form):
Use byte-compile-not-lexical-var-p instead.
* src/bytecode.c (Bvec_ref, Bvec_set): Remove.
(exec_byte_code): Don't handle them.
* lisp/help-fns.el (describe-function-1): Fix paren typo.
2011-02-12 05:53:30 +00:00
|
|
|
|
Return the offset in the form (VAR . OFFSET)."
|
|
|
|
|
(let* ((var (if (consp clause) (car clause) clause)))
|
2013-06-05 02:35:40 +00:00
|
|
|
|
;; We record the stack position even of dynamic bindings; we'll put
|
|
|
|
|
;; them in the proper place later.
|
* lisp/emacs-lisp/byte-lexbind.el: Delete.
* lisp/emacs-lisp/bytecomp.el (byte-compile-current-heap-environment)
(byte-compile-current-num-closures): Remove vars.
(byte-vec-ref, byte-vec-set): Remove byte codes.
(byte-compile-arglist-vars, byte-compile-make-lambda-lexenv): Move from
byte-lexbind.el.
(byte-compile-lambda): Never build a closure.
(byte-compile-closure-code-p, byte-compile-make-closure): Remove.
(byte-compile-closure): Simplify.
(byte-compile-top-level): Don't mess with heap environments.
(byte-compile-dynamic-variable-bind): Always maintain
byte-compile-bound-variables.
(byte-compile-variable-ref, byte-compile-variable-set): Always just use
the stack for lexical vars.
(byte-compile-push-binding-init): Simplify.
(byte-compile-not-lexical-var-p): New function, moved from cconv.el.
(byte-compile-bind, byte-compile-unbind): New functions, moved and
simplified from byte-lexbind.el.
(byte-compile-let, byte-compile-let*): Simplify.
(byte-compile-condition-case): Don't add :fun-body to the bound vars.
(byte-compile-defmacro): Simplify.
* lisp/emacs-lisp/byte-opt.el (byte-compile-side-effect-free-ops)
(byte-optimize-lapcode): Remove byte-vec-ref and byte-vec-set.
* lisp/emacs-lisp/cconv.el (cconv-not-lexical-var-p): Remove.
(cconv-freevars, cconv-analyse-function, cconv-analyse-form):
Use byte-compile-not-lexical-var-p instead.
* src/bytecode.c (Bvec_ref, Bvec_set): Remove.
(exec_byte_code): Don't handle them.
* lisp/help-fns.el (describe-function-1): Fix paren typo.
2011-02-12 05:53:30 +00:00
|
|
|
|
(prog1 (cons var byte-compile-depth)
|
2010-06-13 20:36:17 +00:00
|
|
|
|
(if (consp clause)
|
* lisp/emacs-lisp/byte-lexbind.el: Delete.
* lisp/emacs-lisp/bytecomp.el (byte-compile-current-heap-environment)
(byte-compile-current-num-closures): Remove vars.
(byte-vec-ref, byte-vec-set): Remove byte codes.
(byte-compile-arglist-vars, byte-compile-make-lambda-lexenv): Move from
byte-lexbind.el.
(byte-compile-lambda): Never build a closure.
(byte-compile-closure-code-p, byte-compile-make-closure): Remove.
(byte-compile-closure): Simplify.
(byte-compile-top-level): Don't mess with heap environments.
(byte-compile-dynamic-variable-bind): Always maintain
byte-compile-bound-variables.
(byte-compile-variable-ref, byte-compile-variable-set): Always just use
the stack for lexical vars.
(byte-compile-push-binding-init): Simplify.
(byte-compile-not-lexical-var-p): New function, moved from cconv.el.
(byte-compile-bind, byte-compile-unbind): New functions, moved and
simplified from byte-lexbind.el.
(byte-compile-let, byte-compile-let*): Simplify.
(byte-compile-condition-case): Don't add :fun-body to the bound vars.
(byte-compile-defmacro): Simplify.
* lisp/emacs-lisp/byte-opt.el (byte-compile-side-effect-free-ops)
(byte-optimize-lapcode): Remove byte-vec-ref and byte-vec-set.
* lisp/emacs-lisp/cconv.el (cconv-not-lexical-var-p): Remove.
(cconv-freevars, cconv-analyse-function, cconv-analyse-form):
Use byte-compile-not-lexical-var-p instead.
* src/bytecode.c (Bvec_ref, Bvec_set): Remove.
(exec_byte_code): Don't handle them.
* lisp/help-fns.el (describe-function-1): Fix paren typo.
2011-02-12 05:53:30 +00:00
|
|
|
|
(byte-compile-form (cadr clause))
|
|
|
|
|
(byte-compile-push-constant nil)))))
|
|
|
|
|
|
|
|
|
|
(defun byte-compile-not-lexical-var-p (var)
|
2011-02-17 21:19:13 +00:00
|
|
|
|
(or (not (symbolp var))
|
|
|
|
|
(special-variable-p var)
|
* lisp/emacs-lisp/byte-lexbind.el: Delete.
* lisp/emacs-lisp/bytecomp.el (byte-compile-current-heap-environment)
(byte-compile-current-num-closures): Remove vars.
(byte-vec-ref, byte-vec-set): Remove byte codes.
(byte-compile-arglist-vars, byte-compile-make-lambda-lexenv): Move from
byte-lexbind.el.
(byte-compile-lambda): Never build a closure.
(byte-compile-closure-code-p, byte-compile-make-closure): Remove.
(byte-compile-closure): Simplify.
(byte-compile-top-level): Don't mess with heap environments.
(byte-compile-dynamic-variable-bind): Always maintain
byte-compile-bound-variables.
(byte-compile-variable-ref, byte-compile-variable-set): Always just use
the stack for lexical vars.
(byte-compile-push-binding-init): Simplify.
(byte-compile-not-lexical-var-p): New function, moved from cconv.el.
(byte-compile-bind, byte-compile-unbind): New functions, moved and
simplified from byte-lexbind.el.
(byte-compile-let, byte-compile-let*): Simplify.
(byte-compile-condition-case): Don't add :fun-body to the bound vars.
(byte-compile-defmacro): Simplify.
* lisp/emacs-lisp/byte-opt.el (byte-compile-side-effect-free-ops)
(byte-optimize-lapcode): Remove byte-vec-ref and byte-vec-set.
* lisp/emacs-lisp/cconv.el (cconv-not-lexical-var-p): Remove.
(cconv-freevars, cconv-analyse-function, cconv-analyse-form):
Use byte-compile-not-lexical-var-p instead.
* src/bytecode.c (Bvec_ref, Bvec_set): Remove.
(exec_byte_code): Don't handle them.
* lisp/help-fns.el (describe-function-1): Fix paren typo.
2011-02-12 05:53:30 +00:00
|
|
|
|
(memq var byte-compile-bound-variables)
|
|
|
|
|
(memq var '(nil t))
|
|
|
|
|
(keywordp var)))
|
|
|
|
|
|
|
|
|
|
(defun byte-compile-bind (var init-lexenv)
|
2011-04-01 15:16:50 +00:00
|
|
|
|
"Emit byte-codes to bind VAR and update `byte-compile--lexical-environment'.
|
* lisp/emacs-lisp/byte-lexbind.el: Delete.
* lisp/emacs-lisp/bytecomp.el (byte-compile-current-heap-environment)
(byte-compile-current-num-closures): Remove vars.
(byte-vec-ref, byte-vec-set): Remove byte codes.
(byte-compile-arglist-vars, byte-compile-make-lambda-lexenv): Move from
byte-lexbind.el.
(byte-compile-lambda): Never build a closure.
(byte-compile-closure-code-p, byte-compile-make-closure): Remove.
(byte-compile-closure): Simplify.
(byte-compile-top-level): Don't mess with heap environments.
(byte-compile-dynamic-variable-bind): Always maintain
byte-compile-bound-variables.
(byte-compile-variable-ref, byte-compile-variable-set): Always just use
the stack for lexical vars.
(byte-compile-push-binding-init): Simplify.
(byte-compile-not-lexical-var-p): New function, moved from cconv.el.
(byte-compile-bind, byte-compile-unbind): New functions, moved and
simplified from byte-lexbind.el.
(byte-compile-let, byte-compile-let*): Simplify.
(byte-compile-condition-case): Don't add :fun-body to the bound vars.
(byte-compile-defmacro): Simplify.
* lisp/emacs-lisp/byte-opt.el (byte-compile-side-effect-free-ops)
(byte-optimize-lapcode): Remove byte-vec-ref and byte-vec-set.
* lisp/emacs-lisp/cconv.el (cconv-not-lexical-var-p): Remove.
(cconv-freevars, cconv-analyse-function, cconv-analyse-form):
Use byte-compile-not-lexical-var-p instead.
* src/bytecode.c (Bvec_ref, Bvec_set): Remove.
(exec_byte_code): Don't handle them.
* lisp/help-fns.el (describe-function-1): Fix paren typo.
2011-02-12 05:53:30 +00:00
|
|
|
|
INIT-LEXENV should be a lexical-environment alist describing the
|
|
|
|
|
positions of the init value that have been pushed on the stack.
|
|
|
|
|
Return non-nil if the TOS value was popped."
|
2013-06-05 02:35:40 +00:00
|
|
|
|
;; The mix of lexical and dynamic bindings mean that we may have to
|
2011-02-17 21:19:13 +00:00
|
|
|
|
;; juggle things on the stack, to move them to TOS for
|
|
|
|
|
;; dynamic binding.
|
2013-06-05 02:35:40 +00:00
|
|
|
|
(if (and lexical-binding (not (byte-compile-not-lexical-var-p var)))
|
|
|
|
|
;; VAR is a simple stack-allocated lexical variable.
|
|
|
|
|
(progn (push (assq var init-lexenv)
|
|
|
|
|
byte-compile--lexical-environment)
|
|
|
|
|
nil)
|
|
|
|
|
;; VAR should be dynamically bound.
|
|
|
|
|
(while (assq var byte-compile--lexical-environment)
|
|
|
|
|
;; This dynamic binding shadows a lexical binding.
|
|
|
|
|
(setq byte-compile--lexical-environment
|
|
|
|
|
(remq (assq var byte-compile--lexical-environment)
|
|
|
|
|
byte-compile--lexical-environment)))
|
|
|
|
|
(cond
|
|
|
|
|
((eq var (caar init-lexenv))
|
|
|
|
|
;; VAR is dynamic and is on the top of the
|
|
|
|
|
;; stack, so we can just bind it like usual.
|
|
|
|
|
(byte-compile-dynamic-variable-bind var)
|
|
|
|
|
t)
|
|
|
|
|
(t
|
|
|
|
|
;; VAR is dynamic, but we have to get its
|
|
|
|
|
;; value out of the middle of the stack.
|
|
|
|
|
(let ((stack-pos (cdr (assq var init-lexenv))))
|
|
|
|
|
(byte-compile-stack-ref stack-pos)
|
|
|
|
|
(byte-compile-dynamic-variable-bind var)
|
|
|
|
|
;; Now we have to store nil into its temporary
|
|
|
|
|
;; stack position so it doesn't prevent the value from being GC'd.
|
|
|
|
|
;; FIXME: Not worth the trouble.
|
|
|
|
|
;; (byte-compile-push-constant nil)
|
|
|
|
|
;; (byte-compile-stack-set stack-pos)
|
|
|
|
|
)
|
|
|
|
|
nil))))
|
|
|
|
|
|
|
|
|
|
(defun byte-compile-unbind (clauses init-lexenv preserve-body-value)
|
* lisp/emacs-lisp/byte-lexbind.el: Delete.
* lisp/emacs-lisp/bytecomp.el (byte-compile-current-heap-environment)
(byte-compile-current-num-closures): Remove vars.
(byte-vec-ref, byte-vec-set): Remove byte codes.
(byte-compile-arglist-vars, byte-compile-make-lambda-lexenv): Move from
byte-lexbind.el.
(byte-compile-lambda): Never build a closure.
(byte-compile-closure-code-p, byte-compile-make-closure): Remove.
(byte-compile-closure): Simplify.
(byte-compile-top-level): Don't mess with heap environments.
(byte-compile-dynamic-variable-bind): Always maintain
byte-compile-bound-variables.
(byte-compile-variable-ref, byte-compile-variable-set): Always just use
the stack for lexical vars.
(byte-compile-push-binding-init): Simplify.
(byte-compile-not-lexical-var-p): New function, moved from cconv.el.
(byte-compile-bind, byte-compile-unbind): New functions, moved and
simplified from byte-lexbind.el.
(byte-compile-let, byte-compile-let*): Simplify.
(byte-compile-condition-case): Don't add :fun-body to the bound vars.
(byte-compile-defmacro): Simplify.
* lisp/emacs-lisp/byte-opt.el (byte-compile-side-effect-free-ops)
(byte-optimize-lapcode): Remove byte-vec-ref and byte-vec-set.
* lisp/emacs-lisp/cconv.el (cconv-not-lexical-var-p): Remove.
(cconv-freevars, cconv-analyse-function, cconv-analyse-form):
Use byte-compile-not-lexical-var-p instead.
* src/bytecode.c (Bvec_ref, Bvec_set): Remove.
(exec_byte_code): Don't handle them.
* lisp/help-fns.el (describe-function-1): Fix paren typo.
2011-02-12 05:53:30 +00:00
|
|
|
|
"Emit byte-codes to unbind the variables bound by CLAUSES.
|
|
|
|
|
CLAUSES is a `let'-style variable binding list. INIT-LEXENV should be a
|
|
|
|
|
lexical-environment alist describing the positions of the init value that
|
|
|
|
|
have been pushed on the stack. If PRESERVE-BODY-VALUE is true,
|
|
|
|
|
then an additional value on the top of the stack, above any lexical binding
|
|
|
|
|
slots, is preserved, so it will be on the top of the stack after all
|
|
|
|
|
binding slots have been popped."
|
2013-06-05 02:35:40 +00:00
|
|
|
|
;; Unbind dynamic variables.
|
* lisp/emacs-lisp/byte-lexbind.el: Delete.
* lisp/emacs-lisp/bytecomp.el (byte-compile-current-heap-environment)
(byte-compile-current-num-closures): Remove vars.
(byte-vec-ref, byte-vec-set): Remove byte codes.
(byte-compile-arglist-vars, byte-compile-make-lambda-lexenv): Move from
byte-lexbind.el.
(byte-compile-lambda): Never build a closure.
(byte-compile-closure-code-p, byte-compile-make-closure): Remove.
(byte-compile-closure): Simplify.
(byte-compile-top-level): Don't mess with heap environments.
(byte-compile-dynamic-variable-bind): Always maintain
byte-compile-bound-variables.
(byte-compile-variable-ref, byte-compile-variable-set): Always just use
the stack for lexical vars.
(byte-compile-push-binding-init): Simplify.
(byte-compile-not-lexical-var-p): New function, moved from cconv.el.
(byte-compile-bind, byte-compile-unbind): New functions, moved and
simplified from byte-lexbind.el.
(byte-compile-let, byte-compile-let*): Simplify.
(byte-compile-condition-case): Don't add :fun-body to the bound vars.
(byte-compile-defmacro): Simplify.
* lisp/emacs-lisp/byte-opt.el (byte-compile-side-effect-free-ops)
(byte-optimize-lapcode): Remove byte-vec-ref and byte-vec-set.
* lisp/emacs-lisp/cconv.el (cconv-not-lexical-var-p): Remove.
(cconv-freevars, cconv-analyse-function, cconv-analyse-form):
Use byte-compile-not-lexical-var-p instead.
* src/bytecode.c (Bvec_ref, Bvec_set): Remove.
(exec_byte_code): Don't handle them.
* lisp/help-fns.el (describe-function-1): Fix paren typo.
2011-02-12 05:53:30 +00:00
|
|
|
|
(let ((num-dynamic-bindings 0))
|
|
|
|
|
(dolist (clause clauses)
|
|
|
|
|
(unless (assq (if (consp clause) (car clause) clause)
|
2011-04-01 15:16:50 +00:00
|
|
|
|
byte-compile--lexical-environment)
|
* lisp/emacs-lisp/byte-lexbind.el: Delete.
* lisp/emacs-lisp/bytecomp.el (byte-compile-current-heap-environment)
(byte-compile-current-num-closures): Remove vars.
(byte-vec-ref, byte-vec-set): Remove byte codes.
(byte-compile-arglist-vars, byte-compile-make-lambda-lexenv): Move from
byte-lexbind.el.
(byte-compile-lambda): Never build a closure.
(byte-compile-closure-code-p, byte-compile-make-closure): Remove.
(byte-compile-closure): Simplify.
(byte-compile-top-level): Don't mess with heap environments.
(byte-compile-dynamic-variable-bind): Always maintain
byte-compile-bound-variables.
(byte-compile-variable-ref, byte-compile-variable-set): Always just use
the stack for lexical vars.
(byte-compile-push-binding-init): Simplify.
(byte-compile-not-lexical-var-p): New function, moved from cconv.el.
(byte-compile-bind, byte-compile-unbind): New functions, moved and
simplified from byte-lexbind.el.
(byte-compile-let, byte-compile-let*): Simplify.
(byte-compile-condition-case): Don't add :fun-body to the bound vars.
(byte-compile-defmacro): Simplify.
* lisp/emacs-lisp/byte-opt.el (byte-compile-side-effect-free-ops)
(byte-optimize-lapcode): Remove byte-vec-ref and byte-vec-set.
* lisp/emacs-lisp/cconv.el (cconv-not-lexical-var-p): Remove.
(cconv-freevars, cconv-analyse-function, cconv-analyse-form):
Use byte-compile-not-lexical-var-p instead.
* src/bytecode.c (Bvec_ref, Bvec_set): Remove.
(exec_byte_code): Don't handle them.
* lisp/help-fns.el (describe-function-1): Fix paren typo.
2011-02-12 05:53:30 +00:00
|
|
|
|
(setq num-dynamic-bindings (1+ num-dynamic-bindings))))
|
|
|
|
|
(unless (zerop num-dynamic-bindings)
|
|
|
|
|
(byte-compile-out 'byte-unbind num-dynamic-bindings)))
|
|
|
|
|
;; Pop lexical variables off the stack, possibly preserving the
|
|
|
|
|
;; return value of the body.
|
|
|
|
|
(when init-lexenv
|
2013-06-05 02:35:40 +00:00
|
|
|
|
;; INIT-LEXENV contains all init values left on the stack.
|
* lisp/emacs-lisp/byte-lexbind.el: Delete.
* lisp/emacs-lisp/bytecomp.el (byte-compile-current-heap-environment)
(byte-compile-current-num-closures): Remove vars.
(byte-vec-ref, byte-vec-set): Remove byte codes.
(byte-compile-arglist-vars, byte-compile-make-lambda-lexenv): Move from
byte-lexbind.el.
(byte-compile-lambda): Never build a closure.
(byte-compile-closure-code-p, byte-compile-make-closure): Remove.
(byte-compile-closure): Simplify.
(byte-compile-top-level): Don't mess with heap environments.
(byte-compile-dynamic-variable-bind): Always maintain
byte-compile-bound-variables.
(byte-compile-variable-ref, byte-compile-variable-set): Always just use
the stack for lexical vars.
(byte-compile-push-binding-init): Simplify.
(byte-compile-not-lexical-var-p): New function, moved from cconv.el.
(byte-compile-bind, byte-compile-unbind): New functions, moved and
simplified from byte-lexbind.el.
(byte-compile-let, byte-compile-let*): Simplify.
(byte-compile-condition-case): Don't add :fun-body to the bound vars.
(byte-compile-defmacro): Simplify.
* lisp/emacs-lisp/byte-opt.el (byte-compile-side-effect-free-ops)
(byte-optimize-lapcode): Remove byte-vec-ref and byte-vec-set.
* lisp/emacs-lisp/cconv.el (cconv-not-lexical-var-p): Remove.
(cconv-freevars, cconv-analyse-function, cconv-analyse-form):
Use byte-compile-not-lexical-var-p instead.
* src/bytecode.c (Bvec_ref, Bvec_set): Remove.
(exec_byte_code): Don't handle them.
* lisp/help-fns.el (describe-function-1): Fix paren typo.
2011-02-12 05:53:30 +00:00
|
|
|
|
(byte-compile-discard (length init-lexenv) preserve-body-value)))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
|
|
|
|
(defun byte-compile-let (form)
|
2013-06-05 02:35:40 +00:00
|
|
|
|
"Generate code for the `let' or `let*' form FORM."
|
2011-02-17 21:19:13 +00:00
|
|
|
|
(let ((clauses (cadr form))
|
2013-06-05 02:35:40 +00:00
|
|
|
|
(init-lexenv nil)
|
|
|
|
|
(is-let (eq (car form) 'let)))
|
|
|
|
|
(when is-let
|
2011-02-17 21:19:13 +00:00
|
|
|
|
;; First compute the binding values in the old scope.
|
|
|
|
|
(dolist (var clauses)
|
|
|
|
|
(push (byte-compile-push-binding-init var) init-lexenv)))
|
|
|
|
|
;; New scope.
|
|
|
|
|
(let ((byte-compile-bound-variables byte-compile-bound-variables)
|
2011-04-01 15:16:50 +00:00
|
|
|
|
(byte-compile--lexical-environment
|
|
|
|
|
byte-compile--lexical-environment))
|
2011-02-17 21:19:13 +00:00
|
|
|
|
;; Bind the variables.
|
|
|
|
|
;; For `let', do it in reverse order, because it makes no
|
|
|
|
|
;; semantic difference, but it is a lot more efficient since the
|
|
|
|
|
;; values are now in reverse order on the stack.
|
2013-06-05 02:35:40 +00:00
|
|
|
|
(dolist (var (if is-let (reverse clauses) clauses))
|
|
|
|
|
(unless is-let
|
2011-02-17 21:19:13 +00:00
|
|
|
|
(push (byte-compile-push-binding-init var) init-lexenv))
|
|
|
|
|
(let ((var (if (consp var) (car var) var)))
|
2013-06-05 02:35:40 +00:00
|
|
|
|
(if (byte-compile-bind var init-lexenv)
|
|
|
|
|
(pop init-lexenv))))
|
* lisp/emacs-lisp/byte-lexbind.el: Delete.
* lisp/emacs-lisp/bytecomp.el (byte-compile-current-heap-environment)
(byte-compile-current-num-closures): Remove vars.
(byte-vec-ref, byte-vec-set): Remove byte codes.
(byte-compile-arglist-vars, byte-compile-make-lambda-lexenv): Move from
byte-lexbind.el.
(byte-compile-lambda): Never build a closure.
(byte-compile-closure-code-p, byte-compile-make-closure): Remove.
(byte-compile-closure): Simplify.
(byte-compile-top-level): Don't mess with heap environments.
(byte-compile-dynamic-variable-bind): Always maintain
byte-compile-bound-variables.
(byte-compile-variable-ref, byte-compile-variable-set): Always just use
the stack for lexical vars.
(byte-compile-push-binding-init): Simplify.
(byte-compile-not-lexical-var-p): New function, moved from cconv.el.
(byte-compile-bind, byte-compile-unbind): New functions, moved and
simplified from byte-lexbind.el.
(byte-compile-let, byte-compile-let*): Simplify.
(byte-compile-condition-case): Don't add :fun-body to the bound vars.
(byte-compile-defmacro): Simplify.
* lisp/emacs-lisp/byte-opt.el (byte-compile-side-effect-free-ops)
(byte-optimize-lapcode): Remove byte-vec-ref and byte-vec-set.
* lisp/emacs-lisp/cconv.el (cconv-not-lexical-var-p): Remove.
(cconv-freevars, cconv-analyse-function, cconv-analyse-form):
Use byte-compile-not-lexical-var-p instead.
* src/bytecode.c (Bvec_ref, Bvec_set): Remove.
(exec_byte_code): Don't handle them.
* lisp/help-fns.el (describe-function-1): Fix paren typo.
2011-02-12 05:53:30 +00:00
|
|
|
|
;; Emit the body.
|
2011-02-17 21:19:13 +00:00
|
|
|
|
(let ((init-stack-depth byte-compile-depth))
|
|
|
|
|
(byte-compile-body-do-effect (cdr (cdr form)))
|
2013-06-05 02:35:40 +00:00
|
|
|
|
;; Unbind both lexical and dynamic variables.
|
|
|
|
|
(cl-assert (or (eq byte-compile-depth init-stack-depth)
|
|
|
|
|
(eq byte-compile-depth (1+ init-stack-depth))))
|
|
|
|
|
(byte-compile-unbind clauses init-lexenv
|
|
|
|
|
(> byte-compile-depth init-stack-depth))))))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
2010-06-13 20:36:17 +00:00
|
|
|
|
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
|
|
|
|
(byte-defop-compiler-1 /= byte-compile-negated)
|
|
|
|
|
(byte-defop-compiler-1 atom byte-compile-negated)
|
|
|
|
|
(byte-defop-compiler-1 nlistp byte-compile-negated)
|
|
|
|
|
|
|
|
|
|
(put '/= 'byte-compile-negated-op '=)
|
|
|
|
|
(put 'atom 'byte-compile-negated-op 'consp)
|
|
|
|
|
(put 'nlistp 'byte-compile-negated-op 'listp)
|
|
|
|
|
|
|
|
|
|
(defun byte-compile-negated (form)
|
|
|
|
|
(byte-compile-form-do-effect (byte-compile-negation-optimizer form)))
|
|
|
|
|
|
|
|
|
|
;; Even when optimization is off, /= is optimized to (not (= ...)).
|
|
|
|
|
(defun byte-compile-negation-optimizer (form)
|
|
|
|
|
;; an optimizer for forms where <form1> is less efficient than (not <form2>)
|
2002-05-28 17:40:47 +00:00
|
|
|
|
(byte-compile-set-symbol-position (car form))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(list 'not
|
|
|
|
|
(cons (or (get (car form) 'byte-compile-negated-op)
|
|
|
|
|
(error
|
1992-07-15 20:26:37 +00:00
|
|
|
|
"Compiler error: `%s' has no `byte-compile-negated-op' property"
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(car form)))
|
|
|
|
|
(cdr form))))
|
|
|
|
|
|
|
|
|
|
;;; other tricky macro-like special-forms
|
|
|
|
|
|
|
|
|
|
(byte-defop-compiler-1 catch)
|
|
|
|
|
(byte-defop-compiler-1 unwind-protect)
|
|
|
|
|
(byte-defop-compiler-1 condition-case)
|
|
|
|
|
(byte-defop-compiler-1 save-excursion)
|
1996-09-22 04:37:55 +00:00
|
|
|
|
(byte-defop-compiler-1 save-current-buffer)
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(byte-defop-compiler-1 save-restriction)
|
2011-04-01 15:16:50 +00:00
|
|
|
|
;; (byte-defop-compiler-1 save-window-excursion) ;Obsolete: now a macro.
|
|
|
|
|
;; (byte-defop-compiler-1 with-output-to-temp-buffer) ;Obsolete: now a macro.
|
1993-05-15 19:47:15 +00:00
|
|
|
|
(byte-defop-compiler-1 track-mouse)
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
Introduce new bytecodes for efficient catch/condition-case in lexbind.
* lisp/emacs-lisp/byte-opt.el (byte-optimize-form-code-walker):
Optimize under `condition-case' and `catch' if
byte-compile--use-old-handlers is nil.
(disassemble-offset): Handle new bytecodes.
* lisp/emacs-lisp/bytecomp.el (byte-pushcatch, byte-pushconditioncase)
(byte-pophandler): New byte codes.
(byte-goto-ops): Adjust accordingly.
(byte-compile--use-old-handlers): New var.
(byte-compile-catch): Use new byte codes depending on
byte-compile--use-old-handlers.
(byte-compile-condition-case--old): Rename from
byte-compile-condition-case.
(byte-compile-condition-case--new): New function.
(byte-compile-condition-case): New function that dispatches depending
on byte-compile--use-old-handlers.
(byte-compile-unwind-protect): Pass a function to byte-unwind-protect
when we can.
* lisp/emacs-lisp/cconv.el (cconv-convert, cconv-analyse-form): Adjust for
the new compilation scheme using the new byte-codes.
* src/alloc.c (Fgarbage_collect): Merge scans of handlerlist and catchlist,
and make them unconditional now that they're heap-allocated.
* src/bytecode.c (BYTE_CODES): Add Bpushcatch, Bpushconditioncase
and Bpophandler.
(bcall0): New function.
(exec_byte_code): Add corresponding cases. Improve error message when
encountering an invalid byte-code. Let Bunwind_protect accept
a function (rather than a list of expressions) as argument.
* src/eval.c (catchlist): Remove (merge with handlerlist).
(handlerlist, lisp_eval_depth): Not static any more.
(internal_catch, internal_condition_case, internal_condition_case_1)
(internal_condition_case_2, internal_condition_case_n):
Use PUSH_HANDLER.
(unwind_to_catch, Fthrow, Fsignal): Adjust to merged
handlerlist/catchlist.
(internal_lisp_condition_case): Use PUSH_HANDLER. Adjust to new
handlerlist which can only handle a single condition-case handler at
a time.
(find_handler_clause): Simplify since we only a single branch here
any more.
* src/lisp.h (struct handler): Merge struct handler and struct catchtag.
(PUSH_HANDLER): New macro.
(catchlist): Remove.
(handlerlist): Always declare.
2013-10-03 04:58:56 +00:00
|
|
|
|
(defvar byte-compile--use-old-handlers t
|
|
|
|
|
"If nil, use new byte codes introduced in Emacs-24.4.")
|
|
|
|
|
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(defun byte-compile-catch (form)
|
|
|
|
|
(byte-compile-form (car (cdr form)))
|
Introduce new bytecodes for efficient catch/condition-case in lexbind.
* lisp/emacs-lisp/byte-opt.el (byte-optimize-form-code-walker):
Optimize under `condition-case' and `catch' if
byte-compile--use-old-handlers is nil.
(disassemble-offset): Handle new bytecodes.
* lisp/emacs-lisp/bytecomp.el (byte-pushcatch, byte-pushconditioncase)
(byte-pophandler): New byte codes.
(byte-goto-ops): Adjust accordingly.
(byte-compile--use-old-handlers): New var.
(byte-compile-catch): Use new byte codes depending on
byte-compile--use-old-handlers.
(byte-compile-condition-case--old): Rename from
byte-compile-condition-case.
(byte-compile-condition-case--new): New function.
(byte-compile-condition-case): New function that dispatches depending
on byte-compile--use-old-handlers.
(byte-compile-unwind-protect): Pass a function to byte-unwind-protect
when we can.
* lisp/emacs-lisp/cconv.el (cconv-convert, cconv-analyse-form): Adjust for
the new compilation scheme using the new byte-codes.
* src/alloc.c (Fgarbage_collect): Merge scans of handlerlist and catchlist,
and make them unconditional now that they're heap-allocated.
* src/bytecode.c (BYTE_CODES): Add Bpushcatch, Bpushconditioncase
and Bpophandler.
(bcall0): New function.
(exec_byte_code): Add corresponding cases. Improve error message when
encountering an invalid byte-code. Let Bunwind_protect accept
a function (rather than a list of expressions) as argument.
* src/eval.c (catchlist): Remove (merge with handlerlist).
(handlerlist, lisp_eval_depth): Not static any more.
(internal_catch, internal_condition_case, internal_condition_case_1)
(internal_condition_case_2, internal_condition_case_n):
Use PUSH_HANDLER.
(unwind_to_catch, Fthrow, Fsignal): Adjust to merged
handlerlist/catchlist.
(internal_lisp_condition_case): Use PUSH_HANDLER. Adjust to new
handlerlist which can only handle a single condition-case handler at
a time.
(find_handler_clause): Simplify since we only a single branch here
any more.
* src/lisp.h (struct handler): Merge struct handler and struct catchtag.
(PUSH_HANDLER): New macro.
(catchlist): Remove.
(handlerlist): Always declare.
2013-10-03 04:58:56 +00:00
|
|
|
|
(if (not byte-compile--use-old-handlers)
|
|
|
|
|
(let ((endtag (byte-compile-make-tag)))
|
|
|
|
|
(byte-compile-goto 'byte-pushcatch endtag)
|
|
|
|
|
(byte-compile-body (cddr form) nil)
|
|
|
|
|
(byte-compile-out 'byte-pophandler)
|
|
|
|
|
(byte-compile-out-tag endtag))
|
|
|
|
|
(pcase (cddr form)
|
|
|
|
|
(`(:fun-body ,f)
|
|
|
|
|
(byte-compile-form `(list 'funcall ,f)))
|
|
|
|
|
(body
|
|
|
|
|
(byte-compile-push-constant
|
|
|
|
|
(byte-compile-top-level (cons 'progn body) byte-compile--for-effect))))
|
|
|
|
|
(byte-compile-out 'byte-catch 0)))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
|
|
|
|
(defun byte-compile-unwind-protect (form)
|
2011-02-10 23:37:03 +00:00
|
|
|
|
(pcase (cddr form)
|
|
|
|
|
(`(:fun-body ,f)
|
Introduce new bytecodes for efficient catch/condition-case in lexbind.
* lisp/emacs-lisp/byte-opt.el (byte-optimize-form-code-walker):
Optimize under `condition-case' and `catch' if
byte-compile--use-old-handlers is nil.
(disassemble-offset): Handle new bytecodes.
* lisp/emacs-lisp/bytecomp.el (byte-pushcatch, byte-pushconditioncase)
(byte-pophandler): New byte codes.
(byte-goto-ops): Adjust accordingly.
(byte-compile--use-old-handlers): New var.
(byte-compile-catch): Use new byte codes depending on
byte-compile--use-old-handlers.
(byte-compile-condition-case--old): Rename from
byte-compile-condition-case.
(byte-compile-condition-case--new): New function.
(byte-compile-condition-case): New function that dispatches depending
on byte-compile--use-old-handlers.
(byte-compile-unwind-protect): Pass a function to byte-unwind-protect
when we can.
* lisp/emacs-lisp/cconv.el (cconv-convert, cconv-analyse-form): Adjust for
the new compilation scheme using the new byte-codes.
* src/alloc.c (Fgarbage_collect): Merge scans of handlerlist and catchlist,
and make them unconditional now that they're heap-allocated.
* src/bytecode.c (BYTE_CODES): Add Bpushcatch, Bpushconditioncase
and Bpophandler.
(bcall0): New function.
(exec_byte_code): Add corresponding cases. Improve error message when
encountering an invalid byte-code. Let Bunwind_protect accept
a function (rather than a list of expressions) as argument.
* src/eval.c (catchlist): Remove (merge with handlerlist).
(handlerlist, lisp_eval_depth): Not static any more.
(internal_catch, internal_condition_case, internal_condition_case_1)
(internal_condition_case_2, internal_condition_case_n):
Use PUSH_HANDLER.
(unwind_to_catch, Fthrow, Fsignal): Adjust to merged
handlerlist/catchlist.
(internal_lisp_condition_case): Use PUSH_HANDLER. Adjust to new
handlerlist which can only handle a single condition-case handler at
a time.
(find_handler_clause): Simplify since we only a single branch here
any more.
* src/lisp.h (struct handler): Merge struct handler and struct catchtag.
(PUSH_HANDLER): New macro.
(catchlist): Remove.
(handlerlist): Always declare.
2013-10-03 04:58:56 +00:00
|
|
|
|
(byte-compile-form
|
|
|
|
|
(if byte-compile--use-old-handlers `(list (list 'funcall ,f)) f)))
|
2011-02-10 23:37:03 +00:00
|
|
|
|
(handlers
|
Introduce new bytecodes for efficient catch/condition-case in lexbind.
* lisp/emacs-lisp/byte-opt.el (byte-optimize-form-code-walker):
Optimize under `condition-case' and `catch' if
byte-compile--use-old-handlers is nil.
(disassemble-offset): Handle new bytecodes.
* lisp/emacs-lisp/bytecomp.el (byte-pushcatch, byte-pushconditioncase)
(byte-pophandler): New byte codes.
(byte-goto-ops): Adjust accordingly.
(byte-compile--use-old-handlers): New var.
(byte-compile-catch): Use new byte codes depending on
byte-compile--use-old-handlers.
(byte-compile-condition-case--old): Rename from
byte-compile-condition-case.
(byte-compile-condition-case--new): New function.
(byte-compile-condition-case): New function that dispatches depending
on byte-compile--use-old-handlers.
(byte-compile-unwind-protect): Pass a function to byte-unwind-protect
when we can.
* lisp/emacs-lisp/cconv.el (cconv-convert, cconv-analyse-form): Adjust for
the new compilation scheme using the new byte-codes.
* src/alloc.c (Fgarbage_collect): Merge scans of handlerlist and catchlist,
and make them unconditional now that they're heap-allocated.
* src/bytecode.c (BYTE_CODES): Add Bpushcatch, Bpushconditioncase
and Bpophandler.
(bcall0): New function.
(exec_byte_code): Add corresponding cases. Improve error message when
encountering an invalid byte-code. Let Bunwind_protect accept
a function (rather than a list of expressions) as argument.
* src/eval.c (catchlist): Remove (merge with handlerlist).
(handlerlist, lisp_eval_depth): Not static any more.
(internal_catch, internal_condition_case, internal_condition_case_1)
(internal_condition_case_2, internal_condition_case_n):
Use PUSH_HANDLER.
(unwind_to_catch, Fthrow, Fsignal): Adjust to merged
handlerlist/catchlist.
(internal_lisp_condition_case): Use PUSH_HANDLER. Adjust to new
handlerlist which can only handle a single condition-case handler at
a time.
(find_handler_clause): Simplify since we only a single branch here
any more.
* src/lisp.h (struct handler): Merge struct handler and struct catchtag.
(PUSH_HANDLER): New macro.
(catchlist): Remove.
(handlerlist): Always declare.
2013-10-03 04:58:56 +00:00
|
|
|
|
(if byte-compile--use-old-handlers
|
|
|
|
|
(byte-compile-push-constant
|
|
|
|
|
(byte-compile-top-level-body handlers t))
|
|
|
|
|
(byte-compile-form `#'(lambda () ,@handlers)))))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(byte-compile-out 'byte-unwind-protect 0)
|
|
|
|
|
(byte-compile-form-do-effect (car (cdr form)))
|
|
|
|
|
(byte-compile-out 'byte-unbind 1))
|
|
|
|
|
|
1993-05-15 19:47:15 +00:00
|
|
|
|
(defun byte-compile-track-mouse (form)
|
1994-03-10 17:22:59 +00:00
|
|
|
|
(byte-compile-form
|
2011-02-10 23:37:03 +00:00
|
|
|
|
(pcase form
|
|
|
|
|
(`(,_ :fun-body ,f) `(eval (list 'track-mouse (list 'funcall ,f))))
|
|
|
|
|
(_ `(eval '(track-mouse ,@(byte-compile-top-level-body (cdr form))))))))
|
1993-05-15 19:47:15 +00:00
|
|
|
|
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(defun byte-compile-condition-case (form)
|
Introduce new bytecodes for efficient catch/condition-case in lexbind.
* lisp/emacs-lisp/byte-opt.el (byte-optimize-form-code-walker):
Optimize under `condition-case' and `catch' if
byte-compile--use-old-handlers is nil.
(disassemble-offset): Handle new bytecodes.
* lisp/emacs-lisp/bytecomp.el (byte-pushcatch, byte-pushconditioncase)
(byte-pophandler): New byte codes.
(byte-goto-ops): Adjust accordingly.
(byte-compile--use-old-handlers): New var.
(byte-compile-catch): Use new byte codes depending on
byte-compile--use-old-handlers.
(byte-compile-condition-case--old): Rename from
byte-compile-condition-case.
(byte-compile-condition-case--new): New function.
(byte-compile-condition-case): New function that dispatches depending
on byte-compile--use-old-handlers.
(byte-compile-unwind-protect): Pass a function to byte-unwind-protect
when we can.
* lisp/emacs-lisp/cconv.el (cconv-convert, cconv-analyse-form): Adjust for
the new compilation scheme using the new byte-codes.
* src/alloc.c (Fgarbage_collect): Merge scans of handlerlist and catchlist,
and make them unconditional now that they're heap-allocated.
* src/bytecode.c (BYTE_CODES): Add Bpushcatch, Bpushconditioncase
and Bpophandler.
(bcall0): New function.
(exec_byte_code): Add corresponding cases. Improve error message when
encountering an invalid byte-code. Let Bunwind_protect accept
a function (rather than a list of expressions) as argument.
* src/eval.c (catchlist): Remove (merge with handlerlist).
(handlerlist, lisp_eval_depth): Not static any more.
(internal_catch, internal_condition_case, internal_condition_case_1)
(internal_condition_case_2, internal_condition_case_n):
Use PUSH_HANDLER.
(unwind_to_catch, Fthrow, Fsignal): Adjust to merged
handlerlist/catchlist.
(internal_lisp_condition_case): Use PUSH_HANDLER. Adjust to new
handlerlist which can only handle a single condition-case handler at
a time.
(find_handler_clause): Simplify since we only a single branch here
any more.
* src/lisp.h (struct handler): Merge struct handler and struct catchtag.
(PUSH_HANDLER): New macro.
(catchlist): Remove.
(handlerlist): Always declare.
2013-10-03 04:58:56 +00:00
|
|
|
|
(if byte-compile--use-old-handlers
|
|
|
|
|
(byte-compile-condition-case--old form)
|
|
|
|
|
(byte-compile-condition-case--new form)))
|
|
|
|
|
|
|
|
|
|
(defun byte-compile-condition-case--old (form)
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(let* ((var (nth 1 form))
|
* lisp/emacs-lisp/byte-lexbind.el: Delete.
* lisp/emacs-lisp/bytecomp.el (byte-compile-current-heap-environment)
(byte-compile-current-num-closures): Remove vars.
(byte-vec-ref, byte-vec-set): Remove byte codes.
(byte-compile-arglist-vars, byte-compile-make-lambda-lexenv): Move from
byte-lexbind.el.
(byte-compile-lambda): Never build a closure.
(byte-compile-closure-code-p, byte-compile-make-closure): Remove.
(byte-compile-closure): Simplify.
(byte-compile-top-level): Don't mess with heap environments.
(byte-compile-dynamic-variable-bind): Always maintain
byte-compile-bound-variables.
(byte-compile-variable-ref, byte-compile-variable-set): Always just use
the stack for lexical vars.
(byte-compile-push-binding-init): Simplify.
(byte-compile-not-lexical-var-p): New function, moved from cconv.el.
(byte-compile-bind, byte-compile-unbind): New functions, moved and
simplified from byte-lexbind.el.
(byte-compile-let, byte-compile-let*): Simplify.
(byte-compile-condition-case): Don't add :fun-body to the bound vars.
(byte-compile-defmacro): Simplify.
* lisp/emacs-lisp/byte-opt.el (byte-compile-side-effect-free-ops)
(byte-optimize-lapcode): Remove byte-vec-ref and byte-vec-set.
* lisp/emacs-lisp/cconv.el (cconv-not-lexical-var-p): Remove.
(cconv-freevars, cconv-analyse-function, cconv-analyse-form):
Use byte-compile-not-lexical-var-p instead.
* src/bytecode.c (Bvec_ref, Bvec_set): Remove.
(exec_byte_code): Don't handle them.
* lisp/help-fns.el (describe-function-1): Fix paren typo.
2011-02-12 05:53:30 +00:00
|
|
|
|
(fun-bodies (eq var :fun-body))
|
|
|
|
|
(byte-compile-bound-variables
|
|
|
|
|
(if (and var (not fun-bodies))
|
|
|
|
|
(cons var byte-compile-bound-variables)
|
1992-07-10 22:06:47 +00:00
|
|
|
|
byte-compile-bound-variables)))
|
2002-05-28 17:40:47 +00:00
|
|
|
|
(byte-compile-set-symbol-position 'condition-case)
|
|
|
|
|
(unless (symbolp var)
|
|
|
|
|
(byte-compile-warn
|
2004-06-13 22:01:36 +00:00
|
|
|
|
"`%s' is not a variable-name or nil (in condition-case)" var))
|
2011-02-10 23:37:03 +00:00
|
|
|
|
(if fun-bodies (setq var (make-symbol "err")))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(byte-compile-push-constant var)
|
2011-02-10 23:37:03 +00:00
|
|
|
|
(if fun-bodies
|
|
|
|
|
(byte-compile-form `(list 'funcall ,(nth 2 form)))
|
|
|
|
|
(byte-compile-push-constant
|
Try and fix w32 build; misc cleanup.
* lisp/subr.el (apply-partially): Move from subr.el; don't use lexical-let.
(eval-after-load): Obey lexical-binding.
* lisp/simple.el (apply-partially): Move to subr.el.
* lisp/makefile.w32-in: Match changes in Makefile.in.
(BIG_STACK_DEPTH, BIG_STACK_OPTS, BYTE_COMPILE_FLAGS): New vars.
(.el.elc, compile-CMD, compile-SH, compile-always-CMD)
(compile-always-SH, compile-calc-CMD, compile-calc-SH): Use them.
(COMPILE_FIRST): Add pcase, macroexp, and cconv.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Silence warning about
calling CL's `compiler-macroexpand'.
* lisp/emacs-lisp/bytecomp.el (byte-compile-preprocess): New function.
(byte-compile-initial-macro-environment)
(byte-compile-toplevel-file-form, byte-compile, byte-compile-sexp): Use it.
(byte-compile-eval, byte-compile-eval-before-compile): Obey lexical-binding.
(byte-compile--for-effect): Rename from `for-effect'.
(display-call-tree): Use case.
* lisp/emacs-lisp/byte-opt.el (for-effect): Don't declare as dynamic.
(byte-optimize-form-code-walker, byte-optimize-form):
Revert to old arg name.
* lisp/Makefile.in (BYTE_COMPILE_FLAGS): New var.
(compile-onefile, .el.elc, compile-calc, recompile): Use it.
2011-03-12 03:32:43 +00:00
|
|
|
|
(byte-compile-top-level (nth 2 form) byte-compile--for-effect)))
|
2011-02-10 23:37:03 +00:00
|
|
|
|
(let ((compiled-clauses
|
|
|
|
|
(mapcar
|
|
|
|
|
(lambda (clause)
|
|
|
|
|
(let ((condition (car clause)))
|
|
|
|
|
(cond ((not (or (symbolp condition)
|
|
|
|
|
(and (listp condition)
|
|
|
|
|
(let ((ok t))
|
|
|
|
|
(dolist (sym condition)
|
|
|
|
|
(if (not (symbolp sym))
|
|
|
|
|
(setq ok nil)))
|
|
|
|
|
ok))))
|
|
|
|
|
(byte-compile-warn
|
|
|
|
|
"`%S' is not a condition name or list of such (in condition-case)"
|
|
|
|
|
condition))
|
|
|
|
|
;; (not (or (eq condition 't)
|
|
|
|
|
;; (and (stringp (get condition 'error-message))
|
|
|
|
|
;; (consp (get condition
|
|
|
|
|
;; 'error-conditions)))))
|
|
|
|
|
;; (byte-compile-warn
|
|
|
|
|
;; "`%s' is not a known condition name
|
|
|
|
|
;; (in condition-case)"
|
|
|
|
|
;; condition))
|
|
|
|
|
)
|
|
|
|
|
(if fun-bodies
|
|
|
|
|
`(list ',condition (list 'funcall ,(cadr clause) ',var))
|
|
|
|
|
(cons condition
|
|
|
|
|
(byte-compile-top-level-body
|
Try and fix w32 build; misc cleanup.
* lisp/subr.el (apply-partially): Move from subr.el; don't use lexical-let.
(eval-after-load): Obey lexical-binding.
* lisp/simple.el (apply-partially): Move to subr.el.
* lisp/makefile.w32-in: Match changes in Makefile.in.
(BIG_STACK_DEPTH, BIG_STACK_OPTS, BYTE_COMPILE_FLAGS): New vars.
(.el.elc, compile-CMD, compile-SH, compile-always-CMD)
(compile-always-SH, compile-calc-CMD, compile-calc-SH): Use them.
(COMPILE_FIRST): Add pcase, macroexp, and cconv.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Silence warning about
calling CL's `compiler-macroexpand'.
* lisp/emacs-lisp/bytecomp.el (byte-compile-preprocess): New function.
(byte-compile-initial-macro-environment)
(byte-compile-toplevel-file-form, byte-compile, byte-compile-sexp): Use it.
(byte-compile-eval, byte-compile-eval-before-compile): Obey lexical-binding.
(byte-compile--for-effect): Rename from `for-effect'.
(display-call-tree): Use case.
* lisp/emacs-lisp/byte-opt.el (for-effect): Don't declare as dynamic.
(byte-optimize-form-code-walker, byte-optimize-form):
Revert to old arg name.
* lisp/Makefile.in (BYTE_COMPILE_FLAGS): New var.
(compile-onefile, .el.elc, compile-calc, recompile): Use it.
2011-03-12 03:32:43 +00:00
|
|
|
|
(cdr clause) byte-compile--for-effect)))))
|
2011-02-10 23:37:03 +00:00
|
|
|
|
(cdr (cdr (cdr form))))))
|
|
|
|
|
(if fun-bodies
|
|
|
|
|
(byte-compile-form `(list ,@compiled-clauses))
|
|
|
|
|
(byte-compile-push-constant compiled-clauses)))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(byte-compile-out 'byte-condition-case 0)))
|
|
|
|
|
|
Introduce new bytecodes for efficient catch/condition-case in lexbind.
* lisp/emacs-lisp/byte-opt.el (byte-optimize-form-code-walker):
Optimize under `condition-case' and `catch' if
byte-compile--use-old-handlers is nil.
(disassemble-offset): Handle new bytecodes.
* lisp/emacs-lisp/bytecomp.el (byte-pushcatch, byte-pushconditioncase)
(byte-pophandler): New byte codes.
(byte-goto-ops): Adjust accordingly.
(byte-compile--use-old-handlers): New var.
(byte-compile-catch): Use new byte codes depending on
byte-compile--use-old-handlers.
(byte-compile-condition-case--old): Rename from
byte-compile-condition-case.
(byte-compile-condition-case--new): New function.
(byte-compile-condition-case): New function that dispatches depending
on byte-compile--use-old-handlers.
(byte-compile-unwind-protect): Pass a function to byte-unwind-protect
when we can.
* lisp/emacs-lisp/cconv.el (cconv-convert, cconv-analyse-form): Adjust for
the new compilation scheme using the new byte-codes.
* src/alloc.c (Fgarbage_collect): Merge scans of handlerlist and catchlist,
and make them unconditional now that they're heap-allocated.
* src/bytecode.c (BYTE_CODES): Add Bpushcatch, Bpushconditioncase
and Bpophandler.
(bcall0): New function.
(exec_byte_code): Add corresponding cases. Improve error message when
encountering an invalid byte-code. Let Bunwind_protect accept
a function (rather than a list of expressions) as argument.
* src/eval.c (catchlist): Remove (merge with handlerlist).
(handlerlist, lisp_eval_depth): Not static any more.
(internal_catch, internal_condition_case, internal_condition_case_1)
(internal_condition_case_2, internal_condition_case_n):
Use PUSH_HANDLER.
(unwind_to_catch, Fthrow, Fsignal): Adjust to merged
handlerlist/catchlist.
(internal_lisp_condition_case): Use PUSH_HANDLER. Adjust to new
handlerlist which can only handle a single condition-case handler at
a time.
(find_handler_clause): Simplify since we only a single branch here
any more.
* src/lisp.h (struct handler): Merge struct handler and struct catchtag.
(PUSH_HANDLER): New macro.
(catchlist): Remove.
(handlerlist): Always declare.
2013-10-03 04:58:56 +00:00
|
|
|
|
(defun byte-compile-condition-case--new (form)
|
|
|
|
|
(let* ((var (nth 1 form))
|
|
|
|
|
(body (nth 2 form))
|
|
|
|
|
(depth byte-compile-depth)
|
|
|
|
|
(clauses (mapcar (lambda (clause)
|
|
|
|
|
(cons (byte-compile-make-tag) clause))
|
|
|
|
|
(nthcdr 3 form)))
|
|
|
|
|
(endtag (byte-compile-make-tag)))
|
|
|
|
|
(byte-compile-set-symbol-position 'condition-case)
|
|
|
|
|
(unless (symbolp var)
|
|
|
|
|
(byte-compile-warn
|
|
|
|
|
"`%s' is not a variable-name or nil (in condition-case)" var))
|
|
|
|
|
|
|
|
|
|
(dolist (clause (reverse clauses))
|
|
|
|
|
(let ((condition (nth 1 clause)))
|
|
|
|
|
(unless (consp condition) (setq condition (list condition)))
|
|
|
|
|
(dolist (c condition)
|
|
|
|
|
(unless (and c (symbolp c))
|
|
|
|
|
(byte-compile-warn
|
|
|
|
|
"`%S' is not a condition name (in condition-case)" c))
|
|
|
|
|
;; In reality, the `error-conditions' property is only required
|
|
|
|
|
;; for the argument to `signal', not to `condition-case'.
|
|
|
|
|
;;(unless (consp (get c 'error-conditions))
|
|
|
|
|
;; (byte-compile-warn
|
|
|
|
|
;; "`%s' is not a known condition name (in condition-case)"
|
|
|
|
|
;; c))
|
|
|
|
|
)
|
|
|
|
|
(byte-compile-push-constant condition))
|
|
|
|
|
(byte-compile-goto 'byte-pushconditioncase (car clause)))
|
|
|
|
|
|
|
|
|
|
(byte-compile-form body) ;; byte-compile--for-effect
|
|
|
|
|
(dolist (_ clauses) (byte-compile-out 'byte-pophandler))
|
|
|
|
|
(byte-compile-goto 'byte-goto endtag)
|
|
|
|
|
|
|
|
|
|
(while clauses
|
|
|
|
|
(let ((clause (pop clauses))
|
|
|
|
|
(byte-compile-bound-variables byte-compile-bound-variables)
|
|
|
|
|
(byte-compile--lexical-environment
|
|
|
|
|
byte-compile--lexical-environment))
|
|
|
|
|
(setq byte-compile-depth (1+ depth))
|
|
|
|
|
(byte-compile-out-tag (pop clause))
|
|
|
|
|
(dolist (_ clauses) (byte-compile-out 'byte-pophandler))
|
|
|
|
|
(cond
|
|
|
|
|
((null var) (byte-compile-discard))
|
|
|
|
|
(lexical-binding
|
|
|
|
|
(push (cons var (1- byte-compile-depth))
|
|
|
|
|
byte-compile--lexical-environment))
|
|
|
|
|
(t (byte-compile-dynamic-variable-bind var)))
|
|
|
|
|
(byte-compile-body (cdr clause)) ;; byte-compile--for-effect
|
|
|
|
|
(cond
|
|
|
|
|
((null var) nil)
|
|
|
|
|
(lexical-binding (byte-compile-discard 1 'preserve-tos))
|
|
|
|
|
(t (byte-compile-out 'byte-unbind 1)))
|
|
|
|
|
(byte-compile-goto 'byte-goto endtag)))
|
|
|
|
|
|
|
|
|
|
(byte-compile-out-tag endtag)))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
|
|
|
|
(defun byte-compile-save-excursion (form)
|
2009-11-27 22:03:04 +00:00
|
|
|
|
(if (and (eq 'set-buffer (car-safe (car-safe (cdr form))))
|
|
|
|
|
(byte-compile-warning-enabled-p 'suspicious))
|
2011-03-15 01:12:54 +00:00
|
|
|
|
(byte-compile-warn
|
|
|
|
|
"Use `with-current-buffer' rather than save-excursion+set-buffer"))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(byte-compile-out 'byte-save-excursion 0)
|
|
|
|
|
(byte-compile-body-do-effect (cdr form))
|
|
|
|
|
(byte-compile-out 'byte-unbind 1))
|
|
|
|
|
|
|
|
|
|
(defun byte-compile-save-restriction (form)
|
|
|
|
|
(byte-compile-out 'byte-save-restriction 0)
|
|
|
|
|
(byte-compile-body-do-effect (cdr form))
|
|
|
|
|
(byte-compile-out 'byte-unbind 1))
|
|
|
|
|
|
1996-09-22 04:37:55 +00:00
|
|
|
|
(defun byte-compile-save-current-buffer (form)
|
|
|
|
|
(byte-compile-out 'byte-save-current-buffer 0)
|
|
|
|
|
(byte-compile-body-do-effect (cdr form))
|
|
|
|
|
(byte-compile-out 'byte-unbind 1))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
|
|
|
|
;;; top-level forms elsewhere
|
|
|
|
|
|
|
|
|
|
(byte-defop-compiler-1 defvar)
|
|
|
|
|
(byte-defop-compiler-1 defconst byte-compile-defvar)
|
|
|
|
|
(byte-defop-compiler-1 autoload)
|
|
|
|
|
(byte-defop-compiler-1 lambda byte-compile-lambda-form)
|
|
|
|
|
|
2011-03-12 02:59:24 +00:00
|
|
|
|
;; If foo.el declares `toto' as obsolete, it is likely that foo.el will
|
|
|
|
|
;; actually use `toto' in order for this obsolete variable to still work
|
|
|
|
|
;; correctly, so paradoxically, while byte-compiling foo.el, the presence
|
|
|
|
|
;; of a make-obsolete-variable call for `toto' is an indication that `toto'
|
|
|
|
|
;; should not trigger obsolete-warnings in foo.el.
|
|
|
|
|
(byte-defop-compiler-1 make-obsolete-variable)
|
|
|
|
|
(defun byte-compile-make-obsolete-variable (form)
|
|
|
|
|
(when (eq 'quote (car-safe (nth 1 form)))
|
2011-11-20 04:33:36 +00:00
|
|
|
|
(push (nth 1 (nth 1 form)) byte-compile-global-not-obsolete-vars))
|
2011-03-12 02:59:24 +00:00
|
|
|
|
(byte-compile-normal-call form))
|
|
|
|
|
|
2012-02-09 21:51:03 +00:00
|
|
|
|
(defconst byte-compile-tmp-var (make-symbol "def-tmp-var"))
|
|
|
|
|
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(defun byte-compile-defvar (form)
|
2012-02-09 21:51:03 +00:00
|
|
|
|
;; This is not used for file-level defvar/consts.
|
2010-09-15 15:30:43 +00:00
|
|
|
|
(when (and (symbolp (nth 1 form))
|
2010-09-17 14:31:06 +00:00
|
|
|
|
(not (string-match "[-*/:$]" (symbol-name (nth 1 form))))
|
2010-09-15 15:30:43 +00:00
|
|
|
|
(byte-compile-warning-enabled-p 'lexical))
|
2010-09-23 07:55:01 +00:00
|
|
|
|
(byte-compile-warn "global/dynamic var `%s' lacks a prefix"
|
2010-09-15 15:30:43 +00:00
|
|
|
|
(nth 1 form)))
|
2000-09-25 15:41:30 +00:00
|
|
|
|
(let ((fun (nth 0 form))
|
|
|
|
|
(var (nth 1 form))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(value (nth 2 form))
|
|
|
|
|
(string (nth 3 form)))
|
2002-05-28 17:40:47 +00:00
|
|
|
|
(byte-compile-set-symbol-position fun)
|
2003-04-12 20:28:10 +00:00
|
|
|
|
(when (or (> (length form) 4)
|
|
|
|
|
(and (eq fun 'defconst) (null (cddr form))))
|
2003-04-21 15:48:28 +00:00
|
|
|
|
(let ((ncall (length (cdr form))))
|
|
|
|
|
(byte-compile-warn
|
2004-06-13 22:01:36 +00:00
|
|
|
|
"`%s' called with %d argument%s, but %s %s"
|
2003-04-21 15:48:28 +00:00
|
|
|
|
fun ncall
|
|
|
|
|
(if (= 1 ncall) "" "s")
|
|
|
|
|
(if (< ncall 2) "requires" "accepts only")
|
|
|
|
|
"2-3")))
|
2009-11-03 03:16:23 +00:00
|
|
|
|
(push var byte-compile-bound-variables)
|
|
|
|
|
(if (eq fun 'defconst)
|
|
|
|
|
(push var byte-compile-const-variables))
|
2012-02-09 21:51:03 +00:00
|
|
|
|
(when (and string (not (stringp string)))
|
|
|
|
|
(byte-compile-warn "third arg to `%s %s' is not a string: %s"
|
|
|
|
|
fun var string))
|
|
|
|
|
(byte-compile-form-do-effect
|
|
|
|
|
(if (cddr form) ; `value' provided
|
|
|
|
|
;; Quote with `quote' to prevent byte-compiling the body,
|
|
|
|
|
;; which would lead to an inf-loop.
|
|
|
|
|
`(funcall '(lambda (,byte-compile-tmp-var)
|
|
|
|
|
(,fun ,var ,byte-compile-tmp-var ,@(nthcdr 3 form)))
|
|
|
|
|
,value)
|
|
|
|
|
(if (eq fun 'defconst)
|
|
|
|
|
;; This will signal an appropriate error at runtime.
|
|
|
|
|
`(eval ',form)
|
|
|
|
|
;; A simple (defvar foo) just returns foo.
|
|
|
|
|
`',var)))))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
|
|
|
|
(defun byte-compile-autoload (form)
|
2002-05-28 17:40:47 +00:00
|
|
|
|
(byte-compile-set-symbol-position 'autoload)
|
2012-06-07 19:25:48 +00:00
|
|
|
|
(and (macroexp-const-p (nth 1 form))
|
|
|
|
|
(macroexp-const-p (nth 5 form))
|
2013-06-19 07:35:00 +00:00
|
|
|
|
(memq (eval (nth 5 form)) '(t macro)) ; macro-p
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(not (fboundp (eval (nth 1 form))))
|
|
|
|
|
(byte-compile-warn
|
2000-03-29 21:32:57 +00:00
|
|
|
|
"The compiler ignores `autoload' except at top level. You should
|
1992-07-10 22:06:47 +00:00
|
|
|
|
probably put the autoload of the macro `%s' at top-level."
|
|
|
|
|
(eval (nth 1 form))))
|
|
|
|
|
(byte-compile-normal-call form))
|
|
|
|
|
|
2000-03-29 21:32:57 +00:00
|
|
|
|
;; Lambdas in valid places are handled as special cases by various code.
|
1992-07-10 22:06:47 +00:00
|
|
|
|
;; The ones that remain are errors.
|
2011-03-10 19:40:48 +00:00
|
|
|
|
(defun byte-compile-lambda-form (_form)
|
2002-05-28 17:40:47 +00:00
|
|
|
|
(byte-compile-set-symbol-position 'lambda)
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(error "`lambda' used as function name is invalid"))
|
|
|
|
|
|
1994-06-29 18:06:09 +00:00
|
|
|
|
;; Compile normally, but deal with warnings for the function being defined.
|
2004-11-11 22:44:46 +00:00
|
|
|
|
(put 'defalias 'byte-hunk-handler 'byte-compile-file-form-defalias)
|
2011-05-07 04:03:49 +00:00
|
|
|
|
;; Used for eieio--defalias as well.
|
2004-11-11 22:44:46 +00:00
|
|
|
|
(defun byte-compile-file-form-defalias (form)
|
2012-05-30 03:59:42 +00:00
|
|
|
|
;; For the compilation itself, we could largely get rid of this hunk-handler,
|
|
|
|
|
;; if it weren't for the fact that we need to figure out when a defalias
|
|
|
|
|
;; defines a macro, so as to add it to byte-compile-macro-environment.
|
|
|
|
|
;;
|
|
|
|
|
;; FIXME: we also use this hunk-handler to implement the function's dynamic
|
|
|
|
|
;; docstring feature. We could actually implement it more elegantly in
|
|
|
|
|
;; byte-compile-lambda so it applies to all lambdas, but the problem is that
|
|
|
|
|
;; the resulting .elc format will not be recognized by make-docfile, so
|
|
|
|
|
;; either we stop using DOC for the docstrings of preloaded elc files (at the
|
|
|
|
|
;; cost of around 24KB on 32bit hosts, double on 64bit hosts) or we need to
|
|
|
|
|
;; build DOC in a more clever way (e.g. handle anonymous elements).
|
|
|
|
|
(let ((byte-compile-free-references nil)
|
|
|
|
|
(byte-compile-free-assignments nil))
|
|
|
|
|
(pcase form
|
|
|
|
|
;; Decompose `form' into:
|
|
|
|
|
;; - `name' is the name of the defined function.
|
|
|
|
|
;; - `arg' is the expression to which it is defined.
|
|
|
|
|
;; - `rest' is the rest of the arguments.
|
|
|
|
|
(`(,_ ',name ,arg . ,rest)
|
|
|
|
|
(pcase-let*
|
|
|
|
|
;; `macro' is non-nil if it defines a macro.
|
|
|
|
|
;; `fun' is the function part of `arg' (defaults to `arg').
|
|
|
|
|
(((or (and (or `(cons 'macro ,fun) `'(macro . ,fun)) (let macro t))
|
|
|
|
|
(and (let fun arg) (let macro nil)))
|
|
|
|
|
arg)
|
|
|
|
|
;; `lam' is the lambda expression in `fun' (or nil if not
|
|
|
|
|
;; recognized).
|
|
|
|
|
((or `(,(or `quote `function) ,lam) (let lam nil))
|
|
|
|
|
fun)
|
|
|
|
|
;; `arglist' is the list of arguments (or t if not recognized).
|
|
|
|
|
;; `body' is the body of `lam' (or t if not recognized).
|
|
|
|
|
((or `(lambda ,arglist . ,body)
|
|
|
|
|
;; `(closure ,_ ,arglist . ,body)
|
|
|
|
|
(and `(internal-make-closure ,arglist . ,_) (let body t))
|
|
|
|
|
(and (let arglist t) (let body t)))
|
|
|
|
|
lam))
|
|
|
|
|
(unless (byte-compile-file-form-defmumble
|
|
|
|
|
name macro arglist body rest)
|
2013-06-14 02:31:28 +00:00
|
|
|
|
(when macro
|
|
|
|
|
(if (null fun)
|
|
|
|
|
(message "Macro %s unrecognized, won't work in file" name)
|
|
|
|
|
(message "Macro %s partly recognized, trying our luck" name)
|
|
|
|
|
(push (cons name (eval fun))
|
|
|
|
|
byte-compile-macro-environment)))
|
2012-05-30 03:59:42 +00:00
|
|
|
|
(byte-compile-keep-pending form))))
|
|
|
|
|
|
|
|
|
|
;; We used to just do: (byte-compile-normal-call form)
|
|
|
|
|
;; But it turns out that this fails to optimize the code.
|
|
|
|
|
;; So instead we now do the same as what other byte-hunk-handlers do,
|
|
|
|
|
;; which is to call back byte-compile-file-form and then return nil.
|
|
|
|
|
;; Except that we can't just call byte-compile-file-form since it would
|
|
|
|
|
;; call us right back.
|
|
|
|
|
(t (byte-compile-keep-pending form)))))
|
2003-05-28 11:26:45 +00:00
|
|
|
|
|
|
|
|
|
(byte-defop-compiler-1 with-no-warnings byte-compile-no-warnings)
|
|
|
|
|
(defun byte-compile-no-warnings (form)
|
|
|
|
|
(let (byte-compile-warnings)
|
2004-04-21 19:13:00 +00:00
|
|
|
|
(byte-compile-form (cons 'progn (cdr form)))))
|
2005-07-29 19:54:18 +00:00
|
|
|
|
|
|
|
|
|
;; Warn about misuses of make-variable-buffer-local.
|
2009-09-15 04:03:35 +00:00
|
|
|
|
(byte-defop-compiler-1 make-variable-buffer-local
|
|
|
|
|
byte-compile-make-variable-buffer-local)
|
2005-07-29 19:54:18 +00:00
|
|
|
|
(defun byte-compile-make-variable-buffer-local (form)
|
2007-06-07 07:00:00 +00:00
|
|
|
|
(if (and (eq (car-safe (car-safe (cdr-safe form))) 'quote)
|
2007-10-28 23:53:06 +00:00
|
|
|
|
(byte-compile-warning-enabled-p 'make-local))
|
2005-07-29 19:54:18 +00:00
|
|
|
|
(byte-compile-warn
|
2013-08-16 06:53:41 +00:00
|
|
|
|
"`make-variable-buffer-local' not called at toplevel"))
|
2005-07-29 19:54:18 +00:00
|
|
|
|
(byte-compile-normal-call form))
|
|
|
|
|
(put 'make-variable-buffer-local
|
|
|
|
|
'byte-hunk-handler 'byte-compile-form-make-variable-buffer-local)
|
|
|
|
|
(defun byte-compile-form-make-variable-buffer-local (form)
|
|
|
|
|
(byte-compile-keep-pending form 'byte-compile-normal-call))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
|
|
|
|
;;; tags
|
|
|
|
|
|
|
|
|
|
;; Note: Most operations will strip off the 'TAG, but it speeds up
|
|
|
|
|
;; optimization to have the 'TAG as a part of the tag.
|
|
|
|
|
;; Tags will be (TAG . (tag-number . stack-depth)).
|
|
|
|
|
(defun byte-compile-make-tag ()
|
|
|
|
|
(list 'TAG (setq byte-compile-tag-number (1+ byte-compile-tag-number))))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
(defun byte-compile-out-tag (tag)
|
|
|
|
|
(setq byte-compile-output (cons tag byte-compile-output))
|
|
|
|
|
(if (cdr (cdr tag))
|
|
|
|
|
(progn
|
|
|
|
|
;; ## remove this someday
|
|
|
|
|
(and byte-compile-depth
|
2011-02-17 21:19:13 +00:00
|
|
|
|
(not (= (cdr (cdr tag)) byte-compile-depth))
|
|
|
|
|
(error "Compiler bug: depth conflict at tag %d" (car (cdr tag))))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(setq byte-compile-depth (cdr (cdr tag))))
|
|
|
|
|
(setcdr (cdr tag) byte-compile-depth)))
|
|
|
|
|
|
|
|
|
|
(defun byte-compile-goto (opcode tag)
|
2003-04-12 20:28:10 +00:00
|
|
|
|
(push (cons opcode tag) byte-compile-output)
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(setcdr (cdr tag) (if (memq opcode byte-goto-always-pop-ops)
|
|
|
|
|
(1- byte-compile-depth)
|
|
|
|
|
byte-compile-depth))
|
|
|
|
|
(setq byte-compile-depth (and (not (eq opcode 'byte-goto))
|
|
|
|
|
(1- byte-compile-depth))))
|
|
|
|
|
|
2010-06-13 20:36:17 +00:00
|
|
|
|
(defun byte-compile-stack-adjustment (op operand)
|
|
|
|
|
"Return the amount by which an operation adjusts the stack.
|
|
|
|
|
OP and OPERAND are as passed to `byte-compile-out'."
|
|
|
|
|
(if (memq op '(byte-call byte-discardN byte-discardN-preserve-tos))
|
|
|
|
|
;; For calls, OPERAND is the number of args, so we pop OPERAND + 1
|
|
|
|
|
;; elements, and the push the result, for a total of -OPERAND.
|
|
|
|
|
;; For discardN*, of course, we just pop OPERAND elements.
|
|
|
|
|
(- operand)
|
|
|
|
|
(or (aref byte-stack+-info (symbol-value op))
|
|
|
|
|
;; Ops with a nil entry in `byte-stack+-info' are byte-codes
|
|
|
|
|
;; that take OPERAND values off the stack and push a result, for
|
|
|
|
|
;; a total of 1 - OPERAND
|
|
|
|
|
(- 1 operand))))
|
2011-04-01 15:16:50 +00:00
|
|
|
|
|
2010-06-13 20:36:17 +00:00
|
|
|
|
(defun byte-compile-out (op &optional operand)
|
|
|
|
|
(push (cons op operand) byte-compile-output)
|
|
|
|
|
(if (eq op 'byte-return)
|
|
|
|
|
;; This is actually an unnecessary case, because there should be no
|
|
|
|
|
;; more ops behind byte-return.
|
|
|
|
|
(setq byte-compile-depth nil)
|
|
|
|
|
(setq byte-compile-depth
|
|
|
|
|
(+ byte-compile-depth (byte-compile-stack-adjustment op operand)))
|
|
|
|
|
(setq byte-compile-maxdepth (max byte-compile-depth byte-compile-maxdepth))
|
|
|
|
|
;;(if (< byte-compile-depth 0) (error "Compiler error: stack underflow"))
|
|
|
|
|
))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
|
|
|
|
;;; call tree stuff
|
|
|
|
|
|
|
|
|
|
(defun byte-compile-annotate-call-tree (form)
|
|
|
|
|
(let (entry)
|
|
|
|
|
;; annotate the current call
|
|
|
|
|
(if (setq entry (assq (car form) byte-compile-call-tree))
|
|
|
|
|
(or (memq byte-compile-current-form (nth 1 entry)) ;callers
|
|
|
|
|
(setcar (cdr entry)
|
|
|
|
|
(cons byte-compile-current-form (nth 1 entry))))
|
|
|
|
|
(setq byte-compile-call-tree
|
|
|
|
|
(cons (list (car form) (list byte-compile-current-form) nil)
|
|
|
|
|
byte-compile-call-tree)))
|
|
|
|
|
;; annotate the current function
|
|
|
|
|
(if (setq entry (assq byte-compile-current-form byte-compile-call-tree))
|
|
|
|
|
(or (memq (car form) (nth 2 entry)) ;called
|
|
|
|
|
(setcar (cdr (cdr entry))
|
|
|
|
|
(cons (car form) (nth 2 entry))))
|
|
|
|
|
(setq byte-compile-call-tree
|
|
|
|
|
(cons (list byte-compile-current-form nil (list (car form)))
|
|
|
|
|
byte-compile-call-tree)))
|
|
|
|
|
))
|
|
|
|
|
|
1992-07-15 20:26:37 +00:00
|
|
|
|
;; Renamed from byte-compile-report-call-tree
|
|
|
|
|
;; to avoid interfering with completion of byte-compile-file.
|
1992-07-19 01:07:07 +00:00
|
|
|
|
;;;###autoload
|
1992-07-15 20:26:37 +00:00
|
|
|
|
(defun display-call-tree (&optional filename)
|
|
|
|
|
"Display a call graph of a specified file.
|
|
|
|
|
This lists which functions have been called, what functions called
|
|
|
|
|
them, and what functions they call. The list includes all functions
|
|
|
|
|
whose definitions have been compiled in this Emacs session, as well as
|
|
|
|
|
all functions called by those functions.
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
1992-07-15 20:26:37 +00:00
|
|
|
|
The call graph does not include macros, inline functions, or
|
|
|
|
|
primitives that the byte-code interpreter knows about directly \(eq,
|
|
|
|
|
cons, etc.\).
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
|
|
|
|
The call tree also lists those functions which are not known to be called
|
1992-07-15 20:26:37 +00:00
|
|
|
|
\(that is, to which no calls have been compiled\), and which cannot be
|
|
|
|
|
invoked interactively."
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(interactive)
|
|
|
|
|
(message "Generating call tree...")
|
|
|
|
|
(with-output-to-temp-buffer "*Call-Tree*"
|
|
|
|
|
(set-buffer "*Call-Tree*")
|
|
|
|
|
(erase-buffer)
|
1995-02-08 00:43:45 +00:00
|
|
|
|
(message "Generating call tree... (sorting on %s)"
|
1992-07-10 22:06:47 +00:00
|
|
|
|
byte-compile-call-tree-sort)
|
|
|
|
|
(insert "Call tree for "
|
|
|
|
|
(cond ((null byte-compile-current-file) (or filename "???"))
|
|
|
|
|
((stringp byte-compile-current-file)
|
|
|
|
|
byte-compile-current-file)
|
|
|
|
|
(t (buffer-name byte-compile-current-file)))
|
|
|
|
|
" sorted on "
|
|
|
|
|
(prin1-to-string byte-compile-call-tree-sort)
|
|
|
|
|
":\n\n")
|
|
|
|
|
(if byte-compile-call-tree-sort
|
|
|
|
|
(setq byte-compile-call-tree
|
|
|
|
|
(sort byte-compile-call-tree
|
Reduce use of (require 'cl).
* admin/bzrmerge.el: Use cl-lib.
* leim/quail/hangul.el: Don't require CL.
* leim/quail/ipa.el: Use cl-lib.
* vc/smerge-mode.el, vc/pcvs.el, vc/pcvs-util.el, vc/pcvs-info.el:
* vc/diff-mode.el, vc/cvs-status.el, uniquify.el, scroll-bar.el:
* register.el, progmodes/sh-script.el, net/gnutls.el, net/dbus.el:
* msb.el, mpc.el, minibuffer.el, international/ucs-normalize.el:
* international/quail.el, info-xref.el, imenu.el, image-mode.el:
* font-lock.el, filesets.el, edmacro.el, doc-view.el, bookmark.el:
* battery.el, avoid.el, abbrev.el: Use cl-lib.
* vc/pcvs-parse.el, vc/pcvs-defs.el, vc/log-view.el, vc/log-edit.el:
* vc/diff.el, simple.el, pcomplete.el, lpr.el, comint.el, loadhist.el:
* jit-lock.el, international/iso-ascii.el, info.el, frame.el, bs.el:
* emulation/crisp.el, electric.el, dired.el, cus-dep.el, composite.el:
* calculator.el, autorevert.el, apropos.el: Don't require CL.
* emacs-bytecomp.el (byte-recompile-directory, display-call-tree)
(byte-compile-unfold-bcf, byte-compile-check-variable):
* emacs-byte-opt.el (byte-compile-trueconstp)
(byte-compile-nilconstp):
* emacs-autoload.el (make-autoload): Use pcase.
* face-remap.el (text-scale-adjust): Simplify pcase patterns.
2012-07-10 11:51:54 +00:00
|
|
|
|
(pcase byte-compile-call-tree-sort
|
|
|
|
|
(`callers
|
Try and fix w32 build; misc cleanup.
* lisp/subr.el (apply-partially): Move from subr.el; don't use lexical-let.
(eval-after-load): Obey lexical-binding.
* lisp/simple.el (apply-partially): Move to subr.el.
* lisp/makefile.w32-in: Match changes in Makefile.in.
(BIG_STACK_DEPTH, BIG_STACK_OPTS, BYTE_COMPILE_FLAGS): New vars.
(.el.elc, compile-CMD, compile-SH, compile-always-CMD)
(compile-always-SH, compile-calc-CMD, compile-calc-SH): Use them.
(COMPILE_FIRST): Add pcase, macroexp, and cconv.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Silence warning about
calling CL's `compiler-macroexpand'.
* lisp/emacs-lisp/bytecomp.el (byte-compile-preprocess): New function.
(byte-compile-initial-macro-environment)
(byte-compile-toplevel-file-form, byte-compile, byte-compile-sexp): Use it.
(byte-compile-eval, byte-compile-eval-before-compile): Obey lexical-binding.
(byte-compile--for-effect): Rename from `for-effect'.
(display-call-tree): Use case.
* lisp/emacs-lisp/byte-opt.el (for-effect): Don't declare as dynamic.
(byte-optimize-form-code-walker, byte-optimize-form):
Revert to old arg name.
* lisp/Makefile.in (BYTE_COMPILE_FLAGS): New var.
(compile-onefile, .el.elc, compile-calc, recompile): Use it.
2011-03-12 03:32:43 +00:00
|
|
|
|
(lambda (x y) (< (length (nth 1 x))
|
|
|
|
|
(length (nth 1 y)))))
|
Reduce use of (require 'cl).
* admin/bzrmerge.el: Use cl-lib.
* leim/quail/hangul.el: Don't require CL.
* leim/quail/ipa.el: Use cl-lib.
* vc/smerge-mode.el, vc/pcvs.el, vc/pcvs-util.el, vc/pcvs-info.el:
* vc/diff-mode.el, vc/cvs-status.el, uniquify.el, scroll-bar.el:
* register.el, progmodes/sh-script.el, net/gnutls.el, net/dbus.el:
* msb.el, mpc.el, minibuffer.el, international/ucs-normalize.el:
* international/quail.el, info-xref.el, imenu.el, image-mode.el:
* font-lock.el, filesets.el, edmacro.el, doc-view.el, bookmark.el:
* battery.el, avoid.el, abbrev.el: Use cl-lib.
* vc/pcvs-parse.el, vc/pcvs-defs.el, vc/log-view.el, vc/log-edit.el:
* vc/diff.el, simple.el, pcomplete.el, lpr.el, comint.el, loadhist.el:
* jit-lock.el, international/iso-ascii.el, info.el, frame.el, bs.el:
* emulation/crisp.el, electric.el, dired.el, cus-dep.el, composite.el:
* calculator.el, autorevert.el, apropos.el: Don't require CL.
* emacs-bytecomp.el (byte-recompile-directory, display-call-tree)
(byte-compile-unfold-bcf, byte-compile-check-variable):
* emacs-byte-opt.el (byte-compile-trueconstp)
(byte-compile-nilconstp):
* emacs-autoload.el (make-autoload): Use pcase.
* face-remap.el (text-scale-adjust): Simplify pcase patterns.
2012-07-10 11:51:54 +00:00
|
|
|
|
(`calls
|
Try and fix w32 build; misc cleanup.
* lisp/subr.el (apply-partially): Move from subr.el; don't use lexical-let.
(eval-after-load): Obey lexical-binding.
* lisp/simple.el (apply-partially): Move to subr.el.
* lisp/makefile.w32-in: Match changes in Makefile.in.
(BIG_STACK_DEPTH, BIG_STACK_OPTS, BYTE_COMPILE_FLAGS): New vars.
(.el.elc, compile-CMD, compile-SH, compile-always-CMD)
(compile-always-SH, compile-calc-CMD, compile-calc-SH): Use them.
(COMPILE_FIRST): Add pcase, macroexp, and cconv.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Silence warning about
calling CL's `compiler-macroexpand'.
* lisp/emacs-lisp/bytecomp.el (byte-compile-preprocess): New function.
(byte-compile-initial-macro-environment)
(byte-compile-toplevel-file-form, byte-compile, byte-compile-sexp): Use it.
(byte-compile-eval, byte-compile-eval-before-compile): Obey lexical-binding.
(byte-compile--for-effect): Rename from `for-effect'.
(display-call-tree): Use case.
* lisp/emacs-lisp/byte-opt.el (for-effect): Don't declare as dynamic.
(byte-optimize-form-code-walker, byte-optimize-form):
Revert to old arg name.
* lisp/Makefile.in (BYTE_COMPILE_FLAGS): New var.
(compile-onefile, .el.elc, compile-calc, recompile): Use it.
2011-03-12 03:32:43 +00:00
|
|
|
|
(lambda (x y) (< (length (nth 2 x))
|
|
|
|
|
(length (nth 2 y)))))
|
Reduce use of (require 'cl).
* admin/bzrmerge.el: Use cl-lib.
* leim/quail/hangul.el: Don't require CL.
* leim/quail/ipa.el: Use cl-lib.
* vc/smerge-mode.el, vc/pcvs.el, vc/pcvs-util.el, vc/pcvs-info.el:
* vc/diff-mode.el, vc/cvs-status.el, uniquify.el, scroll-bar.el:
* register.el, progmodes/sh-script.el, net/gnutls.el, net/dbus.el:
* msb.el, mpc.el, minibuffer.el, international/ucs-normalize.el:
* international/quail.el, info-xref.el, imenu.el, image-mode.el:
* font-lock.el, filesets.el, edmacro.el, doc-view.el, bookmark.el:
* battery.el, avoid.el, abbrev.el: Use cl-lib.
* vc/pcvs-parse.el, vc/pcvs-defs.el, vc/log-view.el, vc/log-edit.el:
* vc/diff.el, simple.el, pcomplete.el, lpr.el, comint.el, loadhist.el:
* jit-lock.el, international/iso-ascii.el, info.el, frame.el, bs.el:
* emulation/crisp.el, electric.el, dired.el, cus-dep.el, composite.el:
* calculator.el, autorevert.el, apropos.el: Don't require CL.
* emacs-bytecomp.el (byte-recompile-directory, display-call-tree)
(byte-compile-unfold-bcf, byte-compile-check-variable):
* emacs-byte-opt.el (byte-compile-trueconstp)
(byte-compile-nilconstp):
* emacs-autoload.el (make-autoload): Use pcase.
* face-remap.el (text-scale-adjust): Simplify pcase patterns.
2012-07-10 11:51:54 +00:00
|
|
|
|
(`calls+callers
|
Try and fix w32 build; misc cleanup.
* lisp/subr.el (apply-partially): Move from subr.el; don't use lexical-let.
(eval-after-load): Obey lexical-binding.
* lisp/simple.el (apply-partially): Move to subr.el.
* lisp/makefile.w32-in: Match changes in Makefile.in.
(BIG_STACK_DEPTH, BIG_STACK_OPTS, BYTE_COMPILE_FLAGS): New vars.
(.el.elc, compile-CMD, compile-SH, compile-always-CMD)
(compile-always-SH, compile-calc-CMD, compile-calc-SH): Use them.
(COMPILE_FIRST): Add pcase, macroexp, and cconv.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Silence warning about
calling CL's `compiler-macroexpand'.
* lisp/emacs-lisp/bytecomp.el (byte-compile-preprocess): New function.
(byte-compile-initial-macro-environment)
(byte-compile-toplevel-file-form, byte-compile, byte-compile-sexp): Use it.
(byte-compile-eval, byte-compile-eval-before-compile): Obey lexical-binding.
(byte-compile--for-effect): Rename from `for-effect'.
(display-call-tree): Use case.
* lisp/emacs-lisp/byte-opt.el (for-effect): Don't declare as dynamic.
(byte-optimize-form-code-walker, byte-optimize-form):
Revert to old arg name.
* lisp/Makefile.in (BYTE_COMPILE_FLAGS): New var.
(compile-onefile, .el.elc, compile-calc, recompile): Use it.
2011-03-12 03:32:43 +00:00
|
|
|
|
(lambda (x y) (< (+ (length (nth 1 x))
|
|
|
|
|
(length (nth 2 x)))
|
|
|
|
|
(+ (length (nth 1 y))
|
|
|
|
|
(length (nth 2 y))))))
|
Reduce use of (require 'cl).
* admin/bzrmerge.el: Use cl-lib.
* leim/quail/hangul.el: Don't require CL.
* leim/quail/ipa.el: Use cl-lib.
* vc/smerge-mode.el, vc/pcvs.el, vc/pcvs-util.el, vc/pcvs-info.el:
* vc/diff-mode.el, vc/cvs-status.el, uniquify.el, scroll-bar.el:
* register.el, progmodes/sh-script.el, net/gnutls.el, net/dbus.el:
* msb.el, mpc.el, minibuffer.el, international/ucs-normalize.el:
* international/quail.el, info-xref.el, imenu.el, image-mode.el:
* font-lock.el, filesets.el, edmacro.el, doc-view.el, bookmark.el:
* battery.el, avoid.el, abbrev.el: Use cl-lib.
* vc/pcvs-parse.el, vc/pcvs-defs.el, vc/log-view.el, vc/log-edit.el:
* vc/diff.el, simple.el, pcomplete.el, lpr.el, comint.el, loadhist.el:
* jit-lock.el, international/iso-ascii.el, info.el, frame.el, bs.el:
* emulation/crisp.el, electric.el, dired.el, cus-dep.el, composite.el:
* calculator.el, autorevert.el, apropos.el: Don't require CL.
* emacs-bytecomp.el (byte-recompile-directory, display-call-tree)
(byte-compile-unfold-bcf, byte-compile-check-variable):
* emacs-byte-opt.el (byte-compile-trueconstp)
(byte-compile-nilconstp):
* emacs-autoload.el (make-autoload): Use pcase.
* face-remap.el (text-scale-adjust): Simplify pcase patterns.
2012-07-10 11:51:54 +00:00
|
|
|
|
(`name
|
Try and fix w32 build; misc cleanup.
* lisp/subr.el (apply-partially): Move from subr.el; don't use lexical-let.
(eval-after-load): Obey lexical-binding.
* lisp/simple.el (apply-partially): Move to subr.el.
* lisp/makefile.w32-in: Match changes in Makefile.in.
(BIG_STACK_DEPTH, BIG_STACK_OPTS, BYTE_COMPILE_FLAGS): New vars.
(.el.elc, compile-CMD, compile-SH, compile-always-CMD)
(compile-always-SH, compile-calc-CMD, compile-calc-SH): Use them.
(COMPILE_FIRST): Add pcase, macroexp, and cconv.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Silence warning about
calling CL's `compiler-macroexpand'.
* lisp/emacs-lisp/bytecomp.el (byte-compile-preprocess): New function.
(byte-compile-initial-macro-environment)
(byte-compile-toplevel-file-form, byte-compile, byte-compile-sexp): Use it.
(byte-compile-eval, byte-compile-eval-before-compile): Obey lexical-binding.
(byte-compile--for-effect): Rename from `for-effect'.
(display-call-tree): Use case.
* lisp/emacs-lisp/byte-opt.el (for-effect): Don't declare as dynamic.
(byte-optimize-form-code-walker, byte-optimize-form):
Revert to old arg name.
* lisp/Makefile.in (BYTE_COMPILE_FLAGS): New var.
(compile-onefile, .el.elc, compile-calc, recompile): Use it.
2011-03-12 03:32:43 +00:00
|
|
|
|
(lambda (x y) (string< (car x) (car y))))
|
Reduce use of (require 'cl).
* admin/bzrmerge.el: Use cl-lib.
* leim/quail/hangul.el: Don't require CL.
* leim/quail/ipa.el: Use cl-lib.
* vc/smerge-mode.el, vc/pcvs.el, vc/pcvs-util.el, vc/pcvs-info.el:
* vc/diff-mode.el, vc/cvs-status.el, uniquify.el, scroll-bar.el:
* register.el, progmodes/sh-script.el, net/gnutls.el, net/dbus.el:
* msb.el, mpc.el, minibuffer.el, international/ucs-normalize.el:
* international/quail.el, info-xref.el, imenu.el, image-mode.el:
* font-lock.el, filesets.el, edmacro.el, doc-view.el, bookmark.el:
* battery.el, avoid.el, abbrev.el: Use cl-lib.
* vc/pcvs-parse.el, vc/pcvs-defs.el, vc/log-view.el, vc/log-edit.el:
* vc/diff.el, simple.el, pcomplete.el, lpr.el, comint.el, loadhist.el:
* jit-lock.el, international/iso-ascii.el, info.el, frame.el, bs.el:
* emulation/crisp.el, electric.el, dired.el, cus-dep.el, composite.el:
* calculator.el, autorevert.el, apropos.el: Don't require CL.
* emacs-bytecomp.el (byte-recompile-directory, display-call-tree)
(byte-compile-unfold-bcf, byte-compile-check-variable):
* emacs-byte-opt.el (byte-compile-trueconstp)
(byte-compile-nilconstp):
* emacs-autoload.el (make-autoload): Use pcase.
* face-remap.el (text-scale-adjust): Simplify pcase patterns.
2012-07-10 11:51:54 +00:00
|
|
|
|
(_ (error "`byte-compile-call-tree-sort': `%s' - unknown sort mode"
|
Try and fix w32 build; misc cleanup.
* lisp/subr.el (apply-partially): Move from subr.el; don't use lexical-let.
(eval-after-load): Obey lexical-binding.
* lisp/simple.el (apply-partially): Move to subr.el.
* lisp/makefile.w32-in: Match changes in Makefile.in.
(BIG_STACK_DEPTH, BIG_STACK_OPTS, BYTE_COMPILE_FLAGS): New vars.
(.el.elc, compile-CMD, compile-SH, compile-always-CMD)
(compile-always-SH, compile-calc-CMD, compile-calc-SH): Use them.
(COMPILE_FIRST): Add pcase, macroexp, and cconv.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Silence warning about
calling CL's `compiler-macroexpand'.
* lisp/emacs-lisp/bytecomp.el (byte-compile-preprocess): New function.
(byte-compile-initial-macro-environment)
(byte-compile-toplevel-file-form, byte-compile, byte-compile-sexp): Use it.
(byte-compile-eval, byte-compile-eval-before-compile): Obey lexical-binding.
(byte-compile--for-effect): Rename from `for-effect'.
(display-call-tree): Use case.
* lisp/emacs-lisp/byte-opt.el (for-effect): Don't declare as dynamic.
(byte-optimize-form-code-walker, byte-optimize-form):
Revert to old arg name.
* lisp/Makefile.in (BYTE_COMPILE_FLAGS): New var.
(compile-onefile, .el.elc, compile-calc, recompile): Use it.
2011-03-12 03:32:43 +00:00
|
|
|
|
byte-compile-call-tree-sort))))))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(message "Generating call tree...")
|
|
|
|
|
(let ((rest byte-compile-call-tree)
|
|
|
|
|
(b (current-buffer))
|
|
|
|
|
f p
|
|
|
|
|
callers calls)
|
|
|
|
|
(while rest
|
|
|
|
|
(prin1 (car (car rest)) b)
|
|
|
|
|
(setq callers (nth 1 (car rest))
|
|
|
|
|
calls (nth 2 (car rest)))
|
|
|
|
|
(insert "\t"
|
|
|
|
|
(cond ((not (fboundp (setq f (car (car rest)))))
|
|
|
|
|
(if (null f)
|
|
|
|
|
" <top level>";; shouldn't insert nil then, actually -sk
|
|
|
|
|
" <not defined>"))
|
|
|
|
|
((subrp (setq f (symbol-function f)))
|
|
|
|
|
" <subr>")
|
|
|
|
|
((symbolp f)
|
|
|
|
|
(format " ==> %s" f))
|
* disass.el (disassemble): Add autoload cookie for this.
* bytecomp.el (byte-decompile-bytecode): Add an autoload for this.
compiled-function-p has been renamed to byte-code-function-p.
* subr.el: Define compiled-function-p as an alias for it.
* bytecomp.el: Register compiled-function-p as obsolete.
* bytecomp.el, byte-opt.el, disass.el, help.el, map-ynp.el: Change
uses.
unread-command-event has been replaced by unread-command-events.
* simple.el (prefix-arg-internal): Use this to push back all
key sequences for processing by the main command loop, instead of
trying to simulate its behavior ourselves.
* bytecomp.el: Document unread-command-event as an obsolete
variable, although nothing but the GNU Emacs 19 sources use it.
Adjust obsolescence message for unread-command-char.
* comint.el (comint-dynamic-list-completions): Change uses of
unread-command-event to work with unread-command-events.
* ebuff-menu.el (electric-buffer-list, Electric-buffer-menu-exit):
Same.
* edebug.el (edebug-outside-excursion): Same.
* ehelp.el (electric-help-command-loop): Same.
* electric.el (Electric-command-loop): Same.
* emerge.el (emerge-show-file-name): Same.
* fortran.el (fortran-abbrev-start,
fortran-window-create-momentarily): Same.
* gnus.el (gnus-Subject-next-article): Same.
* info.el (Info-summary): Same.
* isearch-mode.el (isearch-update, isearch-unread): Same.
* map-ynp.el (map-y-or-n-p): Same.
* mlsupport.el (push-back-character): Same.
* replace.el (perform-replace): Same.
* simula.el (simula-electric-label): Same.
* subr.el (read-quoted-char, momentary-string-display): Same.
* sun-mouse.el (mouse-second-hit): Same.
* terminal.el (te-escape-extended-command-unread): Same.
* vip.el (vip-escape-to-emacs, vip-prefix-arg-value,
vip-prefix-arg-com): Same.
1993-01-26 01:36:02 +00:00
|
|
|
|
((byte-code-function-p f)
|
1992-07-10 22:06:47 +00:00
|
|
|
|
"<compiled function>")
|
|
|
|
|
((not (consp f))
|
|
|
|
|
"<malformed function>")
|
|
|
|
|
((eq 'macro (car f))
|
* disass.el (disassemble): Add autoload cookie for this.
* bytecomp.el (byte-decompile-bytecode): Add an autoload for this.
compiled-function-p has been renamed to byte-code-function-p.
* subr.el: Define compiled-function-p as an alias for it.
* bytecomp.el: Register compiled-function-p as obsolete.
* bytecomp.el, byte-opt.el, disass.el, help.el, map-ynp.el: Change
uses.
unread-command-event has been replaced by unread-command-events.
* simple.el (prefix-arg-internal): Use this to push back all
key sequences for processing by the main command loop, instead of
trying to simulate its behavior ourselves.
* bytecomp.el: Document unread-command-event as an obsolete
variable, although nothing but the GNU Emacs 19 sources use it.
Adjust obsolescence message for unread-command-char.
* comint.el (comint-dynamic-list-completions): Change uses of
unread-command-event to work with unread-command-events.
* ebuff-menu.el (electric-buffer-list, Electric-buffer-menu-exit):
Same.
* edebug.el (edebug-outside-excursion): Same.
* ehelp.el (electric-help-command-loop): Same.
* electric.el (Electric-command-loop): Same.
* emerge.el (emerge-show-file-name): Same.
* fortran.el (fortran-abbrev-start,
fortran-window-create-momentarily): Same.
* gnus.el (gnus-Subject-next-article): Same.
* info.el (Info-summary): Same.
* isearch-mode.el (isearch-update, isearch-unread): Same.
* map-ynp.el (map-y-or-n-p): Same.
* mlsupport.el (push-back-character): Same.
* replace.el (perform-replace): Same.
* simula.el (simula-electric-label): Same.
* subr.el (read-quoted-char, momentary-string-display): Same.
* sun-mouse.el (mouse-second-hit): Same.
* terminal.el (te-escape-extended-command-unread): Same.
* vip.el (vip-escape-to-emacs, vip-prefix-arg-value,
vip-prefix-arg-com): Same.
1993-01-26 01:36:02 +00:00
|
|
|
|
(if (or (byte-code-function-p (cdr f))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(assq 'byte-code (cdr (cdr (cdr f)))))
|
|
|
|
|
" <compiled macro>"
|
|
|
|
|
" <macro>"))
|
|
|
|
|
((assq 'byte-code (cdr (cdr f)))
|
|
|
|
|
"<compiled lambda>")
|
|
|
|
|
((eq 'lambda (car f))
|
|
|
|
|
"<function>")
|
|
|
|
|
(t "???"))
|
|
|
|
|
(format " (%d callers + %d calls = %d)"
|
|
|
|
|
;; Does the optimizer eliminate common subexpressions?-sk
|
|
|
|
|
(length callers)
|
|
|
|
|
(length calls)
|
|
|
|
|
(+ (length callers) (length calls)))
|
|
|
|
|
"\n")
|
|
|
|
|
(if callers
|
|
|
|
|
(progn
|
|
|
|
|
(insert " called by:\n")
|
|
|
|
|
(setq p (point))
|
|
|
|
|
(insert " " (if (car callers)
|
|
|
|
|
(mapconcat 'symbol-name callers ", ")
|
|
|
|
|
"<top level>"))
|
|
|
|
|
(let ((fill-prefix " "))
|
2004-09-08 12:04:22 +00:00
|
|
|
|
(fill-region-as-paragraph p (point)))
|
|
|
|
|
(unless (= 0 (current-column))
|
|
|
|
|
(insert "\n"))))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(if calls
|
|
|
|
|
(progn
|
|
|
|
|
(insert " calls:\n")
|
|
|
|
|
(setq p (point))
|
|
|
|
|
(insert " " (mapconcat 'symbol-name calls ", "))
|
|
|
|
|
(let ((fill-prefix " "))
|
2004-09-08 12:04:22 +00:00
|
|
|
|
(fill-region-as-paragraph p (point)))
|
|
|
|
|
(unless (= 0 (current-column))
|
|
|
|
|
(insert "\n"))))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(setq rest (cdr rest)))
|
|
|
|
|
|
|
|
|
|
(message "Generating call tree...(finding uncalled functions...)")
|
|
|
|
|
(setq rest byte-compile-call-tree)
|
2009-10-31 02:10:43 +00:00
|
|
|
|
(let (uncalled def)
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(while rest
|
|
|
|
|
(or (nth 1 (car rest))
|
2009-10-31 02:10:43 +00:00
|
|
|
|
(null (setq f (caar rest)))
|
|
|
|
|
(progn
|
|
|
|
|
(setq def (byte-compile-fdefinition f t))
|
|
|
|
|
(and (eq (car-safe def) 'macro)
|
|
|
|
|
(eq (car-safe (cdr-safe def)) 'lambda)
|
|
|
|
|
(setq def (cdr def)))
|
|
|
|
|
(functionp def))
|
|
|
|
|
(progn
|
|
|
|
|
(setq def (byte-compile-fdefinition f nil))
|
|
|
|
|
(and (eq (car-safe def) 'macro)
|
|
|
|
|
(eq (car-safe (cdr-safe def)) 'lambda)
|
|
|
|
|
(setq def (cdr def)))
|
|
|
|
|
(commandp def))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(setq uncalled (cons f uncalled)))
|
|
|
|
|
(setq rest (cdr rest)))
|
|
|
|
|
(if uncalled
|
|
|
|
|
(let ((fill-prefix " "))
|
|
|
|
|
(insert "Noninteractive functions not known to be called:\n ")
|
|
|
|
|
(setq p (point))
|
|
|
|
|
(insert (mapconcat 'symbol-name (nreverse uncalled) ", "))
|
2009-10-31 02:10:43 +00:00
|
|
|
|
(fill-region-as-paragraph p (point))))))
|
|
|
|
|
(message "Generating call tree...done.")))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
|
|
|
|
|
2002-03-22 23:05:26 +00:00
|
|
|
|
;;;###autoload
|
2002-02-01 04:14:14 +00:00
|
|
|
|
(defun batch-byte-compile-if-not-done ()
|
|
|
|
|
"Like `byte-compile-file' but doesn't recompile if already up to date.
|
|
|
|
|
Use this from the command line, with `-batch';
|
|
|
|
|
it won't work in an interactive Emacs."
|
|
|
|
|
(batch-byte-compile t))
|
|
|
|
|
|
1992-07-10 22:06:47 +00:00
|
|
|
|
;;; by crl@newton.purdue.edu
|
|
|
|
|
;;; Only works noninteractively.
|
1992-07-19 01:07:07 +00:00
|
|
|
|
;;;###autoload
|
2002-02-01 04:14:14 +00:00
|
|
|
|
(defun batch-byte-compile (&optional noforce)
|
1992-07-15 20:26:37 +00:00
|
|
|
|
"Run `byte-compile-file' on the files remaining on the command line.
|
|
|
|
|
Use this from the command line, with `-batch';
|
|
|
|
|
it won't work in an interactive Emacs.
|
|
|
|
|
Each file is processed even if an error occurred previously.
|
2002-02-01 04:14:14 +00:00
|
|
|
|
For example, invoke \"emacs -batch -f batch-byte-compile $emacs/ ~/*.el\".
|
|
|
|
|
If NOFORCE is non-nil, don't recompile a file that seems to be
|
|
|
|
|
already up-to-date."
|
Try and fix w32 build; misc cleanup.
* lisp/subr.el (apply-partially): Move from subr.el; don't use lexical-let.
(eval-after-load): Obey lexical-binding.
* lisp/simple.el (apply-partially): Move to subr.el.
* lisp/makefile.w32-in: Match changes in Makefile.in.
(BIG_STACK_DEPTH, BIG_STACK_OPTS, BYTE_COMPILE_FLAGS): New vars.
(.el.elc, compile-CMD, compile-SH, compile-always-CMD)
(compile-always-SH, compile-calc-CMD, compile-calc-SH): Use them.
(COMPILE_FIRST): Add pcase, macroexp, and cconv.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Silence warning about
calling CL's `compiler-macroexpand'.
* lisp/emacs-lisp/bytecomp.el (byte-compile-preprocess): New function.
(byte-compile-initial-macro-environment)
(byte-compile-toplevel-file-form, byte-compile, byte-compile-sexp): Use it.
(byte-compile-eval, byte-compile-eval-before-compile): Obey lexical-binding.
(byte-compile--for-effect): Rename from `for-effect'.
(display-call-tree): Use case.
* lisp/emacs-lisp/byte-opt.el (for-effect): Don't declare as dynamic.
(byte-optimize-form-code-walker, byte-optimize-form):
Revert to old arg name.
* lisp/Makefile.in (BYTE_COMPILE_FLAGS): New var.
(compile-onefile, .el.elc, compile-calc, recompile): Use it.
2011-03-12 03:32:43 +00:00
|
|
|
|
;; command-line-args-left is what is left of the command line, from
|
|
|
|
|
;; startup.el.
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(defvar command-line-args-left) ;Avoid 'free variable' warning
|
|
|
|
|
(if (not noninteractive)
|
1992-07-15 20:26:37 +00:00
|
|
|
|
(error "`batch-byte-compile' is to be used only with -batch"))
|
2011-03-16 20:08:39 +00:00
|
|
|
|
(let ((error nil))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(while command-line-args-left
|
|
|
|
|
(if (file-directory-p (expand-file-name (car command-line-args-left)))
|
2002-02-01 04:14:14 +00:00
|
|
|
|
;; Directory as argument.
|
2011-03-16 20:08:39 +00:00
|
|
|
|
(let (source dest)
|
|
|
|
|
(dolist (file (directory-files (car command-line-args-left)))
|
|
|
|
|
(if (and (string-match emacs-lisp-file-regexp file)
|
|
|
|
|
(not (auto-save-file-name-p file))
|
|
|
|
|
(setq source
|
|
|
|
|
(expand-file-name file
|
2008-03-01 21:11:37 +00:00
|
|
|
|
(car command-line-args-left)))
|
2011-03-16 20:08:39 +00:00
|
|
|
|
(setq dest (byte-compile-dest-file source))
|
|
|
|
|
(file-exists-p dest)
|
|
|
|
|
(file-newer-than-file-p source dest))
|
|
|
|
|
(if (null (batch-byte-compile-file source))
|
|
|
|
|
(setq error t)))))
|
2002-02-01 04:14:14 +00:00
|
|
|
|
;; Specific file argument
|
|
|
|
|
(if (or (not noforce)
|
2011-03-16 20:08:39 +00:00
|
|
|
|
(let* ((source (car command-line-args-left))
|
|
|
|
|
(dest (byte-compile-dest-file source)))
|
|
|
|
|
(or (not (file-exists-p dest))
|
|
|
|
|
(file-newer-than-file-p source dest))))
|
2002-02-01 04:14:14 +00:00
|
|
|
|
(if (null (batch-byte-compile-file (car command-line-args-left)))
|
2011-03-16 20:08:39 +00:00
|
|
|
|
(setq error t))))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(setq command-line-args-left (cdr command-line-args-left)))
|
2011-03-16 20:08:39 +00:00
|
|
|
|
(kill-emacs (if error 1 0))))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
2011-03-16 20:08:39 +00:00
|
|
|
|
(defun batch-byte-compile-file (file)
|
2012-05-19 18:28:32 +00:00
|
|
|
|
(let ((byte-compile-root-dir (or byte-compile-root-dir default-directory)))
|
|
|
|
|
(if debug-on-error
|
|
|
|
|
(byte-compile-file file)
|
|
|
|
|
(condition-case err
|
|
|
|
|
(byte-compile-file file)
|
|
|
|
|
(file-error
|
|
|
|
|
(message (if (cdr err)
|
|
|
|
|
">>Error occurred processing %s: %s (%s)"
|
|
|
|
|
">>Error occurred processing %s: %s")
|
|
|
|
|
file
|
|
|
|
|
(get (car err) 'error-message)
|
|
|
|
|
(prin1-to-string (cdr err)))
|
|
|
|
|
(let ((destfile (byte-compile-dest-file file)))
|
|
|
|
|
(if (file-exists-p destfile)
|
|
|
|
|
(delete-file destfile)))
|
|
|
|
|
nil)
|
|
|
|
|
(error
|
|
|
|
|
(message (if (cdr err)
|
|
|
|
|
">>Error occurred processing %s: %s (%s)"
|
|
|
|
|
">>Error occurred processing %s: %s")
|
|
|
|
|
file
|
|
|
|
|
(get (car err) 'error-message)
|
|
|
|
|
(prin1-to-string (cdr err)))
|
|
|
|
|
nil)))))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
2009-09-15 04:03:35 +00:00
|
|
|
|
(defun byte-compile-refresh-preloaded ()
|
|
|
|
|
"Reload any Lisp file that was changed since Emacs was dumped.
|
|
|
|
|
Use with caution."
|
|
|
|
|
(let* ((argv0 (car command-line-args))
|
|
|
|
|
(emacs-file (executable-find argv0)))
|
|
|
|
|
(if (not (and emacs-file (file-executable-p emacs-file)))
|
|
|
|
|
(message "Can't find %s to refresh preloaded Lisp files" argv0)
|
|
|
|
|
(dolist (f (reverse load-history))
|
|
|
|
|
(setq f (car f))
|
|
|
|
|
(if (string-match "elc\\'" f) (setq f (substring f 0 -1)))
|
|
|
|
|
(when (and (file-readable-p f)
|
2011-03-01 05:03:24 +00:00
|
|
|
|
(file-newer-than-file-p f emacs-file)
|
|
|
|
|
;; Don't reload the source version of the files below
|
|
|
|
|
;; because that causes subsequent byte-compilation to
|
|
|
|
|
;; be a lot slower and need a higher max-lisp-eval-depth,
|
|
|
|
|
;; so it can cause recompilation to fail.
|
|
|
|
|
(not (member (file-name-nondirectory f)
|
|
|
|
|
'("pcase.el" "bytecomp.el" "macroexp.el"
|
|
|
|
|
"cconv.el" "byte-opt.el"))))
|
2009-09-15 04:03:35 +00:00
|
|
|
|
(message "Reloading stale %s" (file-name-nondirectory f))
|
|
|
|
|
(condition-case nil
|
|
|
|
|
(load f 'noerror nil 'nosuffix)
|
|
|
|
|
;; Probably shouldn't happen, but in case of an error, it seems
|
|
|
|
|
;; at least as useful to ignore it as it is to stop compilation.
|
|
|
|
|
(error nil)))))))
|
|
|
|
|
|
1993-12-23 03:37:27 +00:00
|
|
|
|
;;;###autoload
|
2004-04-21 22:34:27 +00:00
|
|
|
|
(defun batch-byte-recompile-directory (&optional arg)
|
2002-09-09 21:41:34 +00:00
|
|
|
|
"Run `byte-recompile-directory' on the dirs remaining on the command line.
|
1993-06-13 22:32:17 +00:00
|
|
|
|
Must be used only with `-batch', and kills Emacs on completion.
|
2006-01-13 09:56:23 +00:00
|
|
|
|
For example, invoke `emacs -batch -f batch-byte-recompile-directory .'.
|
|
|
|
|
|
|
|
|
|
Optional argument ARG is passed as second argument ARG to
|
2007-11-26 15:38:18 +00:00
|
|
|
|
`byte-recompile-directory'; see there for its possible values
|
2006-01-13 09:56:23 +00:00
|
|
|
|
and corresponding effects."
|
1993-06-11 16:19:49 +00:00
|
|
|
|
;; command-line-args-left is what is left of the command line (startup.el)
|
|
|
|
|
(defvar command-line-args-left) ;Avoid 'free variable' warning
|
|
|
|
|
(if (not noninteractive)
|
|
|
|
|
(error "batch-byte-recompile-directory is to be used only with -batch"))
|
|
|
|
|
(or command-line-args-left
|
|
|
|
|
(setq command-line-args-left '(".")))
|
|
|
|
|
(while command-line-args-left
|
2004-04-21 22:34:27 +00:00
|
|
|
|
(byte-recompile-directory (car command-line-args-left) arg)
|
1993-06-11 16:19:49 +00:00
|
|
|
|
(setq command-line-args-left (cdr command-line-args-left)))
|
|
|
|
|
(kill-emacs 0))
|
|
|
|
|
|
2012-06-13 13:16:34 +00:00
|
|
|
|
;;; Core compiler macros.
|
|
|
|
|
|
|
|
|
|
(put 'featurep 'compiler-macro
|
|
|
|
|
(lambda (form feature &rest _ignore)
|
|
|
|
|
;; Emacs-21's byte-code doesn't run under XEmacs or SXEmacs anyway, so
|
|
|
|
|
;; we can safely optimize away this test.
|
|
|
|
|
(if (member feature '('xemacs 'sxemacs 'emacs))
|
|
|
|
|
(eval form)
|
|
|
|
|
form)))
|
|
|
|
|
|
1992-07-10 22:06:47 +00:00
|
|
|
|
(provide 'byte-compile)
|
1993-12-25 00:32:37 +00:00
|
|
|
|
(provide 'bytecomp)
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;; report metering (see the hacks in bytecode.c)
|
|
|
|
|
|
2003-07-04 23:47:48 +00:00
|
|
|
|
(defvar byte-code-meter)
|
1992-07-15 20:26:37 +00:00
|
|
|
|
(defun byte-compile-report-ops ()
|
2010-09-08 16:02:38 +00:00
|
|
|
|
(or (boundp 'byte-metering-on)
|
|
|
|
|
(error "You must build Emacs with -DBYTE_CODE_METER to use this"))
|
1992-07-15 20:26:37 +00:00
|
|
|
|
(with-output-to-temp-buffer "*Meter*"
|
|
|
|
|
(set-buffer "*Meter*")
|
|
|
|
|
(let ((i 0) n op off)
|
|
|
|
|
(while (< i 256)
|
|
|
|
|
(setq n (aref (aref byte-code-meter 0) i)
|
|
|
|
|
off nil)
|
|
|
|
|
(if t ;(not (zerop n))
|
|
|
|
|
(progn
|
|
|
|
|
(setq op i)
|
|
|
|
|
(setq off nil)
|
|
|
|
|
(cond ((< op byte-nth)
|
|
|
|
|
(setq off (logand op 7))
|
|
|
|
|
(setq op (logand op 248)))
|
|
|
|
|
((>= op byte-constant)
|
|
|
|
|
(setq off (- op byte-constant)
|
|
|
|
|
op byte-constant)))
|
|
|
|
|
(setq op (aref byte-code-vector op))
|
|
|
|
|
(insert (format "%-4d" i))
|
|
|
|
|
(insert (symbol-name op))
|
|
|
|
|
(if off (insert " [" (int-to-string off) "]"))
|
|
|
|
|
(indent-to 40)
|
|
|
|
|
(insert (int-to-string n) "\n")))
|
|
|
|
|
(setq i (1+ i))))))
|
1992-07-10 22:06:47 +00:00
|
|
|
|
|
|
|
|
|
;; To avoid "lisp nesting exceeds max-lisp-eval-depth" when bytecomp compiles
|
|
|
|
|
;; itself, compile some of its most used recursive functions (at load time).
|
|
|
|
|
;;
|
|
|
|
|
(eval-when-compile
|
1995-07-09 13:01:31 +00:00
|
|
|
|
(or (byte-code-function-p (symbol-function 'byte-compile-form))
|
|
|
|
|
(assq 'byte-code (symbol-function 'byte-compile-form))
|
|
|
|
|
(let ((byte-optimize nil) ; do it fast
|
|
|
|
|
(byte-compile-warnings nil))
|
2007-09-21 07:13:28 +00:00
|
|
|
|
(mapc (lambda (x)
|
|
|
|
|
(or noninteractive (message "compiling %s..." x))
|
|
|
|
|
(byte-compile x)
|
|
|
|
|
(or noninteractive (message "compiling %s...done" x)))
|
|
|
|
|
'(byte-compile-normal-call
|
|
|
|
|
byte-compile-form
|
|
|
|
|
byte-compile-body
|
|
|
|
|
;; Inserted some more than necessary, to speed it up.
|
|
|
|
|
byte-compile-top-level
|
|
|
|
|
byte-compile-out-toplevel
|
|
|
|
|
byte-compile-constant
|
|
|
|
|
byte-compile-variable-ref))))
|
1995-07-09 13:01:31 +00:00
|
|
|
|
nil)
|
1992-07-19 01:07:07 +00:00
|
|
|
|
|
2000-02-02 15:10:35 +00:00
|
|
|
|
(run-hooks 'bytecomp-load-hook)
|
|
|
|
|
|
1992-07-19 01:07:07 +00:00
|
|
|
|
;;; bytecomp.el ends here
|