Mercurial > hg > xemacs-beta
comparison src/events.c @ 5050:6f2158fa75ed
Fix quick-build, use asserts() in place of ABORT()
-------------------- ChangeLog entries follow: --------------------
ChangeLog addition:
2010-02-20 Ben Wing <ben@xemacs.org>
* configure.ac (XE_COMPLEX_ARG):
Correct doc of --quick-build: It also doesn't check for Lisp shadows.
src/ChangeLog addition:
2010-02-20 Ben Wing <ben@xemacs.org>
* EmacsFrame.c:
* EmacsFrame.c (EmacsFrameRecomputeCellSize):
* alloca.c (i00afunc):
* buffer.c:
* buffer.c (MARKED_SLOT):
* buffer.c (complex_vars_of_buffer):
* cm.c:
* cm.c (cmcheckmagic):
* console.c:
* console.c (MARKED_SLOT):
* device-x.c:
* device-x.c (x_get_visual_depth):
* emacs.c (sort_args):
* eval.c (throw_or_bomb_out):
* event-stream.c:
* event-stream.c (Fadd_timeout):
* event-stream.c (Fadd_async_timeout):
* event-stream.c (Frecent_keys):
* events.c:
* events.c (Fdeallocate_event):
* events.c (event_pixel_translation):
* extents.c:
* extents.c (process_extents_for_insertion_mapper):
* fns.c (Fbase64_encode_region):
* fns.c (Fbase64_encode_string):
* fns.c (Fbase64_decode_region):
* fns.c (Fbase64_decode_string):
* font-lock.c:
* font-lock.c (find_context):
* frame-x.c:
* frame-x.c (x_wm_mark_shell_size_user_specified):
* frame-x.c (x_wm_mark_shell_position_user_specified):
* frame-x.c (x_wm_set_shell_iconic_p):
* frame-x.c (x_wm_set_cell_size):
* frame-x.c (x_wm_set_variable_size):
* frame-x.c (x_wm_store_class_hints):
* frame-x.c (x_wm_maybe_store_wm_command):
* frame-x.c (x_initialize_frame_size):
* frame.c (delete_frame_internal):
* frame.c (change_frame_size_1):
* free-hook.c (check_free):
* free-hook.c (note_block_input):
* free-hook.c (log_gcpro):
* gccache-gtk.c (gc_cache_lookup):
* gccache-x.c:
* gccache-x.c (gc_cache_lookup):
* glyphs-gtk.c:
* glyphs-gtk.c (init_image_instance_from_gdk_pixmap):
* glyphs-x.c:
* glyphs-x.c (extract_xpm_color_names):
* insdel.c:
* insdel.c (move_gap):
* keymap.c:
* keymap.c (keymap_lookup_directly):
* keymap.c (keymap_delete_inverse_internal):
* keymap.c (accessible_keymaps_mapper_1):
* keymap.c (where_is_recursive_mapper):
* lisp.h:
* lstream.c (make_lisp_buffer_stream_1):
* macros.c:
* macros.c (pop_kbd_macro_event):
* mc-alloc.c (remove_page_from_used_list):
* menubar-x.c:
* menubar-x.c (set_frame_menubar):
* ralloc.c:
* ralloc.c (obtain):
* ralloc.c (relinquish):
* ralloc.c (relocate_blocs):
* ralloc.c (resize_bloc):
* ralloc.c (r_alloc_free):
* ralloc.c (r_re_alloc):
* ralloc.c (r_alloc_thaw):
* ralloc.c (init_ralloc):
* ralloc.c (Free_Addr_Block):
* scrollbar-x.c:
* scrollbar-x.c (x_update_scrollbar_instance_status):
* sunplay.c (init_device):
* unexnt.c:
* unexnt.c (read_in_bss):
* unexnt.c (map_in_heap):
* window.c:
* window.c (real_window):
* window.c (window_display_lines):
* window.c (window_display_buffer):
* window.c (set_window_display_buffer):
* window.c (unshow_buffer):
* window.c (Fget_lru_window):
if (...) ABORT(); ---> assert();
More specifically:
if (x == y) ABORT (); --> assert (x != y);
if (x != y) ABORT (); --> assert (x == y);
if (x > y) ABORT (); --> assert (x <= y);
etc.
if (!x) ABORT (); --> assert (x);
if (x) ABORT (); --> assert (!x);
DeMorgan's Law's applied and manually simplified:
if (x && !y) ABORT (); --> assert (!x || y);
if (!x || y >= z) ABORT (); --> assert (x && y < z);
Checked to make sure that assert() of an expression with side
effects ensures that the side effects get executed even when
asserts are disabled, and add a comment about this being a
requirement of any "disabled assert" expression.
* depend:
* make-src-depend:
* make-src-depend (PrintDeps):
Fix broken code in make-src-depend so it does what it was always
supposed to do, which was separate out config.h and lisp.h and
all the files they include into separate variables in the
depend part of Makefile so that quick-build can turn off the
lisp.h/config.h/text.h/etc. dependencies of the source files, to
speed up recompilation.
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Sat, 20 Feb 2010 05:05:54 -0600 |
parents | e813cf16c015 |
children | 92dc90c0bb40 |
comparison
equal
deleted
inserted
replaced
5030:422b4b4fb2a6 | 5050:6f2158fa75ed |
---|---|
1 /* Events: printing them, converting them to and from characters. | 1 /* Events: printing them, converting them to and from characters. |
2 Copyright (C) 1991, 1992, 1993, 1994 Free Software Foundation, Inc. | 2 Copyright (C) 1991, 1992, 1993, 1994 Free Software Foundation, Inc. |
3 Copyright (C) 1994, 1995 Board of Trustees, University of Illinois. | 3 Copyright (C) 1994, 1995 Board of Trustees, University of Illinois. |
4 Copyright (C) 2001, 2002, 2005 Ben Wing. | 4 Copyright (C) 2001, 2002, 2005, 2010 Ben Wing. |
5 | 5 |
6 This file is part of XEmacs. | 6 This file is part of XEmacs. |
7 | 7 |
8 XEmacs is free software; you can redistribute it and/or modify it | 8 XEmacs is free software; you can redistribute it and/or modify it |
9 under the terms of the GNU General Public License as published by the | 9 under the terms of the GNU General Public License as published by the |
887 | 887 |
888 #if 0 | 888 #if 0 |
889 { | 889 { |
890 int i, len; | 890 int i, len; |
891 | 891 |
892 if (EQ (event, Vlast_command_event) || | 892 assert (!(EQ (event, Vlast_command_event) || |
893 EQ (event, Vlast_input_event) || | 893 EQ (event, Vlast_input_event) || |
894 EQ (event, Vunread_command_event)) | 894 EQ (event, Vunread_command_event))); |
895 ABORT (); | |
896 | 895 |
897 len = XVECTOR_LENGTH (Vthis_command_keys); | 896 len = XVECTOR_LENGTH (Vthis_command_keys); |
898 for (i = 0; i < len; i++) | 897 for (i = 0; i < len; i++) |
899 if (EQ (event, XVECTOR_DATA (Vthis_command_keys) [i])) | 898 assert (!EQ (event, XVECTOR_DATA (Vthis_command_keys) [i])); |
900 ABORT (); | |
901 if (!NILP (Vrecent_keys_ring)) | 899 if (!NILP (Vrecent_keys_ring)) |
902 { | 900 { |
903 int recent_ring_len = XVECTOR_LENGTH (Vrecent_keys_ring); | 901 int recent_ring_len = XVECTOR_LENGTH (Vrecent_keys_ring); |
904 for (i = 0; i < recent_ring_len; i++) | 902 for (i = 0; i < recent_ring_len; i++) |
905 if (EQ (event, XVECTOR_DATA (Vrecent_keys_ring) [i])) | 903 assert (!EQ (event, XVECTOR_DATA (Vrecent_keys_ring) [i])); |
906 ABORT (); | |
907 } | 904 } |
908 } | 905 } |
909 #endif /* 0 */ | 906 #endif /* 0 */ |
910 | 907 |
911 assert (!EQ (event, Vevent_resource)); | 908 assert (!EQ (event, Vevent_resource)); |
2147 /* #### pixel_to_glyph_translation() sometimes returns garbage... | 2144 /* #### pixel_to_glyph_translation() sometimes returns garbage... |
2148 The word has type Lisp_Type_Record (presumably meaning `extent') but the | 2145 The word has type Lisp_Type_Record (presumably meaning `extent') but the |
2149 pointer points to random memory, often filled with 0, sometimes not. | 2146 pointer points to random memory, often filled with 0, sometimes not. |
2150 */ | 2147 */ |
2151 /* #### Chuck, do we still need this crap? */ | 2148 /* #### Chuck, do we still need this crap? */ |
2152 if (!NILP (ret_obj1) && !(GLYPHP (ret_obj1) | 2149 assert (NILP (ret_obj1) || GLYPHP (ret_obj1) |
2153 #ifdef HAVE_TOOLBARS | 2150 #ifdef HAVE_TOOLBARS |
2154 || TOOLBAR_BUTTONP (ret_obj1) | 2151 || TOOLBAR_BUTTONP (ret_obj1) |
2155 #endif | 2152 #endif |
2156 )) | 2153 ); |
2157 ABORT (); | 2154 assert (NILP (ret_obj2) || EXTENTP (ret_obj2) || CONSP (ret_obj2)); |
2158 if (!NILP (ret_obj2) && !(EXTENTP (ret_obj2) || CONSP (ret_obj2))) | |
2159 ABORT (); | |
2160 | 2155 |
2161 if (char_x) | 2156 if (char_x) |
2162 *char_x = ret_x; | 2157 *char_x = ret_x; |
2163 if (char_y) | 2158 if (char_y) |
2164 *char_y = ret_y; | 2159 *char_y = ret_y; |