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.

/* 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/>. */

#define noname_width 28
#define noname_height 28
static char noname_bits[] = {
 0x08,0x21,0x80,0x00,0x42,0x88,0x2a,0x04,0x28,0x25,0x40,0x01,0x45,0x20,0x15,
 0x04,0x10,0xfd,0xa0,0x00,0x44,0xa8,0x08,0x05,0x12,0xfd,0x25,0x00,0x40,0xa8,
 0x00,0x05,0x0a,0xf9,0xaa,0x00,0x40,0x22,0x00,0x04,0x2a,0x08,0x55,0x01,0x01,
 0xf5,0x00,0x04,0x54,0xde,0xaa,0x00,0x81,0xe8,0x00,0x04,0x14,0xba,0xaa,0x02,
 0x82,0xe8,0x00,0x00,0x28,0xda,0xaa,0x0a,0x04,0xb1,0x00,0x00,0x52,0xfc,0xaa,
 0x02,0x00,0xa9,0x00,0x04,0x5e,0xf8,0xea,0x01,0x24,0xaa,0x40,0x06,0xb4,0xfc,
 0x45,0x02,0x25,0x56,0xd3,0x01,0xa4,0x00,0x48,0x0a,0x2c,0xaa,0x42,0x02,0x9a,
 0x00,0xd4,0x09,0x20,0x54,0x01,0x02};