annotate tests/automated/region-tests.el @ 4967:0d4c9d0f6a8d

rewrite dynarr code -------------------- ChangeLog entries follow: -------------------- src/ChangeLog addition: 2010-02-03 Ben Wing <ben@xemacs.org> * device-x.c (x_get_resource_prefix): * device-x.c (Fx_get_resource): * device-x.c (Fx_get_resource_prefix): * device-x.c (Fx_put_resource): * dialog-msw.c: * dialog-msw.c (handle_question_dialog_box): * dired-msw.c (mswindows_sort_files): * dired-msw.c (mswindows_get_files): * extents.c (extent_fragment_sort_by_priority): * extents.c (Fset_extent_parent): * file-coding.c (coding_reader): * file-coding.c (coding_writer): * file-coding.c (gzip_convert): * frame.c (generate_title_string): * gutter.c (calculate_gutter_size_from_display_lines): * indent.c (vmotion_1): * lread.c (read_bit_vector): * mule-coding.c (iso2022_decode): * rangetab.c: * rangetab.c (Fcopy_range_table): * rangetab.c (Fget_range_table): * rangetab.c (unified_range_table_copy_data): * redisplay-msw.c (mswindows_output_string): * redisplay-output.c (output_display_line): * redisplay-output.c (redisplay_move_cursor): * redisplay-output.c (redisplay_clear_bottom_of_window): * redisplay-tty.c (tty_output_ichar_dynarr): * redisplay-tty.c (set_foreground_to): * redisplay-tty.c (set_background_to): * redisplay-xlike-inc.c (XLIKE_output_string): * redisplay.c (redisplay_window_text_width_string): * redisplay.c (redisplay_text_width_string): * redisplay.c (create_text_block): * redisplay.c (SET_CURRENT_MODE_CHARS_PIXSIZE): * redisplay.c (generate_fstring_runes): * redisplay.c (regenerate_modeline): * redisplay.c (ensure_modeline_generated): * redisplay.c (real_current_modeline_height): * redisplay.c (create_string_text_block): * redisplay.c (regenerate_window): * redisplay.c (REGEN_INC_FIND_START_END): * redisplay.c (point_visible): * redisplay.c (redisplay_window): * redisplay.c (mark_glyph_block_dynarr): * redisplay.c (line_start_cache_start): * redisplay.c (start_with_line_at_pixpos): * redisplay.c (update_line_start_cache): * redisplay.c (glyph_to_pixel_translation): * redisplay.c (pixel_to_glyph_translation): * sysdep.c (qxe_readdir): * text.c (dfc_convert_to_external_format): * text.c (dfc_convert_to_internal_format): * toolbar-common.c (common_output_toolbar_button): * window.c (window_modeline_height): * window.c (Fwindow_last_line_visible_height): * window.c (window_displayed_height): * window.c (window_scroll): * window.c (get_current_pixel_pos): Use Dynarr_begin() in place of Dynarr_atp (foo, 0). * dynarr.c (Dynarr_realloc): * dynarr.c (Dynarr_lisp_realloc): * dynarr.c (Dynarr_resize): * dynarr.c (Dynarr_insert_many): * dynarr.c (Dynarr_delete_many): * dynarr.c (Dynarr_memory_usage): * dynarr.c (stack_like_malloc): * dynarr.c (stack_like_free): * lisp.h: * lisp.h (DECLARE_DYNARR_LISP_IMP): * lisp.h (XD_DYNARR_DESC): * lisp.h (Dynarr_pop): * gutter.c (output_gutter): * redisplay-output.c (sync_rune_structs): * redisplay-output.c (redisplay_output_window): Redo the dynarr code, add greater checks. Rename the `len', `largest' and `max' members to `len_', `largest_' and `max_' to try and catch existing places that might directly modify these values. Make new accessors Dynarr_largest() and Dynarr_max() and make them and existing Dynarr_length() be non-lvalues by adding '+ 0' to them; fix a couple of places in the redisplay code that tried to modify the length directly by setting Dynarr_length(). Use the accessors whenever possible even in the dynarr code itself. The accessors also verify that 0 <= len <= largest <= max. Rename settor function Dynarr_set_size() to Dynarr_set_length() and use it more consistently; also create lower-level Dynarr_set_length_1(). This latter function should be the only function that directly modifies the `len_' member of a Dynarr, and in the process makes sure that the `largest' value is kept correct. Consistently use ERROR_CHECK_STRUCTURES instead of ERROR_CHECK_TYPES for error-checking code. Reintroduce the temporarily disabled verification code on the positions of Dynarr_at(), Dynarr_atp() and Dynarr_atp_past_end(). Also create Dynarr_resize_if() in place of a repeated code fragment. Clean up all the functions that modify Dynarrs to use the new macros and functions and verify the correctness of the Dynarr both before and after the change. Note that there are two kinds of verification -- one for accessing and one for modifying. The difference is that the modify verification additionally checks to make sure that the Dynarr isn't locked. (This is used in redisplay to check for problems with reentrancy.) * lrecord.h: Move XD_DYNARR_DESC to lisp.h, grouping with the dynarr code.
author Ben Wing <ben@xemacs.org>
date Wed, 03 Feb 2010 20:51:18 -0600
parents 189fb67ca31a
children 0f66906b6e37
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2614
29555dfb1592 [xemacs-hg @ 2005-02-24 23:02:32 by adrian]
adrian
parents:
diff changeset
1 ;; Copyright (C) 2005 Adrian Aichner
29555dfb1592 [xemacs-hg @ 2005-02-24 23:02:32 by adrian]
adrian
parents:
diff changeset
2
29555dfb1592 [xemacs-hg @ 2005-02-24 23:02:32 by adrian]
adrian
parents:
diff changeset
3 ;; Author: Adrian Aichner <adrian@xemacs.org>
29555dfb1592 [xemacs-hg @ 2005-02-24 23:02:32 by adrian]
adrian
parents:
diff changeset
4 ;; Maintainer: XEmacs Beta List <xemacs-beta@xemacs.org>
29555dfb1592 [xemacs-hg @ 2005-02-24 23:02:32 by adrian]
adrian
parents:
diff changeset
5 ;; Created: 2005
29555dfb1592 [xemacs-hg @ 2005-02-24 23:02:32 by adrian]
adrian
parents:
diff changeset
6 ;; Keywords: tests
29555dfb1592 [xemacs-hg @ 2005-02-24 23:02:32 by adrian]
adrian
parents:
diff changeset
7
29555dfb1592 [xemacs-hg @ 2005-02-24 23:02:32 by adrian]
adrian
parents:
diff changeset
8 ;; This file is part of XEmacs.
29555dfb1592 [xemacs-hg @ 2005-02-24 23:02:32 by adrian]
adrian
parents:
diff changeset
9
29555dfb1592 [xemacs-hg @ 2005-02-24 23:02:32 by adrian]
adrian
parents:
diff changeset
10 ;; XEmacs is free software; you can redistribute it and/or modify it
29555dfb1592 [xemacs-hg @ 2005-02-24 23:02:32 by adrian]
adrian
parents:
diff changeset
11 ;; under the terms of the GNU General Public License as published by
29555dfb1592 [xemacs-hg @ 2005-02-24 23:02:32 by adrian]
adrian
parents:
diff changeset
12 ;; the Free Software Foundation; either version 2, or (at your option)
29555dfb1592 [xemacs-hg @ 2005-02-24 23:02:32 by adrian]
adrian
parents:
diff changeset
13 ;; any later version.
29555dfb1592 [xemacs-hg @ 2005-02-24 23:02:32 by adrian]
adrian
parents:
diff changeset
14
29555dfb1592 [xemacs-hg @ 2005-02-24 23:02:32 by adrian]
adrian
parents:
diff changeset
15 ;; XEmacs is distributed in the hope that it will be useful, but
29555dfb1592 [xemacs-hg @ 2005-02-24 23:02:32 by adrian]
adrian
parents:
diff changeset
16 ;; WITHOUT ANY WARRANTY; without even the implied warranty of
29555dfb1592 [xemacs-hg @ 2005-02-24 23:02:32 by adrian]
adrian
parents:
diff changeset
17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
29555dfb1592 [xemacs-hg @ 2005-02-24 23:02:32 by adrian]
adrian
parents:
diff changeset
18 ;; General Public License for more details.
29555dfb1592 [xemacs-hg @ 2005-02-24 23:02:32 by adrian]
adrian
parents:
diff changeset
19
29555dfb1592 [xemacs-hg @ 2005-02-24 23:02:32 by adrian]
adrian
parents:
diff changeset
20 ;; You should have received a copy of the GNU General Public License
29555dfb1592 [xemacs-hg @ 2005-02-24 23:02:32 by adrian]
adrian
parents:
diff changeset
21 ;; along with XEmacs; see the file COPYING. If not, write to the Free
29555dfb1592 [xemacs-hg @ 2005-02-24 23:02:32 by adrian]
adrian
parents:
diff changeset
22 ;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
29555dfb1592 [xemacs-hg @ 2005-02-24 23:02:32 by adrian]
adrian
parents:
diff changeset
23 ;; 02111-1307, USA.
29555dfb1592 [xemacs-hg @ 2005-02-24 23:02:32 by adrian]
adrian
parents:
diff changeset
24
29555dfb1592 [xemacs-hg @ 2005-02-24 23:02:32 by adrian]
adrian
parents:
diff changeset
25 ;;; Synched up with: Not in FSF.
29555dfb1592 [xemacs-hg @ 2005-02-24 23:02:32 by adrian]
adrian
parents:
diff changeset
26
29555dfb1592 [xemacs-hg @ 2005-02-24 23:02:32 by adrian]
adrian
parents:
diff changeset
27 ;;; Commentary:
29555dfb1592 [xemacs-hg @ 2005-02-24 23:02:32 by adrian]
adrian
parents:
diff changeset
28
29555dfb1592 [xemacs-hg @ 2005-02-24 23:02:32 by adrian]
adrian
parents:
diff changeset
29 ;;; Test region and zmacs-region functionality
29555dfb1592 [xemacs-hg @ 2005-02-24 23:02:32 by adrian]
adrian
parents:
diff changeset
30 ;;; See test-harness.el
29555dfb1592 [xemacs-hg @ 2005-02-24 23:02:32 by adrian]
adrian
parents:
diff changeset
31
29555dfb1592 [xemacs-hg @ 2005-02-24 23:02:32 by adrian]
adrian
parents:
diff changeset
32 (condition-case err
29555dfb1592 [xemacs-hg @ 2005-02-24 23:02:32 by adrian]
adrian
parents:
diff changeset
33 (require 'test-harness)
29555dfb1592 [xemacs-hg @ 2005-02-24 23:02:32 by adrian]
adrian
parents:
diff changeset
34 (file-error
29555dfb1592 [xemacs-hg @ 2005-02-24 23:02:32 by adrian]
adrian
parents:
diff changeset
35 (when (and (boundp 'load-file-name) (stringp load-file-name))
29555dfb1592 [xemacs-hg @ 2005-02-24 23:02:32 by adrian]
adrian
parents:
diff changeset
36 (push (file-name-directory load-file-name) load-path)
29555dfb1592 [xemacs-hg @ 2005-02-24 23:02:32 by adrian]
adrian
parents:
diff changeset
37 (require 'test-harness))))
29555dfb1592 [xemacs-hg @ 2005-02-24 23:02:32 by adrian]
adrian
parents:
diff changeset
38
29555dfb1592 [xemacs-hg @ 2005-02-24 23:02:32 by adrian]
adrian
parents:
diff changeset
39 ;; Active region testing, verifying functionality of
29555dfb1592 [xemacs-hg @ 2005-02-24 23:02:32 by adrian]
adrian
parents:
diff changeset
40 ;; http://list-archive.xemacs.org/xemacs-patches/200502/msg00194.html
29555dfb1592 [xemacs-hg @ 2005-02-24 23:02:32 by adrian]
adrian
parents:
diff changeset
41 ;; Message-ID: <zmxwtboa.fsf@smtprelay.t-online.de>
29555dfb1592 [xemacs-hg @ 2005-02-24 23:02:32 by adrian]
adrian
parents:
diff changeset
42 (with-temp-buffer
29555dfb1592 [xemacs-hg @ 2005-02-24 23:02:32 by adrian]
adrian
parents:
diff changeset
43 ;; Using active regions
29555dfb1592 [xemacs-hg @ 2005-02-24 23:02:32 by adrian]
adrian
parents:
diff changeset
44 (let ((zmacs-regions t)
29555dfb1592 [xemacs-hg @ 2005-02-24 23:02:32 by adrian]
adrian
parents:
diff changeset
45 (first-buffer (current-buffer)))
3472
43b4a54fbf66 [xemacs-hg @ 2006-06-24 14:30:36 by stephent]
stephent
parents: 2614
diff changeset
46 (Silence-Message
43b4a54fbf66 [xemacs-hg @ 2006-06-24 14:30:36 by stephent]
stephent
parents: 2614
diff changeset
47 (insert (buffer-name)))
2614
29555dfb1592 [xemacs-hg @ 2005-02-24 23:02:32 by adrian]
adrian
parents:
diff changeset
48 (Assert (not (region-exists-p)))
29555dfb1592 [xemacs-hg @ 2005-02-24 23:02:32 by adrian]
adrian
parents:
diff changeset
49 (Assert (not (region-active-p)))
3472
43b4a54fbf66 [xemacs-hg @ 2006-06-24 14:30:36 by stephent]
stephent
parents: 2614
diff changeset
50 (Silence-Message
43b4a54fbf66 [xemacs-hg @ 2006-06-24 14:30:36 by stephent]
stephent
parents: 2614
diff changeset
51 (mark-whole-buffer))
2614
29555dfb1592 [xemacs-hg @ 2005-02-24 23:02:32 by adrian]
adrian
parents:
diff changeset
52 (Assert (region-exists-p))
29555dfb1592 [xemacs-hg @ 2005-02-24 23:02:32 by adrian]
adrian
parents:
diff changeset
53 (Assert (region-active-p))
29555dfb1592 [xemacs-hg @ 2005-02-24 23:02:32 by adrian]
adrian
parents:
diff changeset
54 ;; Turn off active regions
29555dfb1592 [xemacs-hg @ 2005-02-24 23:02:32 by adrian]
adrian
parents:
diff changeset
55 (setq zmacs-regions nil)
29555dfb1592 [xemacs-hg @ 2005-02-24 23:02:32 by adrian]
adrian
parents:
diff changeset
56 ;; Region still exists
29555dfb1592 [xemacs-hg @ 2005-02-24 23:02:32 by adrian]
adrian
parents:
diff changeset
57 (Assert (region-exists-p))
29555dfb1592 [xemacs-hg @ 2005-02-24 23:02:32 by adrian]
adrian
parents:
diff changeset
58 ;; Region is no longer active
29555dfb1592 [xemacs-hg @ 2005-02-24 23:02:32 by adrian]
adrian
parents:
diff changeset
59 (Assert (not (region-active-p)))
29555dfb1592 [xemacs-hg @ 2005-02-24 23:02:32 by adrian]
adrian
parents:
diff changeset
60 ;; Turn active regions back on
29555dfb1592 [xemacs-hg @ 2005-02-24 23:02:32 by adrian]
adrian
parents:
diff changeset
61 (setq zmacs-regions t)
29555dfb1592 [xemacs-hg @ 2005-02-24 23:02:32 by adrian]
adrian
parents:
diff changeset
62 ;; Region still exists
29555dfb1592 [xemacs-hg @ 2005-02-24 23:02:32 by adrian]
adrian
parents:
diff changeset
63 (Assert (region-exists-p))
29555dfb1592 [xemacs-hg @ 2005-02-24 23:02:32 by adrian]
adrian
parents:
diff changeset
64 ;; Region is active again
29555dfb1592 [xemacs-hg @ 2005-02-24 23:02:32 by adrian]
adrian
parents:
diff changeset
65 (Assert (region-active-p))
29555dfb1592 [xemacs-hg @ 2005-02-24 23:02:32 by adrian]
adrian
parents:
diff changeset
66 (with-temp-buffer
3472
43b4a54fbf66 [xemacs-hg @ 2006-06-24 14:30:36 by stephent]
stephent
parents: 2614
diff changeset
67 (Silence-Message
43b4a54fbf66 [xemacs-hg @ 2006-06-24 14:30:36 by stephent]
stephent
parents: 2614
diff changeset
68 (insert (buffer-name)))
2614
29555dfb1592 [xemacs-hg @ 2005-02-24 23:02:32 by adrian]
adrian
parents:
diff changeset
69 ;; Region exists in first buffer, not this second one
29555dfb1592 [xemacs-hg @ 2005-02-24 23:02:32 by adrian]
adrian
parents:
diff changeset
70 (Assert (not (region-exists-p)))
29555dfb1592 [xemacs-hg @ 2005-02-24 23:02:32 by adrian]
adrian
parents:
diff changeset
71 ;; Region not active in this second temp buffer
29555dfb1592 [xemacs-hg @ 2005-02-24 23:02:32 by adrian]
adrian
parents:
diff changeset
72 (Assert (not (region-active-p)))
29555dfb1592 [xemacs-hg @ 2005-02-24 23:02:32 by adrian]
adrian
parents:
diff changeset
73 ;; Region still active in first temp buffer
4855
189fb67ca31a Create Assert-eq, Assert-equal, etc.
Ben Wing <ben@xemacs.org>
parents: 3472
diff changeset
74 (Assert-eq (zmacs-region-buffer) first-buffer)
2614
29555dfb1592 [xemacs-hg @ 2005-02-24 23:02:32 by adrian]
adrian
parents:
diff changeset
75 ;; Activate region in second temp buffer
3472
43b4a54fbf66 [xemacs-hg @ 2006-06-24 14:30:36 by stephent]
stephent
parents: 2614
diff changeset
76 (Silence-Message
43b4a54fbf66 [xemacs-hg @ 2006-06-24 14:30:36 by stephent]
stephent
parents: 2614
diff changeset
77 (mark-whole-buffer))
2614
29555dfb1592 [xemacs-hg @ 2005-02-24 23:02:32 by adrian]
adrian
parents:
diff changeset
78 ;; Region exists in second temp buffer
29555dfb1592 [xemacs-hg @ 2005-02-24 23:02:32 by adrian]
adrian
parents:
diff changeset
79 (Assert (region-exists-p))
29555dfb1592 [xemacs-hg @ 2005-02-24 23:02:32 by adrian]
adrian
parents:
diff changeset
80 ;; Region active in second temp buffer
29555dfb1592 [xemacs-hg @ 2005-02-24 23:02:32 by adrian]
adrian
parents:
diff changeset
81 (Assert (region-active-p)))
29555dfb1592 [xemacs-hg @ 2005-02-24 23:02:32 by adrian]
adrian
parents:
diff changeset
82 ;; Second temp buffer no longer exists
29555dfb1592 [xemacs-hg @ 2005-02-24 23:02:32 by adrian]
adrian
parents:
diff changeset
83 (Assert (null (zmacs-region-buffer)))))