Mercurial > hg > xemacs-beta
annotate src/objects-tty-impl.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 | 141c2920ea48 |
| children | e0db3c197671 |
| rev | line source |
|---|---|
| 872 | 1 /* TTY-specific Lisp objects. |
| 2 Copyright (C) 1995 Board of Trustees, University of Illinois. | |
| 3 Copyright (C) 1995 Ben Wing | |
| 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 #ifndef INCLUDED_objects_tty_impl_h_ | |
| 25 #define INCLUDED_objects_tty_impl_h_ | |
| 26 | |
| 27 #include "objects-impl.h" | |
| 28 #include "objects-tty.h" | |
| 29 | |
| 30 struct tty_color_instance_data | |
| 31 { | |
| 3092 | 32 #ifdef NEW_GC |
| 33 struct lrecord_header header; | |
| 34 #endif /* NEW_GC */ | |
| 872 | 35 Lisp_Object symbol; /* so we don't have to constantly call Fintern() */ |
| 36 }; | |
| 37 | |
| 3092 | 38 #ifdef NEW_GC |
| 39 DECLARE_LRECORD (tty_color_instance_data, struct tty_color_instance_data); | |
| 40 #define XTTY_COLOR_INSTANCE_DATA(x) \ | |
| 41 XRECORD (x, tty_color_instance_data, struct tty_color_instance_data) | |
| 42 #define wrap_tty_color_instance_data(p) \ | |
| 43 wrap_record (p, tty_color_instance_data) | |
| 44 #define TTY_COLOR_INSTANCE_DATAP(x) RECORDP (x, tty_color_instance_data) | |
| 45 #define CHECK_TTY_COLOR_INSTANCE_DATA(x) \ | |
| 46 CHECK_RECORD (x, tty_color_instance_data) | |
| 47 #define CONCHECK_TTY_COLOR_INSTANCE_DATA(x) \ | |
| 48 CONCHECK_RECORD (x, tty_color_instance_data) | |
| 49 #endif /* NEW_GC */ | |
| 50 | |
| 872 | 51 #define TTY_COLOR_INSTANCE_DATA(c) \ |
| 52 ((struct tty_color_instance_data *) (c)->data) | |
| 53 | |
| 54 #define COLOR_INSTANCE_TTY_SYMBOL(c) (TTY_COLOR_INSTANCE_DATA (c)->symbol) | |
| 55 | |
| 56 struct tty_font_instance_data | |
| 57 { | |
| 3092 | 58 #ifdef NEW_GC |
| 59 struct lrecord_header header; | |
| 60 #endif /* NEW_GC */ | |
| 872 | 61 Lisp_Object charset; |
| 62 }; | |
| 63 | |
| 3092 | 64 #ifdef NEW_GC |
| 65 DECLARE_LRECORD (tty_font_instance_data, struct tty_font_instance_data); | |
| 66 #define XTTY_FONT_INSTANCE_DATA(x) \ | |
| 67 XRECORD (x, tty_font_instance_data, struct tty_font_instance_data) | |
| 68 #define wrap_tty_font_instance_data(p) \ | |
| 69 wrap_record (p, tty_font_instance_data) | |
| 70 #define TTY_FONT_INSTANCE_DATAP(x) RECORDP (x, tty_font_instance_data) | |
| 71 #define CHECK_TTY_FONT_INSTANCE_DATA(x) \ | |
| 72 CHECK_RECORD (x, tty_font_instance_data) | |
| 73 #define CONCHECK_TTY_FONT_INSTANCE_DATA(x) \ | |
| 74 CONCHECK_RECORD (x, tty_font_instance_data) | |
| 75 #endif /* NEW_GC */ | |
| 76 | |
| 872 | 77 #define TTY_FONT_INSTANCE_DATA(c) \ |
| 78 ((struct tty_font_instance_data *) (c)->data) | |
| 79 | |
| 80 #define FONT_INSTANCE_TTY_CHARSET(c) (TTY_FONT_INSTANCE_DATA (c)->charset) | |
| 81 | |
| 82 #endif /* INCLUDED_objects_tty_impl_h_ */ |