Mercurial > hg > xemacs-beta
view src/s/mingw32.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
/* system description file for mingw32. Copyright (C) 1993, 1994, 1995, 1999 Free Software Foundation, Inc. Copyright (C) 2001, 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/>. */ /* based on cygwin32.h by Andy Piper <andy@xemacs.org> */ /* See win32.c for info about the different Windows files in XEmacs. */ #include "win32-native.h" #define MINGW /* We are using Cygwin-style headers in /usr/include, also used by Cygwin itself */ #define CYGWIN_HEADERS #ifndef ORDINARY_LINK #define ORDINARY_LINK #endif #define C_SWITCH_SYSTEM "-mno-cygwin -fno-caller-saves -DWIN32_NATIVE -DMINGW" #define LIBS_SYSTEM "-mno-cygwin -mwindows -lwinmm -lwsock32" #define WIN32_LEAN_AND_MEAN #define TEXT_START -1 #define HEAP_IN_DATA #define UNEXEC "unexcw.o" #define TIME_ONESHOT 0 #define TIME_PERIODIC 1 #define LOCALE_USE_CP_ACP 0x40000000 #define NSIG 23 /* this is necessary to get the TCS_* definitions in <commctrl.h> */ #define _WIN32_IE 0x0400 /* translate NT world unexec stuff to our a.out definitions */ #define strnicmp strncasecmp /* #ifndef HAVE_SOCKETS */ #define HAVE_SOCKETS /* #endif */ #define OBJECTS_SYSTEM nt.o ntheap.o ntproc.o dired-msw.o #undef MAIL_USE_SYSTEM_LOCK #define HAVE_MSW_C_DIRED /* Do not define LOAD_AVE_TYPE or LOAD_AVE_CVT since there is no load average available. */ /* define MAIL_USE_FLOCK if the mailer uses flock to interlock access to /usr/spool/mail/$USER. The alternative is that a lock file named /usr/spool/mail/$USER.lock. */ #ifndef NOT_C_CODE #include <stdlib.h> #include <../mingw/process.h> #define mkdir __mkdir #include <dir.h> #undef mkdir #ifdef HAVE_CYGWIN_VERSION_H #include <cygwin/version.h> #endif #endif /* NOT_C_CODE */ #define DONT_USE_LITOUT /* Stuff that gets set wrongly or otherwise */ #define HAVE_GETTIMEOFDAY #define HAVE_SELECT /* systime.h includes winsock.h which defines timeval */ #define HAVE_TIMEVAL #define HAVE_GETPAGESIZE #define getpagesize() 4096 #ifndef HAVE_H_ERRNO #define HAVE_H_ERRNO #endif #ifndef HAVE_TZNAME #define HAVE_TZNAME #endif #undef GETTIMEOFDAY_ONE_ARGUMENT #undef HAVE_SYS_WAIT_H #undef HAVE_TERMIOS #undef SYSV_SYSTEM_DIR #undef CLASH_DETECTION