Mercurial > hg > xemacs-beta
view src/keymap-slots.h @ 5908:6174848f3e6c
Use parse_integer() in read_atom(); support bases with ratios like integers
src/ChangeLog addition:
2015-05-08 Aidan Kehoe <kehoea@parhasard.net>
* data.c (init_errors_once_early):
Move the Qunsupported_type here from numbers.c, so it's available
when the majority of our types are not supported.
* general-slots.h: Add it here, too.
* number.c: Remove the definition of Qunsupported_type from here.
* lread.c (read_atom):
Check if the first character could reflect a rational, if so, call
parse_integer(), don't check the syntax of the other
characters. This allows us to accept the non-ASCII digit
characters too.
If that worked partially, but not completely, and the next char is
a slash, try to parse as a ratio.
If that fails, try isfloat_string(), but only if the first
character could plausibly be part of a float.
Otherwise, treat as a symbol.
* lread.c (read_rational):
Rename from read_integer. Handle ratios with the same radix
specification as was used for integers.
* lread.c (read1):
Rename read_integer in this function. Support the Common Lisp
#NNNrMMM syntax for parsing a number MMM of arbitrary radix NNN.
man/ChangeLog addition:
2015-05-08 Aidan Kehoe <kehoea@parhasard.net>
* lispref/numbers.texi (Numbers):
Describe the newly-supported arbitrary-base syntax for rationals
(integers and ratios). Describe that ratios can take the same base
specification as integers, something also new.
tests/ChangeLog addition:
2015-05-08 Aidan Kehoe <kehoea@parhasard.net>
* automated/lisp-reader-tests.el:
Check the arbitrary-base integer reader syntax support, just
added. Check the reader base support for ratios, just added.
Check the non-ASCII-digit support in the reader, just added.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sat, 09 May 2015 00:40:57 +0100 |
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