Mercurial > hg > xemacs-beta
view tests/glyph-test.el @ 5191:71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
tests/ChangeLog addition:
2010-04-05 Aidan Kehoe <kehoea@parhasard.net>
* automated/hash-table-tests.el:
Test the new built-in #'equalp hash table test. Test
#'define-hash-table-test.
* automated/lisp-tests.el:
When asserting that two objects are #'equalp, also assert that
their #'equalp-hash is identical.
man/ChangeLog addition:
2010-04-03 Aidan Kehoe <kehoea@parhasard.net>
* lispref/hash-tables.texi (Introduction to Hash Tables):
Document that we now support #'equalp as a hash table test by
default, and mention #'define-hash-table-test.
(Working With Hash Tables): Document #'define-hash-table-test.
src/ChangeLog addition:
2010-04-05 Aidan Kehoe <kehoea@parhasard.net>
* elhash.h:
* elhash.c (struct Hash_Table_Test, lisp_object_eql_equal)
(lisp_object_eql_hash, lisp_object_equal_equal)
(lisp_object_equal_hash, lisp_object_equalp_hash)
(lisp_object_equalp_equal, lisp_object_general_hash)
(lisp_object_general_equal, Feq_hash, Feql_hash, Fequal_hash)
(Fequalp_hash, define_hash_table_test, Fdefine_hash_table_test)
(init_elhash_once_early, mark_hash_table_tests, string_equalp_hash):
* glyphs.c (vars_of_glyphs):
Add a new hash table test in C, #'equalp.
Make it possible to specify new hash table tests with functions
define_hash_table_test, #'define-hash-table-test.
Use define_hash_table_test() in glyphs.c.
Expose the hash functions (besides that used for #'equal) to Lisp,
for people writing functions to be used with #'define-hash-table-test.
Call define_hash_table_test() very early in temacs, to create the
built-in hash table tests.
* ui-gtk.c (emacs_gtk_boxed_hash):
* specifier.h (struct specifier_methods):
* specifier.c (specifier_hash):
* rangetab.c (range_table_entry_hash, range_table_hash):
* number.c (bignum_hash, ratio_hash, bigfloat_hash):
* marker.c (marker_hash):
* lrecord.h (struct lrecord_implementation):
* keymap.c (keymap_hash):
* gui.c (gui_item_id_hash, gui_item_hash):
* glyphs.c (image_instance_hash, glyph_hash):
* glyphs-x.c (x_image_instance_hash):
* glyphs-msw.c (mswindows_image_instance_hash):
* glyphs-gtk.c (gtk_image_instance_hash):
* frame-msw.c (mswindows_set_title_from_ibyte):
* fontcolor.c (color_instance_hash, font_instance_hash):
* fontcolor-x.c (x_color_instance_hash):
* fontcolor-tty.c (tty_color_instance_hash):
* fontcolor-msw.c (mswindows_color_instance_hash):
* fontcolor-gtk.c (gtk_color_instance_hash):
* fns.c (bit_vector_hash):
* floatfns.c (float_hash):
* faces.c (face_hash):
* extents.c (extent_hash):
* events.c (event_hash):
* data.c (weak_list_hash, weak_box_hash):
* chartab.c (char_table_entry_hash, char_table_hash):
* bytecode.c (compiled_function_hash):
* alloc.c (vector_hash):
Change the various object hash methods to take a new EQUALP
parameter, hashing appropriately for #'equalp if it is true.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Mon, 05 Apr 2010 13:03:35 +0100 |
parents | 8a653fbe5c27 |
children | 308d34e9f07d |
line wrap: on
line source
;;; Copyright (C) 1998 Andy Piper ;;; 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., 51 Franklin Street, Fifth Floor, ;;; Boston, MA 02110-1301, USA. (set-extent-begin-glyph (make-extent (point) (point)) (setq im (make-glyph [xbm :file "xemacsicon.xbm"]))) (set-extent-begin-glyph (make-extent (point) (point)) (make-glyph [string :data "xemacs"])) (defun foo () (interactive) (setq ok-select (not ok-select))) (defun fee () (interactive) (message "hello")) ;; button in a group (setq ok-select nil) (set-extent-begin-glyph (make-extent (point) (point)) (make-glyph (setq radio-button1 [button :face widget :descriptor ["ok1" (setq ok-select t) :style radio :selected ok-select]]))) ;; button in a group (set-extent-begin-glyph (make-extent (point) (point)) (make-glyph (setq radio-button2 [button :descriptor ["ok2" (setq ok-select nil) :style radio :selected (not ok-select)]]))) ;; toggle button (set-extent-begin-glyph (make-extent (point) (point)) (setq tbutton (make-glyph [button :descriptor ["ok3" (setq ok-select nil) :style toggle :selected (not ok-select)]]))) (set-extent-begin-glyph (make-extent (point) (point)) (make-glyph (setq toggle-button [button :descriptor ["ok4" :style toggle :callback (setq ok-select (not ok-select)) :selected ok-select]]))) ;; normal pushbutton (set-extent-begin-glyph (make-extent (point) (point)) (setq push-button (make-glyph [button :width 10 :height 2 :face modeline-mousable :descriptor "ok" :callback foo :selected t]))) ;; tree view (set-extent-begin-glyph (make-extent (point) (point)) (setq tree (make-glyph [tree-view :width 10 :descriptor "My Tree" :items (["One" foo] (["Two" foo] ["Four" foo] "Six") "Three")]))) ;; tab control (set-extent-begin-glyph (make-extent (point) (point)) (setq tab (make-glyph [tab-control :descriptor "My Tab" :face highlight :orientation right :items (["One" foo :selected t] ["Two" fee :selected nil] ["Three" foo :selected nil])]))) ;; progress gauge (set-extent-begin-glyph (make-extent (point) (point)) (setq pgauge (make-glyph [progress-gauge :width 10 :height 2 :value 0 :descriptor "ok"]))) ;; progress the progress ... (let ((x 0)) (while (<= x 100) (set-glyph-image pgauge `[progress-gauge :width 10 :height 2 :descriptor "ok" :value ,x]) (setq x (+ x 5)) (sit-for 0.1))) ;; progress gauge in the modeline (setq global-mode-string (cons (make-extent nil nil) (setq pg (make-glyph [progress-gauge :width 5 :pixel-height 16 :descriptor "ok"])))) ;; progress the progress ... (let ((x 0)) (while (<= x 100) (set-glyph-image pg `[progress-gauge :width 5 :pixel-height 16 :descriptor "ok" :value ,x]) (setq x (+ x 5)) (redisplay-frame) (sit-for 0.1))) (set-extent-begin-glyph (make-extent (point) (point)) (make-glyph [button :face modeline-mousable :descriptor "ok" :callback foo :image [xpm :file "../etc/xemacs-icon.xpm"]])) ;; normal pushbutton (set-extent-begin-glyph (make-extent (point) (point)) (setq pbutton (make-glyph [button :descriptor ["A Big Button" foo ]]))) ;; edit box (set-extent-begin-glyph (make-extent (point) (point)) (make-glyph (setq edit-field [edit-field :pixel-width 50 :pixel-height 30 :face bold-italic :descriptor ["Hello"]]))) ;; combo box (set-extent-begin-glyph (make-extent (point) (point)) (make-glyph (setq combo-box [combo-box :width 10 :descriptor ["Hello"] :items ("One" "Two" "Three")]))) ;; label (set-extent-begin-glyph (make-extent (point) (point)) (make-glyph (setq label [label :pixel-width 150 :descriptor "Hello"]))) ;; string (set-extent-begin-glyph (make-extent (point) (point)) (make-glyph (setq str [string :data "Hello There"]))) ;; scrollbar ;(set-extent-begin-glyph ; (make-extent (point) (point)) ; (make-glyph [scrollbar :width 50 :height 20 :descriptor ["Hello"]])) ;; generic subwindow (setq sw (make-glyph [subwindow :pixel-width 50 :pixel-height 70])) (set-extent-begin-glyph (make-extent (point) (point)) sw) ;; layout (setq layout (make-glyph `[layout :descriptor "The Layout" :orientation vertical :justify left :border [string :data "Hello There Mrs"] :items ([layout :orientation horizontal :items (,radio-button1 ,radio-button2)] ,edit-field ,toggle-button ,label ,str)])) ;(set-glyph-face layout 'gui-element) (set-extent-begin-glyph (make-extent (point) (point)) layout) ;; another test layout (set-extent-begin-glyph (make-extent (point) (point)) (setq layout-2 (make-glyph `[layout :descriptor "The Layout" :orientation vertical :items ([progress-gauge :value 0 :width 10 :height 2 :descriptor "ok"])]))) (set-glyph-image layout-2 `[layout :descriptor "The Layout" :orientation vertical :items ([progress-gauge :value 4 :width 10 :height 2 :descriptor "ok"])]) (setq test-toggle-widget nil) (defun test-toggle (widget) (set-extent-begin-glyph (make-extent (point) (point)) (make-glyph (vector 'button :descriptor "ok" :style 'toggle :selected `(funcall test-toggle-value ,widget) :callback `(funcall test-toggle-action ,widget))))) (defun test-toggle-action (widget &optional event) (if widget (message "Widget is t") (message "Widget is nil"))) (defun test-toggle-value (widget) (setq widget (not widget)) (not widget))