Mercurial > hg > xemacs-beta
annotate lisp/cl-compat.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 | 393039450288 |
children | b5e1d4f6b66f |
rev | line source |
---|---|
613 | 1 ;;; cl-compat.el --- Common Lisp extensions for XEmacs Lisp (compatibility) |
209 | 2 |
3 ;; Copyright (C) 1993 Free Software Foundation, Inc. | |
4 | |
5 ;; Author: Dave Gillespie <daveg@synaptics.com> | |
6 ;; Version: 2.02 | |
7 ;; Keywords: extensions | |
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 Free | |
23 ;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA | |
24 ;; 02111-1307, USA. | |
25 | |
2153 | 26 ;;; Synched up with: FSF 21.3. |
209 | 27 |
28 ;;; Commentary: | |
29 | |
30 ;; These are extensions to Emacs Lisp that provide a degree of | |
31 ;; Common Lisp compatibility, beyond what is already built-in | |
32 ;; in Emacs Lisp. | |
33 ;; | |
34 ;; This package was written by Dave Gillespie; it is a complete | |
35 ;; rewrite of Cesar Quiroz's original cl.el package of December 1986. | |
36 ;; | |
37 ;; This package works with Emacs 18, Emacs 19, and XEmacs/Lucid Emacs 19. | |
38 ;; | |
39 ;; Bug reports, comments, and suggestions are welcome! | |
40 | |
41 ;; This file contains emulations of internal routines of the older | |
42 ;; CL package which users may have called directly from their code. | |
43 ;; Use (require 'cl-compat) to get these routines. | |
44 | |
45 ;; See cl.el for Change Log. | |
46 | |
47 | |
48 ;;; Code: | |
49 | |
50 ;; Require at load-time, but not when compiling cl-compat. | |
51 (or (featurep 'cl) (require 'cl)) | |
52 | |
53 | |
54 ;;; Keyword routines not supported by new package. | |
55 | |
56 (defmacro defkeyword (x &optional doc) | |
57 (list* 'defconst x (list 'quote x) (and doc (list doc)))) | |
58 | |
59 (defun keyword-of (sym) | |
60 (or (keywordp sym) (keywordp (intern (format ":%s" sym))))) | |
61 | |
62 ;;; Routines for parsing keyword arguments. | |
63 | |
64 (defun build-klist (arglist keys &optional allow-others) | |
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2153
diff
changeset
|
65 (let ((res (multiple-value-call 'mapcar* 'cons (unzip-lists arglist)))) |
209 | 66 (or allow-others |
67 (let ((bad (set-difference (mapcar 'car res) keys))) | |
68 (if bad (error "Bad keywords: %s not in %s" bad keys)))) | |
69 res)) | |
70 | |
71 (defun extract-from-klist (klist key &optional def) | |
72 (let ((res (assq key klist))) (if res (cdr res) def))) | |
73 | |
74 (defun keyword-argument-supplied-p (klist key) | |
75 (assq key klist)) | |
76 | |
77 (defun elt-satisfies-test-p (item elt klist) | |
78 (let ((test-not (cdr (assq ':test-not klist))) | |
79 (test (cdr (assq ':test klist))) | |
80 (key (cdr (assq ':key klist)))) | |
81 (if key (setq elt (funcall key elt))) | |
82 (if test-not (not (funcall test-not item elt)) | |
83 (funcall (or test 'eql) item elt)))) | |
84 | |
85 ;;; Rounding functions with old-style multiple value returns. | |
86 | |
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2153
diff
changeset
|
87 (defun cl-floor (a &optional b) (values-list (floor* a b))) |
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2153
diff
changeset
|
88 (defun cl-ceiling (a &optional b) (values-list (ceiling* a b))) |
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2153
diff
changeset
|
89 (defun cl-round (a &optional b) (values-list (round* a b))) |
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2153
diff
changeset
|
90 (defun cl-truncate (a &optional b) (values-list (truncate* a b))) |
209 | 91 |
92 (defun safe-idiv (a b) | |
93 (let* ((q (/ (abs a) (abs b))) | |
94 (s (* (signum a) (signum b)))) | |
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2153
diff
changeset
|
95 (values q (- a (* s q b)) s))) |
209 | 96 |
97 ;; Internal routines. | |
98 | |
99 (defun pair-with-newsyms (oldforms) | |
100 (let ((newsyms (mapcar (function (lambda (x) (gensym))) oldforms))) | |
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2153
diff
changeset
|
101 (values (mapcar* 'list newsyms oldforms) newsyms))) |
209 | 102 |
103 (defun zip-lists (evens odds) | |
104 (mapcan 'list evens odds)) | |
105 | |
106 (defun unzip-lists (list) | |
107 (let ((e nil) (o nil)) | |
108 (while list | |
109 (setq e (cons (car list) e) o (cons (cadr list) o) list (cddr list))) | |
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2153
diff
changeset
|
110 (values (nreverse e) (nreverse o)))) |
209 | 111 |
112 (defun reassemble-argslists (list) | |
113 (let ((n (apply 'min (mapcar 'length list))) (res nil)) | |
114 (while (>= (setq n (1- n)) 0) | |
115 (setq res (cons (mapcar (function (lambda (x) (elt x n))) list) res))) | |
116 res)) | |
117 | |
118 (defun duplicate-symbols-p (list) | |
119 (let ((res nil)) | |
120 (while list | |
121 (if (memq (car list) (cdr list)) (setq res (cons (car list) res))) | |
122 (setq list (cdr list))) | |
123 res)) | |
124 | |
125 | |
126 ;;; Setf internals. | |
127 | |
128 (defun setnth (n list x) | |
129 (setcar (nthcdr n list) x)) | |
130 | |
131 (defun setnthcdr (n list x) | |
132 (setcdr (nthcdr (1- n) list) x)) | |
133 | |
134 (defun setelt (seq n x) | |
135 (if (consp seq) (setcar (nthcdr n seq) x) (aset seq n x))) | |
136 | |
137 | |
138 ;;; Functions omitted: case-clausify, check-do-stepforms, check-do-endforms, | |
139 ;;; extract-do-inits, extract-do[*]-steps, select-stepping-forms, | |
140 ;;; elt-satisfies-if[-not]-p, with-keyword-args, mv-bind-clausify, | |
141 ;;; all names with embedded `$'. | |
142 | |
143 | |
144 (provide 'cl-compat) | |
145 | |
2153 | 146 ;;; arch-tag: 9996bb4f-aaf5-4592-b436-bf64759a3163 |
209 | 147 ;;; cl-compat.el ends here |