annotate src/chartab.c @ 420:41dbb7a9d5f2 r21-2-18

Import from CVS: tag r21-2-18
author cvs
date Mon, 13 Aug 2007 11:24:09 +0200
parents da8ed4261e83
children 11054d720c21
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1 /* XEmacs routines to deal with char tables.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
2 Copyright (C) 1992, 1995 Free Software Foundation, Inc.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
3 Copyright (C) 1995 Sun Microsystems, Inc.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
4 Copyright (C) 1995, 1996 Ben Wing.
420
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
5 Copyright (C) 1995, 1997, 1999 Electrotechnical Laboratory, JAPAN.
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
6 Licensed to the Free Software Foundation.
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
7
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
8 This file is part of XEmacs.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
9
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
10 XEmacs is free software; you can redistribute it and/or modify it
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
11 under the terms of the GNU General Public License as published by the
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
12 Free Software Foundation; either version 2, or (at your option) any
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
13 later version.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
14
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
15 XEmacs is distributed in the hope that it will be useful, but WITHOUT
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
16 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
17 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
18 for more details.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
19
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
20 You should have received a copy of the GNU General Public License
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
21 along with XEmacs; see the file COPYING. If not, write to
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
22 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
23 Boston, MA 02111-1307, USA. */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
24
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
25 /* Synched up with: Mule 2.3. Not synched with FSF.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
26
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
27 This file was written independently of the FSF implementation,
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
28 and is not compatible. */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
29
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
30 /* Authorship:
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
31
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
32 Ben Wing: wrote, for 19.13 (Mule). Some category table stuff
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
33 loosely based on the original Mule.
104
cf808b4c4290 Import from CVS: tag r20-1b4
cvs
parents: 70
diff changeset
34 Jareth Hein: fixed a couple of bugs in the implementation, and
cf808b4c4290 Import from CVS: tag r20-1b4
cvs
parents: 70
diff changeset
35 added regex support for categories with check_category_at
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
36 */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
37
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
38 #include <config.h>
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
39 #include "lisp.h"
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
40
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
41 #include "buffer.h"
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
42 #include "chartab.h"
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
43 #include "syntax.h"
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
44
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
45 Lisp_Object Qchar_tablep, Qchar_table;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
46
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
47 Lisp_Object Vall_syntax_tables;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
48
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
49 #ifdef MULE
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
50 Lisp_Object Qcategory_table_p;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
51 Lisp_Object Qcategory_designator_p;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
52 Lisp_Object Qcategory_table_value_p;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
53
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
54 Lisp_Object Vstandard_category_table;
420
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
55
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
56 /* Variables to determine word boundary. */
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
57 Lisp_Object Vword_combining_categories, Vword_separating_categories;
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
58 #endif /* MULE */
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
59
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
60
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
61 /* A char table maps from ranges of characters to values.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
62
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
63 Implementing a general data structure that maps from arbitrary
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
64 ranges of numbers to values is tricky to do efficiently. As it
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
65 happens, it should suffice (and is usually more convenient, anyway)
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
66 when dealing with characters to restrict the sorts of ranges that
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
67 can be assigned values, as follows:
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
68
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
69 1) All characters.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
70 2) All characters in a charset.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
71 3) All characters in a particular row of a charset, where a "row"
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
72 means all characters with the same first byte.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
73 4) A particular character in a charset.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
74
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
75 We use char tables to generalize the 256-element vectors now
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
76 littering the Emacs code.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
77
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
78 Possible uses (all should be converted at some point):
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
79
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
80 1) category tables
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
81 2) syntax tables
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
82 3) display tables
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
83 4) case tables
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
84 5) keyboard-translate-table?
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
85
251
677f6a0ee643 Import from CVS: tag r20-5b24
cvs
parents: 249
diff changeset
86 We provide an
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
87 abstract type to generalize the Emacs vectors and Mule
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
88 vectors-of-vectors goo.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
89 */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
90
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
91 /************************************************************************/
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
92 /* Char Table object */
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
93 /************************************************************************/
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
94
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
95 #ifdef MULE
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
96
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
97 static Lisp_Object
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 400
diff changeset
98 mark_char_table_entry (Lisp_Object obj, void (*markobj) (Lisp_Object))
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
99 {
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 400
diff changeset
100 struct Lisp_Char_Table_Entry *cte = XCHAR_TABLE_ENTRY (obj);
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
101 int i;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
102
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
103 for (i = 0; i < 96; i++)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
104 {
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 400
diff changeset
105 markobj (cte->level2[i]);
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
106 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
107 return Qnil;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
108 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
109
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
110 static int
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
111 char_table_entry_equal (Lisp_Object obj1, Lisp_Object obj2, int depth)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
112 {
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 400
diff changeset
113 struct Lisp_Char_Table_Entry *cte1 = XCHAR_TABLE_ENTRY (obj1);
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 400
diff changeset
114 struct Lisp_Char_Table_Entry *cte2 = XCHAR_TABLE_ENTRY (obj2);
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
115 int i;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
116
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
117 for (i = 0; i < 96; i++)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
118 if (!internal_equal (cte1->level2[i], cte2->level2[i], depth + 1))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
119 return 0;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
120
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
121 return 1;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
122 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
123
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
124 static unsigned long
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
125 char_table_entry_hash (Lisp_Object obj, int depth)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
126 {
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 400
diff changeset
127 struct Lisp_Char_Table_Entry *cte = XCHAR_TABLE_ENTRY (obj);
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
128
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
129 return internal_array_hash (cte->level2, 96, depth);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
130 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
131
420
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
132 static const struct lrecord_description char_table_entry_description[] = {
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
133 { XD_LISP_OBJECT, offsetof(struct Lisp_Char_Table_Entry, level2), 96 },
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
134 { XD_END }
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
135 };
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
136
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 251
diff changeset
137 DEFINE_LRECORD_IMPLEMENTATION ("char-table-entry", char_table_entry,
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 251
diff changeset
138 mark_char_table_entry, internal_object_printer,
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 251
diff changeset
139 0, char_table_entry_equal,
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 251
diff changeset
140 char_table_entry_hash,
420
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
141 char_table_entry_description,
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 400
diff changeset
142 struct Lisp_Char_Table_Entry);
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
143 #endif /* MULE */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
144
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
145 static Lisp_Object
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 400
diff changeset
146 mark_char_table (Lisp_Object obj, void (*markobj) (Lisp_Object))
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
147 {
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 400
diff changeset
148 struct Lisp_Char_Table *ct = XCHAR_TABLE (obj);
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
149 int i;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
150
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
151 for (i = 0; i < NUM_ASCII_CHARS; i++)
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 400
diff changeset
152 markobj (ct->ascii[i]);
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
153 #ifdef MULE
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
154 for (i = 0; i < NUM_LEADING_BYTES; i++)
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 400
diff changeset
155 markobj (ct->level1[i]);
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
156 #endif
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
157 return ct->mirror_table;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
158 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
159
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
160 /* WARNING: All functions of this nature need to be written extremely
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
161 carefully to avoid crashes during GC. Cf. prune_specifiers()
380
8626e4521993 Import from CVS: tag r21-2-5
cvs
parents: 377
diff changeset
162 and prune_weak_hash_tables(). */
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
163
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
164 void
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 400
diff changeset
165 prune_syntax_tables (int (*obj_marked_p) (Lisp_Object))
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
166 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
167 Lisp_Object rest, prev = Qnil;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
168
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
169 for (rest = Vall_syntax_tables;
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 400
diff changeset
170 !GC_NILP (rest);
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
171 rest = XCHAR_TABLE (rest)->next_table)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
172 {
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 400
diff changeset
173 if (! obj_marked_p (rest))
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
174 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
175 /* This table is garbage. Remove it from the list. */
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 400
diff changeset
176 if (GC_NILP (prev))
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
177 Vall_syntax_tables = XCHAR_TABLE (rest)->next_table;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
178 else
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
179 XCHAR_TABLE (prev)->next_table =
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
180 XCHAR_TABLE (rest)->next_table;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
181 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
182 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
183 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
184
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
185 static Lisp_Object
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
186 char_table_type_to_symbol (enum char_table_type type)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
187 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
188 switch (type)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
189 {
380
8626e4521993 Import from CVS: tag r21-2-5
cvs
parents: 377
diff changeset
190 default: abort();
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
191 case CHAR_TABLE_TYPE_GENERIC: return Qgeneric;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
192 case CHAR_TABLE_TYPE_SYNTAX: return Qsyntax;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
193 case CHAR_TABLE_TYPE_DISPLAY: return Qdisplay;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
194 case CHAR_TABLE_TYPE_CHAR: return Qchar;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
195 #ifdef MULE
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
196 case CHAR_TABLE_TYPE_CATEGORY: return Qcategory;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
197 #endif
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
198 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
199 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
200
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
201 static enum char_table_type
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
202 symbol_to_char_table_type (Lisp_Object symbol)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
203 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
204 CHECK_SYMBOL (symbol);
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
205
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
206 if (EQ (symbol, Qgeneric)) return CHAR_TABLE_TYPE_GENERIC;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
207 if (EQ (symbol, Qsyntax)) return CHAR_TABLE_TYPE_SYNTAX;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
208 if (EQ (symbol, Qdisplay)) return CHAR_TABLE_TYPE_DISPLAY;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
209 if (EQ (symbol, Qchar)) return CHAR_TABLE_TYPE_CHAR;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
210 #ifdef MULE
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
211 if (EQ (symbol, Qcategory)) return CHAR_TABLE_TYPE_CATEGORY;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
212 #endif
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
213
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
214 signal_simple_error ("Unrecognized char table type", symbol);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
215 return CHAR_TABLE_TYPE_GENERIC; /* not reached */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
216 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
217
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
218 static void
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
219 print_chartab_range (Emchar first, Emchar last, Lisp_Object val,
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
220 Lisp_Object printcharfun)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
221 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
222 if (first != last)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
223 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
224 write_c_string (" (", printcharfun);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
225 print_internal (make_char (first), printcharfun, 0);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
226 write_c_string (" ", printcharfun);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
227 print_internal (make_char (last), printcharfun, 0);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
228 write_c_string (") ", printcharfun);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
229 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
230 else
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
231 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
232 write_c_string (" ", printcharfun);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
233 print_internal (make_char (first), printcharfun, 0);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
234 write_c_string (" ", printcharfun);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
235 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
236 print_internal (val, printcharfun, 1);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
237 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
238
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
239 #ifdef MULE
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
240
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
241 static void
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
242 print_chartab_charset_row (Lisp_Object charset,
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
243 int row,
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 400
diff changeset
244 struct Lisp_Char_Table_Entry *cte,
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
245 Lisp_Object printcharfun)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
246 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
247 int i;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
248 Lisp_Object cat = Qunbound;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
249 int first = -1;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
250
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
251 for (i = 32; i < 128; i++)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
252 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
253 Lisp_Object pam = cte->level2[i - 32];
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
254
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
255 if (first == -1)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
256 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
257 first = i;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
258 cat = pam;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
259 continue;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
260 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
261
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
262 if (!EQ (cat, pam))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
263 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
264 if (row == -1)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
265 print_chartab_range (MAKE_CHAR (charset, first, 0),
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
266 MAKE_CHAR (charset, i - 1, 0),
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
267 cat, printcharfun);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
268 else
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
269 print_chartab_range (MAKE_CHAR (charset, row, first),
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
270 MAKE_CHAR (charset, row, i - 1),
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
271 cat, printcharfun);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
272 first = -1;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
273 i--;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
274 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
275 }
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
276
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
277 if (first != -1)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
278 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
279 if (row == -1)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
280 print_chartab_range (MAKE_CHAR (charset, first, 0),
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
281 MAKE_CHAR (charset, i - 1, 0),
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
282 cat, printcharfun);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
283 else
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
284 print_chartab_range (MAKE_CHAR (charset, row, first),
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
285 MAKE_CHAR (charset, row, i - 1),
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
286 cat, printcharfun);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
287 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
288 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
289
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
290 static void
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
291 print_chartab_two_byte_charset (Lisp_Object charset,
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 400
diff changeset
292 struct Lisp_Char_Table_Entry *cte,
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
293 Lisp_Object printcharfun)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
294 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
295 int i;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
296
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
297 for (i = 32; i < 128; i++)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
298 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
299 Lisp_Object jen = cte->level2[i - 32];
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
300
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
301 if (!CHAR_TABLE_ENTRYP (jen))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
302 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
303 char buf[100];
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
304
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
305 write_c_string (" [", printcharfun);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
306 print_internal (XCHARSET_NAME (charset), printcharfun, 0);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
307 sprintf (buf, " %d] ", i);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
308 write_c_string (buf, printcharfun);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
309 print_internal (jen, printcharfun, 0);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
310 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
311 else
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
312 print_chartab_charset_row (charset, i, XCHAR_TABLE_ENTRY (jen),
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
313 printcharfun);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
314 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
315 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
316
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
317 #endif /* MULE */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
318
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
319 static void
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
320 print_char_table (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
321 {
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 400
diff changeset
322 struct Lisp_Char_Table *ct = XCHAR_TABLE (obj);
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
323 char buf[200];
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
324
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
325 sprintf (buf, "#s(char-table type %s data (",
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
326 string_data (symbol_name (XSYMBOL
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
327 (char_table_type_to_symbol (ct->type)))));
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
328 write_c_string (buf, printcharfun);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
329
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
330 /* Now write out the ASCII/Control-1 stuff. */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
331 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
332 int i;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
333 int first = -1;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
334 Lisp_Object val = Qunbound;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
335
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
336 for (i = 0; i < NUM_ASCII_CHARS; i++)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
337 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
338 if (first == -1)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
339 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
340 first = i;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
341 val = ct->ascii[i];
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
342 continue;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
343 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
344
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
345 if (!EQ (ct->ascii[i], val))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
346 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
347 print_chartab_range (first, i - 1, val, printcharfun);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
348 first = -1;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
349 i--;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
350 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
351 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
352
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
353 if (first != -1)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
354 print_chartab_range (first, i - 1, val, printcharfun);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
355 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
356
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
357 #ifdef MULE
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
358 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
359 int i;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
360
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
361 for (i = MIN_LEADING_BYTE; i < MIN_LEADING_BYTE + NUM_LEADING_BYTES;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
362 i++)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
363 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
364 Lisp_Object ann = ct->level1[i - MIN_LEADING_BYTE];
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
365 Lisp_Object charset = CHARSET_BY_LEADING_BYTE (i);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
366
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
367 if (!CHARSETP (charset) || i == LEADING_BYTE_ASCII
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
368 || i == LEADING_BYTE_CONTROL_1)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
369 continue;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
370 if (!CHAR_TABLE_ENTRYP (ann))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
371 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
372 write_c_string (" ", printcharfun);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
373 print_internal (XCHARSET_NAME (charset),
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
374 printcharfun, 0);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
375 write_c_string (" ", printcharfun);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
376 print_internal (ann, printcharfun, 0);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
377 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
378 else
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
379 {
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 400
diff changeset
380 struct Lisp_Char_Table_Entry *cte = XCHAR_TABLE_ENTRY (ann);
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
381 if (XCHARSET_DIMENSION (charset) == 1)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
382 print_chartab_charset_row (charset, -1, cte, printcharfun);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
383 else
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
384 print_chartab_two_byte_charset (charset, cte, printcharfun);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
385 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
386 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
387 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
388 #endif /* MULE */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
389
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
390 write_c_string ("))", printcharfun);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
391 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
392
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
393 static int
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
394 char_table_equal (Lisp_Object obj1, Lisp_Object obj2, int depth)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
395 {
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 400
diff changeset
396 struct Lisp_Char_Table *ct1 = XCHAR_TABLE (obj1);
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 400
diff changeset
397 struct Lisp_Char_Table *ct2 = XCHAR_TABLE (obj2);
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
398 int i;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
399
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
400 if (CHAR_TABLE_TYPE (ct1) != CHAR_TABLE_TYPE (ct2))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
401 return 0;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
402
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
403 for (i = 0; i < NUM_ASCII_CHARS; i++)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
404 if (!internal_equal (ct1->ascii[i], ct2->ascii[i], depth + 1))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
405 return 0;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
406
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
407 #ifdef MULE
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
408 for (i = 0; i < NUM_LEADING_BYTES; i++)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
409 if (!internal_equal (ct1->level1[i], ct2->level1[i], depth + 1))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
410 return 0;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
411 #endif /* MULE */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
412
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
413 return 1;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
414 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
415
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
416 static unsigned long
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
417 char_table_hash (Lisp_Object obj, int depth)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
418 {
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 400
diff changeset
419 struct Lisp_Char_Table *ct = XCHAR_TABLE (obj);
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
420 unsigned long hashval = internal_array_hash (ct->ascii, NUM_ASCII_CHARS,
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
421 depth);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
422 #ifdef MULE
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
423 hashval = HASH2 (hashval,
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
424 internal_array_hash (ct->level1, NUM_LEADING_BYTES, depth));
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
425 #endif /* MULE */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
426 return hashval;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
427 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
428
420
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
429 static const struct lrecord_description char_table_description[] = {
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
430 { XD_LISP_OBJECT, offsetof(struct Lisp_Char_Table, ascii), NUM_ASCII_CHARS },
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
431 #ifdef MULE
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
432 { XD_LISP_OBJECT, offsetof(struct Lisp_Char_Table, level1), NUM_LEADING_BYTES },
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
433 #endif
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
434 { XD_END }
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
435 };
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
436
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 251
diff changeset
437 DEFINE_LRECORD_IMPLEMENTATION ("char-table", char_table,
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 251
diff changeset
438 mark_char_table, print_char_table, 0,
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 251
diff changeset
439 char_table_equal, char_table_hash,
420
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
440 char_table_description,
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 400
diff changeset
441 struct Lisp_Char_Table);
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 251
diff changeset
442
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
443 DEFUN ("char-table-p", Fchar_table_p, 1, 1, 0, /*
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
444 Return non-nil if OBJECT is a char table.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
445
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
446 A char table is a table that maps characters (or ranges of characters)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
447 to values. Char tables are specialized for characters, only allowing
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
448 particular sorts of ranges to be assigned values. Although this
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
449 loses in generality, it makes for extremely fast (constant-time)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
450 lookups, and thus is feasible for applications that do an extremely
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
451 large number of lookups (e.g. scanning a buffer for a character in
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
452 a particular syntax, where a lookup in the syntax table must occur
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
453 once per character).
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
454
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
455 When Mule support exists, the types of ranges that can be assigned
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
456 values are
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
457
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
458 -- all characters
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
459 -- an entire charset
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
460 -- a single row in a two-octet charset
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
461 -- a single character
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
462
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
463 When Mule support is not present, the types of ranges that can be
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
464 assigned values are
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
465
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
466 -- all characters
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
467 -- a single character
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
468
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
469 To create a char table, use `make-char-table'. To modify a char
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
470 table, use `put-char-table' or `remove-char-table'. To retrieve the
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
471 value for a particular character, use `get-char-table'. See also
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
472 `map-char-table', `clear-char-table', `copy-char-table',
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
473 `valid-char-table-type-p', `char-table-type-list', `valid-char-table-value-p',
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
474 and `check-char-table-value'.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
475 */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
476 (object))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
477 {
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 110
diff changeset
478 return CHAR_TABLEP (object) ? Qt : Qnil;
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
479 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
480
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
481 DEFUN ("char-table-type-list", Fchar_table_type_list, 0, 0, 0, /*
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
482 Return a list of the recognized char table types.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
483 See `valid-char-table-type-p'.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
484 */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
485 ())
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
486 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
487 #ifdef MULE
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
488 return list5 (Qchar, Qcategory, Qdisplay, Qgeneric, Qsyntax);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
489 #else
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
490 return list4 (Qchar, Qdisplay, Qgeneric, Qsyntax);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
491 #endif
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
492 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
493
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
494 DEFUN ("valid-char-table-type-p", Fvalid_char_table_type_p, 1, 1, 0, /*
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
495 Return t if TYPE if a recognized char table type.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
496
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
497 Each char table type is used for a different purpose and allows different
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
498 sorts of values. The different char table types are
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
499
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
500 `category'
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
501 Used for category tables, which specify the regexp categories
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
502 that a character is in. The valid values are nil or a
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
503 bit vector of 95 elements. Higher-level Lisp functions are
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
504 provided for working with category tables. Currently categories
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
505 and category tables only exist when Mule support is present.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
506 `char'
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
507 A generalized char table, for mapping from one character to
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
508 another. Used for case tables, syntax matching tables,
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
509 `keyboard-translate-table', etc. The valid values are characters.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
510 `generic'
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
511 An even more generalized char table, for mapping from a
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
512 character to anything.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
513 `display'
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
514 Used for display tables, which specify how a particular character
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
515 is to appear when displayed. #### Not yet implemented.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
516 `syntax'
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
517 Used for syntax tables, which specify the syntax of a particular
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
518 character. Higher-level Lisp functions are provided for
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
519 working with syntax tables. The valid values are integers.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
520
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
521 */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
522 (type))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
523 {
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 110
diff changeset
524 return (EQ (type, Qchar) ||
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
525 #ifdef MULE
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 110
diff changeset
526 EQ (type, Qcategory) ||
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
527 #endif
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 110
diff changeset
528 EQ (type, Qdisplay) ||
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 110
diff changeset
529 EQ (type, Qgeneric) ||
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 110
diff changeset
530 EQ (type, Qsyntax)) ? Qt : Qnil;
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
531 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
532
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
533 DEFUN ("char-table-type", Fchar_table_type, 1, 1, 0, /*
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
534 Return the type of char table TABLE.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
535 See `valid-char-table-type-p'.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
536 */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
537 (table))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
538 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
539 CHECK_CHAR_TABLE (table);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
540 return char_table_type_to_symbol (XCHAR_TABLE (table)->type);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
541 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
542
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
543 void
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 400
diff changeset
544 fill_char_table (struct Lisp_Char_Table *ct, Lisp_Object value)
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
545 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
546 int i;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
547
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
548 for (i = 0; i < NUM_ASCII_CHARS; i++)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
549 ct->ascii[i] = value;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
550 #ifdef MULE
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
551 for (i = 0; i < NUM_LEADING_BYTES; i++)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
552 ct->level1[i] = value;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
553 #endif /* MULE */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
554
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
555 if (ct->type == CHAR_TABLE_TYPE_SYNTAX)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
556 update_syntax_table (ct);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
557 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
558
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
559 DEFUN ("reset-char-table", Freset_char_table, 1, 1, 0, /*
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
560 Reset a char table to its default state.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
561 */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
562 (table))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
563 {
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 400
diff changeset
564 struct Lisp_Char_Table *ct;
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
565
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
566 CHECK_CHAR_TABLE (table);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
567 ct = XCHAR_TABLE (table);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
568
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
569 switch (ct->type)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
570 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
571 case CHAR_TABLE_TYPE_CHAR:
377
d883f39b8495 Import from CVS: tag r21-2b4
cvs
parents: 371
diff changeset
572 fill_char_table (ct, make_char (0));
d883f39b8495 Import from CVS: tag r21-2b4
cvs
parents: 371
diff changeset
573 break;
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
574 case CHAR_TABLE_TYPE_DISPLAY:
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
575 case CHAR_TABLE_TYPE_GENERIC:
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
576 #ifdef MULE
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
577 case CHAR_TABLE_TYPE_CATEGORY:
377
d883f39b8495 Import from CVS: tag r21-2b4
cvs
parents: 371
diff changeset
578 #endif /* MULE */
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
579 fill_char_table (ct, Qnil);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
580 break;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
581
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
582 case CHAR_TABLE_TYPE_SYNTAX:
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
583 fill_char_table (ct, make_int (Sinherit));
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
584 break;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
585
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
586 default:
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
587 abort ();
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
588 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
589
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
590 return Qnil;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
591 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
592
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
593 DEFUN ("make-char-table", Fmake_char_table, 1, 1, 0, /*
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 251
diff changeset
594 Return a new, empty char table of type TYPE.
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
595 Currently recognized types are 'char, 'category, 'display, 'generic,
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
596 and 'syntax. See `valid-char-table-type-p'.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
597 */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
598 (type))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
599 {
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 400
diff changeset
600 struct Lisp_Char_Table *ct;
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 251
diff changeset
601 Lisp_Object obj;
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
602 enum char_table_type ty = symbol_to_char_table_type (type);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
603
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 400
diff changeset
604 ct = alloc_lcrecord_type (struct Lisp_Char_Table, &lrecord_char_table);
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
605 ct->type = ty;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
606 if (ty == CHAR_TABLE_TYPE_SYNTAX)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
607 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
608 ct->mirror_table = Fmake_char_table (Qgeneric);
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 251
diff changeset
609 fill_char_table (XCHAR_TABLE (ct->mirror_table),
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 251
diff changeset
610 make_int (Spunct));
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
611 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
612 else
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
613 ct->mirror_table = Qnil;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
614 ct->next_table = Qnil;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
615 XSETCHAR_TABLE (obj, ct);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
616 if (ty == CHAR_TABLE_TYPE_SYNTAX)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
617 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
618 ct->next_table = Vall_syntax_tables;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
619 Vall_syntax_tables = obj;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
620 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
621 Freset_char_table (obj);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
622 return obj;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
623 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
624
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
625 #ifdef MULE
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
626
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
627 static Lisp_Object
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
628 make_char_table_entry (Lisp_Object initval)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
629 {
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 251
diff changeset
630 Lisp_Object obj;
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
631 int i;
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 400
diff changeset
632 struct Lisp_Char_Table_Entry *cte =
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 400
diff changeset
633 alloc_lcrecord_type (struct Lisp_Char_Table_Entry,
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 400
diff changeset
634 &lrecord_char_table_entry);
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
635
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
636 for (i = 0; i < 96; i++)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
637 cte->level2[i] = initval;
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 251
diff changeset
638
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
639 XSETCHAR_TABLE_ENTRY (obj, cte);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
640 return obj;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
641 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
642
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
643 static Lisp_Object
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
644 copy_char_table_entry (Lisp_Object entry)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
645 {
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 400
diff changeset
646 struct Lisp_Char_Table_Entry *cte = XCHAR_TABLE_ENTRY (entry);
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 251
diff changeset
647 Lisp_Object obj;
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
648 int i;
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 400
diff changeset
649 struct Lisp_Char_Table_Entry *ctenew =
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 400
diff changeset
650 alloc_lcrecord_type (struct Lisp_Char_Table_Entry,
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 400
diff changeset
651 &lrecord_char_table_entry);
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
652
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
653 for (i = 0; i < 96; i++)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
654 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
655 Lisp_Object new = cte->level2[i];
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
656 if (CHAR_TABLE_ENTRYP (new))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
657 ctenew->level2[i] = copy_char_table_entry (new);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
658 else
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
659 ctenew->level2[i] = new;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
660 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
661
249
83b3d10dcba9 Import from CVS: tag r20-5b23
cvs
parents: 207
diff changeset
662 XSETCHAR_TABLE_ENTRY (obj, ctenew);
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
663 return obj;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
664 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
665
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
666 #endif /* MULE */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
667
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
668 DEFUN ("copy-char-table", Fcopy_char_table, 1, 1, 0, /*
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
669 Make a new char table which is a copy of OLD-TABLE.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
670 It will contain the same values for the same characters and ranges
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
671 as OLD-TABLE. The values will not themselves be copied.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
672 */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
673 (old_table))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
674 {
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 400
diff changeset
675 struct Lisp_Char_Table *ct, *ctnew;
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 251
diff changeset
676 Lisp_Object obj;
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
677 int i;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
678
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
679 CHECK_CHAR_TABLE (old_table);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
680 ct = XCHAR_TABLE (old_table);
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 400
diff changeset
681 ctnew = alloc_lcrecord_type (struct Lisp_Char_Table, &lrecord_char_table);
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
682 ctnew->type = ct->type;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
683
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
684 for (i = 0; i < NUM_ASCII_CHARS; i++)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
685 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
686 Lisp_Object new = ct->ascii[i];
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
687 #ifdef MULE
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
688 assert (! (CHAR_TABLE_ENTRYP (new)));
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
689 #endif /* MULE */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
690 ctnew->ascii[i] = new;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
691 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
692
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
693 #ifdef MULE
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
694
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
695 for (i = 0; i < NUM_LEADING_BYTES; i++)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
696 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
697 Lisp_Object new = ct->level1[i];
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
698 if (CHAR_TABLE_ENTRYP (new))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
699 ctnew->level1[i] = copy_char_table_entry (new);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
700 else
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
701 ctnew->level1[i] = new;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
702 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
703
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
704 #endif /* MULE */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
705
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
706 if (CHAR_TABLEP (ct->mirror_table))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
707 ctnew->mirror_table = Fcopy_char_table (ct->mirror_table);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
708 else
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
709 ctnew->mirror_table = ct->mirror_table;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
710 XSETCHAR_TABLE (obj, ctnew);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
711 return obj;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
712 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
713
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
714 static void
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
715 decode_char_table_range (Lisp_Object range, struct chartab_range *outrange)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
716 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
717 if (EQ (range, Qt))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
718 outrange->type = CHARTAB_RANGE_ALL;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
719 else if (CHAR_OR_CHAR_INTP (range))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
720 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
721 outrange->type = CHARTAB_RANGE_CHAR;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
722 outrange->ch = XCHAR_OR_CHAR_INT (range);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
723 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
724 #ifndef MULE
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
725 else
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
726 signal_simple_error ("Range must be t or a character", range);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
727 #else /* MULE */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
728 else if (VECTORP (range))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
729 {
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 400
diff changeset
730 struct Lisp_Vector *vec = XVECTOR (range);
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
731 Lisp_Object *elts = vector_data (vec);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
732 if (vector_length (vec) != 2)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
733 signal_simple_error ("Length of charset row vector must be 2",
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
734 range);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
735 outrange->type = CHARTAB_RANGE_ROW;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
736 outrange->charset = Fget_charset (elts[0]);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
737 CHECK_INT (elts[1]);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
738 outrange->row = XINT (elts[1]);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
739 switch (XCHARSET_TYPE (outrange->charset))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
740 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
741 case CHARSET_TYPE_94:
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
742 case CHARSET_TYPE_96:
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
743 signal_simple_error ("Charset in row vector must be multi-byte",
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
744 outrange->charset);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
745 case CHARSET_TYPE_94X94:
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
746 check_int_range (outrange->row, 33, 126);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
747 break;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
748 case CHARSET_TYPE_96X96:
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
749 check_int_range (outrange->row, 32, 127);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
750 break;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
751 default:
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
752 abort ();
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
753 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
754 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
755 else
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
756 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
757 if (!CHARSETP (range) && !SYMBOLP (range))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
758 signal_simple_error
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
759 ("Char table range must be t, charset, char, or vector", range);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
760 outrange->type = CHARTAB_RANGE_CHARSET;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
761 outrange->charset = Fget_charset (range);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
762 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
763 #endif /* MULE */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
764 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
765
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
766 #ifdef MULE
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
767
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
768 /* called from CHAR_TABLE_VALUE(). */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
769 Lisp_Object
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 400
diff changeset
770 get_non_ascii_char_table_value (struct Lisp_Char_Table *ct, int leading_byte,
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
771 Emchar c)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
772 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
773 Lisp_Object val;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
774 Lisp_Object charset = CHARSET_BY_LEADING_BYTE (leading_byte);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
775 int byte1, byte2;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
776
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
777 BREAKUP_CHAR_1_UNSAFE (c, charset, byte1, byte2);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
778 val = ct->level1[leading_byte - MIN_LEADING_BYTE];
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
779 if (CHAR_TABLE_ENTRYP (val))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
780 {
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 400
diff changeset
781 struct Lisp_Char_Table_Entry *cte = XCHAR_TABLE_ENTRY (val);
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
782 val = cte->level2[byte1 - 32];
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
783 if (CHAR_TABLE_ENTRYP (val))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
784 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
785 cte = XCHAR_TABLE_ENTRY (val);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
786 assert (byte2 >= 32);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
787 val = cte->level2[byte2 - 32];
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
788 assert (!CHAR_TABLE_ENTRYP (val));
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
789 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
790 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
791
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
792 return val;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
793 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
794
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
795 #endif /* MULE */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
796
377
d883f39b8495 Import from CVS: tag r21-2b4
cvs
parents: 371
diff changeset
797 Lisp_Object
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 400
diff changeset
798 get_char_table (Emchar ch, struct Lisp_Char_Table *ct)
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
799 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
800 #ifdef MULE
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
801 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
802 Lisp_Object charset;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
803 int byte1, byte2;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
804 Lisp_Object val;
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
805
104
cf808b4c4290 Import from CVS: tag r20-1b4
cvs
parents: 70
diff changeset
806 BREAKUP_CHAR (ch, charset, byte1, byte2);
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
807
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
808 if (EQ (charset, Vcharset_ascii))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
809 val = ct->ascii[byte1];
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
810 else if (EQ (charset, Vcharset_control_1))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
811 val = ct->ascii[byte1 + 128];
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
812 else
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
813 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
814 int lb = XCHARSET_LEADING_BYTE (charset) - MIN_LEADING_BYTE;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
815 val = ct->level1[lb];
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
816 if (CHAR_TABLE_ENTRYP (val))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
817 {
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 400
diff changeset
818 struct Lisp_Char_Table_Entry *cte = XCHAR_TABLE_ENTRY (val);
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
819 val = cte->level2[byte1 - 32];
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
820 if (CHAR_TABLE_ENTRYP (val))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
821 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
822 cte = XCHAR_TABLE_ENTRY (val);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
823 assert (byte2 >= 32);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
824 val = cte->level2[byte2 - 32];
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
825 assert (!CHAR_TABLE_ENTRYP (val));
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
826 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
827 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
828 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
829
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
830 return val;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
831 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
832 #else /* not MULE */
104
cf808b4c4290 Import from CVS: tag r20-1b4
cvs
parents: 70
diff changeset
833 return ct->ascii[(unsigned char)ch];
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
834 #endif /* not MULE */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
835 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
836
104
cf808b4c4290 Import from CVS: tag r20-1b4
cvs
parents: 70
diff changeset
837
cf808b4c4290 Import from CVS: tag r20-1b4
cvs
parents: 70
diff changeset
838 DEFUN ("get-char-table", Fget_char_table, 2, 2, 0, /*
cf808b4c4290 Import from CVS: tag r20-1b4
cvs
parents: 70
diff changeset
839 Find value for char CH in TABLE.
cf808b4c4290 Import from CVS: tag r20-1b4
cvs
parents: 70
diff changeset
840 */
cf808b4c4290 Import from CVS: tag r20-1b4
cvs
parents: 70
diff changeset
841 (ch, table))
cf808b4c4290 Import from CVS: tag r20-1b4
cvs
parents: 70
diff changeset
842 {
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 400
diff changeset
843 struct Lisp_Char_Table *ct;
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
844
104
cf808b4c4290 Import from CVS: tag r20-1b4
cvs
parents: 70
diff changeset
845 CHECK_CHAR_TABLE (table);
cf808b4c4290 Import from CVS: tag r20-1b4
cvs
parents: 70
diff changeset
846 ct = XCHAR_TABLE (table);
cf808b4c4290 Import from CVS: tag r20-1b4
cvs
parents: 70
diff changeset
847 CHECK_CHAR_COERCE_INT (ch);
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
848
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
849 return get_char_table (XCHAR (ch), ct);
104
cf808b4c4290 Import from CVS: tag r20-1b4
cvs
parents: 70
diff changeset
850 }
cf808b4c4290 Import from CVS: tag r20-1b4
cvs
parents: 70
diff changeset
851
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
852 DEFUN ("get-range-char-table", Fget_range_char_table, 2, 3, 0, /*
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
853 Find value for a range in TABLE.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
854 If there is more than one value, return MULTI (defaults to nil).
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
855 */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
856 (range, table, multi))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
857 {
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 400
diff changeset
858 struct Lisp_Char_Table *ct;
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
859 struct chartab_range rainj;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
860
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
861 if (CHAR_OR_CHAR_INTP (range))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
862 return Fget_char_table (range, table);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
863 CHECK_CHAR_TABLE (table);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
864 ct = XCHAR_TABLE (table);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
865
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
866 decode_char_table_range (range, &rainj);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
867 switch (rainj.type)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
868 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
869 case CHARTAB_RANGE_ALL:
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
870 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
871 int i;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
872 Lisp_Object first = ct->ascii[0];
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
873
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
874 for (i = 1; i < NUM_ASCII_CHARS; i++)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
875 if (!EQ (first, ct->ascii[i]))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
876 return multi;
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
877
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
878 #ifdef MULE
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
879 for (i = MIN_LEADING_BYTE; i < MIN_LEADING_BYTE + NUM_LEADING_BYTES;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
880 i++)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
881 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
882 if (!CHARSETP (CHARSET_BY_LEADING_BYTE (i))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
883 || i == LEADING_BYTE_ASCII
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
884 || i == LEADING_BYTE_CONTROL_1)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
885 continue;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
886 if (!EQ (first, ct->level1[i - MIN_LEADING_BYTE]))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
887 return multi;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
888 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
889 #endif /* MULE */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
890
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
891 return first;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
892 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
893
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
894 #ifdef MULE
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
895 case CHARTAB_RANGE_CHARSET:
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
896 if (EQ (rainj.charset, Vcharset_ascii))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
897 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
898 int i;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
899 Lisp_Object first = ct->ascii[0];
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
900
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
901 for (i = 1; i < 128; i++)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
902 if (!EQ (first, ct->ascii[i]))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
903 return multi;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
904 return first;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
905 }
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
906
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
907 if (EQ (rainj.charset, Vcharset_control_1))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
908 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
909 int i;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
910 Lisp_Object first = ct->ascii[128];
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
911
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
912 for (i = 129; i < 160; i++)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
913 if (!EQ (first, ct->ascii[i]))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
914 return multi;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
915 return first;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
916 }
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
917
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
918 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
919 Lisp_Object val = ct->level1[XCHARSET_LEADING_BYTE (rainj.charset) -
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
920 MIN_LEADING_BYTE];
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
921 if (CHAR_TABLE_ENTRYP (val))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
922 return multi;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
923 return val;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
924 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
925
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
926 case CHARTAB_RANGE_ROW:
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
927 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
928 Lisp_Object val = ct->level1[XCHARSET_LEADING_BYTE (rainj.charset) -
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
929 MIN_LEADING_BYTE];
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
930 if (!CHAR_TABLE_ENTRYP (val))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
931 return val;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
932 val = XCHAR_TABLE_ENTRY (val)->level2[rainj.row - 32];
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
933 if (CHAR_TABLE_ENTRYP (val))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
934 return multi;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
935 return val;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
936 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
937 #endif /* not MULE */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
938
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
939 default:
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
940 abort ();
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
941 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
942
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
943 return Qnil; /* not reached */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
944 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
945
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
946 static int
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
947 check_valid_char_table_value (Lisp_Object value, enum char_table_type type,
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
948 Error_behavior errb)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
949 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
950 switch (type)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
951 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
952 case CHAR_TABLE_TYPE_SYNTAX:
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
953 if (!ERRB_EQ (errb, ERROR_ME))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
954 return INTP (value) || (CONSP (value) && INTP (XCAR (value))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
955 && CHAR_OR_CHAR_INTP (XCDR (value)));
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
956 if (CONSP (value))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
957 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
958 Lisp_Object cdr = XCDR (value);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
959 CHECK_INT (XCAR (value));
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
960 CHECK_CHAR_COERCE_INT (cdr);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
961 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
962 else
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
963 CHECK_INT (value);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
964 break;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
965
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
966 #ifdef MULE
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
967 case CHAR_TABLE_TYPE_CATEGORY:
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
968 if (!ERRB_EQ (errb, ERROR_ME))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
969 return CATEGORY_TABLE_VALUEP (value);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
970 CHECK_CATEGORY_TABLE_VALUE (value);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
971 break;
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
972 #endif /* MULE */
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
973
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
974 case CHAR_TABLE_TYPE_GENERIC:
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
975 return 1;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
976
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
977 case CHAR_TABLE_TYPE_DISPLAY:
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
978 /* #### fix this */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
979 maybe_signal_simple_error ("Display char tables not yet implemented",
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
980 value, Qchar_table, errb);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
981 return 0;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
982
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
983 case CHAR_TABLE_TYPE_CHAR:
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
984 if (!ERRB_EQ (errb, ERROR_ME))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
985 return CHAR_OR_CHAR_INTP (value);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
986 CHECK_CHAR_COERCE_INT (value);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
987 break;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
988
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
989 default:
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
990 abort ();
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
991 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
992
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
993 return 0; /* not reached */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
994 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
995
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
996 static Lisp_Object
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
997 canonicalize_char_table_value (Lisp_Object value, enum char_table_type type)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
998 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
999 switch (type)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1000 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1001 case CHAR_TABLE_TYPE_SYNTAX:
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1002 if (CONSP (value))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1003 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1004 Lisp_Object car = XCAR (value);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1005 Lisp_Object cdr = XCDR (value);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1006 CHECK_CHAR_COERCE_INT (cdr);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1007 return Fcons (car, cdr);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1008 }
377
d883f39b8495 Import from CVS: tag r21-2b4
cvs
parents: 371
diff changeset
1009 break;
d883f39b8495 Import from CVS: tag r21-2b4
cvs
parents: 371
diff changeset
1010 case CHAR_TABLE_TYPE_CHAR:
d883f39b8495 Import from CVS: tag r21-2b4
cvs
parents: 371
diff changeset
1011 CHECK_CHAR_COERCE_INT (value);
d883f39b8495 Import from CVS: tag r21-2b4
cvs
parents: 371
diff changeset
1012 break;
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1013 default:
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1014 break;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1015 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1016 return value;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1017 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1018
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1019 DEFUN ("valid-char-table-value-p", Fvalid_char_table_value_p, 2, 2, 0, /*
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1020 Return non-nil if VALUE is a valid value for CHAR-TABLE-TYPE.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1021 */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1022 (value, char_table_type))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1023 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1024 enum char_table_type type = symbol_to_char_table_type (char_table_type);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1025
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1026 return check_valid_char_table_value (value, type, ERROR_ME_NOT) ? Qt : Qnil;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1027 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1028
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1029 DEFUN ("check-valid-char-table-value", Fcheck_valid_char_table_value, 2, 2, 0, /*
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1030 Signal an error if VALUE is not a valid value for CHAR-TABLE-TYPE.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1031 */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1032 (value, char_table_type))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1033 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1034 enum char_table_type type = symbol_to_char_table_type (char_table_type);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1035
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1036 check_valid_char_table_value (value, type, ERROR_ME);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1037 return Qnil;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1038 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1039
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1040 /* Assign VAL to all characters in RANGE in char table CT. */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1041
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1042 void
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 400
diff changeset
1043 put_char_table (struct Lisp_Char_Table *ct, struct chartab_range *range,
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1044 Lisp_Object val)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1045 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1046 switch (range->type)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1047 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1048 case CHARTAB_RANGE_ALL:
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1049 fill_char_table (ct, val);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1050 return; /* avoid the duplicate call to update_syntax_table() below,
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1051 since fill_char_table() also did that. */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1052
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1053 #ifdef MULE
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1054 case CHARTAB_RANGE_CHARSET:
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1055 if (EQ (range->charset, Vcharset_ascii))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1056 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1057 int i;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1058 for (i = 0; i < 128; i++)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1059 ct->ascii[i] = val;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1060 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1061 else if (EQ (range->charset, Vcharset_control_1))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1062 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1063 int i;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1064 for (i = 128; i < 160; i++)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1065 ct->ascii[i] = val;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1066 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1067 else
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1068 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1069 int lb = XCHARSET_LEADING_BYTE (range->charset) - MIN_LEADING_BYTE;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1070 ct->level1[lb] = val;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1071 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1072 break;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1073
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1074 case CHARTAB_RANGE_ROW:
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1075 {
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 400
diff changeset
1076 struct Lisp_Char_Table_Entry *cte;
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1077 int lb = XCHARSET_LEADING_BYTE (range->charset) - MIN_LEADING_BYTE;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1078 /* make sure that there is a separate entry for the row. */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1079 if (!CHAR_TABLE_ENTRYP (ct->level1[lb]))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1080 ct->level1[lb] = make_char_table_entry (ct->level1[lb]);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1081 cte = XCHAR_TABLE_ENTRY (ct->level1[lb]);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1082 cte->level2[range->row - 32] = val;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1083 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1084 break;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1085 #endif /* MULE */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1086
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1087 case CHARTAB_RANGE_CHAR:
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1088 #ifdef MULE
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1089 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1090 Lisp_Object charset;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1091 int byte1, byte2;
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1092
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1093 BREAKUP_CHAR (range->ch, charset, byte1, byte2);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1094 if (EQ (charset, Vcharset_ascii))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1095 ct->ascii[byte1] = val;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1096 else if (EQ (charset, Vcharset_control_1))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1097 ct->ascii[byte1 + 128] = val;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1098 else
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1099 {
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 400
diff changeset
1100 struct Lisp_Char_Table_Entry *cte;
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1101 int lb = XCHARSET_LEADING_BYTE (charset) - MIN_LEADING_BYTE;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1102 /* make sure that there is a separate entry for the row. */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1103 if (!CHAR_TABLE_ENTRYP (ct->level1[lb]))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1104 ct->level1[lb] = make_char_table_entry (ct->level1[lb]);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1105 cte = XCHAR_TABLE_ENTRY (ct->level1[lb]);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1106 /* now CTE is a char table entry for the charset;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1107 each entry is for a single row (or character of
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1108 a one-octet charset). */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1109 if (XCHARSET_DIMENSION (charset) == 1)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1110 cte->level2[byte1 - 32] = val;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1111 else
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1112 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1113 /* assigning to one character in a two-octet charset. */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1114 /* make sure that the charset row contains a separate
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1115 entry for each character. */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1116 if (!CHAR_TABLE_ENTRYP (cte->level2[byte1 - 32]))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1117 cte->level2[byte1 - 32] =
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1118 make_char_table_entry (cte->level2[byte1 - 32]);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1119 cte = XCHAR_TABLE_ENTRY (cte->level2[byte1 - 32]);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1120 cte->level2[byte2 - 32] = val;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1121 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1122 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1123 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1124 #else /* not MULE */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1125 ct->ascii[(unsigned char) (range->ch)] = val;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1126 break;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1127 #endif /* not MULE */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1128 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1129
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1130 if (ct->type == CHAR_TABLE_TYPE_SYNTAX)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1131 update_syntax_table (ct);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1132 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1133
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1134 DEFUN ("put-char-table", Fput_char_table, 3, 3, 0, /*
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1135 Set the value for chars in RANGE to be VAL in TABLE.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1136
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1137 RANGE specifies one or more characters to be affected and should be
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1138 one of the following:
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1139
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1140 -- t (all characters are affected)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1141 -- A charset (only allowed when Mule support is present)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1142 -- A vector of two elements: a two-octet charset and a row number
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1143 (only allowed when Mule support is present)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1144 -- A single character
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1145
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1146 VAL must be a value appropriate for the type of TABLE.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1147 See `valid-char-table-type-p'.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1148 */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1149 (range, val, table))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1150 {
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 400
diff changeset
1151 struct Lisp_Char_Table *ct;
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1152 struct chartab_range rainj;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1153
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1154 CHECK_CHAR_TABLE (table);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1155 ct = XCHAR_TABLE (table);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1156 check_valid_char_table_value (val, ct->type, ERROR_ME);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1157 decode_char_table_range (range, &rainj);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1158 val = canonicalize_char_table_value (val, ct->type);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1159 put_char_table (ct, &rainj, val);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1160 return Qnil;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1161 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1162
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1163 /* Map FN over the ASCII chars in CT. */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1164
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1165 static int
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 400
diff changeset
1166 map_over_charset_ascii (struct Lisp_Char_Table *ct,
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1167 int (*fn) (struct chartab_range *range,
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1168 Lisp_Object val, void *arg),
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1169 void *arg)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1170 {
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1171 struct chartab_range rainj;
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1172 int i, retval;
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1173 int start = 0;
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1174 #ifdef MULE
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1175 int stop = 128;
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1176 #else
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1177 int stop = 256;
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1178 #endif
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1179
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1180 rainj.type = CHARTAB_RANGE_CHAR;
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1181
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1182 for (i = start, retval = 0; i < stop && retval == 0; i++)
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1183 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1184 rainj.ch = (Emchar) i;
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1185 retval = (fn) (&rainj, ct->ascii[i], arg);
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1186 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1187
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1188 return retval;
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1189 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1190
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1191 #ifdef MULE
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1192
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1193 /* Map FN over the Control-1 chars in CT. */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1194
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1195 static int
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 400
diff changeset
1196 map_over_charset_control_1 (struct Lisp_Char_Table *ct,
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1197 int (*fn) (struct chartab_range *range,
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1198 Lisp_Object val, void *arg),
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1199 void *arg)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1200 {
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1201 struct chartab_range rainj;
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1202 int i, retval;
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1203 int start = 128;
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1204 int stop = start + 32;
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1205
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1206 rainj.type = CHARTAB_RANGE_CHAR;
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1207
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1208 for (i = start, retval = 0; i < stop && retval == 0; i++)
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1209 {
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1210 rainj.ch = (Emchar) (i);
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1211 retval = (fn) (&rainj, ct->ascii[i], arg);
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1212 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1213
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1214 return retval;
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1215 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1216
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1217 /* Map FN over the row ROW of two-byte charset CHARSET.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1218 There must be a separate value for that row in the char table.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1219 CTE specifies the char table entry for CHARSET. */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1220
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1221 static int
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 400
diff changeset
1222 map_over_charset_row (struct Lisp_Char_Table_Entry *cte,
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1223 Lisp_Object charset, int row,
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1224 int (*fn) (struct chartab_range *range,
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1225 Lisp_Object val, void *arg),
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1226 void *arg)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1227 {
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1228 Lisp_Object val = cte->level2[row - 32];
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1229
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1230 if (!CHAR_TABLE_ENTRYP (val))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1231 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1232 struct chartab_range rainj;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1233
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1234 rainj.type = CHARTAB_RANGE_ROW;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1235 rainj.charset = charset;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1236 rainj.row = row;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1237 return (fn) (&rainj, val, arg);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1238 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1239 else
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1240 {
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1241 struct chartab_range rainj;
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1242 int i, retval;
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1243 int charset94_p = (XCHARSET_CHARS (charset) == 94);
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1244 int start = charset94_p ? 33 : 32;
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1245 int stop = charset94_p ? 127 : 128;
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1246
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1247 cte = XCHAR_TABLE_ENTRY (val);
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1248
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1249 rainj.type = CHARTAB_RANGE_CHAR;
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1250
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1251 for (i = start, retval = 0; i < stop && retval == 0; i++)
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1252 {
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1253 rainj.ch = MAKE_CHAR (charset, row, i);
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1254 retval = (fn) (&rainj, cte->level2[i - 32], arg);
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1255 }
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1256 return retval;
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1257 }
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1258 }
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1259
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1260
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1261 static int
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 400
diff changeset
1262 map_over_other_charset (struct Lisp_Char_Table *ct, int lb,
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1263 int (*fn) (struct chartab_range *range,
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1264 Lisp_Object val, void *arg),
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1265 void *arg)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1266 {
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 110
diff changeset
1267 Lisp_Object val = ct->level1[lb - MIN_LEADING_BYTE];
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 110
diff changeset
1268 Lisp_Object charset = CHARSET_BY_LEADING_BYTE (lb);
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1269
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 110
diff changeset
1270 if (!CHARSETP (charset)
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 110
diff changeset
1271 || lb == LEADING_BYTE_ASCII
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1272 || lb == LEADING_BYTE_CONTROL_1)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1273 return 0;
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1274
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1275 if (!CHAR_TABLE_ENTRYP (val))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1276 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1277 struct chartab_range rainj;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1278
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1279 rainj.type = CHARTAB_RANGE_CHARSET;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1280 rainj.charset = charset;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1281 return (fn) (&rainj, val, arg);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1282 }
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1283
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 110
diff changeset
1284 {
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 400
diff changeset
1285 struct Lisp_Char_Table_Entry *cte = XCHAR_TABLE_ENTRY (val);
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 110
diff changeset
1286 int charset94_p = (XCHARSET_CHARS (charset) == 94);
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 110
diff changeset
1287 int start = charset94_p ? 33 : 32;
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 110
diff changeset
1288 int stop = charset94_p ? 127 : 128;
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 110
diff changeset
1289 int i, retval;
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1290
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 110
diff changeset
1291 if (XCHARSET_DIMENSION (charset) == 1)
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1292 {
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1293 struct chartab_range rainj;
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1294 rainj.type = CHARTAB_RANGE_CHAR;
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1295
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1296 for (i = start, retval = 0; i < stop && retval == 0; i++)
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1297 {
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1298 rainj.ch = MAKE_CHAR (charset, i, 0);
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1299 retval = (fn) (&rainj, cte->level2[i - 32], arg);
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1300 }
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1301 }
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 110
diff changeset
1302 else
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1303 {
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1304 for (i = start, retval = 0; i < stop && retval == 0; i++)
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 110
diff changeset
1305 retval = map_over_charset_row (cte, charset, i, fn, arg);
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1306 }
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1307
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1308 return retval;
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 110
diff changeset
1309 }
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1310 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1311
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1312 #endif /* MULE */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1313
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1314 /* Map FN (with client data ARG) over range RANGE in char table CT.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1315 Mapping stops the first time FN returns non-zero, and that value
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1316 becomes the return value of map_char_table(). */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1317
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1318 int
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 400
diff changeset
1319 map_char_table (struct Lisp_Char_Table *ct,
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1320 struct chartab_range *range,
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1321 int (*fn) (struct chartab_range *range,
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1322 Lisp_Object val, void *arg),
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1323 void *arg)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1324 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1325 switch (range->type)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1326 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1327 case CHARTAB_RANGE_ALL:
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1328 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1329 int retval;
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1330
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1331 retval = map_over_charset_ascii (ct, fn, arg);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1332 if (retval)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1333 return retval;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1334 #ifdef MULE
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1335 retval = map_over_charset_control_1 (ct, fn, arg);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1336 if (retval)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1337 return retval;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1338 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1339 int i;
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1340 int start = MIN_LEADING_BYTE;
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1341 int stop = start + NUM_LEADING_BYTES;
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1342
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1343 for (i = start, retval = 0; i < stop && retval == 0; i++)
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1344 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1345 retval = map_over_other_charset (ct, i, fn, arg);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1346 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1347 }
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 110
diff changeset
1348 #endif /* MULE */
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1349 return retval;
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1350 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1351
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1352 #ifdef MULE
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1353 case CHARTAB_RANGE_CHARSET:
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1354 return map_over_other_charset (ct,
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1355 XCHARSET_LEADING_BYTE (range->charset),
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1356 fn, arg);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1357
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1358 case CHARTAB_RANGE_ROW:
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1359 {
104
cf808b4c4290 Import from CVS: tag r20-1b4
cvs
parents: 70
diff changeset
1360 Lisp_Object val = ct->level1[XCHARSET_LEADING_BYTE (range->charset) - MIN_LEADING_BYTE];
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1361 if (!CHAR_TABLE_ENTRYP (val))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1362 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1363 struct chartab_range rainj;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1364
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1365 rainj.type = CHARTAB_RANGE_ROW;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1366 rainj.charset = range->charset;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1367 rainj.row = range->row;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1368 return (fn) (&rainj, val, arg);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1369 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1370 else
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1371 return map_over_charset_row (XCHAR_TABLE_ENTRY (val),
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1372 range->charset, range->row,
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1373 fn, arg);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1374 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1375 #endif /* MULE */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1376
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1377 case CHARTAB_RANGE_CHAR:
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1378 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1379 Emchar ch = range->ch;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1380 Lisp_Object val = CHAR_TABLE_VALUE_UNSAFE (ct, ch);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1381 struct chartab_range rainj;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1382
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1383 rainj.type = CHARTAB_RANGE_CHAR;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1384 rainj.ch = ch;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1385 return (fn) (&rainj, val, arg);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1386 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1387
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1388 default:
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1389 abort ();
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1390 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1391
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1392 return 0;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1393 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1394
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1395 struct slow_map_char_table_arg
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1396 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1397 Lisp_Object function;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1398 Lisp_Object retval;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1399 };
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1400
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1401 static int
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1402 slow_map_char_table_fun (struct chartab_range *range,
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1403 Lisp_Object val, void *arg)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1404 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1405 Lisp_Object ranjarg = Qnil;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1406 struct slow_map_char_table_arg *closure =
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1407 (struct slow_map_char_table_arg *) arg;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1408
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1409 switch (range->type)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1410 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1411 case CHARTAB_RANGE_ALL:
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1412 ranjarg = Qt;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1413 break;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1414
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1415 #ifdef MULE
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1416 case CHARTAB_RANGE_CHARSET:
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1417 ranjarg = XCHARSET_NAME (range->charset);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1418 break;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1419
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1420 case CHARTAB_RANGE_ROW:
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1421 ranjarg = vector2 (XCHARSET_NAME (range->charset),
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1422 make_int (range->row));
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1423 break;
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1424 #endif /* MULE */
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1425 case CHARTAB_RANGE_CHAR:
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1426 ranjarg = make_char (range->ch);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1427 break;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1428 default:
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1429 abort ();
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1430 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1431
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1432 closure->retval = call2 (closure->function, ranjarg, val);
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1433 return !NILP (closure->retval);
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1434 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1435
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1436 DEFUN ("map-char-table", Fmap_char_table, 2, 3, 0, /*
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1437 Map FUNCTION over entries in TABLE, calling it with two args,
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1438 each key and value in the table.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1439
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1440 RANGE specifies a subrange to map over and is in the same format as
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1441 the RANGE argument to `put-range-table'. If omitted or t, it defaults to
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1442 the entire table.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1443 */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1444 (function, table, range))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1445 {
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 400
diff changeset
1446 struct Lisp_Char_Table *ct;
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1447 struct slow_map_char_table_arg slarg;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1448 struct gcpro gcpro1, gcpro2;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1449 struct chartab_range rainj;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1450
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1451 CHECK_CHAR_TABLE (table);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1452 ct = XCHAR_TABLE (table);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1453 if (NILP (range))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1454 range = Qt;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1455 decode_char_table_range (range, &rainj);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1456 slarg.function = function;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1457 slarg.retval = Qnil;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1458 GCPRO2 (slarg.function, slarg.retval);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1459 map_char_table (ct, &rainj, slow_map_char_table_fun, &slarg);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1460 UNGCPRO;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1461
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1462 return slarg.retval;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1463 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1464
104
cf808b4c4290 Import from CVS: tag r20-1b4
cvs
parents: 70
diff changeset
1465
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1466
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1467 /************************************************************************/
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1468 /* Char table read syntax */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1469 /************************************************************************/
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1470
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1471 static int
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1472 chartab_type_validate (Lisp_Object keyword, Lisp_Object value,
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1473 Error_behavior errb)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1474 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1475 /* #### should deal with ERRB */
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1476 symbol_to_char_table_type (value);
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1477 return 1;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1478 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1479
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1480 static int
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1481 chartab_data_validate (Lisp_Object keyword, Lisp_Object value,
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1482 Error_behavior errb)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1483 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1484 Lisp_Object rest;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1485
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1486 /* #### should deal with ERRB */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1487 EXTERNAL_LIST_LOOP (rest, value)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1488 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1489 Lisp_Object range = XCAR (rest);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1490 struct chartab_range dummy;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1491
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1492 rest = XCDR (rest);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1493 if (!CONSP (rest))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1494 signal_simple_error ("Invalid list format", value);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1495 if (CONSP (range))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1496 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1497 if (!CONSP (XCDR (range))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1498 || !NILP (XCDR (XCDR (range))))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1499 signal_simple_error ("Invalid range format", range);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1500 decode_char_table_range (XCAR (range), &dummy);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1501 decode_char_table_range (XCAR (XCDR (range)), &dummy);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1502 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1503 else
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1504 decode_char_table_range (range, &dummy);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1505 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1506
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1507 return 1;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1508 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1509
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1510 static Lisp_Object
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1511 chartab_instantiate (Lisp_Object data)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1512 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1513 Lisp_Object chartab;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1514 Lisp_Object type = Qgeneric;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1515 Lisp_Object dataval = Qnil;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1516
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1517 while (!NILP (data))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1518 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1519 Lisp_Object keyw = Fcar (data);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1520 Lisp_Object valw;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1521
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1522 data = Fcdr (data);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1523 valw = Fcar (data);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1524 data = Fcdr (data);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1525 if (EQ (keyw, Qtype))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1526 type = valw;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1527 else if (EQ (keyw, Qdata))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1528 dataval = valw;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1529 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1530
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1531 chartab = Fmake_char_table (type);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1532
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1533 data = dataval;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1534 while (!NILP (data))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1535 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1536 Lisp_Object range = Fcar (data);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1537 Lisp_Object val = Fcar (Fcdr (data));
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1538
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1539 data = Fcdr (Fcdr (data));
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1540 if (CONSP (range))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1541 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1542 if (CHAR_OR_CHAR_INTP (XCAR (range)))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1543 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1544 Emchar first = XCHAR_OR_CHAR_INT (Fcar (range));
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1545 Emchar last = XCHAR_OR_CHAR_INT (Fcar (Fcdr (range)));
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1546 Emchar i;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1547
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1548 for (i = first; i <= last; i++)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1549 Fput_char_table (make_char (i), val, chartab);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1550 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1551 else
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1552 abort ();
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1553 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1554 else
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1555 Fput_char_table (range, val, chartab);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1556 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1557
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1558 return chartab;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1559 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1560
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1561 #ifdef MULE
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1562
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1563
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1564 /************************************************************************/
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1565 /* Category Tables, specifically */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1566 /************************************************************************/
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1567
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1568 DEFUN ("category-table-p", Fcategory_table_p, 1, 1, 0, /*
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1569 Return t if ARG is a category table.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1570 A category table is a type of char table used for keeping track of
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1571 categories. Categories are used for classifying characters for use
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1572 in regexps -- you can refer to a category rather than having to use
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1573 a complicated [] expression (and category lookups are significantly
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1574 faster).
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1575
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1576 There are 95 different categories available, one for each printable
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1577 character (including space) in the ASCII charset. Each category
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
1578 is designated by one such character, called a "category designator".
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
1579 They are specified in a regexp using the syntax "\\cX", where X is
104
cf808b4c4290 Import from CVS: tag r20-1b4
cvs
parents: 70
diff changeset
1580 a category designator.
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1581
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1582 A category table specifies, for each character, the categories that
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1583 the character is in. Note that a character can be in more than one
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1584 category. More specifically, a category table maps from a character
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1585 to either the value nil (meaning the character is in no categories)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1586 or a 95-element bit vector, specifying for each of the 95 categories
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1587 whether the character is in that category.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1588
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1589 Special Lisp functions are provided that abstract this, so you do not
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1590 have to directly manipulate bit vectors.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1591 */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1592 (obj))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1593 {
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1594 return (CHAR_TABLEP (obj) &&
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1595 XCHAR_TABLE_TYPE (obj) == CHAR_TABLE_TYPE_CATEGORY) ?
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1596 Qt : Qnil;
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1597 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1598
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1599 static Lisp_Object
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1600 check_category_table (Lisp_Object obj, Lisp_Object def)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1601 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1602 if (NILP (obj))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1603 obj = def;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1604 while (NILP (Fcategory_table_p (obj)))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1605 obj = wrong_type_argument (Qcategory_table_p, obj);
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1606 return obj;
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1607 }
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1608
104
cf808b4c4290 Import from CVS: tag r20-1b4
cvs
parents: 70
diff changeset
1609 int
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1610 check_category_char (Emchar ch, Lisp_Object table,
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1611 unsigned int designator, unsigned int not)
104
cf808b4c4290 Import from CVS: tag r20-1b4
cvs
parents: 70
diff changeset
1612 {
203
850242ba4a81 Import from CVS: tag r20-3b28
cvs
parents: 185
diff changeset
1613 REGISTER Lisp_Object temp;
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 400
diff changeset
1614 struct Lisp_Char_Table *ctbl;
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 104
diff changeset
1615 #ifdef ERROR_CHECK_TYPECHECK
104
cf808b4c4290 Import from CVS: tag r20-1b4
cvs
parents: 70
diff changeset
1616 if (NILP (Fcategory_table_p (table)))
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1617 signal_simple_error ("Expected category table", table);
104
cf808b4c4290 Import from CVS: tag r20-1b4
cvs
parents: 70
diff changeset
1618 #endif
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1619 ctbl = XCHAR_TABLE (table);
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1620 temp = get_char_table (ch, ctbl);
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 251
diff changeset
1621 if (NILP (temp))
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 251
diff changeset
1622 return not;
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1623
104
cf808b4c4290 Import from CVS: tag r20-1b4
cvs
parents: 70
diff changeset
1624 designator -= ' ';
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1625 return bit_vector_bit (XBIT_VECTOR (temp), designator) ? !not : not;
104
cf808b4c4290 Import from CVS: tag r20-1b4
cvs
parents: 70
diff changeset
1626 }
cf808b4c4290 Import from CVS: tag r20-1b4
cvs
parents: 70
diff changeset
1627
cf808b4c4290 Import from CVS: tag r20-1b4
cvs
parents: 70
diff changeset
1628 DEFUN ("check-category-at", Fcheck_category_at, 2, 4, 0, /*
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 104
diff changeset
1629 Return t if category of a character at POS includes DESIGNATOR,
104
cf808b4c4290 Import from CVS: tag r20-1b4
cvs
parents: 70
diff changeset
1630 else return nil. Optional third arg specifies which buffer
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 251
diff changeset
1631 \(defaulting to current), and fourth specifies the CATEGORY-TABLE,
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 251
diff changeset
1632 \(defaulting to the buffer's category table).
104
cf808b4c4290 Import from CVS: tag r20-1b4
cvs
parents: 70
diff changeset
1633 */
cf808b4c4290 Import from CVS: tag r20-1b4
cvs
parents: 70
diff changeset
1634 (pos, designator, buffer, category_table))
cf808b4c4290 Import from CVS: tag r20-1b4
cvs
parents: 70
diff changeset
1635 {
cf808b4c4290 Import from CVS: tag r20-1b4
cvs
parents: 70
diff changeset
1636 Lisp_Object ctbl;
cf808b4c4290 Import from CVS: tag r20-1b4
cvs
parents: 70
diff changeset
1637 Emchar ch;
cf808b4c4290 Import from CVS: tag r20-1b4
cvs
parents: 70
diff changeset
1638 unsigned int des;
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1639 struct buffer *buf = decode_buffer (buffer, 0);
104
cf808b4c4290 Import from CVS: tag r20-1b4
cvs
parents: 70
diff changeset
1640
cf808b4c4290 Import from CVS: tag r20-1b4
cvs
parents: 70
diff changeset
1641 CHECK_INT (pos);
cf808b4c4290 Import from CVS: tag r20-1b4
cvs
parents: 70
diff changeset
1642 CHECK_CATEGORY_DESIGNATOR (designator);
207
e45d5e7c476e Import from CVS: tag r20-4b2
cvs
parents: 203
diff changeset
1643 des = XCHAR (designator);
104
cf808b4c4290 Import from CVS: tag r20-1b4
cvs
parents: 70
diff changeset
1644 ctbl = check_category_table (category_table, Vstandard_category_table);
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1645 ch = BUF_FETCH_CHAR (buf, XINT (pos));
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1646 return check_category_char (ch, ctbl, des, 0) ? Qt : Qnil;
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 104
diff changeset
1647 }
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 104
diff changeset
1648
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 104
diff changeset
1649 DEFUN ("char-in-category-p", Fchar_in_category_p, 2, 3, 0, /*
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1650 Return t if category of character CHR includes DESIGNATOR, else nil.
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1651 Optional third arg specifies the CATEGORY-TABLE to use,
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 104
diff changeset
1652 which defaults to the system default table.
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 104
diff changeset
1653 */
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 104
diff changeset
1654 (chr, designator, category_table))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 104
diff changeset
1655 {
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 104
diff changeset
1656 Lisp_Object ctbl;
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 104
diff changeset
1657 Emchar ch;
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 104
diff changeset
1658 unsigned int des;
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 104
diff changeset
1659
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 104
diff changeset
1660 CHECK_CATEGORY_DESIGNATOR (designator);
207
e45d5e7c476e Import from CVS: tag r20-4b2
cvs
parents: 203
diff changeset
1661 des = XCHAR (designator);
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1662 CHECK_CHAR (chr);
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1663 ch = XCHAR (chr);
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 104
diff changeset
1664 ctbl = check_category_table (category_table, Vstandard_category_table);
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 181
diff changeset
1665 return check_category_char (ch, ctbl, des, 0) ? Qt : Qnil;
104
cf808b4c4290 Import from CVS: tag r20-1b4
cvs
parents: 70
diff changeset
1666 }
cf808b4c4290 Import from CVS: tag r20-1b4
cvs
parents: 70
diff changeset
1667
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1668 DEFUN ("category-table", Fcategory_table, 0, 1, 0, /*
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1669 Return the current category table.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1670 This is the one specified by the current buffer, or by BUFFER if it
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1671 is non-nil.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1672 */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1673 (buffer))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1674 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1675 return decode_buffer (buffer, 0)->category_table;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1676 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1677
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1678 DEFUN ("standard-category-table", Fstandard_category_table, 0, 0, 0, /*
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1679 Return the standard category table.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1680 This is the one used for new buffers.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1681 */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1682 ())
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1683 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1684 return Vstandard_category_table;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1685 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1686
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1687 DEFUN ("copy-category-table", Fcopy_category_table, 0, 1, 0, /*
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1688 Construct a new category table and return it.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1689 It is a copy of the TABLE, which defaults to the standard category table.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1690 */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1691 (table))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1692 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1693 if (NILP (Vstandard_category_table))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1694 return Fmake_char_table (Qcategory);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1695
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1696 table = check_category_table (table, Vstandard_category_table);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1697 return Fcopy_char_table (table);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1698 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1699
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1700 DEFUN ("set-category-table", Fset_category_table, 1, 2, 0, /*
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1701 Select a new category table for BUFFER.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1702 One argument, a category table.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1703 BUFFER defaults to the current buffer if omitted.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1704 */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1705 (table, buffer))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1706 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1707 struct buffer *buf = decode_buffer (buffer, 0);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1708 table = check_category_table (table, Qnil);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1709 buf->category_table = table;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1710 /* Indicate that this buffer now has a specified category table. */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1711 buf->local_var_flags |= XINT (buffer_local_flags.category_table);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1712 return table;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1713 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1714
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1715 DEFUN ("category-designator-p", Fcategory_designator_p, 1, 1, 0, /*
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1716 Return t if ARG is a category designator (a char in the range ' ' to '~').
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1717 */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1718 (obj))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1719 {
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 110
diff changeset
1720 return CATEGORY_DESIGNATORP (obj) ? Qt : Qnil;
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1721 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1722
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1723 DEFUN ("category-table-value-p", Fcategory_table_value_p, 1, 1, 0, /*
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1724 Return t if ARG is a category table value.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1725 Valid values are nil or a bit vector of size 95.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1726 */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1727 (obj))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1728 {
181
bfd6434d15b3 Import from CVS: tag r20-3b17
cvs
parents: 110
diff changeset
1729 return CATEGORY_TABLE_VALUEP (obj) ? Qt : Qnil;
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1730 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1731
420
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1732
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1733 #define CATEGORYP(x) \
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1734 (CHARP ((x)) && XCHAR ((x)) >= 0x20 && XCHAR ((x)) <= 0x7E)
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1735
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1736 #define CATEGORY_SET(c) \
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1737 (get_char_table(c, XCHAR_TABLE(current_buffer->category_table)))
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1738
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1739 /* Return 1 if CATEGORY_SET contains CATEGORY, else return 0.
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1740 The faster version of `!NILP (Faref (category_set, category))'. */
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1741 #define CATEGORY_MEMBER(category, category_set) \
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1742 (bit_vector_bit(XBIT_VECTOR (category_set), category - 32))
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1743
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1744 /* Return 1 if there is a word boundary between two word-constituent
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1745 characters C1 and C2 if they appear in this order, else return 0.
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1746 Use the macro WORD_BOUNDARY_P instead of calling this function
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1747 directly. */
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1748
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1749 int
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1750 word_boundary_p (Emchar c1, Emchar c2)
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1751 {
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1752 Lisp_Object category_set1, category_set2;
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1753 Lisp_Object tail;
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1754 int default_result;
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1755
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1756 #if 0
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1757 if (COMPOSITE_CHAR_P (c1))
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1758 c1 = cmpchar_component (c1, 0, 1);
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1759 if (COMPOSITE_CHAR_P (c2))
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1760 c2 = cmpchar_component (c2, 0, 1);
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1761 #endif
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1762
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1763 if (EQ (CHAR_CHARSET (c1), CHAR_CHARSET (c2)))
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1764 {
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1765 tail = Vword_separating_categories;
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1766 default_result = 0;
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1767 }
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1768 else
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1769 {
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1770 tail = Vword_combining_categories;
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1771 default_result = 1;
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1772 }
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1773
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1774 category_set1 = CATEGORY_SET (c1);
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1775 if (NILP (category_set1))
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1776 return default_result;
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1777 category_set2 = CATEGORY_SET (c2);
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1778 if (NILP (category_set2))
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1779 return default_result;
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1780
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1781 for (; CONSP (tail); tail = XCONS (tail)->cdr)
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1782 {
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1783 Lisp_Object elt = XCONS(tail)->car;
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1784
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1785 if (CONSP (elt)
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1786 && CATEGORYP (XCONS (elt)->car)
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1787 && CATEGORYP (XCONS (elt)->cdr)
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1788 && CATEGORY_MEMBER (XCHAR (XCONS (elt)->car), category_set1)
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1789 && CATEGORY_MEMBER (XCHAR (XCONS (elt)->cdr), category_set2))
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1790 return !default_result;
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1791 }
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1792 return default_result;
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1793 }
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1794 #endif /* MULE */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1795
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1796
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1797 void
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1798 syms_of_chartab (void)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1799 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1800 #ifdef MULE
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1801 defsymbol (&Qcategory_table_p, "category-table-p");
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1802 defsymbol (&Qcategory_designator_p, "category-designator-p");
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1803 defsymbol (&Qcategory_table_value_p, "category-table-value-p");
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1804 #endif /* MULE */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1805
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1806 defsymbol (&Qchar_table, "char-table");
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1807 defsymbol (&Qchar_tablep, "char-table-p");
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1808
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1809 DEFSUBR (Fchar_table_p);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1810 DEFSUBR (Fchar_table_type_list);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1811 DEFSUBR (Fvalid_char_table_type_p);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1812 DEFSUBR (Fchar_table_type);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1813 DEFSUBR (Freset_char_table);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1814 DEFSUBR (Fmake_char_table);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1815 DEFSUBR (Fcopy_char_table);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1816 DEFSUBR (Fget_char_table);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1817 DEFSUBR (Fget_range_char_table);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1818 DEFSUBR (Fvalid_char_table_value_p);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1819 DEFSUBR (Fcheck_valid_char_table_value);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1820 DEFSUBR (Fput_char_table);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1821 DEFSUBR (Fmap_char_table);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1822
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1823 #ifdef MULE
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1824 DEFSUBR (Fcategory_table_p);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1825 DEFSUBR (Fcategory_table);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1826 DEFSUBR (Fstandard_category_table);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1827 DEFSUBR (Fcopy_category_table);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1828 DEFSUBR (Fset_category_table);
104
cf808b4c4290 Import from CVS: tag r20-1b4
cvs
parents: 70
diff changeset
1829 DEFSUBR (Fcheck_category_at);
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 104
diff changeset
1830 DEFSUBR (Fchar_in_category_p);
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1831 DEFSUBR (Fcategory_designator_p);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1832 DEFSUBR (Fcategory_table_value_p);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1833 #endif /* MULE */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1834
414
da8ed4261e83 Import from CVS: tag r21-2-15
cvs
parents: 412
diff changeset
1835 }
da8ed4261e83 Import from CVS: tag r21-2-15
cvs
parents: 412
diff changeset
1836
da8ed4261e83 Import from CVS: tag r21-2-15
cvs
parents: 412
diff changeset
1837 void
da8ed4261e83 Import from CVS: tag r21-2-15
cvs
parents: 412
diff changeset
1838 vars_of_chartab (void)
da8ed4261e83 Import from CVS: tag r21-2-15
cvs
parents: 412
diff changeset
1839 {
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1840 /* DO NOT staticpro this. It works just like Vweak_hash_tables. */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1841 Vall_syntax_tables = Qnil;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1842 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1843
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1844 void
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1845 structure_type_create_chartab (void)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1846 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1847 struct structure_type *st;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1848
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1849 st = define_structure_type (Qchar_table, 0, chartab_instantiate);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1850
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1851 define_structure_type_keyword (st, Qtype, chartab_type_validate);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1852 define_structure_type_keyword (st, Qdata, chartab_data_validate);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1853 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1854
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1855 void
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1856 complex_vars_of_chartab (void)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1857 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1858 #ifdef MULE
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1859 /* Set this now, so first buffer creation can refer to it. */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1860 /* Make it nil before calling copy-category-table
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1861 so that copy-category-table will know not to try to copy from garbage */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1862 Vstandard_category_table = Qnil;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1863 Vstandard_category_table = Fcopy_category_table (Qnil);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1864 staticpro (&Vstandard_category_table);
420
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1865
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1866 DEFVAR_LISP ("word-combining-categories", &Vword_combining_categories /*
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1867 List of pair (cons) of categories to determine word boundary.
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1868
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1869 Emacs treats a sequence of word constituent characters as a single
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1870 word (i.e. finds no word boundary between them) iff they belongs to
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1871 the same charset. But, exceptions are allowed in the following cases.
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1872
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1873 (1) The case that characters are in different charsets is controlled
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1874 by the variable `word-combining-categories'.
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1875
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1876 Emacs finds no word boundary between characters of different charsets
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1877 if they have categories matching some element of this list.
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1878
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1879 More precisely, if an element of this list is a cons of category CAT1
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1880 and CAT2, and a multibyte character C1 which has CAT1 is followed by
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1881 C2 which has CAT2, there's no word boundary between C1 and C2.
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1882
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1883 For instance, to tell that ASCII characters and Latin-1 characters can
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1884 form a single word, the element `(?l . ?l)' should be in this list
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1885 because both characters have the category `l' (Latin characters).
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1886
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1887 (2) The case that character are in the same charset is controlled by
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1888 the variable `word-separating-categories'.
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1889
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1890 Emacs find a word boundary between characters of the same charset
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1891 if they have categories matching some element of this list.
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1892
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1893 More precisely, if an element of this list is a cons of category CAT1
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1894 and CAT2, and a multibyte character C1 which has CAT1 is followed by
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1895 C2 which has CAT2, there's a word boundary between C1 and C2.
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1896
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1897 For instance, to tell that there's a word boundary between Japanese
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1898 Hiragana and Japanese Kanji (both are in the same charset), the
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1899 element `(?H . ?C) should be in this list.
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1900 */ );
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1901
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1902 Vword_combining_categories = Qnil;
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1903
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1904 DEFVAR_LISP ("word-separating-categories", &Vword_separating_categories /*
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1905 List of pair (cons) of categories to determine word boundary.
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1906 See the documentation of the variable `word-combining-categories'.
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1907 */ );
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1908
41dbb7a9d5f2 Import from CVS: tag r21-2-18
cvs
parents: 414
diff changeset
1909 Vword_separating_categories = Qnil;
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1910 #endif /* MULE */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1911 }