Mercurial > hg > xemacs-beta
view src/commands.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 | 61855263cb07 |
children | 308d34e9f07d |
line wrap: on
line source
/* Definitions needed by most editing commands. Copyright (C) 1985-1994 Free Software Foundation, Inc. This file is part of XEmacs. XEmacs is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. XEmacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with XEmacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Synched up with: FSF 19.30. */ #ifndef INCLUDED_commands_h_ #define INCLUDED_commands_h_ #if 0 /* FSFmacs */ #define Ctl(c) ((c)&037) #endif /* bunches of FSF keymap and minibuffer stuff not here (in Lisp) */ extern Lisp_Object Vlast_command_event; extern Lisp_Object Vlast_input_event; /* These next two for compatibility; they are V... because they can be nil. (Many FSFmacs equivalent variables incorrectly omit the V even though they are Lisp_Objects.) */ /* Last character of last key sequence. */ extern Lisp_Object Vlast_command_char; extern Lisp_Object Vlast_input_char; #if 0 /* FSFmacs */ /* Last input character read as a command, not counting menus reached by the mouse. */ extern Lisp_Object Vlast_nonmenu_event; #endif #if 0 /* Local to event-stream.c */ /* List of command events to be re-read, or Qnil. */ extern Lisp_Object Vunread_command_events; #endif #if 0 /* FSFmacs */ /* Command char event to be re-read, or -1 if none. Setting this is obsolete, but some things should still check it. */ extern int unread_command_char; #endif /* Last command executed by the editor command loop, not counting commands that set the prefix argument. */ extern Lisp_Object Vlast_command; /* The command being executed by the command loop. Commands may set this, and the value set will be copied into Vlast_command instead of the actual command. */ extern Lisp_Object Vthis_command; #if 0 /* FSFmacs */ /* If not Qnil, this is a switch-frame event which we decided to put off until the end of a key sequence. This should be read as the next command input, after any Vunread_command_events. read_key_sequence uses this to delay switch-frame events until the end of the key sequence; Fread_char uses it to put off switch-frame events until a non-ASCII event is acceptable as input. */ extern Lisp_Object unread_switch_frame; #endif #if 0 /* Local to event-stream.c */ /* The value of point when the last command was executed. */ extern int last_point_position; /* The buffer that was current when the last command was started. */ extern Lisp_Object last_point_position_buffer; #endif /* This is so incredibly losing that it's been completely eliminated from the code. Trust me, there are cleaner, safer ways of achieving the same functionality (e.g. use select()). */ /* extern int immediate_quit; Nonzero means ^G can quit instantly */ /* Nonzero if input is coming from the keyboard */ #define INTERACTIVE (NILP (Vexecuting_macro) && !noninteractive) /* Set this nonzero to force reconsideration of modeline. */ extern int modeline_changed; extern Lisp_Object recent_keys_ring; extern int recent_keys_ring_index; /* #ifndef LISP_COMMAND_LOOP */ extern Lisp_Object Vtop_level; /* #else */ extern Lisp_Object Vcommand_loop; /* #endif */ DECLARE_DOESNT_RETURN (initial_command_loop (Lisp_Object)); DECLARE_DOESNT_RETURN_TYPE (Lisp_Object, call_command_loop (Lisp_Object catch_errors)); extern Fixnum command_loop_level; extern Lisp_Object Vkeyboard_translate_table; extern Lisp_Object Vlast_input_time; extern Lisp_Object Vcurrent_mouse_event; extern int zmacs_regions; extern int zmacs_region_active_p; extern int zmacs_region_stays; void zmacs_update_region (void); void zmacs_deactivate_region (void); Lisp_Object zmacs_region_buffer (void); extern Lisp_Object Vthis_command_keys; /* event-stream.c */ #endif /* INCLUDED_commands_h_ */