Mercurial > hg > xemacs-beta
annotate 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 |
| rev | line source |
|---|---|
| 870 | 1 /* Interface to graphics/etc libraries, with cdecl calling convention. |
| 2 Copyright (C) 2002 Ben Wing | |
| 3 | |
| 4 This file is part of XEmacs. | |
| 5 | |
| 6 XEmacs is free software; you can redistribute it and/or modify it | |
| 7 under the terms of the GNU General Public License as published by the | |
| 8 Free Software Foundation; either version 2, or (at your option) any | |
| 9 later version. | |
| 10 | |
| 11 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 12 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 13 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 14 for more details. | |
| 15 | |
| 16 You should have received a copy of the GNU General Public License | |
| 17 along with XEmacs; see the file COPYING. If not, write to | |
| 18 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 19 Boston, MA 02111-1307, USA. */ | |
| 20 | |
| 21 /* Synched up with: Not in FSF. */ | |
| 22 | |
| 23 #include <config.h> | |
| 24 #include "lisp.h" | |
| 25 | |
| 26 #include "libinterface.h" | |
| 27 | |
| 28 /* YUUUUUUUUUUUUUUCK! | |
| 29 | |
| 30 This file exists only because VC++ lacks pragmas that let you change the | |
| 31 default calling convention in the middle of a file. With optimization, | |
| 32 we compile XEmacs using fastcall as the default convention; but | |
| 33 libraries are not compiled this way, and thus need __cdecl in their | |
| 34 declaration. Without the pragma, we either | |
| 35 | |
| 36 (a) depend on libraries that declare their external functions with | |
| 37 suitable preprocessor definitions that we can change; | |
| 38 | |
| 39 (b) force the user to recompile the library with fastcall (not | |
| 40 reasonable); | |
| 41 | |
| 42 (c) hack the headers manually (not reasonable); | |
| 43 | |
| 44 (d) put all calls to the library in a separate file where the default | |
| 45 calling convention is __cdecl (hence, this file). | |
| 46 | |
| 47 In fact, some libraries do make (a) feasible. This is the case with PNG | |
| 48 and ZLIB. JPEG almost does so, since all externs are wrapped with | |
| 49 EXTERN(); but they fail to wrap their definition of EXTERN with #ifndef | |
| 50 EXTERN, so we can't override it. XPM is similar, wrapping their externs | |
| 51 with FUNC() -- again, not overridable. With PNG, we define PNG_EXPORT; | |
| 52 with ZLIB, we define ZEXPORT and ZEXPORTVA. */ | |
| 53 | |
| 54 #ifdef HAVE_XPM | |
| 55 | |
| 56 void | |
| 57 qxe_XpmFreeXpmImage (XpmImage *image) | |
| 58 { | |
| 59 XpmFreeXpmImage (image); | |
| 60 } | |
| 61 | |
| 62 void | |
| 63 qxe_XpmFreeXpmInfo (XpmInfo *info) | |
| 64 { | |
| 65 XpmFreeXpmInfo (info); | |
| 66 } | |
| 67 | |
| 68 int | |
| 69 qxe_XpmCreateXpmImageFromBuffer (char *buffer, XpmImage *image, XpmInfo *info) | |
| 70 { | |
| 71 return XpmCreateXpmImageFromBuffer (buffer, image, info); | |
| 72 } | |
| 73 | |
| 74 void | |
| 75 qxe_XpmFree (void *ptr) | |
| 76 { | |
| 77 XpmFree (ptr); | |
| 78 } | |
| 79 | |
| 80 int | |
| 81 qxe_XpmReadFileToData (char *filename, char ***data_return) | |
| 82 { | |
| 83 return XpmReadFileToData (filename, data_return); | |
| 84 } | |
| 85 | |
| 86 #endif /* HAVE_XPM */ | |
| 87 | |
| 88 #ifdef HAVE_JPEG | |
| 89 | |
| 90 boolean | |
| 91 qxe_jpeg_finish_decompress (j_decompress_ptr cinfo) | |
| 92 { | |
| 93 return jpeg_finish_decompress (cinfo); | |
| 94 } | |
| 95 | |
| 96 boolean | |
| 97 qxe_jpeg_start_decompress (j_decompress_ptr cinfo) | |
| 98 { | |
| 99 return jpeg_start_decompress (cinfo); | |
| 100 } | |
| 101 | |
| 102 JDIMENSION | |
| 103 qxe_jpeg_read_scanlines (j_decompress_ptr cinfo, JSAMPARRAY scanlines, | |
| 104 JDIMENSION max_lines) | |
| 105 { | |
| 106 return jpeg_read_scanlines (cinfo, scanlines, max_lines); | |
| 107 } | |
| 108 | |
| 109 int | |
| 110 qxe_jpeg_read_header (j_decompress_ptr cinfo, boolean require_image) | |
| 111 { | |
| 112 return jpeg_read_header (cinfo, require_image); | |
| 113 } | |
| 114 | |
| 115 void | |
| 116 qxe_jpeg_CreateDecompress (j_decompress_ptr cinfo, int version, | |
| 117 size_t structsize) | |
| 118 { | |
| 119 jpeg_CreateDecompress (cinfo, version, structsize); | |
| 120 } | |
| 121 | |
| 122 struct jpeg_error_mgr * | |
| 123 qxe_jpeg_std_error (struct jpeg_error_mgr *err) | |
| 124 { | |
| 125 return jpeg_std_error (err); | |
| 126 } | |
| 127 | |
| 128 void | |
| 129 qxe_jpeg_destroy_decompress (j_decompress_ptr cinfo) | |
| 130 { | |
| 131 jpeg_destroy_decompress (cinfo); | |
| 132 } | |
| 133 | |
| 134 boolean | |
| 135 qxe_jpeg_resync_to_restart (j_decompress_ptr cinfo, int desired) | |
| 136 { | |
| 137 return jpeg_resync_to_restart (cinfo, desired); | |
| 138 } | |
| 139 | |
| 140 #endif /* HAVE_JPEG */ | |
| 141 | |
| 142 #ifdef HAVE_TIFF | |
| 143 | |
| 144 tdata_t | |
| 145 qxe_TIFFmalloc (tsize_t x1) | |
| 146 { | |
| 147 return _TIFFmalloc (x1); | |
| 148 } | |
| 149 | |
| 150 void | |
| 151 qxe_TIFFfree (tdata_t x1) | |
| 152 { | |
| 153 _TIFFfree (x1); | |
| 154 } | |
| 155 | |
| 156 void | |
| 157 qxe_TIFFClose (TIFF *x1) | |
| 158 { | |
| 159 TIFFClose (x1); | |
| 160 } | |
| 161 | |
| 162 int | |
| 163 qxe_TIFFGetField (TIFF *x1, ttag_t x2, uint32 *x3) | |
| 164 { | |
| 165 return TIFFGetField (x1, x2, x3); | |
| 166 } | |
| 167 | |
| 168 TIFF * | |
| 169 qxe_TIFFClientOpen (const char *x1, const char *x2, | |
| 170 thandle_t x3, | |
| 171 TIFFReadWriteProc x4, TIFFReadWriteProc x5, | |
| 172 TIFFSeekProc x6, TIFFCloseProc x7, | |
| 173 TIFFSizeProc x8, | |
| 174 TIFFMapFileProc x9, TIFFUnmapFileProc x10) | |
| 175 { | |
| 176 return TIFFClientOpen (x1, x2, x3, x4, x5, x6, x7, x8, x9, x10); | |
| 177 } | |
| 178 | |
| 179 TIFFErrorHandler | |
| 180 qxe_TIFFSetErrorHandler (TIFFErrorHandler x1) | |
| 181 { | |
| 182 return TIFFSetErrorHandler (x1); | |
| 183 } | |
| 184 | |
| 185 TIFFErrorHandler | |
| 186 qxe_TIFFSetWarningHandler (TIFFErrorHandler x1) | |
| 187 { | |
| 188 return TIFFSetWarningHandler (x1); | |
| 189 } | |
| 190 | |
| 191 int | |
| 192 qxe_TIFFReadRGBAImage (TIFF *x1, uint32 x2, uint32 x3, uint32 *x4, int x5) | |
| 193 { | |
| 194 return TIFFReadRGBAImage (x1, x2, x3, x4, x5); | |
| 195 } | |
| 196 | |
| 197 #endif /* HAVE_TIFF */ |