Mercurial > hg > xemacs-beta
annotate src/number.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 | 48386fd60fd0 |
| rev | line source |
|---|---|
| 1983 | 1 /* Numeric types for XEmacs. |
| 2 Copyright (C) 2004 Jerry James. | |
| 5125 | 3 Copyright (C) 2010 Ben Wing. |
| 1983 | 4 |
| 5 This file is part of XEmacs. | |
| 6 | |
|
5405
2aa9cd456ae7
Move src/ to GPLv3.
Mike Sperber <sperber@deinprogramm.de>
parents:
5231
diff
changeset
|
7 XEmacs is free software: you can redistribute it and/or modify it |
| 1983 | 8 under the terms of the GNU General Public License as published by the |
|
5405
2aa9cd456ae7
Move src/ to GPLv3.
Mike Sperber <sperber@deinprogramm.de>
parents:
5231
diff
changeset
|
9 Free Software Foundation, either version 3 of the License, or (at your |
|
2aa9cd456ae7
Move src/ to GPLv3.
Mike Sperber <sperber@deinprogramm.de>
parents:
5231
diff
changeset
|
10 option) any later version. |
| 1983 | 11 |
| 12 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 15 for more details. | |
| 16 | |
| 17 You should have received a copy of the GNU General Public License | |
|
5405
2aa9cd456ae7
Move src/ to GPLv3.
Mike Sperber <sperber@deinprogramm.de>
parents:
5231
diff
changeset
|
18 along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */ |
| 1983 | 19 |
| 20 /* Synched up with: Not in FSF. */ | |
| 21 | |
| 22 #include <config.h> | |
| 23 #include <limits.h> | |
| 24 #include "lisp.h" | |
| 25 | |
| 2595 | 26 #ifdef HAVE_BIGFLOAT |
| 27 #define USED_IF_BIGFLOAT(decl) decl | |
| 28 #else | |
| 29 #define USED_IF_BIGFLOAT(decl) UNUSED (decl) | |
| 30 #endif | |
| 31 | |
| 2001 | 32 Lisp_Object Qrationalp, Qfloatingp, Qrealp; |
| 1983 | 33 Lisp_Object Vdefault_float_precision; |
|
4885
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4802
diff
changeset
|
34 |
| 1983 | 35 static Lisp_Object Vbigfloat_max_prec; |
| 36 static int number_initialized; | |
| 37 | |
| 38 #ifdef HAVE_BIGNUM | |
| 39 bignum scratch_bignum, scratch_bignum2; | |
| 40 #endif | |
| 41 #ifdef HAVE_RATIO | |
|
4678
b5e1d4f6b66f
Make #'floor, #'ceiling, #'round, #'truncate conform to Common Lisp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3391
diff
changeset
|
42 ratio scratch_ratio, scratch_ratio2; |
| 1983 | 43 #endif |
| 44 #ifdef HAVE_BIGFLOAT | |
| 45 bigfloat scratch_bigfloat, scratch_bigfloat2; | |
| 46 #endif | |
| 47 | |
| 48 /********************************* Bignums **********************************/ | |
| 49 #ifdef HAVE_BIGNUM | |
| 50 static void | |
| 2286 | 51 bignum_print (Lisp_Object obj, Lisp_Object printcharfun, |
| 52 int UNUSED (escapeflag)) | |
| 1983 | 53 { |
|
4952
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4883
diff
changeset
|
54 Ascbyte *bstr = bignum_to_string (XBIGNUM_DATA (obj), 10); |
|
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4883
diff
changeset
|
55 write_ascstring (printcharfun, bstr); |
|
4976
16112448d484
Rename xfree(FOO, TYPE) -> xfree(FOO)
Ben Wing <ben@xemacs.org>
parents:
4962
diff
changeset
|
56 xfree (bstr); |
| 1983 | 57 } |
| 58 | |
|
4802
2fc0e2f18322
Don't create any bignums before pdumping. Add bignum, ratio, and bigfloat
Jerry James <james@xemacs.org>
parents:
4678
diff
changeset
|
59 #ifdef NEW_GC |
|
2fc0e2f18322
Don't create any bignums before pdumping. Add bignum, ratio, and bigfloat
Jerry James <james@xemacs.org>
parents:
4678
diff
changeset
|
60 static void |
|
5141
0dcd22290039
fix issues with finalizers in number.c, postgresql, ldap
Ben Wing <ben@xemacs.org>
parents:
5125
diff
changeset
|
61 bignum_finalize (Lisp_Object obj) |
|
4802
2fc0e2f18322
Don't create any bignums before pdumping. Add bignum, ratio, and bigfloat
Jerry James <james@xemacs.org>
parents:
4678
diff
changeset
|
62 { |
|
5141
0dcd22290039
fix issues with finalizers in number.c, postgresql, ldap
Ben Wing <ben@xemacs.org>
parents:
5125
diff
changeset
|
63 struct Lisp_Bignum *num = XBIGNUM (obj); |
| 5125 | 64 /* #### WARNING: It would be better to put some sort of check to make |
| 65 sure this doesn't happen more than once, just in case --- | |
| 66 e.g. checking if it's zero before finalizing and then setting it to | |
| 67 zero after finalizing. */ | |
| 68 bignum_fini (num->data); | |
|
4802
2fc0e2f18322
Don't create any bignums before pdumping. Add bignum, ratio, and bigfloat
Jerry James <james@xemacs.org>
parents:
4678
diff
changeset
|
69 } |
|
2fc0e2f18322
Don't create any bignums before pdumping. Add bignum, ratio, and bigfloat
Jerry James <james@xemacs.org>
parents:
4678
diff
changeset
|
70 #endif |
|
2fc0e2f18322
Don't create any bignums before pdumping. Add bignum, ratio, and bigfloat
Jerry James <james@xemacs.org>
parents:
4678
diff
changeset
|
71 |
| 1983 | 72 static int |
|
4906
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4892
diff
changeset
|
73 bignum_equal (Lisp_Object obj1, Lisp_Object obj2, int UNUSED (depth), |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4892
diff
changeset
|
74 int UNUSED (foldcase)) |
| 1983 | 75 { |
| 76 return bignum_eql (XBIGNUM_DATA (obj1), XBIGNUM_DATA (obj2)); | |
| 77 } | |
| 78 | |
| 79 static Hashcode | |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
80 bignum_hash (Lisp_Object obj, int UNUSED (depth), Boolint equalp) |
| 1983 | 81 { |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
82 if (equalp) |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
83 { |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
84 return FLOAT_HASHCODE_FROM_DOUBLE (bignum_to_double (XBIGNUM_DATA (obj))); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
85 } |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
86 else |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
87 { |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
88 return bignum_hashcode (XBIGNUM_DATA (obj)); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
89 } |
| 1983 | 90 } |
| 91 | |
| 2551 | 92 static void |
| 93 bignum_convert (const void *object, void **data, Bytecount *size) | |
| 94 { | |
| 95 CIbyte *bstr = bignum_to_string (*(bignum *)object, 10); | |
| 96 *data = bstr; | |
| 97 *size = strlen(bstr)+1; | |
| 98 } | |
| 99 | |
| 100 static void | |
| 101 bignum_convfree (const void * UNUSED (object), void *data, | |
| 102 Bytecount UNUSED (size)) | |
| 103 { | |
|
4976
16112448d484
Rename xfree(FOO, TYPE) -> xfree(FOO)
Ben Wing <ben@xemacs.org>
parents:
4962
diff
changeset
|
104 xfree (data); |
| 2551 | 105 } |
| 106 | |
| 107 static void * | |
| 108 bignum_deconvert (void *object, void *data, Bytecount UNUSED (size)) | |
| 109 { | |
| 110 bignum *b = (bignum *) object; | |
| 111 bignum_init(*b); | |
| 112 bignum_set_string(*b, (const char *) data, 10); | |
| 113 return object; | |
| 114 } | |
| 115 | |
| 116 static const struct opaque_convert_functions bignum_opc = { | |
| 117 bignum_convert, | |
| 118 bignum_convfree, | |
| 119 bignum_deconvert | |
| 120 }; | |
| 121 | |
| 1983 | 122 static const struct memory_description bignum_description[] = { |
| 2551 | 123 { XD_OPAQUE_DATA_CONVERTIBLE, offsetof (Lisp_Bignum, data), |
| 124 0, { &bignum_opc }, XD_FLAG_NO_KKCC }, | |
| 1983 | 125 { XD_END } |
| 126 }; | |
| 127 | |
|
5118
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
128 DEFINE_DUMPABLE_FROB_BLOCK_LISP_OBJECT ("bignum", bignum, 0, bignum_print, |
|
5169
6c6d78781d59
cleanup of code related to xfree(), better KKCC backtrace capabilities, document XD_INLINE_LISP_OBJECT_BLOCK_PTR, fix some memory leaks, other code cleanup
Ben Wing <ben@xemacs.org>
parents:
5141
diff
changeset
|
129 IF_NEW_GC (bignum_finalize), |
|
6c6d78781d59
cleanup of code related to xfree(), better KKCC backtrace capabilities, document XD_INLINE_LISP_OBJECT_BLOCK_PTR, fix some memory leaks, other code cleanup
Ben Wing <ben@xemacs.org>
parents:
5141
diff
changeset
|
130 bignum_equal, bignum_hash, |
|
6c6d78781d59
cleanup of code related to xfree(), better KKCC backtrace capabilities, document XD_INLINE_LISP_OBJECT_BLOCK_PTR, fix some memory leaks, other code cleanup
Ben Wing <ben@xemacs.org>
parents:
5141
diff
changeset
|
131 bignum_description, Lisp_Bignum); |
| 2092 | 132 #endif /* HAVE_BIGNUM */ |
| 1983 | 133 |
| 134 Lisp_Object Qbignump; | |
| 135 | |
| 136 DEFUN ("bignump", Fbignump, 1, 1, 0, /* | |
| 137 Return t if OBJECT is a bignum, nil otherwise. | |
| 138 */ | |
| 139 (object)) | |
| 140 { | |
| 141 return BIGNUMP (object) ? Qt : Qnil; | |
| 142 } | |
| 143 | |
| 144 | |
| 145 /********************************** Ratios **********************************/ | |
| 146 #ifdef HAVE_RATIO | |
| 147 static void | |
| 2286 | 148 ratio_print (Lisp_Object obj, Lisp_Object printcharfun, |
| 149 int UNUSED (escapeflag)) | |
| 1983 | 150 { |
| 151 CIbyte *rstr = ratio_to_string (XRATIO_DATA (obj), 10); | |
|
4952
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4883
diff
changeset
|
152 write_ascstring (printcharfun, rstr); |
|
4976
16112448d484
Rename xfree(FOO, TYPE) -> xfree(FOO)
Ben Wing <ben@xemacs.org>
parents:
4962
diff
changeset
|
153 xfree (rstr); |
| 1983 | 154 } |
| 155 | |
|
4802
2fc0e2f18322
Don't create any bignums before pdumping. Add bignum, ratio, and bigfloat
Jerry James <james@xemacs.org>
parents:
4678
diff
changeset
|
156 #ifdef NEW_GC |
|
2fc0e2f18322
Don't create any bignums before pdumping. Add bignum, ratio, and bigfloat
Jerry James <james@xemacs.org>
parents:
4678
diff
changeset
|
157 static void |
|
5141
0dcd22290039
fix issues with finalizers in number.c, postgresql, ldap
Ben Wing <ben@xemacs.org>
parents:
5125
diff
changeset
|
158 ratio_finalize (Lisp_Object obj) |
|
4802
2fc0e2f18322
Don't create any bignums before pdumping. Add bignum, ratio, and bigfloat
Jerry James <james@xemacs.org>
parents:
4678
diff
changeset
|
159 { |
|
5141
0dcd22290039
fix issues with finalizers in number.c, postgresql, ldap
Ben Wing <ben@xemacs.org>
parents:
5125
diff
changeset
|
160 struct Lisp_Ratio *num = XRATIO (obj); |
| 5125 | 161 /* #### WARNING: It would be better to put some sort of check to make |
| 162 sure this doesn't happen more than once, just in case --- | |
| 163 e.g. checking if it's zero before finalizing and then setting it to | |
| 164 zero after finalizing. */ | |
| 165 ratio_fini (num->data); | |
|
4802
2fc0e2f18322
Don't create any bignums before pdumping. Add bignum, ratio, and bigfloat
Jerry James <james@xemacs.org>
parents:
4678
diff
changeset
|
166 } |
|
5169
6c6d78781d59
cleanup of code related to xfree(), better KKCC backtrace capabilities, document XD_INLINE_LISP_OBJECT_BLOCK_PTR, fix some memory leaks, other code cleanup
Ben Wing <ben@xemacs.org>
parents:
5141
diff
changeset
|
167 #endif /* not NEW_GC */ |
|
4802
2fc0e2f18322
Don't create any bignums before pdumping. Add bignum, ratio, and bigfloat
Jerry James <james@xemacs.org>
parents:
4678
diff
changeset
|
168 |
| 1983 | 169 static int |
|
4906
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4892
diff
changeset
|
170 ratio_equal (Lisp_Object obj1, Lisp_Object obj2, int UNUSED (depth), |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4892
diff
changeset
|
171 int UNUSED (foldcase)) |
| 1983 | 172 { |
| 173 return ratio_eql (XRATIO_DATA (obj1), XRATIO_DATA (obj2)); | |
| 174 } | |
| 175 | |
| 176 static Hashcode | |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
177 ratio_hash (Lisp_Object obj, int UNUSED (depth), Boolint equalp) |
| 1983 | 178 { |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
179 if (equalp) |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
180 { |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
181 return FLOAT_HASHCODE_FROM_DOUBLE (ratio_to_double (XRATIO_DATA (obj))); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
182 } |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
183 else |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
184 { |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
185 return ratio_hashcode (XRATIO_DATA (obj)); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
186 } |
| 1983 | 187 } |
| 188 | |
| 189 static const struct memory_description ratio_description[] = { | |
| 190 { XD_OPAQUE_PTR, offsetof (Lisp_Ratio, data) }, | |
| 191 { XD_END } | |
| 192 }; | |
| 193 | |
|
5118
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
194 DEFINE_NODUMP_FROB_BLOCK_LISP_OBJECT ("ratio", ratio, 0, ratio_print, |
|
5169
6c6d78781d59
cleanup of code related to xfree(), better KKCC backtrace capabilities, document XD_INLINE_LISP_OBJECT_BLOCK_PTR, fix some memory leaks, other code cleanup
Ben Wing <ben@xemacs.org>
parents:
5141
diff
changeset
|
195 IF_NEW_GC (ratio_finalize), |
|
6c6d78781d59
cleanup of code related to xfree(), better KKCC backtrace capabilities, document XD_INLINE_LISP_OBJECT_BLOCK_PTR, fix some memory leaks, other code cleanup
Ben Wing <ben@xemacs.org>
parents:
5141
diff
changeset
|
196 ratio_equal, ratio_hash, |
|
5118
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
197 ratio_description, Lisp_Ratio); |
| 1983 | 198 |
| 2092 | 199 #endif /* HAVE_RATIO */ |
| 1983 | 200 |
| 201 Lisp_Object Qratiop; | |
| 202 | |
| 203 DEFUN ("ratiop", Fratiop, 1, 1, 0, /* | |
| 204 Return t if OBJECT is a ratio, nil otherwise. | |
| 205 */ | |
| 206 (object)) | |
| 207 { | |
| 208 return RATIOP (object) ? Qt : Qnil; | |
| 209 } | |
| 210 | |
| 211 | |
| 212 /******************************** Rationals *********************************/ | |
| 213 DEFUN ("rationalp", Frationalp, 1, 1, 0, /* | |
| 214 Return t if OBJECT is a rational, nil otherwise. | |
| 215 */ | |
| 216 (object)) | |
| 217 { | |
| 218 return RATIONALP (object) ? Qt : Qnil; | |
| 219 } | |
| 220 | |
| 221 DEFUN ("numerator", Fnumerator, 1, 1, 0, /* | |
| 222 Return the numerator of the canonical form of RATIONAL. | |
| 223 If RATIONAL is an integer, RATIONAL is returned. | |
| 224 */ | |
| 225 (rational)) | |
| 226 { | |
| 227 CONCHECK_RATIONAL (rational); | |
| 228 #ifdef HAVE_RATIO | |
|
4883
f730384b8ddf
Be more careful about canonical integer forms when dealing with ratios.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4802
diff
changeset
|
229 if (RATIOP (rational)) |
|
f730384b8ddf
Be more careful about canonical integer forms when dealing with ratios.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4802
diff
changeset
|
230 { |
|
f730384b8ddf
Be more careful about canonical integer forms when dealing with ratios.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4802
diff
changeset
|
231 return |
|
f730384b8ddf
Be more careful about canonical integer forms when dealing with ratios.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4802
diff
changeset
|
232 Fcanonicalize_number (make_bignum_bg (XRATIO_NUMERATOR (rational))); |
|
f730384b8ddf
Be more careful about canonical integer forms when dealing with ratios.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4802
diff
changeset
|
233 } |
|
f730384b8ddf
Be more careful about canonical integer forms when dealing with ratios.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4802
diff
changeset
|
234 #endif |
| 1983 | 235 return rational; |
| 236 } | |
| 237 | |
| 238 DEFUN ("denominator", Fdenominator, 1, 1, 0, /* | |
| 239 Return the denominator of the canonical form of RATIONAL. | |
| 240 If RATIONAL is an integer, 1 is returned. | |
| 241 */ | |
| 242 (rational)) | |
| 243 { | |
| 244 CONCHECK_RATIONAL (rational); | |
| 245 #ifdef HAVE_RATIO | |
|
4883
f730384b8ddf
Be more careful about canonical integer forms when dealing with ratios.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4802
diff
changeset
|
246 if (RATIOP (rational)) |
|
f730384b8ddf
Be more careful about canonical integer forms when dealing with ratios.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4802
diff
changeset
|
247 { |
|
f730384b8ddf
Be more careful about canonical integer forms when dealing with ratios.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4802
diff
changeset
|
248 return Fcanonicalize_number (make_bignum_bg |
|
f730384b8ddf
Be more careful about canonical integer forms when dealing with ratios.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4802
diff
changeset
|
249 (XRATIO_DENOMINATOR (rational))); |
|
f730384b8ddf
Be more careful about canonical integer forms when dealing with ratios.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4802
diff
changeset
|
250 } |
|
4892
d1d4ce10c7b4
Fix the build problem in number.c
Aidan Kehoe <kehoea@parhasard.net>
parents:
4886
diff
changeset
|
251 #endif |
|
5581
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5405
diff
changeset
|
252 return make_fixnum (1); |
| 1983 | 253 } |
| 254 | |
| 255 | |
| 256 /******************************** Bigfloats *********************************/ | |
| 257 #ifdef HAVE_BIGFLOAT | |
| 258 static void | |
| 2286 | 259 bigfloat_print (Lisp_Object obj, Lisp_Object printcharfun, |
| 260 int UNUSED (escapeflag)) | |
| 1983 | 261 { |
|
4952
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4883
diff
changeset
|
262 Ascbyte *fstr = bigfloat_to_string (XBIGFLOAT_DATA (obj), 10); |
|
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4883
diff
changeset
|
263 write_ascstring (printcharfun, fstr); |
|
4976
16112448d484
Rename xfree(FOO, TYPE) -> xfree(FOO)
Ben Wing <ben@xemacs.org>
parents:
4962
diff
changeset
|
264 xfree (fstr); |
| 1983 | 265 } |
| 266 | |
|
4802
2fc0e2f18322
Don't create any bignums before pdumping. Add bignum, ratio, and bigfloat
Jerry James <james@xemacs.org>
parents:
4678
diff
changeset
|
267 #ifdef NEW_GC |
|
2fc0e2f18322
Don't create any bignums before pdumping. Add bignum, ratio, and bigfloat
Jerry James <james@xemacs.org>
parents:
4678
diff
changeset
|
268 static void |
|
5141
0dcd22290039
fix issues with finalizers in number.c, postgresql, ldap
Ben Wing <ben@xemacs.org>
parents:
5125
diff
changeset
|
269 bigfloat_finalize (Lisp_Object obj) |
|
4802
2fc0e2f18322
Don't create any bignums before pdumping. Add bignum, ratio, and bigfloat
Jerry James <james@xemacs.org>
parents:
4678
diff
changeset
|
270 { |
|
5141
0dcd22290039
fix issues with finalizers in number.c, postgresql, ldap
Ben Wing <ben@xemacs.org>
parents:
5125
diff
changeset
|
271 struct Lisp_Bigfloat *num = XBIGFLOAT (obj); |
| 5125 | 272 /* #### WARNING: It would be better to put some sort of check to make |
| 273 sure this doesn't happen more than once, just in case --- | |
| 274 e.g. checking if it's zero before finalizing and then setting it to | |
| 275 zero after finalizing. */ | |
| 276 bigfloat_fini (num->bf); | |
|
4802
2fc0e2f18322
Don't create any bignums before pdumping. Add bignum, ratio, and bigfloat
Jerry James <james@xemacs.org>
parents:
4678
diff
changeset
|
277 } |
|
5169
6c6d78781d59
cleanup of code related to xfree(), better KKCC backtrace capabilities, document XD_INLINE_LISP_OBJECT_BLOCK_PTR, fix some memory leaks, other code cleanup
Ben Wing <ben@xemacs.org>
parents:
5141
diff
changeset
|
278 #endif /* not NEW_GC */ |
|
4802
2fc0e2f18322
Don't create any bignums before pdumping. Add bignum, ratio, and bigfloat
Jerry James <james@xemacs.org>
parents:
4678
diff
changeset
|
279 |
| 1983 | 280 static int |
|
4906
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4892
diff
changeset
|
281 bigfloat_equal (Lisp_Object obj1, Lisp_Object obj2, int UNUSED (depth), |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4892
diff
changeset
|
282 int UNUSED (foldcase)) |
| 1983 | 283 { |
| 284 return bigfloat_eql (XBIGFLOAT_DATA (obj1), XBIGFLOAT_DATA (obj2)); | |
| 285 } | |
| 286 | |
| 287 static Hashcode | |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
288 bigfloat_hash (Lisp_Object obj, int UNUSED (depth), Boolint equalp) |
| 1983 | 289 { |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
290 if (equalp) |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
291 { |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
292 return |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
293 FLOAT_HASHCODE_FROM_DOUBLE (bigfloat_to_double (XBIGFLOAT_DATA (obj))); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
294 } |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
295 else |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
296 { |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
297 return bigfloat_hashcode (XBIGFLOAT_DATA (obj)); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5169
diff
changeset
|
298 } |
| 1983 | 299 } |
| 300 | |
| 301 static const struct memory_description bigfloat_description[] = { | |
| 302 { XD_OPAQUE_PTR, offsetof (Lisp_Bigfloat, bf) }, | |
| 303 { XD_END } | |
| 304 }; | |
| 305 | |
|
5118
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
306 DEFINE_DUMPABLE_FROB_BLOCK_LISP_OBJECT ("bigfloat", bigfloat, 0, |
|
5169
6c6d78781d59
cleanup of code related to xfree(), better KKCC backtrace capabilities, document XD_INLINE_LISP_OBJECT_BLOCK_PTR, fix some memory leaks, other code cleanup
Ben Wing <ben@xemacs.org>
parents:
5141
diff
changeset
|
307 bigfloat_print, |
|
6c6d78781d59
cleanup of code related to xfree(), better KKCC backtrace capabilities, document XD_INLINE_LISP_OBJECT_BLOCK_PTR, fix some memory leaks, other code cleanup
Ben Wing <ben@xemacs.org>
parents:
5141
diff
changeset
|
308 IF_NEW_GC (bigfloat_finalize), |
|
5124
623d57b7fbe8
separate regular and disksave finalization, print method fixes.
Ben Wing <ben@xemacs.org>
parents:
5118
diff
changeset
|
309 bigfloat_equal, bigfloat_hash, |
|
623d57b7fbe8
separate regular and disksave finalization, print method fixes.
Ben Wing <ben@xemacs.org>
parents:
5118
diff
changeset
|
310 bigfloat_description, Lisp_Bigfloat); |
| 1983 | 311 |
| 2092 | 312 #endif /* HAVE_BIGFLOAT */ |
| 1983 | 313 |
| 314 Lisp_Object Qbigfloatp; | |
| 315 | |
| 316 DEFUN ("bigfloatp", Fbigfloatp, 1, 1, 0, /* | |
| 317 Return t if OBJECT is a bigfloat, nil otherwise. | |
| 318 */ | |
| 319 (object)) | |
| 320 { | |
| 321 return BIGFLOATP (object) ? Qt : Qnil; | |
| 322 } | |
| 323 | |
| 2092 | 324 DEFUN ("bigfloat-get-precision", Fbigfloat_get_precision, 1, 1, 0, /* |
| 325 Return the precision of bigfloat F as an integer. | |
| 326 */ | |
| 327 (f)) | |
| 328 { | |
| 329 CHECK_BIGFLOAT (f); | |
|
5602
c9e5612f5424
Support the MP library on recent FreeBSD, have it pass relevant tests.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5581
diff
changeset
|
330 #ifdef HAVE_BIGFLOAT |
| 2092 | 331 #ifdef HAVE_BIGNUM |
| 332 bignum_set_ulong (scratch_bignum, XBIGFLOAT_GET_PREC (f)); | |
| 333 return Fcanonicalize_number (make_bignum_bg (scratch_bignum)); | |
| 334 #else | |
|
5581
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5405
diff
changeset
|
335 return make_fixnum ((int) XBIGFLOAT_GET_PREC (f)); |
| 2092 | 336 #endif |
|
5602
c9e5612f5424
Support the MP library on recent FreeBSD, have it pass relevant tests.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5581
diff
changeset
|
337 #endif |
| 2092 | 338 } |
| 339 | |
| 340 DEFUN ("bigfloat-set-precision", Fbigfloat_set_precision, 2, 2, 0, /* | |
| 341 Set the precision of F, a bigfloat, to PRECISION, a nonnegative integer. | |
| 342 The new precision of F is returned. Note that the return value may differ | |
| 343 from PRECISION if the underlying library is unable to support exactly | |
| 344 PRECISION bits of precision. | |
| 345 */ | |
| 346 (f, precision)) | |
| 347 { | |
| 348 unsigned long prec; | |
| 349 | |
| 350 CHECK_BIGFLOAT (f); | |
|
5581
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5405
diff
changeset
|
351 if (FIXNUMP (precision)) |
| 2092 | 352 { |
|
5581
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5405
diff
changeset
|
353 prec = (XFIXNUM (precision) <= 0) ? 1UL : (unsigned long) XFIXNUM (precision); |
| 2092 | 354 } |
| 355 #ifdef HAVE_BIGNUM | |
| 356 else if (BIGNUMP (precision)) | |
| 357 { | |
| 358 prec = bignum_fits_ulong_p (XBIGNUM_DATA (precision)) | |
| 359 ? bignum_to_ulong (XBIGNUM_DATA (precision)) | |
| 360 : UINT_MAX; | |
| 361 } | |
| 362 #endif | |
| 363 else | |
| 364 { | |
| 365 dead_wrong_type_argument (Qintegerp, f); | |
| 366 return Qnil; | |
| 367 } | |
|
5602
c9e5612f5424
Support the MP library on recent FreeBSD, have it pass relevant tests.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5581
diff
changeset
|
368 #ifdef HAVE_BIGFLOAT |
| 2092 | 369 XBIGFLOAT_SET_PREC (f, prec); |
|
5602
c9e5612f5424
Support the MP library on recent FreeBSD, have it pass relevant tests.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5581
diff
changeset
|
370 #endif |
| 2092 | 371 return Fbigfloat_get_precision (f); |
| 372 } | |
| 373 | |
| 1983 | 374 static int |
| 2286 | 375 default_float_precision_changed (Lisp_Object UNUSED (sym), Lisp_Object *val, |
| 376 Lisp_Object UNUSED (in_object), | |
| 377 int UNUSED (flags)) | |
| 1983 | 378 { |
| 379 unsigned long prec; | |
| 380 | |
| 381 CONCHECK_INTEGER (*val); | |
| 382 #ifdef HAVE_BIGFLOAT | |
|
5581
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5405
diff
changeset
|
383 if (FIXNUMP (*val)) |
|
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5405
diff
changeset
|
384 prec = XFIXNUM (*val); |
|
4802
2fc0e2f18322
Don't create any bignums before pdumping. Add bignum, ratio, and bigfloat
Jerry James <james@xemacs.org>
parents:
4678
diff
changeset
|
385 else |
| 1983 | 386 { |
| 387 if (!bignum_fits_ulong_p (XBIGNUM_DATA (*val))) | |
| 388 args_out_of_range_3 (*val, Qzero, Vbigfloat_max_prec); | |
| 389 prec = bignum_to_ulong (XBIGNUM_DATA (*val)); | |
| 390 } | |
| 391 if (prec != 0UL) | |
| 392 bigfloat_set_default_prec (prec); | |
| 393 #endif | |
| 394 return 0; | |
| 395 } | |
| 396 | |
| 397 | |
| 398 /********************************* Floating *********************************/ | |
| 399 Lisp_Object | |
| 400 make_floating (double d) | |
| 401 { | |
| 402 #ifdef HAVE_BIGFLOAT | |
| 403 if (ZEROP (Vdefault_float_precision)) | |
| 404 #endif | |
| 405 return make_float (d); | |
| 406 #ifdef HAVE_BIGFLOAT | |
| 407 else | |
| 408 return make_bigfloat (d, 0UL); | |
| 409 #endif | |
| 410 } | |
| 411 | |
| 412 DEFUN ("floatingp", Ffloatingp, 1, 1, 0, /* | |
| 413 Return t if OBJECT is a floating point number of any kind, nil otherwise. | |
| 414 */ | |
| 415 (object)) | |
| 416 { | |
| 417 return FLOATINGP (object) ? Qt : Qnil; | |
| 418 } | |
| 419 | |
| 420 | |
| 421 /********************************** Reals ***********************************/ | |
| 422 DEFUN ("realp", Frealp, 1, 1, 0, /* | |
| 423 Return t if OBJECT is a real, nil otherwise. | |
| 424 */ | |
| 425 (object)) | |
| 426 { | |
| 427 return REALP (object) ? Qt : Qnil; | |
| 428 } | |
| 429 | |
| 430 | |
| 431 /********************************* Numbers **********************************/ | |
| 432 DEFUN ("canonicalize-number", Fcanonicalize_number, 1, 1, 0, /* | |
| 433 Return the canonical form of NUMBER. | |
| 434 */ | |
| 435 (number)) | |
| 436 { | |
| 437 /* The tests should go in order from larger, more expressive, or more | |
| 438 complex types to smaller, less expressive, or simpler types so that a | |
| 439 number can cascade all the way down to the simplest type if | |
| 440 appropriate. */ | |
| 441 #ifdef HAVE_RATIO | |
| 442 if (RATIOP (number) && | |
| 443 bignum_fits_long_p (XRATIO_DENOMINATOR (number)) && | |
| 444 bignum_to_long (XRATIO_DENOMINATOR (number)) == 1L) | |
|
4883
f730384b8ddf
Be more careful about canonical integer forms when dealing with ratios.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4802
diff
changeset
|
445 number = Fcanonicalize_number (make_bignum_bg (XRATIO_NUMERATOR (number))); |
| 1983 | 446 #endif |
| 447 #ifdef HAVE_BIGNUM | |
| 3391 | 448 if (BIGNUMP (number) && bignum_fits_emacs_int_p (XBIGNUM_DATA (number))) |
| 1983 | 449 { |
| 3391 | 450 EMACS_INT n = bignum_to_emacs_int (XBIGNUM_DATA (number)); |
|
5581
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5405
diff
changeset
|
451 if (NUMBER_FITS_IN_A_FIXNUM (n)) |
|
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5405
diff
changeset
|
452 number = make_fixnum (n); |
| 1983 | 453 } |
| 454 #endif | |
| 455 return number; | |
| 456 } | |
| 457 | |
| 458 enum number_type | |
| 459 get_number_type (Lisp_Object arg) | |
| 460 { | |
|
5581
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5405
diff
changeset
|
461 if (FIXNUMP (arg)) |
| 1983 | 462 return FIXNUM_T; |
| 463 #ifdef HAVE_BIGNUM | |
| 464 if (BIGNUMP (arg)) | |
| 465 return BIGNUM_T; | |
| 466 #endif | |
| 467 #ifdef HAVE_RATIO | |
| 468 if (RATIOP (arg)) | |
| 469 return RATIO_T; | |
| 470 #endif | |
| 471 if (FLOATP (arg)) | |
| 472 return FLOAT_T; | |
| 473 #ifdef HAVE_BIGFLOAT | |
| 474 if (BIGFLOATP (arg)) | |
| 475 return BIGFLOAT_T; | |
| 476 #endif | |
| 477 /* Catch unintentional bad uses of this function */ | |
| 2500 | 478 ABORT (); |
| 1995 | 479 /* NOTREACHED */ |
| 480 return FIXNUM_T; | |
| 1983 | 481 } |
| 482 | |
| 483 /* Convert NUMBER to type TYPE. If TYPE is BIGFLOAT_T then use the indicated | |
| 484 PRECISION; otherwise, PRECISION is ignored. */ | |
| 485 static Lisp_Object | |
| 486 internal_coerce_number (Lisp_Object number, enum number_type type, | |
| 2286 | 487 #ifdef HAVE_BIGFLOAT |
| 488 unsigned long precision | |
| 489 #else | |
| 490 unsigned long UNUSED (precision) | |
| 491 #endif | |
| 492 ) | |
| 1983 | 493 { |
| 494 enum number_type current_type; | |
| 495 | |
| 496 if (CHARP (number)) | |
|
5581
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5405
diff
changeset
|
497 number = make_fixnum (XCHAR (number)); |
| 1983 | 498 else if (MARKERP (number)) |
|
5581
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5405
diff
changeset
|
499 number = make_fixnum (marker_position (number)); |
| 1983 | 500 |
| 501 /* Note that CHECK_NUMBER ensures that NUMBER is a supported type. Hence, | |
| 2500 | 502 we ABORT() in the #else sections below, because it shouldn't be possible |
| 1983 | 503 to arrive there. */ |
| 504 CHECK_NUMBER (number); | |
| 505 current_type = get_number_type (number); | |
| 506 switch (current_type) | |
| 507 { | |
| 508 case FIXNUM_T: | |
| 509 switch (type) | |
| 510 { | |
| 511 case FIXNUM_T: | |
| 512 return number; | |
| 513 case BIGNUM_T: | |
| 514 #ifdef HAVE_BIGNUM | |
|
5581
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5405
diff
changeset
|
515 return make_bignum (XREALFIXNUM (number)); |
| 1983 | 516 #else |
| 2500 | 517 ABORT (); |
| 1983 | 518 #endif /* HAVE_BIGNUM */ |
| 519 case RATIO_T: | |
| 520 #ifdef HAVE_RATIO | |
|
5581
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5405
diff
changeset
|
521 return make_ratio (XREALFIXNUM (number), 1UL); |
| 1983 | 522 #else |
| 2500 | 523 ABORT (); |
| 1983 | 524 #endif /* HAVE_RATIO */ |
| 525 case FLOAT_T: | |
|
5581
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5405
diff
changeset
|
526 return make_float (XREALFIXNUM (number)); |
| 1983 | 527 case BIGFLOAT_T: |
| 528 #ifdef HAVE_BIGFLOAT | |
|
5581
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5405
diff
changeset
|
529 return make_bigfloat (XREALFIXNUM (number), precision); |
| 1983 | 530 #else |
| 2500 | 531 ABORT (); |
| 1983 | 532 #endif /* HAVE_BIGFLOAT */ |
| 533 } | |
| 534 case BIGNUM_T: | |
| 535 #ifdef HAVE_BIGNUM | |
| 536 switch (type) | |
| 537 { | |
| 538 case FIXNUM_T: | |
|
5581
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5405
diff
changeset
|
539 return make_fixnum (bignum_to_long (XBIGNUM_DATA (number))); |
| 1983 | 540 case BIGNUM_T: |
| 541 return number; | |
| 542 case RATIO_T: | |
| 543 #ifdef HAVE_RATIO | |
| 544 bignum_set_long (scratch_bignum, 1L); | |
| 545 return make_ratio_bg (XBIGNUM_DATA (number), scratch_bignum); | |
| 546 #else | |
| 2500 | 547 ABORT (); |
| 1983 | 548 #endif /* HAVE_RATIO */ |
| 549 case FLOAT_T: | |
| 550 return make_float (bignum_to_double (XBIGNUM_DATA (number))); | |
| 551 case BIGFLOAT_T: | |
| 552 #ifdef HAVE_BIGFLOAT | |
| 553 { | |
| 554 Lisp_Object temp; | |
| 555 temp = make_bigfloat (0.0, precision); | |
| 556 bigfloat_set_bignum (XBIGFLOAT_DATA (temp), XBIGNUM_DATA (number)); | |
| 557 return temp; | |
| 558 } | |
| 559 #else | |
| 2500 | 560 ABORT (); |
| 1983 | 561 #endif /* HAVE_BIGFLOAT */ |
| 562 } | |
| 563 #else | |
| 2500 | 564 ABORT (); |
| 1983 | 565 #endif /* HAVE_BIGNUM */ |
| 566 case RATIO_T: | |
| 567 #ifdef HAVE_RATIO | |
| 568 switch (type) | |
| 569 { | |
| 570 case FIXNUM_T: | |
| 571 bignum_div (scratch_bignum, XRATIO_NUMERATOR (number), | |
| 572 XRATIO_DENOMINATOR (number)); | |
|
5581
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5405
diff
changeset
|
573 return make_fixnum (bignum_to_long (scratch_bignum)); |
| 1983 | 574 case BIGNUM_T: |
| 575 bignum_div (scratch_bignum, XRATIO_NUMERATOR (number), | |
| 576 XRATIO_DENOMINATOR (number)); | |
| 577 return make_bignum_bg (scratch_bignum); | |
| 578 case RATIO_T: | |
| 579 return number; | |
| 580 case FLOAT_T: | |
| 581 return make_float (ratio_to_double (XRATIO_DATA (number))); | |
| 582 case BIGFLOAT_T: | |
| 583 #ifdef HAVE_BIGFLOAT | |
| 584 { | |
| 585 Lisp_Object temp; | |
| 586 temp = make_bigfloat (0.0, precision); | |
| 587 bigfloat_set_ratio (XBIGFLOAT_DATA (temp), XRATIO_DATA (number)); | |
| 588 return temp; | |
| 589 } | |
| 590 #else | |
| 2500 | 591 ABORT (); |
| 1983 | 592 #endif /* HAVE_BIGFLOAT */ |
| 593 } | |
| 594 #else | |
| 2500 | 595 ABORT (); |
| 1983 | 596 #endif /* HAVE_RATIO */ |
| 597 case FLOAT_T: | |
| 598 switch (type) | |
| 599 { | |
| 600 case FIXNUM_T: | |
|
4678
b5e1d4f6b66f
Make #'floor, #'ceiling, #'round, #'truncate conform to Common Lisp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3391
diff
changeset
|
601 return Ftruncate (number, Qnil); |
| 1983 | 602 case BIGNUM_T: |
| 603 #ifdef HAVE_BIGNUM | |
| 604 bignum_set_double (scratch_bignum, XFLOAT_DATA (number)); | |
| 605 return make_bignum_bg (scratch_bignum); | |
| 606 #else | |
| 2500 | 607 ABORT (); |
| 1983 | 608 #endif /* HAVE_BIGNUM */ |
| 609 case RATIO_T: | |
| 610 #ifdef HAVE_RATIO | |
| 611 ratio_set_double (scratch_ratio, XFLOAT_DATA (number)); | |
| 612 return make_ratio_rt (scratch_ratio); | |
| 613 #else | |
| 2500 | 614 ABORT (); |
| 1983 | 615 #endif /* HAVE_RATIO */ |
| 616 case FLOAT_T: | |
| 617 return number; | |
| 618 case BIGFLOAT_T: | |
| 619 #ifdef HAVE_BIGFLOAT | |
| 620 bigfloat_set_prec (scratch_bigfloat, precision); | |
| 621 bigfloat_set_double (scratch_bigfloat, XFLOAT_DATA (number)); | |
| 622 return make_bigfloat_bf (scratch_bigfloat); | |
| 623 #else | |
| 2500 | 624 ABORT (); |
| 1983 | 625 #endif /* HAVE_BIGFLOAT */ |
| 626 } | |
| 627 case BIGFLOAT_T: | |
| 628 #ifdef HAVE_BIGFLOAT | |
| 629 switch (type) | |
| 630 { | |
| 631 case FIXNUM_T: | |
|
5581
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5405
diff
changeset
|
632 return make_fixnum (bigfloat_to_long (XBIGFLOAT_DATA (number))); |
| 1983 | 633 case BIGNUM_T: |
| 634 #ifdef HAVE_BIGNUM | |
| 635 bignum_set_bigfloat (scratch_bignum, XBIGFLOAT_DATA (number)); | |
| 636 return make_bignum_bg (scratch_bignum); | |
| 637 #else | |
| 2500 | 638 ABORT (); |
| 1983 | 639 #endif /* HAVE_BIGNUM */ |
| 640 case RATIO_T: | |
| 641 #ifdef HAVE_RATIO | |
| 642 ratio_set_bigfloat (scratch_ratio, XBIGFLOAT_DATA (number)); | |
| 643 return make_ratio_rt (scratch_ratio); | |
| 644 #else | |
| 2500 | 645 ABORT (); |
| 1983 | 646 #endif |
| 647 case FLOAT_T: | |
| 648 return make_float (bigfloat_to_double (XBIGFLOAT_DATA (number))); | |
| 649 case BIGFLOAT_T: | |
| 650 /* FIXME: Do we need to change the precision? */ | |
| 651 return number; | |
| 652 } | |
| 653 #else | |
| 2500 | 654 ABORT (); |
| 1983 | 655 #endif /* HAVE_BIGFLOAT */ |
| 656 } | |
| 2500 | 657 ABORT (); |
| 1995 | 658 /* NOTREACHED */ |
| 659 return Qzero; | |
| 1983 | 660 } |
| 661 | |
| 662 /* This function promotes its arguments as necessary to make them both the | |
| 663 same type. It destructively modifies its arguments to do so. Characters | |
| 664 and markers are ALWAYS converted to integers. */ | |
| 665 enum number_type | |
| 666 promote_args (Lisp_Object *arg1, Lisp_Object *arg2) | |
| 667 { | |
| 668 enum number_type type1, type2; | |
| 669 | |
| 670 if (CHARP (*arg1)) | |
|
5581
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5405
diff
changeset
|
671 *arg1 = make_fixnum (XCHAR (*arg1)); |
| 1983 | 672 else if (MARKERP (*arg1)) |
|
5581
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5405
diff
changeset
|
673 *arg1 = make_fixnum (marker_position (*arg1)); |
| 1983 | 674 if (CHARP (*arg2)) |
|
5581
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5405
diff
changeset
|
675 *arg2 = make_fixnum (XCHAR (*arg2)); |
| 1983 | 676 else if (MARKERP (*arg2)) |
|
5581
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5405
diff
changeset
|
677 *arg2 = make_fixnum (marker_position (*arg2)); |
| 1983 | 678 |
| 679 CHECK_NUMBER (*arg1); | |
| 680 CHECK_NUMBER (*arg2); | |
| 681 | |
| 682 type1 = get_number_type (*arg1); | |
| 683 type2 = get_number_type (*arg2); | |
| 684 | |
| 685 if (type1 < type2) | |
| 686 { | |
| 687 *arg1 = internal_coerce_number (*arg1, type2, | |
| 688 #ifdef HAVE_BIGFLOAT | |
| 689 type2 == BIGFLOAT_T | |
| 690 ? XBIGFLOAT_GET_PREC (*arg2) : | |
| 691 #endif | |
| 692 0UL); | |
| 693 return type2; | |
| 694 } | |
|
4802
2fc0e2f18322
Don't create any bignums before pdumping. Add bignum, ratio, and bigfloat
Jerry James <james@xemacs.org>
parents:
4678
diff
changeset
|
695 |
| 1983 | 696 if (type2 < type1) |
| 697 { | |
| 698 *arg2 = internal_coerce_number (*arg2, type1, | |
| 699 #ifdef HAVE_BIGFLOAT | |
| 700 type1 == BIGFLOAT_T | |
| 701 ? XBIGFLOAT_GET_PREC (*arg1) : | |
| 702 #endif | |
| 703 0UL); | |
| 704 return type1; | |
| 705 } | |
| 706 | |
| 707 /* No conversion necessary */ | |
| 708 return type1; | |
| 709 } | |
| 710 | |
| 711 DEFUN ("coerce-number", Fcoerce_number, 2, 3, 0, /* | |
| 712 Convert NUMBER to the indicated type, possibly losing information. | |
| 713 Do not call this function. Use `coerce' instead. | |
| 714 | |
| 3025 | 715 TYPE is one of the symbols `fixnum', `integer', `ratio', `float', or |
| 716 `bigfloat'. Not all of these types may be supported. | |
| 1983 | 717 |
| 718 PRECISION is the number of bits of precision to use when converting to | |
| 719 bigfloat; it is ignored otherwise. If nil, the default precision is used. | |
| 720 | |
| 721 Note that some conversions lose information. No error is signaled in such | |
| 722 cases; the information is silently lost. | |
| 723 */ | |
| 2595 | 724 (number, type, USED_IF_BIGFLOAT (precision))) |
| 1983 | 725 { |
| 726 CHECK_SYMBOL (type); | |
| 727 if (EQ (type, Qfixnum)) | |
| 728 return internal_coerce_number (number, FIXNUM_T, 0UL); | |
| 729 else if (EQ (type, Qinteger)) | |
| 730 { | |
| 731 /* If bignums are available, we always convert to one first, then | |
| 732 downgrade to a fixnum if possible. */ | |
| 733 #ifdef HAVE_BIGNUM | |
| 734 return Fcanonicalize_number | |
| 735 (internal_coerce_number (number, BIGNUM_T, 0UL)); | |
| 736 #else | |
| 737 return internal_coerce_number (number, FIXNUM_T, 0UL); | |
| 738 #endif | |
| 739 } | |
| 740 #ifdef HAVE_RATIO | |
| 741 else if (EQ (type, Qratio)) | |
| 742 return internal_coerce_number (number, RATIO_T, 0UL); | |
| 743 #endif | |
| 744 else if (EQ (type, Qfloat)) | |
| 745 return internal_coerce_number (number, FLOAT_T, 0UL); | |
| 746 #ifdef HAVE_BIGFLOAT | |
| 747 else if (EQ (type, Qbigfloat)) | |
| 748 { | |
| 749 unsigned long prec; | |
| 750 | |
| 751 if (NILP (precision)) | |
| 752 prec = bigfloat_get_default_prec (); | |
| 753 else | |
| 754 { | |
| 755 CHECK_INTEGER (precision); | |
| 756 #ifdef HAVE_BIGNUM | |
|
5581
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5405
diff
changeset
|
757 if (FIXNUMP (precision)) |
| 1983 | 758 #endif /* HAVE_BIGNUM */ |
|
5581
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5405
diff
changeset
|
759 prec = (unsigned long) XREALFIXNUM (precision); |
| 1983 | 760 #ifdef HAVE_BIGNUM |
| 761 else | |
| 762 { | |
| 763 if (!bignum_fits_ulong_p (XBIGNUM_DATA (precision))) | |
| 764 args_out_of_range (precision, Vbigfloat_max_prec); | |
| 765 prec = bignum_to_ulong (XBIGNUM_DATA (precision)); | |
| 766 } | |
| 767 #endif /* HAVE_BIGNUM */ | |
| 768 } | |
| 769 return internal_coerce_number (number, BIGFLOAT_T, prec); | |
| 770 } | |
| 771 #endif /* HAVE_BIGFLOAT */ | |
| 772 | |
| 773 Fsignal (Qunsupported_type, type); | |
| 774 /* NOTREACHED */ | |
| 775 return Qnil; | |
| 776 } | |
| 777 | |
| 778 | |
| 779 void | |
| 780 syms_of_number (void) | |
| 781 { | |
| 782 #ifdef HAVE_BIGNUM | |
|
5117
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
3025
diff
changeset
|
783 INIT_LISP_OBJECT (bignum); |
| 1983 | 784 #endif |
| 785 #ifdef HAVE_RATIO | |
|
5117
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
3025
diff
changeset
|
786 INIT_LISP_OBJECT (ratio); |
| 1983 | 787 #endif |
| 788 #ifdef HAVE_BIGFLOAT | |
|
5117
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
3025
diff
changeset
|
789 INIT_LISP_OBJECT (bigfloat); |
| 1983 | 790 #endif |
| 791 | |
| 792 /* Type predicates */ | |
| 793 DEFSYMBOL (Qrationalp); | |
| 794 DEFSYMBOL (Qfloatingp); | |
| 795 DEFSYMBOL (Qrealp); | |
| 796 DEFSYMBOL (Qbignump); | |
| 797 DEFSYMBOL (Qratiop); | |
| 798 DEFSYMBOL (Qbigfloatp); | |
| 799 | |
| 800 /* Functions */ | |
| 801 DEFSUBR (Fbignump); | |
| 802 DEFSUBR (Fratiop); | |
| 803 DEFSUBR (Frationalp); | |
| 804 DEFSUBR (Fnumerator); | |
| 805 DEFSUBR (Fdenominator); | |
| 806 DEFSUBR (Fbigfloatp); | |
| 2092 | 807 DEFSUBR (Fbigfloat_get_precision); |
| 808 DEFSUBR (Fbigfloat_set_precision); | |
| 2001 | 809 DEFSUBR (Ffloatingp); |
| 1983 | 810 DEFSUBR (Frealp); |
| 811 DEFSUBR (Fcanonicalize_number); | |
| 812 DEFSUBR (Fcoerce_number); | |
| 813 } | |
| 814 | |
| 815 void | |
| 816 vars_of_number (void) | |
| 817 { | |
| 2051 | 818 /* These variables are Lisp variables rather than number variables so that |
| 819 we can put bignums in them. */ | |
| 1983 | 820 DEFVAR_LISP_MAGIC ("default-float-precision", &Vdefault_float_precision, /* |
| 821 The default floating-point precision for newly created floating point values. | |
| 2092 | 822 This should be 0 to create Lisp float types, or an unsigned integer no greater |
| 823 than `bigfloat-maximum-precision' to create Lisp bigfloat types with the | |
| 824 indicated precision. | |
| 1983 | 825 */ default_float_precision_changed); |
|
5581
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5405
diff
changeset
|
826 Vdefault_float_precision = make_fixnum (0); |
| 1983 | 827 |
| 2092 | 828 DEFVAR_CONST_LISP ("bigfloat-maximum-precision", &Vbigfloat_max_prec /* |
| 1983 | 829 The maximum number of bits of precision a bigfloat can have. |
| 2092 | 830 This is determined by the underlying library used to implement bigfloats. |
| 1983 | 831 */); |
| 832 | |
| 2061 | 833 #ifdef HAVE_BIGFLOAT |
|
4802
2fc0e2f18322
Don't create any bignums before pdumping. Add bignum, ratio, and bigfloat
Jerry James <james@xemacs.org>
parents:
4678
diff
changeset
|
834 /* Don't create a bignum here. Otherwise, we lose with NEW_GC + pdump. |
|
2fc0e2f18322
Don't create any bignums before pdumping. Add bignum, ratio, and bigfloat
Jerry James <james@xemacs.org>
parents:
4678
diff
changeset
|
835 See reinit_vars_of_number(). */ |
|
5581
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5405
diff
changeset
|
836 Vbigfloat_max_prec = make_fixnum (MOST_POSITIVE_FIXNUM); |
| 2061 | 837 #else |
|
5581
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5405
diff
changeset
|
838 Vbigfloat_max_prec = make_fixnum (0); |
| 2051 | 839 #endif /* HAVE_BIGFLOAT */ |
| 840 | |
| 1983 | 841 Fprovide (intern ("number-types")); |
| 842 #ifdef HAVE_BIGNUM | |
| 843 Fprovide (intern ("bignum")); | |
| 844 #endif | |
| 845 #ifdef HAVE_RATIO | |
| 846 Fprovide (intern ("ratio")); | |
| 847 #endif | |
| 848 #ifdef HAVE_BIGFLOAT | |
| 849 Fprovide (intern ("bigfloat")); | |
| 850 #endif | |
| 851 } | |
| 852 | |
| 853 void | |
|
4802
2fc0e2f18322
Don't create any bignums before pdumping. Add bignum, ratio, and bigfloat
Jerry James <james@xemacs.org>
parents:
4678
diff
changeset
|
854 reinit_vars_of_number (void) |
|
2fc0e2f18322
Don't create any bignums before pdumping. Add bignum, ratio, and bigfloat
Jerry James <james@xemacs.org>
parents:
4678
diff
changeset
|
855 { |
|
2fc0e2f18322
Don't create any bignums before pdumping. Add bignum, ratio, and bigfloat
Jerry James <james@xemacs.org>
parents:
4678
diff
changeset
|
856 #if defined(HAVE_BIGFLOAT) && defined(HAVE_BIGNUM) |
|
2fc0e2f18322
Don't create any bignums before pdumping. Add bignum, ratio, and bigfloat
Jerry James <james@xemacs.org>
parents:
4678
diff
changeset
|
857 Vbigfloat_max_prec = make_bignum (0L); |
|
2fc0e2f18322
Don't create any bignums before pdumping. Add bignum, ratio, and bigfloat
Jerry James <james@xemacs.org>
parents:
4678
diff
changeset
|
858 bignum_set_ulong (XBIGNUM_DATA (Vbigfloat_max_prec), ULONG_MAX); |
|
2fc0e2f18322
Don't create any bignums before pdumping. Add bignum, ratio, and bigfloat
Jerry James <james@xemacs.org>
parents:
4678
diff
changeset
|
859 #endif |
|
2fc0e2f18322
Don't create any bignums before pdumping. Add bignum, ratio, and bigfloat
Jerry James <james@xemacs.org>
parents:
4678
diff
changeset
|
860 } |
|
2fc0e2f18322
Don't create any bignums before pdumping. Add bignum, ratio, and bigfloat
Jerry James <james@xemacs.org>
parents:
4678
diff
changeset
|
861 |
|
2fc0e2f18322
Don't create any bignums before pdumping. Add bignum, ratio, and bigfloat
Jerry James <james@xemacs.org>
parents:
4678
diff
changeset
|
862 void |
| 1983 | 863 init_number (void) |
| 864 { | |
| 865 if (!number_initialized) | |
| 866 { | |
| 867 number_initialized = 1; | |
| 868 | |
|
5739
a2912073be85
Support bignums with MPIR. Add documentation on the bignum, ratio,
Jerry James <james@xemacs.org>
parents:
5602
diff
changeset
|
869 #if defined(WITH_GMP) || defined(WITH_MPIR) |
| 1983 | 870 init_number_gmp (); |
| 871 #endif | |
| 872 #ifdef WITH_MP | |
| 873 init_number_mp (); | |
| 874 #endif | |
| 875 | |
| 876 #ifdef HAVE_BIGNUM | |
| 877 bignum_init (scratch_bignum); | |
| 878 bignum_init (scratch_bignum2); | |
| 879 #endif | |
| 880 | |
| 881 #ifdef HAVE_RATIO | |
| 882 ratio_init (scratch_ratio); | |
|
4678
b5e1d4f6b66f
Make #'floor, #'ceiling, #'round, #'truncate conform to Common Lisp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3391
diff
changeset
|
883 ratio_init (scratch_ratio2); |
| 1983 | 884 #endif |
| 885 | |
| 886 #ifdef HAVE_BIGFLOAT | |
| 887 bigfloat_init (scratch_bigfloat); | |
| 888 bigfloat_init (scratch_bigfloat2); | |
| 889 #endif | |
|
4802
2fc0e2f18322
Don't create any bignums before pdumping. Add bignum, ratio, and bigfloat
Jerry James <james@xemacs.org>
parents:
4678
diff
changeset
|
890 |
|
2fc0e2f18322
Don't create any bignums before pdumping. Add bignum, ratio, and bigfloat
Jerry James <james@xemacs.org>
parents:
4678
diff
changeset
|
891 #ifndef PDUMP |
|
2fc0e2f18322
Don't create any bignums before pdumping. Add bignum, ratio, and bigfloat
Jerry James <james@xemacs.org>
parents:
4678
diff
changeset
|
892 reinit_vars_of_number (); |
|
2fc0e2f18322
Don't create any bignums before pdumping. Add bignum, ratio, and bigfloat
Jerry James <james@xemacs.org>
parents:
4678
diff
changeset
|
893 #endif |
| 1983 | 894 } |
| 895 } |