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[] = {
 0x00,0x00,0x80,0x00,0x24,0xa5,0x2a,0x04,0x82,0x10,0x80,0x00,0x28,0x84,0x24,
 0x04,0x80,0x7c,0x83,0x00,0x25,0x02,0x2c,0x04,0x10,0x69,0x81,0x00,0x84,0xb4,
 0x33,0x04,0x50,0xde,0xa6,0x00,0x25,0xb5,0x4d,0x04,0x90,0xd3,0x94,0x02,0xd2,
 0x65,0xbc,0x00,0x90,0x06,0xab,0x04,0xd2,0x9d,0x9e,0x00,0x90,0x0b,0xb5,0x04,
 0x54,0x25,0x2e,0x01,0xd0,0xe3,0xb8,0x04,0x12,0xb9,0x94,0x00,0x20,0xeb,0x4f,
 0x02,0x4a,0xbc,0x22,0x00,0x80,0x6a,0x93,0x04,0x29,0xd9,0x09,0x01,0x80,0x02,
 0x24,0x04,0x29,0x6c,0x03,0x01,0x00,0x00,0x48,0x04,0x4a,0x25,0x11,0x00,0x20,
 0x10,0x44,0x09,0x09,0x44,0x01,0x00};