X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fchartab.c;h=84878f48e2f444777b1435f6e622b2a3814fb712;hb=d23fba1bb89b51685ce9a9684a55c81c7d373e01;hp=8260714ba44514276847aba69d6415cc7df9ba6c;hpb=fe869f6450e01b2afb274ecc9bbed9e0369191da;p=chise%2Fxemacs-chise.git

diff --git a/src/chartab.c b/src/chartab.c
index 8260714..84878f4 100644
--- a/src/chartab.c
+++ b/src/chartab.c
@@ -67,9 +67,6 @@ Lisp_Object Vword_combining_categories, Vword_separating_categories;
 
 #ifdef UTF2000
 
-static void
-decode_char_table_range (Lisp_Object range, struct chartab_range *outrange);
-
 #define BT_UINT8_MIN		0
 #define BT_UINT8_MAX	(UCHAR_MAX - 3)
 #define BT_UINT8_t	(UCHAR_MAX - 2)
@@ -193,12 +190,16 @@ uint8_byte_table_hash (Lisp_Object obj, int depth)
   return hash;
 }
 
+static const struct lrecord_description uint8_byte_table_description[] = {
+  { XD_END }
+};
+
 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 */,
+			       uint8_byte_table_description,
 			       Lisp_Uint8_Byte_Table);
 
 static Lisp_Object
@@ -418,12 +419,16 @@ uint16_byte_table_hash (Lisp_Object obj, int depth)
   return hash;
 }
 
+static const struct lrecord_description uint16_byte_table_description[] = {
+  { XD_END }
+};
+
 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 */,
+			       uint16_byte_table_description,
 			       Lisp_Uint16_Byte_Table);
 
 static Lisp_Object
@@ -842,33 +847,6 @@ make_char_id_table (Lisp_Object initval)
   return obj;
 }
 
-Lisp_Object
-get_char_id_table (Lisp_Char_Table* cit, Emchar ch)
-{
-  Lisp_Object val = get_byte_table (get_byte_table
-				    (get_byte_table
-				     (get_byte_table
-				      (cit->table,
-				       (unsigned char)(ch >> 24)),
-				      (unsigned char) (ch >> 16)),
-				     (unsigned char)  (ch >> 8)),
-				    (unsigned char)    ch);
-  if (UNBOUNDP (val))
-    return cit->default_value;
-  else
-    return val;
-}
-
-void
-put_char_id_table (Lisp_Char_Table* cit,
-		   Lisp_Object character, Lisp_Object value)
-{
-  struct chartab_range range;
-
-  decode_char_table_range (character, &range);
-  put_char_table (cit, &range, value);
-}
-
 
 Lisp_Object Vcharacter_composition_table;
 Lisp_Object Vcharacter_variant_table;
@@ -1732,7 +1710,32 @@ as CHAR-TABLE.  The values will not themselves be copied.
   return obj;
 }
 
