Mercurial > hg > xemacs-beta
view lisp/find-paths.el @ 4906:6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
-------------------- ChangeLog entries follow: --------------------
lisp/ChangeLog addition:
2010-02-01 Ben Wing <ben@xemacs.org>
* cl-extra.el:
* cl-extra.el (cl-string-vector-equalp): Removed.
* cl-extra.el (cl-bit-vector-vector-equalp): Removed.
* cl-extra.el (cl-vector-array-equalp): Removed.
* cl-extra.el (cl-hash-table-contents-equalp): Removed.
* cl-extra.el (equalp): Removed.
* cl-extra.el (cl-mapcar-many):
Comment out the whole `equalp' implementation for the moment;
remove once we're sure the C implementation works.
* cl-macs.el:
* cl-macs.el (equalp):
Simplify the compiler-macro for `equalp' -- once it's in C,
we don't need to try so hard to expand it.
src/ChangeLog addition:
2010-02-01 Ben Wing <ben@xemacs.org>
* abbrev.c (abbrev_match_mapper):
* buffer.h (CANON_TABLE_OF):
* buffer.h:
* editfns.c (Fchar_equal):
* minibuf.c (scmp_1):
* text.c (qxestrcasecmp_i18n):
* text.c (qxestrncasecmp_i18n):
* text.c (qxetextcasecmp):
* text.c (qxetextcasecmp_matching):
Create new macro CANONCASE that converts to a canonical mapping
and use it to do caseless comparisons instead of DOWNCASE.
* alloc.c:
* alloc.c (cons_equal):
* alloc.c (vector_equal):
* alloc.c (string_equal):
* bytecode.c (compiled_function_equal):
* chartab.c (char_table_entry_equal):
* chartab.c (char_table_equal):
* data.c (weak_list_equal):
* data.c (weak_box_equal):
* data.c (ephemeron_equal):
* device-msw.c (equal_devmode):
* elhash.c (hash_table_equal):
* events.c (event_equal):
* extents.c (properties_equal):
* extents.c (extent_equal):
* faces.c:
* faces.c (face_equal):
* faces.c (face_hash):
* floatfns.c (float_equal):
* fns.c:
* fns.c (bit_vector_equal):
* fns.c (plists_differ):
* fns.c (Fplists_eq):
* fns.c (Fplists_equal):
* fns.c (Flax_plists_eq):
* fns.c (Flax_plists_equal):
* fns.c (internal_equal):
* fns.c (internal_equalp):
* fns.c (internal_equal_0):
* fns.c (syms_of_fns):
* glyphs.c (image_instance_equal):
* glyphs.c (glyph_equal):
* glyphs.c (glyph_hash):
* gui.c (gui_item_equal):
* lisp.h:
* lrecord.h (struct lrecord_implementation):
* marker.c (marker_equal):
* number.c (bignum_equal):
* number.c (ratio_equal):
* number.c (bigfloat_equal):
* objects.c (color_instance_equal):
* objects.c (font_instance_equal):
* opaque.c (equal_opaque):
* opaque.c (equal_opaque_ptr):
* rangetab.c (range_table_equal):
* specifier.c (specifier_equal):
Add a `foldcase' param to the equal() method and use it to implement
`equalp' comparisons. Also add to plists_differ(), although we
don't currently use it here.
Rewrite internal_equalp(). Implement cross-type vector comparisons.
Don't implement our own handling of numeric promotion -- just use
the `=' primitive.
Add internal_equal_0(), which takes a `foldcase' param and calls
either internal_equal() or internal_equalp().
* buffer.h:
When given a 0 for buffer (which is the norm when functions don't
have a specific buffer available), use the current buffer's table,
not `standard-case-table'; otherwise the current settings are
ignored.
* casetab.c:
* casetab.c (set_case_table):
When handling old-style vectors of 256 in `set-case-table' don't
overwrite the existing table! Instead create a new table and
populate.
* device-msw.c (sync_printer_with_devmode):
* lisp.h:
* text.c (lisp_strcasecmp_ascii):
Rename lisp_strcasecmp to lisp_strcasecmp_ascii and use
lisp_strcasecmp_i18n for caseless comparisons in some places.
* elhash.c:
Delete unused lisp_string_hash and lisp_string_equal().
* events.h:
* keymap-buttons.h:
* keymap.h:
* keymap.c (keymap_lookup_directly):
* keymap.c (keymap_store):
* keymap.c (FROB):
* keymap.c (key_desc_list_to_event):
* keymap.c (describe_map_mapper):
* keymap.c (INCLUDE_BUTTON_ZERO):
New file keymap-buttons.h; use to handle buttons 1-26 in place of
duplicating code 26 times.
* frame-gtk.c (allocate_gtk_frame_struct):
* frame-msw.c (mswindows_init_frame_1):
Fix some comments about internal_equal() in redisplay that don't
apply any more.
* keymap-slots.h:
* keymap.c:
New file keymap-slots.h. Use it to notate the slots in a keymap
structure, similar to frameslots.h or coding-system-slots.h.
* keymap.c (MARKED_SLOT):
* keymap.c (keymap_equal):
* keymap.c (keymap_hash):
Implement.
tests/ChangeLog addition:
2010-02-01 Ben Wing <ben@xemacs.org>
* automated/case-tests.el:
* automated/case-tests.el (uni-mappings):
* automated/search-tests.el:
Delete old pristine-case-table code. Rewrite the Unicode torture
test to take into account whether overlapping mappings exist for
more than one character, and not doing the upcase/downcase
comparisons in such cases.
* automated/lisp-tests.el (foo):
* automated/lisp-tests.el (string-variable):
* automated/lisp-tests.el (featurep):
Replace Assert (equal ... with Assert-equal; same for other types
of equality. Replace some awkward equivalents of Assert-equalp
with Assert-equalp. Add lots of equalp tests.
* automated/case-tests.el:
* automated/regexp-tests.el:
* automated/search-tests.el:
Fix up the comments at the top of the files. Move rules about where
to put tests into case-tests.el.
* automated/test-harness.el:
* automated/test-harness.el (test-harness-aborted-summary-template): New.
* automated/test-harness.el (test-harness-from-buffer):
* automated/test-harness.el (batch-test-emacs):
Fix Assert-test-not. Create Assert-not-equal and variants.
Delete the doc strings from all these convenience functions to avoid
excessive repetition; instead use one copy in a comment.
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Mon, 01 Feb 2010 01:02:40 -0600 |
parents | 5da4cc7d5968 |
children | 9c6ea1581159 |
line wrap: on
line source
;;; find-paths.el --- setup various XEmacs paths ;; Copyright (C) 1985-1986, 1990, 1992-1997 Free Software Foundation, Inc. ;; Copyright (c) 1993, 1994 Sun Microsystems, Inc. ;; Copyright (C) 1995 Board of Trustees, University of Illinois ;; Copyright (C) 2003 Ben Wing. ;; Author: Mike Sperber <mike@xemacs.org> ;; Maintainer: XEmacs Development Team ;; Keywords: internal, dumped ;; 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, 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. ;;; Synched up with: Not in FSF. ;;; Commentary: ;; This file is dumped with XEmacs. ;; This file contains basic library functionality for manipulating paths ;; and path lists and finding paths in the XEmacs hierarchy. ;;; Code: (defvar paths-version-control-filename-regexp "^\\(RCS\\|CVS\\|SCCS\\)$" "File bases associated with version control.") (defvar paths-lisp-filename-regexp "^\\(.*\\.elc?\\)$" "File bases that name Emacs Lisp files.") (defvar paths-no-lisp-directory-regexp (concat "\\(" paths-version-control-filename-regexp "\\)" "\\|" "\\(" paths-lisp-filename-regexp "\\)") "File bases that may not be directories containing Lisp code.") (defun paths-find-recursive-path (directories &optional max-depth exclude-regexp) "Return a list of the directory hierarchy underneath DIRECTORIES. The returned list is sorted by pre-order and lexicographically. MAX-DEPTH limits the depth of the search to MAX-DEPTH level, if it is a number. If MAX-DEPTH is NIL, the search depth is unlimited. EXCLUDE-REGEXP is a regexp that matches directory names to exclude from the search." (let ((path '())) (while directories (let ((directory (file-name-as-directory (expand-file-name (car directories))))) (if (paths-file-readable-directory-p directory) (let ((raw-entries (if (equal 0 max-depth) '() (directory-files directory nil "^[^.-]"))) (reverse-dirs '())) (while raw-entries (if (not (and exclude-regexp (string-match exclude-regexp (car raw-entries)))) (setq reverse-dirs (cons (expand-file-name (car raw-entries) directory) reverse-dirs))) (setq raw-entries (cdr raw-entries))) (let ((sub-path (paths-find-recursive-path (reverse reverse-dirs) (if (numberp max-depth) (- max-depth 1) max-depth) exclude-regexp))) (setq path (nconc path (list directory) sub-path)))))) (setq directories (cdr directories))) path)) (defun paths-file-readable-directory-p (filename) "Check if filename is a readable directory." (and (file-directory-p filename) (file-readable-p filename))) (defun paths-find-recursive-load-path (directories &optional max-depth) "Construct a recursive load path underneath DIRECTORIES." (paths-find-recursive-path directories max-depth paths-no-lisp-directory-regexp)) (defun paths-chase-symlink (file-name) "Chase a symlink until the bitter end." (let ((maybe-symlink (file-symlink-p file-name))) (if maybe-symlink (let* ((directory (file-name-directory file-name)) (destination (expand-file-name maybe-symlink directory))) (paths-chase-symlink destination)) file-name))) (defun paths-construct-path (components &optional expand-directory) "Convert list of path components COMPONENTS into a path. If EXPAND-DIRECTORY is non-NIL, use it as a directory to feed to EXPAND-FILE-NAME." (let* ((reverse-components (reverse components)) (last-component (car reverse-components)) (first-components (reverse (cdr reverse-components))) (path (apply #'concat (append (mapcar #'file-name-as-directory first-components) (list last-component))))) (if expand-directory (expand-file-name path expand-directory) path))) (defun paths-construct-emacs-directory (root suffix base) "Construct a directory name within the XEmacs hierarchy. ROOT must be an installation root. SUFFIX is the subdirectory from there. BASE is the base to look for." (file-name-as-directory (expand-file-name (concat (file-name-as-directory root) suffix base)))) (defun paths-for-each-emacs-directory (func roots suffix bases &optional envvar default keep-suffix) "Iterate over directories in the XEmacs hierarchy. FUNC is a function that called for each directory, with the directory as the only argument. ROOTS must be a list of installation roots. SUFFIX is the subdirectory from there. BASEA is a list of possible bases to look for. ENVVAR is the name of the environment variable that might also specify the directory. DEFAULT is the preferred value. If KEEP-SUFFIX is non-nil, the suffix must be respected in searching the directory." (let ((preferred-value (or (and envvar (getenv envvar)) default))) (if (and preferred-value (paths-file-readable-directory-p preferred-value)) (file-name-as-directory preferred-value) (while roots (let ((root (car roots)) (bases bases)) (while bases (let* ((base (car bases)) ;; installed (path (paths-construct-emacs-directory root suffix base))) (if (paths-file-readable-directory-p path) (funcall func path) ;; in-place (if (null keep-suffix) (let ((path (paths-construct-emacs-directory root "" base))) (if (paths-file-readable-directory-p path) (funcall func path)))))) (setq bases (cdr bases)))) (setq roots (cdr roots)))))) (defun paths-find-emacs-directories (roots suffix bases &optional envvar default keep-suffix) "Find a list of directories in the XEmacs hierarchy. ROOTS must be a list of installation roots. SUFFIX is the subdirectory from there. BASES is a list of bases to look for. ENVVAR is the name of the environment variable that might also specify the directory. DEFAULT is the preferred value. If KEEP-SUFFIX is non-nil, the suffix must be respected in searching the directory." (let ((l '())) (paths-for-each-emacs-directory #'(lambda (dir) (setq l (cons dir l))) roots suffix bases envvar default keep-suffix) (reverse l))) (defun paths-find-emacs-directory (roots suffix bases &optional envvar default keep-suffix) "Find a directory in the XEmacs hierarchy. ROOTS must be a list of installation roots. SUFFIX is the subdirectory from there. BASES is a list of possible bases to look for. ENVVAR is the name of the environment variable that might also specify the directory. DEFAULT is the preferred value. If KEEP-SUFFIX is non-nil, the suffix must be respected in searching the directory." (catch 'gotcha (paths-for-each-emacs-directory #'(lambda (dir) (throw 'gotcha dir)) roots suffix bases envvar default keep-suffix))) (defun paths-for-each-site-directory (func roots bases arch-dependent-p &optional envvar default) "Iterate over the site-specific directories in the XEmacs hierarchy. FUNC is a function that called for each directory, with the directory as the only argument. ROOTS must be a list of installation roots. BASES is a list of possible bases to look for. ARCH-DEPENDENT-P says whether the file is architecture-specific. ENVVAR is the name of the environment variable that might also specify the directory. DEFAULT is the preferred value." (paths-for-each-emacs-directory func roots (file-name-as-directory (paths-construct-path (list (if arch-dependent-p "lib" "share") emacs-program-name))) bases envvar default)) (defun paths-find-site-directory (roots bases arch-dependent-p &optional envvar default) "Find a site-specific directory in the XEmacs hierarchy. ROOTS must be a list of installation roots. BASES is a list of possible bases to look for. ARCH-DEPENDENT-P says whether the file is architecture-specific. ENVVAR is the name of the environment variable that might also specify the directory. DEFAULT is the preferred value." (catch 'gotcha (paths-for-each-site-directory #'(lambda (dir) (throw 'gotcha dir)) roots bases arch-dependent-p envvar default))) (defun paths-find-site-directories (roots bases arch-dependent-p &optional envvar default) "Find a list of site-specific directories in the XEmacs hierarchy. ROOTS must be a list of installation roots. BASES is a list of bases to look for. ARCH-DEPENDENT-P says whether the file is architecture-specific. ENVVAR is the name of the environment variable that might also specify the directory. DEFAULT is the preferred value." (let ((l '())) (paths-for-each-site-directory #'(lambda (dir) (setq l (cons dir l))) roots bases arch-dependent-p envvar default) (reverse l))) (defun paths-for-each-version-directory (func roots bases arch-dependent-p &optional envvar default enforce-version) "Iterate over version-specific directories in the XEmacs hierarchy. FUNC is a function that called for each directory, with the directory as the only argument. ROOTS must be a list of installation roots. BASES is a list of possible bases to look for. ARCH-DEPENDENT-P says whether the file is architecture-specific. ENVVAR is the name of the environment variable that might also specify the directory. DEFAULT is the preferred value. If ENFORCE-VERSION is non-nil, the directory must contain the XEmacs version." (paths-for-each-emacs-directory func roots (file-name-as-directory (paths-construct-path (list (if arch-dependent-p "lib" "share") (construct-emacs-version-name)))) bases envvar default)) (defun paths-find-version-directory (roots bases arch-dependent-p &optional envvar default enforce-version) "Find a version-specific directory in the XEmacs hierarchy. ROOTS must be a list of installation roots. BASES is a list of possible bases to look for. ARCH-DEPENDENT-P says whether the file is architecture-specific. ENVVAR is the name of the environment variable that might also specify the directory. DEFAULT is the preferred value. If ENFORCE-VERSION is non-nil, the directory must contain the XEmacs version." (catch 'gotcha (paths-for-each-version-directory #'(lambda (dir) (throw 'gotcha dir)) roots bases arch-dependent-p envvar default))) (defun paths-find-version-directories (roots bases arch-dependent-p &optional envvar default enforce-version) "Find a list of version-specific directories in the XEmacs hierarchy. ROOTS must be a list of installation roots. BASES is a list of possible bases to look for. ARCH-DEPENDENT-P says whether the file is architecture-specific. ENVVAR is the name of the environment variable that might also specify the directory. DEFAULT is the preferred value. If ENFORCE-VERSION is non-nil, the directory must contain the XEmacs version." (let ((l '())) (paths-for-each-version-directory #'(lambda (dir) (setq l (cons dir l))) roots bases arch-dependent-p envvar default) (reverse l))) (defun paths-find-architecture-directory (roots bases &optional envvar default) "Find an architecture-specific directory in the XEmacs hierarchy. ROOTS must be a list of installation roots. BASES is a list of possible bases to look for. ENVVAR is the name of the environment variable that might also specify the directory. DEFAULT is the preferred value." (paths-find-version-directory roots ;; from more to less specific (append (mapcar #'(lambda (base) (paths-construct-path (list system-configuration base))) bases) bases (list system-configuration)) t envvar default)) (defun construct-emacs-version-name () "Construct a string from the raw XEmacs version number." (concat emacs-program-name "-" emacs-program-version)) (defun paths-directories-which-exist (directories) "Return the directories among DIRECTORIES. DIRECTORIES is a list of strings." (let ((reverse-directories '())) (while directories (if (paths-file-readable-directory-p (car directories)) (setq reverse-directories (cons (car directories) reverse-directories))) (setq directories (cdr directories))) (reverse reverse-directories))) (defun paths-uniq-append (list-1 list-2) "Append LIST-1 and LIST-2, omitting EQUAL duplicates." (let ((reverse-survivors '())) (while list-2 (if (null (member (car list-2) list-1)) (setq reverse-survivors (cons (car list-2) reverse-survivors))) (setq list-2 (cdr list-2))) (append list-1 (reverse reverse-survivors)))) (defun paths-filter (predicate list) "Delete all matches of PREDICATE from LIST." (let ((reverse-result '())) (while list (if (funcall predicate (car list)) (setq reverse-result (cons (car list) reverse-result))) (setq list (cdr list))) (nreverse reverse-result))) (defun paths-decode-directory-path (string &optional drop-empties) "Split STRING at path separators into a directory list. Non-\"\" components are converted into directory form. If DROP-EMPTIES is non-NIL, \"\" components are dropped from the output. Otherwise, they are left alone." (let* ((components (split-path string)) (directories (mapcar #'(lambda (component) (if (string-equal "" component) component (file-name-as-directory component))) components))) (if drop-empties (paths-filter #'(lambda (component) (null (string-equal "" component))) directories) directories))) ;;; find-paths.el ends here