Mercurial > hg > xemacs-beta
comparison src/symeval.h @ 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 | d674024a8674 |
children | 17362f371cc2 19a72041c5ed e0db3c197671 |
comparison
equal
deleted
inserted
replaced
4676:e3feb329bda9 | 4677:8f1ee2d15784 |
---|---|
486 #define DEFVAR_BOOL_MAGIC(lname, c_location, magicfun) \ | 486 #define DEFVAR_BOOL_MAGIC(lname, c_location, magicfun) \ |
487 DEFVAR_SYMVAL_FWD_INT (lname, c_location, SYMVAL_BOOLEAN_FORWARD, magicfun) | 487 DEFVAR_SYMVAL_FWD_INT (lname, c_location, SYMVAL_BOOLEAN_FORWARD, magicfun) |
488 | 488 |
489 void flush_all_buffer_local_cache (void); | 489 void flush_all_buffer_local_cache (void); |
490 | 490 |
491 struct multiple_value { | |
492 struct LCRECORD_HEADER header; | |
493 Elemcount count; | |
494 Elemcount allocated_count; | |
495 Elemcount first_desired; | |
496 Lisp_Object contents[1]; | |
497 }; | |
498 typedef struct multiple_value multiple_value; | |
499 | |
500 DECLARE_LRECORD (multiple_value, multiple_value); | |
501 #define MULTIPLE_VALUEP(x) RECORDP (x, multiple_value) | |
502 | |
503 #define XMULTIPLE_VALUE(x) XRECORD (x, multiple_value, multiple_value) | |
504 #define wrap_multiple_value(p) wrap_record (p, multiple_value) | |
505 | |
506 #define CHECK_MULTIPLE_VALUE(x) CHECK_RECORD (x, multiple_value) | |
507 #define CONCHECK_MULTIPLE_VALUE(x) CONCHECK_RECORD (x, multiple_value) | |
508 | |
509 #define multiple_value_count(x) ((x)->count) | |
510 #define multiple_value_allocated_count(x) ((x)->allocated_count) | |
511 #define multiple_value_first_desired(x) ((x)->first_desired) | |
512 #define multiple_value_contents(x) ((x)->contents) | |
513 | |
514 #define XMULTIPLE_VALUE_COUNT(x) multiple_value_count (XMULTIPLE_VALUE (x)) | |
515 #define XMULTIPLE_VALUE_ALLOCATED_COUNT(x) \ | |
516 multiple_value_allocated_count (XMULTIPLE_VALUE (x)) | |
517 #define XMULTIPLE_VALUE_FIRST_DESIRED(x) \ | |
518 multiple_value_first_desired (XMULTIPLE_VALUE(x)) | |
519 #define XMULTIPLE_VALUE_CONTENTS(x) multiple_value_contents (XMULTIPLE_VALUE(x)) | |
520 | |
521 Lisp_Object multiple_value_call (int nargs, Lisp_Object *args); | |
522 Lisp_Object multiple_value_list_internal (int nargs, Lisp_Object *args); | |
523 | |
524 /* It's slightly ugly to expose this here, but it does cut down the amount | |
525 of work the bytecode interpreter has to do substantially. */ | |
526 extern int multiple_value_current_limit; | |
527 | |
528 /* Bind the multiple value limits that #'values and #'values-list pay | |
529 attention to. Used by bytecode and interpreted code. */ | |
530 int bind_multiple_value_limits (int first, int upper); | |
531 | |
532 Lisp_Object multiple_value_aref (Lisp_Object, Elemcount); | |
533 void multiple_value_aset (Lisp_Object, Elemcount, Lisp_Object); | |
534 | |
535 Lisp_Object values2 (Lisp_Object first, Lisp_Object second); | |
536 | |
537 DECLARE_INLINE_HEADER ( | |
538 Lisp_Object | |
539 ignore_multiple_values (Lisp_Object obj) | |
540 ) | |
541 { | |
542 return MULTIPLE_VALUEP (obj) ? multiple_value_aref (obj, 0) : obj; | |
543 } | |
544 | |
545 #ifdef ERROR_CHECK_MULTIPLE_VALUES | |
546 | |
547 DECLARE_INLINE_HEADER ( | |
548 Lisp_Object | |
549 ignore_multiple_values_1 (Lisp_Object obj) | |
550 ) | |
551 { | |
552 if (1 == multiple_value_current_limit) | |
553 { | |
554 assert (!MULTIPLE_VALUEP (obj)); | |
555 return obj; | |
556 } | |
557 | |
558 return ignore_multiple_values (obj); | |
559 } | |
560 | |
561 #define IGNORE_MULTIPLE_VALUES(X) ignore_multiple_values_1 (X) | |
562 | |
563 #else | |
564 #define IGNORE_MULTIPLE_VALUES(X) (multiple_value_current_limit == 1 ? (X) \ | |
565 : ignore_multiple_values (X)) | |
566 #endif | |
567 | |
491 END_C_DECLS | 568 END_C_DECLS |
492 | 569 |
493 #endif /* INCLUDED_symeval_h_ */ | 570 #endif /* INCLUDED_symeval_h_ */ |