Mercurial > hg > xemacs-beta
view src/device.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
/* Define device-object for XEmacs. Copyright (C) 1994, 1995 Board of Trustees, University of Illinois. Copyright (C) 1995, 2002 Ben Wing Copyright (C) 1995 Sun Microsystems 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/>. */ /* Synched up with: Not in FSF. */ /* Written by Chuck Thompson and Ben Wing. */ #ifndef INCLUDED_device_h_ #define INCLUDED_device_h_ #include "console.h" struct device; DECLARE_LISP_OBJECT (device, struct device); #define XDEVICE(x) XRECORD (x, device, struct device) #define wrap_device(p) wrap_record (p, device) #define DEVICEP(x) RECORDP (x, device) #define CHECK_DEVICE(x) CHECK_RECORD (x, device) #define CONCHECK_DEVICE(x) CONCHECK_RECORD (x, device) /* Basic properties available to non-privileged users; redefined in device-impl.h */ int device_live_p (struct device *d); Lisp_Object device_console (struct device *d); Lisp_Object device_frame_list (struct device *d); #define DEVICE_LIVE_P(d) device_live_p (d) #define DEVICE_CONSOLE(d) device_console (d) #define DEVICE_FRAME_LIST(d) device_frame_list (d) #define DEVICE_XCONSOLE(d) XCONSOLE (DEVICE_CONSOLE (d)) #define XDEVICE_CONSOLE(d) DEVICE_CONSOLE (XDEVICE (d)) #define XDEVICE_XCONSOLE(d) XCONSOLE (XDEVICE_XCONSOLE (d)) #define CHECK_LIVE_DEVICE(x) do { \ CHECK_DEVICE (x); \ if (! DEVICE_LIVE_P (XDEVICE (x))) \ dead_wrong_type_argument (Qdevice_live_p, (x)); \ } while (0) #define CONCHECK_LIVE_DEVICE(x) do { \ CONCHECK_DEVICE (x); \ if (! DEVICE_LIVE_P (XDEVICE (x))) \ x = wrong_type_argument (Qdevice_live_p, (x)); \ } while (0) /* #### unify this with DOMAIN_DEVICE once the latter has image instances expunged from it. */ /* This turns out to be used heavily so we make it a macro to make it inline. Also, the majority of the time the object will turn out to be a window so we move it from being checked last to being checked first. */ #define DFW_DEVICE(obj) \ (WINDOWP (obj) ? WINDOW_DEVICE (XWINDOW (obj)) \ : (FRAMEP (obj) ? FRAME_DEVICE (XFRAME (obj)) \ : (DEVICEP (obj) ? obj \ : Qnil))) /* NO_BREAK means that "break" doesn't do what you think it does! Use goto instead. "continue" is OK, though. */ #define DEVICE_LOOP_NO_BREAK(devcons, concons) \ CONSOLE_LOOP (concons) \ CONSOLE_DEVICE_LOOP (devcons, XCONSOLE (XCAR (concons))) #define DEVICE_FRAME_LOOP(frmcons, d) \ LIST_LOOP (frmcons, DEVICE_FRAME_LIST (d)) #define CONSOLE_FRAME_LOOP_NO_BREAK(frmcons, devcons, con) \ CONSOLE_DEVICE_LOOP (devcons, con) \ DEVICE_FRAME_LOOP (frmcons, XDEVICE (XCAR (devcons))) EXFUN (Fdevice_console, 1); EXFUN (Fdevice_name, 1); EXFUN (Ffind_device, 2); EXFUN (Fmake_device, 3); EXFUN (Fselected_device, 1); extern Lisp_Object Qcreate_device_hook, Qdelete_device_hook, Qgrayscale; extern Lisp_Object Qinit_post_tty_win, Qmono; extern Lisp_Object Vdevice_class_list; int valid_device_class_p (Lisp_Object class_); void select_device_1 (Lisp_Object); struct device *decode_device (Lisp_Object); void handle_asynch_device_change (void); Lisp_Object call_critical_lisp_code (struct device *d, Lisp_Object function, Lisp_Object object); void delete_device_internal (struct device *d, int force, int called_from_delete_console, int from_io_error); void io_error_delete_device (Lisp_Object device); Lisp_Object find_nonminibuffer_frame_not_on_device (Lisp_Object device); void set_device_selected_frame (struct device *d, Lisp_Object frame); Lisp_Object domain_device_type (Lisp_Object domain); int window_system_pixelated_geometry (Lisp_Object domain); Lisp_Object get_default_device (Lisp_Object type); void set_default_device (Lisp_Object type, Lisp_Object device); void clear_default_devices (void); #endif /* INCLUDED_device_h_ */