Mercurial > hg > xemacs-beta
annotate lisp/symbol-syntax.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 | 3ecd8885ac67 |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 428 | 1 ;;; symbol-syntax.el --- find chars with symbol syntax |
| 2 | |
| 3 ;; Copyright (C) 1992, 1993, 1997 Free Software Foundation, Inc. | |
| 4 ;; Copyright (C) 1995 Sun Microsystems. | |
| 5 | |
| 6 ;; Author: JBW, JBW@_CORTEZ | |
| 7 ;; Created: Wed Jun 20 15:15:34 1990 | |
| 8 ;; Maintainer: XEmacs Development Team | |
| 9 ;; Keywords: matching | |
| 10 | |
| 11 ;; This file is part of XEmacs. | |
| 12 | |
| 13 ;; XEmacs is free software; you can redistribute it and/or modify it | |
| 14 ;; under the terms of the GNU General Public License as published by | |
| 15 ;; the Free Software Foundation; either version 2, or (at your option) | |
| 16 ;; any later version. | |
| 17 | |
| 18 ;; XEmacs is distributed in the hope that it will be useful, but | |
| 19 ;; WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 20 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 21 ;; General Public License for more details. | |
| 22 | |
| 23 ;; You should have received a copy of the GNU General Public License | |
| 24 ;; along with XEmacs; see the file COPYING. If not, write to the | |
| 25 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 26 ;; Boston, MA 02111-1307, USA. | |
| 27 | |
| 28 ;;; Synched up with: Not in FSF. | |
| 29 | |
| 30 ;;; Commentary: | |
| 31 | |
| 32 ;; Last modified by: Ben Wing, ben@xemacs.org | |
| 33 ;; Last modified on: Mon Oct 2 02:32:05 GMT 1995 | |
| 34 | |
| 35 ;;; Code: | |
| 36 | |
| 37 (defvar symbol-syntax-table-alist nil) | |
| 38 ;; '((c-mode-syntax-table) | |
| 39 ;; (emacs-lisp-mode-syntax-table) | |
| 40 ;; (lisp-mode-syntax-table) | |
| 41 ;; (text-mode-syntax-table))) | |
| 42 | |
| 43 (defun update-symbol-syntax-table-alist () | |
| 44 (let ((alist symbol-syntax-table-alist) | |
| 45 item) | |
| 46 (while (consp alist) | |
| 47 (cond ((null (car alist)) | |
| 48 (error "Missing alist item")) | |
| 49 ((null (car (car alist))) | |
| 50 (error "Alist item with null car")) | |
| 51 ;; this functionality not used | |
| 52 ((symbolp (setq item (car (car alist)))) | |
| 53 (or (null (cdr (car alist))) | |
| 54 (error "Alist item expected to have null cdr")) | |
| 55 (while (symbolp item) | |
| 56 (setq item (symbol-value item))) | |
| 57 (setcar (car alist) item))) | |
| 58 (cond ((not (syntax-table-p (car (car alist)))) | |
| 59 (error "Alist item car expected to be symbol table")) | |
| 60 ((null (cdr (car alist))) | |
| 61 (setcdr (car alist) | |
| 62 (make-symbol-syntax-table (car (car alist)))))) | |
| 63 (setq alist (cdr alist))))) | |
| 64 | |
| 65 (defun get-symbol-syntax-table (norm-table) | |
| 66 (let (result) | |
| 67 (if (setq result (assq norm-table symbol-syntax-table-alist)) | |
| 68 nil | |
| 69 (update-symbol-syntax-table-alist) | |
| 70 (if (setq result (assq norm-table symbol-syntax-table-alist)) | |
| 71 nil | |
| 72 (setq symbol-syntax-table-alist | |
| 73 (cons (list norm-table) | |
| 74 symbol-syntax-table-alist)) | |
| 75 (update-symbol-syntax-table-alist) | |
| 76 (or (setq result (assq norm-table symbol-syntax-table-alist)) | |
| 77 (error "Syntax table missing from symbol-syntax-table-alist")))) | |
| 78 (or (setq result (cdr result)) | |
| 79 (error "Alist item has null cdr")) | |
| 80 (or (syntax-table-p result) | |
| 81 (error "Non-syntax-table item in alist")) | |
| 82 result)) | |
| 83 | |
| 84 (defun make-symbol-syntax-table (in-table) | |
| 85 (let ((out-table (copy-syntax-table in-table))) | |
| 86 (map-syntax-table | |
| 87 #'(lambda (key value) | |
| 88 (if (eq ?_ (char-syntax-from-code value)) | |
| 89 (put-char-table key (set-char-syntax-in-code value ?w) | |
| 90 out-table)) | |
| 91 nil) | |
| 92 out-table) | |
| 93 out-table)) | |
| 94 | |
| 95 ;; stuff for examining contents of syntax tables | |
| 96 ;;(show-chars-with-syntax | |
| 97 ;; '(c-mode-syntax-table | |
| 98 ;; emacs-lisp-mode-syntax-table | |
| 99 ;; lisp-mode-syntax-table | |
| 100 ;; text-mode-syntax-table) | |
| 101 ;; ?_) | |
| 102 | |
| 103 (defun show-chars-with-syntax (tables syntax) | |
| 104 (let ((schars nil)) | |
| 105 (unwind-protect | |
| 106 (while (consp tables) | |
| 107 (let* ((chars nil) | |
| 108 (table-symbol (car tables)) | |
| 109 (table table-symbol)) | |
| 110 (or (symbolp table-symbol) | |
| 111 (error "bad argument non-symbol")) | |
| 112 (while (symbolp table) | |
| 113 (setq table (symbol-value table))) | |
| 114 (map-syntax-table | |
| 115 #'(lambda (key value) | |
| 116 (if (eq syntax (char-syntax-from-code value)) | |
| 117 (setq chars (cons key chars))) | |
| 118 nil) | |
| 119 table) | |
| 120 (setq schars (cons (list table-symbol (nreverse chars)) | |
| 121 schars))) | |
| 122 (setq tables (cdr tables)))) | |
| 123 (nreverse schars))) | |
| 124 | |
| 125 (provide 'symbol-syntax) | |
| 126 | |
| 127 ;;; symbol-syntax.el ends here |