Mercurial > hg > xemacs-beta
view src/paths.h.in @ 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 | 15139dbf89f4 |
children |
line wrap: on
line source
/* Hey Emacs, this is -*- C -*- code! */ /* Synched up with: Not synched with FSF. */ /* Think twice before editing this file. Generated automatically by configure. The file startup.el guesses at reasonable values for load-path, exec-path, and lock-directory. This means that if you move emacs and its associated sub-tree to a different place in the filesystem, or to a different machine, you won't have to do anything for it to work. If you define the paths in this file then they will take precedence over any value generated by the heuristic in startup.el. The hardcoded paths will be checked to see if they are valid, in which case they will be used. Otherwise the editor will attempt to make its normal guess. See the NEWS file for a description of the heuristic used to locate the lisp and exec directories at startup time. If you are looking at this file because you are having trouble, then you would be much better off arranging for those heuristics to succeed than defining the paths in this file. ** Let me say that again. If you're editing this file, you're making ** a mistake. Re-read the section on installation in ../etc/NEWS. If it defines anything, this file should define some subset of the following: PATH_PROGNAME The name of the Emacs variant that's running. PATH_VERSION The version id of the Emacs variant that's running. PATH_EXEC_PREFIX The value of --exec-prefix. PATH_PREFIX The value of --prefix. PATH_LOADSEARCH The default value of `load-path'. PATH_MODULESEARCH The default value of `module-load-path'. PATH_EARLY_PACKAGE_DIRECTORIES The value of `--with-early-packages'. PATH_LATE_PACKAGE_DIRECTORIES The value of `--with-late-packages'. PATH_EARLY_PACKAGE_DIRECTORIES The value of `--with-last-packages'. PATH_PACKAGEPATH The default value of `package-path'. PATH_SITE The default location of site-specific Lisp files. PATH_SITE_MODULES The default location of site-specific modules. PATH_EXEC The default value of `exec-directory' and `exec-path'. (exec-path also contains the value of whatever is in the PATH environment variable.) PATH_DATA The default value of `data-directory'. This is where architecture-independent files are searched for. PATH_INFO This is where the info documentation is installed. PATH_INFOPATH The default value of `Info-directory-list'. These are additional places info files are searched for. */ #define PATH_PROGNAME "@PROGNAME@" #define PATH_VERSION "@version@" #ifdef EXEC_PREFIX_USER_DEFINED #define PATH_EXEC_PREFIX "@EXEC_PREFIX@" #endif #ifdef PREFIX_USER_DEFINED #define PATH_PREFIX "@PREFIX@" #endif #ifdef LISPDIR_USER_DEFINED #define PATH_LOADSEARCH "@LISPDIR@" #endif #ifdef MODULEDIR_USER_DEFINED #define PATH_MODULESEARCH "@MODULEDIR@" #endif #ifdef SITELISPDIR_USER_DEFINED #define PATH_SITE "@SITELISPDIR@" #endif #ifdef SITEMODULEDIR_USER_DEFINED #define PATH_SITE_MODULES "@SITEMODULEDIR@" #endif #ifdef EARLY_PACKAGE_DIRECTORIES_USER_DEFINED #define PATH_EARLY_PACKAGE_DIRECTORIES "@EARLY_PACKAGE_DIRECTORIES@" #endif #ifdef LATE_PACKAGE_DIRECTORIES_USER_DEFINED #define PATH_LATE_PACKAGE_DIRECTORIES "@LATE_PACKAGE_DIRECTORIES@" #endif #ifdef LAST_PACKAGE_DIRECTORIES_USER_DEFINED #define PATH_LAST_PACKAGE_DIRECTORIES "@LAST_PACKAGE_DIRECTORIES@" #endif #ifdef PACKAGE_PATH_USER_DEFINED #define PATH_PACKAGEPATH "@PACKAGE_PATH@" #endif #ifdef ARCHLIBDIR_USER_DEFINED #define PATH_EXEC "@ARCHLIBDIR@" #endif #ifdef ETCDIR_USER_DEFINED #define PATH_DATA "@ETCDIR@" #endif #ifdef DOCDIR_USER_DEFINED #define PATH_DOC "@DOCDIR@" #endif #ifdef INFODIR_USER_DEFINED #define PATH_INFO "@INFODIR@" #endif #ifdef INFOPATH_USER_DEFINED #define PATH_INFOPATH "@INFOPATH@" #endif