Mercurial > hg > xemacs-beta
view src/insdel.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 | 804517e16990 |
children | 304aebb79cd3 |
line wrap: on
line source
/* Buffer insertion/deletion and gap motion for XEmacs. 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: Not in FSF. */ /* Mostly rewritten by Ben Wing. */ #ifndef INCLUDED_insdel_h_ #define INCLUDED_insdel_h_ /************************************************************************/ /* changing a buffer's text */ /************************************************************************/ int begin_multiple_change (struct buffer *buf, Charbpos start, Charbpos end); void end_multiple_change (struct buffer *buf, int count); /* flags for functions below */ #define INSDEL_BEFORE_MARKERS 1 #define INSDEL_NO_LOCKING 2 Charcount buffer_insert_string_1 (struct buffer *buf, Charbpos pos, const Ibyte *nonreloc, Lisp_Object reloc, Bytecount offset, Bytecount length, int flags); Charcount buffer_insert_raw_string_1 (struct buffer *buf, Charbpos pos, const Ibyte *nonreloc, Bytecount length, int flags); Charcount buffer_insert_lisp_string_1 (struct buffer *buf, Charbpos pos, Lisp_Object str, int flags); Charcount buffer_insert_c_string_1 (struct buffer *buf, Charbpos pos, const char *s, int flags); Charcount buffer_insert_emacs_char_1 (struct buffer *buf, Charbpos pos, Ichar ch, int flags); Charcount buffer_insert_c_char_1 (struct buffer *buf, Charbpos pos, char c, int flags); Charcount buffer_insert_from_buffer_1 (struct buffer *buf, Charbpos pos, struct buffer *buf2, Charbpos pos2, Charcount length, int flags); /* Macros for insertion functions that insert at point after markers. All of these can GC. */ #define buffer_insert_string(buf, nonreloc, reloc, offset, length) \ buffer_insert_string_1 (buf, -1, nonreloc, reloc, offset, length, 0) #define buffer_insert_raw_string(buf, string, length) \ buffer_insert_raw_string_1 (buf, -1, string, length, 0) #define buffer_insert_c_string(buf, s) \ buffer_insert_c_string_1 (buf, -1, s, 0) #define buffer_insert_lisp_string(buf, str) \ buffer_insert_lisp_string_1 (buf, -1, str, 0) #define buffer_insert_c_char(buf, c) \ buffer_insert_c_char_1 (buf, -1, c, 0) #define buffer_insert_emacs_char(buf, ch) \ buffer_insert_emacs_char_1 (buf, -1, ch, 0) #define buffer_insert_from_buffer(buf, b, index, length) \ buffer_insert_from_buffer_1 (buf, -1, b, index, length, 0) void buffer_delete_range (struct buffer *buf, Charbpos from, Charbpos to, int flags); void buffer_replace_char (struct buffer *b, Charbpos pos, Ichar ch, int not_real_change, int force_lock_check); /************************************************************************/ /* tracking buffer changes */ /************************************************************************/ /* Split into two parts. One part goes with a buffer's text (possibly shared), the other with the buffer itself. */ struct buffer_text_change_data { /* multiple change stuff */ int in_multiple_change; Charbpos mc_begin, mc_orig_end, mc_new_end; int mc_begin_signaled; }; struct each_buffer_change_data { Charcount begin_unchanged, end_unchanged; /* redisplay needs to know if a newline was deleted so its incremental-redisplay algorithm will fail */ int newline_was_deleted; Charcount begin_extent_unchanged, end_extent_unchanged; }; /* Number of characters at the beginning and end of the buffer that have not changed since the last call to buffer_reset_changes(). If no changes have occurred since then, both values will be -1. "Changed" means that the text has changed. */ #define BUF_BEGIN_UNCHANGED(buf) ((buf)->changes->begin_unchanged) #define BUF_END_UNCHANGED(buf) ((buf)->changes->end_unchanged) /* Number of characters at the beginning and end of the buffer that have not had a covering extent change since the last call to buffer_reset_changes (). If no changes have occurred since then, both values will be -1. "Changed" means that the extents covering the text have changed. */ #define BUF_EXTENT_BEGIN_UNCHANGED(buf) \ ((buf)->changes->begin_extent_unchanged) #define BUF_EXTENT_END_UNCHANGED(buf) \ ((buf)->changes->end_extent_unchanged) #define BUF_NEWLINE_WAS_DELETED(buf) \ ((buf)->changes->newline_was_deleted) void buffer_extent_signal_changed_region (struct buffer *buf, Charbpos start, Charbpos end); void buffer_reset_changes (struct buffer *buf); /************************************************************************/ /* other related functions */ /************************************************************************/ Membpos do_marker_adjustment (Membpos mpos, Membpos from, Membpos to, Bytecount amount); void fixup_internal_substring (const Ibyte *nonreloc, Lisp_Object reloc, Bytecount offset, Bytecount *len); /* In font-lock.c */ void font_lock_maybe_update_syntactic_caches (struct buffer *buf, Charbpos start, Charbpos orig_end, Charbpos new_end); void font_lock_buffer_was_killed (struct buffer *buf); void barf_if_buffer_read_only (struct buffer *buf, Charbpos from, Charbpos to); void init_buffer_text (struct buffer *b); void uninit_buffer_text (struct buffer *b); #endif /* INCLUDED_insdel_h_ */