Mercurial > hg > xemacs-beta

comparison src/extents.c @ 4967:0d4c9d0f6a8d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 e813cf16c015
children 16112448d484
comparison
equal deleted inserted replaced
4966:48b63cd88a21 4967:0d4c9d0f6a8d
2969 } 2969 }
2970 else 2970 else
2971 /* But some loser programs mess up and may create a large number 2971 /* But some loser programs mess up and may create a large number
2972 of extents overlapping the same spot. This will result in 2972 of extents overlapping the same spot. This will result in
2973 catastrophic behavior if we use the bubble sort above. */ 2973 catastrophic behavior if we use the bubble sort above. */
2974 qsort (Dynarr_atp (extarr, 0), Dynarr_length (extarr), 2974 qsort (Dynarr_begin (extarr), Dynarr_length (extarr),
2975 sizeof (EXTENT), extent_priority_sort_function); 2975 sizeof (EXTENT), extent_priority_sort_function);
2976 } 2976 }
2977 2977
2978 /* If PROP is the `invisible' property of an extent, 2978 /* If PROP is the `invisible' property of an extent,
2979 this is 1 if the extent should be treated as invisible. */ 2979 this is 1 if the extent should be treated as invisible. */
3882 if (!NILP (cur_parent)) 3882 if (!NILP (cur_parent))
3883 extent_properties (XEXTENT (cur_parent), oldprops); 3883 extent_properties (XEXTENT (cur_parent), oldprops);
3884 if (!NILP (parent)) 3884 if (!NILP (parent))
3885 extent_properties (XEXTENT (parent), newprops); 3885 extent_properties (XEXTENT (parent), newprops);
3886 3886
3887 qsort (Dynarr_atp (oldprops, 0), Dynarr_length (oldprops), 3887 qsort (Dynarr_begin (oldprops), Dynarr_length (oldprops),
3888 sizeof (Lisp_Object_pair), compare_key_value_pairs); 3888 sizeof (Lisp_Object_pair), compare_key_value_pairs);
3889 qsort (Dynarr_atp (newprops, 0), Dynarr_length (newprops), 3889 qsort (Dynarr_begin (newprops), Dynarr_length (newprops),
3890 sizeof (Lisp_Object_pair), compare_key_value_pairs); 3890 sizeof (Lisp_Object_pair), compare_key_value_pairs);
3891 orignewlength = Dynarr_length (newprops); 3891 orignewlength = Dynarr_length (newprops);
3892 for (i = 0; i < Dynarr_length (oldprops); i++) 3892 for (i = 0; i < Dynarr_length (oldprops); i++)
3893 { 3893 {
3894 if (!bsearch (Dynarr_atp (oldprops, i), Dynarr_atp (newprops, 0), 3894 if (!bsearch (Dynarr_atp (oldprops, i), Dynarr_begin (newprops),
3895 Dynarr_length (newprops), sizeof (Lisp_Object_pair), 3895 Dynarr_length (newprops), sizeof (Lisp_Object_pair),
3896 compare_key_value_pairs)) 3896 compare_key_value_pairs))
3897 { 3897 {
3898 Lisp_Object_pair new_; 3898 Lisp_Object_pair new_;
3899 new_.key = Dynarr_at (oldprops, i).key; 3899 new_.key = Dynarr_at (oldprops, i).key;
3902 } 3902 }
3903 } 3903 }
3904 for (i = 0; i < orignewlength; i++) 3904 for (i = 0; i < orignewlength; i++)
3905 { 3905 {
3906 if (!Dynarr_length (oldprops) || !bsearch (Dynarr_atp (newprops, i), 3906 if (!Dynarr_length (oldprops) || !bsearch (Dynarr_atp (newprops, i),
3907 Dynarr_atp (oldprops, 0), 3907 Dynarr_begin (oldprops),
3908 Dynarr_length (oldprops), 3908 Dynarr_length (oldprops),
3909 sizeof (Lisp_Object_pair), 3909 sizeof (Lisp_Object_pair),
3910 compare_key_value_pairs)) 3910 compare_key_value_pairs))
3911 { 3911 {
3912 Lisp_Object_pair new_; 3912 Lisp_Object_pair new_;
3913 new_.key = Dynarr_at (newprops, i).key; 3913 new_.key = Dynarr_at (newprops, i).key;
3914 new_.value = Qunbound; 3914 new_.value = Qunbound;
3915 Dynarr_add (oldprops, new_); 3915 Dynarr_add (oldprops, new_);
3916 } 3916 }
3917 } 3917 }
3918 qsort (Dynarr_atp (oldprops, 0), Dynarr_length (oldprops), 3918 qsort (Dynarr_begin (oldprops), Dynarr_length (oldprops),
3919 sizeof (Lisp_Object_pair), compare_key_value_pairs); 3919 sizeof (Lisp_Object_pair), compare_key_value_pairs);
3920 qsort (Dynarr_atp (newprops, 0), Dynarr_length (newprops), 3920 qsort (Dynarr_begin (newprops), Dynarr_length (newprops),
3921 sizeof (Lisp_Object_pair), compare_key_value_pairs); 3921 sizeof (Lisp_Object_pair), compare_key_value_pairs);
3922 for (i = 0; i < Dynarr_length (oldprops); i++) 3922 for (i = 0; i < Dynarr_length (oldprops); i++)
3923 { 3923 {
3924 assert (EQ (Dynarr_at (oldprops, i).key, Dynarr_at (newprops, i).key)); 3924 assert (EQ (Dynarr_at (oldprops, i).key, Dynarr_at (newprops, i).key));
3925 if (!EQ (Dynarr_at (oldprops, i).value, Dynarr_at (newprops, i).value)) 3925 if (!EQ (Dynarr_at (oldprops, i).value, Dynarr_at (newprops, i).value))