/* Rewritten by Ben Wing <ben@xemacs.org>. */
#include <config.h>
+#ifdef UTF2000
+#include <limits.h>
+#endif
#include "lisp.h"
#include "buffer.h"
#ifdef UTF2000
+#define BT_UINT8_MIN 0
+#define BT_UINT8_MAX (UCHAR_MAX - 3)
+#define BT_UINT8_t (UCHAR_MAX - 2)
+#define BT_UINT8_nil (UCHAR_MAX - 1)
+#define BT_UINT8_unbound UCHAR_MAX
+
+INLINE_HEADER int INT_UINT8_P (Lisp_Object obj);
+INLINE_HEADER int UINT8_VALUE_P (Lisp_Object obj);
+INLINE_HEADER unsigned char UINT8_ENCODE (Lisp_Object obj);
+INLINE_HEADER Lisp_Object UINT8_DECODE (unsigned char n);
+INLINE_HEADER unsigned short UINT8_TO_UINT16 (unsigned char n);
+
+INLINE_HEADER int
+INT_UINT8_P (Lisp_Object obj)
+{
+ if (INTP (obj))
+ {
+ int num = XINT (obj);
+
+ return (BT_UINT8_MIN <= num) && (num <= BT_UINT8_MAX);
+ }
+ else
+ return 0;
+}
+
+INLINE_HEADER int
+UINT8_VALUE_P (Lisp_Object obj)
+{
+ return EQ (obj, Qunbound)
+ || EQ (obj, Qnil) || EQ (obj, Qt) || INT_UINT8_P (obj);
+}
+
+INLINE_HEADER unsigned char
+UINT8_ENCODE (Lisp_Object obj)
+{
+ if (EQ (obj, Qunbound))
+ return BT_UINT8_unbound;
+ else if (EQ (obj, Qnil))
+ return BT_UINT8_nil;
+ else if (EQ (obj, Qt))
+ return BT_UINT8_t;
+ else
+ return XINT (obj);
+}
+
+INLINE_HEADER Lisp_Object
+UINT8_DECODE (unsigned char n)
+{
+ if (n == BT_UINT8_unbound)
+ return Qunbound;
+ else if (n == BT_UINT8_nil)
+ return Qnil;
+ else if (n == BT_UINT8_t)
+ return Qt;
+ else
+ return make_int (n);
+}
+
+static Lisp_Object
+mark_uint8_byte_table (Lisp_Object obj)
+{
+ return Qnil;
+}
+
+static void
+print_uint8_byte_table (Lisp_Object obj,
+ Lisp_Object printcharfun, int escapeflag)
+{
+ Lisp_Uint8_Byte_Table *bte = XUINT8_BYTE_TABLE (obj);
+ int i;
+ struct gcpro gcpro1, gcpro2;
+ GCPRO2 (obj, printcharfun);
+
+ write_c_string ("\n#<uint8-byte-table", printcharfun);
+ for (i = 0; i < 256; i++)
+ {
+ unsigned char n = bte->property[i];
+ if ( (i & 15) == 0 )
+ write_c_string ("\n ", printcharfun);
+ write_c_string (" ", printcharfun);
+ if (n == BT_UINT8_unbound)
+ write_c_string ("void", printcharfun);
+ else if (n == BT_UINT8_nil)
+ write_c_string ("nil", printcharfun);
+ else if (n == BT_UINT8_t)
+ write_c_string ("t", printcharfun);
+ else
+ {
+ char buf[4];
+
+ sprintf (buf, "%hd", n);
+ write_c_string (buf, printcharfun);
+ }
+ }
+ UNGCPRO;
+ write_c_string (">", printcharfun);
+}
+
+static int
+uint8_byte_table_equal (Lisp_Object obj1, Lisp_Object obj2, int depth)
+{
+ Lisp_Uint8_Byte_Table *te1 = XUINT8_BYTE_TABLE (obj1);
+ Lisp_Uint8_Byte_Table *te2 = XUINT8_BYTE_TABLE (obj2);
+ int i;
+
+ for (i = 0; i < 256; i++)
+ if (te1->property[i] != te2->property[i])
+ return 0;
+ return 1;
+}
+
+static unsigned long
+uint8_byte_table_hash (Lisp_Object obj, int depth)
+{
+ Lisp_Uint8_Byte_Table *te = XUINT8_BYTE_TABLE (obj);
+ int i;
+ hashcode_t hash = 0;
+
+ for (i = 0; i < 256; i++)
+ hash = HASH2 (hash, te->property[i]);
+ return hash;
+}
+
+DEFINE_LRECORD_IMPLEMENTATION ("uint8-byte-table", uint8_byte_table,
+ mark_uint8_byte_table,
+ print_uint8_byte_table,
+ 0, uint8_byte_table_equal,
+ uint8_byte_table_hash,
+ 0 /* uint8_byte_table_description */,
+ Lisp_Uint8_Byte_Table);
+
+static Lisp_Object
+make_uint8_byte_table (unsigned char initval)
+{
+ Lisp_Object obj;
+ int i;
+ Lisp_Uint8_Byte_Table *cte;
+
+ cte = alloc_lcrecord_type (Lisp_Uint8_Byte_Table,
+ &lrecord_uint8_byte_table);
+
+ for (i = 0; i < 256; i++)
+ cte->property[i] = initval;
+
+ XSETUINT8_BYTE_TABLE (obj, cte);
+ return obj;
+}
+
+static int
+uint8_byte_table_same_value_p (Lisp_Object obj)
+{
+ Lisp_Uint8_Byte_Table *bte = XUINT8_BYTE_TABLE (obj);
+ unsigned char v0 = bte->property[0];
+ int i;
+
+ for (i = 1; i < 256; i++)
+ {
+ if (bte->property[i] != v0)
+ return 0;
+ }
+ return -1;
+}
+
+
+#define BT_UINT16_MIN 0
+#define BT_UINT16_MAX (USHRT_MAX - 3)
+#define BT_UINT16_t (USHRT_MAX - 2)
+#define BT_UINT16_nil (USHRT_MAX - 1)
+#define BT_UINT16_unbound USHRT_MAX
+
+INLINE_HEADER int INT_UINT16_P (Lisp_Object obj);
+INLINE_HEADER int UINT16_VALUE_P (Lisp_Object obj);
+INLINE_HEADER unsigned short UINT16_ENCODE (Lisp_Object obj);
+INLINE_HEADER Lisp_Object UINT16_DECODE (unsigned short us);
+
+INLINE_HEADER int
+INT_UINT16_P (Lisp_Object obj)
+{
+ if (INTP (obj))
+ {
+ int num = XINT (obj);
+
+ return (BT_UINT16_MIN <= num) && (num <= BT_UINT16_MAX);
+ }
+ else
+ return 0;
+}
+
+INLINE_HEADER int
+UINT16_VALUE_P (Lisp_Object obj)
+{
+ return EQ (obj, Qunbound)
+ || EQ (obj, Qnil) || EQ (obj, Qt) || INT_UINT16_P (obj);
+}
+
+INLINE_HEADER unsigned short
+UINT16_ENCODE (Lisp_Object obj)
+{
+ if (EQ (obj, Qunbound))
+ return BT_UINT16_unbound;
+ else if (EQ (obj, Qnil))
+ return BT_UINT16_nil;
+ else if (EQ (obj, Qt))
+ return BT_UINT16_t;
+ else
+ return XINT (obj);
+}
+
+INLINE_HEADER Lisp_Object
+UINT16_DECODE (unsigned short n)
+{
+ if (n == BT_UINT16_unbound)
+ return Qunbound;
+ else if (n == BT_UINT16_nil)
+ return Qnil;
+ else if (n == BT_UINT16_t)
+ return Qt;
+ else
+ return make_int (n);
+}
+
+INLINE_HEADER unsigned short
+UINT8_TO_UINT16 (unsigned char n)
+{
+ if (n == BT_UINT8_unbound)
+ return BT_UINT16_unbound;
+ else if (n == BT_UINT8_nil)
+ return BT_UINT16_nil;
+ else if (n == BT_UINT8_t)
+ return BT_UINT16_t;
+ else
+ return n;
+}
+
+static Lisp_Object
+mark_uint16_byte_table (Lisp_Object obj)
+{
+ return Qnil;
+}
+
+static void
+print_uint16_byte_table (Lisp_Object obj,
+ Lisp_Object printcharfun, int escapeflag)
+{
+ Lisp_Uint16_Byte_Table *bte = XUINT16_BYTE_TABLE (obj);
+ int i;
+ struct gcpro gcpro1, gcpro2;
+ GCPRO2 (obj, printcharfun);
+
+ write_c_string ("\n#<uint16-byte-table", printcharfun);
+ for (i = 0; i < 256; i++)
+ {
+ unsigned short n = bte->property[i];
+ if ( (i & 15) == 0 )
+ write_c_string ("\n ", printcharfun);
+ write_c_string (" ", printcharfun);
+ if (n == BT_UINT16_unbound)
+ write_c_string ("void", printcharfun);
+ else if (n == BT_UINT16_nil)
+ write_c_string ("nil", printcharfun);
+ else if (n == BT_UINT16_t)
+ write_c_string ("t", printcharfun);
+ else
+ {
+ char buf[7];
+
+ sprintf (buf, "%hd", n);
+ write_c_string (buf, printcharfun);
+ }
+ }
+ UNGCPRO;
+ write_c_string (">", printcharfun);
+}
+
+static int
+uint16_byte_table_equal (Lisp_Object obj1, Lisp_Object obj2, int depth)
+{
+ Lisp_Uint16_Byte_Table *te1 = XUINT16_BYTE_TABLE (obj1);
+ Lisp_Uint16_Byte_Table *te2 = XUINT16_BYTE_TABLE (obj2);
+ int i;
+
+ for (i = 0; i < 256; i++)
+ if (te1->property[i] != te2->property[i])
+ return 0;
+ return 1;
+}
+
+static unsigned long
+uint16_byte_table_hash (Lisp_Object obj, int depth)
+{
+ Lisp_Uint16_Byte_Table *te = XUINT16_BYTE_TABLE (obj);
+ int i;
+ hashcode_t hash = 0;
+
+ for (i = 0; i < 256; i++)
+ hash = HASH2 (hash, te->property[i]);
+ return hash;
+}
+
+DEFINE_LRECORD_IMPLEMENTATION ("uint16-byte-table", uint16_byte_table,
+ mark_uint16_byte_table,
+ print_uint16_byte_table,
+ 0, uint16_byte_table_equal,
+ uint16_byte_table_hash,
+ 0 /* uint16_byte_table_description */,
+ Lisp_Uint16_Byte_Table);
+
+static Lisp_Object
+make_uint16_byte_table (unsigned short initval)
+{
+ Lisp_Object obj;
+ int i;
+ Lisp_Uint16_Byte_Table *cte;
+
+ cte = alloc_lcrecord_type (Lisp_Uint16_Byte_Table,
+ &lrecord_uint16_byte_table);
+
+ for (i = 0; i < 256; i++)
+ cte->property[i] = initval;
+
+ XSETUINT16_BYTE_TABLE (obj, cte);
+ return obj;
+}
+
+static int
+uint16_byte_table_same_value_p (Lisp_Object obj)
+{
+ Lisp_Uint16_Byte_Table *bte = XUINT16_BYTE_TABLE (obj);
+ unsigned short v0 = bte->property[0];
+ int i;
+
+ for (i = 1; i < 256; i++)
+ {
+ if (bte->property[i] != v0)
+ return 0;
+ }
+ return -1;
+}
+
+
static Lisp_Object
mark_byte_table (Lisp_Object obj)
{
return Qnil;
}
+static void
+print_byte_table (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag)
+{
+ Lisp_Byte_Table *bte = XBYTE_TABLE (obj);
+ int i;
+ struct gcpro gcpro1, gcpro2;
+ GCPRO2 (obj, printcharfun);
+
+ write_c_string ("\n#<byte-table", printcharfun);
+ for (i = 0; i < 256; i++)
+ {
+ Lisp_Object elt = bte->property[i];
+ if ( (i & 15) == 0 )
+ write_c_string ("\n ", printcharfun);
+ write_c_string (" ", printcharfun);
+ if (EQ (elt, Qunbound))
+ write_c_string ("void", printcharfun);
+ else
+ print_internal (elt, printcharfun, escapeflag);
+ }
+ UNGCPRO;
+ write_c_string (">", printcharfun);
+}
+
static int
byte_table_equal (Lisp_Object obj1, Lisp_Object obj2, int depth)
{
DEFINE_LRECORD_IMPLEMENTATION ("byte-table", byte_table,
mark_byte_table,
- internal_object_printer,
+ print_byte_table,
0, byte_table_equal,
byte_table_hash,
byte_table_description,
Lisp_Byte_Table);
static Lisp_Object
-make_byte_table (Lisp_Object initval, int older)
+make_byte_table (Lisp_Object initval)
{
Lisp_Object obj;
int i;
Lisp_Byte_Table *cte;
- if (older)
- cte = alloc_older_lcrecord_type (Lisp_Byte_Table, &lrecord_byte_table);
- else
- cte = alloc_lcrecord_type (Lisp_Byte_Table, &lrecord_byte_table);
+ cte = alloc_lcrecord_type (Lisp_Byte_Table, &lrecord_byte_table);
for (i = 0; i < 256; i++)
cte->property[i] = initval;
return obj;
}
-static Lisp_Object
-copy_byte_table (Lisp_Object entry)
+static int
+byte_table_same_value_p (Lisp_Object obj)
{
- Lisp_Byte_Table *cte = XBYTE_TABLE (entry);
- Lisp_Object obj;
+ Lisp_Byte_Table *bte = XBYTE_TABLE (obj);
+ Lisp_Object v0 = bte->property[0];
int i;
- Lisp_Byte_Table *ctenew
- = alloc_lcrecord_type (Lisp_Byte_Table, &lrecord_byte_table);
- for (i = 0; i < 256; i++)
+ for (i = 1; i < 256; i++)
{
- Lisp_Object new = cte->property[i];
- if (BYTE_TABLE_P (new))
- ctenew->property[i] = copy_byte_table (new);
- else
- ctenew->property[i] = new;
+ if (!internal_equal (bte->property[i], v0, 0))
+ return 0;
}
+ return -1;
+}
- XSETBYTE_TABLE (obj, ctenew);
- return obj;
+
+Lisp_Object get_byte_table (Lisp_Object table, unsigned char idx);
+Lisp_Object put_byte_table (Lisp_Object table, unsigned char idx,
+ Lisp_Object value);
+
+Lisp_Object
+get_byte_table (Lisp_Object table, unsigned char idx)
+{
+ if (UINT8_BYTE_TABLE_P (table))
+ return UINT8_DECODE (XUINT8_BYTE_TABLE(table)->property[idx]);
+ else if (UINT16_BYTE_TABLE_P (table))
+ return UINT16_DECODE (XUINT16_BYTE_TABLE(table)->property[idx]);
+ else if (BYTE_TABLE_P (table))
+ return XBYTE_TABLE(table)->property[idx];
+ else
+ return table;
}
+Lisp_Object
+put_byte_table (Lisp_Object table, unsigned char idx, Lisp_Object value)
+{
+ if (UINT8_BYTE_TABLE_P (table))
+ {
+ if (UINT8_VALUE_P (value))
+ {
+ XUINT8_BYTE_TABLE(table)->property[idx] = UINT8_ENCODE (value);
+ if (!UINT8_BYTE_TABLE_P (value) &&
+ !UINT16_BYTE_TABLE_P (value) && !BYTE_TABLE_P (value)
+ && uint8_byte_table_same_value_p (table))
+ {
+ return value;
+ }
+ }
+ else if (UINT16_VALUE_P (value))
+ {
+ Lisp_Object new = make_uint16_byte_table (Qnil);
+ int i;
+
+ for (i = 0; i < 256; i++)
+ {
+ XUINT16_BYTE_TABLE(new)->property[i]
+ = UINT8_TO_UINT16 (XUINT8_BYTE_TABLE(table)->property[i]);
+ }
+ XUINT16_BYTE_TABLE(new)->property[idx] = UINT16_ENCODE (value);
+ return new;
+ }
+ else
+ {
+ Lisp_Object new = make_byte_table (Qnil);
+ int i;
+
+ for (i = 0; i < 256; i++)
+ {
+ XBYTE_TABLE(new)->property[i]
+ = UINT8_DECODE (XUINT8_BYTE_TABLE(table)->property[i]);
+ }
+ XBYTE_TABLE(new)->property[idx] = value;
+ return new;
+ }
+ }
+ else if (UINT16_BYTE_TABLE_P (table))
+ {
+ if (UINT16_VALUE_P (value))
+ {
+ XUINT16_BYTE_TABLE(table)->property[idx] = UINT16_ENCODE (value);
+ if (!UINT8_BYTE_TABLE_P (value) &&
+ !UINT16_BYTE_TABLE_P (value) && !BYTE_TABLE_P (value)
+ && uint16_byte_table_same_value_p (table))
+ {
+ return value;
+ }
+ }
+ else
+ {
+ Lisp_Object new = make_byte_table (Qnil);
+ int i;
+
+ for (i = 0; i < 256; i++)
+ {
+ XBYTE_TABLE(new)->property[i]
+ = UINT16_DECODE (XUINT16_BYTE_TABLE(table)->property[i]);
+ }
+ XBYTE_TABLE(new)->property[idx] = value;
+ return new;
+ }
+ }
+ else if (BYTE_TABLE_P (table))
+ {
+ XBYTE_TABLE(table)->property[idx] = value;
+ if (!UINT8_BYTE_TABLE_P (value) &&
+ !UINT16_BYTE_TABLE_P (value) && !BYTE_TABLE_P (value)
+ && byte_table_same_value_p (table))
+ {
+ return value;
+ }
+ }
+ else if (!internal_equal (table, value, 0))
+ {
+ if (UINT8_VALUE_P (table) && UINT8_VALUE_P (value))
+ {
+ table = make_uint8_byte_table (UINT8_ENCODE (table));
+ XUINT8_BYTE_TABLE(table)->property[idx] = UINT8_ENCODE (value);
+ }
+ else if (UINT16_VALUE_P (table) && UINT16_VALUE_P (value))
+ {
+ table = make_uint16_byte_table (UINT16_ENCODE (table));
+ XUINT16_BYTE_TABLE(table)->property[idx] = UINT16_ENCODE (value);
+ }
+ else
+ {
+ table = make_byte_table (table);
+ XBYTE_TABLE(table)->property[idx] = value;
+ }
+ }
+ return table;
+}
static Lisp_Object
mark_char_id_table (Lisp_Object obj)
return cte->table;
}
+static void
+print_char_id_table (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag)
+{
+ Lisp_Object table = XCHAR_ID_TABLE (obj)->table;
+ int i;
+ struct gcpro gcpro1, gcpro2;
+ GCPRO2 (obj, printcharfun);
+
+ write_c_string ("#<char-id-table ", printcharfun);
+ for (i = 0; i < 256; i++)
+ {
+ Lisp_Object elt = get_byte_table (table, i);
+ if (i != 0) write_c_string ("\n ", printcharfun);
+ if (EQ (elt, Qunbound))
+ write_c_string ("void", printcharfun);
+ else
+ print_internal (elt, printcharfun, escapeflag);
+ }
+ UNGCPRO;
+ write_c_string (">", printcharfun);
+}
+
static int
char_id_table_equal (Lisp_Object obj1, Lisp_Object obj2, int depth)
{
- Lisp_Char_ID_Table *cte1 = XCHAR_ID_TABLE (obj1);
- Lisp_Char_ID_Table *cte2 = XCHAR_ID_TABLE (obj2);
+ Lisp_Object table1 = XCHAR_ID_TABLE (obj1)->table;
+ Lisp_Object table2 = XCHAR_ID_TABLE (obj2)->table;
+ int i;
- return byte_table_equal (cte1->table, cte2->table, depth + 1);
+ for (i = 0; i < 256; i++)
+ {
+ if (!internal_equal (get_byte_table (table1, i),
+ get_byte_table (table2, i), 0))
+ return 0;
+ }
+ return -1;
}
static unsigned long
DEFINE_LRECORD_IMPLEMENTATION ("char-id-table", char_id_table,
mark_char_id_table,
- internal_object_printer,
+ print_char_id_table,
0, char_id_table_equal,
char_id_table_hash,
char_id_table_description,
Lisp_Char_ID_Table);
static Lisp_Object
-make_char_id_table (Lisp_Object initval, int older)
+make_char_id_table (Lisp_Object initval)
{
Lisp_Object obj;
Lisp_Char_ID_Table *cte;
- if (older)
- cte = alloc_older_lcrecord_type (Lisp_Char_ID_Table,
- &lrecord_char_id_table);
- else
- cte = alloc_lcrecord_type (Lisp_Char_ID_Table, &lrecord_char_id_table);
+ cte = alloc_lcrecord_type (Lisp_Char_ID_Table, &lrecord_char_id_table);
- cte->table = make_byte_table (initval, older);
+ cte->table = make_byte_table (initval);
XSETCHAR_ID_TABLE (obj, cte);
return obj;
}
-/* not used */
-#if 0
-static Lisp_Object
-copy_char_id_table (Lisp_Object entry)
-{
- Lisp_Char_ID_Table *cte = XCHAR_ID_TABLE (entry);
- Lisp_Object obj;
- Lisp_Char_ID_Table *ctenew
- = alloc_lcrecord_type (Lisp_Char_ID_Table, &lrecord_char_id_table);
-
- ctenew->table = copy_byte_table (cte->table);
- XSETCHAR_ID_TABLE (obj, ctenew);
- return obj;
-}
-#endif
-
Lisp_Object
get_char_id_table (Emchar ch, Lisp_Object table)
{
unsigned int code = ch;
- Lisp_Byte_Table* cpt
- = XBYTE_TABLE (XCHAR_ID_TABLE (table)->table);
- Lisp_Object ret = cpt->property [(unsigned char)(code >> 24)];
-
- if (BYTE_TABLE_P (ret))
- cpt = XBYTE_TABLE (ret);
- else
- return ret;
-
- ret = cpt->property [(unsigned char) (code >> 16)];
- if (BYTE_TABLE_P (ret))
- cpt = XBYTE_TABLE (ret);
- else
- return ret;
- ret = cpt->property [(unsigned char) (code >> 8)];
- if (BYTE_TABLE_P (ret))
- cpt = XBYTE_TABLE (ret);
- else
- return ret;
-
- return cpt->property [(unsigned char) code];
+ return
+ get_byte_table
+ (get_byte_table
+ (get_byte_table
+ (get_byte_table
+ (XCHAR_ID_TABLE (table)->table,
+ (unsigned char)(code >> 24)),
+ (unsigned char) (code >> 16)),
+ (unsigned char) (code >> 8)),
+ (unsigned char) code);
}
void put_char_id_table (Emchar ch, Lisp_Object value, Lisp_Object table);
put_char_id_table (Emchar ch, Lisp_Object value, Lisp_Object table)
{
unsigned int code = ch;
- Lisp_Byte_Table* cpt1 = XBYTE_TABLE (XCHAR_ID_TABLE (table)->table);
- Lisp_Object ret = cpt1->property[(unsigned char)(code >> 24)];
-
- if (BYTE_TABLE_P (ret))
- {
- Lisp_Byte_Table* cpt2 = XBYTE_TABLE (ret);
-
- ret = cpt2->property[(unsigned char)(code >> 16)];
- if (BYTE_TABLE_P (ret))
- {
- Lisp_Byte_Table* cpt3 = XBYTE_TABLE (ret);
-
- ret = cpt3->property[(unsigned char)(code >> 8)];
- if (BYTE_TABLE_P (ret))
- {
- Lisp_Byte_Table* cpt4 = XBYTE_TABLE (ret);
-
- cpt4->property[(unsigned char)code] = value;
- }
- else if (!EQ (ret, value))
- {
- Lisp_Object cpt4
- = make_byte_table (ret, OLDER_RECORD_P (table));
-
- XBYTE_TABLE(cpt4)->property[(unsigned char)code] = value;
- cpt3->property[(unsigned char)(code >> 8)] = cpt4;
- }
- }
- else if (!EQ (ret, value))
- {
- int older = OLDER_RECORD_P (table);
- Lisp_Object cpt3 = make_byte_table (ret, older);
- Lisp_Object cpt4 = make_byte_table (ret, older);
-
- XBYTE_TABLE(cpt4)->property[(unsigned char)code] = value;
- XBYTE_TABLE(cpt3)->property[(unsigned char)(code >> 8)]
- = cpt4;
- cpt2->property[(unsigned char)(code >> 16)] = cpt3;
- }
- }
- else if (!EQ (ret, value))
- {
- int older = OLDER_RECORD_P (table);
- Lisp_Object cpt2 = make_byte_table (ret, older);
- Lisp_Object cpt3 = make_byte_table (ret, older);
- Lisp_Object cpt4 = make_byte_table (ret, older);
-
- XBYTE_TABLE(cpt4)->property[(unsigned char)code] = value;
- XBYTE_TABLE(cpt3)->property[(unsigned char)(code >> 8)] = cpt4;
- XBYTE_TABLE(cpt2)->property[(unsigned char)(code >> 16)] = cpt3;
- cpt1->property[(unsigned char)(code >> 24)] = cpt2;
- }
+ Lisp_Object table1, table2, table3, table4;
+
+ table1 = XCHAR_ID_TABLE (table)->table;
+ table2 = get_byte_table (table1, (unsigned char)(code >> 24));
+ table3 = get_byte_table (table2, (unsigned char)(code >> 16));
+ table4 = get_byte_table (table3, (unsigned char)(code >> 8));
+
+ table4 = put_byte_table (table4, (unsigned char)code, value);
+ table3 = put_byte_table (table3, (unsigned char)(code >> 8), table4);
+ table2 = put_byte_table (table2, (unsigned char)(code >> 16), table3);
+ XCHAR_ID_TABLE (table)->table
+ = put_byte_table (table1, (unsigned char)(code >> 24), table2);
}
Lisp_Object Vchar_attribute_hash_table;
-Lisp_Object Vcharacter_ideographic_radical_table;
-Lisp_Object Vcharacter_ideographic_strokes_table;
-Lisp_Object Vcharacter_total_strokes_table;
-Lisp_Object Vcharacter_morohashi_daikanwa_table;
-Lisp_Object Vcharacter_decomposition_table;
Lisp_Object Vcharacter_composition_table;
Lisp_Object Vcharacter_variant_table;
-Lisp_Object Qname;
-Lisp_Object Qideographic_radical, Qideographic_strokes;
-Lisp_Object Qtotal_strokes;
-Lisp_Object Qmorohashi_daikanwa;
Lisp_Object Qideograph_daikanwa;
Lisp_Object Q_decomposition;
Lisp_Object Qucs;
return char_attribute_list;
}
+DEFUN ("find-char-attribute-table", Ffind_char_attribute_table, 1, 1, 0, /*
+Return char-id-table corresponding to ATTRIBUTE.
+*/
+ (attribute))
+{
+ return Fgethash (attribute, Vchar_attribute_hash_table, Qnil);
+}
+
/* We store the char-id-tables in hash tables with the attributes as
the key and the actual char-id-table object as the value. Each
(character))
{
Lisp_Object alist = Qnil;
- Lisp_Object ret;
int i;
CHECK_CHAR (character);
&char_attribute_alist_closure);
UNGCPRO;
}
- ret = get_char_id_table (XCHAR (character),
- Vcharacter_ideographic_radical_table);
- if (!NILP (ret))
- alist = Fcons (Fcons (Qideographic_radical, ret), alist);
-
- ret = get_char_id_table (XCHAR (character),
- Vcharacter_ideographic_strokes_table);
- if (!NILP (ret))
- alist = Fcons (Fcons (Qideographic_strokes, ret), alist);
-
- ret = get_char_id_table (XCHAR (character), Vcharacter_total_strokes_table);
- if (!NILP (ret))
- alist = Fcons (Fcons (Qtotal_strokes, ret), alist);
-
- ret = get_char_id_table (XCHAR (character),
- Vcharacter_morohashi_daikanwa_table);
- if (!NILP (ret))
- alist = Fcons (Fcons (Qmorohashi_daikanwa, ret), alist);
-
- ret = get_char_id_table (XCHAR (character),
- Vcharacter_decomposition_table);
- if (!NILP (ret))
- alist = Fcons (Fcons (Q_decomposition, ret), alist);
for (i = 0; i < countof (chlook->charset_by_leading_byte); i++)
{
if (!NILP (ccs))
{
-#if 0
- int code_point = charset_code_point (ccs, XCHAR (character));
-
- if (code_point >= 0)
- {
- alist = Fcons (Fcons (ccs, make_int (code_point)), alist);
- }
-#else
Lisp_Object encoding_table = XCHARSET_ENCODING_TABLE (ccs);
Lisp_Object cpos;
{
alist = Fcons (Fcons (ccs, cpos), alist);
}
-#endif
}
}
return alist;
else
return Qnil;
}
- else if (EQ (attribute, Qideographic_radical))
- {
- return get_char_id_table (XCHAR (character),
- Vcharacter_ideographic_radical_table);
- }
- else if (EQ (attribute, Qideographic_strokes))
- {
- return get_char_id_table (XCHAR (character),
- Vcharacter_ideographic_strokes_table);
- }
- else if (EQ (attribute, Qtotal_strokes))
- {
- return get_char_id_table (XCHAR (character),
- Vcharacter_total_strokes_table);
- }
- else if (EQ (attribute, Qmorohashi_daikanwa))
- {
- return get_char_id_table (XCHAR (character),
- Vcharacter_morohashi_daikanwa_table);
- }
- else if (EQ (attribute, Q_decomposition))
- {
- return get_char_id_table (XCHAR (character),
- Vcharacter_decomposition_table);
- }
else
{
Lisp_Object table = Fgethash (attribute,
{
return put_char_ccs_code_point (character, ccs, value);
}
- else if (EQ (attribute, Qideographic_radical))
- {
- CHECK_INT (value);
- put_char_id_table (XCHAR (character), value,
- Vcharacter_ideographic_radical_table);
- return value;
- }
- else if (EQ (attribute, Qideographic_strokes))
- {
- CHECK_INT (value);
- put_char_id_table (XCHAR (character), value,
- Vcharacter_ideographic_strokes_table);
- return value;
- }
- else if (EQ (attribute, Qtotal_strokes))
- {
- CHECK_INT (value);
- put_char_id_table (XCHAR (character), value,
- Vcharacter_total_strokes_table);
- return value;
- }
- else if (EQ (attribute, Qmorohashi_daikanwa))
- {
- CHECK_LIST (value);
- put_char_id_table (XCHAR (character), value,
- Vcharacter_morohashi_daikanwa_table);
- return value;
- }
else if (EQ (attribute, Q_decomposition))
{
Lisp_Object seq;
int i = 0;
GET_EXTERNAL_LIST_LENGTH (rest, len);
- seq = make_older_vector (len, Qnil);
+ seq = make_vector (len, Qnil);
while (CONSP (rest))
{
ntable = get_char_id_table (c, table);
if (!CHAR_ID_TABLE_P (ntable))
{
- ntable
- = make_char_id_table (Qnil, OLDER_RECORD_P (table));
+ ntable = make_char_id_table (Qnil);
put_char_id_table (c, ntable, table);
}
table = ntable;
Vcharacter_variant_table);
}
}
- seq = make_older_vector (1, v);
+ seq = make_vector (1, v);
}
- put_char_id_table (XCHAR (character), seq,
- Vcharacter_decomposition_table);
- return value;
+ value = seq;
}
else if (EQ (attribute, Q_ucs))
{
if (NILP (table))
{
- table = make_char_id_table (Qunbound, 0);
+ table = make_char_id_table (Qunbound);
Fputhash (attribute, table, Vchar_attribute_hash_table);
}
put_char_id_table (XCHAR (character), value, table);
if (NILP (encoding_table = XCHARSET_ENCODING_TABLE (ccs)))
{
XCHARSET_ENCODING_TABLE (ccs)
- = encoding_table = make_char_id_table (Qnil, -1);
+ = encoding_table = make_char_id_table (Qnil);
}
put_char_id_table (XCHAR (character), value, encoding_table);
return Qt;
Lisp_Object rest = attributes;
Lisp_Object code = Fcdr (Fassq (Qucs, attributes));
Lisp_Object character;
+#if 0
Lisp_Object daikanwa = Qnil;
+#endif
if (NILP (code))
{
while (CONSP (rest))
{
Lisp_Object cell = Fcar (rest);
+#if 0
Lisp_Object key = Fcar (cell);
Lisp_Object value = Fcdr (cell);
+#endif
if (!LISTP (cell))
signal_simple_error ("Invalid argument", attributes);
+#if 0
if (EQ (key, Qmorohashi_daikanwa))
{
size_t len;
}
else if (EQ (key, Qideograph_daikanwa))
daikanwa = value;
+#endif
Fput_char_attribute (character, Fcar (cell), Fcdr (cell));
+#if 0
ignored:
+#endif
rest = Fcdr (rest);
}
return character;
mark_object (cs->registry);
mark_object (cs->ccl_program);
#ifdef UTF2000
- /* mark_object (cs->encoding_table); */
+ mark_object (cs->encoding_table);
/* mark_object (cs->decoding_table); */
#endif
return cs->name;
syms_of_mule_charset (void)
{
#ifdef UTF2000
+ INIT_LRECORD_IMPLEMENTATION (uint8_byte_table);
+ INIT_LRECORD_IMPLEMENTATION (uint16_byte_table);
INIT_LRECORD_IMPLEMENTATION (byte_table);
INIT_LRECORD_IMPLEMENTATION (char_id_table);
#endif
DEFSUBR (Fset_charset_registry);
#ifdef UTF2000
DEFSUBR (Fchar_attribute_list);
+ DEFSUBR (Ffind_char_attribute_table);
DEFSUBR (Fchar_attribute_alist);
DEFSUBR (Fget_char_attribute);
DEFSUBR (Fput_char_attribute);
defsymbol (&Qchinese_cns11643_1, "chinese-cns11643-1");
defsymbol (&Qchinese_cns11643_2, "chinese-cns11643-2");
#ifdef UTF2000
- defsymbol (&Qname, "name");
- defsymbol (&Qideographic_radical, "ideographic-radical");
- defsymbol (&Qideographic_strokes, "ideographic-strokes");
- defsymbol (&Qtotal_strokes, "total-strokes");
- defsymbol (&Qmorohashi_daikanwa, "morohashi-daikanwa");
defsymbol (&Q_ucs, "->ucs");
defsymbol (&Q_decomposition, "->decomposition");
defsymbol (&Qcompat, "compat");
Version number of UTF-2000.
*/ );
- /* staticpro (&Vcharacter_ideographic_radical_table); */
- Vcharacter_ideographic_radical_table = make_char_id_table (Qnil, -1);
-
- /* staticpro (&Vcharacter_ideographic_strokes_table); */
- Vcharacter_ideographic_strokes_table = make_char_id_table (Qnil, -1);
-
- /* staticpro (&Vcharacter_total_strokes_table); */
- Vcharacter_total_strokes_table = make_char_id_table (Qnil, -1);
-
- staticpro (&Vcharacter_morohashi_daikanwa_table);
- Vcharacter_morohashi_daikanwa_table = make_char_id_table (Qnil, 0);
-
- /* staticpro (&Vcharacter_decomposition_table); */
- Vcharacter_decomposition_table = make_char_id_table (Qnil, -1);
-
- /* staticpro (&Vcharacter_composition_table); */
- Vcharacter_composition_table = make_char_id_table (Qnil, -1);
+ staticpro (&Vcharacter_composition_table);
+ Vcharacter_composition_table = make_char_id_table (Qnil);
staticpro (&Vcharacter_variant_table);
- Vcharacter_variant_table = make_char_id_table (Qnil, 0);
+ Vcharacter_variant_table = make_char_id_table (Qnil);
Vdefault_coded_charset_priority_list = Qnil;
DEFVAR_LISP ("default-coded-charset-priority-list",
projects / chise / xemacs-chise.git- / blobdiff