Mercurial > hg > xemacs-beta
view lisp/make-docfile.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 | 308d34e9f07d |
children |
line wrap: on
line source
;;; make-docfile.el --- Cache docstrings in external file ;; Copyright (C) 1985, 1986, 1992-1995, 1997 Free Software Foundation, Inc. ;; Copyright (C) 2002, 2003 Ben Wing. ;; Author: Unknown ;; Maintainer: XEmacs Development Team ;; Keywords: internal ;; This file is part of XEmacs. ;; XEmacs is free software: you can redistribute it and/or modify it ;; under the terms of the GNU General Public License as published by the ;; Free Software Foundation, either version 3 of the License, or (at your ;; option) any later version. ;; XEmacs 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 ;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>. ;;; Synched up with: Not in FSF ;;; Commentary: ;; This is a front-end to the make-docfile program that gathers up all the ;; lisp files that will be dumped with XEmacs. It would probably be best ;; to just move make-docfile.c completely to lisp and be done with it. ;;; Code: ;; Help debug problems. (setq stack-trace-on-error t load-always-display-messages t) (defvar options nil) (defvar processed nil) (defvar docfile nil) (defvar docfile-buffer nil) (defvar site-file-list nil) (defvar docfile-out-of-date nil) (defvar build-directory (expand-file-name ".." invocation-directory)) (defvar build-lib-src (expand-file-name "lib-src" build-directory)) (defvar source-lisp (file-name-directory (expand-file-name (nth 2 command-line-args)))) (defvar source-src (expand-file-name "../src" source-lisp)) (defun message (fmt &rest args) (princ (apply #'format fmt args)) (terpri)) ;; Gobble up the stuff we don't wish to pass on. (setq command-line-args (cdr (cdr (cdr (cdr command-line-args))))) ;; First gather up the command line options. (let (done) (while (and (null done) command-line-args) (let ((arg (car command-line-args))) (cond ((or (string-equal arg "-o") ; Specify DOC file name (string-equal arg "-a") ; Append to DOC file (string-equal arg "-d")) ; Set working directory (if (string-equal arg "-o") (setq docfile (expand-file-name (car (cdr command-line-args))))) (setq options (cons arg options)) (setq options (cons (expand-file-name (car (cdr command-line-args))) options))) ((string-equal arg "-i") ; Set site files to scan (setq site-file-list (car (cdr command-line-args)))) (t (setq done t))) (if (null done) (setq command-line-args (cdr (cdr command-line-args))))))) (setq options (nreverse options)) ;; (message (concat "Options: " (prin1-to-string options))) ;; Next process the list of C files. (defun process-args (args) (while args (let ((arg (car args))) ;; When called from xemacs.mak, we need to do some frobbing on the ;; args given to us -- remove NEEDTODUMP and make-docfile.exe, ;; convert .obj files into .c files in the source directory, ;; handle response files (beginning with @, specifying arguments), ;; due to line-length limitations in the shell. (if (string-match "^@" arg) ;; MS Windows response file ;; no generate-new-buffer so use its implementation. (let ((buf (get-buffer-create (generate-new-buffer-name "foo")))) (set-buffer buf) (insert-file-contents-internal (subseq arg 1)) ;; now majorly grind up the response file. ;; backslashes get doubled, quotes around strings, ;; get rid of pesky CR's and NL's, and put parens around ;; the whole thing so we have a valid list of strings. (goto-char (point-max)) (insert "\")") (goto-char (point-min)) (insert "(\"") (while (search-forward "\\" nil t) (replace-match "\\\\" nil t)) (goto-char (point-min)) (while (search-forward "\n" nil t) (replace-match "" nil t)) (goto-char (point-min)) (while (search-forward "\r" nil t) (replace-match "" nil t)) (goto-char (point-min)) (while (search-forward " " nil t) (replace-match "\" \"" nil t)) (goto-char (point-min)) (process-args (read buf))) ;; remove NEEDTODUMP and make-docfile.exe, convert .obj files into ;; .c files in the source directory. (when (and (not (string-match "\\(NEEDTODUMP\\|\\.exe$\\)" arg)) (not (member arg processed))) (when (string-match "\\(.*\\)\\.obj$" arg) (setq arg (expand-file-name (concat (file-name-nondirectory ;; no match-string so use its implementation. (subseq arg (match-beginning 1) (match-end 1))) ".c") source-src))) (if (and (null docfile-out-of-date) (file-newer-than-file-p arg docfile)) (setq docfile-out-of-date t)) (setq processed (cons arg processed)))) (setq args (cdr args))))) ;; Then process the list of Lisp files. (process-args command-line-args) (setq load-path (list source-lisp)) ;; Then process the autoloads (setq autoload-file-name "auto-autoloads.elc") (defvar custom-declare-variable-list nil) ; unclean (load "find-paths.el") (load "packages.el") (load "setup-paths.el") (load "raw-process.el") (let (preloaded-file-list arg0 arg package-preloaded-file-list absolute) (load (expand-file-name "dumped-lisp.el" source-lisp)) (setq package-preloaded-file-list (packages-collect-package-dumped-lisps late-package-load-path) preloaded-file-list (append package-preloaded-file-list preloaded-file-list packages-hardcoded-lisp) processed (cons "-d" processed) processed (cons source-lisp processed) ;; Include loadup.el, which is never in preloaded-file-list: processed (cons "loadup.el" processed)) (while preloaded-file-list (setq arg0 (packages-add-suffix (car preloaded-file-list)) arg (locate-library arg0) absolute arg) (if (null arg) (progn (message "Error: dumped file %s does not exist" arg0) ;; Uncomment in case of difficulties ;(message "late-package-hierarchies: %S" ; late-package-hierarchies) ;(message "guessed-roots: %S" (paths-find-emacs-roots ; invocation-directory ; invocation-name ; #'paths-emacs-root-p)) ;(message "guessed-data-roots: %S" (paths-find-emacs-roots ; invocation-directory ; invocation-name ; #'paths-emacs-data-root-p)) ) (when (equal arg (expand-file-name arg0 source-lisp)) ;; Use relative paths where possible, since this makes file lookup ;; in an installed XEmacs easier: (setq arg arg0)) (if (null (member arg processed)) (progn (if (and (null docfile-out-of-date) ;; We need to check the absolute path here: (file-newer-than-file-p absolute docfile)) (setq docfile-out-of-date t)) (setq processed (cons arg processed))))) (setq preloaded-file-list (cdr preloaded-file-list)))) ;; Finally process the list of site-loaded files. (if site-file-list (let (site-load-packages) (load site-file-list t t) (while site-load-packages (let ((arg (car site-load-packages))) (if (null (member arg processed)) (progn (if (and (null docfile-out-of-date) (file-newer-than-file-p arg docfile)) (setq docfile-out-of-date t)) (setq processed (cons arg processed))))) (setq site-load-packages (cdr site-load-packages))))) ;(let ((autoloads (packages-list-autoloads-path))) ; ;; (message (concat "Autoloads: " (prin1-to-string autoloads))) ; (while autoloads ; (let ((arg (car autoloads))) ; (if (null (member arg processed)) ; (progn ; ;; (message arg) ; (if (and (null docfile-out-of-date) ; (file-newer-than-file-p arg docfile)) ; (setq docfile-out-of-date t)) ; (setq processed (cons arg processed)))) ; (setq autoloads (cdr autoloads))))) ;; Now fire up make-docfile and we're done (setq processed (nreverse processed)) (terpri) ;(message (prin1-to-string (append options processed))) (when docfile-out-of-date (condition-case nil (delete-file docfile) (error nil)) (message "Spawning make-docfile ...") ;; (message (prin1-to-string (append options processed))) (setq exec-path (list build-lib-src)) ;; (locate-file-clear-hashing nil) (if (memq system-type '(berkeley-unix next-mach)) ;; Suboptimal, but we have a unresolved bug somewhere in the ;; low-level process code. #### Now that we've switched to using ;; the regular asynch process code, we should try removing this. (call-process-internal "/bin/csh" nil t nil "-fc" (mapconcat #'identity (append (list (expand-file-name "make-docfile" build-lib-src)) options processed) " ")) ;; (message (prin1-to-string (append options processed))) (apply 'call-process-internal ;; exec-path is set. ;; (expand-file-name "make-docfile" build-lib-src) "make-docfile" nil t nil (append options processed))) (message "Spawning make-docfile ...done") ;; (write-region-internal (point-min) (point-max) "/tmp/DOC") ) (kill-emacs) ;;; make-docfile.el ends here