Mercurial > hg > xemacs-beta
view lisp/glade.el @ 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
;;; glade.el --- Import libglade functions into XEmacs ;; Copyright (C) 2000 Free Software Foundation ;; Maintainer: William Perry <wmperry@gnu.org> ;; Keywords: extensions, dumped ;; 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 ;;; Commentary: ;; This file is dumped with XEmacs (if glade was detected) (eval-and-compile (require 'gtk-ffi)) (globally-declare-fboundp '(gtk-import-function-internal gtk-call-function)) (gtk-import-function none glade_init) (gtk-import-function none glade_gnome_init) (gtk-import-function none glade_bonobo_init) (gtk-import-function none glade_load_module (GtkString . module)) (gtk-import-function GtkType glade_xml_get_type) (gtk-import-function GtkObject glade_xml_new (GtkString . filename) (GtkString . root)) (gtk-import-function GladeXML glade_xml_new_with_domain (GtkString . filename) (GtkString . root) (GtkString . domain)) (gtk-import-function GladeXML glade_xml_new_from_memory (GtkString . buffer) (gint . size) (GtkString . root) (GtkString . domain)) (gtk-import-function gboolean glade_xml_construct (GladeXML . self) (GtkString . filename) (GtkString . root) (GtkString . domain)) (gtk-import-function GtkWidget glade_xml_get_widget (GladeXML . xml) (GtkString . name)) (gtk-import-function GtkWidget glade_xml_get_widget_by_long_name (GladeXML . xml) (GtkString . longname)) (gtk-import-function GtkString glade_get_widget_name (GtkWidget . widget)) (gtk-import-function GtkString glade_get_widget_long_name (GtkWidget . widget)) (gtk-import-function GladeXML glade_get_widget_tree (GtkWidget . widget))