Mercurial > hg > xemacs-beta
annotate lisp/update-elc-2.el @ 5882:bbe4146603db
Reduce regexp usage, now CL-oriented non-regexp code available, core Lisp
lisp/ChangeLog addition:
2015-04-01 Aidan Kehoe <kehoea@parhasard.net>
When calling #'string-match with a REGEXP without regular
expression special characters, call #'search, #'mismatch, #'find,
etc. instead, making our code less likely to side-effect other
functions' match data and a little faster.
* apropos.el (apropos-command):
* apropos.el (apropos):
Call (position ?\n ...) rather than (string-match "\n" ...) here.
* buff-menu.el:
* buff-menu.el (buffers-menu-omit-invisible-buffers):
Don't fire up the regexp engine just to check if a string starts
with a space.
* buff-menu.el (select-buffers-tab-buffers-by-mode):
Don't fire up the regexp engine just to compare mode basenames.
* buff-menu.el (format-buffers-tab-line):
* buff-menu.el (build-buffers-tab-internal): Moved to being a
label within the following.
* buff-menu.el (buffers-tab-items): Use the label.
* bytecomp.el (byte-compile-log-1):
Don't fire up the regexp engine just to look for a newline.
* cus-edit.el (get):
Ditto.
* cus-edit.el (custom-variable-value-create):
Ditto, but for a colon.
* descr-text.el (describe-text-sexp):
Ditto.
* descr-text.el (describe-char-unicode-data):
Use #'split-string-by-char given that we're just looking for a
semicolon.
* descr-text.el (describe-char):
Don't fire up the regexp engine just to look for a newline.
* disass.el (disassemble-internal):
Ditto.
* files.el (file-name-sans-extension):
Implement this using #'position.
* files.el (file-name-extension):
Correct this function's docstring, implement it in terms of
#'position.
* files.el (insert-directory):
Don't fire up the regexp engine to split a string by space; don't
reverse the list of switches, this is actually a longstand bug as
far as I can see.
* gnuserv.el (gnuserv-process-filter):
Use #'position here, instead of consing inside #'split-string
needlessly.
* gtk-file-dialog.el (gtk-file-dialog-update-dropdown):
Use #'split-string-by-char here, don't fire up #'split-string for
directory-sep-char.
* gtk-font-menu.el (hack-font-truename):
Implement this more cheaply in terms of #'find,
#'split-string-by-char, #'equal, rather than #'string-match,
#'split-string, #'string-equal.
* hyper-apropos.el (hyper-apropos-grok-functions):
* hyper-apropos.el (hyper-apropos-grok-variables):
Look for a newline using #'position rather than #'string-match in
these functions.
* info.el (Info-insert-dir):
* info.el (Info-insert-file-contents):
* info.el (Info-follow-reference):
* info.el (Info-extract-menu-node-name):
* info.el (Info-menu):
Look for fixed strings using #'position or #'search as appropriate
in this file.
* ldap.el (ldap-decode-string):
* ldap.el (ldap-encode-string):
#'encode-coding-string, #'decode-coding-string are always
available, don't check if they're fboundp.
* ldap.el (ldap-decode-address):
* ldap.el (ldap-encode-address):
Use #'split-string-by-char in these functions.
* lisp-mnt.el (lm-creation-date):
* lisp-mnt.el (lm-last-modified-date):
Don't fire up the regexp engine just to look for spaces in this file.
* menubar-items.el (default-menubar):
Use (not (mismatch ...)) rather than #'string-match here, for
simple regexp.
Use (search "beta" ...) rather than (string-match "beta" ...)
* menubar-items.el (sort-buffers-menu-alphabetically):
* menubar-items.el (sort-buffers-menu-by-mode-then-alphabetically):
* menubar-items.el (group-buffers-menu-by-mode-then-alphabetically):
Don't fire up the regexp engine to check if a string starts with
a space or an asterisk.
Use the more fine-grained results of #'compare-strings; compare
case-insensitively for the buffer menu.
* menubar-items.el (list-all-buffers):
* menubar-items.el (tutorials-menu-filter):
Use #'equal rather than #'string-equal, which, in this context,
has the drawback of not having a bytecode, and no redeeming
features.
* minibuf.el:
* minibuf.el (un-substitute-in-file-name):
Use #'count, rather than counting the occurences of $ using the
regexp engine.
* minibuf.el (read-file-name-internal-1):
Don't fire up the regexp engine to search for ?=.
* mouse.el (mouse-eval-sexp):
Check for newline with #'find.
* msw-font-menu.el (mswindows-reset-device-font-menus):
Split a string by newline with #'split-string-by-char.
* mule/japanese.el:
* mule/japanese.el ("Japanese"):
Use #'search rather than #'string-match; canoncase before
comparing; fix a bug I had introduced where I had been making case
insensitive comparisons where the case mattered.
* mule/korea-util.el (default-korean-keyboard):
Look for ?3 using #'find, not #'string-march.
* mule/korea-util.el (quail-hangul-switch-hanja):
Search for a fixed string using #'search.
* mule/mule-cmds.el (set-locale-for-language-environment):
#'position, #'substitute rather than #'string-match,
#'replace-in-string.
* newcomment.el (comment-make-extra-lines):
Use #'search rather than #'string-match for a simple string.
* package-get.el (package-get-remote-filename):
Use #'position when looking for ?@
* process.el (setenv):
* process.el (read-envvar-name):
Use #'position when looking for ?=.
* replace.el (map-query-replace-regexp):
Use #'split-string-by-char instead of using an inline
implementation of it.
* select.el (select-convert-from-cf-text):
* select.el (select-convert-from-cf-unicodetext):
Use #'position rather than #'string-match in these functions.
* setup-paths.el (paths-emacs-data-root-p):
Use #'search when looking for simple string.
* sound.el (load-sound-file):
Use #'split-string-by-char rather than an inline reimplementation
of same.
* startup.el (splash-screen-window-body):
* startup.el (splash-screen-tty-body):
Search for simple strings using #'search.
* version.el (emacs-version):
Ditto.
* x-font-menu.el (hack-font-truename):
Implement this more cheaply in terms of #'find,
#'split-string-by-char, #'equal, rather than #'string-match,
#'split-string, #'string-equal.
* x-font-menu.el (x-reset-device-font-menus-core):
Use #'split-string-by-char here.
* x-init.el (x-initialize-keyboard):
Search for a simple string using #'search.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Wed, 01 Apr 2015 14:28:20 +0100 |
parents | bd80d9103fc8 |
children |
rev | line source |
---|---|
442 | 1 ;;; update-elc-2.el --- Recompile remaining .el files, post-dumping |
2 | |
3 ;; Copyright (C) 1997 by Free Software Foundation, Inc. | |
1261 | 4 ;; Copyright (C) 2000, 2003 Ben Wing. |
442 | 5 |
6 ;; Author: Ben Wing <ben@xemacs.org>, based on cleantree.el by | |
7 ;; Steven L Baur <steve@xemacs.org> | |
8 ;; Maintainer: XEmacs Development Team | |
9 ;; Keywords: internal | |
10 | |
11 ;; This file is part of XEmacs. | |
12 | |
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
4246
diff
changeset
|
13 ;; XEmacs is free software: you can redistribute it and/or modify it |
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
4246
diff
changeset
|
14 ;; under the terms of the GNU General Public License as published by the |
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
4246
diff
changeset
|
15 ;; Free Software Foundation, either version 3 of the License, or (at your |
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
4246
diff
changeset
|
16 ;; option) any later version. |
442 | 17 |
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
4246
diff
changeset
|
18 ;; XEmacs is distributed in the hope that it will be useful, but WITHOUT |
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
4246
diff
changeset
|
19 ;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
4246
diff
changeset
|
20 ;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
4246
diff
changeset
|
21 ;; for more details. |
442 | 22 |
23 ;; You should have received a copy of the GNU General Public License | |
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
4246
diff
changeset
|
24 ;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>. |
442 | 25 |
26 ;;; Synched up with: Not in FSF | |
27 | |
28 ;;; Commentary: | |
29 | |
30 ;; This file should be used after XEmacs has been dumped, to recompile | |
31 ;; all remaining out-of-date .els and clean up orphaned .elcs. It should | |
32 ;; be called as | |
33 ;; | |
34 ;; xemacs -batch -vanilla -l update-elc-2.el -f batch-update-elc-2 ${dirname} | |
35 ;; | |
36 ;; where ${dirname} is the directory tree to recompile, usually `lisp'. | |
37 ;; | |
38 ;; Note that this is very different from update-elc.el, which is called | |
39 ;; BEFORE dumping, handles only the files needed to dump, and is called | |
40 ;; from temacs instead of xemacs. | |
41 ;; | |
42 ;; The original cleantree.el had the comment: This code is derived | |
43 ;; from Gnus based on a suggestion by David Moore <dmoore@ucsd.edu> | |
44 | |
45 ;;; Code: | |
46 | |
1261 | 47 ;; Help debug problems. |
48 (setq stack-trace-on-error t | |
49 load-always-display-messages t) | |
50 | |
442 | 51 (defvar update-elc-ignored-dirs |
52 `("." ".." "CVS" "SCCS" "RCS" ,@(unless (featurep 'mule) '("mule")))) | |
53 | |
54 (defvar update-elc-ignored-files | |
55 ;; note: entries here are regexps | |
56 '("^," ;; #### huh? | |
444 | 57 "^paths\\.el$" |
58 "^loadup\\.el$" | |
59 "^loadup-el\\.el$" | |
60 "^update-elc\\.el$" | |
61 "^update-elc-2\\.el$" | |
62 "^dumped-lisp\\.el$" | |
63 "^make-docfile\\.el$" | |
64 "^site-start\\.el$" | |
65 "^site-load\\.el$" | |
4246 | 66 "^site-init\\.el$")) |
442 | 67 |
1298 | 68 (defvar dirfiles-table (make-hash-table :test 'equal)) |
69 | |
442 | 70 ;; SEEN accumulates the list of already-handled dirs. |
71 (defun do-update-elc-2 (dir compile-stage-p seen) | |
72 (setq dir (file-name-as-directory dir)) | |
73 ;; Only scan this sub-tree if we haven't been here yet. | |
74 (unless (member (file-truename dir) seen) | |
75 (push (file-truename dir) seen) | |
76 | |
1298 | 77 (let ((files (or (gethash dir dirfiles-table) |
78 (directory-files dir t nil t)))) | |
79 | |
80 ;; Do this directory. | |
81 (if compile-stage-p | |
82 ;; Stage 2: Recompile necessary .els | |
83 (dolist (file files) | |
84 (when (string-match "\\.el$" file) | |
85 (let ((file-c (concat file "c"))) | |
86 (when (and (not (member file-c files)) | |
87 ;; no need to check for out-of-date-ness because | |
88 ;; that was already done, and .elc removed. | |
89 (let (ignore) | |
90 (mapcar | |
91 #'(lambda (regexp) | |
92 (if (string-match | |
93 regexp | |
94 (file-name-nondirectory file)) | |
95 (setq ignore t))) | |
96 update-elc-ignored-files) | |
97 (not ignore))) | |
98 (byte-compile-file file))))) | |
442 | 99 |
1298 | 100 ;; Stage 1. |
101 ;; Remove out-of-date elcs | |
102 (let (deleted) | |
103 (dolist (file files) | |
104 (when (string-match "\\.el$" file) | |
105 (let ((file-c (concat file "c"))) | |
106 (when (and (member file-c files) | |
107 (file-newer-than-file-p file file-c)) | |
108 (message "Removing out-of-date %s" file-c) | |
109 (delete-file file-c) | |
110 (push file-c deleted))))) | |
442 | 111 |
1298 | 112 ;; Remove elcs without corresponding el |
113 (dolist (file-c files) | |
114 (when (string-match "\\.elc$" file-c) | |
115 (let ((file (replace-in-string file-c "c$" ""))) | |
116 (when (not (member file files)) | |
117 (message "Removing %s; no corresponding .el" file-c) | |
118 (delete-file file-c) | |
119 (push file-c deleted))))) | |
442 | 120 |
1303 | 121 (setq files (set-difference files deleted :test 'equal)))) |
1298 | 122 |
123 (puthash dir files dirfiles-table) | |
124 | |
125 ;; We descend recursively. On my Windows machine, it is much faster | |
126 ;; to call directory-files again to recompute than to call | |
127 ;; file-directory-p on each member of the files list. | |
128 (dolist (dir (directory-files dir t nil t 'dir)) | |
129 (when (not (member (file-name-nondirectory dir) | |
130 update-elc-ignored-dirs)) | |
131 (do-update-elc-2 dir compile-stage-p seen)))))) | |
442 | 132 |
133 (defun batch-update-elc-2 () | |
134 (defvar command-line-args-left) | |
135 (unless noninteractive | |
136 (error "`batch-update-elc-2' is to be used only with -batch")) | |
137 (let ((dir (car command-line-args-left))) | |
1298 | 138 ;; don't depend on being able to autoload `update-autoload-files'! |
139 (load "autoload") | |
5632
bd80d9103fc8
Integrate CL code better into core, remove obsolete compatibility code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
140 (autoload 'cl-compile-time-init "cl-macs") |
1298 | 141 (load "bytecomp") |
142 (load "byte-optimize") | |
143 ;; #### the API used here is deprecated, convert to one with explicit | |
144 ;; arguments when it is available | |
145 ;; update-elc.el signals us to rebuild the autoloads when necessary. | |
146 ;; in some cases it will rebuild the autoloads itself, but doing it this | |
147 ;; way is slow, so we avoid it when possible. | |
1330 | 148 (when (file-exists-p (expand-file-name "REBUILD_AUTOLOADS" |
149 invocation-directory)) | |
2548 | 150 ;; if we were instructed to rebuild the autoloads, force the file |
151 ;; to be touched even w/o changes; otherwise, we won't ever stop | |
152 ;; being told to rebuild them. | |
153 (update-autoload-files dir "auto" nil t) | |
154 (byte-recompile-file (expand-file-name "auto-autoloads.el" dir) 0) | |
1298 | 155 (when (featurep 'mule) |
2548 | 156 (let ((muledir (expand-file-name "../lisp/mule" (file-truename dir)))) |
1330 | 157 ;; force here just like above. |
2548 | 158 (update-autoload-files muledir "mule" nil t) |
159 (byte-recompile-file (expand-file-name "auto-autoloads.el" dir) 0)))) | |
1298 | 160 (when (featurep 'modules) |
161 (let* ((moddir (expand-file-name "../modules" (file-truename dir))) | |
2548 | 162 (autofile (expand-file-name "auto-autoloads.el" moddir))) |
163 (update-autoload-files | |
1298 | 164 (delete (concat (file-name-as-directory moddir) ".") |
165 (delete (concat (file-name-as-directory moddir) "..") | |
166 (directory-files moddir t nil nil 0))) | |
2548 | 167 "modules" autofile) |
168 (byte-recompile-file autofile 0))) | |
1298 | 169 ;; now load the (perhaps newly rebuilt) autoloads; we were called with |
170 ;; -no-autoloads so they're not already loaded. | |
1330 | 171 (load (expand-file-name "auto-autoloads" lisp-directory)) |
1298 | 172 (when (featurep 'mule) |
1330 | 173 (load (expand-file-name "mule/auto-autoloads" lisp-directory))) |
442 | 174 ;; We remove all the bad .elcs before any byte-compilation, because |
175 ;; there may be dependencies between one .el and another (even across | |
176 ;; directories), and we don't want to load an out-of-date .elc while | |
177 ;; byte-compiling a file. | |
178 (message "Removing old or spurious .elcs in directory tree `%s'..." dir) | |
179 (do-update-elc-2 dir nil nil) | |
180 (message "Removing old or spurious .elcs in directory tree `%s'...done" | |
181 dir) | |
182 (message "Recompiling updated .els in directory tree `%s'..." dir) | |
183 (do-update-elc-2 dir t nil) | |
528 | 184 (message "Recompiling updated .els in directory tree `%s'...done" dir) |
185 ;; likewise here. | |
186 (load "cus-dep") | |
187 (Custom-make-dependencies dir) | |
188 (byte-recompile-file (expand-file-name "custom-load.el" dir) 0) | |
189 (when (featurep 'mule) | |
190 (Custom-make-dependencies (expand-file-name "mule" dir)) | |
4246 | 191 (byte-recompile-file (expand-file-name "mule/custom-load.el" dir) 0) |
192 ;; See the eval-when-compile in the definition of | |
193 ;; Installation-file-coding-system; if the file name sniffing or the | |
194 ;; available coding systems have changed, version.elc should be | |
195 ;; rebuilt. | |
196 (byte-recompile-file (expand-file-name "version.el" dir) 0))) | |
442 | 197 (setq command-line-args-left nil)) |
198 | |
444 | 199 ;;; update-elc-2.el ends here |