Mercurial > hg > xemacs-beta
view tests/automated/extent-tests.el @ 5013:ae48681c47fa
changes to VOID_TO_LISP et al.
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-02-08 Ben Wing <ben@xemacs.org>
* casetab.c (compute_canon_mapper):
* casetab.c (initialize_identity_mapper):
* casetab.c (compute_up_or_eqv_mapper):
* casetab.c (recompute_case_table):
* casetab.c (set_case_table):
* chartab.c (copy_mapper):
* chartab.c (copy_char_table_range):
* chartab.c (get_range_char_table_1):
* console.c (find_nonminibuffer_frame_not_on_console_predicate):
* console.c (find_nonminibuffer_frame_not_on_console):
* console.c (nuke_all_console_slots):
* device.c:
* device.c (find_nonminibuffer_frame_not_on_device_predicate):
* device.c (find_nonminibuffer_frame_not_on_device):
* dialog-msw.c (dialog_proc):
* dialog-msw.c (handle_question_dialog_box):
* dialog-x.c (maybe_run_dbox_text_callback):
* eval.c:
* eval.c (safe_run_hook_trapping_problems_1):
* eval.c (safe_run_hook_trapping_problems):
* event-msw.c:
* event-msw.c (mswindows_wnd_proc):
* event-msw.c (mswindows_find_frame):
* faces.c (update_face_inheritance_mapper):
* frame-msw.c (mswindows_init_frame_1):
* frame-msw.c (mswindows_get_mouse_position):
* frame-msw.c (mswindows_get_frame_parent):
* glade.c (connector):
* glade.c (Fglade_xml_signal_connect):
* glade.c (Fglade_xml_signal_autoconnect):
* glade.c (Fglade_xml_textdomain):
* glyphs-msw.c (mswindows_subwindow_instantiate):
* glyphs-msw.c (mswindows_widget_instantiate):
* glyphs.c (check_instance_cache_mapper):
* glyphs.c (check_window_subwindow_cache):
* glyphs.c (check_image_instance_structure):
* gui-x.c (snarf_widget_value_mapper):
* gui-x.c (popup_selection_callback):
* gui-x.c (button_item_to_widget_value):
* keymap.c (map_keymap_mapper):
* keymap.c (Fmap_keymap):
* menubar-gtk.c (__torn_off_sir):
* menubar-gtk.c (__activate_menu):
* menubar-gtk.c (menu_convert):
* menubar-gtk.c (__generic_button_callback):
* menubar-gtk.c (menu_descriptor_to_widget_1):
* menubar-msw.c:
* menubar-msw.c (EMPTY_ITEM_ID):
* menubar-x.c (menu_item_descriptor_to_widget_value_1):
* menubar-x.c (pre_activate_callback):
* menubar-x.c (command_builder_operate_menu_accelerator):
* menubar-x.c (command_builder_find_menu_accelerator):
* print.c (print_internal):
* process-unix.c (close_process_descs_mapfun):
* process.c (get_process_from_usid):
* process.c (init_process_io_handles):
* profile.c (sigprof_handler):
* profile.c (get_profiling_info_timing_maphash):
* profile.c (Fget_profiling_info):
* profile.c (set_profiling_info_timing_maphash):
* profile.c (mark_profiling_info_maphash):
* scrollbar-msw.c (mswindows_create_scrollbar_instance):
* scrollbar-msw.c (mswindows_free_scrollbar_instance):
* scrollbar-msw.c (mswindows_handle_scrollbar_event):
* specifier.c (recompute_cached_specifier_everywhere_mapfun):
* specifier.c (recompute_cached_specifier_everywhere):
* syntax.c (copy_to_mirrortab):
* syntax.c (copy_if_not_already_present):
* syntax.c (update_just_this_syntax_table):
* text.c (new_dfc_convert_now_damn_it):
* text.h (LISP_STRING_TO_EXTERNAL):
* tooltalk.c:
* tooltalk.c (tooltalk_message_callback):
* tooltalk.c (tooltalk_pattern_callback):
* tooltalk.c (Fcreate_tooltalk_message):
* tooltalk.c (Fcreate_tooltalk_pattern):
* ui-byhand.c (__generic_toolbar_callback):
* ui-byhand.c (generic_toolbar_insert_item):
* ui-byhand.c (__emacs_gtk_ctree_recurse_internal):
* ui-byhand.c (Fgtk_ctree_recurse):
* ui-gtk.c (__internal_callback_destroy):
* ui-gtk.c (__internal_callback_marshal):
* ui-gtk.c (Fgtk_signal_connect):
* ui-gtk.c (gtk_type_to_lisp):
* ui-gtk.c (lisp_to_gtk_type):
* ui-gtk.c (lisp_to_gtk_ret_type):
* lisp-disunion.h:
* lisp-disunion.h (NON_LVALUE):
* lisp-union.h:
* lisp.h (LISP_HASH):
Rename:
LISP_TO_VOID -> STORE_LISP_IN_VOID
VOID_TO_LISP -> GET_LISP_FROM_VOID
These new names are meant to clearly identify that the Lisp object
is the source and void the sink, and that they can't be used the
other way around -- they aren't exact opposites despite the old
names. The names are also important given the new functions
created just below. Also, clarify comments in lisp-union.h and
lisp-disunion.h about the use of the functions.
* lisp.h:
New functions STORE_VOID_IN_LISP and GET_VOID_FROM_LISP. These
are different from the above in that the source is a void *
(previously, you had to use make_opaque_ptr()).
* eval.c (restore_lisp_object):
* eval.c (record_unwind_protect_restoring_lisp_object):
* eval.c (struct restore_int):
* eval.c (restore_int):
* eval.c (record_unwind_protect_restoring_int):
* eval.c (free_pointer):
* eval.c (record_unwind_protect_freeing):
* eval.c (free_dynarr):
* eval.c (record_unwind_protect_freeing_dynarr):
* eval.c (unbind_to_1):
Use STORE_VOID_IN_LISP and GET_VOID_FROM_LISP to eliminate the
use of make_opaque_ptr() and mostly eliminate Lisp consing
entirely in the use of these various record_unwind_protect_*
functions as well as internal_bind_* (e.g. internal_bind_int).
* tests.c:
* tests.c (Ftest_store_void_in_lisp):
* tests.c (syms_of_tests):
* tests.c (vars_of_tests):
Add an C-assert-style test to test STORE_VOID_IN_LISP and
GET_VOID_FROM_LISP to make sure the same value comes back that
was put in.
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Mon, 08 Feb 2010 06:42:16 -0600 |
parents | 189fb67ca31a |
children | 0f66906b6e37 |
line wrap: on
line source
;; Copyright (C) 2001 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 extents 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)))) ;;----------------------------------------------------- ;; Creating and attaching. ;;----------------------------------------------------- (with-temp-buffer (let ((extent (make-extent nil nil)) (string "somecoolstring")) ;; Detached extent. (Assert (extent-detached-p extent)) ;; Put it in a buffer. (set-extent-endpoints extent 1 1 (current-buffer)) (Assert-eq (extent-object extent) (current-buffer)) ;; And then into another buffer. (with-temp-buffer (set-extent-endpoints extent 1 1 (current-buffer)) (Assert-eq (extent-object extent) (current-buffer))) ;; Now that the buffer doesn't exist, extent should be detached ;; again. (Assert (extent-detached-p extent)) ;; This line crashes XEmacs 21.2.46 and prior. (set-extent-endpoints extent 1 (length string) string) (Assert-eq (extent-object extent) string) ) (let ((extent (make-extent 1 1))) ;; By default, extent should be closed-open (Assert-eq (get extent 'start-closed) t) (Assert-eq (get extent 'start-open) nil) (Assert-eq (get extent 'end-open) t) (Assert-eq (get extent 'end-closed) nil) ;; Make it closed-closed. (set-extent-property extent 'end-closed t) (Assert-eq (get extent 'start-closed) t) (Assert-eq (get extent 'start-open) nil) (Assert-eq (get extent 'end-open) nil) (Assert-eq (get extent 'end-closed) t) ;; open-closed (set-extent-property extent 'start-open t) (Assert-eq (get extent 'start-closed) nil) (Assert-eq (get extent 'start-open) t) (Assert-eq (get extent 'end-open) nil) (Assert-eq (get extent 'end-closed) t) ;; open-open (set-extent-property extent 'end-open t) (Assert-eq (get extent 'start-closed) nil) (Assert-eq (get extent 'start-open) t) (Assert-eq (get extent 'end-open) t) (Assert-eq (get extent 'end-closed) nil)) ) ;;----------------------------------------------------- ;; Insertion behavior. ;;----------------------------------------------------- (defun et-range (extent) "List (START-POSITION END-POSITION) of EXTENT." (list (extent-start-position extent) (extent-end-position extent))) (defun et-insert-at (string position) "Insert STRING at POSITION in the current buffer." (save-excursion (goto-char position) (insert string))) ;; Test insertion at the beginning, middle, and end of the extent. ;; closed-open (with-temp-buffer (insert "###eee###") (let ((e (make-extent 4 7))) ;; current state: "###[eee)###" ;; 123 456 789 (Assert-equal (et-range e) '(4 7)) (et-insert-at "xxx" 4) ;; current state: "###[xxxeee)###" ;; 123 456789 012 (Assert-equal (et-range e) '(4 10)) (et-insert-at "yyy" 7) ;; current state: "###[xxxyyyeee)###" ;; 123 456789012 345 (Assert-equal (et-range e) '(4 13)) (et-insert-at "zzz" 13) ;; current state: "###[xxxyyyeee)zzz###" ;; 123 456789012 345678 (Assert-equal (et-range e) '(4 13)) )) ;; closed-closed (with-temp-buffer (insert "###eee###") (let ((e (make-extent 4 7))) (put e 'end-closed t) ;; current state: "###[eee]###" ;; 123 456 789 (Assert-equal (et-range e) '(4 7)) (et-insert-at "xxx" 4) ;; current state: "###[xxxeee]###" ;; 123 456789 012 (Assert-equal (et-range e) '(4 10)) (et-insert-at "yyy" 7) ;; current state: "###[xxxyyyeee]###" ;; 123 456789012 345 (Assert-equal (et-range e) '(4 13)) (et-insert-at "zzz" 13) ;; current state: "###[xxxyyyeeezzz]###" ;; 123 456789012345 678 (Assert-equal (et-range e) '(4 16)) )) ;; open-closed (with-temp-buffer (insert "###eee###") (let ((e (make-extent 4 7))) (put e 'start-open t) (put e 'end-closed t) ;; current state: "###(eee]###" ;; 123 456 789 (Assert-equal (et-range e) '(4 7)) (et-insert-at "xxx" 4) ;; current state: "###xxx(eee]###" ;; 123456 789 012 (Assert-equal (et-range e) '(7 10)) (et-insert-at "yyy" 8) ;; current state: "###xxx(eyyyee]###" ;; 123456 789012 345 (Assert-equal (et-range e) '(7 13)) (et-insert-at "zzz" 13) ;; current state: "###xxx(eyyyeezzz]###" ;; 123456 789012345 678 (Assert-equal (et-range e) '(7 16)) )) ;; open-open (with-temp-buffer (insert "###eee###") (let ((e (make-extent 4 7))) (put e 'start-open t) ;; current state: "###(eee)###" ;; 123 456 789 (Assert-equal (et-range e) '(4 7)) (et-insert-at "xxx" 4) ;; current state: "###xxx(eee)###" ;; 123456 789 012 (Assert-equal (et-range e) '(7 10)) (et-insert-at "yyy" 8) ;; current state: "###xxx(eyyyee)###" ;; 123456 789012 345 (Assert-equal (et-range e) '(7 13)) (et-insert-at "zzz" 13) ;; current state: "###xxx(eyyyee)zzz###" ;; 123456 789012 345678 (Assert-equal (et-range e) '(7 13)) )) ;;----------------------------------------------------- ;; Deletion behavior. ;;----------------------------------------------------- (dolist (props '((start-closed t end-open t) (start-closed t end-open nil) (start-closed nil end-open nil) (start-closed nil end-open t))) ;; Deletion needs to behave the same regardless of the open-ness of ;; the boundaries. (with-temp-buffer (insert "xxxxxxxxxx") (let ((e (make-extent 3 9))) (set-extent-properties e props) ;; current state: xx[xxxxxx]xx ;; 12 345678 90 (Assert-equal (et-range e) '(3 9)) (delete-region 1 2) ;; current state: x[xxxxxx]xx ;; 1 234567 89 (Assert-equal (et-range e) '(2 8)) (delete-region 2 4) ;; current state: x[xxxx]xx ;; 1 2345 67 (Assert-equal (et-range e) '(2 6)) (delete-region 1 3) ;; current state: [xxx]xx ;; 123 45 (Assert-equal (et-range e) '(1 4)) (delete-region 3 5) ;; current state: [xx]x ;; 12 3 (Assert-equal (et-range e) '(1 3)) ))) ;;; #### Should have a test for read-only-ness and insertion and ;;; deletion! ;;----------------------------------------------------- ;; `detachable' property ;;----------------------------------------------------- (dolist (props '((start-closed t end-open t) (start-closed t end-open nil) (start-closed nil end-open nil) (start-closed nil end-open t))) ;; `detachable' shouldn't relate to region properties, hence the ;; loop. (with-temp-buffer (insert "###eee###") (let ((e (make-extent 4 7))) (set-extent-properties e props) (Assert (get e 'detachable)) (Assert (not (extent-detached-p e))) (delete-region 4 5) ;; ###ee### (not detached yet) (Assert (not (extent-detached-p e))) (delete-region 4 6) ;; ###### (should be detached now) (Assert (extent-detached-p e)))) (with-temp-buffer (insert "###eee###") (let ((e (make-extent 4 7))) (set-extent-properties e props) (put e 'detachable nil) (Assert (not (get e 'detachable))) (Assert (not (extent-detached-p e))) (delete-region 4 5) ;; ###ee### (Assert (not (extent-detached-p e))) (delete-region 4 6) ;; ###[]### (Assert (not (extent-detached-p e))) (Assert-equal (et-range e) '(4 4)) )) ) ;;----------------------------------------------------- ;; Zero-length extents. ;;----------------------------------------------------- ;; closed-open (should stay put) (with-temp-buffer (insert "######") (let ((e (make-extent 4 4))) (et-insert-at "foo" 4) (Assert-equal (et-range e) '(4 4)))) ;; open-closed (should move) (with-temp-buffer (insert "######") (let ((e (make-extent 4 4))) (put e 'start-open t) (put e 'end-closed t) (et-insert-at "foo" 4) (Assert-equal (et-range e) '(7 7)))) ;; closed-closed (should extend) (with-temp-buffer (insert "######") (let ((e (make-extent 4 4))) (put e 'end-closed t) (et-insert-at "foo" 4) (Assert-equal (et-range e) '(4 7)))) ;; open-open (illegal; forced to behave like closed-open) (with-temp-buffer (insert "######") (let ((e (make-extent 4 4))) (put e 'start-open t) (et-insert-at "foo" 4) (Assert-equal (et-range e) '(4 4))))