Mercurial > hg > xemacs-beta
view src/cmds.c @ 5169:6c6d78781d59
cleanup of code related to xfree(), better KKCC backtrace capabilities, document XD_INLINE_LISP_OBJECT_BLOCK_PTR, fix some memory leaks, other code cleanup
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-03-24 Ben Wing <ben@xemacs.org>
* array.h:
* array.h (XD_LISP_DYNARR_DESC):
* dumper.c (pdump_register_sub):
* dumper.c (pdump_store_new_pointer_offsets):
* dumper.c (pdump_reloc_one_mc):
* elhash.c:
* gc.c (lispdesc_one_description_line_size):
* gc.c (kkcc_marking):
* lrecord.h:
* lrecord.h (IF_NEW_GC):
* lrecord.h (enum memory_description_type):
* lrecord.h (enum data_description_entry_flags):
* lrecord.h (struct opaque_convert_functions):
Rename XD_LISP_OBJECT_BLOCK_PTR to XD_INLINE_LISP_OBJECT_BLOCK_PTR
and document it in lrecord.h.
* data.c:
* data.c (finish_marking_weak_lists):
* data.c (continue_marking_ephemerons):
* data.c (finish_marking_ephemerons):
* elhash.c (MARK_OBJ):
* gc.c:
* gc.c (lispdesc_indirect_count_1):
* gc.c (struct):
* gc.c (kkcc_bt_push):
* gc.c (kkcc_gc_stack_push):
* gc.c (kkcc_gc_stack_push_lisp_object):
* gc.c (kkcc_gc_stack_repush_dirty_object):
* gc.c (KKCC_DO_CHECK_FREE):
* gc.c (mark_object_maybe_checking_free):
* gc.c (mark_struct_contents):
* gc.c (mark_lisp_object_block_contents):
* gc.c (register_for_finalization):
* gc.c (mark_object):
* gc.h:
* lisp.h:
* profile.c:
* profile.c (mark_profiling_info_maphash):
Clean up KKCC code related to DEBUG_XEMACS. Rename
kkcc_backtrace() to kkcc_backtrace_1() and add two params: a
`size' arg to control how many stack elements to print and a
`detailed' arg to control whether Lisp objects are printed using
`debug_print()'. Create front-ends to kkcc_backtrace_1() --
kkcc_detailed_backtrace(), kkcc_short_backtrace(),
kkcc_detailed_backtrace_full(), kkcc_short_backtrace_full(), as
well as shortened versions kbt(), kbts(), kbtf(), kbtsf() -- to
call it with various parameter values. Add an `is_lisp' field to
the stack and backtrace structures and use it to keep track of
whether an object pushed onto the stack is a Lisp object or a
non-Lisp structure; in kkcc_backtrace_1(), don't try to print a
non-Lisp structure as a Lisp object.
* elhash.c:
* extents.c:
* file-coding.c:
* lrecord.h:
* lrecord.h (IF_NEW_GC):
* marker.c:
* marker.c (Fmarker_buffer):
* mule-coding.c:
* number.c:
* rangetab.c:
* specifier.c:
New macros IF_OLD_GC(), IF_NEW_GC() to simplify declaration of
Lisp objects when a finalizer may exist in one but not the other.
Use them appropriately.
* extents.c (finalize_extent_info):
Don't zero out data->soe and data->extents before trying to free,
else we get memory leaks.
* lrecord.h (enum lrecord_type):
Make the first lrecord type have value 1 not 0 so that 0 remains
without implementation and attempts to interpret zeroed memory
as a Lisp object will be more obvious.
* array.c (Dynarr_free):
* device-msw.c (msprinter_delete_device):
* device-tty.c (free_tty_device_struct):
* device-tty.c (tty_delete_device):
* dialog-msw.c (handle_directory_dialog_box):
* dialog-x.c:
* emacs.c (free_argc_argv):
* emodules.c (attempt_module_delete):
* file-coding.c (chain_finalize_coding_stream_1):
* file-coding.c (chain_finalize_coding_stream):
* glyphs-eimage.c:
* glyphs-eimage.c (jpeg_instantiate_unwind):
* glyphs-eimage.c (gif_instantiate_unwind):
* glyphs-eimage.c (png_instantiate_unwind):
* glyphs-eimage.c (tiff_instantiate_unwind):
* imgproc.c:
* imgproc.c (build_EImage_quantable):
* insdel.c (uninit_buffer_text):
* mule-coding.c (iso2022_finalize_detection_state):
* objects-tty.c (tty_finalize_color_instance):
* objects-tty.c (tty_finalize_font_instance):
* objects-tty.c (tty_font_list):
* process.c:
* process.c (finalize_process):
* redisplay.c (add_propagation_runes):
* scrollbar-gtk.c:
* scrollbar-gtk.c (gtk_free_scrollbar_instance):
* scrollbar-gtk.c (gtk_release_scrollbar_instance):
* scrollbar-msw.c:
* scrollbar-msw.c (mswindows_free_scrollbar_instance):
* scrollbar-msw.c (unshow_that_mofo):
* scrollbar-x.c (x_free_scrollbar_instance):
* scrollbar-x.c (x_release_scrollbar_instance):
* select-x.c:
* select-x.c (x_handle_selection_request):
* syntax.c:
* syntax.c (uninit_buffer_syntax_cache):
* text.h (eifree):
If possible, whenever we call xfree() on a field in a structure,
set the field to 0 afterwards. A lot of code is written so that
it checks the value being freed to see if it is non-zero before
freeing it -- doing this and setting the value to 0 afterwards
ensures (a) we won't try to free twice if the cleanup code is
called twice; (b) if the object itself stays around, KKCC won't
crash when attempting to mark the freed field.
* rangetab.c:
Add a finalization method when not NEW_GC to avoid memory leaks.
(#### We still get memory leaks when NEW_GC; need to convert gap
array to Lisp object).
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Wed, 24 Mar 2010 01:22:51 -0500 |
parents | 91950589598c |
children | c096d8051f89 308d34e9f07d |
line wrap: on
line source
/* Simple built-in editing commands. Copyright (C) 1985, 1992, 1993, 1994, 1995 Free Software Foundation, Inc. Copyright (C) 2002 Ben Wing. This file is part of XEmacs. XEmacs is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. XEmacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with XEmacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Synched up with: Mule 2.0, FSF 19.30. */ #include <config.h> #include "lisp.h" #include "commands.h" #include "buffer.h" #include "extents.h" #include "syntax.h" #include "insdel.h" Lisp_Object Qkill_forward_chars; Lisp_Object Qself_insert_command; Lisp_Object Qno_self_insert; Lisp_Object Vblink_paren_function; /* A possible value for a buffer's overwrite-mode variable. */ Lisp_Object Qoverwrite_mode_binary; /* Non-nil means put this face on the next self-inserting character. */ Lisp_Object Vself_insert_face; /* This is the command that set up Vself_insert_face. */ Lisp_Object Vself_insert_face_command; /* A char-table for characters which may invoke auto-filling. */ Lisp_Object Vauto_fill_chars; DEFUN ("forward-char", Fforward_char, 0, 2, "_p", /* Move point right COUNT characters (left if COUNT is negative). On attempt to pass end of buffer, stop and signal `end-of-buffer'. On attempt to pass beginning of buffer, stop and signal `beginning-of-buffer'. On reaching end of buffer, stop and signal error. The characters that are moved over may be added to the current selection \(i.e. active region) if the Shift key is held down, a motion key is used to invoke this command, and `shifted-motion-keys-select-region' is t; see the documentation for this variable for more details. */ (count, buffer)) { struct buffer *buf = decode_buffer (buffer, 1); EMACS_INT n; if (NILP (count)) n = 1; else { CHECK_INT (count); n = XINT (count); } /* This used to just set point to point + XINT (count), and then check to see if it was within boundaries. But now that SET_PT can potentially do a lot of stuff (calling entering and exiting hooks, etcetera), that's not a good approach. So we validate the proposed position, then set point. */ { Charbpos new_point = BUF_PT (buf) + n; if (new_point < BUF_BEGV (buf)) { BUF_SET_PT (buf, BUF_BEGV (buf)); Fsignal (Qbeginning_of_buffer, Qnil); return Qnil; } if (new_point > BUF_ZV (buf)) { BUF_SET_PT (buf, BUF_ZV (buf)); Fsignal (Qend_of_buffer, Qnil); return Qnil; } BUF_SET_PT (buf, new_point); } return Qnil; } DEFUN ("backward-char", Fbackward_char, 0, 2, "_p", /* Move point left COUNT characters (right if COUNT is negative). On attempt to pass end of buffer, stop and signal `end-of-buffer'. On attempt to pass beginning of buffer, stop and signal `beginning-of-buffer'. The characters that are moved over may be added to the current selection \(i.e. active region) if the Shift key is held down, a motion key is used to invoke this command, and `shifted-motion-keys-select-region' is t; see the documentation for this variable for more details. */ (count, buffer)) { if (NILP (count)) count = make_int (-1); else { CHECK_INT (count); count = make_int (- XINT (count)); } return Fforward_char (count, buffer); } DEFUN ("forward-line", Fforward_line, 0, 2, "_p", /* Move COUNT lines forward (backward if COUNT is negative). Precisely, if point is on line I, move to the start of line I + COUNT. If there isn't room, go as far as possible (no error). Returns the count of lines left to move. If moving forward, that is COUNT - number of lines moved; if backward, COUNT + number moved. \(Note that if COUNT is negative, the return will be non-positive.) With positive COUNT, a non-empty line at the end counts as one line successfully moved (for the return value). If BUFFER is nil, the current buffer is assumed. The characters that are moved over may be added to the current selection \(i.e. active region) if the Shift key is held down, a motion key is used to invoke this command, and `shifted-motion-keys-select-region' is t; see the documentation for this variable for more details. */ (count, buffer)) { struct buffer *buf = decode_buffer (buffer, 1); Charbpos pos2 = BUF_PT (buf); Charbpos pos; EMACS_INT n, shortage, negp; if (NILP (count)) n = 1; else { CHECK_INT (count); n = XINT (count); } negp = n <= 0; pos = scan_buffer (buf, '\n', pos2, 0, n - negp, &shortage, 1); if (shortage > 0 && (negp || (BUF_ZV (buf) > BUF_BEGV (buf) && pos != pos2 && BUF_FETCH_CHAR (buf, pos - 1) != '\n'))) shortage--; BUF_SET_PT (buf, pos); return make_int (negp ? - shortage : shortage); } DEFUN ("point-at-bol", Fpoint_at_bol, 0, 2, 0, /* Return the character position of the first character on the current line. With argument COUNT not nil or 1, move forward COUNT - 1 lines first. If scan reaches end of buffer, return that position. This function does not move point. */ (count, buffer)) { struct buffer *b = decode_buffer (buffer, 1); REGISTER int orig, end; buffer = wrap_buffer (b); if (NILP (count)) count = make_int (0); else { CHECK_INT (count); count = make_int (XINT (count) - 1); } orig = BUF_PT (b); Fforward_line (count, buffer); end = BUF_PT (b); BUF_SET_PT (b, orig); return make_int (end); } DEFUN ("beginning-of-line", Fbeginning_of_line, 0, 2, "_p", /* Move point to beginning of current line. With argument COUNT not nil or 1, move forward COUNT - 1 lines first. If scan reaches end of buffer, stop there without error. If BUFFER is nil, the current buffer is assumed. The characters that are moved over may be added to the current selection \(i.e. active region) if the Shift key is held down, a motion key is used to invoke this command, and `shifted-motion-keys-select-region' is t; see the documentation for this variable for more details. */ (count, buffer)) { struct buffer *b = decode_buffer (buffer, 1); BUF_SET_PT (b, XINT (Fpoint_at_bol (count, buffer))); return Qnil; } DEFUN ("point-at-eol", Fpoint_at_eol, 0, 2, 0, /* Return the character position of the last character on the current line. With argument COUNT not nil or 1, move forward COUNT - 1 lines first. If scan reaches end of buffer, return that position. This function does not move point. */ (count, buffer)) { struct buffer *buf = decode_buffer (buffer, 1); EMACS_INT n; if (NILP (count)) n = 1; else { CHECK_INT (count); n = XINT (count); } return make_int (find_before_next_newline (buf, BUF_PT (buf), 0, n - (n <= 0))); } DEFUN ("end-of-line", Fend_of_line, 0, 2, "_p", /* Move point to end of current line. With argument COUNT not nil or 1, move forward COUNT - 1 lines first. If scan reaches end of buffer, stop there without error. If BUFFER is nil, the current buffer is assumed. The characters that are moved over may be added to the current selection \(i.e. active region) if the Shift key is held down, a motion key is used to invoke this command, and `shifted-motion-keys-select-region' is t; see the documentation for this variable for more details. */ (count, buffer)) { struct buffer *b = decode_buffer (buffer, 1); BUF_SET_PT (b, XINT (Fpoint_at_eol (count, buffer))); return Qnil; } DEFUN ("delete-char", Fdelete_char, 0, 2, "*p\nP", /* Delete the following COUNT characters (previous, with negative COUNT). Optional second arg KILLP non-nil means kill instead (save in kill ring). Interactively, COUNT is the prefix arg, and KILLP is set if COUNT was explicitly specified. */ (count, killp)) { /* This function can GC */ Charbpos pos; struct buffer *buf = current_buffer; EMACS_INT n; if (NILP (count)) n = 1; else { CHECK_INT (count); n = XINT (count); } pos = BUF_PT (buf) + n; if (NILP (killp)) { if (n < 0) { if (pos < BUF_BEGV (buf)) signal_error (Qbeginning_of_buffer, 0, Qunbound); else buffer_delete_range (buf, pos, BUF_PT (buf), 0); } else { if (pos > BUF_ZV (buf)) signal_error (Qend_of_buffer, 0, Qunbound); else buffer_delete_range (buf, BUF_PT (buf), pos, 0); } } else { call1 (Qkill_forward_chars, count); } return Qnil; } DEFUN ("delete-backward-char", Fdelete_backward_char, 0, 2, "*p\nP", /* Delete the previous COUNT characters (following, with negative COUNT). Optional second arg KILLP non-nil means kill instead (save in kill ring). Interactively, COUNT is the prefix arg, and KILLP is set if COUNT was explicitly specified. */ (count, killp)) { /* This function can GC */ EMACS_INT n; if (NILP (count)) n = 1; else { CHECK_INT (count); n = XINT (count); } return Fdelete_char (make_int (- n), killp); } static void internal_self_insert (Ichar ch, int noautofill); DEFUN ("self-insert-command", Fself_insert_command, 1, 1, "*p", /* Insert the character you type. Whichever character you type to run this command is inserted. If a prefix arg COUNT is specified, the character is inserted COUNT times. */ (count)) { /* This function can GC */ Ichar ch; Lisp_Object c; EMACS_INT n; CHECK_NATNUM (count); n = XINT (count); if (CHAR_OR_CHAR_INTP (Vlast_command_char)) c = Vlast_command_char; else c = Fevent_to_character (Vlast_command_event, Qnil, Qnil, Qnil); if (NILP (c)) invalid_operation ( "Last typed key has no character equivalent (that we know of)", Fcopy_event (Vlast_command_event, Qnil)); CHECK_CHAR_COERCE_INT (c); ch = XCHAR (c); while (n--) internal_self_insert (ch, (n != 0)); return Qnil; } /* Insert character C1. If NOAUTOFILL is nonzero, don't do autofill even if it is enabled. FSF: If this insertion is suitable for direct output (completely simple), return 0. A value of 1 indicates this *might* not have been simple. A value of 2 means this did things that call for an undo boundary. */ static void internal_self_insert (Ichar c1, int noautofill) { /* This function can GC */ /* int hairy = 0; -- unused */ REGISTER enum syntaxcode synt; REGISTER Ichar c2; Lisp_Object overwrite; Lisp_Object syntax_table; struct buffer *buf = current_buffer; int tab_width; overwrite = buf->overwrite_mode; syntax_table = buf->mirror_syntax_table; #if 0 /* No, this is very bad, it makes undo *always* undo a character at a time instead of grouping consecutive self-inserts together. Nasty nasty. */ if (!NILP (Vbefore_change_functions) || !NILP (Vafter_change_functions) || !NILP (Vbefore_change_function) || !NILP (Vafter_change_function)) hairy = 1; #endif if (!NILP (overwrite) && BUF_PT (buf) < BUF_ZV (buf) && (EQ (overwrite, Qoverwrite_mode_binary) || (c1 != '\n' && BUF_FETCH_CHAR (buf, BUF_PT (buf)) != '\n')) && (EQ (overwrite, Qoverwrite_mode_binary) || BUF_FETCH_CHAR (buf, BUF_PT (buf)) != '\t' || ((tab_width = XINT (buf->tab_width), tab_width <= 0) || tab_width > 20 || !((current_column (buf) + 1) % tab_width)))) { buffer_delete_range (buf, BUF_PT (buf), BUF_PT (buf) + 1, 0); /* hairy = 2; */ } if (!NILP (buf->abbrev_mode) && !WORD_SYNTAX_P (syntax_table, c1) && NILP (buf->read_only) && BUF_PT (buf) > BUF_BEGV (buf)) { c2 = BUF_FETCH_CHAR (buf, BUF_PT (buf) - 1); if (WORD_SYNTAX_P (syntax_table, c2)) { #if 1 Fexpand_abbrev (); #else /* FSFmacs */ Lisp_Object sym = Fexpand_abbrev (); /* I think this is too bogus to add. The function should have a way of examining the character to be inserted, so it can decide whether to insert it or not. We should design it better than that. */ /* Here FSFmacs remembers MODIFF, compares it after Fexpand_abbrev() finishes, and updates HAIRY. */ /* NOTE: we cannot simply check for Vlast_abbrev, because Fexpand_abbrev() can bail out before setting it to anything meaningful, leaving us stuck with an old value. Thus Fexpand_abbrev() was extended to return the actual abbrev symbol. */ if (!NILP (sym) && !NILP (symbol_function (XSYMBOL (sym))) && SYMBOLP (symbol_function (XSYMBOL (sym)))) { Lisp_Object prop = Fget (symbol_function (XSYMBOL (sym)), Qno_self_insert, Qnil); if (!NILP (prop)) return; } #endif /* FSFmacs */ } } if ((CHAR_TABLEP (Vauto_fill_chars) ? !NILP (get_char_table (c1, Vauto_fill_chars)) : (c1 == ' ' || c1 == '\n')) && !noautofill && !NILP (buf->auto_fill_function)) { buffer_insert_emacs_char (buf, c1); if (c1 == '\n') /* After inserting a newline, move to previous line and fill */ /* that. Must have the newline in place already so filling and */ /* justification, if any, know where the end is going to be. */ BUF_SET_PT (buf, BUF_PT (buf) - 1); call0 (buf->auto_fill_function); if (c1 == '\n') BUF_SET_PT (buf, BUF_PT (buf) + 1); /* hairy = 2; */ } else buffer_insert_emacs_char (buf, c1); /* If previous command specified a face to use, use it. */ if (!NILP (Vself_insert_face) && EQ (Vlast_command, Vself_insert_face_command)) { Lisp_Object before = make_int (BUF_PT (buf) - 1); Lisp_Object after = make_int (BUF_PT (buf)); Fput_text_property (before, after, Qface, Vself_insert_face, Qnil); Fput_text_property (before, after, Qstart_open, Qt, Qnil); Fput_text_property (before, after, Qend_open, Qnil, Qnil); /* #### FSFmacs properties are normally closed ("sticky") on the end but not the beginning. It's the opposite for us. */ Vself_insert_face = Qnil; } synt = SYNTAX (syntax_table, c1); if ((synt == Sclose || synt == Smath) && !NILP (Vblink_paren_function) && INTERACTIVE && !noautofill) { call0 (Vblink_paren_function); /* hairy = 2; */ } /* return hairy; */ } /* (this comes from Mule but is a generally good idea) */ DEFUN ("self-insert-internal", Fself_insert_internal, 1, 1, 0, /* Invoke `self-insert-command' as if CHARACTER is entered from keyboard. */ (character)) { /* This function can GC */ CHECK_CHAR_COERCE_INT (character); internal_self_insert (XCHAR (character), 0); return Qnil; } /* module initialization */ void syms_of_cmds (void) { DEFSYMBOL (Qkill_forward_chars); DEFSYMBOL (Qself_insert_command); DEFSYMBOL (Qoverwrite_mode_binary); DEFSYMBOL (Qno_self_insert); DEFSUBR (Fforward_char); DEFSUBR (Fbackward_char); DEFSUBR (Fforward_line); DEFSUBR (Fbeginning_of_line); DEFSUBR (Fend_of_line); DEFSUBR (Fpoint_at_bol); DEFSUBR (Fpoint_at_eol); DEFSUBR (Fdelete_char); DEFSUBR (Fdelete_backward_char); DEFSUBR (Fself_insert_command); DEFSUBR (Fself_insert_internal); } void vars_of_cmds (void) { DEFVAR_LISP ("self-insert-face", &Vself_insert_face /* If non-nil, set the face of the next self-inserting character to this. See also `self-insert-face-command'. */ ); Vself_insert_face = Qnil; DEFVAR_LISP ("self-insert-face-command", &Vself_insert_face_command /* This is the command that set up `self-insert-face'. If `last-command' does not equal this value, we ignore `self-insert-face'. */ ); Vself_insert_face_command = Qnil; DEFVAR_LISP ("blink-paren-function", &Vblink_paren_function /* Function called, if non-nil, whenever a close parenthesis is inserted. More precisely, a char with closeparen syntax is self-inserted. */ ); Vblink_paren_function = Qnil; DEFVAR_LISP ("auto-fill-chars", &Vauto_fill_chars /* A char-table for characters which invoke auto-filling. Such characters have value t in this table. */); Vauto_fill_chars = Fmake_char_table (Qgeneric); XCHAR_TABLE (Vauto_fill_chars)->ascii[' '] = Qt; XCHAR_TABLE (Vauto_fill_chars)->ascii['\n'] = Qt; }