Mercurial > hg > xemacs-beta
annotate src/chartab.h @ 826:6728e641994e
[xemacs-hg @ 2002-05-05 11:30:15 by ben]
syntax cache, 8-bit-format, lots of code cleanup
README.packages: Update info about --package-path.
i.c: Create an inheritable event and pass it on to XEmacs, so that ^C
can be handled properly. Intercept ^C and signal the event.
"Stop Build" in VC++ now works.
bytecomp-runtime.el: Doc string changes.
compat.el: Some attempts to redo this to
make it truly useful and fix the "multiple versions interacting
with each other" problem. Not yet done. Currently doesn't work.
files.el: Use with-obsolete-variable to avoid warnings in new revert-buffer code.
xemacs.mak: Split up CFLAGS into a version without flags specifying the C
library. The problem seems to be that minitar depends on zlib,
which depends specifically on libc.lib, not on any of the other C
libraries. Unless you compile with libc.lib, you get errors --
specifically, no _errno in the other libraries, which must make it
something other than an int. (#### But this doesn't seem to obtain
in XEmacs, which also uses zlib, and can be linked with any of the
C libraries. Maybe zlib is used differently and doesn't need
errno, or maybe XEmacs provides an int errno; ... I don't
understand.
Makefile.in.in: Fix so that packages are around when testing.
abbrev.c, alloc.c, buffer.c, buffer.h, bytecode.c, callint.c, casefiddle.c, casetab.c, casetab.h, charset.h, chartab.c, chartab.h, cmds.c, console-msw.h, console-stream.c, console-x.c, console.c, console.h, data.c, device-msw.c, device.c, device.h, dialog-msw.c, dialog-x.c, dired-msw.c, dired.c, doc.c, doprnt.c, dumper.c, editfns.c, elhash.c, emacs.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, events.c, events.h, extents.c, extents.h, faces.c, file-coding.c, file-coding.h, fileio.c, fns.c, font-lock.c, frame-gtk.c, frame-msw.c, frame-x.c, frame.c, frame.h, glade.c, glyphs-gtk.c, glyphs-msw.c, glyphs-msw.h, glyphs-x.c, glyphs.c, glyphs.h, gui-msw.c, gui-x.c, gui.h, gutter.h, hash.h, indent.c, insdel.c, intl-win32.c, intl.c, keymap.c, lisp-disunion.h, lisp-union.h, lisp.h, lread.c, lrecord.h, lstream.c, lstream.h, marker.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, menubar.c, minibuf.c, mule-ccl.c, mule-charset.c, mule-coding.c, mule-wnnfns.c, nas.c, objects-msw.c, objects-x.c, opaque.c, postgresql.c, print.c, process-nt.c, process-unix.c, process.c, process.h, profile.c, rangetab.c, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-x.c, redisplay.c, redisplay.h, regex.c, regex.h, scrollbar-msw.c, search.c, select-x.c, specifier.c, specifier.h, symbols.c, symsinit.h, syntax.c, syntax.h, syswindows.h, tests.c, text.c, text.h, tooltalk.c, ui-byhand.c, ui-gtk.c, unicode.c, win32.c, window.c: Another big Ben patch.
-- FUNCTIONALITY CHANGES:
add partial support for 8-bit-fixed, 16-bit-fixed, and
32-bit-fixed formats. not quite done yet. (in particular, needs
functions to actually convert the buffer.) NOTE: lots of changes
to regex.c here. also, many new *_fmt() inline funs that take an
Internal_Format argument.
redo syntax cache code. make the cache per-buffer; keep the cache
valid across calls to functions that use it. also keep it valid
across insertions/deletions and extent changes, as much as is
possible. eliminate the junky regex-reentrancy code by passing in
the relevant lisp info to the regex routines as local vars.
add general mechanism in extents code for signalling extent changes.
fix numerous problems with the case-table implementation; yoshiki
never properly transferred many algorithms from old-style to
new-style case tables.
redo char tables to support a default argument, so that mapping
only occurs over changed args. change many chartab functions to
accept Lisp_Object instead of Lisp_Char_Table *.
comment out the code in font-lock.c by default, because
font-lock.el no longer uses it. we should consider eliminating it
entirely.
Don't output bell as ^G in console-stream when not a TTY.
add -mswindows-termination-handle to interface with i.c, so we can
properly kill a build.
add more error-checking to buffer/string macros.
add some additional buffer_or_string_() funs.
-- INTERFACE CHANGES AFFECTING MORE CODE:
switch the arguments of write_c_string and friends to be
consistent with write_fmt_string, which must have printcharfun
first.
change BI_* macros to BYTE_* for increased clarity; similarly for
bi_* local vars.
change VOID_TO_LISP to be a one-argument function. eliminate
no-longer-needed CVOID_TO_LISP.
-- char/string macro changes:
rename MAKE_CHAR() to make_emchar() for slightly less confusion
with make_char(). (The former generates an Emchar, the latter a
Lisp object. Conceivably we should rename make_char() -> wrap_char()
and similarly for make_int(), make_float().)
Similar changes for other *CHAR* macros -- we now consistently use
names with `emchar' whenever we are working with Emchars. Any
remaining name with just `char' always refers to a Lisp object.
rename macros with XSTRING_* to string_* except for those that
reference actual fields in the Lisp_String object, following
conventions used elsewhere.
rename set_string_{data,length} macros (the only ones to work with
a Lisp_String_* instead of a Lisp_Object) to set_lispstringp_*
to make the difference clear.
try to be consistent about caps vs. lowercase in macro/inline-fun
names for chars and such, which wasn't the case before. we now
reserve caps either for XFOO_ macros that reference object fields
(e.g. XSTRING_DATA) or for things that have non-function semantics,
e.g. directly modifying an arg (BREAKUP_EMCHAR) or evaluating an
arg (any arg) more than once. otherwise, use lowercase.
here is a summary of most of the macros/inline funs changed by all
of the above changes:
BYTE_*_P -> byte_*_p
XSTRING_BYTE -> string_byte
set_string_data/length -> set_lispstringp_data/length
XSTRING_CHAR_LENGTH -> string_char_length
XSTRING_CHAR -> string_emchar
INTBYTE_FIRST_BYTE_P -> intbyte_first_byte_p
INTBYTE_LEADING_BYTE_P -> intbyte_leading_byte_p
charptr_copy_char -> charptr_copy_emchar
LEADING_BYTE_* -> leading_byte_*
CHAR_* -> EMCHAR_*
*_CHAR_* -> *_EMCHAR_*
*_CHAR -> *_EMCHAR
CHARSET_BY_ -> charset_by_*
BYTE_SHIFT_JIS* -> byte_shift_jis*
BYTE_BIG5* -> byte_big5*
REP_BYTES_BY_FIRST_BYTE -> rep_bytes_by_first_byte
char_to_unicode -> emchar_to_unicode
valid_char_p -> valid_emchar_p
Change intbyte_strcmp -> qxestrcmp_c (duplicated functionality).
-- INTERFACE CHANGES AFFECTING LESS CODE:
use DECLARE_INLINE_HEADER in various places.
remove '#ifdef emacs' from XEmacs-only files.
eliminate CHAR_TABLE_VALUE(), which duplicated the functionality
of get_char_table().
add BUFFER_TEXT_LOOP to simplify iterations over buffer text.
define typedefs for signed and unsigned types of fixed sizes
(INT_32_BIT, UINT_32_BIT, etc.).
create ALIGN_FOR_TYPE as a higher-level interface onto ALIGN_SIZE;
fix code to use it.
add charptr_emchar_len to return the text length of the character
pointed to by a ptr; use it in place of
charcount_to_bytecount(..., 1). add emchar_len to return the text
length of a given character.
add types Bytexpos and Charxpos to generalize Bytebpos/Bytecount
and Charbpos/Charcount, in code (particularly, the extents code
and redisplay code) that works with either kind of index. rename
redisplay struct params with names such as `charbpos' to
e.g. `charpos' when they are e.g. a Charxpos, not a Charbpos.
eliminate xxDEFUN in place of DEFUN; no longer necessary with
changes awhile back to doc.c.
split up big ugly combined list of EXFUNs in lisp.h on a
file-by-file basis, since other prototypes are similarly split.
rewrite some "*_UNSAFE" macros as inline funs and eliminate the
_UNSAFE suffix.
move most string code from lisp.h to text.h; the string code and
text.h code is now intertwined in such a fashion that they need
to be in the same place and partially interleaved. (you can't
create forward references for inline funs)
automated/lisp-tests.el, automated/symbol-tests.el, automated/test-harness.el: Fix test harness to output FAIL messages to stderr when in
batch mode.
Fix up some problems in lisp-tests/symbol-tests that were
causing spurious failures.
author | ben |
---|---|
date | Sun, 05 May 2002 11:33:57 +0000 |
parents | e38acbeb1cae |
children | 804517e16990 |
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. | |
793 | 4 Copyright (C) 2002 Ben Wing. |
428 | 5 |
6 This file is part of XEmacs. | |
7 | |
8 XEmacs is free software; you can redistribute it and/or modify it | |
9 under the terms of the GNU General Public License as published by the | |
10 Free Software Foundation; either version 2, or (at your option) any | |
11 later version. | |
12 | |
13 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
16 for more details. | |
17 | |
18 You should have received a copy of the GNU General Public License | |
19 along with XEmacs; see the file COPYING. If not, write to | |
20 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
21 Boston, MA 02111-1307, USA. */ | |
22 | |
23 /* Synched up with: Mule 2.3. Not synched with FSF. | |
24 | |
25 This file was written independently of the FSF implementation, | |
26 and is not compatible. */ | |
27 | |
440 | 28 #ifndef INCLUDED_chartab_h_ |
29 #define INCLUDED_chartab_h_ | |
428 | 30 |
771 | 31 #include "charset.h" |
32 | |
428 | 33 /************************************************************************/ |
34 /* Char Tables */ | |
35 /************************************************************************/ | |
36 | |
37 /* Under Mule, we use a complex representation (see below). | |
38 When not under Mule, there are only 256 possible characters | |
39 so we just represent them directly. */ | |
40 | |
41 #ifdef MULE | |
42 | |
43 struct Lisp_Char_Table_Entry | |
44 { | |
45 struct lcrecord_header header; | |
46 | |
47 /* In the interests of simplicity, we just use a fixed 96-entry | |
48 table. If we felt like being smarter, we could make this | |
49 variable-size and add an offset value into this structure. */ | |
50 Lisp_Object level2[96]; | |
51 }; | |
440 | 52 typedef struct Lisp_Char_Table_Entry Lisp_Char_Table_Entry; |
53 | |
54 DECLARE_LRECORD (char_table_entry, Lisp_Char_Table_Entry); | |
55 #define XCHAR_TABLE_ENTRY(x) \ | |
56 XRECORD (x, char_table_entry, Lisp_Char_Table_Entry) | |
617 | 57 #define wrap_char_table_entry(p) wrap_record (p, char_table_entry) |
440 | 58 #define CHAR_TABLE_ENTRYP(x) RECORDP (x, char_table_entry) |
59 /* #define CHECK_CHAR_TABLE_ENTRY(x) CHECK_RECORD (x, char_table_entry) | |
60 char table entries should never escape to Lisp */ | |
428 | 61 |
62 #endif /* MULE */ | |
63 | |
64 enum char_table_type | |
65 { | |
66 CHAR_TABLE_TYPE_GENERIC, | |
67 #ifdef MULE | |
68 CHAR_TABLE_TYPE_CATEGORY, | |
69 #endif | |
70 CHAR_TABLE_TYPE_SYNTAX, | |
71 CHAR_TABLE_TYPE_DISPLAY, | |
72 CHAR_TABLE_TYPE_CHAR | |
73 }; | |
74 | |
75 #ifdef MULE | |
76 #define NUM_ASCII_CHARS 160 | |
77 #else | |
78 #define NUM_ASCII_CHARS 256 | |
79 #endif | |
80 | |
81 struct Lisp_Char_Table | |
82 { | |
83 struct lcrecord_header header; | |
84 | |
85 Lisp_Object ascii[NUM_ASCII_CHARS]; | |
826 | 86 Lisp_Object default_; |
793 | 87 Lisp_Object parent; /* #### not yet implemented */ |
88 | |
428 | 89 #ifdef MULE |
90 /* We basically duplicate the Mule vectors-of-vectors implementation. | |
91 We can do this because we know a great deal about the sorts of | |
92 things we are going to be indexing. | |
93 | |
94 The current implementation is as follows: | |
95 | |
96 ascii[0-159] is used for ASCII and Control-1 characters. | |
97 | |
98 level1[0 .. (NUM_LEADING_BYTES-1)] indexes charsets by leading | |
99 byte (subtract MIN_LEADING_BYTE from the leading byte). If the | |
100 value of this is not an opaque, then it specifies a value for all | |
101 characters in the charset. Otherwise, it will be a | |
102 96-Lisp-Object opaque that we created, specifying a value for | |
103 each row. If the value of this is not an opaque, then it | |
104 specifies a value for all characters in the row. Otherwise, it | |
105 will be a 96-Lisp-Object opaque that we created, specifying a | |
106 value for each character. | |
107 | |
108 NOTE: 1) This will fail if some C routine passes an opaque to | |
109 Fput_char_table(). Currently this is not a problem | |
110 since all char tables that are created are Lisp-visible | |
111 and thus no one should ever be putting an opaque in | |
112 a char table. Another possibility is to consider | |
113 adding a type to */ | |
114 | |
115 Lisp_Object level1[NUM_LEADING_BYTES]; | |
116 | |
117 #endif /* MULE */ | |
118 | |
119 enum char_table_type type; | |
120 | |
121 /* stuff used for syntax tables */ | |
122 Lisp_Object mirror_table; | |
123 Lisp_Object next_table; /* DO NOT mark through this. */ | |
124 }; | |
440 | 125 typedef struct Lisp_Char_Table Lisp_Char_Table; |
126 | |
127 DECLARE_LRECORD (char_table, Lisp_Char_Table); | |
128 #define XCHAR_TABLE(x) XRECORD (x, char_table, Lisp_Char_Table) | |
617 | 129 #define wrap_char_table(p) wrap_record (p, char_table) |
440 | 130 #define CHAR_TABLEP(x) RECORDP (x, char_table) |
131 #define CHECK_CHAR_TABLE(x) CHECK_RECORD (x, char_table) | |
132 #define CONCHECK_CHAR_TABLE(x) CONCHECK_RECORD (x, char_table) | |
133 | |
134 #define CHAR_TABLE_TYPE(ct) ((ct)->type) | |
135 #define XCHAR_TABLE_TYPE(ct) CHAR_TABLE_TYPE (XCHAR_TABLE (ct)) | |
428 | 136 |
440 | 137 Lisp_Object get_non_ascii_char_table_value (Lisp_Char_Table *ct, |
138 int leading_byte, | |
139 Emchar c); | |
428 | 140 |
826 | 141 DECLARE_INLINE_HEADER ( |
142 Lisp_Object | |
143 get_char_table (Emchar ch, Lisp_Object table) | |
144 ) | |
428 | 145 { |
826 | 146 Lisp_Object retval; |
147 Lisp_Char_Table *ct = XCHAR_TABLE (table); | |
148 #ifdef MULE | |
149 if (ch < NUM_ASCII_CHARS) | |
150 retval = ct->ascii[ch]; | |
428 | 151 else |
826 | 152 { |
153 unsigned char lb = emchar_leading_byte (ch); | |
154 if (!CHAR_TABLE_ENTRYP (ct->level1[lb - MIN_LEADING_BYTE])) | |
155 retval = ct->level1[lb - MIN_LEADING_BYTE]; | |
156 else | |
157 retval = get_non_ascii_char_table_value (ct, lb, ch); | |
158 } | |
159 #else /* not MULE */ | |
160 retval = ct->ascii[(unsigned char) ch]; | |
161 #endif /* not MULE */ | |
162 if (!UNBOUNDP (retval)) | |
163 return retval; | |
164 else | |
165 return ct->default_; | |
428 | 166 } |
167 | |
168 enum chartab_range_type | |
169 { | |
170 CHARTAB_RANGE_ALL, | |
171 #ifdef MULE | |
172 CHARTAB_RANGE_CHARSET, | |
173 CHARTAB_RANGE_ROW, | |
174 #endif | |
175 CHARTAB_RANGE_CHAR | |
176 }; | |
177 | |
178 struct chartab_range | |
179 { | |
180 enum chartab_range_type type; | |
181 Emchar ch; | |
182 Lisp_Object charset; | |
183 int row; | |
184 }; | |
185 | |
826 | 186 void set_char_table_default (Lisp_Object table, Lisp_Object value); |
187 void put_char_table (Lisp_Object table, struct chartab_range *range, | |
428 | 188 Lisp_Object val); |
826 | 189 int map_char_table (Lisp_Object table, |
428 | 190 struct chartab_range *range, |
191 int (*fn) (struct chartab_range *range, | |
826 | 192 Lisp_Object table, |
428 | 193 Lisp_Object val, void *arg), |
194 void *arg); | |
195 void prune_syntax_tables (void); | |
826 | 196 Lisp_Object get_range_char_table (struct chartab_range *range, |
197 Lisp_Object table, Lisp_Object multi); | |
198 void copy_char_table_range (Lisp_Object from, Lisp_Object to, | |
199 struct chartab_range *range); | |
200 int word_boundary_p (Emchar c1, Emchar c2); | |
428 | 201 |
202 EXFUN (Fcopy_char_table, 1); | |
203 EXFUN (Fmake_char_table, 1); | |
204 EXFUN (Fput_char_table, 3); | |
205 EXFUN (Fget_char_table, 2); | |
206 | |
207 extern Lisp_Object Vall_syntax_tables; | |
208 | |
209 | |
210 | |
211 #ifdef MULE | |
826 | 212 int check_category_char (Emchar ch, Lisp_Object ctbl, int designator, |
213 int not_p); | |
428 | 214 |
215 extern Lisp_Object Vstandard_category_table; | |
216 | |
217 #define CATEGORY_DESIGNATORP(x) \ | |
218 (CHARP (x) && XCHAR (x) >= 32 && XCHAR (x) <= 126) | |
219 | |
220 #define CHECK_CATEGORY_DESIGNATOR(x) do { \ | |
221 if (!CATEGORY_DESIGNATORP (x)) \ | |
222 dead_wrong_type_argument (Qcategory_designator_p, x); \ | |
223 } while (0) | |
224 | |
225 #define CONCHECK_CATEGORY_DESIGNATOR(x) do { \ | |
226 if (!CATEGORY_DESIGNATORP (x)) \ | |
227 x = wrong_type_argument (Qcategory_designator_p, x); \ | |
228 } while (0) | |
229 | |
230 #define CATEGORY_TABLE_VALUEP(x) \ | |
231 (NILP (x) || (BIT_VECTORP (x) && (bit_vector_length (XBIT_VECTOR (x)) == 95))) | |
232 | |
233 #define CHECK_CATEGORY_TABLE_VALUE(x) do { \ | |
234 if (!CATEGORY_TABLE_VALUEP (x)) \ | |
235 dead_wrong_type_argument (Qcategory_table_value_p, x); \ | |
236 } while (0) | |
237 | |
238 #define CONCHECK_CATEGORY_TABLE_VALUE(x) do { \ | |
239 if (!CATEGORY_TABLE_VALUEP (x)) \ | |
240 x = wrong_type_argument (Qcategory_table_value_p, x); \ | |
241 } while (0) | |
242 | |
243 #endif /* MULE */ | |
244 | |
440 | 245 #endif /* INCLUDED_chartab_h_ */ |