Mercurial > hg > xemacs-beta
view src/gif_io.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 | 726060ee587c |
children |
line wrap: on
line source
#include <config.h> #include "lisp.h" #include "sysfile.h" #include "gifrlib.h" /****************************************************************************** * Set up the GifFileType structure for use. This must be called first in any * * client program. Then, if custom IO or Error functions are desired, call * * GifSetIOFunc/GifSetErrorFunc, then call EGifInitWrite. Else call * * EGifOpenFileName or EGifOpenFileHandle for standard IO functions. * * If setup fails, a NULL pointer is returned. * ******************************************************************************/ GifFileType *GifSetup(void) { GifIODataType *GifIO; GifFileType *GifFile; if ((GifFile = (GifFileType *) malloc(sizeof(GifFileType))) == NULL) return NULL; memset(GifFile, '\0', sizeof(GifFileType)); if ((GifIO = (GifIODataType *) malloc(sizeof(GifIODataType))) == NULL) { free((char *) GifFile); return NULL; } memset(GifIO, '\0', sizeof(GifIODataType)); GifFile->GifIO = GifIO; return GifFile; } void GifFree(GifFileType *GifFile) { GifFilePrivateType *Private; if (GifFile == NULL) return; Private = (GifFilePrivateType *) GifFile->Private; if (GifFile->SavedImages) FreeSavedImages(GifFile); if (GifFile->Image.ColorMap) FreeMapObject(GifFile->Image.ColorMap); if (GifFile->SColorMap) FreeMapObject(GifFile->SColorMap); if (Private) { free(Private); } if (GifFile->GifIO) free(GifFile->GifIO); free(GifFile); } /**************************************************************************** * Install the specified ReadFunction into the GifFile specified. * ****************************************************************************/ void GifSetReadFunc(GifFileType *GifFile, Gif_rw_func ReadFunc, VoidPtr data) { GifIODataType *GifIO = (GifIODataType *)GifFile->GifIO; GifIO->ReadFunc = ReadFunc; GifIO->ReadFunc_data = data; } /**************************************************************************** * Install the specified WriteFunction into the GifFile specified. * ****************************************************************************/ void GifSetWriteFunc(GifFileType *GifFile, Gif_rw_func WriteFunc, VoidPtr data) { GifIODataType *GifIO = (GifIODataType *)GifFile->GifIO; GifIO->WriteFunc = WriteFunc; GifIO->WriteFunc_data = data; } /**************************************************************************** * Install the specified CloseFunction into the GifFile specified. * ****************************************************************************/ void GifSetCloseFunc(GifFileType *GifFile, Gif_close_func CloseFunc, VoidPtr data) { GifIODataType *GifIO = (GifIODataType *)GifFile->GifIO; GifIO->CloseFunc = CloseFunc; GifIO->CloseFunc_data = data; } /**************************************************************************** * Install the standard IO funcs into the GifFile, including the FILE info * ****************************************************************************/ void GifStdIOInit(GifFileType *GifFile, FILE *file, int filehandle) { GifStdIODataType *IOData; if ((IOData = (GifStdIODataType*)malloc(sizeof(GifStdIODataType))) == NULL) GifInternError(GifFile, GIF_ERR_NOT_ENOUGH_MEM); IOData->File = file; IOData->FileHandle = filehandle; GifSetReadFunc(GifFile, GifStdRead, IOData); GifSetWriteFunc(GifFile, GifStdWrite, IOData); GifSetCloseFunc(GifFile, GifStdFileClose, IOData); } Bytecount GifStdRead(GifByteType *buf, Bytecount size, VoidPtr method_data) { GifStdIODataType *IOtype = (GifStdIODataType*)method_data; return (retry_fread(buf, 1, size, IOtype->File)); } Bytecount GifStdWrite(GifByteType *buf, Bytecount size, VoidPtr method_data) { GifStdIODataType *IOtype = (GifStdIODataType*)method_data; return (retry_fwrite(buf, 1, size, IOtype->File)); } int GifStdFileClose(VoidPtr method_data) { int ret; GifStdIODataType *IOtype = (GifStdIODataType*)method_data; ret = retry_fclose(IOtype->File); if (ret == 0 && IOtype->FileHandle != -1) ret = retry_close(IOtype->FileHandle); return ret; } void GifRead(GifByteType *buf, Bytecount size, GifFileType *GifFile) { GifIODataType *GifIO = (GifIODataType*)GifFile->GifIO; if ((*(GifIO->ReadFunc))(buf, size, GifIO->ReadFunc_data) != size) GifError(GifFile, "Read error!"); } void GifWrite(GifByteType *buf, Bytecount size, GifFileType *GifFile) { GifIODataType *GifIO = (GifIODataType*)GifFile->GifIO; if ((*(GifIO->WriteFunc))(buf, size, GifIO->WriteFunc_data) != size) GifError(GifFile, "Write error!"); } int GifClose(GifFileType *GifFile) { GifIODataType *GifIO = (GifIODataType*)GifFile->GifIO; return ((*(GifIO->CloseFunc))(GifIO->CloseFunc_data)); } static const char *GifErrorString[14] = { "Failed to open given file", /* D_GIF_ERR_OPEN_FAILED */ "Failed to read from given file", /* D_GIF_ERR_READ_FAILED */ "Given file is NOT a GIF file", /* D_GIF_ERR_NOT_GIF_FILE */ "No Screen Descriptor detected", /* D_GIF_ERR_NO_SCRN_DSCR */ "No Image Descriptor detected", /* D_GIF_ERR_NO_IMAG_DSCR */ "No global or local color map", /* D_GIF_ERR_NO_COLOR_MAP */ "Wrong record type detected", /* D_GIF_ERR_WRONG_RECORD */ "#Pixels bigger than Width * Height", /* D_GIF_ERR_DATA_TOO_BIG */ "Fail to allocate required memory", /* D_GIF_ERR_NOT_ENOUGH_MEM */ "Failed to close given file", /* D_GIF_ERR_CLOSE_FAILED */ "Given file was not opened for read", /* D_GIF_ERR_CLOSE_FAILED */ "Image is defective, decoding aborted", /* D_GIF_ERR_IMAGE_DEFECT */ "Image EOF detected before image complete", /* D_GIF_ERR_EOF_TOO_SOON */ "Undefined error!", }; const char *GetGifError(int errore); /***************************************************************************** * Get the last GIF error in human-readable form. * *****************************************************************************/ const char *GetGifError(int errore) { const char *Err; switch(errore) { case D_GIF_ERR_OPEN_FAILED: Err = GifErrorString[0]; break; case D_GIF_ERR_READ_FAILED: Err = GifErrorString[1]; break; case D_GIF_ERR_NOT_GIF_FILE: Err = GifErrorString[2]; break; case D_GIF_ERR_NO_SCRN_DSCR: Err = GifErrorString[3]; break; case D_GIF_ERR_NO_IMAG_DSCR: Err = GifErrorString[4]; break; case D_GIF_ERR_NO_COLOR_MAP: Err = GifErrorString[5]; break; case D_GIF_ERR_WRONG_RECORD: Err = GifErrorString[6]; break; case D_GIF_ERR_DATA_TOO_BIG: Err = GifErrorString[7]; break; case D_GIF_ERR_NOT_ENOUGH_MEM: Err = GifErrorString[8]; break; case D_GIF_ERR_CLOSE_FAILED: Err = GifErrorString[9]; break; case D_GIF_ERR_NOT_READABLE: Err = GifErrorString[10]; break; case D_GIF_ERR_IMAGE_DEFECT: Err = GifErrorString[11]; break; case D_GIF_ERR_EOF_TOO_SOON: Err = GifErrorString[12]; break; default: Err = GifErrorString[13]; break; } return Err; } /****************************** * These are called internally * ******************************/ DOESNT_RETURN GifError(GifFileType *GifFile, const char *err_str) { GifIODataType *GifIO = (GifIODataType*)GifFile->GifIO; if (GifIO->ErrorFunc) (*(GifIO->ErrorFunc))(err_str, GifIO->ErrorFunc_data); else fprintf(stderr, "GIF FATAL ERROR: %s", err_str); exit(-10); } void GifWarning(GifFileType *GifFile, const char *err_str) { GifIODataType *GifIO = (GifIODataType*)GifFile->GifIO; if (GifIO->WarningFunc) (*(GifIO->WarningFunc))(err_str, GifIO->WarningFunc_data); } DOESNT_RETURN GifInternError(GifFileType *GifFile, int error_num) { const char *ErrStr = GetGifError(error_num); GifError(GifFile, ErrStr); } void GifInternWarning(GifFileType *GifFile, int error_num) { const char *ErrStr = GetGifError(error_num); GifWarning(GifFile, ErrStr); } void GifSetErrorFunc(GifFileType *GifFile, Gif_error_func ErrorFunc, VoidPtr data) { GifIODataType *GifIO = (GifIODataType *)GifFile->GifIO; GifIO->ErrorFunc = ErrorFunc; GifIO->ErrorFunc_data = data; } void GifSetWarningFunc(GifFileType *GifFile, Gif_error_func WarningFunc, VoidPtr data) { GifIODataType *GifIO = (GifIODataType *)GifFile->GifIO; GifIO->WarningFunc = WarningFunc; GifIO->WarningFunc_data = data; }