Mercurial > hg > xemacs-beta

comparison src/data.c @ 5908:6174848f3e6c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
5907:87e29d93e11b 5908:6174848f3e6c
1812 *buf_end_out = (Ibyte *) p; 1812 *buf_end_out = (Ibyte *) p;
1813 return result; 1813 return result;
1814 1814
1815 overflow: 1815 overflow:
1816 #ifndef HAVE_BIGNUM 1816 #ifndef HAVE_BIGNUM
1817 return Fsignal (Qinvalid_argument, 1817 return Fsignal (Qunsupported_type,
1818 list3 (build_msg_string ("Integer constant overflow"), 1818 list3 (build_ascstring ("bignum"), make_string (buf, len),
1819 make_string (buf, len), make_fixnum (base))); 1819 make_fixnum (base)));
1820
1821 #else /* HAVE_BIGNUM */ 1820 #else /* HAVE_BIGNUM */
1822 result = make_bignum_emacs_uint (onum); 1821 result = make_bignum_emacs_uint (onum);
1823 1822
1824 bignum_set_emacs_int (scratch_bignum, base); 1823 bignum_set_emacs_int (scratch_bignum, base);
1825 bignum_set_emacs_int (scratch_bignum2, cint); 1824 bignum_set_emacs_int (scratch_bignum2, cint);
4098 DEFERROR (Qrange_error, "Arithmetic range error", Qarith_error); 4097 DEFERROR (Qrange_error, "Arithmetic range error", Qarith_error);
4099 DEFERROR (Qdomain_error, "Arithmetic domain error", Qarith_error); 4098 DEFERROR (Qdomain_error, "Arithmetic domain error", Qarith_error);
4100 DEFERROR (Qsingularity_error, "Arithmetic singularity error", Qdomain_error); 4099 DEFERROR (Qsingularity_error, "Arithmetic singularity error", Qdomain_error);
4101 DEFERROR (Qoverflow_error, "Arithmetic overflow error", Qdomain_error); 4100 DEFERROR (Qoverflow_error, "Arithmetic overflow error", Qdomain_error);
4102 DEFERROR (Qunderflow_error, "Arithmetic underflow error", Qdomain_error); 4101 DEFERROR (Qunderflow_error, "Arithmetic underflow error", Qdomain_error);
4102
4103 /* Moved here from number.c, so it's available when none of the new numeric
4104 types are. */
4105 DEFERROR_STANDARD (Qunsupported_type, Qwrong_type_argument);
4103 } 4106 }
4104 4107
4105 void 4108 void
4106 syms_of_data (void) 4109 syms_of_data (void)
4107 { 4110 {