Mercurial > hg > xemacs-beta
view src/imgproc.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 (2012-04-21) |
parents | 2aa9cd456ae7 |
children | 574f0cded429 |
line wrap: on
line source
/* Image processing aux functions header file Copyright (C) 1998 Jareth Hein This file is a 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 INCLUDED_imgproc_h_ #define INCLUDED_imgproc_h_ /* Synched up with: Not in FSF. */ /* Original author: Jareth Hein */ #define MAX_CMAP_SIZE 256 #define COLOR_DEPTH 8 #define MAX_COLOR 256 #define B_DEPTH 5 /* # bits/pixel to use */ #define B_LEN (1L<<B_DEPTH) #define C_DEPTH 2 #define C_LEN (1L<<C_DEPTH) /* # cells/color to use */ #define COLOR_SHIFT (COLOR_DEPTH-B_DEPTH) typedef struct colorbox { struct colorbox *next, *prev; int rmin, rmax; int gmin, gmax; int bmin, bmax; int total; } Colorbox; typedef struct { int num_ents; int entries[MAX_CMAP_SIZE][2]; } C_cell; typedef struct { unsigned short rm[MAX_CMAP_SIZE], gm[MAX_CMAP_SIZE], bm[MAX_CMAP_SIZE]; /* map values */ int um[MAX_CMAP_SIZE]; /* usage counts for each mapentry */ int histogram[B_LEN][B_LEN][B_LEN]; int num_active_colors; Colorbox *freeboxes; /* used and freed internally */ Colorbox *usedboxes; /* used and freed internally */ C_cell **ColorCells; /* used and freed internally */ } quant_table; #define QUANT_GET_COLOR(qt,r,g,b) (qt->histogram[r>>COLOR_SHIFT][g>>COLOR_SHIFT][b>>COLOR_SHIFT]) quant_table *build_EImage_quantable(unsigned char *eimage, int width, int height, int num_colors); #endif /* INCLUDED_imgproc_h_ */