Mercurial > hg > xemacs-beta
view src/emodules.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
/* emodules.h - Declarations and definitions for XEmacs loadable modules. (C) Copyright 1998, 1999 J. Kean Johnston. All rights reserved. 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/>. */ #ifndef EMODULES_HDR #ifndef EMODULES_GATHER_VERSION #define EMODULES_HDR #endif #define EMODULES_VERSION "1.1.0" #define EMODULES_MAJOR 1 #define EMODULES_MINOR 1 #define EMODULES_PATCH 0 #define EMODULES_REVISION (long)((EMODULES_MAJOR * 1000) + \ (EMODULES_MINOR * 10) + \ (EMODULES_PATCH)) #ifndef EMODULES_GATHER_VERSION #include <config.h> #include "lisp.h" #include "sysdep.h" #include "window.h" #include "buffer.h" #include "insdel.h" #include "frame.h" #include "lstream.h" #include "file-coding.h" /* Module loading technology version number */ extern Lisp_Object Vmodule_version; /* XEmacs version Information */ extern Lisp_Object Vemacs_major_version; extern Lisp_Object Vemacs_minor_version; /* * Load in a C module. The first argument is the name of the .so file, the * second is the name of the module, and the third is the module version. * If the module name is NULL, we will always reload the .so. If it is not * NULL, we check to make sure we haven't loaded it before. If the version * is specified, we check to make sure we didn't load the module of the * specified version before. We also use these as checks when we open the * module to make sure we have the right module. */ extern void emodules_load (const Ibyte *module, const Ibyte *modname, const Ibyte *modver); /* * Because subrs and symbols added by a dynamic module are not part of * the make-docfile process, we need a clean way to get the variables * and functions documented. Since people don't like the idea of making * shared modules use different versions of DEFSUBR() and DEFVAR_LISP() * and friends, we need these two functions to insert the documentation * into the right place. These functions will be called by the module * init code, generated by ellcc during initialization mode. */ EXTERN_C MODULE_API void emodules_doc_subr (const Ascbyte *objname, const Ascbyte *docstr); EXTERN_C MODULE_API void emodules_doc_sym (const Ascbyte *objname, const Ascbyte *docstr); #define CDOCSUBR(Fname, DOC) emodules_doc_subr (Fname, DOC) #define CDOCSYM(Sname, DOC) emodules_doc_sym (Sname, DOC) #endif /* EMODULES_GATHER_VERSION */ /* We should not expose module entities to the portable dumper. */ #if defined(PDUMP) && defined(EMACS_MODULE) #undef dump_add_root_block_ptr #define dump_add_root_block_ptr(varaddr,descaddr) DO_NOTHING #undef dump_add_opaque #define dump_add_opaque(varaddr,size) DO_NOTHING #undef dump_add_root_block #define dump_add_root_block(ptraddress,desc) DO_NOTHING #undef dump_add_opaque_int #define dump_add_opaque_int(int_varaddr) DO_NOTHING #undef dump_add_opaque_fixnum #define dump_add_opaque_fixnum(fixnum_varaddr) DO_NOTHING #undef dump_add_root_lisp_object #define dump_add_root_lisp_object(varaddr) DO_NOTHING #undef dump_add_weak_object_chain #define dump_add_weak_object_chain(varaddr) DO_NOTHING #undef staticpro #define staticpro(DSF_location) staticpro_nodump(DSF_location) #undef unstaticpro #define unstaticpro(DSF_location) unstaticpro_nodump(DFS_location) #undef DEFSYMBOL #define DEFSYMBOL(name) DEFSYMBOL_NO_DUMP (name) #undef DEFSYMBOL_MULTIWORD_PREDICATE #define DEFSYMBOL_MULTIWORD_PREDICATE(name) \ DEFSYMBOL_MULTIWORD_PREDICATE_NO_DUMP (name) #undef defsymbol #define defsymbol(location,name) defsymbol_nodump (location, name) #endif /* defined(PDUMP) && defined(EMACS_MODULE) */ #endif /* EMODULES_HDR */