Mercurial > hg > xemacs-beta
view tests/automated/weak-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) 1998 Free Software Foundation, Inc. ;; Author: Mike Sperber <mike@xemacs.org> ;; Maintainer: Mike Sperber <mike@xemacs.org> ;; Created: 2002 ;; Keywords: tests, database ;; 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 implementation of weak boxes, ephemerons, and weak lists ;;; See test-harness.el (condition-case err (require 'test-harness) (file-error (when (and (boundp 'load-file-name) (stringp load-file-name)) (push (file-name-directory load-file-name) load-path) (require 'test-harness)))) (garbage-collect) ;; tests for weak-boxes (let ((w (make-weak-box (cons 2 3)))) (Assert-equal (cons 2 3) (weak-box-ref w)) (garbage-collect) (Assert (not (weak-box-ref w)))) (garbage-collect) ;; tests for ephemerons (let* ((p (cons 3 4)) (finalized-p nil) (eph1 (make-ephemeron (cons 1 2) p #'(lambda (value) (setq finalized-p t)))) (eph2 (make-ephemeron p p))) (Assert-eq p (ephemeron-ref (make-ephemeron (cons 1 2) p))) (Assert (ephemeron-p (make-ephemeron (cons 1 2) p))) (garbage-collect) (garbage-collect) ; ensure the post-gc hook runs (Assert finalized-p) (Assert (not (ephemeron-ref eph1))) (garbage-collect) (Assert-eq p (ephemeron-ref eph2))) (garbage-collect) ;; tests for simple weak-lists (let* ((a (cons 23 42)) (b (cons 42 65)) (testlist (list a b)) (weaklist1 (make-weak-list 'simple)) (weaklist2 (make-weak-list 'simple)) (weaklist3 (make-weak-list 'simple)) (weaklist4 (make-weak-list 'simple))) (set-weak-list-list weaklist1 testlist) (set-weak-list-list weaklist2 (list (cons 1 2) a b)) (set-weak-list-list weaklist3 (list a (cons 1 2) b)) (set-weak-list-list weaklist4 (list a b (cons 1 2))) (Assert (weak-list-p weaklist1)) (Assert-eq (weak-list-type weaklist1) 'simple) (Assert (weak-list-p weaklist2)) (Assert-eq (weak-list-type weaklist2) 'simple) (Assert (weak-list-p weaklist3)) (Assert-eq (weak-list-type weaklist3) 'simple) (Assert (weak-list-p weaklist4)) (Assert-eq (weak-list-type weaklist4) 'simple) (garbage-collect) (Assert-eq (weak-list-list weaklist1) testlist) (Assert-equal (weak-list-list weaklist2) testlist) (Assert-equal (weak-list-list weaklist3) testlist) (Assert-equal (weak-list-list weaklist4) testlist)) (garbage-collect) ;; tests for assoc weak-lists (let* ((a (cons 23 42)) (b (cons a a)) (testlist (list b b)) (weaklist1 (make-weak-list 'assoc)) (weaklist2 (make-weak-list 'assoc)) (weaklist3 (make-weak-list 'assoc)) (weaklist4 (make-weak-list 'assoc))) (set-weak-list-list weaklist1 testlist) (set-weak-list-list weaklist2 (list b (cons (cons 1 2) a) b)) (set-weak-list-list weaklist3 (list b (cons a (cons 1 2)) b)) (set-weak-list-list weaklist4 (list b (cons (cons 1 2) (cons 3 4)) b)) (Assert (weak-list-p weaklist1)) (Assert-eq (weak-list-type weaklist1) 'assoc) (Assert (weak-list-p weaklist2)) (Assert-eq (weak-list-type weaklist2) 'assoc) (Assert (weak-list-p weaklist3)) (Assert-eq (weak-list-type weaklist3) 'assoc) (Assert (weak-list-p weaklist4)) (Assert-eq (weak-list-type weaklist4) 'assoc) (garbage-collect) (Assert-eq (weak-list-list weaklist1) testlist) (Assert-equal (weak-list-list weaklist2) testlist) (Assert-equal (weak-list-list weaklist3) testlist) (Assert-equal (weak-list-list weaklist4) testlist)) (garbage-collect) ;; tests for key-assoc weak-lists (let* ((a (cons 23 42)) (b (cons a a)) (testlist (list b b)) (weaklist1 (make-weak-list 'key-assoc)) (weaklist2 (make-weak-list 'key-assoc)) (weaklist3 (make-weak-list 'key-assoc)) (weaklist4 (make-weak-list 'key-assoc))) (set-weak-list-list weaklist1 testlist) (set-weak-list-list weaklist2 (list b (cons (cons 1 2) a) b)) (set-weak-list-list weaklist3 (list b (cons a (cons 1 2)) b)) (set-weak-list-list weaklist4 (list b (cons (cons 1 2) (cons 3 4)) b)) (Assert (weak-list-p weaklist1)) (Assert-eq (weak-list-type weaklist1) 'key-assoc) (Assert (weak-list-p weaklist2)) (Assert-eq (weak-list-type weaklist2) 'key-assoc) (Assert (weak-list-p weaklist3)) (Assert-eq (weak-list-type weaklist3) 'key-assoc) (Assert (weak-list-p weaklist4)) (Assert-eq (weak-list-type weaklist4) 'key-assoc) (garbage-collect) (Assert-eq (weak-list-list weaklist1) testlist) (Assert-equal (weak-list-list weaklist2) testlist) (Assert-equal (weak-list-list weaklist3) (list b (cons a (cons 1 2)) b)) (Assert-equal (weak-list-list weaklist4) testlist)) (garbage-collect) ;; tests for value-assoc weak-lists (let* ((a (cons 23 42)) (b (cons a a)) (testlist (list b b)) (weaklist1 (make-weak-list 'value-assoc)) (weaklist2 (make-weak-list 'value-assoc)) (weaklist3 (make-weak-list 'value-assoc)) (weaklist4 (make-weak-list 'value-assoc))) (set-weak-list-list weaklist1 testlist) (set-weak-list-list weaklist2 (list b (cons (cons 1 2) a) b)) (set-weak-list-list weaklist3 (list b (cons a (cons 1 2)) b)) (set-weak-list-list weaklist4 (list b (cons (cons 1 2) (cons 3 4)) b)) (Assert (weak-list-p weaklist1)) (Assert-eq (weak-list-type weaklist1) 'value-assoc) (Assert (weak-list-p weaklist2)) (Assert-eq (weak-list-type weaklist2) 'value-assoc) (Assert (weak-list-p weaklist3)) (Assert-eq (weak-list-type weaklist3) 'value-assoc) (Assert (weak-list-p weaklist4)) (Assert-eq (weak-list-type weaklist4) 'value-assoc) (garbage-collect) (Assert-eq (weak-list-list weaklist1) testlist) (Assert-equal (weak-list-list weaklist2) (list b (cons (cons 1 2) a) b)) (Assert-equal (weak-list-list weaklist3) testlist) (Assert-equal (weak-list-list weaklist4) testlist)) (garbage-collect) ;; tests for full-assoc weak-lists (let* ((a (cons 23 42)) (b (cons a a)) (testlist (list b b)) (weaklist1 (make-weak-list 'full-assoc)) (weaklist2 (make-weak-list 'full-assoc)) (weaklist3 (make-weak-list 'full-assoc)) (weaklist4 (make-weak-list 'full-assoc))) (set-weak-list-list weaklist1 testlist) (set-weak-list-list weaklist2 (list b (cons (cons 1 2) a) b)) (set-weak-list-list weaklist3 (list b (cons a (cons 1 2)) b)) (set-weak-list-list weaklist4 (list b (cons (cons 1 2) (cons 3 4)) b)) (Assert (weak-list-p weaklist1)) (Assert-eq (weak-list-type weaklist1) 'full-assoc) (Assert (weak-list-p weaklist2)) (Assert-eq (weak-list-type weaklist2) 'full-assoc) (Assert (weak-list-p weaklist3)) (Assert-eq (weak-list-type weaklist3) 'full-assoc) (Assert (weak-list-p weaklist4)) (Assert-eq (weak-list-type weaklist4) 'full-assoc) (garbage-collect) (Assert-eq (weak-list-list weaklist1) testlist) (Assert-equal (weak-list-list weaklist2) (list b (cons (cons 1 2) a) b)) (Assert-equal (weak-list-list weaklist3) (list b (cons a (cons 1 2)) b)) (Assert-equal (weak-list-list weaklist4) testlist)) (garbage-collect) ;; test the intended functionality of the fixpoint iteration used for marking ;; weak data structures like the ephermerons. Basically this tests gc_internals ;; to work properly but it also ensures the ephemerons behave according to the ;; specification (let* ((inner_cons (cons 1 2)) (weak1 (make-ephemeron inner_cons (make-ephemeron inner_cons (cons 1 2) '(lambda (v) t)) #'(lambda (v) t)))) (Assert (ephemeron-ref (ephemeron-ref weak1))) (garbage-collect) ;; assure the inner ephis are still there (Assert (ephemeron-ref (ephemeron-ref weak1))) ;; delete the key reference and force cleaning up the garbage (setq inner_cons (cons 3 4)) (garbage-collect) (Assert (not (ephemeron-ref weak1))) ) (garbage-collect)