Mercurial > hg > xemacs-beta
view src/extents-impl.h @ 4604:e0a8715fdb1f
Support new IGNORE-INVALID-SEQUENCESP argument, #'query-coding-region.
lisp/ChangeLog addition:
2009-02-07 Aidan Kehoe <kehoea@parhasard.net>
* coding.el (query-coding-clear-highlights):
Rename the BUFFER argument to BUFFER-OR-STRING, describe it as
possibly being a string in its documentation.
(default-query-coding-region):
Add a new IGNORE-INVALID-SEQUENCESP argument, document that this
function does not support it.
Bind case-fold-search to nil, we don't want this to influence what the
function thinks is encodable or not.
(query-coding-region):
Add a new IGNORE-INVALID-SEQUENCESP argument, document what it
does; reflect this new argument in the associated compiler macro.
(query-coding-string):
Add a new IGNORE-INVALID-SEQUENCESP argument, document what it
does. Support the HIGHLIGHT argument correctly.
* unicode.el (unicode-query-coding-region):
Add a new IGNORE-INVALID-SEQUENCESP argument, document what it
does, implement this. Document a potential problem.
Use #'query-coding-clear-highlights instead of reimplementing it
ourselves.
Remove some debugging messages.
* mule/arabic.el (iso-8859-6):
* mule/cyrillic.el (iso-8859-5):
* mule/greek.el (iso-8859-7):
* mule/hebrew.el (iso-8859-8):
* mule/latin.el (iso-8859-2):
* mule/latin.el (iso-8859-3):
* mule/latin.el (iso-8859-4):
* mule/latin.el (iso-8859-14):
* mule/latin.el (iso-8859-15):
* mule/latin.el (iso-8859-16):
* mule/latin.el (iso-8859-9):
* mule/latin.el (windows-1252):
* mule/mule-coding.el (iso-8859-1):
Avoid the assumption that characters not given an explicit mapping
in these coding systems map to the ISO 8859-1 characters
corresponding to the octets on disk; this makes it much more
reasonable to implement the IGNORE-INVALID-SEQUENCESP argument to
query-coding-region.
* mule/mule-cmds.el (set-language-info):
Correct the docstring.
* mule/mule-cmds.el (finish-set-language-environment):
Treat invalid Unicode sequences produced from
invalid-sequence-coding-system and corresponding to control
characters the same as control characters in redisplay.
* mule/mule-cmds.el:
Document that encode-coding-char is available in coding.el
* mule/mule-coding.el (make-8-bit-generate-helper):
Change to return the both the encode-program generated and the
relevant non-ASCII charset; update the docstring to reflect this.
* mule/mule-coding.el
(make-8-bit-generate-encode-program-and-skip-chars-strings):
Rename this function; have it return skip-chars-strings as well as
the encode program. Have these skip-chars-strings use ranges for
charsets, where possible.
* mule/mule-coding.el (make-8-bit-create-decode-encode-tables):
Revise this to allow people to specify explicitly characters that
should be undefined (= corresponding to keys in
unicode-error-default-translation-table), and treating unspecified
octets above #x7f as undefined by default.
* mule/mule-coding.el (8-bit-fixed-query-coding-region):
Add a new IGNORE-INVALID-SEQUENCESP argument, implement support
for it using the 8-bit-fixed-invalid-sequences-skip-chars coding
system property; remove some debugging messages.
* mule/mule-coding.el (make-8-bit-coding-system):
This function is dumped, autoloading it makes no sense.
Document what happens when characters above #x7f are not
specified, implement this.
* mule/vietnamese.el:
Correct spelling.
tests/ChangeLog addition:
2009-02-07 Aidan Kehoe <kehoea@parhasard.net>
* automated/query-coding-tests.el:
Add FAILING-CASE arguments to the Assert calls, making #'q-c-debug
mostly unnecessary. Remove #'q-c-debug.
Add new tests that use the IGNORE-INVALID-SEQUENCESP argument to
#'query-coding-region; rework the existing ones to respect it.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sat, 07 Feb 2009 17:13:37 +0000 |
parents | 1e7cc382eb16 |
children | d1247f3cc363 |
line wrap: on
line source
/* Copyright (c) 1994, 1995 Free Software Foundation. Copyright (c) 1995, 1996, 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 2, 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; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Synched up with: Not in FSF. */ #ifndef INCLUDED_extents_impl_h_ #define INCLUDED_extents_impl_h_ #include "extents.h" struct extent { struct lrecord_header lheader; Memxpos start; Memxpos end; Lisp_Object object; /* A buffer, string, Qnil (extent detached from no buffer), Qt (destroyed extent) */ /* Extent properties are conceptually a plist, but the most common props are implemented as bits instead of conses. */ struct { Lisp_Object face; /* These flags are simply an optimization for common boolean properties which go onto the extent's property list. Any of them would work if done in the normal way, but the space savings of doing these in this way is significant. Note that if you add a flag, there are numerous places in extents.c that need to know about it. Another consideration is that some of these properties are accessed during redisplay, so it's good for access to them to be fast (a bit reference instead of a search down a plist). `begin_glyph_layout' and `end_glyph_layout' are unusual in that they have 4 states instead of 2. Other special extent properties are stored in an auxiliary structure that sits at the beginning of the plist. The has_aux flag indicates whether this structure exists. The has_parent flag is an optimization indicating whether the extent has a parent (this could also be determined by looking in the aux structure). */ enum_field (glyph_layout) begin_glyph_layout :2; /* 2 text, margins, or whitespace */ enum_field (glyph_layout) end_glyph_layout :2; /* 4 text, margins, or whitespace */ unsigned int has_parent :1; /* 5 extent has a parent */ unsigned int has_aux :1; /* 6 extent has an aux. structure */ unsigned int start_open :1; /* 7 insertion behavior at start */ unsigned int end_open :1; /* 8 insertion behavior at end */ unsigned int unique :1; /* 9 there may be only one attached */ unsigned int duplicable :1; /* 10 copied to strings by kill/undo */ unsigned int detachable :1; /* 11 extent detaches if text deleted */ unsigned int internal :1; /* 12 used by map-extents etc. */ unsigned int in_red_event :1; /* 13 An event has been spawned for initial redisplay. (not exported to lisp) */ unsigned int unused16 :1; /* 16 unused bits */ /* --- Adding more flags will cause the extent struct to grow by another word. It's not clear that this would make a difference, however, because on 32-bit machines things tend to get allocated in chunks of 4 bytes. */ } flags; /* The plist may have an auxiliary structure as its first element */ Lisp_Object plist; }; /* Basic properties of an extent (not affected by the extent's parent) */ #define extent_object(e) ((e)->object) #define extent_start(e) ((e)->start + 0) #define extent_end(e) ((e)->end + 0) #define set_extent_start(e, val) ((void) ((e)->start = (val))) #define set_extent_end(e, val) ((void) ((e)->end = (val))) #define extent_endpoint(e, endp) ((endp) ? extent_end (e) : extent_start (e)) #define set_extent_endpoint(e, val, endp) \ ((endp) ? set_extent_end (e, val) : set_extent_start (e, val)) #define extent_detached_p(e) (extent_start (e) < 0) /* Additional information that may be present in an extent. The idea is that fast access is provided to this information, but since (hopefully) most extents won't have this set on them, we usually don't need to have this structure around and thus the size of an extent is smaller. */ typedef struct extent_auxiliary extent_auxiliary; struct extent_auxiliary { struct LCRECORD_HEADER header; Lisp_Object begin_glyph; Lisp_Object end_glyph; Lisp_Object parent; /* We use a weak list here. Originally I didn't do this and depended on having the extent's finalization method remove itself from its parent's children list. This runs into lots and lots of problems though because everything is in a really really bizarre state when an extent's finalization method is called (it happens in sweep_extents() by way of ADDITIONAL_FREE_extent()) and it's extremely difficult to avoid getting hosed by just-freed objects. */ Lisp_Object children; Lisp_Object invisible; Lisp_Object read_only; Lisp_Object mouse_face; Lisp_Object initial_redisplay_function; Lisp_Object before_change_functions, after_change_functions; int priority; }; extern struct extent_auxiliary extent_auxiliary_defaults; struct extent_info { struct LCRECORD_HEADER header; struct extent_list *extents; struct stack_of_extents *soe; }; /* A "normal" field is one that is stored in the `struct flags' structure in an extent. an "aux" field is one that is stored in the extent's auxiliary structure. The functions below that have `extent_no_chase' in their name operate on an extent directly (ignoring its parent), and should normally only be used on extents known not to have a parent. The other versions chase down any parent links. */ #define extent_no_chase_normal_field(e, field) ((e)->flags.field) DECLARE_INLINE_HEADER ( struct extent_auxiliary * extent_aux_or_default (EXTENT e) ) { return e->flags.has_aux ? XEXTENT_AUXILIARY (XCAR (e->plist)) : & extent_auxiliary_defaults; } #define extent_no_chase_aux_field(e, field) (extent_aux_or_default(e)->field) #define extent_normal_field(e, field) \ extent_no_chase_normal_field (extent_ancestor (e), field) #define extent_aux_field(e, field) \ extent_no_chase_aux_field (extent_ancestor (e), field) #define set_extent_no_chase_aux_field(e, field, value) do { \ EXTENT sencaf_e = (e); \ if (! sencaf_e->flags.has_aux) \ allocate_extent_auxiliary (sencaf_e); \ XEXTENT_AUXILIARY (XCAR (sencaf_e->plist))->field = (value);\ } while (0) #define set_extent_no_chase_normal_field(e, field, value) \ extent_no_chase_normal_field (e, field) = (value) #define set_extent_aux_field(e, field, value) \ set_extent_no_chase_aux_field (extent_ancestor (e), field, value) #define set_extent_normal_field(e, field, value) \ set_extent_no_chase_normal_field (extent_ancestor (e), field, value) /* The `parent' and `children' fields are not affected by any parent links. We don't provide any settors for these fields because they need special handling and it's cleaner just to do this in the particular functions that need to do this. */ #define extent_parent(e) extent_no_chase_aux_field (e, parent) #define extent_children(e) extent_no_chase_aux_field (e, children) EXTENT extent_ancestor_1 (EXTENT e); /* extent_ancestor() chases all the parent links until there aren't any more. extent_ancestor_1() does the same thing but it a function; the following optimizes the most common case. */ DECLARE_INLINE_HEADER ( EXTENT extent_ancestor (EXTENT e) ) { return e->flags.has_parent ? extent_ancestor_1 (e) : e; } #define extent_begin_glyph(e) extent_aux_field (e, begin_glyph) #define extent_end_glyph(e) extent_aux_field (e, end_glyph) #define extent_priority(e) extent_aux_field (e, priority) #define extent_invisible(e) extent_aux_field (e, invisible) #define extent_read_only(e) extent_aux_field (e, read_only) #define extent_mouse_face(e) extent_aux_field (e, mouse_face) #define extent_initial_redisplay_function(e) extent_aux_field (e, initial_redisplay_function) #define extent_before_change_functions(e) extent_aux_field (e, before_change_functions) #define extent_after_change_functions(e) extent_aux_field (e, after_change_functions) #define set_extent_begin_glyph(e, value) \ set_extent_aux_field (e, begin_glyph, value) #define set_extent_end_glyph(e, value) \ set_extent_aux_field (e, end_glyph, value) #define set_extent_priority(e, value) \ set_extent_aux_field (e, priority, value) #define set_extent_invisible_1(e, value) \ set_extent_aux_field (e, invisible, value) #define set_extent_read_only(e, value) \ set_extent_aux_field (e, read_only, value) #define set_extent_mouse_face(e, value) \ set_extent_aux_field (e, mouse_face, value) /* Use Fset_extent_initial_redisplay_function unless you know what you're doing */ #define set_extent_initial_redisplay_function(e, value) \ set_extent_aux_field (e, initial_redisplay_function, value) #define set_extent_before_change_functions(e, value) \ set_extent_aux_field (e, before_change_functions, value) #define set_extent_after_change_functions(e, value) \ set_extent_aux_field (e, after_change_functions, value) #define extent_face(e) extent_normal_field (e, face) #define extent_begin_glyph_layout(e) ((enum glyph_layout) extent_normal_field (e, begin_glyph_layout)) #define extent_end_glyph_layout(e) ((enum glyph_layout) extent_normal_field (e, end_glyph_layout)) #define extent_start_open_p(e) extent_normal_field (e, start_open) #define extent_end_open_p(e) extent_normal_field (e, end_open) #define extent_unique_p(e) extent_normal_field (e, unique) #define extent_duplicable_p(e) extent_normal_field (e, duplicable) #define extent_detachable_p(e) extent_normal_field (e, detachable) #define extent_internal_p(e) extent_normal_field (e, internal) #define extent_in_red_event_p(e) extent_normal_field (e, in_red_event) #define set_extent_face(e, val) \ set_extent_normal_field (e, face, val) #define set_extent_begin_glyph_layout(e, val) \ set_extent_normal_field (e, begin_glyph_layout, val) #define set_extent_end_glyph_layout(e, val) \ set_extent_normal_field (e, end_glyph_layout, val) #define set_extent_start_open_p(e, val) \ set_extent_normal_field (e, start_open, val) #define set_extent_end_open_p(e, val) \ set_extent_normal_field (e, end_open, val) #define set_extent_unique_p(e, val) \ set_extent_normal_field (e, unique, val) #define set_extent_duplicable_p(e, val) \ set_extent_normal_field (e, duplicable, val) #define set_extent_detachable_p(e, val) \ set_extent_normal_field (e, detachable, val) #define set_extent_internal_p(e, val) \ set_extent_normal_field (e, internal, val) #define set_extent_in_red_event_p(e, val) \ set_extent_normal_field (e, in_red_event, val) DECLARE_INLINE_HEADER ( Lisp_Object * extent_no_chase_plist_addr (EXTENT e) ) { return e->flags.has_aux ? &XCDR (e->plist) : &e->plist; } #define extent_no_chase_plist(e) (*extent_no_chase_plist_addr (e)) #define extent_plist_addr(e) extent_no_chase_plist_addr (extent_ancestor (e)) #define extent_plist_slot(e) extent_no_chase_plist (extent_ancestor (e)) #define EXTENT_LIVE_P(e) (!EQ (extent_object (e), Qt)) #define CHECK_LIVE_EXTENT(x) do { \ CHECK_EXTENT (x); \ if (!EXTENT_LIVE_P (XEXTENT (x))) \ dead_wrong_type_argument (Qextent_live_p, (x)); \ } while (0) #define CONCHECK_LIVE_EXTENT(x) do { \ CONCHECK_EXTENT (x); \ if (!EXTENT_LIVE_P (XEXTENT (x))) \ x = wrong_type_argument (Qextent_live_p, (x)); \ } while (0) #endif /* INCLUDED_extents_impl_h_ */