Mercurial > hg > xemacs-beta
annotate src/rangetab.h @ 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 | 1e7cc382eb16 |
| children | e0db3c197671 |
| rev | line source |
|---|---|
| 428 | 1 /* XEmacs routines to deal with range tables. |
| 2 Copyright (C) 1995 Sun Microsystems, Inc. | |
| 2421 | 3 Copyright (C) 1995, 2004 Ben Wing. |
| 428 | 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 | |
| 19 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 20 Boston, MA 02111-1307, USA. */ | |
| 21 | |
| 22 /* Synched up with: Not in FSF. */ | |
| 23 | |
| 24 /* Extracted from rangetab.c by O. Galibert, 1998. */ | |
| 25 | |
| 440 | 26 #ifndef INCLUDED_rangetab_h_ |
| 27 #define INCLUDED_rangetab_h_ | |
| 428 | 28 |
| 29 typedef struct range_table_entry range_table_entry; | |
| 30 struct range_table_entry | |
| 31 { | |
| 32 EMACS_INT first; | |
| 33 EMACS_INT last; | |
| 34 Lisp_Object val; | |
| 35 }; | |
| 36 | |
| 37 typedef struct | |
| 38 { | |
| 39 Dynarr_declare (range_table_entry); | |
| 40 } range_table_entry_dynarr; | |
| 41 | |
| 2421 | 42 enum range_table_type |
| 43 { | |
| 44 RANGE_START_CLOSED_END_OPEN, | |
| 45 RANGE_START_CLOSED_END_CLOSED, | |
| 46 RANGE_START_OPEN_END_CLOSED, | |
| 47 RANGE_START_OPEN_END_OPEN | |
| 48 }; | |
| 49 | |
| 428 | 50 struct Lisp_Range_Table |
| 51 { | |
| 3017 | 52 struct LCRECORD_HEADER header; |
| 428 | 53 range_table_entry_dynarr *entries; |
| 2421 | 54 enum range_table_type type; |
| 428 | 55 }; |
| 440 | 56 typedef struct Lisp_Range_Table Lisp_Range_Table; |
| 428 | 57 |
| 440 | 58 DECLARE_LRECORD (range_table, Lisp_Range_Table); |
| 59 #define XRANGE_TABLE(x) XRECORD (x, range_table, Lisp_Range_Table) | |
| 617 | 60 #define wrap_range_table(p) wrap_record (p, range_table) |
| 428 | 61 #define RANGE_TABLEP(x) RECORDP (x, range_table) |
| 62 #define CHECK_RANGE_TABLE(x) CHECK_RECORD (x, range_table) | |
| 63 | |
| 440 | 64 #endif /* INCLUDED_rangetab_h_ */ |