Mercurial > hg > xemacs-beta
view lisp/undo-stack.el @ 4953:304aebb79cd3
function renamings to track names of char typedefs
-------------------- ChangeLog entries follow: --------------------
man/ChangeLog addition:
2010-01-27 Ben Wing <ben@xemacs.org>
* internals/internals.texi (lrecords):
* internals/internals.texi (The DFC API):
* internals/internals.texi (Conversion to and from External Data):
* internals/internals.texi (Mule-izing Code):
* internals/internals.texi (Pervasive changes throughout XEmacs sources):
* internals/internals.texi (Ben's README):
* internals/internals.texi (Future Work -- Localized Text/Messages):
* emodules.texi (Defining Variables):
Rename:
write_c_string -> write_cistring
build_intstring -> build_istring
build_string -> build_cistring
build_ext_string -> build_extstring
make_ext_string -> make_extstring
buffer_insert_c_string -> buffer_insert_ascstring
intern_int -> intern_istring
See comment in src/ChangeLog about this.
modules/ChangeLog addition:
2010-01-27 Ben Wing <ben@xemacs.org>
* postgresql/postgresql.c (print_pgconn):
* postgresql/postgresql.c (print_pgresult):
* postgresql/postgresql.c (Fpq_conn_defaults):
* postgresql/postgresql.c (Fpq_pgconn):
* postgresql/postgresql.c (Fpq_res_status):
* postgresql/postgresql.c (Fpq_result_error_message):
* postgresql/postgresql.c (Fpq_fname):
* postgresql/postgresql.c (Fpq_get_value):
* postgresql/postgresql.c (Fpq_cmd_status):
* postgresql/postgresql.c (Fpq_cmd_tuples):
* postgresql/postgresql.c (Fpq_notifies):
* postgresql/postgresql.c (Fpq_get_line):
* postgresql/postgresql.c (Fpq_get_line_async):
* postgresql/postgresql.c (FROB):
* postgresql/postgresql.c (init_postgresql_from_environment):
* ldap/eldap.c:
* ldap/eldap.c (Fldap_open):
* ldap/eldap.c (Fldap_search_basic):
* canna/canna_api.c:
* canna/canna_api.c (make_euc_string):
Rename:
write_c_string -> write_cistring
build_intstring -> build_istring
build_string -> build_cistring
build_ext_string -> build_extstring
make_ext_string -> make_extstring
buffer_insert_c_string -> buffer_insert_ascstring
intern_int -> intern_istring
See comment in src/ChangeLog about this.
src/ChangeLog addition:
2010-01-27 Ben Wing <ben@xemacs.org>
* .gdbinit.in.in:
* README:
* abbrev.c (write_abbrev):
* abbrev.c (describe_abbrev):
* alloc.c (make_extstring):
* alloc.c (build_istring):
* alloc.c (build_cistring):
* alloc.c (build_ascstring):
* alloc.c (build_extstring):
* alloc.c (build_msg_istring):
* alloc.c (build_defer_istring):
* buffer.c (Fgenerate_new_buffer_name):
* buffer.c (init_buffer_2):
* console-tty.c (tty_init_console):
* console-x.c (get_display_arg_connection):
* console-x.c (x_perhaps_init_unseen_key_defaults):
* database.c (dbm_map):
* database.c (dbm_get):
* database.c (berkdb_get):
* database.c (berkdb_map):
* device-gtk.c (FROB_PIXMAP):
* device-gtk.c (Fgtk_style_info):
* device-msw.c (msprinter_default_printer):
* device-msw.c (sync_printer_with_devmode):
* device-x.c (coding_system_of_xrm_database):
* device-x.c (x_init_device):
* device-x.c (signal_if_x_error):
* device-x.c (Fx_get_resource):
* device-x.c (Fx_server_vendor):
* device-x.c (Fx_get_font_path):
* dialog-x.c (maybe_run_dbox_text_callback):
* doc.c (extract_object_file_name):
* doc.c (unparesseuxify_doc_string):
* doc.c (get_doc_string):
* doc.c (get_object_file_name):
* doc.c (Fdocumentation):
* doc.c (Fsnarf_documentation):
* doc.c (Fsubstitute_command_keys):
* editfns.c (init_editfns):
* editfns.c (Ftemp_directory):
* editfns.c (Fuser_login_name):
* editfns.c (Fuser_real_login_name):
* editfns.c (Fuser_home_directory):
* editfns.c (Fformat_time_string):
* editfns.c (Fcurrent_time_string):
* editfns.c (Fcurrent_time_zone):
* emacs.c:
* emacs.c (main_1):
* emodules.c (Flist_modules):
* emodules.c (emodules_load):
* emodules.c (emodules_doc_sym):
* emodules.c (vars_of_module):
* event-Xt.c (x_has_keysym):
* event-gtk.c (emacs_gtk_format_magic_event):
* event-gtk.c (dragndrop_data_received):
* event-gtk.c (gtk_reset_key_mapping):
* event-msw.c (mswindows_dde_callback):
* event-msw.c (mswindows_wnd_proc):
* faces.c (complex_vars_of_faces):
* file-coding.c (find_coding_system):
* file-coding.c (setup_eol_coding_systems):
* file-coding.c (make_coding_system_1):
* file-coding.c (snarf_coding_system):
* fileio.c:
* fileio.c (lisp_strerror):
* fileio.c (Ffile_name_directory):
* fileio.c (Ffile_name_as_directory):
* fileio.c (Fdirectory_file_name):
* fileio.c (if):
* fileio.c (Ffile_symlink_p):
* fileio.c (Fencrypt_string):
* fileio.c (Fdecrypt_string):
* filelock.c (lock_file):
* filelock.c (Ffile_locked_p):
* floatfns.c (matherr):
* font-mgr.c (build_fcapi_string):
* font-mgr.c (make_xlfd_font_regexp):
* frame-msw.c (mswindows_window_id):
* frame-msw.c (mswindows_frame_property):
* frame-x.c:
* frame-x.c (color_to_string):
* frame-x.c (maybe_set_frame_title_format):
* frame-x.c (x_cde_transfer_callback):
* frame-x.c (Fx_window_id):
* glade.c (connector):
* glade.c (Fglade_xml_textdomain):
* glade.c (syms_of_glade):
* glyphs-eimage.c (jpeg_instantiate):
* glyphs-eimage.c (png_instantiate):
* glyphs-eimage.c (tiff_instantiate):
* glyphs-gtk.c (font_instantiate):
* glyphs-gtk.c (BUILD_GLYPH_INST):
* glyphs-x.c (x_locate_pixmap_file):
* glyphs-x.c (font_instantiate):
* glyphs-x.c (x_widget_property):
* glyphs-x.c (BUILD_GLYPH_INST):
* glyphs.c (print_image_instance):
* glyphs.c (bitmap_to_lisp_data):
* glyphs.c (pixmap_to_lisp_data):
* gpmevent.c (turn_off_gpm):
* gpmevent.c (Fgpm_enabled_p):
* gpmevent.c (Fgpm_enable):
* gtk-glue.c (__make_string_mapper):
* gtk-glue.c (xemacs_gtklist_to_list):
* gtk-xemacs.c (FROB_FACE):
* gtk-xemacs.c (xemacs_gtk_convert_color):
* hpplay.c (player_error_internal):
* hpplay.c (myHandler):
* insdel.c (buffer_insert_ascstring_1):
* insdel.h:
* insdel.h (buffer_insert_ascstring):
* intl.c (Fcurrent_locale):
* intl.c (Fset_current_locale):
* keymap.c (make_key_description):
* keymap.c (Ftext_char_description):
* keymap.c (describe_command):
* keymap.c (describe_map):
* lisp.h:
* lread.c:
* lread.c (locate_file_in_directory_mapper):
* lread.c (locate_file_construct_suffixed_files_mapper):
* mule-charset.c (Fmake_charset):
* nt.c (Fmswindows_short_file_name):
* nt.c (Fmswindows_long_file_name):
* objects-gtk.c (__get_gtk_font_truename):
* objects-gtk.c (__gtk_font_list_internal):
* objects-msw.c (font_enum_callback_2):
* objects-msw.c (create_hfont_from_font_spec):
* objects-msw.c (mswindows_font_list):
* objects-msw.c (mswindows_font_spec_matches_charset_stage_2):
* objects-tty.c (tty_initialize_font_instance):
* objects-x.c (x_font_truename):
* objects-x.c (x_font_instance_truename):
* objects-x.c (x_font_instance_properties):
* objects-x.c (x_font_list):
* print.c (write_cistring):
* print.c (print_vector_internal):
* print.c (print_cons):
* process-nt.c (nt_canonicalize_host_name):
* process-unix.c (unix_create_process):
* process-unix.c (unix_canonicalize_host_name):
* process.c (status_message):
* process.c (status_notify):
* process.c (init_xemacs_process):
* process.c (syms_of_process):
* redisplay-tty.c (term_get_fkeys_1):
* redisplay-tty.c (CONDITIONAL_REASSIGN):
* search.c (compile_pattern_1):
* select-common.h (selection_data_to_lisp_data):
* select-gtk.c (atom_to_symbol):
* select-gtk.c (PROCESSING_GTK_CODE):
* select-msw.c (mswindows_get_foreign_selection):
* select-x.c (x_atom_to_symbol):
* select-x.c (Fx_get_cutbuffer_internal):
* symbols.c (intern_istring):
* symbols.c (intern):
* symbols.c (intern_converting_underscores_to_dashes):
* symbols.c (Fintern):
* sysdep.c (init_system_name):
* sysdll.c (dll_error):
* sysdll.c (dll_open):
* syswindows.h:
* syswindows.h (build_tstr_string):
* tests.c (DFC_CHECK_LENGTH):
* tests.c (DFC_CHECK_CONTENT):
* tests.c (DFC_RESULT_PASS):
* tests.c (Ftest_data_format_conversion):
* text.c:
* text.c (new_dfc_convert_now_damn_it):
* text.h:
* text.h (build_wext_string):
* tooltalk.c (tt_build_c_string):
* tooltalk.c (Ftooltalk_default_procid):
* tooltalk.c (Ftooltalk_default_session):
* tooltalk.c (init_tooltalk):
* ui-byhand.c (Fgtk_clist_get_text):
* ui-byhand.c (Fgtk_clist_get_pixtext):
* ui-byhand.c (Fgtk_label_get):
* ui-byhand.c (Fgtk_notebook_query_tab_label_packing):
* ui-gtk.c (emacs_gtk_object_printer):
* ui-gtk.c (emacs_gtk_boxed_printer):
* ui-gtk.c (gtk_type_to_lisp):
* ui-gtk.c (symbol_to_enum):
* ui-gtk.c (enum_to_symbol):
* unexaix.c (report_error):
* unexaix.c (ERROR0):
* unexec.c (report_error):
* unexec.c (ERROR0):
* unicode.c (unicode_to_ichar):
* win32.c (tstr_to_local_file_format):
* win32.c (Fmswindows_cygwin_to_win32_path):
* win32.c (struct read_link_hash):
* xemacs.def.in.in:
Rename:
write_c_string -> write_cistring
build_intstring -> build_istring
build_string -> build_cistring
build_ext_string -> build_extstring
make_ext_string -> make_extstring
buffer_insert_c_string -> buffer_insert_ascstring
intern_int -> intern_istring
These functions have been renamed so that the naming harmonizes
with the typedefs for strings: `cistring' along with CIbyte *,
`istring' along with Ibyte *, `extstring' along with Extbyte *,
`ascstring' along with Ascbyte *.
Also make buffer_insert_ascstring take Ascbyte * and assert
that its argument is ASCII.
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Wed, 27 Jan 2010 00:35:36 -0600 |
parents | 3ecd8885ac67 |
children | 308d34e9f07d |
line wrap: on
line source
;;; undo-stack.el --- An "undoable stack" object. ;; Copyright (C) 1997 Free Software Foundation, Inc. ;; Copyright (C) 1996 Ben Wing. ;; Maintainer: XEmacs Development Team ;; Keywords: extensions, dumped ;; 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, 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. ;;; Synched up with: Not in FSF. ;;; Commentary: ;; This file is dumped with XEmacs. ;; An "undoable stack" is an object that can be used to implement ;; a history of positions, with undo and redo. Conceptually, it ;; is the kind of data structure used to keep track of (e.g.) ;; visited Web pages, so that the "Back" and "Forward" operations ;; in the browser work. Basically, I can successively visit a ;; number of Web pages through links, and then hit "Back" a ;; few times to go to previous positions, and then "Forward" a ;; few times to reverse this process. This is similar to an ;; "undo" and "redo" mechanism. ;; Note that Emacs does not standardly contain structures like ;; this. Instead, it implements history using either a ring ;; (the kill ring, the mark ring), or something like the undo ;; stack, where successive "undo" operations get recorded as ;; normal modifications, so that if you do a bunch of successive ;; undo's, then something else, then start undoing, you will ;; be redoing all your undo's back to the point before you did ;; the undo's, and then further undo's will act like the previous ;; round of undo's. I think that both of these paradigms are ;; inferior to the "undoable-stack" paradigm because they're ;; confusing and difficult to keep track of. ;; Conceptually, imagine a position history like this: ;; 1 -> 2 -> 3 -> 4 -> 5 -> 6 ;; ^^ ;; where the arrow indicates where you currently are. "Going back" ;; and "going forward" just amount to moving the arrow. However, ;; what happens if the history state is this: ;; 1 -> 2 -> 3 -> 4 -> 5 -> 6 ;; ^^ ;; and then I visit new positions (7) and (8)? In the most general ;; implementation, you've just caused a new branch like this: ;; 1 -> 2 -> 3 -> 4 -> 5 -> 6 ;; | ;; | ;; 7 -> 8 ;; ^^ ;; But then you can end up with a whole big tree, and you need ;; more sophisticated ways of navigating ("Forward" might involve ;; a choice of paths to follow) and managing its size (if you don't ;; want to keep unlimited history, you have to truncate at some point, ;; and how do you truncate a tree?) ;; My solution to this is just to insert the new positions like ;; this: ;; 1 -> 2 -> 3 -> 4 -> 7 -> 8 -> 5 -> 6 ;; ^^ ;; (Netscape, I think, would just truncate 5 and 6 completely, ;; but that seems a bit drastic. In the Emacs-standard "ring" ;; structure, this problem is avoided by simply moving 5 and 6 ;; to the beginning of the ring. However, it doesn't seem ;; logical to me to have "going back past 1" get you to 6.) ;; Now what if we have a "maximum" size of (say) 7 elements? ;; When we add 8, we could truncate either 1 or 6. Since 5 and ;; 6 are "undone" positions, we should presumably truncate ;; them before 1. So, adding 8 truncates 6, adding 9 truncates ;; 5, and adding 10 truncates 1 because there is nothing more ;; that is forward of the insertion point. ;; Interestingly, this method of truncation is almost like ;; how a ring would truncate. A ring would move 5 and 6 ;; around to the back, like this: ;; 5 -> 6 -> 1 -> 2 -> 3 -> 4 -> 7 -> 8 ;; ^^ ;; However, when 8 is added, the ring truncates 5 instead of ;; 6, which is less than optimal. ;; Conceptually, we can implement the "undoable stack" using ;; two stacks of a sort called "truncatable stack", which are ;; just simple stacks, but where you can truncate elements ;; off of the bottom of the stack. Then, the undoable stack ;; 1 -> 2 -> 3 -> 4 -> 5 -> 6 ;; ^^ ;; is equivalent to two truncatable stacks: ;; 4 <- 3 <- 2 <- 1 ;; 5 <- 6 ;; where I reversed the direction to accord with the probable ;; implementation of a standard list. To do another undo, ;; I pop 4 off of the first stack and move it to the top of ;; the second stack. A redo operation does the opposite. ;; To truncate to the proper size, first chop off 6, then 5, ;; then 1 -- in all cases, truncating off the bottom. ;;; Code: (define-error 'trunc-stack-bottom "Bottom of stack reached") (defsubst trunc-stack-stack (stack) ;; return the list representing the trunc-stack's elements. ;; the head of the list is the most recent element. (aref stack 1)) (defsubst trunc-stack-length (stack) ;; return the number of elements in the trunc-stack. (aref stack 2)) (defsubst set-trunc-stack-stack (stack new) ;; set the list representing the trunc-stack's elements. (aset stack 1 new)) (defsubst set-trunc-stack-length (stack new) ;; set the length of the trunc-stack. (aset stack 2 new)) ;; public functions: (defun make-trunc-stack () ;; make an empty trunc-stack. (vector 'trunc-stack nil 0)) (defun trunc-stack-push (stack el) ;; push a new element onto the head of the trunc-stack. (set-trunc-stack-stack stack (cons el (trunc-stack-stack stack))) (set-trunc-stack-length stack (1+ (trunc-stack-length stack)))) (defun trunc-stack-top (stack &optional n) ;; return the nth topmost element from the trunc-stack. ;; signal an error if the stack doesn't have that many elements. (or n (setq n 0)) (if (>= n (trunc-stack-length stack)) (signal-error 'trunc-stack-bottom (list stack)) (nth n (trunc-stack-stack stack)))) (defun trunc-stack-pop (stack) ;; pop and return the topmost element from the stack. (prog1 (trunc-stack-top stack) (set-trunc-stack-stack stack (cdr (trunc-stack-stack stack))) (set-trunc-stack-length stack (1- (trunc-stack-length stack))))) (defun trunc-stack-truncate (stack &optional n) ;; truncate N items off the bottom of the stack. If the stack is ;; not that big, it just becomes empty. (or n (setq n 1)) (if (> n 0) (let ((len (trunc-stack-length stack))) (if (>= n len) (progn (set-trunc-stack-length stack 0) (set-trunc-stack-stack stack nil)) (setcdr (nthcdr (1- (- len n)) (trunc-stack-stack stack)) nil) (set-trunc-stack-length stack (- len n)))))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; FMH! FMH! FMH! This object-oriented stuff doesn't really work ;;; properly without built-in structures (vectors suck) and without ;;; public and private functions and fields. (defsubst undoable-stack-max (stack) (aref stack 1)) (defsubst undoable-stack-a (stack) (aref stack 2)) (defsubst undoable-stack-b (stack) (aref stack 3)) ;; public functions: (defun make-undoable-stack (max) ;; make an empty undoable stack of max size MAX. (vector 'undoable-stack max (make-trunc-stack) (make-trunc-stack))) (defsubst set-undoable-stack-max (stack new) ;; change the max size of an undoable stack. (aset stack 1 new)) (defun undoable-stack-a-top (stack) ;; return the topmost element off the "A" stack of an undoable stack. ;; this is the most recent position pushed on the undoable stack. (trunc-stack-top (undoable-stack-a stack))) (defun undoable-stack-a-length (stack) (trunc-stack-length (undoable-stack-a stack))) (defun undoable-stack-b-top (stack) ;; return the topmost element off the "B" stack of an undoable stack. ;; this is the position that will become the most recent position, ;; after a redo operation. (trunc-stack-top (undoable-stack-b stack))) (defun undoable-stack-b-length (stack) (trunc-stack-length (undoable-stack-b stack))) (defun undoable-stack-push (stack el) ;; push an element onto the stack. (let* ((lena (trunc-stack-length (undoable-stack-a stack))) (lenb (trunc-stack-length (undoable-stack-b stack))) (max (undoable-stack-max stack)) (len (+ lena lenb))) ;; maybe truncate some elements. We have to deal with the ;; possibility that we have more elements than our max ;; (someone might have reduced the max). (if (>= len max) (let ((must-nuke (1+ (- len max)))) ;; chop off must-nuke elements from the B stack. (trunc-stack-truncate (undoable-stack-b stack) must-nuke) ;; but if there weren't that many elements to chop, ;; take the rest off the A stack. (if (< lenb must-nuke) (trunc-stack-truncate (undoable-stack-a stack) (- must-nuke lenb))))) (trunc-stack-push (undoable-stack-a stack) el))) (defun undoable-stack-pop (stack) ;; pop an element off the stack. (trunc-stack-pop (undoable-stack-a stack))) (defun undoable-stack-undo (stack) ;; transfer an element from the top of A to the top of B. ;; return value is undefined. (trunc-stack-push (undoable-stack-b stack) (trunc-stack-pop (undoable-stack-a stack)))) (defun undoable-stack-redo (stack) ;; transfer an element from the top of B to the top of A. ;; return value is undefined. (trunc-stack-push (undoable-stack-a stack) (trunc-stack-pop (undoable-stack-b stack)))) ;;; undo-stack.el ends here