Mercurial > hg > xemacs-beta
view src/number-mp.h @ 4906:6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
-------------------- ChangeLog entries follow: --------------------
lisp/ChangeLog addition:
2010-02-01 Ben Wing <ben@xemacs.org>
* cl-extra.el:
* cl-extra.el (cl-string-vector-equalp): Removed.
* cl-extra.el (cl-bit-vector-vector-equalp): Removed.
* cl-extra.el (cl-vector-array-equalp): Removed.
* cl-extra.el (cl-hash-table-contents-equalp): Removed.
* cl-extra.el (equalp): Removed.
* cl-extra.el (cl-mapcar-many):
Comment out the whole `equalp' implementation for the moment;
remove once we're sure the C implementation works.
* cl-macs.el:
* cl-macs.el (equalp):
Simplify the compiler-macro for `equalp' -- once it's in C,
we don't need to try so hard to expand it.
src/ChangeLog addition:
2010-02-01 Ben Wing <ben@xemacs.org>
* abbrev.c (abbrev_match_mapper):
* buffer.h (CANON_TABLE_OF):
* buffer.h:
* editfns.c (Fchar_equal):
* minibuf.c (scmp_1):
* text.c (qxestrcasecmp_i18n):
* text.c (qxestrncasecmp_i18n):
* text.c (qxetextcasecmp):
* text.c (qxetextcasecmp_matching):
Create new macro CANONCASE that converts to a canonical mapping
and use it to do caseless comparisons instead of DOWNCASE.
* alloc.c:
* alloc.c (cons_equal):
* alloc.c (vector_equal):
* alloc.c (string_equal):
* bytecode.c (compiled_function_equal):
* chartab.c (char_table_entry_equal):
* chartab.c (char_table_equal):
* data.c (weak_list_equal):
* data.c (weak_box_equal):
* data.c (ephemeron_equal):
* device-msw.c (equal_devmode):
* elhash.c (hash_table_equal):
* events.c (event_equal):
* extents.c (properties_equal):
* extents.c (extent_equal):
* faces.c:
* faces.c (face_equal):
* faces.c (face_hash):
* floatfns.c (float_equal):
* fns.c:
* fns.c (bit_vector_equal):
* fns.c (plists_differ):
* fns.c (Fplists_eq):
* fns.c (Fplists_equal):
* fns.c (Flax_plists_eq):
* fns.c (Flax_plists_equal):
* fns.c (internal_equal):
* fns.c (internal_equalp):
* fns.c (internal_equal_0):
* fns.c (syms_of_fns):
* glyphs.c (image_instance_equal):
* glyphs.c (glyph_equal):
* glyphs.c (glyph_hash):
* gui.c (gui_item_equal):
* lisp.h:
* lrecord.h (struct lrecord_implementation):
* marker.c (marker_equal):
* number.c (bignum_equal):
* number.c (ratio_equal):
* number.c (bigfloat_equal):
* objects.c (color_instance_equal):
* objects.c (font_instance_equal):
* opaque.c (equal_opaque):
* opaque.c (equal_opaque_ptr):
* rangetab.c (range_table_equal):
* specifier.c (specifier_equal):
Add a `foldcase' param to the equal() method and use it to implement
`equalp' comparisons. Also add to plists_differ(), although we
don't currently use it here.
Rewrite internal_equalp(). Implement cross-type vector comparisons.
Don't implement our own handling of numeric promotion -- just use
the `=' primitive.
Add internal_equal_0(), which takes a `foldcase' param and calls
either internal_equal() or internal_equalp().
* buffer.h:
When given a 0 for buffer (which is the norm when functions don't
have a specific buffer available), use the current buffer's table,
not `standard-case-table'; otherwise the current settings are
ignored.
* casetab.c:
* casetab.c (set_case_table):
When handling old-style vectors of 256 in `set-case-table' don't
overwrite the existing table! Instead create a new table and
populate.
* device-msw.c (sync_printer_with_devmode):
* lisp.h:
* text.c (lisp_strcasecmp_ascii):
Rename lisp_strcasecmp to lisp_strcasecmp_ascii and use
lisp_strcasecmp_i18n for caseless comparisons in some places.
* elhash.c:
Delete unused lisp_string_hash and lisp_string_equal().
* events.h:
* keymap-buttons.h:
* keymap.h:
* keymap.c (keymap_lookup_directly):
* keymap.c (keymap_store):
* keymap.c (FROB):
* keymap.c (key_desc_list_to_event):
* keymap.c (describe_map_mapper):
* keymap.c (INCLUDE_BUTTON_ZERO):
New file keymap-buttons.h; use to handle buttons 1-26 in place of
duplicating code 26 times.
* frame-gtk.c (allocate_gtk_frame_struct):
* frame-msw.c (mswindows_init_frame_1):
Fix some comments about internal_equal() in redisplay that don't
apply any more.
* keymap-slots.h:
* keymap.c:
New file keymap-slots.h. Use it to notate the slots in a keymap
structure, similar to frameslots.h or coding-system-slots.h.
* keymap.c (MARKED_SLOT):
* keymap.c (keymap_equal):
* keymap.c (keymap_hash):
Implement.
tests/ChangeLog addition:
2010-02-01 Ben Wing <ben@xemacs.org>
* automated/case-tests.el:
* automated/case-tests.el (uni-mappings):
* automated/search-tests.el:
Delete old pristine-case-table code. Rewrite the Unicode torture
test to take into account whether overlapping mappings exist for
more than one character, and not doing the upcase/downcase
comparisons in such cases.
* automated/lisp-tests.el (foo):
* automated/lisp-tests.el (string-variable):
* automated/lisp-tests.el (featurep):
Replace Assert (equal ... with Assert-equal; same for other types
of equality. Replace some awkward equivalents of Assert-equalp
with Assert-equalp. Add lots of equalp tests.
* automated/case-tests.el:
* automated/regexp-tests.el:
* automated/search-tests.el:
Fix up the comments at the top of the files. Move rules about where
to put tests into case-tests.el.
* automated/test-harness.el:
* automated/test-harness.el (test-harness-aborted-summary-template): New.
* automated/test-harness.el (test-harness-from-buffer):
* automated/test-harness.el (batch-test-emacs):
Fix Assert-test-not. Create Assert-not-equal and variants.
Delete the doc strings from all these convenience functions to avoid
excessive repetition; instead use one copy in a comment.
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Mon, 01 Feb 2010 01:02:40 -0600 |
parents | 2fc0e2f18322 |
children | ba07c880114a |
line wrap: on
line source
/* Definitions of numeric types for XEmacs using the MP library. Copyright (C) 2004 Jerry James. 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., 51 Franklin St - Fifth Floor, Boston, MA 02111-1301, USA. */ /* Synched up with: Not in FSF. */ /* This library defines the following types: bignum = MINT The MP library does not include support for ratios or bigfloats. */ #ifndef INCLUDED_number_mp_h_ #define INCLUDED_number_mp_h_ /* BSD MP libraries without MP_PREFIX define a function named pow in mp.h that has a different prototype from the one in math.h. We don't use that function anyway, so we do this for safety purposes. However, this means that number-mp.h must always be included before math.h. */ #define pow mp_pow #include <mp.h> #undef pow #ifdef MP_PREFIX #define MP_GCD mp_gcd #define MP_ITOM mp_itom #define MP_MADD mp_madd #define MP_MCMP mp_mcmp #define MP_MDIV mp_mdiv #define MP_MFREE mp_mfree #define MP_MSUB mp_msub #define MP_MULT mp_mult #define MP_SDIV mp_sdiv #ifdef HAVE_MP_MOVE #define MP_MOVE(x,y) mp_move (x, y) #else #define MP_MOVE(x,y) mp_madd (x, bignum_zero, y) #endif #else #define MP_GCD gcd #define MP_ITOM itom #define MP_MADD madd #define MP_MCMP mcmp #define MP_MDIV mdiv #define MP_MFREE mfree #define MP_MSUB msub #define MP_MULT mult #define MP_SDIV sdiv #ifdef HAVE_MP_MOVE #define MP_MOVE(x,y) move (x, y) #else #define MP_MOVE(x,y) madd (x, bignum_zero, y) #endif #endif typedef MINT *bignum; extern void init_number_mp(void); /********************************* Bignums **********************************/ #define HAVE_BIGNUM 1 extern MINT *bignum_zero, *intern_bignum; extern MINT *bignum_min_int, *bignum_max_int, *bignum_max_uint; extern MINT *bignum_min_long, *bignum_max_long, *bignum_max_ulong; extern short div_rem; /***** Bignum: basic functions *****/ #define bignum_init(b) (b = MP_ITOM (0)) #define bignum_fini(b) MP_MFREE (b) #define bignum_hashcode(b) bignum_to_uint (b) #define bignum_sign(b) MP_MCMP (b, bignum_zero) #define bignum_evenp(b) (MP_SDIV (b, 2, intern_bignum, &div_rem), \ div_rem == 0) #define bignum_oddp(b) (MP_SDIV (b, 2, intern_bignum, &div_rem), \ div_rem != 0) /***** Bignum: size *****/ #define bignum_fits_int_p(b) (MP_MCMP (b, bignum_min_int) >= 0 && \ MP_MCMP (b, bignum_max_int) <= 0) #define bignum_fits_uint_p(b) (MP_MCMP (b, bignum_zero) >= 0 && \ MP_MCMP (b, bignum_max_uint) <= 0) #define bignum_fits_long_p(b) (MP_MCMP (b, bignum_min_long) >= 0 && \ MP_MCMP (b, bignum_max_long) <= 0) #define bignum_fits_ulong_p(b) (MP_MCMP (b, bignum_zero) >= 0 && \ MP_MCMP (b, bignum_max_ulong) <= 0) /***** Bignum: conversions *****/ extern char *bignum_to_string(bignum, int); extern int bignum_to_int(bignum); extern unsigned int bignum_to_uint(bignum); extern long bignum_to_long(bignum); extern unsigned long bignum_to_ulong(bignum); extern double bignum_to_double(bignum); /***** Bignum: converting assignments *****/ #define bignum_set(b1, b2) MP_MOVE (b2, b1) extern int bignum_set_string(bignum, const char *, int); extern void bignum_set_long(bignum, long); extern void bignum_set_ulong(bignum, unsigned long); extern void bignum_set_double(bignum, double); /***** Bignum: comparisons *****/ #define bignum_cmp(b1,b2) MP_MCMP (b1, b2) #define bignum_lt(b1,b2) (MP_MCMP (b1, b2) < 0) #define bignum_le(b1,b2) (MP_MCMP (b1, b2) <= 0) #define bignum_eql(b1,b2) (MP_MCMP (b1, b2) == 0) #define bignum_ge(b1,b2) (MP_MCMP (b1, b2) >= 0) #define bignum_gt(b1,b2) (MP_MCMP (b1, b2) > 0) /***** Bignum: arithmetic *****/ #define bignum_neg(b,b2) MP_MSUB (bignum_zero, b2, b) #define bignum_abs(b,b2) (MP_MCMP (b2, bignum_zero) < 0 \ ? MP_MSUB (bignum_zero, b2, b) \ : MP_MADD (bignum_zero, b2, b)) #define bignum_add(b,b1,b2) MP_MADD (b1, b2, b) #define bignum_sub(b,b1,b2) MP_MSUB (b1, b2, b) #define bignum_mul(b,b1,b2) MP_MULT (b1, b2, b) extern int bignum_divisible_p(bignum, bignum); #define bignum_div(b,b1,b2) MP_MDIV (b1, b2, b, intern_bignum) extern void bignum_ceil(bignum, bignum, bignum); extern void bignum_floor(bignum, bignum, bignum); #define bignum_mod(b,b1,b2) MP_MDIV (b1, b2, intern_bignum, b) extern void bignum_pow(bignum, bignum, unsigned long); #define bignum_gcd(res,b1,b2) MP_GCD (b1, b2, res) extern void bignum_lcm(bignum, bignum, bignum); /***** Bignum: bit manipulations *****/ extern void bignum_and(bignum, bignum, bignum); extern void bignum_ior(bignum, bignum, bignum); extern void bignum_xor(bignum, bignum, bignum); extern void bignum_not(bignum, bignum); extern void bignum_setbit(bignum, unsigned long); extern void bignum_clrbit(bignum, unsigned long); extern int bignum_testbit(bignum, unsigned long); extern void bignum_lshift(bignum, bignum, unsigned long); extern void bignum_rshift(bignum, bignum, unsigned long); /***** Bignum: random numbers *****/ extern void bignum_random_seed(unsigned long); extern void bignum_random(bignum, bignum); #endif /* INCLUDED_number_mp_h_ */