Mercurial > hg > xemacs-beta
diff src/data.c @ 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 | 85fd1ab80057 |
children | eb1e15c9440b |
line wrap: on
line diff
--- a/src/data.c Fri May 08 20:04:42 2015 +0100 +++ b/src/data.c Sat May 09 00:40:57 2015 +0100 @@ -1814,10 +1814,9 @@ overflow: #ifndef HAVE_BIGNUM - return Fsignal (Qinvalid_argument, - list3 (build_msg_string ("Integer constant overflow"), - make_string (buf, len), make_fixnum (base))); - + return Fsignal (Qunsupported_type, + list3 (build_ascstring ("bignum"), make_string (buf, len), + make_fixnum (base))); #else /* HAVE_BIGNUM */ result = make_bignum_emacs_uint (onum); @@ -4100,6 +4099,10 @@ DEFERROR (Qsingularity_error, "Arithmetic singularity error", Qdomain_error); DEFERROR (Qoverflow_error, "Arithmetic overflow error", Qdomain_error); DEFERROR (Qunderflow_error, "Arithmetic underflow error", Qdomain_error); + + /* Moved here from number.c, so it's available when none of the new numeric + types are. */ + DEFERROR_STANDARD (Qunsupported_type, Qwrong_type_argument); } void