Mercurial > hg > xemacs-beta
view src/widget.c @ 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
/* Primitives for work of the "widget" library. Copyright (C) 1997 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 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. */ /* In an ideal world, this file would not have been necessary. However, elisp function calls being as slow as they are, it turns out that some functions in the widget library (wid-edit.el) are the bottleneck of Widget operation. Here is their translation to C, for the sole reason of efficiency. */ #include <config.h> #include "lisp.h" #include "buffer.h" Lisp_Object Qwidget_type; DEFUN ("widget-plist-member", Fwidget_plist_member, 2, 2, 0, /* Like `plist-get', but returns the tail of PLIST whose car is PROP. */ (plist, prop)) { while (!NILP (plist) && !EQ (Fcar (plist), prop)) { /* Check for QUIT, so a circular plist doesn't lock up the editor. */ QUIT; plist = Fcdr (Fcdr (plist)); } return plist; } DEFUN ("widget-put", Fwidget_put, 3, 3, 0, /* In WIDGET set PROPERTY to VALUE. The value can later be retrieved with `widget-get'. */ (widget, property, value)) { CHECK_CONS (widget); XCDR (widget) = Fplist_put (XCDR (widget), property, value); return widget; } DEFUN ("widget-get", Fwidget_get, 2, 2, 0, /* In WIDGET, get the value of PROPERTY. The value could either be specified when the widget was created, or later with `widget-put'. */ (widget, property)) { Lisp_Object value = Qnil; while (1) { Lisp_Object tmp = Fwidget_plist_member (Fcdr (widget), property); if (!NILP (tmp)) { value = Fcar (Fcdr (tmp)); break; } tmp = Fcar (widget); if (!NILP (tmp)) { widget = Fget (tmp, Qwidget_type, Qnil); continue; } break; } return value; } DEFUN ("widget-apply", Fwidget_apply, 2, MANY, 0, /* Apply the value of WIDGET's PROPERTY to the widget itself. ARGS are passed as extra arguments to the function. arguments: (WIDGET PROPERTY &rest ARGS) */ (int nargs, Lisp_Object *args)) { /* This function can GC */ Lisp_Object newargs[3]; struct gcpro gcpro1; newargs[0] = Fwidget_get (args[0], args[1]); newargs[1] = args[0]; newargs[2] = Flist (nargs - 2, args + 2); GCPRO1 (newargs[2]); RETURN_UNGCPRO (Fapply (3, newargs)); } void syms_of_widget (void) { DEFSYMBOL (Qwidget_type); DEFSUBR (Fwidget_plist_member); DEFSUBR (Fwidget_put); DEFSUBR (Fwidget_get); DEFSUBR (Fwidget_apply); }