Mercurial > hg > xemacs-beta
annotate src/objects-x-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 | ad2f4ae9895b |
| children | 87175eb65ff4 |
| rev | line source |
|---|---|
| 872 | 1 /* X-specific Lisp objects. |
| 2 Copyright (C) 1993, 1994 Free Software Foundation, Inc. | |
| 3 Copyright (C) 1995 Board of Trustees, University of Illinois. | |
| 4 Copyright (C) 1995, 1996, 2002 Ben Wing. | |
| 5 | |
| 6 This file is part of XEmacs. | |
| 7 | |
| 8 XEmacs is free software; you can redistribute it and/or modify it | |
| 9 under the terms of the GNU General Public License as published by the | |
| 10 Free Software Foundation; either version 2, or (at your option) any | |
| 11 later version. | |
| 12 | |
| 13 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 16 for more details. | |
| 17 | |
| 18 You should have received a copy of the GNU General Public License | |
| 19 along with XEmacs; see the file COPYING. If not, write to | |
| 20 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 21 Boston, MA 02111-1307, USA. */ | |
| 22 | |
| 23 /* Synched up with: Not in FSF. */ | |
| 24 | |
| 25 /* This file Mule-ized (more like Mule-verified) by Ben Wing, 7-10-00. */ | |
| 26 | |
| 27 #ifndef INCLUDED_objects_x_impl_h_ | |
| 28 #define INCLUDED_objects_x_impl_h_ | |
| 29 | |
| 30 #include "objects-impl.h" | |
| 31 #include "objects-x.h" | |
| 3094 | 32 #ifdef USE_XFT |
| 33 /* for resource name definitions, etc */ | |
| 34 #include "../lwlib/lwlib-fonts.h" | |
| 35 #endif | |
| 872 | 36 |
| 37 #ifdef HAVE_X_WINDOWS | |
| 38 | |
| 39 /***************************************************************************** | |
| 40 Color-Instance | |
| 41 ****************************************************************************/ | |
| 42 | |
| 43 struct x_color_instance_data | |
| 44 { | |
| 45 XColor color; | |
| 3094 | 46 /* Yes, it looks crazy to have both the XColor and the XftColor, but |
| 47 pragmatically both are used. */ | |
| 48 #ifdef USE_XFT | |
| 49 XftColor xftColor; | |
| 50 #endif | |
| 872 | 51 char dealloc_on_gc; |
| 52 }; | |
| 53 | |
| 54 #define X_COLOR_INSTANCE_DATA(c) ((struct x_color_instance_data *) (c)->data) | |
| 55 #define COLOR_INSTANCE_X_COLOR(c) (X_COLOR_INSTANCE_DATA (c)->color) | |
| 3094 | 56 #ifdef USE_XFT |
| 57 #define COLOR_INSTANCE_X_XFTCOLOR(c) (X_COLOR_INSTANCE_DATA (c)->xftColor) | |
| 58 #endif | |
| 872 | 59 #define COLOR_INSTANCE_X_DEALLOC(c) (X_COLOR_INSTANCE_DATA (c)->dealloc_on_gc) |
| 60 | |
| 61 /***************************************************************************** | |
| 62 Font-Instance | |
| 63 ****************************************************************************/ | |
| 64 | |
| 65 struct x_font_instance_data | |
| 66 { | |
| 67 /* X-specific information */ | |
| 3094 | 68 /* Yes, it looks crazy to have both the XFontStruct and the XftFont, but |
| 69 pragmatically both are used (lwlib delegates labels to the widget sets, | |
| 70 which internally use XFontStructs). */ | |
| 71 XFontStruct * font; | |
| 72 #ifdef USE_XFT | |
| 73 XftFont *xftFont; | |
| 74 #endif | |
| 75 | |
| 872 | 76 }; |
| 77 | |
| 78 #define X_FONT_INSTANCE_DATA(f) ((struct x_font_instance_data *) (f)->data) | |
| 79 #define FONT_INSTANCE_X_FONT(f) (X_FONT_INSTANCE_DATA (f)->font) | |
| 3094 | 80 #ifdef USE_XFT |
| 81 #define FONT_INSTANCE_X_XFTFONT(f) (X_FONT_INSTANCE_DATA (f)->xftFont) | |
| 82 #endif | |
| 872 | 83 |
| 84 #endif /* HAVE_X_WINDOWS */ | |
| 85 | |
| 86 #endif /* INCLUDED_objects_x_impl_h_ */ |