emacs: src/ccl.c comparison

comparison src/ccl.c @ 89370:0888fb1bda3f

(CCL_DECODE_CHAR, CCL_ENCODE_CHAR): New macros. (ccl_driver): New arg CHARSET_LIST. Use the above macros instead of DECODE_CAHR, ENCODE_CHAR, CHAR_CHARSET. (Fccl_execute): Call ccl_driver with the last arg Qnil. (Fccl_execute_on_string): Likewise.

author	Kenichi Handa <handa@m17n.org>
date	Thu, 30 Jan 2003 02:19:06 +0000
parents	aa33304a3bb8
children	2f877ed80fa6

comparison

equal deleted inserted replaced

-:db3deaa3ae51
+:0888fb1bda3f
 }						\
 else					\
 CCL_SUSPEND (CCL_STAT_SUSPEND_BY_SRC);	\
 } while (0)
+/* Decode CODE by a charset whose id is ID.  If ID is 0, return CODE
+as is for backward compatibility.  Assume that we can use the
+variable `charset'.  */
+#define CCL_DECODE_CHAR(id, code)	\
+((id) == 0 ? (code)			\
+: (charset = CHARSET_FROM_ID ((id)), DECODE_CHAR (charset, (code))))
+/* Encode character C by some of charsets in CHARSET_LIST.  Set ID to
+the id of the used charset, ENCODED to the resulf of encoding.
+Assume that we can use the variable `charset'.  */
+#define CCL_ENCODE_CHAR(c, charset_list, id, encoded)			\
+do {									\
+unsigned code;							\
+									\
+charset = char_charset ((c), (charset_list), &code);		\
+if (! charset && ! NILP (charset_list))				\
+charset = char_charset ((c), Qnil, &code);		  	\
+if (charset)							\
+{									\
+	(id) = CHARSET_ID (charset);					\
+	(encoded) = code;						\
+}									\
+} while (0)
 /* Execute CCL code on characters at SOURCE (length SRC_SIZE).  The
 resulting text goes to a place pointed by DESTINATION, the length
 of which should not exceed DST_SIZE.  As a side effect, how many
 characters are consumed and produced are recorded in CCL->consumed
 /* For the moment, we only support depth 256 of stack.  */
 static struct ccl_prog_stack ccl_prog_stack_struct[256];
 void
-ccl_driver (ccl, source, destination, src_size, dst_size)
+ccl_driver (ccl, source, destination, src_size, dst_size, charset_list)
 struct ccl_program *ccl;
 int *source, *destination;
 int src_size, dst_size;
+Lisp_Object charset_list;
 {
 register int *reg = ccl->reg;
 register int ic = ccl->ic;
 register int code = 0, field1, field2;
 register Lisp_Object *ccl_prog = ccl->prog;
 	    {
 	    case CCL_ReadMultibyteChar2:
 	      if (!src)
 		CCL_INVALID_CMD;
 	      CCL_READ_CHAR (i);
-	      charset = CHAR_CHARSET (i);
+	      CCL_ENCODE_CHAR (i, charset_list, reg[RRR], reg[rrr]);
-	      reg[rrr] = CHARSET_ID (charset);
-	      reg[RRR] = ENCODE_CHAR (charset, i);
 	      break;
 	    case CCL_WriteMultibyteChar2:
 	      if (! dst)
 		CCL_INVALID_CMD;
-	      charset = CHARSET_FROM_ID (reg[RRR]);
+	      i = CCL_DECODE_CHAR (reg[RRR], reg[rrr]);
-	      i = DECODE_CHAR (charset, reg[rrr]);
 	      CCL_WRITE_CHAR (i);
 	      break;
 	    case CCL_TranslateCharacter:
-	      charset = CHARSET_FROM_ID (reg[RRR]);
+	      i = CCL_DECODE_CHAR (reg[RRR], reg[rrr]);
-	      i = DECODE_CHAR (charset, reg[rrr]);
 	      op = translate_char (GET_TRANSLATION_TABLE (reg[Rrr]), i);
-	      charset = CHAR_CHARSET (op);
+	      CCL_ENCODE_CHAR (op, charset_list, reg[RRR], reg[rrr]);
-	      reg[RRR] = CHARSET_ID (charset);
-	      reg[rrr] = ENCODE_CHAR (charset, op);
 	      break;
 	    case CCL_TranslateCharacterConstTbl:
 	      op = XINT (ccl_prog[ic]); /* table */
 	      ic++;
-	      charset = CHARSET_FROM_ID (reg[RRR]);
+	      i = CCL_DECODE_CHAR (reg[RRR], reg[rrr]);
-	      i = DECODE_CHAR (charset, reg[rrr]);
 	      op = translate_char (GET_TRANSLATION_TABLE (op), i);
-	      charset = CHAR_CHARSET (op);
+	      CCL_ENCODE_CHAR (op, charset_list, reg[RRR], reg[rrr]);
-	      reg[RRR] = CHARSET_ID (charset);
-	      reg[rrr] = ENCODE_CHAR (charset, op);
 	      break;
 	    case CCL_LookupIntConstTbl:
 	      op = XINT (ccl_prog[ic]); /* table */
 	      ic++;
 		  {
 Lisp_Object opl;
 		    opl = HASH_VALUE (h, op);
 		    if (!CHARACTERP (opl))
 		      CCL_INVALID_CMD;
-		    reg[rrr] = ENCODE_CHAR (CHAR_CHARSET (charset_unicode),
+		    reg[RRR] = charset_unicode;
-					    op);
+		    reg[rrr] = op;
 		    reg[7] = 1; /* r7 true for success */
 		  }
 		else
 		  reg[7] = 0;
 	      }
 	      break;
 	    case CCL_LookupCharConstTbl:
 	      op = XINT (ccl_prog[ic]); /* table */
 	      ic++;
-	      charset = CHARSET_FROM_ID (reg[RRR]);
+	      i = CCL_DECODE_CHAR (reg[RRR], reg[rrr]);
-	      i = DECODE_CHAR (charset, reg[rrr]);
 	      {
 		struct Lisp_Hash_Table *h = GET_HASH_TABLE (op);
 		op = hash_lookup (h, make_number (i), NULL);
 		if (op >= 0)
 for (i = 0; i < 8; i++)
 ccl.reg[i] = (INTEGERP (AREF (reg, i))
 		  ? XINT (AREF (reg, i))
 		  : 0);
-ccl_driver (&ccl, NULL, NULL, 0, 0);
+ccl_driver (&ccl, NULL, NULL, 0, 0, Qnil);
 QUIT;
 if (ccl.status != CCL_STAT_SUCCESS)
 error ("Error in CCL program at %dth code", ccl.ic);
 for (i = 0; i < 8; i++)
 	ccl.last_block = NILP (contin);
 src = source;
 src_size = i;
 while (1)
 	{
-	  ccl_driver (&ccl, src, destination, src_size, CCL_EXECUTE_BUF_SIZE);
+	  ccl_driver (&ccl, src, destination, src_size, CCL_EXECUTE_BUF_SIZE,
+		      Qnil);
 	  if (ccl.status != CCL_STAT_SUSPEND_BY_DST)
 	    break;
 	  produced_chars += ccl.produced;
 	  if (NILP (unibyte_p))
 	    {

Mercurial > emacs

comparison src/ccl.c @ 89370:0888fb1bda3f