comparison src/event-stream.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 16112448d484
children 2a462149bd6a a48ef26d87ee
comparison
equal deleted inserted replaced
5030:422b4b4fb2a6 5050:6f2158fa75ed
1 /* The portable interface to event streams. 1 /* The portable interface to event streams.
2 Copyright (C) 1991, 1992, 1993, 1994, 1995 Free Software Foundation, Inc. 2 Copyright (C) 1991, 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
3 Copyright (C) 1995 Board of Trustees, University of Illinois. 3 Copyright (C) 1995 Board of Trustees, University of Illinois.
4 Copyright (C) 1995 Sun Microsystems, Inc. 4 Copyright (C) 1995 Sun Microsystems, Inc.
5 Copyright (C) 1995, 1996, 2001, 2002, 2003 Ben Wing. 5 Copyright (C) 1995, 1996, 2001, 2002, 2003, 2010 Ben Wing.
6 6
7 This file is part of XEmacs. 7 This file is part of XEmacs.
8 8
9 XEmacs is free software; you can redistribute it and/or modify it 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 10 under the terms of the GNU General Public License as published by the
1327 lisp_number_to_milliseconds (resignal, 0)); 1327 lisp_number_to_milliseconds (resignal, 0));
1328 int id; 1328 int id;
1329 Lisp_Object lid; 1329 Lisp_Object lid;
1330 id = event_stream_generate_wakeup (msecs, msecs2, function, object, 0); 1330 id = event_stream_generate_wakeup (msecs, msecs2, function, object, 0);
1331 lid = make_int (id); 1331 lid = make_int (id);
1332 if (id != XINT (lid)) ABORT (); 1332 assert (id == XINT (lid));
1333 return lid; 1333 return lid;
1334 } 1334 }
1335 1335
1336 DEFUN ("disable-timeout", Fdisable_timeout, 1, 1, 0, /* 1336 DEFUN ("disable-timeout", Fdisable_timeout, 1, 1, 0, /*
1337 Disable a timeout from signalling any more. 1337 Disable a timeout from signalling any more.
1406 lisp_number_to_milliseconds (resignal, 0)); 1406 lisp_number_to_milliseconds (resignal, 0));
1407 int id; 1407 int id;
1408 Lisp_Object lid; 1408 Lisp_Object lid;
1409 id = event_stream_generate_wakeup (msecs, msecs2, function, object, 1); 1409 id = event_stream_generate_wakeup (msecs, msecs2, function, object, 1);
1410 lid = make_int (id); 1410 lid = make_int (id);
1411 if (id != XINT (lid)) ABORT (); 1411 assert (id == XINT (lid));
1412 return lid; 1412 return lid;
1413 } 1413 }
1414 1414
1415 DEFUN ("disable-async-timeout", Fdisable_async_timeout, 1, 1, 0, /* 1415 DEFUN ("disable-async-timeout", Fdisable_async_timeout, 1, 1, 0, /*
1416 Disable an asynchronous timeout from signalling any more. 1416 Disable an asynchronous timeout from signalling any more.
3776 3776
3777 for (i = 0, j = start; i < nkeys; i++) 3777 for (i = 0, j = start; i < nkeys; i++)
3778 { 3778 {
3779 Lisp_Object e = XVECTOR_DATA (Vrecent_keys_ring)[j]; 3779 Lisp_Object e = XVECTOR_DATA (Vrecent_keys_ring)[j];
3780 3780
3781 if (NILP (e)) 3781 assert (!NILP (e));
3782 ABORT ();
3783 XVECTOR_DATA (val)[i] = Fcopy_event (e, Qnil); 3782 XVECTOR_DATA (val)[i] = Fcopy_event (e, Qnil);
3784 if (++j >= recent_keys_ring_size) 3783 if (++j >= recent_keys_ring_size)
3785 j = 0; 3784 j = 0;
3786 } 3785 }
3787 UNGCPRO; 3786 UNGCPRO;