comparison 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
comparison
equal deleted inserted replaced
4676:e3feb329bda9 4677:8f1ee2d15784
57 (list* 'defconst x (list 'quote x) (and doc (list doc)))) 57 (list* 'defconst x (list 'quote x) (and doc (list doc))))
58 58
59 (defun keyword-of (sym) 59 (defun keyword-of (sym)
60 (or (keywordp sym) (keywordp (intern (format ":%s" sym))))) 60 (or (keywordp sym) (keywordp (intern (format ":%s" sym)))))
61 61
62
63 ;;; Multiple values. Note that the new package uses a different
64 ;;; convention for multiple values. The following definitions
65 ;;; emulate the old convention; all function names have been changed
66 ;;; by capitalizing the first letter: Values, Multiple-value-*,
67 ;;; to avoid conflict with the new-style definitions in cl-macs.
68
69 (put 'Multiple-value-bind 'lisp-indent-function 2)
70 (put 'Multiple-value-setq 'lisp-indent-function 2)
71 (put 'Multiple-value-call 'lisp-indent-function 1)
72 (put 'Multiple-value-prog1 'lisp-indent-function 1)
73
74 (defvar *mvalues-values* nil)
75
76 (defun Values (&rest val-forms)
77 (setq *mvalues-values* val-forms)
78 (car val-forms))
79
80 (defun Values-list (val-forms)
81 (apply 'values val-forms))
82
83 (defmacro Multiple-value-list (form)
84 (list 'let* (list '(*mvalues-values* nil) (list '*mvalues-temp* form))
85 '(or (and (eq *mvalues-temp* (car *mvalues-values*)) *mvalues-values*)
86 (list *mvalues-temp*))))
87
88 (defmacro Multiple-value-call (function &rest args)
89 (list 'apply function
90 (cons 'append
91 (mapcar (function (lambda (x) (list 'Multiple-value-list x)))
92 args))))
93
94 (defmacro Multiple-value-bind (vars form &rest body)
95 (list* 'multiple-value-bind vars (list 'Multiple-value-list form) body))
96
97 (defmacro Multiple-value-setq (vars form)
98 (list 'multiple-value-setq vars (list 'Multiple-value-list form)))
99
100 (defmacro Multiple-value-prog1 (form &rest body)
101 (list 'prog1 form (list* 'let '((*mvalues-values* nil)) body)))
102
103
104 ;;; Routines for parsing keyword arguments. 62 ;;; Routines for parsing keyword arguments.
105 63
106 (defun build-klist (arglist keys &optional allow-others) 64 (defun build-klist (arglist keys &optional allow-others)
107 (let ((res (Multiple-value-call 'mapcar* 'cons (unzip-lists arglist)))) 65 (let ((res (multiple-value-call 'mapcar* 'cons (unzip-lists arglist))))
108 (or allow-others 66 (or allow-others
109 (let ((bad (set-difference (mapcar 'car res) keys))) 67 (let ((bad (set-difference (mapcar 'car res) keys)))
110 (if bad (error "Bad keywords: %s not in %s" bad keys)))) 68 (if bad (error "Bad keywords: %s not in %s" bad keys))))
111 res)) 69 res))
112 70
122 (key (cdr (assq ':key klist)))) 80 (key (cdr (assq ':key klist))))
123 (if key (setq elt (funcall key elt))) 81 (if key (setq elt (funcall key elt)))
124 (if test-not (not (funcall test-not item elt)) 82 (if test-not (not (funcall test-not item elt))
125 (funcall (or test 'eql) item elt)))) 83 (funcall (or test 'eql) item elt))))
126 84
127
128 ;;; Rounding functions with old-style multiple value returns. 85 ;;; Rounding functions with old-style multiple value returns.
129 86
130 (defun cl-floor (a &optional b) (Values-list (floor* a b))) 87 (defun cl-floor (a &optional b) (values-list (floor* a b)))
131 (defun cl-ceiling (a &optional b) (Values-list (ceiling* a b))) 88 (defun cl-ceiling (a &optional b) (values-list (ceiling* a b)))
132 (defun cl-round (a &optional b) (Values-list (round* a b))) 89 (defun cl-round (a &optional b) (values-list (round* a b)))
133 (defun cl-truncate (a &optional b) (Values-list (truncate* a b))) 90 (defun cl-truncate (a &optional b) (values-list (truncate* a b)))
134 91
135 (defun safe-idiv (a b) 92 (defun safe-idiv (a b)
136 (let* ((q (/ (abs a) (abs b))) 93 (let* ((q (/ (abs a) (abs b)))
137 (s (* (signum a) (signum b)))) 94 (s (* (signum a) (signum b))))
138 (Values q (- a (* s q b)) s))) 95 (values q (- a (* s q b)) s)))
139
140 96
141 ;; Internal routines. 97 ;; Internal routines.
142 98
143 (defun pair-with-newsyms (oldforms) 99 (defun pair-with-newsyms (oldforms)
144 (let ((newsyms (mapcar (function (lambda (x) (gensym))) oldforms))) 100 (let ((newsyms (mapcar (function (lambda (x) (gensym))) oldforms)))
145 (Values (mapcar* 'list newsyms oldforms) newsyms))) 101 (values (mapcar* 'list newsyms oldforms) newsyms)))
146 102
147 (defun zip-lists (evens odds) 103 (defun zip-lists (evens odds)
148 (mapcan 'list evens odds)) 104 (mapcan 'list evens odds))
149 105
150 (defun unzip-lists (list) 106 (defun unzip-lists (list)
151 (let ((e nil) (o nil)) 107 (let ((e nil) (o nil))
152 (while list 108 (while list
153 (setq e (cons (car list) e) o (cons (cadr list) o) list (cddr list))) 109 (setq e (cons (car list) e) o (cons (cadr list) o) list (cddr list)))
154 (Values (nreverse e) (nreverse o)))) 110 (values (nreverse e) (nreverse o))))
155 111
156 (defun reassemble-argslists (list) 112 (defun reassemble-argslists (list)
157 (let ((n (apply 'min (mapcar 'length list))) (res nil)) 113 (let ((n (apply 'min (mapcar 'length list))) (res nil))
158 (while (>= (setq n (1- n)) 0) 114 (while (>= (setq n (1- n)) 0)
159 (setq res (cons (mapcar (function (lambda (x) (elt x n))) list) res))) 115 (setq res (cons (mapcar (function (lambda (x) (elt x n))) list) res)))