Mercurial > hg > xemacs-beta
view src/console-tty-impl.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 | f6cd5fe9bf4c |
children | e0db3c197671 |
line wrap: on
line source
/* Define TTY specific console, device, and frame object for XEmacs. Copyright (C) 1995 Board of Trustees, University of Illinois. Copyright (C) 1996 Ben Wing. This file is part of XEmacs. XEmacs is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. XEmacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with XEmacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Synched up with: Not in FSF. */ /* Written by Chuck Thompson and Ben Wing. */ /* NOTE: Currently each TTY console can have only one device. Therefore, all stuff for both input and output is lumped into the console structure. If it ever becomes meaningful to have more than one device on a TTY console, the output stuff will have to get separated out. */ #ifndef INCLUDED_console_tty_impl_h_ #define INCLUDED_console_tty_impl_h_ #include "console-impl.h" #include "console-tty.h" DECLARE_CONSOLE_TYPE (tty); struct tty_console { #ifdef NEW_GC struct lrecord_header header; #endif /* NEW_GC */ int infd, outfd; Lisp_Object instream, outstream; Lisp_Object terminal_type; Lisp_Object controlling_process; char *term_entry_buffer; /* Physical location of cursor on this console. */ int cursor_x; int cursor_y; /* The real location of the cursor. The above physical location may be ahead of where we really are. */ int real_cursor_x; int real_cursor_y; int final_cursor_x; int final_cursor_y; int height; int width; /* The count of frame number. */ int frame_count; /* flags indicating presence, absence or value of various features */ struct { unsigned int must_write_spaces :1; /* terminal inserts nulls, not spaces to fill whitespace on screen */ unsigned int insert_mode_motion :1; /* cursor movement commands work while in insert mode */ unsigned int standout_motion :1; /* cursor movement is graceful in standout or underline mode */ unsigned int memory_above_frame :1; /* display retained above screen */ unsigned int memory_below_frame :1; /* display retained below screen */ unsigned int meta_key :2; /* 0 == mask off top bit; 1 == top bit is meta; 2 == top bit is useful as character info */ unsigned int flow_control :1; /* Nonzero means use ^S/^Q as cretinous flow control. */ int standout_width; /* # of spaces printed when change to standout mode */ int underline_width; /* # of spaces printed when change to underline mode */ } flags; /* cursor motion entries - each entry is commented with the terminfo and the termcap entry */ struct { /* local cursor movement */ const char *up; /* cuu1, up */ const char *down; /* cud1, do */ const char *left; /* cub1, le */ const char *right; /* cuf1, nd */ const char *home; /* home, ho */ const char *low_left; /* ll, ll */ const char *car_return; /* cr, cr */ /* parameterized local cursor movement */ const char *multi_up; /* cuu, UP */ const char *multi_down; /* cud, DO */ const char *multi_left; /* cub, LE */ const char *multi_right; /* cuf, RI */ /* absolute cursor motion */ const char *abs; /* cup, cm */ const char *hor_abs; /* hpa, ch */ const char *ver_abs; /* vpa, cv */ /* scrolling */ const char *scroll_forw; /* ind, sf */ const char *scroll_back; /* ri, sr */ const char *multi_scroll_forw; /* indn, SF */ const char *multi_scroll_back; /* rin, SR */ const char *set_scroll_region; /* csr, cs */ } cm; /* screen editing entries - each entry is commented with the terminfo and the termcap entry */ struct { /* adding to the screen */ const char *ins_line; /* il1, al */ const char *multi_ins_line; /* il, AL */ const char *repeat; /* rep, rp */ const char *begin_ins_mode; /* smir, im */ const char *end_ins_mode; /* rmir, ei */ const char *ins_char; /* ich1, ic */ const char *multi_ins_char; /* ich, IC */ const char *insert_pad; /* ip, ip */ /* deleting from the screen */ const char *clr_frame; /* clear, cl */ const char *clr_from_cursor; /* ed, cd */ const char *clr_to_eol; /* el, ce */ const char *del_line; /* dl1, dl */ const char *multi_del_line; /* dl, DL */ const char *del_char; /* dch1, dc */ const char *multi_del_char; /* dch, DC */ const char *begin_del_mode; /* smdc, dm */ const char *end_del_mode; /* rmdc, ed */ const char *erase_at_cursor; /* ech, ec */ } se; /* screen display entries - each entry is commented with the terminfo and termcap entry */ struct { const char *begin_standout; /* smso, so */ const char *end_standout; /* rmso, se */ const char *begin_underline; /* smul, us */ const char *end_underline; /* rmul, ue */ const char *begin_alternate; /* smacs, as */ const char *end_alternate; /* rmacs, ae */ const char *turn_on_reverse; /* rev, mr */ const char *turn_on_blinking; /* blink, mb */ const char *turn_on_bold; /* bold, md */ const char *turn_on_dim; /* dim, mh */ const char *turn_off_attributes; /* sgr0, me */ const char *visual_bell; /* flash, vb */ const char *audio_bell; /* bel, bl */ const char *cursor_visible; /* cvvis, vs */ const char *cursor_normal; /* cnorm, ve */ const char *init_motion; /* smcup, ti */ const char *end_motion; /* rmcup, te */ const char *keypad_on; /* smkx, ks */ const char *keypad_off; /* rmkx, ke */ const char *orig_pair; /* op, op */ } sd; /* costs of various operations */ struct { int cm_up; int cm_down; int cm_left; int cm_right; int cm_home; int cm_low_left; int cm_car_return; int cm_abs; int cm_hor_abs; int cm_ver_abs; } cost; /* The initial tty mode bits */ struct emacs_tty old_tty; /* Is this TTY our controlling terminal? */ unsigned int controlling_terminal :1; unsigned int is_stdio :1; /* Do East Asian chars take up two columns? */ unsigned int multiple_width :1; }; #ifdef NEW_GC typedef struct tty_console Lisp_Tty_Console; DECLARE_LRECORD (tty_console, Lisp_Tty_Console); #define XTTY_CONSOLE(x) \ XRECORD (x, tty_console, Lisp_Tty_Console) #define wrap_tty_console(p) wrap_record (p, tty_console) #define TTY_CONSOLE_P(x) RECORDP (x, tty_console) #endif /* NEW_GC */ #define CONSOLE_TTY_DATA(c) CONSOLE_TYPE_DATA (c, tty) #define CONSOLE_TTY_CURSOR_X(c) (CONSOLE_TTY_DATA (c)->cursor_x) #define CONSOLE_TTY_CURSOR_Y(c) (CONSOLE_TTY_DATA (c)->cursor_y) #define CONSOLE_TTY_REAL_CURSOR_X(c) (CONSOLE_TTY_DATA (c)->real_cursor_x) #define CONSOLE_TTY_REAL_CURSOR_Y(c) (CONSOLE_TTY_DATA (c)->real_cursor_y) #define CONSOLE_TTY_FINAL_CURSOR_X(c) (CONSOLE_TTY_DATA (c)->final_cursor_x) #define CONSOLE_TTY_FINAL_CURSOR_Y(c) (CONSOLE_TTY_DATA (c)->final_cursor_y) /* In a more ideal world where available terminfo files actually included information on whether a given TTY supports double-width characters or not, oh, and where Mule was not conditional, SUPPORTS_MULTIPLE_WIDTH would be as console-specific as its syntax implies. In this world, this is overengineering more than it is anything. */ #define CONSOLE_TTY_SUPPORTS_MULTIPLE_WIDTH(c) (1 != MAX_ICHAR_LEN) #define CONSOLE_TTY_MULTIPLE_WIDTH(c) \ (CONSOLE_TTY_SUPPORTS_MULTIPLE_WIDTH(c) ? \ CONSOLE_TTY_DATA (c)->multiple_width : (0)) #define TTY_CM(c) (CONSOLE_TTY_DATA (c)->cm) #define TTY_SE(c) (CONSOLE_TTY_DATA (c)->se) #define TTY_SD(c) (CONSOLE_TTY_DATA (c)->sd) #define TTY_FLAGS(c) (CONSOLE_TTY_DATA (c)->flags) #define TTY_COST(c) (CONSOLE_TTY_DATA (c)->cost) #define TTY_INC_CURSOR_X(c, n) do { \ int TICX_n = (n); \ assert (CONSOLE_TTY_CURSOR_X (c) == CONSOLE_TTY_REAL_CURSOR_X (c)); \ CONSOLE_TTY_CURSOR_X (c) += TICX_n; \ CONSOLE_TTY_REAL_CURSOR_X (c) += TICX_n; \ } while (0) #define TTY_INC_CURSOR_Y(c, n) do { \ int TICY_n = (n); \ CONSOLE_TTY_CURSOR_Y (c) += TICY_n; \ CONSOLE_TTY_REAL_CURSOR_Y (c) += TICY_n; \ } while (0) struct tty_device { #ifdef NEW_GC struct lrecord_header header; #endif /* NEW_GC */ #ifdef HAVE_TERMIOS speed_t ospeed; /* Output speed (from sg_ospeed) */ #else short ospeed; /* Output speed (from sg_ospeed) */ #endif }; #ifdef NEW_GC typedef struct tty_device Lisp_Tty_Device; DECLARE_LRECORD (tty_device, Lisp_Tty_Device); #define XTTY_DEVICE(x) \ XRECORD (x, tty_device, Lisp_Tty_Device) #define wrap_tty_device(p) wrap_record (p, tty_device) #define TTY_DEVICE_P(x) RECORDP (x, tty_device) #endif /* NEW_GC */ #define DEVICE_TTY_DATA(d) DEVICE_TYPE_DATA (d, tty) /* termcap requires this to be global */ #ifndef HAVE_TERMIOS extern short ospeed; /* Output speed (from sg_ospeed) */ #endif #endif /* INCLUDED_console_tty_impl_h_ */