comparison src/font-lock.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 3d8143fc88e1
children 308d34e9f07d
comparison
equal deleted inserted replaced
5030:422b4b4fb2a6 5050:6f2158fa75ed
1 /* Routines to compute the current syntactic context, for font-lock mode. 1 /* Routines to compute the current syntactic context, for font-lock mode.
2 Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc. 2 Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc.
3 Copyright (C) 1995 Sun Microsystems, Inc. 3 Copyright (C) 1995 Sun Microsystems, Inc.
4 Copyright (C) 2002, 2003 Ben Wing. 4 Copyright (C) 2002, 2003, 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
527 if (context_cache.context == context_none) 527 if (context_cache.context == context_none)
528 { 528 {
529 context_cache.context = context_comment; 529 context_cache.context = context_comment;
530 context_cache.ccontext = ccontext_none; 530 context_cache.ccontext = ccontext_none;
531 context_cache.style = SINGLE_SYNTAX_STYLE (syncode); 531 context_cache.style = SINGLE_SYNTAX_STYLE (syncode);
532 if (context_cache.style == comment_style_none) ABORT (); 532 assert (context_cache.style != comment_style_none);
533 } 533 }
534 break; 534 break;
535 535
536 case Sendcomment: 536 case Sendcomment:
537 if (context_cache.style != SINGLE_SYNTAX_STYLE (syncode)) 537 if (context_cache.style != SINGLE_SYNTAX_STYLE (syncode))
619 SYNTAX_CODES_START_P (prev_syncode, syncode) /* the two chars match */ 619 SYNTAX_CODES_START_P (prev_syncode, syncode) /* the two chars match */
620 ) 620 )
621 { 621 {
622 context_cache.ccontext = ccontext_start2; 622 context_cache.ccontext = ccontext_start2;
623 context_cache.style = SYNTAX_START_STYLE (prev_syncode, syncode); 623 context_cache.style = SYNTAX_START_STYLE (prev_syncode, syncode);
624 if (context_cache.style == comment_style_none) ABORT (); 624 assert (context_cache.style != comment_style_none);
625 } 625 }
626 else if ((SYNTAX_CODE_COMMENT_BITS (syncode) & 626 else if ((SYNTAX_CODE_COMMENT_BITS (syncode) &
627 SYNTAX_FIRST_CHAR_START) && 627 SYNTAX_FIRST_CHAR_START) &&
628 context_cache.context == context_none && 628 context_cache.context == context_none &&
629 (context_cache.ccontext == ccontext_none || 629 (context_cache.ccontext == ccontext_none ||
657 /* #### is it right to check for end1 here?? 657 /* #### is it right to check for end1 here??
658 yes, because this might be a repetition of the first char 658 yes, because this might be a repetition of the first char
659 of a comment-end sequence. ie, '/xxx foo xxx/' or 659 of a comment-end sequence. ie, '/xxx foo xxx/' or
660 '/xxx foo x/', where 'x' = '*' -- mct */ 660 '/xxx foo x/', where 'x' = '*' -- mct */
661 { 661 {
662 if (context_cache.style == comment_style_none) ABORT (); 662 assert (context_cache.style != comment_style_none);
663 context_cache.ccontext = ccontext_end1; 663 context_cache.ccontext = ccontext_end1;
664 } 664 }
665 665
666 else if (context_cache.ccontext == ccontext_start1) 666 else if (context_cache.ccontext == ccontext_start1)
667 { 667 {
668 if (context_cache.context != context_none) ABORT (); 668 assert (context_cache.context == context_none);
669 context_cache.ccontext = ccontext_none; 669 context_cache.ccontext = ccontext_none;
670 } 670 }
671 else if (context_cache.ccontext == ccontext_end1) 671 else if (context_cache.ccontext == ccontext_end1)
672 { 672 {
673 if (context_cache.context != context_block_comment) ABORT (); 673 assert (context_cache.context == context_block_comment);
674 context_cache.context = context_none; 674 context_cache.context = context_none;
675 context_cache.ccontext = ccontext_start2; 675 context_cache.ccontext = ccontext_start2;
676 } 676 }
677 677
678 if (context_cache.ccontext == ccontext_start2 && 678 if (context_cache.ccontext == ccontext_start2 &&
679 context_cache.context == context_none) 679 context_cache.context == context_none)
680 { 680 {
681 context_cache.context = context_block_comment; 681 context_cache.context = context_block_comment;
682 if (context_cache.style == comment_style_none) ABORT (); 682 assert (context_cache.style != comment_style_none);
683 } 683 }
684 else if (context_cache.ccontext == ccontext_none && 684 else if (context_cache.ccontext == ccontext_none &&
685 context_cache.context == context_block_comment) 685 context_cache.context == context_block_comment)
686 { 686 {
687 context_cache.context = context_none; 687 context_cache.context = context_none;