Mercurial > hg > xemacs-beta

view src/keymap-slots.h @ 5648:3f4a234f4672

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Support non-ASCII correctly in character classes, test this. src/ChangeLog addition: 2012-04-21 Aidan Kehoe <kehoea@parhasard.net> Support non-ASCII correctly in character classes ([:alnum:] and friends). * regex.c: * regex.c (ISBLANK, ISUNIBYTE): New. Make these and friends independent of the locale, since we want them to be consistent in XEmacs. * regex.c (print_partial_compiled_pattern): Print the flags for charset_mule; don't print non-ASCII as the character values in ranges, this breaks with locales. * regex.c (enum): Define various flags the charset_mule and charset_mule_not opcodes can now take. * regex.c (CHAR_CLASS_MAX_LENGTH): Update this. * regex.c (re_iswctype, re_wctype): New, from GNU. * regex.c (re_wctype_can_match_non_ascii): New; used when deciding on whether to use charset_mule or the ASCII-only regex character set opcode. * regex.c (regex_compile): Error correctly on long, non-existent character class names. Break out the handling of charsets that can match non-ASCII into a separate clause. Use compile_char_class when compiling character classes. * regex.c (compile_char_class): New. Used in regex_compile when compiling character sets that may match non-ASCII. * regex.c (re_compile_fastmap): If there are flags set for charset_mule or charset_mule_not, we can't use the fastmap (since we need to check syntax table values that aren't available there). * regex.c (re_match_2_internal): Check the new flags passed to the charset_mule{,_not} opcode, observe them if appropriate. * regex.h: * regex.h (enum): Expose re_wctype_t here, imported from GNU. tests/ChangeLog addition: 2012-04-21 Aidan Kehoe <kehoea@parhasard.net> * automated/regexp-tests.el: * automated/regexp-tests.el (Assert-char-class): Check that #'string-match errors correctly with an over-long character class name. Add tests for character class functionality that supports non-ASCII characters. These tests expose bugs in GNU Emacs 24.0.94.2, but pass under current XEmacs.
author Aidan Kehoe <kehoea@parhasard.net>
date Sat, 21 Apr 2012 18:58:28 +0100
parents 308d34e9f07d
children
line wrap: on
line source

/* Definitions of marked slots in keymaps.
   Copyright (C) 1985, 1991-1995 Free Software Foundation, Inc.
   Copyright (C) 1995 Board of Trustees, University of Illinois.
   Copyright (C) 1995 Sun Microsystems, Inc.
   Copyright (C) 2001, 2002, 2010 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 3 of the License, 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.  If not, see <http://www.gnu.org/licenses/>. */

/* Synched up with: Not in FSF.  Split out of keymap.c. */

/* We define the Lisp_Objects in the keymap structure in a separate
   file because there are numerous places we want to iterate over them,
   such as when defining them in the structure, initializing them, or
   marking them.

   To use, define MARKED_SLOT before including this file.  No need to
   undefine; that happens automatically.

   MARKED_SLOT_NOCOMPARE is used to indicate a slot that should not be
   compared in the equal() method or hashed in the hash() method --
   basically, a slot used for caching, debugging, etc. instead of for
   defining a property of the keymap.
*/

#ifndef MARKED_SLOT_NOCOMPARE
#define MARKED_SLOT_NOCOMPARE MARKED_SLOT
#endif

  MARKED_SLOT (parents)		 /* Keymaps to be searched after this one.
				    An ordered list */
  MARKED_SLOT (prompt)           /* Qnil or a string to print in the minibuffer
                                    when reading from this keymap */
  MARKED_SLOT (table)		 /* The contents of this keymap */
  MARKED_SLOT_NOCOMPARE (inverse_table)	 /* The inverse mapping of the above */
  MARKED_SLOT (default_binding)  /* Use this if no other binding is found
                                    (this overrides parent maps and the
                                    normal global-map lookup). */
  MARKED_SLOT_NOCOMPARE (sub_maps_cache) /* Cache of directly inferior
					    keymaps; This holds an alist,
					    of the key and the maps, or the
					    modifier bit and the map.  If
					    this is the symbol t, then the
					    cache needs to be recomputed. */
  MARKED_SLOT_NOCOMPARE (name)           /* Just for debugging convenience */

#undef MARKED_SLOT
#undef MARKED_SLOT_NOCOMPARE