comparison src/number.c @ 4678:b5e1d4f6b66f

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
39 39
40 #ifdef HAVE_BIGNUM 40 #ifdef HAVE_BIGNUM
41 bignum scratch_bignum, scratch_bignum2; 41 bignum scratch_bignum, scratch_bignum2;
42 #endif 42 #endif
43 #ifdef HAVE_RATIO 43 #ifdef HAVE_RATIO
44 ratio scratch_ratio; 44 ratio scratch_ratio, scratch_ratio2;
45 #endif 45 #endif
46 #ifdef HAVE_BIGFLOAT 46 #ifdef HAVE_BIGFLOAT
47 bigfloat scratch_bigfloat, scratch_bigfloat2; 47 bigfloat scratch_bigfloat, scratch_bigfloat2;
48 #endif 48 #endif
49 49
559 #endif /* HAVE_RATIO */ 559 #endif /* HAVE_RATIO */
560 case FLOAT_T: 560 case FLOAT_T:
561 switch (type) 561 switch (type)
562 { 562 {
563 case FIXNUM_T: 563 case FIXNUM_T:
564 return Ftruncate (number); 564 return Ftruncate (number, Qnil);
565 case BIGNUM_T: 565 case BIGNUM_T:
566 #ifdef HAVE_BIGNUM 566 #ifdef HAVE_BIGNUM
567 bignum_set_double (scratch_bignum, XFLOAT_DATA (number)); 567 bignum_set_double (scratch_bignum, XFLOAT_DATA (number));
568 return make_bignum_bg (scratch_bignum); 568 return make_bignum_bg (scratch_bignum);
569 #else 569 #else
851 bignum_init (scratch_bignum2); 851 bignum_init (scratch_bignum2);
852 #endif 852 #endif
853 853
854 #ifdef HAVE_RATIO 854 #ifdef HAVE_RATIO
855 ratio_init (scratch_ratio); 855 ratio_init (scratch_ratio);
856 ratio_init (scratch_ratio2);
856 #endif 857 #endif
857 858
858 #ifdef HAVE_BIGFLOAT 859 #ifdef HAVE_BIGFLOAT
859 bigfloat_init (scratch_bigfloat); 860 bigfloat_init (scratch_bigfloat);
860 bigfloat_init (scratch_bigfloat2); 861 bigfloat_init (scratch_bigfloat2);