(mark_byte_table): Renamed from `mark_char_byte_table'.

[chise/xemacs-chise.git] / src / mule-charset.c

diff --git a/src/mule-charset.c b/src/mule-charset.c
index f464a85..9a86e36 100644 (file)
--- a/src/mule-charset.c
+++ b/src/mule-charset.c
@@ -111,7 +111,7 @@ static int composite_char_col_next;
 struct charset_lookup *chlook;
 
 static const struct lrecord_description charset_lookup_description_1[] = {
-  { XD_LISP_OBJECT, offsetof(struct charset_lookup, charset_by_leading_byte),
+  { XD_LISP_OBJECT_ARRAY, offsetof (struct charset_lookup, charset_by_leading_byte),
 #ifdef UTF2000
     128+4*128
 #else
@@ -121,7 +121,7 @@ static const struct lrecord_description charset_lookup_description_1[] = {
 };
 
 static const struct struct_description charset_lookup_description = {
-  sizeof(struct charset_lookup),
+  sizeof (struct charset_lookup),
   charset_lookup_description_1
 };
 
@@ -160,9 +160,9 @@ const Bytecount rep_bytes_by_first_byte[0xA0] =
 #ifdef UTF2000
 
 static Lisp_Object
-mark_char_byte_table (Lisp_Object obj)
+mark_byte_table (Lisp_Object obj)
 {
-  struct Lisp_Char_Byte_Table *cte = XCHAR_BYTE_TABLE (obj);
+  Lisp_Byte_Table *cte = XBYTE_TABLE (obj);
   int i;
 
   for (i = 0; i < 256; i++)
@@ -173,19 +173,19 @@ mark_char_byte_table (Lisp_Object obj)
 }
 
 static int
-char_byte_table_equal (Lisp_Object obj1, Lisp_Object obj2, int depth)
+byte_table_equal (Lisp_Object obj1, Lisp_Object obj2, int depth)
 {
-  struct Lisp_Char_Byte_Table *cte1 = XCHAR_BYTE_TABLE (obj1);
-  struct Lisp_Char_Byte_Table *cte2 = XCHAR_BYTE_TABLE (obj2);
+  Lisp_Byte_Table *cte1 = XBYTE_TABLE (obj1);
+  Lisp_Byte_Table *cte2 = XBYTE_TABLE (obj2);
   int i;
 
   for (i = 0; i < 256; i++)
-    if (CHAR_BYTE_TABLE_P (cte1->property[i]))
+    if (BYTE_TABLE_P (cte1->property[i]))
       {
-       if (CHAR_BYTE_TABLE_P (cte2->property[i]))
+       if (BYTE_TABLE_P (cte2->property[i]))
          {
-           if (!char_byte_table_equal (cte1->property[i],
-                                       cte2->property[i], depth + 1))
+           if (!byte_table_equal (cte1->property[i],
+                                  cte2->property[i], depth + 1))
              return 0;
          }
        else
@@ -198,62 +198,60 @@ char_byte_table_equal (Lisp_Object obj1, Lisp_Object obj2, int depth)
 }
 
 static unsigned long
-char_byte_table_hash (Lisp_Object obj, int depth)
+byte_table_hash (Lisp_Object obj, int depth)
 {
-  struct Lisp_Char_Byte_Table *cte = XCHAR_BYTE_TABLE (obj);
+  Lisp_Byte_Table *cte = XBYTE_TABLE (obj);
 
   return internal_array_hash (cte->property, 256, depth);
 }
 
-static const struct lrecord_description char_byte_table_description[] = {
-  { XD_LISP_OBJECT, offsetof(struct Lisp_Char_Byte_Table, property), 256 },
+static const struct lrecord_description byte_table_description[] = {
+  { XD_LISP_OBJECT, offsetof(Lisp_Byte_Table, property), 256 },
   { XD_END }
 };
 
-DEFINE_LRECORD_IMPLEMENTATION ("char-byte-table", char_byte_table,
-                               mark_char_byte_table,
+DEFINE_LRECORD_IMPLEMENTATION ("byte-table", byte_table,
+                               mark_byte_table,
                               internal_object_printer,
-                              0, char_byte_table_equal,
-                              char_byte_table_hash,
-                              char_byte_table_description,
-                              struct Lisp_Char_Byte_Table);
+                              0, byte_table_equal,
+                              byte_table_hash,
+                              byte_table_description,
+                              Lisp_Byte_Table);
 
 static Lisp_Object
-make_char_byte_table (Lisp_Object initval)
+make_byte_table (Lisp_Object initval)
 {
   Lisp_Object obj;
   int i;
-  struct Lisp_Char_Byte_Table *cte =
-    alloc_lcrecord_type (struct Lisp_Char_Byte_Table,
-                        &lrecord_char_byte_table);
+  Lisp_Byte_Table *cte
+    = alloc_lcrecord_type (Lisp_Byte_Table, &lrecord_byte_table);
 
   for (i = 0; i < 256; i++)
     cte->property[i] = initval;
 
-  XSETCHAR_BYTE_TABLE (obj, cte);
+  XSETBYTE_TABLE (obj, cte);
   return obj;
 }
 
 static Lisp_Object
-copy_char_byte_table (Lisp_Object entry)
+copy_byte_table (Lisp_Object entry)
 {
-  struct Lisp_Char_Byte_Table *cte = XCHAR_BYTE_TABLE (entry);
+  Lisp_Byte_Table *cte = XBYTE_TABLE (entry);
   Lisp_Object obj;
   int i;
-  struct Lisp_Char_Byte_Table *ctenew =
-    alloc_lcrecord_type (struct Lisp_Char_Byte_Table,
-                        &lrecord_char_byte_table);
+  Lisp_Byte_Table *ctenew
+    = alloc_lcrecord_type (Lisp_Byte_Table, &lrecord_byte_table);
 
   for (i = 0; i < 256; i++)
     {
       Lisp_Object new = cte->property[i];
-      if (CHAR_BYTE_TABLE_P (new))
-       ctenew->property[i] = copy_char_byte_table (new);
+      if (BYTE_TABLE_P (new))
+       ctenew->property[i] = copy_byte_table (new);
       else
        ctenew->property[i] = new;
     }
 
-  XSETCHAR_BYTE_TABLE (obj, ctenew);
+  XSETBYTE_TABLE (obj, ctenew);
   return obj;
 }
 
@@ -272,7 +270,7 @@ char_code_table_equal (Lisp_Object obj1, Lisp_Object obj2, int depth)
   struct Lisp_Char_Code_Table *cte1 = XCHAR_CODE_TABLE (obj1);
   struct Lisp_Char_Code_Table *cte2 = XCHAR_CODE_TABLE (obj2);
 
-  return char_byte_table_equal (cte1->table, cte2->table, depth + 1);
+  return byte_table_equal (cte1->table, cte2->table, depth + 1);
 }
 
 static unsigned long
@@ -304,7 +302,7 @@ make_char_code_table (Lisp_Object initval)
     alloc_lcrecord_type (struct Lisp_Char_Code_Table,
                         &lrecord_char_code_table);
 
-  cte->table = make_char_byte_table (initval);
+  cte->table = make_byte_table (initval);
 
   XSETCHAR_CODE_TABLE (obj, cte);
   return obj;
@@ -319,7 +317,7 @@ copy_char_code_table (Lisp_Object entry)
     alloc_lcrecord_type (struct Lisp_Char_Code_Table,
                         &lrecord_char_code_table);
 
-  ctenew->table = copy_char_byte_table (cte->table);
+  ctenew->table = copy_byte_table (cte->table);
   XSETCHAR_CODE_TABLE (obj, ctenew);
   return obj;
 }
@@ -329,83 +327,83 @@ Lisp_Object
 get_char_code_table (Emchar ch, Lisp_Object table)
 {
   unsigned int code = ch;
-  struct Lisp_Char_Byte_Table* cpt
-    = XCHAR_BYTE_TABLE (XCHAR_CODE_TABLE (table)->table);
+  Lisp_Byte_Table* cpt
+    = XBYTE_TABLE (XCHAR_CODE_TABLE (table)->table);
   Lisp_Object ret = cpt->property [(unsigned char)(code >> 24)];
 
-  if (CHAR_BYTE_TABLE_P (ret))
-    cpt = XCHAR_BYTE_TABLE (ret);
+  if (BYTE_TABLE_P (ret))
+    cpt = XBYTE_TABLE (ret);
   else
     return ret;
 
   ret = cpt->property [(unsigned char) (code >> 16)];
-  if (CHAR_BYTE_TABLE_P (ret))
-    cpt = XCHAR_BYTE_TABLE (ret);
+  if (BYTE_TABLE_P (ret))
+    cpt = XBYTE_TABLE (ret);
   else
     return ret;
 
   ret = cpt->property [(unsigned char) (code >> 8)];
-  if (CHAR_BYTE_TABLE_P (ret))
-    cpt = XCHAR_BYTE_TABLE (ret);
+  if (BYTE_TABLE_P (ret))
+    cpt = XBYTE_TABLE (ret);
   else
     return ret;
   
   return cpt->property [(unsigned char) code];
 }
 
+void put_char_code_table (Emchar ch, Lisp_Object value, Lisp_Object table);
 void
 put_char_code_table (Emchar ch, Lisp_Object value, Lisp_Object table)
 {
   unsigned int code = ch;
-  struct Lisp_Char_Byte_Table* cpt1
-    = XCHAR_BYTE_TABLE (XCHAR_CODE_TABLE (table)->table);
+  Lisp_Byte_Table* cpt1
+    = XBYTE_TABLE (XCHAR_CODE_TABLE (table)->table);
   Lisp_Object ret = cpt1->property[(unsigned char)(code >> 24)];
 
-  if (CHAR_BYTE_TABLE_P (ret))
+  if (BYTE_TABLE_P (ret))
     {
-      struct Lisp_Char_Byte_Table* cpt2 = XCHAR_BYTE_TABLE (ret);
+      Lisp_Byte_Table* cpt2 = XBYTE_TABLE (ret);
       
       ret = cpt2->property[(unsigned char)(code >> 16)];
-      if (CHAR_BYTE_TABLE_P (ret))
+      if (BYTE_TABLE_P (ret))
        {
-         struct Lisp_Char_Byte_Table* cpt3 = XCHAR_BYTE_TABLE (ret);
+         Lisp_Byte_Table* cpt3 = XBYTE_TABLE (ret);
          
          ret = cpt3->property[(unsigned char)(code >> 8)];
-         if (CHAR_BYTE_TABLE_P (ret))
+         if (BYTE_TABLE_P (ret))
            {
-             struct Lisp_Char_Byte_Table* cpt4
-               = XCHAR_BYTE_TABLE (ret);
+             Lisp_Byte_Table* cpt4 = XBYTE_TABLE (ret);
              
              cpt4->property[(unsigned char)code] = value;
            }
          else if (!EQ (ret, value))
            {
-             Lisp_Object cpt4 = make_char_byte_table (ret);
+             Lisp_Object cpt4 = make_byte_table (ret);
              
-             XCHAR_BYTE_TABLE(cpt4)->property[(unsigned char)code] = value;
+             XBYTE_TABLE(cpt4)->property[(unsigned char)code] = value;
              cpt3->property[(unsigned char)(code >> 8)] = cpt4;
            }
        }
       else if (!EQ (ret, value))
        {
-         Lisp_Object cpt3 = make_char_byte_table (ret);
-         Lisp_Object cpt4 = make_char_byte_table (ret);
+         Lisp_Object cpt3 = make_byte_table (ret);
+         Lisp_Object cpt4 = make_byte_table (ret);
          
-         XCHAR_BYTE_TABLE(cpt4)->property[(unsigned char)code] = value;
-         XCHAR_BYTE_TABLE(cpt3)->property[(unsigned char)(code >> 8)]
+         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))
     {
-      Lisp_Object cpt2 = make_char_byte_table (ret);
-      Lisp_Object cpt3 = make_char_byte_table (ret);
-      Lisp_Object cpt4 = make_char_byte_table (ret);
+      Lisp_Object cpt2 = make_byte_table (ret);
+      Lisp_Object cpt3 = make_byte_table (ret);
+      Lisp_Object cpt4 = make_byte_table (ret);
       
-      XCHAR_BYTE_TABLE(cpt4)->property[(unsigned char)code] = value;
-      XCHAR_BYTE_TABLE(cpt3)->property[(unsigned char)(code >>  8)] = cpt4;
-      XCHAR_BYTE_TABLE(cpt2)->property[(unsigned char)(code >> 16)] = cpt3;
+      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;
     }
 }
@@ -434,6 +432,7 @@ Lisp_Object Qnarrow;
 Lisp_Object Qsmall;
 Lisp_Object Qfont;
 
+Emchar to_char_code (Lisp_Object v, char* err_msg, Lisp_Object err_arg);
 Emchar
 to_char_code (Lisp_Object v, char* err_msg, Lisp_Object err_arg)
 {
@@ -551,6 +550,8 @@ Return the value of CHARACTER's ATTRIBUTE.
   return Fcdr (Fassq (attribute, ret));
 }
 
+Lisp_Object put_char_attribute (Lisp_Object character,
+                               Lisp_Object attribute, Lisp_Object value);
 Lisp_Object
 put_char_attribute (Lisp_Object character, Lisp_Object attribute,
                    Lisp_Object value)
@@ -574,6 +575,8 @@ put_char_attribute (Lisp_Object character, Lisp_Object attribute,
   return ret;
 }
 
+Lisp_Object remove_char_attribute (Lisp_Object character,
+                                  Lisp_Object attribute);
 Lisp_Object
 remove_char_attribute (Lisp_Object character, Lisp_Object attribute)
 {
@@ -648,7 +651,7 @@ Store CHARACTER's ATTRIBUTE with VALUE.
              rest = Fcdr (value);
              while (!NILP (rest))
                {
-                 int i;
+                 int j;
 
                  if (!CONSP (rest))
                    signal_simple_error ("Invalid value for coded-charset",
@@ -657,10 +660,10 @@ Store CHARACTER's ATTRIBUTE with VALUE.
                  if (!INTP (ret))
                    signal_simple_error ("Invalid value for coded-charset",
                                         value);
-                 i = XINT (ret);
+                 j = XINT (ret);
                  if (XCHARSET_GRAPHIC (ccs) == 1)
-                   i &= 0x7F;
-                 code_point = (code_point << 8) | i;
+                   j &= 0x7F;
+                 code_point = (code_point << 8) | j;
                  rest = Fcdr (rest);
                }
              value = make_int (code_point);
@@ -995,13 +998,6 @@ Lisp_Object Ql2r, Qr2l;
 
 Lisp_Object Vcharset_hash_table;
 
-#ifdef UTF2000
-static Charset_ID next_allocated_leading_byte;
-#else
-static Charset_ID next_allocated_1_byte_leading_byte;
-static Charset_ID next_allocated_2_byte_leading_byte;
-#endif
-
 /* Composite characters are characters constructed by overstriking two
    or more regular characters.
 
@@ -1112,7 +1108,7 @@ non_ascii_set_charptr_emchar (Bufbyte *str, Emchar c)
    Use the macro charptr_emchar() instead. */
 
 Emchar
-non_ascii_charptr_emchar (CONST Bufbyte *str)
+non_ascii_charptr_emchar (const Bufbyte *str)
 {
 #ifdef UTF2000
   Bufbyte b;
@@ -1268,7 +1264,7 @@ non_ascii_valid_char_p (Emchar ch)
    charptr_copy_char() instead. */
 
 Bytecount
-non_ascii_charptr_copy_char (CONST Bufbyte *ptr, Bufbyte *str)
+non_ascii_charptr_copy_char (const Bufbyte *ptr, Bufbyte *str)
 {
   Bufbyte *strptr = str;
   *strptr = *ptr++;
@@ -1361,7 +1357,7 @@ Lstream_funget_emchar (Lstream *stream, Emchar ch)
 static Lisp_Object
 mark_charset (Lisp_Object obj)
 {
-  struct Lisp_Charset *cs = XCHARSET (obj);
+  Lisp_Charset *cs = XCHARSET (obj);
 
   mark_object (cs->short_name);
   mark_object (cs->long_name);
@@ -1377,7 +1373,7 @@ mark_charset (Lisp_Object obj)
 static void
 print_charset (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag)
 {
-  struct Lisp_Charset *cs = XCHARSET (obj);
+  Lisp_Charset *cs = XCHARSET (obj);
   char buf[200];
 
   if (print_readably)
@@ -1407,9 +1403,15 @@ print_charset (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag)
 }
 
 static const struct lrecord_description charset_description[] = {
-  { XD_LISP_OBJECT, offsetof(struct Lisp_Charset, name), 7 },
+  { XD_LISP_OBJECT, offsetof (Lisp_Charset, name) },
+  { XD_LISP_OBJECT, offsetof (Lisp_Charset, doc_string) },
+  { XD_LISP_OBJECT, offsetof (Lisp_Charset, registry) },
+  { XD_LISP_OBJECT, offsetof (Lisp_Charset, short_name) },
+  { XD_LISP_OBJECT, offsetof (Lisp_Charset, long_name) },
+  { XD_LISP_OBJECT, offsetof (Lisp_Charset, reverse_direction_charset) },
+  { XD_LISP_OBJECT, offsetof (Lisp_Charset, ccl_program) },
 #ifdef UTF2000
-  { XD_LISP_OBJECT, offsetof(struct Lisp_Charset, decoding_table), 2 },
+  { XD_LISP_OBJECT, offsetof (Lisp_Charset, decoding_table) },
 #endif
   { XD_END }
 };
@@ -1417,7 +1419,7 @@ static const struct lrecord_description charset_description[] = {
 DEFINE_LRECORD_IMPLEMENTATION ("charset", charset,
                                mark_charset, print_charset, 0, 0, 0,
                               charset_description,
-                              struct Lisp_Charset);
+                              Lisp_Charset);
 /* Make a new charset. */
 
 static Lisp_Object
@@ -1433,8 +1435,10 @@ make_charset (Charset_ID id, Lisp_Object name,
 {
   unsigned char type = 0;
   Lisp_Object obj;
-  struct Lisp_Charset *cs =
-    alloc_lcrecord_type (struct Lisp_Charset, &lrecord_charset);
+  Lisp_Charset *cs = alloc_lcrecord_type (Lisp_Charset, &lrecord_charset);
+
+  zero_lcrecord (cs);
+
   XSETCHARSET (obj, cs);
 
   CHARSET_ID           (cs) = id;
@@ -1554,24 +1558,24 @@ get_unallocated_leading_byte (int dimension)
   Charset_ID lb;
 
 #ifdef UTF2000
-  if (next_allocated_leading_byte > MAX_LEADING_BYTE_PRIVATE)
+  if (chlook->next_allocated_leading_byte > MAX_LEADING_BYTE_PRIVATE)
     lb = 0;
   else
-    lb = next_allocated_leading_byte++;
+    lb = chlook->next_allocated_leading_byte++;
 #else
   if (dimension == 1)
     {
-      if (next_allocated_1_byte_leading_byte > MAX_LEADING_BYTE_PRIVATE_1)
+      if (chlook->next_allocated_1_byte_leading_byte > MAX_LEADING_BYTE_PRIVATE_1)
        lb = 0;
       else
-       lb = next_allocated_1_byte_leading_byte++;
+       lb = chlook->next_allocated_1_byte_leading_byte++;
     }
   else
     {
-      if (next_allocated_2_byte_leading_byte > MAX_LEADING_BYTE_PRIVATE_2)
+      if (chlook->next_allocated_2_byte_leading_byte > MAX_LEADING_BYTE_PRIVATE_2)
        lb = 0;
       else
-       lb = next_allocated_2_byte_leading_byte++;
+       lb = chlook->next_allocated_2_byte_leading_byte++;
     }
 #endif
 
@@ -2165,7 +2169,7 @@ NEW-NAME is the name of the new charset.  Return the new charset.
   int id, chars, dimension, columns, graphic, final;
   int direction;
   Lisp_Object registry, doc_string, short_name, long_name;
-  struct Lisp_Charset *cs;
+  Lisp_Charset *cs;
 
   charset = Fget_charset (charset);
   if (!NILP (XCHARSET_REVERSE_DIRECTION_CHARSET (charset)))
@@ -2334,7 +2338,7 @@ Recognized properties are those listed in `make-charset', as well as
 */
        (charset, prop))
 {
-  struct Lisp_Charset *cs;
+  Lisp_Charset *cs;
 
   charset = Fget_charset (charset);
   cs = XCHARSET (charset);
@@ -2540,7 +2544,7 @@ character s with caron.
 */
        (charset, arg1, arg2))
 {
-  struct Lisp_Charset *cs;
+  Lisp_Charset *cs;
   int a1, a2;
   int lowlim, highlim;
 
@@ -2751,6 +2755,12 @@ Return a string of the characters comprising a composite character.
 void
 syms_of_mule_charset (void)
 {
+#ifdef UTF2000
+  INIT_LRECORD_IMPLEMENTATION (byte_table);
+  INIT_LRECORD_IMPLEMENTATION (char_code_table);
+#endif
+  INIT_LRECORD_IMPLEMENTATION (charset);
+
   DEFSUBR (Fcharsetp);
   DEFSUBR (Ffind_charset);
   DEFSUBR (Fget_charset);
@@ -2917,10 +2927,10 @@ vars_of_mule_charset (void)
 #endif
 
 #ifdef UTF2000
-  next_allocated_leading_byte = MIN_LEADING_BYTE_PRIVATE;
+  chlook->next_allocated_leading_byte = MIN_LEADING_BYTE_PRIVATE;
 #else
-  next_allocated_1_byte_leading_byte = MIN_LEADING_BYTE_PRIVATE_1;
-  next_allocated_2_byte_leading_byte = MIN_LEADING_BYTE_PRIVATE_2;
+  chlook->next_allocated_1_byte_leading_byte = MIN_LEADING_BYTE_PRIVATE_1;
+  chlook->next_allocated_2_byte_leading_byte = MIN_LEADING_BYTE_PRIVATE_2;
 #endif
 
 #ifndef UTF2000