Mercurial > hg > xemacs-beta
view src/conslots.h @ 5648:3f4a234f4672
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 consoles Copyright (C) 1990, 1992, 1993 Free Software Foundation, Inc. Copyright (C) 2002 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: Mule 2.0, FSF 19.30. (see FSF keyboard.h.) */ /* We define the Lisp_Objects in the console 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. */ #ifndef CONSOLE_SLOTS_FIRST_NAME #define CONSOLE_SLOTS_FIRST_NAME name #endif /* Name of this console, for resourcing and printing purposes. If not explicitly given, it's initialized in a console-specific manner. */ MARKED_SLOT (name) /* What this console is connected to */ MARKED_SLOT (connection) /* A canonical name for the connection that is used to determine whether create_console() is being called on an existing console. */ MARKED_SLOT (canon_connection) /* List of devices on this console. */ MARKED_SLOT (device_list) /* Currently selected device. */ MARKED_SLOT (selected_device) /* Most-recently-selected non-minibuffer-only frame. Always the same as the selected frame, unless that's a minibuffer-only frame. */ MARKED_SLOT (last_nonminibuf_frame) /* If non-nil, a keymap that overrides all others but applies only to this console. Lisp code that uses this instead of calling next-event can effectively wait for input in the any-console state, and hence avoid blocking out the other consoles. See universal-argument in lisp/simple.el for an example. #### This comes from FSF Emacs; but there's probably a better solution that involves making next-event itself work over all consoles. */ MARKED_SLOT (overriding_terminal_local_map) /* Last command executed by the editor command loop, not counting commands that set the prefix argument. */ MARKED_SLOT (last_command) /* The prefix argument for the next command, in raw form. */ MARKED_SLOT (prefix_arg) /* Where information about a partially completed key sequence is kept. */ MARKED_SLOT (command_builder) /* Non-nil while a kbd macro is being defined. */ MARKED_SLOT (defining_kbd_macro) /* This is a lisp vector, which contains the events of the keyboard macro currently being read. It is reallocated when the macro gets too large. */ MARKED_SLOT (kbd_macro_builder) /* Last anonymous kbd macro defined. */ MARKED_SLOT (last_kbd_macro) #ifdef HAVE_TTY /* ERASE character from stty settings. */ MARKED_SLOT (tty_erase_char) #endif /* Key that invokes QUIT. */ MARKED_SLOT (quit_char) /* Event version of quit-char. */ MARKED_SLOT (quit_event) /* Event version of critical QUIT (upshifted quit-char). */ MARKED_SLOT (critical_quit_event) /* Minibufferless frames on this console use this frame's minibuffer. */ MARKED_SLOT (default_minibuffer_frame) /* Keymap mapping ASCII function key sequences onto their preferred forms. Initialized by the terminal-specific lisp files. */ MARKED_SLOT (function_key_map) #ifndef CONSOLE_SLOTS_LAST_NAME #define CONSOLE_SLOTS_LAST_NAME function_key_map #endif #undef MARKED_SLOT