Mercurial > hg > xemacs-beta
annotate lisp/x-select.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 | 5e906dd5c3e9 |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 428 | 1 ;;; x-select.el --- Lisp interface to X Selections. |
| 2 | |
| 3 ;; Copyright (C) 1990, 1997 Free Software Foundation, Inc. | |
| 4 ;; Copyright (C) 1995 Sun Microsystems. | |
| 5 | |
| 6 ;; Maintainer: XEmacs Development Team | |
| 7 ;; Keywords: extensions, dumped | |
| 8 | |
| 9 ;; This file is part of XEmacs. | |
| 10 | |
| 11 ;; XEmacs is free software; you can redistribute it and/or modify it | |
| 12 ;; under the terms of the GNU General Public License as published by | |
| 13 ;; the Free Software Foundation; either version 2, or (at your option) | |
| 14 ;; any later version. | |
| 15 | |
| 16 ;; XEmacs is distributed in the hope that it will be useful, but | |
| 17 ;; WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 19 ;; General Public License for more details. | |
| 20 | |
| 21 ;; You should have received a copy of the GNU General Public License | |
| 22 ;; along with XEmacs; see the file COPYING. If not, write to the | |
| 23 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 24 ;; Boston, MA 02111-1307, USA. | |
| 25 | |
| 26 ;;; Synched up with: FSF 19.30 (select.el). | |
| 27 | |
| 28 ;;; Commentary: | |
| 29 | |
| 30 ;; This file is dumped with XEmacs (when X support is compiled in). | |
| 31 | |
| 32 ;; The selection code requires us to use certain symbols whose names are | |
| 33 ;; all upper-case; this may seem tasteless, but it makes there be a 1:1 | |
| 34 ;; correspondence between these symbols and X Atoms (which are upcased). | |
| 35 | |
| 36 ;;; Code: | |
| 37 | |
| 502 | 38 (globally-declare-fboundp |
| 39 '(x-get-cutbuffer-internal | |
| 40 x-rotate-cutbuffers-internal x-store-cutbuffer-internal)) | |
| 41 | |
| 428 | 42 (define-obsolete-function-alias 'x-selection-exists-p 'selection-exists-p) |
| 43 (define-obsolete-function-alias 'x-selection-owner-p 'selection-owner-p) | |
| 44 (define-obsolete-variable-alias 'x-selection-converter-alist 'selection-converter-alist) | |
| 45 (define-obsolete-variable-alias 'x-lost-selection-hooks 'lost-selection-hooks) | |
| 2620 | 46 (define-obsolete-variable-alias 'x-selected-text-type 'selection-preferred-types) |
| 428 | 47 (define-obsolete-function-alias 'x-valid-simple-selection-p 'valid-simple-selection-p) |
| 48 (define-obsolete-function-alias 'x-own-selection 'own-selection) | |
| 49 (define-obsolete-function-alias 'x-disown-selection 'disown-selection) | |
| 50 (define-obsolete-function-alias 'x-delete-primary-selection 'delete-primary-selection) | |
| 51 (define-obsolete-function-alias 'x-copy-primary-selection 'copy-primary-selection) | |
| 52 (define-obsolete-function-alias 'x-kill-primary-selection 'kill-primary-selection) | |
| 53 (define-obsolete-function-alias 'x-select-make-extent-for-selection | |
| 54 'select-make-extent-for-selection) | |
| 55 (define-obsolete-function-alias 'x-cut-copy-clear-internal 'cut-copy-clear-internal) | |
| 56 (define-obsolete-function-alias 'x-get-selection 'get-selection) | |
| 57 (define-obsolete-function-alias 'x-get-clipboard 'get-clipboard) | |
| 444 | 58 (define-obsolete-function-alias 'x-yank-clipboard-selection |
| 428 | 59 'yank-clipboard-selection) |
| 60 (define-obsolete-function-alias 'x-disown-selection-internal | |
| 61 'disown-selection-internal) | |
| 62 | |
| 63 (defun x-get-secondary-selection () | |
| 64 "Return text selected from some X window." | |
| 65 (get-selection 'SECONDARY)) | |
| 66 | |
| 67 (defun x-own-secondary-selection (selection &optional type) | |
| 68 "Make a secondary X Selection of the given argument. The argument may be a | |
| 69 string or a cons of two markers (in which case the selection is considered to | |
| 70 be the text between those markers)." | |
| 71 (interactive (if (not current-prefix-arg) | |
| 72 (list (read-string "Store text for pasting: ")) | |
| 73 (list (cons ;; these need not be ordered. | |
| 74 (copy-marker (point-marker)) | |
| 75 (copy-marker (mark-marker)))))) | |
| 76 (own-selection selection 'SECONDARY)) | |
| 77 | |
| 78 (defun x-notice-selection-requests (selection type successful) | |
| 444 | 79 "for possible use as the value of `x-sent-selection-hooks'." |
| 428 | 80 (if (not successful) |
| 81 (message "Selection request failed to convert %s to %s" | |
| 82 selection type) | |
| 83 (message "Sent selection %s as %s" selection type))) | |
| 84 | |
| 85 (defun x-notice-selection-failures (selection type successful) | |
| 444 | 86 "for possible use as the value of `x-sent-selection-hooks'." |
| 428 | 87 (or successful |
| 88 (message "Selection request failed to convert %s to %s" | |
| 89 selection type))) | |
| 90 | |
| 91 ;(setq x-sent-selection-hooks 'x-notice-selection-requests) | |
| 92 ;(setq x-sent-selection-hooks 'x-notice-selection-failures) | |
| 93 | |
| 94 | |
| 95 ;;; Cut Buffer support | |
| 96 | |
| 97 ;;; FSF name x-get-cut-buffer | |
| 98 (defun x-get-cutbuffer (&optional which-one) | |
| 99 "Return the value of one of the 8 X server cut buffers. | |
| 100 Optional arg WHICH-ONE should be a number from 0 to 7, defaulting to 0. | |
| 101 Cut buffers are considered obsolete; you should use selections instead. | |
| 444 | 102 This function does nothing if cut buffer support was not compiled in." |
| 103 (when (fboundp 'x-get-cutbuffer-internal) | |
| 104 (x-get-cutbuffer-internal | |
| 105 (aref [CUT_BUFFER0 CUT_BUFFER1 CUT_BUFFER2 CUT_BUFFER3 | |
| 106 CUT_BUFFER4 CUT_BUFFER5 CUT_BUFFER6 CUT_BUFFER7] | |
| 107 (or which-one 0))))) | |
| 428 | 108 |
| 109 ;;; FSF name x-set-cut-buffer | |
| 110 (defun x-store-cutbuffer (string &optional push) | |
| 111 "Store STRING into the X server's primary cut buffer. | |
| 444 | 112 If optional arg PUSH is non-nil, also rotate the cut buffers: this |
| 113 means the previous value of the primary cut buffer moves to the second | |
| 428 | 114 cut buffer, and the second to the third, and so on (there are 8 buffers.) |
| 115 Cut buffers are considered obsolete; you should use selections instead. | |
| 444 | 116 This function does nothing if cut buffer support was not compiled in." |
| 117 (when (fboundp 'x-store-cutbuffer-internal) | |
| 118 (when push | |
| 119 (x-rotate-cutbuffers-internal 1)) | |
| 120 (x-store-cutbuffer-internal 'CUT_BUFFER0 string))) | |
| 428 | 121 |
| 122 | |
| 123 ;FSFmacs (provide 'select) | |
| 124 | |
| 125 ;;; x-select.el ends here. |