view src/keymap-slots.h @ 5769:ffc0c5a66ab1

Be lazy converting markers to integers, bytecode_{arithcompare,arithop}(). src/ChangeLog addition: 2013-12-15 Aidan Kehoe <kehoea@parhasard.net> * bytecode.c (bytecode_arithcompare): * bytecode.c (bytecode_arithop): Call promote_args_lazy () in these two functions, only converting markers to fixnums if absolutely necessary (since that is ON with large, mule buffers). * data.c (BIGNUM_CASE): * data.c (RATIO_CASE): * data.c (BIGFLOAT_CASE): * data.c (ARITHCOMPARE_MANY): Call promote_args_lazy () here too if WITH_NUMBER_TYPES is defined. We're not doing the equivalent with the non-NUMBER_TYPES code, but that's mostly fine, we are doing it in the bytecode. * number.h: * number.h (NUMBER_TYPES): * number.h (promote_args_lazy): Add this, returning LAZY_MARKER_T if both arguments are markers that point to the same buffer. tests/ChangeLog addition: 2013-12-15 Aidan Kehoe <kehoea@parhasard.net> * automated/lisp-tests.el: Test arithmetic comparisons with markers, check the type of the returned values for #'min and #'max.
author Aidan Kehoe <kehoea@parhasard.net>
date Sun, 15 Dec 2013 10:26:31 +0000
parents 308d34e9f07d
children
line wrap: on
line source

/* Definitions of marked slots in keymaps.
   Copyright (C) 1985, 1991-1995 Free Software Foundation, Inc.
   Copyright (C) 1995 Board of Trustees, University of Illinois.
   Copyright (C) 1995 Sun Microsystems, Inc.
   Copyright (C) 2001, 2002, 2010 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 3 of the License, 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.  If not, see <http://www.gnu.org/licenses/>. */

/* Synched up with: Not in FSF.  Split out of keymap.c. */

/* We define the Lisp_Objects in the keymap structure in a separate
   file because there are numerous places we want to iterate over them,
   such as when defining them in the structure, initializing them, or
   marking them.

   To use, define MARKED_SLOT before including this file.  No need to
   undefine; that happens automatically.

   MARKED_SLOT_NOCOMPARE is used to indicate a slot that should not be
   compared in the equal() method or hashed in the hash() method --
   basically, a slot used for caching, debugging, etc. instead of for
   defining a property of the keymap.
*/

#ifndef MARKED_SLOT_NOCOMPARE
#define MARKED_SLOT_NOCOMPARE MARKED_SLOT
#endif

  MARKED_SLOT (parents)		 /* Keymaps to be searched after this one.
				    An ordered list */
  MARKED_SLOT (prompt)           /* Qnil or a string to print in the minibuffer
                                    when reading from this keymap */
  MARKED_SLOT (table)		 /* The contents of this keymap */
  MARKED_SLOT_NOCOMPARE (inverse_table)	 /* The inverse mapping of the above */
  MARKED_SLOT (default_binding)  /* Use this if no other binding is found
                                    (this overrides parent maps and the
                                    normal global-map lookup). */
  MARKED_SLOT_NOCOMPARE (sub_maps_cache) /* Cache of directly inferior
					    keymaps; This holds an alist,
					    of the key and the maps, or the
					    modifier bit and the map.  If
					    this is the symbol t, then the
					    cache needs to be recomputed. */
  MARKED_SLOT_NOCOMPARE (name)           /* Just for debugging convenience */

#undef MARKED_SLOT
#undef MARKED_SLOT_NOCOMPARE