Mercurial > hg > xemacs-beta
view src/rangetab.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
/* XEmacs routines to deal with range tables. Copyright (C) 1995 Sun Microsystems, Inc. Copyright (C) 1995, 2004, 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. */ /* Extracted from rangetab.c by O. Galibert, 1998. */ #ifndef INCLUDED_rangetab_h_ #define INCLUDED_rangetab_h_ typedef struct range_table_entry range_table_entry; struct range_table_entry { #ifdef NEW_GC NORMAL_LISP_OBJECT_HEADER header; #endif /* NEW_GC */ EMACS_INT first; EMACS_INT last; Lisp_Object val; }; typedef struct { Dynarr_declare (range_table_entry); } range_table_entry_dynarr; enum range_table_type { RANGE_START_CLOSED_END_OPEN, RANGE_START_CLOSED_END_CLOSED, RANGE_START_OPEN_END_CLOSED, RANGE_START_OPEN_END_OPEN }; struct Lisp_Range_Table { NORMAL_LISP_OBJECT_HEADER header; Gap_Array *entries; enum range_table_type type; }; typedef struct Lisp_Range_Table Lisp_Range_Table; DECLARE_LISP_OBJECT (range_table, Lisp_Range_Table); #define XRANGE_TABLE(x) XRECORD (x, range_table, Lisp_Range_Table) #define wrap_range_table(p) wrap_record (p, range_table) #define RANGE_TABLEP(x) RECORDP (x, range_table) #define CHECK_RANGE_TABLE(x) CHECK_RECORD (x, range_table) #define rangetab_gap_array_at(ga, pos) \ gap_array_at (ga, pos, struct range_table_entry) #define rangetab_gap_array_atp(ga, pos) \ gap_array_atp (ga, pos, struct range_table_entry) #endif /* INCLUDED_rangetab_h_ */