Mercurial > hg > xemacs-beta
view src/keymap-slots.h @ 5253:b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
src/ChangeLog addition:
2010-09-01 Aidan Kehoe <kehoea@parhasard.net>
* fns.c (list_merge, list_array_merge_into_list)
(list_array_merge_into_array):
Avoid algorithmic complexity surprises when checking for
circularity in these functions.
(Freduce): Fix some formatting, in passing.
(mapcarX): Drop the SOME_OR_EVERY argument to this function;
instead, take CALLER, a symbol reflecting the Lisp-visible
function that called mapcarX(). Use CALLER with
mapping_interaction_error() when sequences are modified
illegally. Don't cons with #'some, #'every, not even a little.
(Fmapconcat, FmapcarX, Fmapvector, Fmapcan, Fmapc, Fmap)
(Fmap_into, Fsome, Fevery): Call mapcarX() with its new
arguments.
(Fmapcan): Don't unnecessarily complicate the nconc call.
(maplist): Take CALLER, a symbol reflecting the Lisp-visible
function that called maplist(), rather than having separate
arguments to indicate mapl vs. mapcon.
Avoid algorithmic complexity surprises when checking for
circularity. In #'mapcon, check a given stretch of
result for well-formedness once, which was not previously the
case, despite what the comments said.
(Fmaplist, Fmapl, Fmapcon):
Call maplist() with its new arguments.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Wed, 01 Sep 2010 12:51:32 +0100 |
| parents | 6ef8256a020a |
| children | 308d34e9f07d |
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 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. 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