-static void
+INLINE_HEADER int XCHARSET_CELL_RANGE (Lisp_Object ccs);
+INLINE_HEADER int
+XCHARSET_CELL_RANGE (Lisp_Object ccs)
+{
+  switch (XCHARSET_CHARS (ccs))
+    {
+    case 94:
+      return (33 << 8) | 126;
+    case 96:
+      return (32 << 8) | 127;
+#ifdef UTF2000
+    case 128:
+      return (0 << 8) | 127;
+    case 256:
+      return (0 << 8) | 255;
+#endif
+    default:
+      abort ();
+      return 0;
+    }
+}
+
+#ifndef UTF2000
+static
+#endif
+void
 decode_char_table_range (Lisp_Object range, struct chartab_range *outrange)
 {
   if (EQ (range, Qt))
@@ -1752,30 +1755,39 @@ decode_char_table_range (Lisp_Object range, struct chartab_range *outrange)
     {
       Lisp_Vector *vec = XVECTOR (range);
       Lisp_Object *elts = vector_data (vec);
-      if (vector_length (vec) != 2)
-	signal_simple_error ("Length of charset row vector must be 2",
-			     range);
+      int cell_min, cell_max;
+
       outrange->type = CHARTAB_RANGE_ROW;
       outrange->charset = Fget_charset (elts[0]);
       CHECK_INT (elts[1]);
       outrange->row = XINT (elts[1]);
-      if (XCHARSET_DIMENSION (outrange->charset) >= 2)
+      if (XCHARSET_DIMENSION (outrange->charset) < 2)
+	signal_simple_error ("Charset in row vector must be multi-byte",
+			     outrange->charset);
+      else
 	{
-	  switch (XCHARSET_CHARS (outrange->charset))
-	    {
-	    case 94:
-	      check_int_range (outrange->row, 33, 126);
-	      break;
-	    case 96:
-	      check_int_range (outrange->row, 32, 127);
-	      break;
-	    default:
-	      abort ();
-	    }
+	  int ret = XCHARSET_CELL_RANGE (outrange->charset);
+
+	  cell_min = ret >> 8;
+	  cell_max = ret & 0xFF;
+	}
+      if (XCHARSET_DIMENSION (outrange->charset) == 2)
+	check_int_range (outrange->row, cell_min, cell_max);
+#ifdef UTF2000
+      else if (XCHARSET_DIMENSION (outrange->charset) == 3)
+	{
+	  check_int_range (outrange->row >> 8  , cell_min, cell_max);
+	  check_int_range (outrange->row & 0xFF, cell_min, cell_max);
 	}
+      else if (XCHARSET_DIMENSION (outrange->charset) == 4)
+	{
+	  check_int_range ( outrange->row >> 16       , cell_min, cell_max);
+	  check_int_range ((outrange->row >> 8) & 0xFF, cell_min, cell_max);
+	  check_int_range ( outrange->row       & 0xFF, cell_min, cell_max);
+	}
+#endif
       else
-	signal_simple_error ("Charset in row vector must be multi-byte",
-			     outrange->charset);  
+	abort ();
     }
   else
     {
@@ -1831,18 +1843,7 @@ Lisp_Object
 get_char_table (Emchar ch, Lisp_Char_Table *ct)
 {
 #ifdef UTF2000
-  Lisp_Object val = get_byte_table (get_byte_table
-				    (get_byte_table
-				     (get_byte_table
-				      (ct->table,
-				       (unsigned char)(ch >> 24)),
-				      (unsigned char) (ch >> 16)),
-				     (unsigned char)  (ch >>  8)),
-				    (unsigned char)    ch);
-  if (UNBOUNDP (val))
-    return ct->default_value;
-  else
-    return val;
+  return get_char_id_table (ct, ch);
 #elif defined(MULE)
   {
     Lisp_Object charset;
@@ -2173,50 +2174,13 @@ put_char_table (Lisp_Char_Table *ct, struct chartab_range *range,
       {
 	int cell_min, cell_max, i;
 
-	/* printf ("put-char-table: range = charset-row: %d, 0x%x\n",
-	   XCHARSET_LEADING_BYTE (range->charset), range->row); */
-	if (XCHARSET_DIMENSION (range->charset) < 2)
-	  signal_simple_error ("Charset in row vector must be multi-byte",
-			       range->charset);
-	else
-	  {
-	    switch (XCHARSET_CHARS (range->charset))
-	      {
-	      case 94:
-		cell_min = 33; cell_max = 126;
-		break;
-	      case 96:
-		cell_min = 32; cell_max = 127;
-		break;
-	      case 128:
-		cell_min = 0; cell_max = 127;
-		break;
-	      case 256:
-		cell_min = 0; cell_max = 255;
-		break;
-	      default:
-		abort ();
-	      }
-	  }
-	if (XCHARSET_DIMENSION (range->charset) == 2)
-	  check_int_range (range->row, cell_min, cell_max);
-	else if (XCHARSET_DIMENSION (range->charset) == 3)
-	  {
-	    check_int_range (range->row >> 8  , cell_min, cell_max);
-	    check_int_range (range->row & 0xFF, cell_min, cell_max);
-	  }
-	else if (XCHARSET_DIMENSION (range->charset) == 4)
-	  {
-	    check_int_range ( range->row >> 16       , cell_min, cell_max);
-	    check_int_range ((range->row >> 8) & 0xFF, cell_min, cell_max);
-	    check_int_range ( range->row       & 0xFF, cell_min, cell_max);
-	  }
-	else
-	  abort ();
-
+	i = XCHARSET_CELL_RANGE (range->charset);
+	cell_min = i >> 8;
+	cell_max = i & 0xFF;
 	for (i = cell_min; i <= cell_max; i++)
 	  {
 	    Emchar ch = DECODE_CHAR (range->charset, (range->row << 8) | i);
+
 	    if ( charset_code_point (range->charset, ch) >= 0 )
 	      put_char_id_table_0 (ct, ch, val);
 	  }
@@ -2639,45 +2603,9 @@ map_char_table (Lisp_Char_Table *ct,
 	int retval;
 	struct chartab_range rainj;
 
-	if (XCHARSET_DIMENSION (range->charset) < 2)
-	  signal_simple_error ("Charset in row vector must be multi-byte",
-			       range->charset);
-	else
-	  {
-	    switch (XCHARSET_CHARS (range->charset))
-	      {
-	      case 94:
-		cell_min = 33; cell_max = 126;
-		break;
-	      case 96:
-		cell_min = 32; cell_max = 127;
-		break;
-	      case 128:
-		cell_min = 0; cell_max = 127;
-		break;
-	      case 256:
-		cell_min = 0; cell_max = 255;
-		break;
-	      default:
-		abort ();
-	      }
-	  }
-	if (XCHARSET_DIMENSION (range->charset) == 2)
-	  check_int_range (range->row, cell_min, cell_max);
-	else if (XCHARSET_DIMENSION (range->charset) == 3)
-	  {
-	    check_int_range (range->row >> 8  , cell_min, cell_max);
-	    check_int_range (range->row & 0xFF, cell_min, cell_max);
-	  }
-	else if (XCHARSET_DIMENSION (range->charset) == 4)
-	  {
-	    check_int_range ( range->row >> 16       , cell_min, cell_max);
-	    check_int_range ((range->row >> 8) & 0xFF, cell_min, cell_max);
-	    check_int_range ( range->row       & 0xFF, cell_min, cell_max);
-	  }
-	else
-	  abort ();
-
+	i = XCHARSET_CELL_RANGE (range->charset);
+	cell_min = i >> 8;
+	cell_max = i & 0xFF;
 	rainj.type = CHARTAB_RANGE_CHAR;
 	for (retval =0, i = cell_min; i <= cell_max && retval == 0; i++)
 	  {
@@ -3182,9 +3110,6 @@ the entire table.
   return slarg.retval;
 }
 
-EXFUN (Fmake_char, 3);
-EXFUN (Fdecode_char, 2);
-
 DEFUN ("define-char", Fdefine_char, 1, 1, 0, /*
 Store character's ATTRIBUTES.
 */
@@ -3211,7 +3136,7 @@ Store character's ATTRIBUTES.
 	      if (CONSP (cell))
 		character = Fmake_char (ccs, Fcar (cell), Fcar (Fcdr (cell)));
 	      else
-		character = Fdecode_char (ccs, cell);
+		character = Fdecode_char (ccs, cell, Qnil);
 	      if (!NILP (character))
 		goto setup_attributes;
 	    }
@@ -3270,7 +3195,7 @@ Retrieve the character of the given ATTRIBUTES.
 	  if (CONSP (cell))
 	    return Fmake_char (ccs, Fcar (cell), Fcar (Fcdr (cell)));
 	  else
-	    return Fdecode_char (ccs, cell);
+	    return Fdecode_char (ccs, cell, Qnil);
 	}
       rest = Fcdr (rest);
     }