Mercurial > hg > xemacs-beta
view lisp/lisp.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 | 4bbda1c11a7b |
children | 308d34e9f07d |
line wrap: on
line source
;;; lisp.el --- Lisp editing commands for XEmacs ;; Copyright (C) 1985, 1986, 1994, 1997 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: lisp, languages, 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, Inc., 59 Temple Place - Suite 330, Boston, MA ;; 02111-1307, USA. ;;; Synched up with: Emacs/Mule zeta. ;;; Commentary: ;; This file is dumped with XEmacs. ;; Lisp editing commands to go with Lisp major mode. ;; 06/11/1997 - Use char-(after|before) instead of ;; (following|preceding)-char. -slb ;;; Code: ;; Note that this variable is used by non-lisp modes too. (defcustom defun-prompt-regexp nil "*Non-nil => regexp to ignore, before the character that starts a defun. This is only necessary if the opening paren or brace is not in column 0. See `beginning-of-defun'." :type '(choice (const :tag "none" nil) regexp) :group 'lisp) (make-variable-buffer-local 'defun-prompt-regexp) (defcustom parens-require-spaces t "Non-nil => `insert-parentheses' should insert whitespace as needed." :type 'boolean :group 'editing-basics :group 'lisp) (defun forward-sexp (&optional count) "Move forward across one balanced expression (sexp). With non-nil COUNT, do it that many times. Negative COUNT means move backward across -COUNT balanced expressions." ;; XEmacs change (for zmacs regions) (interactive "_p") (or count (setq count 1)) ;; XEmacs: evil hack! The other half of the evil hack below. (if (and (> count 0) (looking-at "#s(\\|#r[uU]\\{0,1\\}\"")) (goto-char (1+ (- (point) (- (match-end 0) (match-beginning 0)))))) (goto-char (or (scan-sexps (point) count) (buffer-end count))) (when (< count 0) (backward-prefix-chars) ;; XEmacs: evil hack! Skip back over #[sr] so that structures and raw ;; strings are read properly. the current cheesified syntax tables just ;; aren't up to this. (let* ((diff (- (point) (point-min))) (subject (buffer-substring (- (point) (min diff 3)) (1+ (point)))) (matched (string-match "#s(\\|#r[uU]\\{0,1\\}\"" subject))) (if matched (goto-char (1+ (- (point) (- (length subject) matched)))))))) (defun backward-sexp (&optional count) "Move backward across one balanced expression (sexp). With non-nil COUNT, do it that many times. Negative COUNT means move forward across -COUNT balanced expressions." ;; XEmacs change (for zmacs regions) (interactive "_p") (forward-sexp (- (or count 1)))) (defun mark-sexp (&optional count) "Set mark COUNT sexps from point. The place mark goes is the same place \\[forward-sexp] would move to with the same argument. Repeat this command to mark more sexps in the same direction." (interactive "p") (mark-something 'mark-sexp 'forward-sexp (or count 1))) (defun forward-list (&optional count) "Move forward across one balanced group of parentheses. With non-nil COUNT, do it that many times. Negative COUNT means move backward across -COUNT groups of parentheses." ;; XEmacs change (interactive "_p") (goto-char (or (scan-lists (point) (or count 1) 0) (buffer-end (or count 1))))) (defun backward-list (&optional count) "Move backward across one balanced group of parentheses. With non-nil COUNT, do it that many times. Negative COUNT means move forward across -COUNT groups of parentheses." ;; XEmacs change (for zmacs regions) (interactive "_p") (forward-list (- (or count 1)))) (defun down-list (&optional count) "Move forward down one level of parentheses. With non-nil COUNT, do this that many times. A negative COUNT means move backward but still go down a level." ;; XEmacs change (for zmacs regions) (interactive "_p") (or count (setq count 1)) (let ((inc (if (> count 0) 1 -1))) (while (/= count 0) (goto-char (or (scan-lists (point) inc -1) (buffer-end count))) (setq count (- count inc))))) (defun backward-up-list (&optional count) "Move backward out of one level of parentheses. With COUNT, do this that many times. A negative COUNT means move forward but still to a less deep spot." (interactive "_p") (up-list (- (or count 1)))) (defun up-list (&optional count) "Move forward out of one level of parentheses. With non-nil COUNT, do this that many times. A negative COUNT means move backward but still to a less deep spot. In Lisp programs, an argument is required." ;; XEmacs change (for zmacs regions) (interactive "_p") (or count (setq count 1)) (let ((inc (if (> count 0) 1 -1))) (while (/= count 0) (goto-char (or (scan-lists (point) inc 1) (buffer-end count))) (setq count (- count inc))))) (defun kill-sexp (&optional count) "Kill the sexp (balanced expression) following the cursor. With non-nil COUNT, kill that many sexps after the cursor. Negative COUNT means kill -COUNT sexps before the cursor." (interactive "p") (let ((opoint (point))) (forward-sexp (or count 1)) (kill-region opoint (point)))) (defun backward-kill-sexp (&optional count) "Kill the sexp (balanced expression) preceding the cursor. With non-nil COUNT, kill that many sexps before the cursor. Negative COUNT means kill -COUNT sexps after the cursor." (interactive "p") (kill-sexp (- (or count 1)))) ;; derived stuff from GNU Emacs (defvar beginning-of-defun-function nil "If non-nil, this function will be called by `beginning-of-defun-raw'. It will be called with one argument, which is a repetition count. It provides an alternative algorithm to find the beginning of the current defun instead of using the standard one implemented by `beginning-of-defun'. See also `defun-prompt-regexp' for minor tweaks.") (make-variable-buffer-local 'beginning-of-defun-function) (defvar end-of-defun-function nil "If non-nil, this function will be called by `end-of-defun'. It will be called with no arguments. \(Repetition is implemented in `end-of-defun' by calling this function that many times.) This function provides an alternative algorithm to find the end of the current defun instead of using the standard one implemented by `end-of-defun'. ") (make-variable-buffer-local 'end-of-defun-function) (defun beginning-of-defun (&optional count) "Move backward to the beginning of the current defun. With COUNT, do it that many times. Negative COUNT means move forward to -COUNTth following beginning of defun. Returns t unless search stops due to beginning or end of buffer. In the default implementation provided by `beginning-of-defun-raw', a defun starts at a char with open-parenthesis syntax at the beginning of a line. If `defun-prompt-regexp' is non-nil, then a string which matches that regexp may precede the open-parenthesis. Alternatively, if `beginning-of-defun-function' is non-nil, that function is called, and none of the default processing is done. If the beginning of defun function returns t, point moves to the beginning of the line containing the beginning of defun." ;; XEmacs change (for zmacs regions) (interactive "_p") (and (beginning-of-defun-raw count) (progn (beginning-of-line) t))) (defun beginning-of-defun-raw (&optional count) "Move point to the character that starts a defun. This is identical to beginning-of-defun, except that point does not move to the beginning of the line when `defun-prompt-regexp' is non-nil." (interactive "p") (unless count (setq count 1)) (if beginning-of-defun-function (funcall beginning-of-defun-function count) (and (< count 0) (not (eobp)) (forward-char 1)) (and (re-search-backward (if defun-prompt-regexp (concat "^\\s(\\|" "\\(" defun-prompt-regexp "\\)\\s(") "^\\s(") nil 'move count) (progn (goto-char (1- (match-end 0)))) t))) ;; XEmacs change (optional buffer parameter) (defun buffer-end (direction &optional buffer) "Return `point-max' of BUFFER if DIRECTION > 0, else return `point-min'. BUFFER defaults to the current buffer if omitted." (if (> direction 0) (point-max buffer) (point-min buffer))) (defun end-of-defun (&optional count) "Move forward to next end of defun. Non-nil COUNT means do it that many times (default is 1). Negative COUNT means move back to -COUNTth preceding end of defun. In the default implementation, the end of a defun is the end of the s-expression started at the character identified by `beginning-of-defun'. If `end-of-defun-function' is non-nil, none of the default processing is done. For a repetition count greater than 1, `end-of-defun-function' is called that many times. If the repetition count is less than 1, nothing is done. \(This is a bug.)" ;; XEmacs change (for zmacs regions) (interactive "_p") (if (or (null count) (= count 0)) (setq count 1)) (if end-of-defun-function (if (> count 0) (dotimes (i count) (funcall end-of-defun-function))) (let ((first t)) (while (and (> count 0) (< (point) (point-max))) (let ((pos (point))) ; XEmacs -- remove unused npos. (while (progn (if (and first (progn (end-of-line 1) (beginning-of-defun-raw 1))) nil (or (bobp) (backward-char 1)) (beginning-of-defun-raw -1)) (setq first nil) (forward-list 1) (skip-chars-forward " \t") (if (looking-at "\\s<\\|\n") (forward-line 1)) (<= (point) pos)))) (setq count (1- count))) (while (< count 0) (let ((pos (point))) (beginning-of-defun-raw 1) (forward-sexp 1) (forward-line 1) (if (>= (point) pos) (if (beginning-of-defun-raw 2) (progn (forward-list 1) (skip-chars-forward " \t") (if (looking-at "\\s<\\|\n") (forward-line 1))) (goto-char (point-min))))) (setq count (1+ count)))))) (defun mark-defun () "Put mark at end of this defun, point at beginning. The defun marked is the one that contains point or follows point." (interactive) (push-mark (point)) (end-of-defun) (push-mark (point) nil t) (beginning-of-defun) (re-search-backward "^\n" (- (point) 1) t)) (defun narrow-to-defun (&optional arg) "Make text outside current defun invisible. The defun visible is the one that contains point or follows point. Optional ARG is currently ignored." (interactive) (save-excursion (widen) (end-of-defun) (let ((end (point))) (beginning-of-defun) (narrow-to-region (point) end)))) (defun insert-parentheses (count) "Enclose following COUNT sexps in parentheses. Leave point after open-paren. A negative COUNT encloses the preceding -COUNT sexps instead. COUNT defaults to zero: just insert `()' and leave point between. If `parens-require-spaces' is non-nil, this command also inserts a space before and after, depending on the surrounding characters." (interactive "P") (if count (setq count (prefix-numeric-value count)) (setq count 0)) (cond ((> count 0) (skip-chars-forward " \t")) ((< count 0) (forward-sexp count) (setq count (- count)))) (and parens-require-spaces (not (bobp)) (memq (char-syntax (char-before (point))) '(?w ?_ ?\) )) (insert " ")) (insert ?\() (save-excursion (or (eq count 0) (forward-sexp count)) (insert ?\)) (and parens-require-spaces (not (eobp)) (memq (char-syntax (char-after (point))) '(?w ?_ ?\( )) (insert " ")))) (defun move-past-close-and-reindent () "Move past next `)', delete indentation before it, then indent after it." (interactive) (up-list 1) (backward-char 1) (while (save-excursion ; this is my contribution (let ((before-paren (point))) (back-to-indentation) (= (point) before-paren))) (delete-indentation)) (forward-char 1) (newline-and-indent)) (defun lisp-complete-symbol () "Perform completion on Lisp symbol preceding point. Compare that symbol against the known Lisp symbols. The context determines which symbols are considered. If the symbol starts just after an open-parenthesis, only symbols with function definitions are considered. Otherwise, all symbols with function definitions, values or properties are considered." (interactive) (let* ((end (point)) (buffer-syntax (syntax-table)) (beg (unwind-protect (save-excursion ;; XEmacs change (if emacs-lisp-mode-syntax-table (set-syntax-table emacs-lisp-mode-syntax-table)) (backward-sexp 1) (while (eq (char-syntax (char-after (point))) ?\') (forward-char 1)) (point)) (set-syntax-table buffer-syntax))) (pattern (buffer-substring beg end)) (predicate (if (eq (char-after (1- beg)) ?\() 'fboundp ;; XEmacs change #'(lambda (sym) (or (boundp sym) (fboundp sym) (symbol-plist sym))))) (completion (try-completion pattern obarray predicate))) (cond ((eq completion t)) ((null completion) (message "Can't find completion for \"%s\"" pattern) (ding)) ((not (string= pattern completion)) (delete-region beg end) (insert completion)) (t (message "Making completion list...") (let ((list (all-completions pattern obarray predicate)) ;FSFmacs crock unnecessary in XEmacs ;see minibuf.el ;(completion-fixup-function ; (function (lambda () (if (save-excursion ; (goto-char (max (point-min) ; (- (point) 4))) ; (looking-at " <f>")) ; (forward-char -4)))) ) (or (eq predicate 'fboundp) (let (new) (while list (setq new (cons (if (fboundp (intern (car list))) (list (car list) " <f>") (car list)) new)) (setq list (cdr list))) (setq list (nreverse new)))) (with-output-to-temp-buffer "*Completions*" (display-completion-list list))) (message "Making completion list...%s" "done"))))) ;;; lisp.el ends here