Mercurial > hg > xemacs-beta
view tests/automated/byte-compiler-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: Martin Buchholz <martin@xemacs.org> ;; Maintainer: Martin Buchholz <martin@xemacs.org> ;; Created: 1998 ;; 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 byte-compiler functionality ;;; 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)))) (require 'bytecomp) ;; test constant symbol warnings (defmacro check-byte-compiler-message (message-regexp &rest body) `(Check-Message ,message-regexp (byte-compile '(lambda () ,@body)))) (check-byte-compiler-message "Attempt to set non-symbol" (setq 1 1)) (check-byte-compiler-message "Attempt to set constant symbol" (setq t 1)) (check-byte-compiler-message "Attempt to set constant symbol" (setq nil 1)) (check-byte-compiler-message "^$" (defconst :foo 1)) (check-byte-compiler-message "Attempt to let-bind non-symbol" (let ((1 'x)) 1)) (check-byte-compiler-message "Attempt to let-bind constant symbol" (let ((t 'x)) (foo))) (check-byte-compiler-message "Attempt to let-bind constant symbol" (let ((nil 'x)) (foo))) (check-byte-compiler-message "Attempt to let-bind constant symbol" (let ((:foo 'x)) (foo))) (check-byte-compiler-message "bound but not referenced" (let ((foo 'x)) 1)) (Assert (not (boundp 'free-variable))) (Assert (boundp 'byte-compile-warnings)) (check-byte-compiler-message "assignment to free variable" (setq free-variable 1)) (check-byte-compiler-message "reference to free variable" (car free-variable)) (check-byte-compiler-message "called with 2 args, but requires 1" (car 'x 'y)) (check-byte-compiler-message "^$" (setq :foo 1)) (let ((fun '(lambda () (setq :foo 1)))) (fset 'test-byte-compiler-fun fun)) (Check-Error setting-constant (test-byte-compiler-fun)) (byte-compile 'test-byte-compiler-fun) (Check-Error setting-constant (test-byte-compiler-fun)) (eval-when-compile (defvar setq-test-foo nil) (defvar setq-test-bar nil)) (progn (check-byte-compiler-message "set called with 1 arg, but requires 2" (setq setq-test-foo)) (check-byte-compiler-message "set called with 1 arg, but requires 2" (setq setq-test-foo 1 setq-test-bar)) (check-byte-compiler-message "set-default called with 1 arg, but requires 2" (setq-default setq-test-foo)) (check-byte-compiler-message "set-default called with 1 arg, but requires 2" (setq-default setq-test-foo 1 setq-test-bar)) ) ;;----------------------------------------------------- ;; let, let* ;;----------------------------------------------------- ;; Test interpreted and compiled lisp separately here (check-byte-compiler-message "malformed let binding" (let ((x 1 2)) 3)) (check-byte-compiler-message "malformed let binding" (let* ((x 1 2)) 3)) (Check-Error-Message error "`let' bindings can have only one value-form" (eval '(let ((x 1 2)) 3))) (Check-Error-Message error "`let' bindings can have only one value-form" (eval '(let* ((x 1 2)) 3))) (defmacro before-and-after-compile-equal (&rest form) `(Assert-equal (funcall (quote (lambda () ,@form))) (funcall (byte-compile (quote (lambda () ,@form)))))) (defvar simplyamarker (point-min-marker)) ;; The byte optimizer must be careful with +/- with a single argument. (before-and-after-compile-equal (+)) (before-and-after-compile-equal (+ 2 2)) (before-and-after-compile-equal (+ 2 1)) (before-and-after-compile-equal (+ 1 2)) ;; (+ 1) is OK. but (+1) signals an error. (before-and-after-compile-equal (+ 1)) (before-and-after-compile-equal (+ 3)) (before-and-after-compile-equal (+ simplyamarker 1)) ;; The optimization (+ m) --> m is invalid when m is a marker. ;; Currently the following test fails - controversial. ;; (before-and-after-compile-equal (+ simplyamarker)) ;; Same tests for minus. (before-and-after-compile-equal (- 2 2)) (before-and-after-compile-equal (- 2 1)) (before-and-after-compile-equal (- 1 2)) (before-and-after-compile-equal (- 1)) (before-and-after-compile-equal (- 3)) (before-and-after-compile-equal (- simplyamarker 1)) (before-and-after-compile-equal (- simplyamarker)) (before-and-after-compile-equal (let ((z 1)) (or (setq z 42)) z)) ;; byte-after-unbind-ops ;; byte-constant ;; byte-dup ;; byte-symbolp (before-and-after-compile-equal (let ((x 's)) (unwind-protect (symbolp x) (setq x 1)))) ;; byte-consp (before-and-after-compile-equal (let ((x '(a b))) (unwind-protect (consp x) (setq x 1)))) ;; byte-stringp (before-and-after-compile-equal (let ((x "a")) (unwind-protect (stringp x) (setq x 1)))) ;; byte-listp (before-and-after-compile-equal (let ((x '(a b c))) (unwind-protect (listp x) (setq x 1)))) ;; byte-numberp (before-and-after-compile-equal (let ((x 1)) (unwind-protect (numberp x) (setq x nil)))) ;; byte-integerp (before-and-after-compile-equal (let ((x 1)) (unwind-protect (integerp x) (setq x nil)))) ;; byte-equal (before-and-after-compile-equal (let ((x 'a) (y 'a)) (unwind-protect (eq x y) (setq x 'c)))) ;; byte-not (before-and-after-compile-equal (let (x) (unwind-protect (not x) (setq x t)))) ;; byte-cons (before-and-after-compile-equal (equal '(1 . 2) (let ((x 1) (y 2)) (unwind-protect (cons x y) (setq x t))))) ;; byte-list1 (before-and-after-compile-equal (equal '(1) (let ((x 1)) (unwind-protect (list x) (setq x t))))) ;; byte-list2 (before-and-after-compile-equal (equal '(1 . 2) (let ((x 1) (y 2)) (unwind-protect (list x y) (setq x t))))) ;; byte-interactive-p ;; byte-equal (before-and-after-compile-equal (let (x y) (setq x '(1 . 2)) (setq y '(1 . 2)) (unwind-protect (equal x y) (setq y '(1 . 3)))))