comparison lisp/lisp-mode.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 830872ebe096
children 46f0df723e09
comparison
equal deleted inserted replaced
4676:e3feb329bda9 4677:8f1ee2d15784
422 The messages are printed when the expression is treated differently 422 The messages are printed when the expression is treated differently
423 using `\\[eval-last-sexp]' and `\\[eval-defun]' than it would have 423 using `\\[eval-last-sexp]' and `\\[eval-defun]' than it would have
424 been treated noninteractively. 424 been treated noninteractively.
425 425
426 The printed messages are \"defvar treated as defconst\" and \"defcustom 426 The printed messages are \"defvar treated as defconst\" and \"defcustom
427 evaluation forced\". See `eval-interactive' for more details." 427 evaluation forced\". See `eval-interactive' for more details."
428 :type 'boolean 428 :type 'boolean
429 :group 'lisp) 429 :group 'lisp)
430 430
431 (defun eval-interactive (expr) 431 (defun eval-interactive (expr)
432 "Like `eval' except that it transforms defvars to defconsts. 432 "Evaluate EXPR; pass back multiple values, transform defvars to defconsts.
433 The evaluation of defcustom forms is forced." 433
434 Always returns a list. The length of this list will be something other than
435 one if the form returned multiple values. It will be zero if the form
436 returned a single zero-length multiple value."
434 (cond ((and (eq (car-safe expr) 'defvar) 437 (cond ((and (eq (car-safe expr) 'defvar)
435 (> (length expr) 2)) 438 (> (length expr) 2))
436 (eval (cons 'defconst (cdr expr))) 439 (setq expr (multiple-value-list (eval (cons 'defconst (cdr expr)))))
437 (when eval-interactive-verbose 440 (when eval-interactive-verbose
438 (message "defvar treated as defconst") 441 (message "defvar treated as defconst")
439 (sit-for 1) 442 (sit-for 1)
440 (message "")) 443 (message ""))
441 (nth 1 expr)) 444 expr)
442 ((and (eq (car-safe expr) 'defcustom) 445 ((and (eq (car-safe expr) 'defcustom)
443 (> (length expr) 2) 446 (> (length expr) 2)
444 (default-boundp (nth 1 expr))) 447 (default-boundp (nth 1 expr)))
445 ;; Force variable to be bound 448 ;; Force variable to be bound
446 ;; #### defcustom might specify a different :set method. 449 (funcall
447 (set-default (nth 1 expr) (eval (nth 2 expr))) 450 (or (plist-get expr :set) #'custom-set-default)
451 (nth 1 expr) (eval (nth 2 expr)))
448 ;; And evaluate the defcustom 452 ;; And evaluate the defcustom
449 (eval expr) 453 (setq expr (multiple-value-list (eval expr)))
450 (when eval-interactive-verbose 454 (when eval-interactive-verbose
451 (message "defcustom evaluation forced") 455 (message "defcustom evaluation forced")
452 (sit-for 1) 456 (sit-for 1)
453 (message "")) 457 (message ""))
454 (nth 1 expr)) 458 expr)
455 (t 459 (t
456 (eval expr)))) 460 (multiple-value-list (eval expr)))))
461
462 (defun prin1-list-as-multiple-values (multiple-value-list &optional stream)
463 "Call `prin1' on each element of MULTIPLE-VALUE-LIST, separated by \" ;\\n\"
464
465 If MULTIPLE-VALUE-LIST is zero-length, print the text
466 \"#<zero length multiple value> ;\\n\". Always returns nil."
467 (loop for value in multiple-value-list
468 with seen-first = nil
469 do
470 (if seen-first
471 (princ " ;\n" stream)
472 (setq seen-first t))
473 (prin1 value stream)
474 finally (unless seen-first
475 (princ "#<zero length multiple value> ;" stream))))
457 476
458 ;; XEmacs change, based on Bob Weiner suggestion 477 ;; XEmacs change, based on Bob Weiner suggestion
459 (defun eval-last-sexp (eval-last-sexp-arg-internal) ;dynamic scoping wonderment 478 (defun eval-last-sexp (eval-last-sexp-arg-internal) ;dynamic scoping wonderment
460 "Evaluate sexp before point; print value in minibuffer. 479 "Evaluate sexp before point; print value in minibuffer.
461 With argument, print output into current buffer." 480 With argument, print output into current buffer."
462 (interactive "P") 481 (interactive "P")
463 (let ((standard-output (if eval-last-sexp-arg-internal (current-buffer) t)) 482 (let ((standard-output (if eval-last-sexp-arg-internal (current-buffer) t))
464 (opoint (point)) 483 (opoint (point))
465 ignore-quotes) 484 ignore-quotes)
466 (prin1 (eval-interactive 485 (prin1-list-as-multiple-values
467 (letf (((syntax-table) emacs-lisp-mode-syntax-table)) 486 (eval-interactive
468 (save-excursion 487 (letf (((syntax-table) emacs-lisp-mode-syntax-table))
469 ;; If this sexp appears to be enclosed in `...' then 488 (save-excursion
470 ;; ignore the surrounding quotes. 489 ;; If this sexp appears to be enclosed in `...' then
471 (setq ignore-quotes (or (eq (char-after) ?\') 490 ;; ignore the surrounding quotes.
472 (eq (char-before) ?\'))) 491 (setq ignore-quotes (or (eq (char-after) ?\')
473 (forward-sexp -1) 492 (eq (char-before) ?\')))
474 ;; vladimir@cs.ualberta.ca 30-Jul-1997: skip ` in 493 (forward-sexp -1)
475 ;; `variable' so that the value is returned, not the 494 ;; vladimir@cs.ualberta.ca 30-Jul-1997: skip ` in
476 ;; name. 495 ;; `variable' so that the value is returned, not the
477 (if (and ignore-quotes 496 ;; name.
478 (eq (char-after) ?\`)) 497 (if (and ignore-quotes
479 (forward-char)) 498 (eq (char-after) ?\`))
480 (save-restriction 499 (forward-char))
481 (narrow-to-region (point-min) opoint) 500 (save-restriction
482 (let ((expr (read (current-buffer)))) 501 (narrow-to-region (point-min) opoint)
483 (if (eq (car-safe expr) 'interactive) 502 (let ((expr (read (current-buffer))))
484 ;; If it's an (interactive ...) form, it's 503 (if (eq (car-safe expr) 'interactive)
485 ;; more useful to show how an interactive call 504 ;; If it's an (interactive ...) form, it's
486 ;; would use it. 505 ;; more useful to show how an interactive call
487 `(call-interactively 506 ;; would use it.
488 (lambda (&rest args) 507 `(call-interactively
489 ,expr args)) 508 (lambda (&rest args)
490 expr))))))))) 509 ,expr args))
510 expr)))))))))
491 511
492 (defun eval-defun (eval-defun-arg-internal) 512 (defun eval-defun (eval-defun-arg-internal)
493 "Evaluate defun that point is in or before. 513 "Evaluate defun that point is in or before.
494 Print value in minibuffer. 514 Print value in minibuffer.
495 With argument, insert value in current buffer after the defun." 515 With argument, insert value in current buffer after the defun."
496 (interactive "P") 516 (interactive "P")
497 (let ((standard-output (if eval-defun-arg-internal (current-buffer) t))) 517 (let ((standard-output (if eval-defun-arg-internal (current-buffer) t)))
498 (prin1 (eval-interactive (save-excursion 518 (prin1-list-as-multiple-values
499 (end-of-defun) 519 (eval-interactive
500 (beginning-of-defun) 520 (save-excursion
501 (read (current-buffer))))))) 521 (end-of-defun)
502 522 (beginning-of-defun)
523 (read (current-buffer)))))))
503 524
504 (defun lisp-comment-indent () 525 (defun lisp-comment-indent ()
505 (if (looking-at "\\s<\\s<\\s<") 526 (if (looking-at "\\s<\\s<\\s<")
506 (current-column) 527 (current-column)
507 (if (looking-at "\\s<\\s<") 528 (if (looking-at "\\s<\\s<")