Mercurial > hg > xemacs-beta

comparison src/number.h @ 4678:b5e1d4f6b66f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make #'floor, #'ceiling, #'round, #'truncate conform to Common Lisp. lisp/ChangeLog addition: 2009-08-11 Aidan Kehoe <kehoea@parhasard.net> * cl-extra.el (ceiling*, floor*, round*, truncate*): Implement these in terms of the C functions; mark them as obsolete. (mod*, rem*): Use #'nth-value with the C functions, not #'nth with the CL emulation functions. man/ChangeLog addition: 2009-08-11 Aidan Kehoe <kehoea@parhasard.net> * lispref/numbers.texi (Bigfloat Basics): Correct this documentation (ignoring for the moment that it breaks off in mid-sentence). tests/ChangeLog addition: 2009-08-11 Aidan Kehoe <kehoea@parhasard.net> * automated/lisp-tests.el: Test the new Common Lisp-compatible rounding functions available in C. (generate-rounding-output): Provide a function useful for generating the data for the rounding functions tests. src/ChangeLog addition: 2009-08-11 Aidan Kehoe <kehoea@parhasard.net> * floatfns.c (ROUNDING_CONVERT, CONVERT_WITH_NUMBER_TYPES) (CONVERT_WITHOUT_NUMBER_TYPES, MAYBE_TWO_ARGS_BIGNUM) (MAYBE_ONE_ARG_BIGNUM, MAYBE_TWO_ARGS_RATIO) (MAYBE_ONE_ARG_RATIO, MAYBE_TWO_ARGS_BIGFLOAT) (MAYBE_ONE_ARG_BIGFLOAT, MAYBE_EFF, MAYBE_CHAR_OR_MARKER): New macros, used in the implementation of the rounding functions. (ceiling_two_fixnum, ceiling_two_bignum, ceiling_two_ratio) (ceiling_two_bigfloat, ceiling_one_ratio, ceiling_one_bigfloat) (ceiling_two_float, ceiling_one_float, ceiling_one_mundane_arg) (floor_two_fixnum, floor_two_bignum, floor_two_ratio) (floor_two_bigfloat, floor_one_ratio, floor_one_bigfloat) (floor_two_float, floor_one_mundane_arg, round_two_fixnum) (round_two_bignum_1, round_two_bignum, round_two_ratio) (round_one_bigfloat_1, round_two_bigfloat, round_one_ratio) (round_one_bigfloat, round_two_float, round_one_float) (round_one_mundane_arg, truncate_two_fixnum) (truncate_two_bignum, truncate_two_ratio, truncate_two_bigfloat) (truncate_one_ratio, truncate_one_bigfloat, truncate_two_float) (truncate_one_float, truncate_one_mundane_arg): New functions, used in the implementation of the rounding functions. (Fceiling, Ffloor, Fround, Ftruncate, Ffceiling, Fffloor) (Ffround, Fftruncate): Revise to fully support Common Lisp conventions. This means: -- All functions have optional DIVISOR arguments -- All functions return multiple values; see #'values -- All functions do their arithmetic with the correct number types according to the contamination rules. -- #'round and #'fround always round towards the even number in ambiguous cases. * doprnt.c (emacs_doprnt_1): * number.c (internal_coerce_number): Call Ftruncate with two arguments, not one. * floatfns.c (Ffloat): Correct this, if NUMBER is a bignum. * lisp.h: Declare Ftruncate as taking two arguments. * number.c: Provide scratch_ratio2, init it appropriately. * number.h: Make scratch_ratio2 available. * number.h (BIGFLOAT_ARITH_RETURN): * number.h (BIGFLOAT_ARITH_RETURN1): Correct these functions.
author Aidan Kehoe <kehoea@parhasard.net>
date Tue, 11 Aug 2009 17:59:23 +0100
parents 639cdee384e4
children 2fc0e2f18322 e0db3c197671
comparison
equal deleted inserted replaced
4677:8f1ee2d15784 4678:b5e1d4f6b66f
193 } while (0) 193 } while (0)
194 194
195 extern Lisp_Object make_ratio (long, unsigned long); 195 extern Lisp_Object make_ratio (long, unsigned long);
196 extern Lisp_Object make_ratio_bg (bignum, bignum); 196 extern Lisp_Object make_ratio_bg (bignum, bignum);
197 extern Lisp_Object make_ratio_rt (ratio); 197 extern Lisp_Object make_ratio_rt (ratio);
198 extern ratio scratch_ratio; 198 extern ratio scratch_ratio, scratch_ratio2;
199 199
200 #else /* !HAVE_RATIO */ 200 #else /* !HAVE_RATIO */
201 201
202 #define RATIOP(x) 0 202 #define RATIOP(x) 0
203 #define CHECK_RATIO(x) dead_wrong_type_argument (Qratiop, x) 203 #define CHECK_RATIO(x) dead_wrong_type_argument (Qratiop, x)
249 #define bigfloat_data(f) ((f)->bf) 249 #define bigfloat_data(f) ((f)->bf)
250 #define XBIGFLOAT_DATA(x) bigfloat_data (XBIGFLOAT (x)) 250 #define XBIGFLOAT_DATA(x) bigfloat_data (XBIGFLOAT (x))
251 #define XBIGFLOAT_GET_PREC(x) bigfloat_get_prec (XBIGFLOAT_DATA (x)) 251 #define XBIGFLOAT_GET_PREC(x) bigfloat_get_prec (XBIGFLOAT_DATA (x))
252 #define XBIGFLOAT_SET_PREC(x,p) bigfloat_set_prec (XBIGFLOAT_DATA (x), p) 252 #define XBIGFLOAT_SET_PREC(x,p) bigfloat_set_prec (XBIGFLOAT_DATA (x), p)
253 253
254 #define BIGFLOAT_ARITH_RETURN(f,op) do \ 254 #define BIGFLOAT_ARITH_RETURN(f,op) do \
255 { \ 255 { \
256 Lisp_Object retval = make_bigfloat_bf (f); \ 256 Lisp_Object retval = make_bigfloat (0.0, bigfloat_get_default_prec()); \
257 bigfloat_##op (XBIGFLOAT_DATA (retval), XBIGFLOAT_DATA (f)); \ 257 bigfloat_##op (XBIGFLOAT_DATA (retval), XBIGFLOAT_DATA (f)); \
258 return retval; \ 258 return retval; \
259 } while (0) 259 } while (0)
260 260
261 #define BIGFLOAT_ARITH_RETURN1(f,op,arg) do \ 261 #define BIGFLOAT_ARITH_RETURN1(f,op,arg) do \
262 { \ 262 { \
263 Lisp_Object retval = make_bigfloat_bf (f); \ 263 Lisp_Object retval = make_bigfloat (0.0, bigfloat_get_default_prec()); \
264 bigfloat_##op (XBIGFLOAT_DATA (retval), XBIGFLOAT_DATA (f), arg); \ 264 bigfloat_##op (XBIGFLOAT_DATA (retval), XBIGFLOAT_DATA (f), arg); \
265 return retval; \ 265 return retval; \
266 } while (0) 266 } while (0)
267 267
268 extern Lisp_Object make_bigfloat (double, unsigned long); 268 extern Lisp_Object make_bigfloat (double, unsigned long);