Mercurial > hg > xemacs-beta
annotate nt/make-nt-depend @ 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 | 4542b72c005e |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 796 | 1 : #-*- Perl -*- |
| 2 | |
| 3 # Generate dependency info in a form acceptable to nmake | |
| 4 # | |
| 5 # Copyright (C) 2000, 2002 Jonathan Harris. | |
| 6 # | |
| 7 # This file is part of XEmacs. | |
| 8 # | |
| 9 # XEmacs is free software; you can redistribute it and/or modify it | |
| 10 # under the terms of the GNU General Public License as published by the | |
| 11 # Free Software Foundation; either version 2, or (at your option) any | |
| 12 # later version. | |
| 13 # | |
| 14 # XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 15 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 16 # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 17 # for more details. | |
| 18 # | |
| 19 # You should have received a copy of the GNU General Public License | |
| 20 # along with XEmacs; see the file COPYING. If not, write to | |
| 21 # the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 22 # Boston, MA 02111-1307, USA. | |
| 23 # | |
| 24 # Author: Jonathan Harris <jonathan@xemacs.org> | |
| 25 # | |
| 26 # Synched up with: Not in FSF. | |
| 27 | |
| 28 use Getopt::Long; | |
| 29 | |
| 30 my $optsok = GetOptions ('src=s' => \$src, | |
| 31 'config=s' => \$config, | |
| 32 'obj=s' => \$obj); | |
| 33 | |
| 34 die "Generates nmake dependencies for the XEmacs src directory. | |
| 35 | |
| 36 Usage: $0 --src SRCDIR --config CONFIGDIR --obj OBJDIR | |
| 37 | |
| 38 SRCDIR Location of XEmacs sources | |
| 39 CONFIGDIR Location of config.inc | |
| 40 OBJDIR Location for compiler-generated object files | |
| 41 | |
| 42 Expects output from src/make-src-depend on stdin. | |
| 43 The dependencies are written to stdout. | |
| 44 " if (@ARGV || !$optsok | |
| 45 || !defined ($src) || !defined ($config) || !defined ($obj)); | |
| 46 | |
| 47 while (<>) | |
| 48 { | |
| 1111 | 49 # must hack away CRLF junk. wouldn't it be nice if perl handled this |
| 50 # right?? really can't be that hard!!! | |
| 51 s/\r\n/\n/g; | |
| 52 | |
| 796 | 53 # rewrite references to generating script |
| 54 s/make-src-depend/make-nt-depend/; | |
| 55 | |
| 56 # rewrite '#if defined(...)' into nmake syntax | |
| 57 s/^#if defined(.+)/!if defined$1/; | |
| 58 | |
| 59 # rewrite '#else' and '#endif' into nmake syntax | |
| 60 s/^#e/!e/; | |
| 61 | |
| 62 # add src path to source filenames | |
| 63 # allow for source filename being used in variable assignment | |
| 64 s/([\s=])([\w\d\.\-]+\.[ch])/$1$src\\$2/g; | |
| 65 | |
| 66 # add obj path to object filenames | |
| 67 # rewrite .o to .obj | |
| 1330 | 68 s/^(.+)\.o:(.+)/$obj\\$1.obj:$2/; |
| 796 | 69 |
| 1330 | 70 # add dependency on config.inc wherever config.h is. |
| 71 s/\\config.h/\\config.h $config\\config.inc/; | |
| 1111 | 72 print; |
| 796 | 73 } |