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