Mercurial > hg > xemacs-beta
view lisp/shadow.el @ 826:6728e641994e
[xemacs-hg @ 2002-05-05 11:30:15 by ben]
syntax cache, 8-bit-format, lots of code cleanup
README.packages: Update info about --package-path.
i.c: Create an inheritable event and pass it on to XEmacs, so that ^C
can be handled properly. Intercept ^C and signal the event.
"Stop Build" in VC++ now works.
bytecomp-runtime.el: Doc string changes.
compat.el: Some attempts to redo this to
make it truly useful and fix the "multiple versions interacting
with each other" problem. Not yet done. Currently doesn't work.
files.el: Use with-obsolete-variable to avoid warnings in new revert-buffer code.
xemacs.mak: Split up CFLAGS into a version without flags specifying the C
library. The problem seems to be that minitar depends on zlib,
which depends specifically on libc.lib, not on any of the other C
libraries. Unless you compile with libc.lib, you get errors --
specifically, no _errno in the other libraries, which must make it
something other than an int. (#### But this doesn't seem to obtain
in XEmacs, which also uses zlib, and can be linked with any of the
C libraries. Maybe zlib is used differently and doesn't need
errno, or maybe XEmacs provides an int errno; ... I don't
understand.
Makefile.in.in: Fix so that packages are around when testing.
abbrev.c, alloc.c, buffer.c, buffer.h, bytecode.c, callint.c, casefiddle.c, casetab.c, casetab.h, charset.h, chartab.c, chartab.h, cmds.c, console-msw.h, console-stream.c, console-x.c, console.c, console.h, data.c, device-msw.c, device.c, device.h, dialog-msw.c, dialog-x.c, dired-msw.c, dired.c, doc.c, doprnt.c, dumper.c, editfns.c, elhash.c, emacs.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, events.c, events.h, extents.c, extents.h, faces.c, file-coding.c, file-coding.h, fileio.c, fns.c, font-lock.c, frame-gtk.c, frame-msw.c, frame-x.c, frame.c, frame.h, glade.c, glyphs-gtk.c, glyphs-msw.c, glyphs-msw.h, glyphs-x.c, glyphs.c, glyphs.h, gui-msw.c, gui-x.c, gui.h, gutter.h, hash.h, indent.c, insdel.c, intl-win32.c, intl.c, keymap.c, lisp-disunion.h, lisp-union.h, lisp.h, lread.c, lrecord.h, lstream.c, lstream.h, marker.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, menubar.c, minibuf.c, mule-ccl.c, mule-charset.c, mule-coding.c, mule-wnnfns.c, nas.c, objects-msw.c, objects-x.c, opaque.c, postgresql.c, print.c, process-nt.c, process-unix.c, process.c, process.h, profile.c, rangetab.c, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-x.c, redisplay.c, redisplay.h, regex.c, regex.h, scrollbar-msw.c, search.c, select-x.c, specifier.c, specifier.h, symbols.c, symsinit.h, syntax.c, syntax.h, syswindows.h, tests.c, text.c, text.h, tooltalk.c, ui-byhand.c, ui-gtk.c, unicode.c, win32.c, window.c: Another big Ben patch.
-- FUNCTIONALITY CHANGES:
add partial support for 8-bit-fixed, 16-bit-fixed, and
32-bit-fixed formats. not quite done yet. (in particular, needs
functions to actually convert the buffer.) NOTE: lots of changes
to regex.c here. also, many new *_fmt() inline funs that take an
Internal_Format argument.
redo syntax cache code. make the cache per-buffer; keep the cache
valid across calls to functions that use it. also keep it valid
across insertions/deletions and extent changes, as much as is
possible. eliminate the junky regex-reentrancy code by passing in
the relevant lisp info to the regex routines as local vars.
add general mechanism in extents code for signalling extent changes.
fix numerous problems with the case-table implementation; yoshiki
never properly transferred many algorithms from old-style to
new-style case tables.
redo char tables to support a default argument, so that mapping
only occurs over changed args. change many chartab functions to
accept Lisp_Object instead of Lisp_Char_Table *.
comment out the code in font-lock.c by default, because
font-lock.el no longer uses it. we should consider eliminating it
entirely.
Don't output bell as ^G in console-stream when not a TTY.
add -mswindows-termination-handle to interface with i.c, so we can
properly kill a build.
add more error-checking to buffer/string macros.
add some additional buffer_or_string_() funs.
-- INTERFACE CHANGES AFFECTING MORE CODE:
switch the arguments of write_c_string and friends to be
consistent with write_fmt_string, which must have printcharfun
first.
change BI_* macros to BYTE_* for increased clarity; similarly for
bi_* local vars.
change VOID_TO_LISP to be a one-argument function. eliminate
no-longer-needed CVOID_TO_LISP.
-- char/string macro changes:
rename MAKE_CHAR() to make_emchar() for slightly less confusion
with make_char(). (The former generates an Emchar, the latter a
Lisp object. Conceivably we should rename make_char() -> wrap_char()
and similarly for make_int(), make_float().)
Similar changes for other *CHAR* macros -- we now consistently use
names with `emchar' whenever we are working with Emchars. Any
remaining name with just `char' always refers to a Lisp object.
rename macros with XSTRING_* to string_* except for those that
reference actual fields in the Lisp_String object, following
conventions used elsewhere.
rename set_string_{data,length} macros (the only ones to work with
a Lisp_String_* instead of a Lisp_Object) to set_lispstringp_*
to make the difference clear.
try to be consistent about caps vs. lowercase in macro/inline-fun
names for chars and such, which wasn't the case before. we now
reserve caps either for XFOO_ macros that reference object fields
(e.g. XSTRING_DATA) or for things that have non-function semantics,
e.g. directly modifying an arg (BREAKUP_EMCHAR) or evaluating an
arg (any arg) more than once. otherwise, use lowercase.
here is a summary of most of the macros/inline funs changed by all
of the above changes:
BYTE_*_P -> byte_*_p
XSTRING_BYTE -> string_byte
set_string_data/length -> set_lispstringp_data/length
XSTRING_CHAR_LENGTH -> string_char_length
XSTRING_CHAR -> string_emchar
INTBYTE_FIRST_BYTE_P -> intbyte_first_byte_p
INTBYTE_LEADING_BYTE_P -> intbyte_leading_byte_p
charptr_copy_char -> charptr_copy_emchar
LEADING_BYTE_* -> leading_byte_*
CHAR_* -> EMCHAR_*
*_CHAR_* -> *_EMCHAR_*
*_CHAR -> *_EMCHAR
CHARSET_BY_ -> charset_by_*
BYTE_SHIFT_JIS* -> byte_shift_jis*
BYTE_BIG5* -> byte_big5*
REP_BYTES_BY_FIRST_BYTE -> rep_bytes_by_first_byte
char_to_unicode -> emchar_to_unicode
valid_char_p -> valid_emchar_p
Change intbyte_strcmp -> qxestrcmp_c (duplicated functionality).
-- INTERFACE CHANGES AFFECTING LESS CODE:
use DECLARE_INLINE_HEADER in various places.
remove '#ifdef emacs' from XEmacs-only files.
eliminate CHAR_TABLE_VALUE(), which duplicated the functionality
of get_char_table().
add BUFFER_TEXT_LOOP to simplify iterations over buffer text.
define typedefs for signed and unsigned types of fixed sizes
(INT_32_BIT, UINT_32_BIT, etc.).
create ALIGN_FOR_TYPE as a higher-level interface onto ALIGN_SIZE;
fix code to use it.
add charptr_emchar_len to return the text length of the character
pointed to by a ptr; use it in place of
charcount_to_bytecount(..., 1). add emchar_len to return the text
length of a given character.
add types Bytexpos and Charxpos to generalize Bytebpos/Bytecount
and Charbpos/Charcount, in code (particularly, the extents code
and redisplay code) that works with either kind of index. rename
redisplay struct params with names such as `charbpos' to
e.g. `charpos' when they are e.g. a Charxpos, not a Charbpos.
eliminate xxDEFUN in place of DEFUN; no longer necessary with
changes awhile back to doc.c.
split up big ugly combined list of EXFUNs in lisp.h on a
file-by-file basis, since other prototypes are similarly split.
rewrite some "*_UNSAFE" macros as inline funs and eliminate the
_UNSAFE suffix.
move most string code from lisp.h to text.h; the string code and
text.h code is now intertwined in such a fashion that they need
to be in the same place and partially interleaved. (you can't
create forward references for inline funs)
automated/lisp-tests.el, automated/symbol-tests.el, automated/test-harness.el: Fix test harness to output FAIL messages to stderr when in
batch mode.
Fix up some problems in lisp-tests/symbol-tests that were
causing spurious failures.
author | ben |
---|---|
date | Sun, 05 May 2002 11:33:57 +0000 |
parents | 023b83f4e54b |
children | ecc681180115 |
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" "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