Mercurial > hg > xemacs-beta
view src/syssignal.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 | aa5ed11f473b |
children | 308d34e9f07d |
line wrap: on
line source
/* syssignal.h - System-dependent definitions for signals. Copyright (C) 1992, 1993 Free Software Foundation, Inc. Copyright (C) 1996 Ben Wing. 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_syssignal_h_ #define INCLUDED_syssignal_h_ /* In the old world, one could not #include <signal.h> here. The party line was that that header should always be #included before <config.h>, because some configuration files (like s/hpux.h) indicate that SIGIO doesn't work by #undef-ing SIGIO, and if this file #includes <signal.h>, then that will re-#define SIGIO and confuse things. This was, however, a completely fucked up state of affairs, because on some systems it's necessary for the s/m files to #define things in order to get <signal.h> to provide the right typedefs, etc. And it's generally a broken concept for <config.h> to not be the very very first file included. So instead of #undef'ing SIGIO in the various s/m files, I've changed them to define BROKEN_SIGIO instead, then we (syssignal.h) do an #undef SIGIO at the end, after including signal.h. Therefore, it's important that <signal.h> not be included after "syssignal.h", but that's the normal state: nothing should be directly including <signal.h> these days. -- jwz, 29-nov-93 */ #include <signal.h> #include <errno.h> /* SIGPOLL is the SVR4 signal. Those systems generally define SIGIO as an alias for SIGPOLL, but just in case ... */ #if defined (BROKEN_SIGIO) # if defined (SIGIO) && defined (SIGPOLL) # if SIGIO == SIGPOLL # undef SIGIO # undef SIGPOLL # else # undef SIGIO # endif # endif #else /* Not BROKEN_SIGIO */ # if !defined (SIGIO) && defined (SIGPOLL) # define SIGIO SIGPOLL # endif #endif /* Define SIGCHLD as an alias for SIGCLD. There are many conditionals testing SIGCHLD. */ #if defined (SIGCLD) && !defined (SIGCHLD) # define SIGCHLD SIGCLD #endif /* SIGCHLD */ #ifdef BROKEN_SIGCHLD #undef SIGCHLD #endif #ifdef SIGCHLD #define EMACS_BLOCK_SIGCHLD EMACS_BLOCK_SIGNAL (SIGCHLD) #define EMACS_UNBLOCK_SIGCHLD EMACS_UNBLOCK_SIGNAL (SIGCHLD) #else #define EMACS_BLOCK_SIGCHLD #define EMACS_UNBLOCK_SIGCHLD #endif /* According to W.R. Stevens __Advanced Programming in the Unix Environment__, there are four different paradigms for handling signals. We use autoconf to tell us which one applies. Note that on some systems, more than one paradigm is implemented (typically, the POSIX sigaction/sigprocmask and either the older SYSV or BSD way). In such a case, we prefer the POSIX way. We used to say this: [[ NOTE: We use EMACS_* macros for most signal operations, but just signal() for the standard signal-setting operation. Perhaps we should change this to EMACS_SIGNAL(), but that runs the risk of someone forgetting this convention and calling signal() directly. ]] But current policy is to avoid playing with macros as much as possible, since in the long run it really just ends up creating unmaintainable code -- someone newly reading the code is never going to realize exactly which calls are redirected, and on which systems, and where the redirection occurs. Possibly we should use the new "qxe" convention. */ typedef RETSIGTYPE (XCDECL * signal_handler_t) (int); #if defined (HAVE_SIGPROCMASK) /* The POSIX way (sigaction, sigprocmask, sigpending, sigsuspend) */ signal_handler_t qxe_reliable_signal (int signal_number, signal_handler_t action); #define EMACS_SIGNAL qxe_reliable_signal #define EMACS_BLOCK_SIGNAL(sig) do \ { \ sigset_t ES_mask; \ sigemptyset (&ES_mask); \ sigaddset (&ES_mask, sig); \ sigprocmask (SIG_BLOCK, &ES_mask, NULL); \ } while (0) #define EMACS_UNBLOCK_SIGNAL(sig) do \ { \ sigset_t ES_mask; \ sigemptyset (&ES_mask); \ sigaddset (&ES_mask, sig); \ sigprocmask (SIG_UNBLOCK, &ES_mask, NULL); \ } while (0) #define EMACS_UNBLOCK_ALL_SIGNALS() do \ { \ sigset_t ES_mask; \ sigemptyset (&ES_mask); \ sigprocmask (SIG_SETMASK, &ES_mask, NULL); \ } while (0) #define EMACS_WAIT_FOR_SIGNAL(sig) do \ { \ sigset_t ES_mask; \ sigprocmask (0, NULL, &ES_mask); \ sigdelset (&ES_mask, sig); \ sigsuspend (&ES_mask); \ } while (0) #define EMACS_REESTABLISH_SIGNAL(sig, handler) #define SIG_ARG_MAYBE_UNUSED(decl) UNUSED (decl) #elif defined (HAVE_SIGBLOCK) /* The older BSD way (signal/sigvec, sigblock, sigsetmask, sigpause) */ /* It's OK to use signal() here directly. No unreliable signal problems. However, we use sigvec() because it allows us to request interruptible I/O. */ #define EMACS_SIGNAL qxe_reliable_signal /* Is it necessary to define sigmask like this? */ #ifndef sigmask # define sigmask(no) (1L << ((no) - 1)) #endif #define EMACS_BLOCK_SIGNAL(sig) sigblock (sigmask (sig)) #define EMACS_UNBLOCK_SIGNAL(sig) sigsetmask (sigblock (0) & ~sigmask (sig)) #define EMACS_UNBLOCK_ALL_SIGNALS() sigsetmask (0) #define EMACS_WAIT_FOR_SIGNAL(sig) do \ { \ int ES_mask = sigblock (0); \ sigpause (ES_mask & ~sigmask (sig)); \ } while (0) #define EMACS_REESTABLISH_SIGNAL(sig, handler) #define SIG_ARG_MAYBE_UNUSED(decl) UNUSED (decl) #elif defined (HAVE_SIGHOLD) /* The older SYSV way (signal/sigset, sighold, sigrelse, sigignore, sigpause) */ #define EMACS_SIGNAL sigset #define EMACS_BLOCK_SIGNAL(sig) sighold (sig) #define EMACS_UNBLOCK_SIGNAL(sig) sigrelse (sig) /* #### There's not really any simple way to implement this. Since EMACS_UNBLOCK_ALL_SIGNALS() is only called once (at startup), it's probably OK to just ignore it. */ #define EMACS_UNBLOCK_ALL_SIGNALS() 0 #define EMACS_WAIT_FOR_SIGNAL(sig) sigpause (sig) #define EMACS_REESTABLISH_SIGNAL(sig, handler) #define SIG_ARG_MAYBE_UNUSED(decl) UNUSED (decl) #elif defined (WIN32_NATIVE) /* MS Windows signal emulation (in turns emulates the sigset/sighold paradigm) */ #define EMACS_SIGNAL mswindows_sigset #define EMACS_BLOCK_SIGNAL(sig) mswindows_sighold (sig) #define EMACS_UNBLOCK_SIGNAL(sig) mswindows_sigrelse (sig) /* #### There's not really any simple way to implement this. Since EMACS_UNBLOCK_ALL_SIGNALS() is only called once (at startup), it's probably OK to just ignore it. */ #define EMACS_UNBLOCK_ALL_SIGNALS() 0 #define EMACS_WAIT_FOR_SIGNAL(sig) mswindows_sigpause (sig) #define EMACS_REESTABLISH_SIGNAL(sig, handler) #define SIG_ARG_MAYBE_UNUSED(decl) UNUSED (decl) /* Defines that we need that aren't in the standard signal.h */ #define SIGHUP 1 /* Hang up */ #define SIGQUIT 3 /* Quit process */ #define SIGKILL 9 /* Die, die die */ #define SIGALRM 14 /* Alarm */ #define SIGPROF 29 /* Profiling timer exp */ #else /* The oldest SYSV way (signal only; unreliable signals) */ /* Old USG systems don't really have signal blocking. We indicate this by not defining EMACS_BLOCK_SIGNAL or EMACS_WAIT_FOR_SIGNAL. */ #define EMACS_SIGNAL signal #define EMACS_UNBLOCK_SIGNAL(sig) 0 #define EMACS_UNBLOCK_ALL_SIGNALS() 0 #define EMACS_REESTABLISH_SIGNAL(sig, handler) do \ { \ int old_errno = errno; \ signal (sig, handler); \ errno = old_errno; \ } while (0) #define SIG_ARG_MAYBE_UNUSED(decl) decl /* Under SYSV, setting a signal handler for SIGCLD causes SIGCLD to immediately be sent if there any unwaited processes out there. This means that the SIGCLD handler *must* call wait() to reap the status of all processes -- it cannot simply set a flag and then reestablish the handler, because it will get called again, infinitely. We only need to worry about this on systems where signals need to be reestablished (SYSV Release 2 and earlier). */ #define OBNOXIOUS_SYSV_SIGCLD_BEHAVIOR #endif /* different signalling methods */ /* On bsd, [man says] kill does not accept a negative number to kill a pgrp. Must do that using the killpg call. */ #ifdef HAVE_KILLPG #define EMACS_KILLPG(pid, signo) killpg (pid, signo) #elif defined (WIN32_NATIVE) #define EMACS_KILLPG(pid, signo) should never be called #else #define EMACS_KILLPG(pid, signo) kill (-(pid), signo) #endif #ifndef NSIG # ifdef USG5_4 /* Some SVr4s don't define NSIG in sys/signal.h for ANSI environments; * instead, there's a system variable _sys_nsig. Unfortunately, we need the * constant to dimension an array. So wire in the appropriate value here. */ # define NSIG 32 # else # define NSIG (SIGUSR2+1) /* guess how many elements are in sys_siglist... */ # endif #endif /* HAVE_DECL_SYS_SIGLIST is determined by configure. On Linux, it seems, configure incorrectly fails to find it, so s/linux.h defines HAVE_SYS_SIGLIST. */ #if (!defined(HAVE_DECL_SYS_SIGLIST) || !HAVE_DECL_SYS_SIGLIST ) && !defined (HAVE_SYS_SIGLIST) extern const char *sys_siglist[]; #endif #ifdef SIGDANGER SIGTYPE memory_warning_signal (int sig); #endif #if defined (WIN32_NATIVE) || defined (CYGWIN_BROKEN_SIGNALS) typedef void (__cdecl *mswindows_sighandler) (int); /* Prototypes for signal functions, see win32.c */ int mswindows_sighold (int nsig); int mswindows_sigrelse (int nsig); int mswindows_sigpause (int nsig); int mswindows_raise (int nsig); mswindows_sighandler mswindows_sigset (int sig, mswindows_sighandler handler); #endif /* defined (WIN32_NATIVE) || defined (CYGWIN_BROKEN_SIGNALS) */ signal_handler_t set_timeout_signal (int signal_number, signal_handler_t action); #endif /* INCLUDED_syssignal_h_ */