Mercurial > hg > xemacs-beta
annotate src/chartab.h @ 617:af57a77cbc92
[xemacs-hg @ 2001-06-18 07:09:50 by ben]
---------------------------------------------------------------
DOCUMENTATION FIXES:
---------------------------------------------------------------
eval.c: Correct documentation.
elhash.c: Doc correction.
---------------------------------------------------------------
LISP OBJECT CLEANUP:
---------------------------------------------------------------
bytecode.h, buffer.h, casetab.h, chartab.h, console-msw.h, console.h, database.c, device.h, eldap.h, elhash.h, events.h, extents.h, faces.h, file-coding.h, frame.h, glyphs.h, gui-x.h, gui.h, keymap.h, lisp-disunion.h, lisp-union.h, lisp.h, lrecord.h, lstream.h, mule-charset.h, objects.h, opaque.h, postgresql.h, process.h, rangetab.h, specifier.h, toolbar.h, tooltalk.h, ui-gtk.h: Add wrap_* to all objects (it was already there for a few of them)
-- an expression to encapsulate a pointer into a Lisp object,
rather than the inconvenient XSET*. "wrap" was chosen because
"make" as in make_int(), make_char() is not appropriate. (It
implies allocation. The issue does not exist for ints and chars
because they are not allocated.)
Full error checking has been added to these expressions. When
used without error checking, non-union build, use of these
expressions will incur no loss of efficiency. (In fact, XSET* is
now defined in terms of wrap_* in a non-union build.) In a union
build, you will also get no loss of efficiency provided that you
have a decent optimizing compiler, and a compiler that either
understands inlines or automatically inlines those particular
functions. (And since people don't normally do their production
builds on union, it doesn't matter.)
Update the sample Lisp object definition in lrecord.h accordingly.
dumper.c: Fix places in dumper that referenced wrap_object to reference
its new name, wrap_pointer_1.
buffer.c, bufslots.h, conslots.h, console.c, console.h, devslots.h, device.c, device.h, frame.c, frame.h, frameslots.h, window.c, window.h, winslots.h: -- Extract out the Lisp objects of `struct device' into devslots.h,
just like for the other structures.
-- Extract out the remaining (not copied into the window config)
Lisp objects in `struct window' into winslots.h; use different
macros (WINDOW_SLOT vs. WINDOW_SAVED_SLOT) to differentiate them.
-- Eliminate the `dead' flag of `struct frame', since it
duplicates information already available in `framemeths', and fix
FRAME_LIVE_P accordingly. (Devices and consoles already work this
way.)
-- In *slots.h, switch to system where MARKED_SLOT is automatically
undef'd at the end of the file. (Follows what winslots.h already
does.)
-- Update the comments at the beginning of *slots.h to be accurate.
-- When making any of the above objects dead, zero it out entirely
and reset all Lisp object slots to Qnil. (We were already doing
this somewhat, but not consistently.) This (1) Eliminates the
possibility of extra objects hanging around that ought to be
GC'd, (2) Causes an immediate crash if anyone tries to access a
structure in one of these objects, (3) Ensures consistent behavior
wrt dead objects.
dialog-msw.c: Use internal_object_printer, since this object should not escape.
---------------------------------------------------------------
FIXING A CRASH THAT I HIT ONCE (AND A RELATED BAD BEHAVIOR):
---------------------------------------------------------------
eval.c: Fix up some comments about the FSF implementation.
Fix two nasty bugs:
(1) condition_case_unwind frees the conses sitting in the
catch->tag slot too quickly, resulting in a crash that I hit.
(2) catches need to be unwound one at a time when calling
unwind-protect code, rather than all at once at the end; otherwise,
incorrect behavior can result. (A comment shows exactly how.)
backtrace.h: Improve comment about FSF differences in the handler stack.
---------------------------------------------------------------
FIXING A CRASH THAT I REPEATEDLY HIT WHEN USING THE MOUSE WHEEL
UNDER MSWINDOWS:
---------------------------------------------------------------
Basic idea: My crash is due either to a dead, non-marked,
GC-collected frame inside of a window mirror, or a prematurely
freed window mirror. We need to mark the Lisp objects inside of
window mirrors. Tracking the lifespan of window mirrors and
scrollbar instances is extremely hard, and there may well be
lurking bugs where such objects are freed too soon. The only safe
way to fix these problems (and it fixes both problems at once) is
to make both of these structures Lisp objects.
lrecord.h, emacs.c, inline.c, scrollbar-gtk.c, scrollbar-msw.c, scrollbar-x.c, scrollbar.c, scrollbar.h, symsinit.h: Make scrollbar instances actual Lisp objects. Mark the window
mirrors in them. inline.c needs to know about scrollbar.h now.
Record the new type in lrecord.h. Fix up scrollbar-*.c
appropriately. Create a hash table in scrollbar-msw.c so that the
scrollbar instances stored in scrollbar HWND's are properly
GC-protected. Create complex_vars_of_scrollbar_mswindows() to
create the hash table at startup, and call it from emacs.c. Don't
store the scrollbar instance as a property of the GTK scrollbar,
as it's not used and if we did this, we'd have to separately
GC-protect it in a hash table, like in MS Windows.
lrecord.h, frame.h, frame.c, frameslots.h, redisplay.c, window.c, window.h: Move mark_window_mirror from redisplay.c to window.c. Make window
mirrors actual Lisp objects. Tell lrecord.h about them. Change
the window mirror member of struct frame from a pointer to a Lisp
object, and add XWINDOW_MIRROR in appropriate places. Mark the
scrollbar instances in the window mirror.
redisplay.c, redisplay.h, alloc.c: Delete mark_redisplay. Don't call mark_redisplay. We now mark
frame-specific structures in mark_frame.
NOTE: I also deleted an extremely questionable call to
update_frame_window_mirrors(). It was extremely questionable
before, and now totally impossible, since it will create
Lisp objects during redisplay.
frame.c: Mark the scrollbar instances, which are now Lisp objects.
Call mark_gutter() here, not in mark_redisplay().
gutter.c: Update comments about correct marking.
---------------------------------------------------------------
ISSUES BROUGHT UP BY MARTIN:
---------------------------------------------------------------
buffer.h: Put back these macros the way Steve T and I think they ought to be.
I already explained in a previous changelog entry why I think these
macros should be the way I'd defined them. Once again:
We fix these macros so they don't care about the type of their
lvalues. The non-C-string equivalents of these already function
in the same way, and it's correct because it should be OK to pass
in a CBufbyte *, a BufByte *, a Char_Binary *, an UChar_Binary *,
etc. The whole reason for these different types is to work around
errors caused by signed-vs-unsigned non-matching types. Any
possible error that might be caught in a DFC macro would also be
caught wherever the argument is used elsewhere. So creating
multiple macro versions would add no useful error-checking and
just further complicate an already complicated area.
As for Martin's "ANSI aliasing" bug, XEmacs is not ANSI-aliasing
clean and probably never will be. Unless the board agrees to
change XEmacs in this way (and we really don't want to go down
that road), this is not a bug.
sound.h: Undo Martin's type change.
signal.c: Fix problem identified by Martin with Linux and g++ due to
non-standard declaration of setitimer().
systime.h: Update the docs for "qxe_" to point out why making the
encapsulation explicit is always the right way to go. (setitimer()
itself serves as an example.)
For 21.4:
update-elc-2.el: Correct misplaced parentheses, making lisp/mule not get
recompiled.
author | ben |
---|---|
date | Mon, 18 Jun 2001 07:10:32 +0000 |
parents | c33ae14dd6d0 |
children | b39c14581166 |
rev | line source |
---|---|
428 | 1 /* Declarations having to do with Mule char tables. |
2 Copyright (C) 1992 Free Software Foundation, Inc. | |
3 Copyright (C) 1995 Sun Microsystems, Inc. | |
4 | |
5 This file is part of XEmacs. | |
6 | |
7 XEmacs is free software; you can redistribute it and/or modify it | |
8 under the terms of the GNU General Public License as published by the | |
9 Free Software Foundation; either version 2, or (at your option) any | |
10 later version. | |
11 | |
12 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
15 for more details. | |
16 | |
17 You should have received a copy of the GNU General Public License | |
18 along with XEmacs; see the file COPYING. If not, write to | |
19 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
20 Boston, MA 02111-1307, USA. */ | |
21 | |
22 /* Synched up with: Mule 2.3. Not synched with FSF. | |
23 | |
24 This file was written independently of the FSF implementation, | |
25 and is not compatible. */ | |
26 | |
440 | 27 #ifndef INCLUDED_chartab_h_ |
28 #define INCLUDED_chartab_h_ | |
428 | 29 |
30 /************************************************************************/ | |
31 /* Char Tables */ | |
32 /************************************************************************/ | |
33 | |
34 /* Under Mule, we use a complex representation (see below). | |
35 When not under Mule, there are only 256 possible characters | |
36 so we just represent them directly. */ | |
37 | |
38 #ifdef MULE | |
39 | |
40 struct Lisp_Char_Table_Entry | |
41 { | |
42 struct lcrecord_header header; | |
43 | |
44 /* In the interests of simplicity, we just use a fixed 96-entry | |
45 table. If we felt like being smarter, we could make this | |
46 variable-size and add an offset value into this structure. */ | |
47 Lisp_Object level2[96]; | |
48 }; | |
440 | 49 typedef struct Lisp_Char_Table_Entry Lisp_Char_Table_Entry; |
50 | |
51 DECLARE_LRECORD (char_table_entry, Lisp_Char_Table_Entry); | |
52 #define XCHAR_TABLE_ENTRY(x) \ | |
53 XRECORD (x, char_table_entry, Lisp_Char_Table_Entry) | |
54 #define XSETCHAR_TABLE_ENTRY(x, p) XSETRECORD (x, p, char_table_entry) | |
617 | 55 #define wrap_char_table_entry(p) wrap_record (p, char_table_entry) |
440 | 56 #define CHAR_TABLE_ENTRYP(x) RECORDP (x, char_table_entry) |
57 /* #define CHECK_CHAR_TABLE_ENTRY(x) CHECK_RECORD (x, char_table_entry) | |
58 char table entries should never escape to Lisp */ | |
428 | 59 |
60 #endif /* MULE */ | |
61 | |
62 enum char_table_type | |
63 { | |
64 CHAR_TABLE_TYPE_GENERIC, | |
65 #ifdef MULE | |
66 CHAR_TABLE_TYPE_CATEGORY, | |
67 #endif | |
68 CHAR_TABLE_TYPE_SYNTAX, | |
69 CHAR_TABLE_TYPE_DISPLAY, | |
70 CHAR_TABLE_TYPE_CHAR | |
71 }; | |
72 | |
73 #ifdef MULE | |
74 #define NUM_ASCII_CHARS 160 | |
75 #else | |
76 #define NUM_ASCII_CHARS 256 | |
77 #endif | |
78 | |
79 struct Lisp_Char_Table | |
80 { | |
81 struct lcrecord_header header; | |
82 | |
83 Lisp_Object ascii[NUM_ASCII_CHARS]; | |
84 | |
85 #ifdef MULE | |
86 /* We basically duplicate the Mule vectors-of-vectors implementation. | |
87 We can do this because we know a great deal about the sorts of | |
88 things we are going to be indexing. | |
89 | |
90 The current implementation is as follows: | |
91 | |
92 ascii[0-159] is used for ASCII and Control-1 characters. | |
93 | |
94 level1[0 .. (NUM_LEADING_BYTES-1)] indexes charsets by leading | |
95 byte (subtract MIN_LEADING_BYTE from the leading byte). If the | |
96 value of this is not an opaque, then it specifies a value for all | |
97 characters in the charset. Otherwise, it will be a | |
98 96-Lisp-Object opaque that we created, specifying a value for | |
99 each row. If the value of this is not an opaque, then it | |
100 specifies a value for all characters in the row. Otherwise, it | |
101 will be a 96-Lisp-Object opaque that we created, specifying a | |
102 value for each character. | |
103 | |
104 NOTE: 1) This will fail if some C routine passes an opaque to | |
105 Fput_char_table(). Currently this is not a problem | |
106 since all char tables that are created are Lisp-visible | |
107 and thus no one should ever be putting an opaque in | |
108 a char table. Another possibility is to consider | |
109 adding a type to */ | |
110 | |
111 Lisp_Object level1[NUM_LEADING_BYTES]; | |
112 | |
113 #endif /* MULE */ | |
114 | |
115 enum char_table_type type; | |
116 | |
117 /* stuff used for syntax tables */ | |
118 Lisp_Object mirror_table; | |
119 Lisp_Object next_table; /* DO NOT mark through this. */ | |
120 }; | |
440 | 121 typedef struct Lisp_Char_Table Lisp_Char_Table; |
122 | |
123 DECLARE_LRECORD (char_table, Lisp_Char_Table); | |
124 #define XCHAR_TABLE(x) XRECORD (x, char_table, Lisp_Char_Table) | |
125 #define XSETCHAR_TABLE(x, p) XSETRECORD (x, p, char_table) | |
617 | 126 #define wrap_char_table(p) wrap_record (p, char_table) |
440 | 127 #define CHAR_TABLEP(x) RECORDP (x, char_table) |
128 #define CHECK_CHAR_TABLE(x) CHECK_RECORD (x, char_table) | |
129 #define CONCHECK_CHAR_TABLE(x) CONCHECK_RECORD (x, char_table) | |
130 | |
131 #define CHAR_TABLE_TYPE(ct) ((ct)->type) | |
132 #define XCHAR_TABLE_TYPE(ct) CHAR_TABLE_TYPE (XCHAR_TABLE (ct)) | |
428 | 133 |
134 #ifdef MULE | |
135 | |
440 | 136 Lisp_Object get_non_ascii_char_table_value (Lisp_Char_Table *ct, |
137 int leading_byte, | |
138 Emchar c); | |
428 | 139 |
442 | 140 INLINE_HEADER Lisp_Object |
440 | 141 CHAR_TABLE_NON_ASCII_VALUE_UNSAFE (Lisp_Char_Table *ct, Emchar ch); |
442 | 142 INLINE_HEADER Lisp_Object |
440 | 143 CHAR_TABLE_NON_ASCII_VALUE_UNSAFE (Lisp_Char_Table *ct, Emchar ch) |
428 | 144 { |
145 unsigned char lb = CHAR_LEADING_BYTE (ch); | |
146 if (!CHAR_TABLE_ENTRYP ((ct)->level1[lb - MIN_LEADING_BYTE])) | |
147 return (ct)->level1[lb - MIN_LEADING_BYTE]; | |
148 else | |
149 return get_non_ascii_char_table_value (ct, lb, ch); | |
150 } | |
151 | |
152 #define CHAR_TABLE_VALUE_UNSAFE(ct, ch) \ | |
153 ((ch) < NUM_ASCII_CHARS \ | |
154 ? (ct)->ascii[ch] \ | |
155 : CHAR_TABLE_NON_ASCII_VALUE_UNSAFE (ct, ch)) | |
156 | |
157 #else /* not MULE */ | |
158 | |
159 #define CHAR_TABLE_VALUE_UNSAFE(ct, ch) ((ct)->ascii[(unsigned char) (ch)]) | |
160 | |
161 #endif /* not MULE */ | |
162 | |
442 | 163 #define XCHAR_TABLE_VALUE_UNSAFE(ct, ch) \ |
164 CHAR_TABLE_VALUE_UNSAFE (XCHAR_TABLE (ct), ch) | |
165 | |
428 | 166 enum chartab_range_type |
167 { | |
168 CHARTAB_RANGE_ALL, | |
169 #ifdef MULE | |
170 CHARTAB_RANGE_CHARSET, | |
171 CHARTAB_RANGE_ROW, | |
172 #endif | |
173 CHARTAB_RANGE_CHAR | |
174 }; | |
175 | |
176 struct chartab_range | |
177 { | |
178 enum chartab_range_type type; | |
179 Emchar ch; | |
180 Lisp_Object charset; | |
181 int row; | |
182 }; | |
183 | |
440 | 184 void fill_char_table (Lisp_Char_Table *ct, Lisp_Object value); |
185 void put_char_table (Lisp_Char_Table *ct, struct chartab_range *range, | |
428 | 186 Lisp_Object val); |
440 | 187 Lisp_Object get_char_table (Emchar, Lisp_Char_Table *); |
188 int map_char_table (Lisp_Char_Table *ct, | |
428 | 189 struct chartab_range *range, |
190 int (*fn) (struct chartab_range *range, | |
191 Lisp_Object val, void *arg), | |
192 void *arg); | |
193 void prune_syntax_tables (void); | |
194 | |
195 EXFUN (Fcopy_char_table, 1); | |
196 EXFUN (Fmake_char_table, 1); | |
197 EXFUN (Fput_char_table, 3); | |
198 EXFUN (Fget_char_table, 2); | |
199 | |
200 extern Lisp_Object Vall_syntax_tables; | |
201 | |
202 | |
203 | |
204 #ifdef MULE | |
205 int check_category_char(Emchar ch, Lisp_Object ctbl, | |
458 | 206 unsigned int designator, unsigned int not_p); |
428 | 207 |
208 extern Lisp_Object Vstandard_category_table; | |
209 | |
210 #define CATEGORY_DESIGNATORP(x) \ | |
211 (CHARP (x) && XCHAR (x) >= 32 && XCHAR (x) <= 126) | |
212 | |
213 #define CHECK_CATEGORY_DESIGNATOR(x) do { \ | |
214 if (!CATEGORY_DESIGNATORP (x)) \ | |
215 dead_wrong_type_argument (Qcategory_designator_p, x); \ | |
216 } while (0) | |
217 | |
218 #define CONCHECK_CATEGORY_DESIGNATOR(x) do { \ | |
219 if (!CATEGORY_DESIGNATORP (x)) \ | |
220 x = wrong_type_argument (Qcategory_designator_p, x); \ | |
221 } while (0) | |
222 | |
223 #define CATEGORY_TABLE_VALUEP(x) \ | |
224 (NILP (x) || (BIT_VECTORP (x) && (bit_vector_length (XBIT_VECTOR (x)) == 95))) | |
225 | |
226 #define CHECK_CATEGORY_TABLE_VALUE(x) do { \ | |
227 if (!CATEGORY_TABLE_VALUEP (x)) \ | |
228 dead_wrong_type_argument (Qcategory_table_value_p, x); \ | |
229 } while (0) | |
230 | |
231 #define CONCHECK_CATEGORY_TABLE_VALUE(x) do { \ | |
232 if (!CATEGORY_TABLE_VALUEP (x)) \ | |
233 x = wrong_type_argument (Qcategory_table_value_p, x); \ | |
234 } while (0) | |
235 | |
236 #endif /* MULE */ | |
237 | |
440 | 238 #endif /* INCLUDED_chartab_h_ */ |