Mercurial > hg > xemacs-beta
view tests/automated/symbol-tests.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 | 189fb67ca31a |
children | 0f66906b6e37 |
line wrap: on
line source
;; Copyright (C) 1999 Free Software Foundation, Inc. ;; Author: Hrvoje Niksic <hniksic@xemacs.org> ;; Maintainer: Hrvoje Niksic <hniksic@xemacs.org> ;; Created: 1999 ;; Keywords: tests ;; 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: Not in FSF. ;;; Commentary: ;; Test symbols operations. ;; See test-harness.el for instructions on how to run these tests. (eval-when-compile (condition-case nil (require 'test-harness) (file-error (push "." load-path) (when (and (boundp 'load-file-name) (stringp load-file-name)) (push (file-name-directory load-file-name) load-path)) (require 'test-harness)))) (defun ts-fresh-symbol-name (name) "Return a variant of NAME (a string) that is not interned." (when (intern-soft name) (let ((count 1) (orig name)) (while (progn (setq name (format "%s-%d" orig count)) (intern-soft name)) (incf count)))) name) ;;----------------------------------------------------- ;; Creating, reading, and printing symbols ;;----------------------------------------------------- (dolist (name '("foo" "bar" "" "something with space in it" "a string with \0 in the middle." "100" "10.0" "#<>[]]]];'\\';" "!@#$%^^&*(()__")) (let ((interned (intern name)) (uninterned (make-symbol name))) (Assert (symbolp interned)) (Assert (symbolp uninterned)) (Assert-equal (symbol-name interned) name) (Assert-equal (symbol-name uninterned) name) (Assert (not (eq interned uninterned))) (Assert (not (equal interned uninterned))))) (flet ((check-weak-list-unique (weak-list &optional reversep) "Check that elements of WEAK-LIST are referenced only there." (let ((len (length (weak-list-list weak-list)))) (if (string-match "Using the new GC algorithms." Installation-string) (Implementation-Incomplete-Expect-Failure (Assert (not (zerop len))) (garbage-collect) (Assert-eq (length (weak-list-list weak-list)) (if (not reversep) 0 len))) (Assert (not (zerop len))) (garbage-collect) (Assert-eq (length (weak-list-list weak-list)) (if (not reversep) 0 len)))))) (let ((weak-list (make-weak-list)) (gc-cons-threshold most-positive-fixnum)) ;; Symbols created with `make-symbol' and `gensym' should be fresh ;; and not referenced anywhere else. We check that no other ;; references are available using a weak list. (eval ;; This statement must not be run byte-compiled, or the values ;; remain referenced on the bytecode interpreter stack. '(set-weak-list-list weak-list (list (make-symbol "foo") (gensym "foo")))) (check-weak-list-unique weak-list) ;; Equivalent test for `intern' and `gentemp'. (eval '(set-weak-list-list weak-list (list (intern (ts-fresh-symbol-name "foo")) (gentemp (ts-fresh-symbol-name "bar"))))) (check-weak-list-unique weak-list 'not))) (Assert (not (intern-soft (make-symbol "foo")))) (Assert (not (intern-soft (gensym "foo")))) (Assert (intern-soft (intern (ts-fresh-symbol-name "foo")))) (Assert (intern-soft (gentemp (ts-fresh-symbol-name "bar")))) ;; Reading a symbol should intern it automatically, unless the symbol ;; is marked specially. (dolist (string (mapcar #'ts-fresh-symbol-name '("foo" "bar" "\\\0\\\1"))) (setq symbol (read string) string (read (concat "\"" string "\""))) (Assert (intern-soft string)) (Assert (intern-soft symbol)) (Assert-eq (intern-soft string) (intern-soft symbol))) (let ((fresh (read (concat "#:" (ts-fresh-symbol-name "foo"))))) (Assert (not (intern-soft fresh)))) ;; Check #N=OBJECT and #N# read syntax. (let* ((list (read "(#1=#:foo #1# #2=#:bar #2# #1# #2#)")) (foo (nth 0 list)) (foo2 (nth 1 list)) (bar (nth 2 list)) (bar2 (nth 3 list)) (foo3 (nth 4 list)) (bar3 (nth 5 list))) (Assert (symbolp foo)) (Assert (not (intern-soft foo))) (Assert-equal (symbol-name foo) "foo") (Assert (symbolp bar)) (Assert (not (intern-soft bar))) (Assert-equal (symbol-name bar) "bar") (Assert-eq foo foo2) (Assert-eq foo2 foo3) (Assert-eq bar bar2) (Assert-eq bar2 bar3)) ;; Check #N=OBJECT and #N# print syntax. (let* ((foo (make-symbol "foo")) (bar (make-symbol "bar")) (list (list foo foo bar bar foo bar))) (let* ((print-gensym nil) (printed-list (prin1-to-string list))) (Assert-equal printed-list "(foo foo bar bar foo bar)")) (let* ((print-gensym t) (printed-list (prin1-to-string list))) (Assert-equal printed-list "(#1=#:foo #1# #2=#:bar #2# #1# #2#)"))) ;;----------------------------------------------------- ;; Read-only symbols ;;----------------------------------------------------- (Check-Error setting-constant (set nil nil)) (Check-Error setting-constant (set t nil)) ;;----------------------------------------------------- ;; Variable indirections ;;----------------------------------------------------- (let ((foo 0) (bar 1)) (defvaralias 'foo 'bar) (Assert-eq foo bar) (Assert-eq foo 1) (Assert-eq (variable-alias 'foo) 'bar) (defvaralias 'bar 'foo) (Check-Error cyclic-variable-indirection (symbol-value 'foo)) (Check-Error cyclic-variable-indirection (symbol-value 'bar)) (defvaralias 'foo nil) (Assert-eq foo 0) (defvaralias 'bar nil) (Assert-eq bar 1)) ;;----------------------------------------------------- ;; Keywords ;;----------------------------------------------------- ;;; Reading keywords ;; In Elisp, a keyword is by definition a symbol beginning with `:' ;; that is interned in the global obarray. ;; In Elisp, a keyword is interned as any other symbol. (Assert-eq (read ":foo") (intern ":foo")) ;; A keyword is self-quoting and evaluates to itself. (Assert-eq (eval (intern ":foo")) :foo) ;; Keywords are recognized as such only if interned in the global ;; obarray, and `keywordp' is aware of that. (Assert (keywordp :foo)) (Assert (not (keywordp (intern ":foo" [0])))) ;; Keywords used to be initialized at read-time, which resulted in ;; (symbol-value (intern ":some-new-keyword")) signaling an error. ;; Now we handle keywords at the time when the symbol is interned, so ;; that (intern ":something) and (read ":something) will be ;; equivalent. These tests check various operations on symbols that ;; are guaranteed to be freshly interned. ;; Interning a fresh keyword string should produce a regular ;; keyword. (let* ((fresh-keyword-name (ts-fresh-symbol-name ":foo")) (fresh-keyword (intern fresh-keyword-name))) (Assert-eq (symbol-value fresh-keyword) fresh-keyword) (Assert (keywordp fresh-keyword))) ;; Likewise, reading a fresh keyword string should produce a regular ;; keyword. (let* ((fresh-keyword-name (ts-fresh-symbol-name ":foo")) (fresh-keyword (read fresh-keyword-name))) (Assert-eq (symbol-value fresh-keyword) fresh-keyword) (Assert (keywordp fresh-keyword))) ;;; Assigning to keywords ;; You shouldn't be able to set its value to something bogus. (Check-Error setting-constant (set :foo 5)) ;; But, for backward compatibility, setting to the same value is OK. (Assert (eq (set :foo :foo) :foo)) ;; Playing games with `intern' shouldn't fool us. (Check-Error setting-constant (set (intern ":foo" obarray) 5)) (Assert (eq (set (intern ":foo" obarray) :foo) :foo)) ;; But symbols not interned in the global obarray are not real ;; keywords (in elisp): (Assert-eq (set (intern ":foo" [0]) 5) 5) ;;; Printing keywords (let ((print-gensym t)) (Assert-equal (prin1-to-string :foo) ":foo") (Assert-equal (prin1-to-string (intern ":foo")) ":foo") (Assert-equal (prin1-to-string (intern ":foo" [0])) "#::foo")) (let ((print-gensym nil)) (Assert-equal (prin1-to-string :foo) ":foo") (Assert-equal (prin1-to-string (intern ":foo")) ":foo") (Assert-equal (prin1-to-string (intern ":foo" [0])) ":foo")) ;; #### Add many more tests for printing and reading symbols, as well ;; as print-gensym and print-gensym-alist! ;;----------------------------------------------------- ;; Magic symbols ;;----------------------------------------------------- ;; Magic symbols are only half implemented. However, a subset of the ;; functionality is being used to implement backward compatibility or ;; clearer error messages for new features such as specifiers and ;; glyphs. These tests try to test that working subset. (let ((mysym (make-symbol "test-symbol")) save) (dontusethis-set-symbol-value-handler mysym 'set-value (lambda (&rest args) (throw 'test-tag args))) (Assert (not (boundp mysym))) (Assert-equal (catch 'test-tag (set mysym 'foo)) `(,mysym (foo) set nil nil)) (Assert (not (boundp mysym))) (dontusethis-set-symbol-value-handler mysym 'set-value (lambda (&rest args) (setq save (nth 1 args)))) (set mysym 'foo) (Assert-equal save '(foo)) (Assert-eq (symbol-value mysym) 'foo) ) (let ((mysym (make-symbol "test-symbol")) save) (dontusethis-set-symbol-value-handler mysym 'make-unbound (lambda (&rest args) (throw 'test-tag args))) (Assert-equal (catch 'test-tag (makunbound mysym)) `(,mysym nil makunbound nil nil)) (dontusethis-set-symbol-value-handler mysym 'make-unbound (lambda (&rest args) (setq save (nth 2 args)))) (Assert (not (boundp mysym))) (set mysym 'bar) (Assert (null save)) (Assert-eq (symbol-value mysym) 'bar) (makunbound mysym) (Assert (not (boundp mysym))) (Assert-eq save 'makunbound) ) ;; pathname-coding-system is no more. ; (when (featurep 'file-coding) ; (Assert-eq pathname-coding-system file-name-coding-system) ; (let ((val1 file-name-coding-system) ; (val2 pathname-coding-system)) ; (Assert-eq val1 val2) ; (let ((file-name-coding-system 'no-conversion-dos)) ; (Assert-eq file-name-coding-system 'no-conversion-dos) ; (Assert-eq pathname-coding-system file-name-coding-system)) ; (let ((pathname-coding-system 'no-conversion-mac)) ; (Assert-eq file-name-coding-system 'no-conversion-mac) ; (Assert-eq pathname-coding-system file-name-coding-system)) ; (Assert-eq file-name-coding-system pathname-coding-system) ; (Assert-eq val1 file-name-coding-system)) ; (Assert-eq pathname-coding-system file-name-coding-system)) ;(let ((mysym (make-symbol "test-symbol"))) ; (dontusethis-set-symbol-value-handler ; mysym ; 'make-local ; (lambda (&rest args) ; (throw 'test-tag args))) ; (Assert (equal (catch 'test-tag ; (set mysym 'foo)) ; `(,mysym (foo) make-local nil nil)))) ;; ---------------------------------------------------------------- ;; Symbol documentation ;; ---------------------------------------------------------------- ;; built-in variable documentation (Assert (string= (built-in-symbol-file 'internal-doc-file-name) "doc.c")) ;; built-in function documentation (Assert (string= (built-in-symbol-file 'built-in-symbol-file) "doc.c")) ;; built-in macro documentation (Assert (string= (built-in-symbol-file 'when) "eval.c")) ;; #### we should handle symbols defined in Lisp, dumped, autoloaded, ;; and required, too.