Mercurial > hg > xemacs-beta
view src/number-gmp.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 | a2912073be85 |
children |
line wrap: on
line source
/* Numeric types for XEmacs using the GMP or MPIR library. Copyright (C) 2004,2013 Jerry James. 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. */ #include <config.h> #include <limits.h> #include <math.h> #include "lisp.h" #include "sysproc.h" /* For qxe_getpid */ static mp_exp_t float_print_min, float_print_max; gmp_randstate_t random_state; long long bignum_to_llong (const bignum b) { long long l; mpz_export (&l, NULL, 1, sizeof (l), 0, 0U, b); return (mpz_sgn (b) < 0) ? -l : l; } unsigned long long bignum_to_ullong (const bignum b) { unsigned long long l; mpz_export (&l, NULL, 1, sizeof (l), 0, 0U, b); return l; } void bignum_set_llong (bignum b, long long l) { if (l < 0LL) { /* This even works for LLONG_MIN. Try it! */ l = -l; mpz_import (b, 1U, 1, sizeof (l), 0, 0U, &l); mpz_neg (b, b); } else { mpz_import (b, 1U, 1, sizeof (l), 0, 0U, &l); } } CIbyte * bigfloat_to_string (mpf_t f, int base) { mp_exp_t expt; CIbyte *str = mpf_get_str (NULL, &expt, base, 0, f); const int sign = mpf_sgn (f); const int neg = (sign < 0) ? 1 : 0; int len = strlen (str) + 1; /* Count the null terminator */ if (sign == 0) { XREALLOC_ARRAY (str, CIbyte, 4); strncpy (str, "0.0", 4); } else if (float_print_min <= expt && expt <= float_print_max) { if (expt < 0) { /* We need room for a radix point and leading zeroes */ const int space = -expt + 2; XREALLOC_ARRAY (str, CIbyte, len + space); memmove (&str[space + neg], &str[neg], len - neg); memset (&str[neg], '0', space); str[neg + 1] = '.'; } else if (len <= expt + neg + 1) { /* We need room for a radix point and trailing zeroes */ XREALLOC_ARRAY (str, CIbyte, expt + neg + 3); memset (&str[len - 1], '0', expt + neg + 3 - len); str[expt + neg] = '.'; str[expt + neg + 2] = '\0'; } else { /* We just need room for a radix point */ XREALLOC_ARRAY (str, CIbyte, len + 1); memmove (&str[expt + neg + 1], &str[expt + neg], len - (expt + neg)); str[expt + neg] = '.'; } } else { /* Computerized scientific notation: We need room for a possible radix point, format identifier, and exponent */ /* GMP's idea of the exponent is 1 greater than scientific notation's */ expt--; { const int point = (len == neg + 2) ? 0 : 1; const int exponent = (expt < 0) ? (int)(log ((double) (-expt)) / log ((double) base)) + 3 : (int)(log ((double) expt) / log ((double) base)) + 2; const int space = point + exponent; XREALLOC_ARRAY (str, CIbyte, len + space); if (point > 0) { memmove (&str[neg + 2], &str[neg + 1], len - neg); str[neg + 1] = '.'; } sprintf (&str[len + point - 1], "E%ld", expt); } } return str; } /* We need the next two functions since GNU MP insists on giving us an extra parameter. */ static void * gmp_realloc (void *ptr, size_t UNUSED (old_size), size_t new_size) { return xrealloc (ptr, new_size); } static void gmp_free (void *ptr, size_t UNUSED (size)) { xfree (ptr); } void init_number_gmp (void) { mp_set_memory_functions ((void *(*) (size_t)) xmalloc, gmp_realloc, gmp_free); /* Numbers with smaller exponents than this are printed in scientific notation. */ float_print_min = -4; /* Numbers with larger exponents than this are printed in scientific notation. */ float_print_max = 8; /* Prepare the bignum/bigfloat random number generator */ gmp_randinit_default (random_state); gmp_randseed_ui (random_state, qxe_getpid () + time (NULL)); }