annotate lib-src/ad2c @ 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 26a007fa2f4c
children ba07c880114a
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1 #!/bin/sh
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2 #
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3 # ad2c : Convert app-defaults file to C strings decls.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4 #
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5 # George Ferguson, ferguson@cs.rcohester.edu, 12 Nov 1990.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6 # 19 Mar 1991 : gf
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7 # Made it self-contained.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8 # 6 Jan 1992 : mycroft@gnu.ai.mit.edu (Charles Hannum)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
9 # Removed use of "-n" and ":read" label since Gnu and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
10 # IBM sed print pattern space on "n" command. Still works
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
11 # with Sun sed, of course.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
12 # 7 Jan 1992: matthew@sunpix.East.Sun.COM (Matthew Stier)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
13 # Escape quotes after escaping backslashes.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
14 #
4774
26a007fa2f4c Add GPL v2 or later notice to lib-src/ad2c with George Ferguson's permission.
Jerry James <james@xemacs.org>
parents: 0
diff changeset
15 # This file is part of XEmacs.
26a007fa2f4c Add GPL v2 or later notice to lib-src/ad2c with George Ferguson's permission.
Jerry James <james@xemacs.org>
parents: 0
diff changeset
16 #
26a007fa2f4c Add GPL v2 or later notice to lib-src/ad2c with George Ferguson's permission.
Jerry James <james@xemacs.org>
parents: 0
diff changeset
17 # XEmacs is free software; you can redistribute it and/or modify it
26a007fa2f4c Add GPL v2 or later notice to lib-src/ad2c with George Ferguson's permission.
Jerry James <james@xemacs.org>
parents: 0
diff changeset
18 # under the terms of the GNU General Public License as published by the
26a007fa2f4c Add GPL v2 or later notice to lib-src/ad2c with George Ferguson's permission.
Jerry James <james@xemacs.org>
parents: 0
diff changeset
19 # Free Software Foundation; either version 2, or (at your option) any
26a007fa2f4c Add GPL v2 or later notice to lib-src/ad2c with George Ferguson's permission.
Jerry James <james@xemacs.org>
parents: 0
diff changeset
20 # later version.
26a007fa2f4c Add GPL v2 or later notice to lib-src/ad2c with George Ferguson's permission.
Jerry James <james@xemacs.org>
parents: 0
diff changeset
21 #
26a007fa2f4c Add GPL v2 or later notice to lib-src/ad2c with George Ferguson's permission.
Jerry James <james@xemacs.org>
parents: 0
diff changeset
22 # XEmacs is distributed in the hope that it will be useful, but WITHOUT
26a007fa2f4c Add GPL v2 or later notice to lib-src/ad2c with George Ferguson's permission.
Jerry James <james@xemacs.org>
parents: 0
diff changeset
23 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
26a007fa2f4c Add GPL v2 or later notice to lib-src/ad2c with George Ferguson's permission.
Jerry James <james@xemacs.org>
parents: 0
diff changeset
24 # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
26a007fa2f4c Add GPL v2 or later notice to lib-src/ad2c with George Ferguson's permission.
Jerry James <james@xemacs.org>
parents: 0
diff changeset
25 # for more details.
26a007fa2f4c Add GPL v2 or later notice to lib-src/ad2c with George Ferguson's permission.
Jerry James <james@xemacs.org>
parents: 0
diff changeset
26 #
26a007fa2f4c Add GPL v2 or later notice to lib-src/ad2c with George Ferguson's permission.
Jerry James <james@xemacs.org>
parents: 0
diff changeset
27 # You should have received a copy of the GNU General Public License
26a007fa2f4c Add GPL v2 or later notice to lib-src/ad2c with George Ferguson's permission.
Jerry James <james@xemacs.org>
parents: 0
diff changeset
28 # along with XEmacs; see the file COPYING. If not, write to
26a007fa2f4c Add GPL v2 or later notice to lib-src/ad2c with George Ferguson's permission.
Jerry James <james@xemacs.org>
parents: 0
diff changeset
29 # the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
26a007fa2f4c Add GPL v2 or later notice to lib-src/ad2c with George Ferguson's permission.
Jerry James <james@xemacs.org>
parents: 0
diff changeset
30 # Boston, MA 02111-1301, USA. */
26a007fa2f4c Add GPL v2 or later notice to lib-src/ad2c with George Ferguson's permission.
Jerry James <james@xemacs.org>
parents: 0
diff changeset
31 #
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
32 # Synched up with: Not in FSF.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
33
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
34 sed '
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
35 /^!/d
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
36 /^$/d
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
37 s/\\/\\\\/g
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
38 s/\\$//g
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
39 s/"/\\"/g
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
40 s/^/"/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
41 : test
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
42 /\\$/b slash
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
43 s/$/",/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
44 p
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
45 d
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
46 : slash
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
47 n
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
48 /^!/d
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
49 /^$/d
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
50 s/"/\\"/g
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
51 s/\\\\/\\/g
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
52 s/\\n/\\\\n/g
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
53 s/\\t/\\\\t/g
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
54 s/\\f/\\\\f/g
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
55 s/\\b/\\\\b/g
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
56 b test' "$@"