Mercurial > hg > xemacs-beta
view lisp/undo-stack.el @ 4677:8f1ee2d15784
Support full Common Lisp multiple values in C.
lisp/ChangeLog
2009-08-11 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el :
Update this file to support full C-level multiple values. This
involves:
-- Four new bytecodes, and special compiler functions to compile
multiple-value-call, multiple-value-list-internal, values,
values-list, and, since it now needs to pass back multiple values
and is a special form, throw.
-- There's a new compiler variable, byte-compile-checks-on-load,
which is a list of forms that are evaluated at the very start of a
file, with an error thrown if any of them give nil.
-- The header is now inserted *after* compilation, giving a chance
for the compilation process to influence what those checks
are. There is still a check done before compilation for non-ASCII
characters, to try to turn off dynamic docstrings if appopriate,
in `byte-compile-maybe-reset-coding'.
Space is reserved for checks; comments describing the version of
the byte compiler generating the file are inserted if space
remains for them.
* bytecomp.el (byte-compile-version):
Update this, we're a newer version of the byte compiler.
* byte-optimize.el (byte-optimize-funcall):
Correct a comment.
* bytecomp.el (byte-compile-lapcode):
Discard the arg with byte-multiple-value-call.
* bytecomp.el (byte-compile-checks-and-comments-space):
New variable, describe how many octets to reserve for checks at
the start of byte-compiled files.
* cl-compat.el:
Remove the fake multiple-value implementation. Have the functions
that use it use the real multiple-value implementation instead.
* cl-macs.el (cl-block-wrapper, cl-block-throw):
Revise the byte-compile properties of these symbols to work now
we've made throw into a special form; keep the byte-compile
properties as anonymous lambdas, since we don't have docstrings
for them.
* cl-macs.el (multiple-value-bind, multiple-value-setq)
(multiple-value-list, nth-value):
Update these functions to work with the C support for multiple
values.
* cl-macs.el (values):
Modify the setf handler for this to call
#'multiple-value-list-internal appropriately.
* cl-macs.el (cl-setf-do-store):
If the store form is a cons, treat it specially as wrapping the
store value.
* cl.el (cl-block-wrapper):
Make this an alias of #'and, not #'identity, since it needs to
pass back multiple values.
* cl.el (multiple-value-apply):
We no longer support this, mark it obsolete.
* lisp-mode.el (eval-interactive-verbose):
Remove a useless space in the docstring.
* lisp-mode.el (eval-interactive):
Update this function and its docstring. It now passes back a list,
basically wrapping any eval calls with multiple-value-list. This
allows multiple values to be printed by default in *scratch*.
* lisp-mode.el (prin1-list-as-multiple-values):
New function, printing a list as multiple values in the manner of
Bruno Haible's clisp, separating each entry with " ;\n".
* lisp-mode.el (eval-last-sexp):
Call #'prin1-list-as-multiple-values on the return value of
#'eval-interactive.
* lisp-mode.el (eval-defun):
Call #'prin1-list-as-multiple-values on the return value of
#'eval-interactive.
* mouse.el (mouse-eval-sexp):
Deal with lists corresponding to multiple values from
#'eval-interactive. Call #'cl-prettyprint, which is always
available, instead of sometimes calling #'pprint and sometimes
falling back to prin1.
* obsolete.el (obsolete-throw):
New function, called from eval.c when #'funcall encounters an
attempt to call #'throw (now a special form) as a function. Only
needed for compatibility with 21.4 byte-code.
man/ChangeLog addition:
2009-08-11 Aidan Kehoe <kehoea@parhasard.net>
* cl.texi (Organization):
Remove references to the obsolete multiple-value emulating code.
src/ChangeLog addition:
2009-08-11 Aidan Kehoe <kehoea@parhasard.net>
* bytecode.c (enum Opcode /* Byte codes */):
Add four new bytecodes, to deal with multiple values.
(POP_WITH_MULTIPLE_VALUES): New macro.
(POP): Modify this macro to ignore multiple values.
(DISCARD_PRESERVING_MULTIPLE_VALUES): New macro.
(DISCARD): Modify this macro to ignore multiple values.
(TOP_WITH_MULTIPLE_VALUES): New macro.
(TOP_ADDRESS): New macro.
(TOP): Modify this macro to ignore multiple values.
(TOP_LVALUE): New macro.
(Bcall): Ignore multiple values where appropriate.
(Breturn): Pass back multiple values.
(Bdup): Preserve multiple values.
Use TOP_LVALUE with most bytecodes that assign anything to
anything.
(Bbind_multiple_value_limits, Bmultiple_value_call,
Bmultiple_value_list_internal, Bthrow): Implement the new
bytecodes.
(Bgotoifnilelsepop, Bgotoifnonnilelsepop, BRgotoifnilelsepop,
BRgotoifnonnilelsepop):
Discard any multiple values.
* callint.c (Fcall_interactively):
Ignore multiple values when calling #'eval, in two places.
* device-x.c (x_IO_error_handler):
* macros.c (pop_kbd_macro_event):
* eval.c (Fsignal):
* eval.c (flagged_a_squirmer):
Call throw_or_bomb_out, not Fthrow, now that the latter is a
special form.
* eval.c:
Make Qthrow, Qobsolete_throw available as symbols.
Provide multiple_value_current_limit, multiple-values-limit (the
latter as specified by Common Lisp.
* eval.c (For):
Ignore multiple values when comparing with Qnil, but pass any
multiple values back for the last arg.
* eval.c (Fand):
Ditto.
* eval.c (Fif):
Ignore multiple values when examining the result of the
condition.
* eval.c (Fcond):
Ignore multiple values when comparing what the clauses give, but
pass them back if a clause gave non-nil.
* eval.c (Fprog2):
Never pass back multiple values.
* eval.c (FletX, Flet):
Ignore multiple when evaluating what exactly symbols should be
bound to.
* eval.c (Fwhile):
Ignore multiple values when evaluating the test.
* eval.c (Fsetq, Fdefvar, Fdefconst):
Ignore multiple values.
* eval.c (Fthrow):
Declare this as a special form; ignore multiple values for TAG,
preserve them for VALUE.
* eval.c (throw_or_bomb_out):
Make this available to other files, now Fthrow is a special form.
* eval.c (Feval):
Ignore multiple values when calling a compiled function, a
non-special-form subr, or a lambda expression.
* eval.c (Ffuncall):
If we attempt to call #'throw (now a special form) as a function,
don't error, call #'obsolete-throw instead.
* eval.c (make_multiple_value, multiple_value_aset)
(multiple_value_aref, print_multiple_value, mark_multiple_value)
(size_multiple_value):
Implement the multiple_value type. Add a long comment describing
our implementation.
* eval.c (bind_multiple_value_limits):
New function, used by the bytecode and by #'multiple-value-call,
#'multiple-value-list-internal.
* eval.c (multiple_value_call):
New function, used by the bytecode and #'multiple-value-call.
* eval.c (Fmultiple_value_call):
New special form.
* eval.c (multiple_value_list_internal):
New function, used by the byte code and
#'multiple-value-list-internal.
* eval.c (Fmultiple_value_list_internal, Fmultiple_value_prog1):
New special forms.
* eval.c (Fvalues, Fvalues_list):
New Lisp functions.
* eval.c (values2):
New function, for C code returning multiple values.
* eval.c (syms_of_eval):
Make our new Lisp functions and symbols available.
* eval.c (multiple-values-limit):
Make this available to Lisp.
* event-msw.c (dde_eval_string):
* event-stream.c (execute_help_form):
* glade.c (connector):
* glyphs-widget.c (glyph_instantiator_to_glyph):
* glyphs.c (evaluate_xpm_color_symbols):
* gui-x.c (wv_set_evalable_slot, button_item_to_widget_value):
* gui.c (gui_item_value, gui_item_display_flush_left):
* lread.c (check_if_suppressed):
* menubar-gtk.c (menu_convert, menu_descriptor_to_widget_1):
* menubar-msw.c (populate_menu_add_item):
* print.c (Fwith_output_to_temp_buffer):
* symbols.c (Fsetq_default):
Ignore multiple values when calling Feval.
* symeval.h:
Add the header declarations necessary for the multiple-values
implementation.
* inline.c:
#include symeval.h, now that it has some inline functions.
* lisp.h:
Update Fthrow's declaration. Make throw_or_bomb_out available to
all files.
* lrecord.h (enum lrecord_type):
Add the multiple_value type here.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sun, 16 Aug 2009 20:55:49 +0100 |
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