Mercurial > hg > xemacs-beta
view lisp/shadow.el @ 4995:8431b52e43b1
Move the various map* functions to C; add #'map-into.
src/ChangeLog addition:
2010-01-31 Aidan Kehoe <kehoea@parhasard.net>
Move #'mapcar*, #'mapcan, #'mapc, #'map, #'mapl, #'mapcon to C;
extend #'mapvector, #'mapconcat, #'mapcar to support more
SEQUENCES; have them all error with circular lists.
* fns.c (Fsubseq): Call CHECK_SEQUENCE here; Flength can return
from the debugger if it errors with a non-sequence, leading to a
crash in Fsubseq if sequence really is *not* a sequence.
(mapcarX): Rename mapcar1 to mapcarX; rework it comprehensively to
take an optional lisp output argument, and a varying number of
sequences.
Special-case a single list argument, as we used to, saving its
elements in the stack space for the results before calling
FUNCTION, so FUNCTION can corrupt the list all it
wants. dead_wrong_type_argument() in the other cases if we
encounter a non-cons where we expected a cons.
(Fmapconcat):
Accept further SEQUENCES after separator here. Special-case
the idiom (mapconcat 'identity SEQUENCE), don't even funcall.
(FmapcarX): Rename this from Fmapcar. Accept optional SEQUENCES.
(Fmapvector): Accept optional SEQUENCES.
(Fmapcan, Fmapc, Fmap): Move these here from cl-extra.el.
(Fmap_into): New function, as specified by Common Lisp.
(maplist): New function, the guts of the implementation of
Fmaplist and Fmapl.
(Fmaplist, Fmapl, Fmapcon): Move these from cl-extra.el.
(syms_of_fns):
Add a few needed symbols here, for the type tests
used by #'map. Add the new subrs, with aliases for #'mapc-internal
and #'mapcar.
* general-slots.h: Declare Qcoerce here, now it's used in both
indent.c and fns.c
* indent.c (syms_of_indent): Qcoerce is gone from here.
* lisp.h: Add ARRAYP(), SEQUENCEP(), and the corresponding CHECK_*
macros. Declare Fbit_vector, Fstring, FmapcarX, now other files
need to use them.
* data.c (Farrayp, Fsequencep): Use ARRAYP and SEQUENCEP, just
added to lisp.h
* buffer.c (Fbuffer_list): Now Fmapcar has been renamed FmapcarX
and takes MANY arguments, update this function to reflect that.
lisp/ChangeLog addition:
2010-01-31 Aidan Kehoe <kehoea@parhasard.net>
* cl.el (mapcar*): Delete; this is now in fns.c.
Use #'mapc, not #'mapc-internal in a couple of places.
* cl-macs.el (mapc, mapcar*, map): Delete these compiler macros
now the corresponding functions are in fns.c; there's no run-time
advantage to the macros.
* cl-extra.el (coerce): Extend the possible conversions here a
little; it's not remotely comprehensive yet, though it does allow
running slightly more Common Lisp code than previously.
(cl-mapcar-many): Delete.
(map, maplist, mapc, mapl, mapcan, mapcon): Move these to fns.c.
* bytecomp.el (byte-compile-maybe-mapc):
Use #'mapc itself, not #'mapc-internal, now the former is in C.
(mapcar*): Use #'byte-compile-maybe-mapc as this function's
byte-compile method, now a #'mapc that can take more than one
sequence is in C.
* obsolete.el (cl-mapc): Move this compatibility alias to this file.
* update-elc.el (do-autoload-commands): Use #'mapc, not
#'mapc-internal here.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sun, 31 Jan 2010 18:29:48 +0000 |
parents | ecc681180115 |
children | 308d34e9f07d |
line wrap: on
line source
;;; shadow.el --- Locate Emacs Lisp file shadowings. ;; Copyright (C) 1995 Free Software Foundation, Inc. ;; Author: Terry Jones <terry@santafe.edu> ;; Keywords: lisp ;; Created: 15 December 1995 ;; 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 2, 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; see the file COPYING. If not, write to the ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. ;;; Commentary: ;; The functions in this file detect (`find-emacs-lisp-shadows') ;; and display (`list-load-path-shadows') potential load-path ;; problems that arise when Emacs Lisp files "shadow" each other. ;; ;; For example, a file XXX.el early in one's load-path will shadow ;; a file with the same name in a later load-path directory. When ;; this is unintentional, it may result in problems that could have ;; been easily avoided. This occurs often (to me) when installing a ;; new version of emacs and something in the site-lisp directory ;; has been updated and added to the emacs distribution. The old ;; version, now outdated, shadows the new one. This is obviously ;; undesirable. ;; ;; The `list-load-path-shadows' function was run when you installed ;; this version of emacs. To run it by hand in emacs: ;; ;; M-x load-library RET shadow RET ;; M-x list-load-path-shadows ;; ;; or run it non-interactively via: ;; ;; emacs -batch -l shadow.el -f list-load-path-shadows ;; ;; Thanks to Francesco Potorti` <pot@cnuce.cnr.it> for suggestions, ;; rewritings & speedups. ;; 1998-08-15 Martin Buchholz: Speed up using hash tables instead of lists. ;;; Code: (defun find-emacs-lisp-shadows (&optional path) "Return a list of Emacs Lisp files that create shadows. This function does the work for `list-load-path-shadows'. We traverse PATH looking for shadows, and return a \(possibly empty\) even-length list of files. A file in this list at position 2i shadows the file in position 2i+1. Emacs Lisp file suffixes \(.el and .elc\) are stripped from the file names in the list. See the documentation for `list-load-path-shadows' for further information." (let (shadows ; List of shadowings, to be returned. dir ; The dir being currently scanned. curr-files ; This dir's Emacs Lisp files. orig-dir ; Where the file was first seen. (file-dirs ; File names ever seen, with dirs. (make-hash-table :size 2000 :test 'equal)) (true-names ; Dirs ever considered. (make-hash-table :size 50 :test 'equal)) (files-seen-this-dir ; Files seen so far in this dir. (make-hash-table :size 100 :test 'equal)) ) (dolist (path-elt (or path load-path)) (setq dir (file-truename (or path-elt "."))) (if (gethash dir true-names) ;; We have already considered this PATH redundant directory. ;; Show the redundancy if we are interactive, unless the PATH ;; dir is nil or "." (these redundant directories are just a ;; result of the current working directory, and are therefore ;; not always redundant). (or noninteractive (and path-elt (not (string= path-elt ".")) (message "Ignoring redundant directory %s" path-elt))) (puthash dir t true-names) (setq dir (or path-elt ".")) (setq curr-files (if (file-accessible-directory-p dir) (directory-files dir nil ".\\.elc?$" t))) (and curr-files (not noninteractive) (message "Checking %d files in %s..." (length curr-files) dir)) (clrhash files-seen-this-dir) (dolist (file curr-files) (setq file (substring file 0 (if (string= (substring file -1) "c") -4 -3))) ;; FILE now contains the current file name, with no suffix. (unless (or (gethash file files-seen-this-dir) ;; Ignore these files. (member file '("subdirs" "auto-autoloads" "custom-load" "custom-defines" "dumped-lisp" "_pkg" "lpath"))) ;; File has not been seen yet in this directory. ;; This test prevents us declaring that XXX.el shadows ;; XXX.elc (or vice-versa) when they are in the same directory. (puthash file t files-seen-this-dir) (if (setq orig-dir (gethash file file-dirs)) ;; This file was seen before, we have a shadowing. (setq shadows (nconc shadows (list (concat (file-name-as-directory orig-dir) file) (concat (file-name-as-directory dir) file)))) ;; Not seen before, add it to the list of seen files. (puthash file dir file-dirs)))))) ;; Return the list of shadowings. shadows)) ;;;###autoload (defun list-load-path-shadows () "Display a list of Emacs Lisp files that shadow other files. This function lists potential load-path problems. Directories in the `load-path' variable are searched, in order, for Emacs Lisp files. When a previously encountered file name is found again, a message is displayed indicating that the later file is \"hidden\" by the earlier. For example, suppose `load-path' is set to \(\"/usr/gnu/emacs/site-lisp\" \"/usr/gnu/emacs/share/emacs/19.30/lisp\"\) and that each of these directories contains a file called XXX.el. Then XXX.el in the site-lisp directory is referred to by all of: \(require 'XXX\), \(autoload .... \"XXX\"\), \(load-library \"XXX\"\) etc. The first XXX.el file prevents emacs from seeing the second \(unless the second is loaded explicitly via load-file\). When not intended, such shadowings can be the source of subtle problems. For example, the above situation may have arisen because the XXX package was not distributed with versions of emacs prior to 19.30. An emacs maintainer downloaded XXX from elsewhere and installed it. Later, XXX was updated and included in the emacs distribution. Unless the emacs maintainer checks for this, the new version of XXX will be hidden behind the old \(which may no longer work with the new emacs version\). This function performs these checks and flags all possible shadowings. Because a .el file may exist without a corresponding .elc \(or vice-versa\), these suffixes are essentially ignored. A file XXX.elc in an early directory \(that does not contain XXX.el\) is considered to shadow a later file XXX.el, and vice-versa. When run interactively, the shadowings \(if any\) are displayed in a buffer called `*Shadows*'. Shadowings are located by calling the \(non-interactive\) companion function, `find-emacs-lisp-shadows'." (interactive) (let* ((path (copy-sequence load-path)) (tem path) toplevs) ;; If we can find simple.el in two places, (while tem (if (file-exists-p (expand-file-name "simple.el" (car tem))) (setq toplevs (cons (car tem) toplevs))) (setq tem (cdr tem))) (if (> (length toplevs) 1) ;; Cut off our copy of load-path right before ;; the second directory which has simple.el in it. ;; This avoids loads of duplications between the source dir ;; and the dir where these files were copied by installation. (let ((break (nth (- (length toplevs) 2) toplevs))) (setq tem path) (while tem (if (eq (nth 1 tem) break) (progn (setcdr tem nil) (setq tem nil))) (setq tem (cdr tem))))) (let* ((shadows (find-emacs-lisp-shadows path)) (n (/ (length shadows) 2)) (msg (format "%s Emacs Lisp load-path shadowing%s found" (if (zerop n) "No" (concat "\n" (number-to-string n))) (if (= n 1) " was" "s were")))) (if (interactive-p) (save-excursion ;; We are interactive. ;; Create the *Shadows* buffer and display shadowings there. (let ((output-buffer (get-buffer-create "*Shadows*"))) (display-buffer output-buffer) (set-buffer output-buffer) (erase-buffer) (while shadows (insert (format "%s hides %s\n" (car shadows) (car (cdr shadows)))) (setq shadows (cdr (cdr shadows)))) (insert msg "\n"))) ;; We are non-interactive, print shadows via message. (when shadows (message "This site has duplicate Lisp libraries with the same name. If a locally-installed Lisp library overrides a library in the Emacs release, that can cause trouble, and you should probably remove the locally-installed version unless you know what you are doing.\n") (while shadows (message "%s hides %s" (car shadows) (car (cdr shadows))) (setq shadows (cdr (cdr shadows)))) (message "%s" msg)))))) (provide 'shadow) ;;; shadow.el ends here