Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums lisp/ChangeLog addition: 2010-01-24 Aidan Kehoe <kehoea@parhasard.net> Correct the semantics of #'member*, #'eql, #'assoc* in the presence of bignums; change the integerp byte code to fixnump semantics. * bytecomp.el (fixnump, integerp, byte-compile-integerp): Change the integerp byte code to fixnump; add a byte-compile method to integerp using fixnump and numberp and avoiding a funcall most of the time, since in the non-core contexts where integerp is used, it's mostly distinguishing between fixnums and things that are not numbers at all. * byte-optimize.el (side-effect-free-fns, byte-after-unbind-ops) (byte-compile-side-effect-and-error-free-ops): Replace the integerp bytecode with fixnump; add fixnump to the side-effect-free-fns. Add the other extended number type predicates to the list in passing. * obsolete.el (floatp-safe): Mark this as obsolete. * cl.el (eql): Go into more detail in the docstring here. Don't bother checking whether both arguments are numbers; one is enough, #'equal will fail correctly if they have distinct types. (subst): Replace a call to #'integerp (deciding whether to use #'memq or not) with one to #'fixnump. Delete most-positive-fixnum, most-negative-fixnum from this file; they're now always in C, so they can't be modified from Lisp. * cl-seq.el (member*, assoc*, rassoc*): Correct these functions in the presence of bignums. * cl-macs.el (cl-make-type-test): The type test for a fixnum is now fixnump. Ditch floatp-safe, use floatp instead. (eql): Correct this compiler macro in the presence of bignums. (assoc*): Correct this compiler macro in the presence of bignums. * simple.el (undo): Change #'integerp to #'fixnump here, since we use #'delq with the same value as ELT a few lines down. src/ChangeLog addition: 2010-01-24 Aidan Kehoe <kehoea@parhasard.net> Fix problems with #'eql, extended number types, and the hash table implementation; change the Bintegerp bytecode to fixnump semantics even on bignum builds, since #'integerp can have a fast implementation in terms of #'fixnump for most of its extant uses, but not vice-versa. * lisp.h: Always #include number.h; we want the macros provided in it, even if the various number types are not available. * number.h (NON_FIXNUM_NUMBER_P): New macro, giving 1 when its argument is of non-immediate number type. Equivalent to FLOATP if WITH_NUMBER_TYPES is not defined. * elhash.c (lisp_object_eql_equal, lisp_object_eql_hash): Use NON_FIXNUM_NUMBER_P in these functions, instead of FLOATP, giving more correct behaviour in the presence of the extended number types. * bytecode.c (Bfixnump, execute_optimized_program): Rename Bintegerp to Bfixnump; change its semantics to reflect the new name on builds with bignum support. * data.c (Ffixnump, Fintegerp, syms_of_data, vars_of_data): Always make #'fixnump available, even on non-BIGNUM builds; always implement #'integerp in this file, even on BIGNUM builds. Move most-positive-fixnum, most-negative-fixnum here from number.c, so they are Lisp constants even on builds without number types, and attempts to change or bind them error. Use the NUMBERP and INTEGERP macros even on builds without extended number types. * data.c (fixnum_char_or_marker_to_int): Rename this function from integer_char_or_marker_to_int, to better reflect the arguments it accepts. * number.c (Fevenp, Foddp, syms_of_number): Never provide #'integerp in this file. Remove #'oddp, #'evenp; their implementations are overridden by those in cl.el. * number.c (vars_of_number): most-positive-fixnum, most-negative-fixnum are no longer here. man/ChangeLog addition: 2010-01-23 Aidan Kehoe <kehoea@parhasard.net> Generally: be careful to say fixnum, not integer, when talking about fixed-precision integral types. I'm sure I've missed instances, both here and in the docstrings, but this is a decent start. * lispref/text.texi (Columns): Document where only fixnums, not integers generally, are accepted. (Registers): Remove some ancient char-int confoundance here. * lispref/strings.texi (Creating Strings, Creating Strings): Be more exact in describing where fixnums but not integers in general are accepted. (Creating Strings): Use a more contemporary example to illustrate how concat deals with lists including integers about #xFF. Delete some obsolete documentation on same. (Char Table Types): Document that only fixnums are accepted as values in syntax tables. * lispref/searching.texi (String Search, Search and Replace): Be exact in describing where fixnums but not integers in general are accepted. * lispref/range-tables.texi (Range Tables): Be exact in describing them; only fixnums are accepted to describe ranges. * lispref/os.texi (Killing XEmacs, User Identification) (Time of Day, Time Conversion): Be more exact about using fixnum where only fixed-precision integers are accepted. * lispref/objects.texi (Integer Type): Be more exact (and up-to-date) about the possible values for integers. Cross-reference to documentation of the bignum extension. (Equality Predicates): (Range Table Type): (Array Type): Use fixnum, not integer, to describe a fixed-precision integer. (Syntax Table Type): Correct some English syntax here. * lispref/numbers.texi (Numbers): Change the phrasing here to use fixnum to mean the fixed-precision integers normal in emacs. Document that our terminology deviates from that of Common Lisp, and that we're working on it. (Compatibility Issues): Reiterate the Common Lisp versus Emacs Lisp compatibility issues. (Comparison of Numbers, Arithmetic Operations): * lispref/commands.texi (Command Loop Info, Working With Events): * lispref/buffers.texi (Modification Time): Be more exact in describing where fixnums but not integers in general are accepted.

/* 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 */