Mercurial > hg > xemacs-beta
view src/libinterface.c @ 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 | 26a2f3423141 |
children | 308d34e9f07d |
line wrap: on
line source
/* Interface to graphics/etc libraries, with cdecl calling convention. Copyright (C) 2002 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. */ #include <config.h> #include "lisp.h" #include "libinterface.h" /* YUUUUUUUUUUUUUUCK! This file exists only because VC++ lacks pragmas that let you change the default calling convention in the middle of a file. With optimization, we compile XEmacs using fastcall as the default convention; but libraries are not compiled this way, and thus need __cdecl in their declaration. Without the pragma, we either (a) depend on libraries that declare their external functions with suitable preprocessor definitions that we can change; (b) force the user to recompile the library with fastcall (not reasonable); (c) hack the headers manually (not reasonable); (d) put all calls to the library in a separate file where the default calling convention is __cdecl (hence, this file). In fact, some libraries do make (a) feasible. This is the case with PNG and ZLIB. JPEG almost does so, since all externs are wrapped with EXTERN(); but they fail to wrap their definition of EXTERN with #ifndef EXTERN, so we can't override it. XPM is similar, wrapping their externs with FUNC() -- again, not overridable. With PNG, we define PNG_EXPORT; with ZLIB, we define ZEXPORT and ZEXPORTVA. */ #ifdef HAVE_XPM void qxe_XpmFreeXpmImage (XpmImage *image) { XpmFreeXpmImage (image); } void qxe_XpmFreeXpmInfo (XpmInfo *info) { XpmFreeXpmInfo (info); } int qxe_XpmCreateXpmImageFromBuffer (char *buffer, XpmImage *image, XpmInfo *info) { return XpmCreateXpmImageFromBuffer (buffer, image, info); } void qxe_XpmFree (void *ptr) { XpmFree (ptr); } int qxe_XpmReadFileToData (char *filename, char ***data_return) { return XpmReadFileToData (filename, data_return); } #endif /* HAVE_XPM */ #ifdef HAVE_JPEG boolean qxe_jpeg_finish_decompress (j_decompress_ptr cinfo) { return jpeg_finish_decompress (cinfo); } boolean qxe_jpeg_start_decompress (j_decompress_ptr cinfo) { return jpeg_start_decompress (cinfo); } JDIMENSION qxe_jpeg_read_scanlines (j_decompress_ptr cinfo, JSAMPARRAY scanlines, JDIMENSION max_lines) { return jpeg_read_scanlines (cinfo, scanlines, max_lines); } int qxe_jpeg_read_header (j_decompress_ptr cinfo, boolean require_image) { return jpeg_read_header (cinfo, require_image); } void qxe_jpeg_CreateDecompress (j_decompress_ptr cinfo, int version, size_t structsize) { jpeg_CreateDecompress (cinfo, version, structsize); } struct jpeg_error_mgr * qxe_jpeg_std_error (struct jpeg_error_mgr *err) { return jpeg_std_error (err); } void qxe_jpeg_destroy_decompress (j_decompress_ptr cinfo) { jpeg_destroy_decompress (cinfo); } boolean qxe_jpeg_resync_to_restart (j_decompress_ptr cinfo, int desired) { return jpeg_resync_to_restart (cinfo, desired); } #endif /* HAVE_JPEG */ #ifdef HAVE_TIFF tdata_t qxe_TIFFmalloc (tsize_t x1) { return _TIFFmalloc (x1); } void qxe_TIFFfree (tdata_t x1) { _TIFFfree (x1); } void qxe_TIFFClose (TIFF *x1) { TIFFClose (x1); } int qxe_TIFFGetField (TIFF *x1, ttag_t x2, uint32 *x3) { return TIFFGetField (x1, x2, x3); } TIFF * qxe_TIFFClientOpen (const char *x1, const char *x2, thandle_t x3, TIFFReadWriteProc x4, TIFFReadWriteProc x5, TIFFSeekProc x6, TIFFCloseProc x7, TIFFSizeProc x8, TIFFMapFileProc x9, TIFFUnmapFileProc x10) { return TIFFClientOpen (x1, x2, x3, x4, x5, x6, x7, x8, x9, x10); } TIFFErrorHandler qxe_TIFFSetErrorHandler (TIFFErrorHandler x1) { return TIFFSetErrorHandler (x1); } TIFFErrorHandler qxe_TIFFSetWarningHandler (TIFFErrorHandler x1) { return TIFFSetWarningHandler (x1); } int qxe_TIFFReadRGBAImage (TIFF *x1, uint32 x2, uint32 x3, uint32 *x4, int x5) { return TIFFReadRGBAImage (x1, x2, x3, x4, x5); } #endif /* HAVE_TIFF */