From: tomo <tomo>
Date: Mon, 31 Jan 2000 10:36:23 +0000 (+0000)
Subject: (make_builtin_char): New prototype.
X-Git-Tag: r21-2-27-utf-2000-0_14-0~9
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=25ade1eae0b15ba802f0bda632abd3e593faf04c;p=chise%2Fxemacs-chise.git-

(make_builtin_char): New prototype.
(DECODE_CHAR): New inline function.
(MAKE_CHAR): Use `DECODE_CHAR'.
---

diff --git a/src/char-ucs.h b/src/char-ucs.h
index 3c0958c..8f68eb2 100644
--- a/src/char-ucs.h
+++ b/src/char-ucs.h
@@ -435,78 +435,51 @@ CHARSET_BY_LEADING_BYTE (Charset_ID lb)
 #define MAX_CHAR_96x96		(MIN_CHAR_96x96 + 96 * 96 * 80 - 1)
 
 
-/* Return a character whose charset is CHARSET and position-codes
-   are C1 and C2.  TYPE9N character ignores C2. */
+Emchar make_builtin_char (Lisp_Object charset, int c1, int c2);
 
-INLINE Emchar MAKE_CHAR (Lisp_Object charset, int c1, int c2);
+INLINE Emchar DECODE_CHAR (Lisp_Object charset, int code_point);
 INLINE Emchar
-MAKE_CHAR (Lisp_Object charset, int c1, int c2)
+DECODE_CHAR (Lisp_Object charset, int code_point)
 {
+  int dim = XCHARSET_DIMENSION (charset);
   Lisp_Object decoding_table = XCHARSET_DECODING_TABLE (charset);
   int idx;
   Lisp_Object ch;
 
-  if (!EQ (decoding_table, Qnil)
-      && (0 <= (idx = c1 - XCHARSET_BYTE_OFFSET (charset)))
-      && (idx < XVECTOR_LENGTH (decoding_table))
-      && !EQ (ch = XVECTOR_DATA(decoding_table)[idx], Qnil))
+  while (dim > 0)
     {
-      if (VECTORP (ch))
+      dim--;
+      if ( VECTORP (decoding_table)
+	   && ( 0 <= (idx = ((code_point >> (dim * 8))
+			     & 255) - XCHARSET_BYTE_OFFSET (charset)) )
+	   && ( idx < XVECTOR_LENGTH (decoding_table) )
+	   && !NILP (ch = XVECTOR_DATA(decoding_table)[idx]) )
 	{
-	  if ((0 <= (idx = c2 - XCHARSET_BYTE_OFFSET (charset)))
-	      && (idx < XVECTOR_LENGTH (ch))
-	      && !EQ (ch = XVECTOR_DATA(ch)[idx], Qnil))
+	  if (CHARP (ch))
 	    return XCHAR (ch);
+	  else
+	    decoding_table = ch;
 	}
       else
-	return XCHAR (ch);
-    }
-  if (XCHARSET_UCS_MAX (charset))
-    {
-      Emchar code
-	= (XCHARSET_DIMENSION (charset) == 1
-	   ?
-	   c1 - XCHARSET_BYTE_OFFSET (charset)
-	   :
-	   (c1 - XCHARSET_BYTE_OFFSET (charset)) * XCHARSET_CHARS (charset)
-	   + c2  - XCHARSET_BYTE_OFFSET (charset))
-	- XCHARSET_CODE_OFFSET (charset) + XCHARSET_UCS_MIN (charset);
-      if ((code < XCHARSET_UCS_MIN (charset))
-	  || (XCHARSET_UCS_MAX (charset) < code))
-	signal_simple_error ("Arguments makes invalid character",
-			     make_char (code));
-      return code;
-    }
-  else if (XCHARSET_DIMENSION (charset) == 1)
-    {
-      switch (XCHARSET_CHARS (charset))
-	{
-	case 94:
-	  return MIN_CHAR_94
-	    + (XCHARSET_FINAL (charset) - '0') * 94 + (c1 - 33);
-	case 96:
-	  return MIN_CHAR_96
-	    + (XCHARSET_FINAL (charset) - '0') * 96 + (c1 - 32);
-	default:
-	  abort ();
-	}
+	break;
     }
+  if (XCHARSET_DIMENSION (charset) == 1)
+    return make_builtin_char (charset, code_point, 0);
   else
-    {
-      switch (XCHARSET_CHARS (charset))
-	{
-	case 94:
-	  return MIN_CHAR_94x94
-	    + (XCHARSET_FINAL (charset) - '0') * 94 * 94
-	    + (c1 - 33) * 94 + (c2 - 33);
-	case 96:
-	  return MIN_CHAR_96x96
-	    + (XCHARSET_FINAL (charset) - '0') * 96 * 96
-	    + (c1 - 32) * 96 + (c2 - 32);
-	default:
-	  abort ();
-	}
-    }
+    return make_builtin_char (charset, code_point >> 8, code_point & 255);
+}
+
+/* Return a character whose charset is CHARSET and position-codes
+   are C1 and C2.  TYPE9N character ignores C2. */
+
+INLINE Emchar MAKE_CHAR (Lisp_Object charset, int c1, int c2);
+INLINE Emchar
+MAKE_CHAR (Lisp_Object charset, int c1, int c2)
+{
+  if (XCHARSET_DIMENSION (charset) == 1)
+    return DECODE_CHAR (charset, c1);
+  else
+    return DECODE_CHAR (charset, (c1 << 8) | c2);
 }
 
 extern Lisp_Object Vcharacter_attribute_table;