emacs: src/coding.c comparison

comparison src/coding.c @ 89856:18b52da60a76

(get_translation): Fix previous change. (encode_coding): Don't call translate_chars. (consume_chars): New arg translation_table. Caller changed. (translate_chars): Deleted. (syms_of_coding): Make translation-table's number of extra slots 2.

author	Kenichi Handa <handa@m17n.org>
date	Thu, 11 Mar 2004 02:18:12 +0000
parents	b636ae1109c6
children	23cb9ed79225

comparison

equal deleted inserted replaced

-:182d3c31dea9
+:18b52da60a76
 }
 return translation_table;
 }
-static void
-translate_chars (coding, table)
-struct coding_system *coding;
-Lisp_Object table;
-{
-int *charbuf = coding->charbuf;
-int *charbuf_end = charbuf + coding->charbuf_used;
-int c;
-if (coding->chars_at_source)
-return;
-while (charbuf < charbuf_end)
-{
-c = *charbuf;
-if (c < 0)
-	charbuf += -c;
-else
-	*charbuf++ = translate_char (table, c);
-}
-}
 static Lisp_Object
 get_translation (val, buf, buf_end, last_block, from_nchars, to_nchars)
 Lisp_Object val;
 int *buf, *buf_end;
 int last_block;
 int *from_nchars, *to_nchars;
 {
-/* VAL is TO-CHAR, [TO-CHAR ...], ([FROM-CHAR ...] .  TO-CHAR), or
+/* VAL is TO or (([FROM-CHAR ...] .  TO) ...) where TO is TO-CHAR or
-([FROM-CHAR ...] . [TO-CHAR ...]).  */
+[TO-CHAR ...].  */
 if (CONSP (val))
 {
-Lisp_Object from;
+Lisp_Object from, tail;
 int i, len;
-from = XCAR (val);
+for (tail = val; CONSP (tail); tail = XCDR (tail))
-val = XCDR (val);
+	{
-len = ASIZE (from);
+	  val = XCAR (tail);
-for (i = 0; i < len; i++)
+	  from = XCAR (val);
-	{
+	  len = ASIZE (from);
-	  if (buf + i == buf_end)
+	  for (i = 0; i < len; i++)
-	    return (last_block ? Qnil : Qt);
+	    {
-	  if (XINT (AREF (from, i)) != buf[i])
+	      if (buf + i == buf_end)
-	    return Qnil;
+		{
-	}
+		  if (! last_block)
-*from_nchars = len;
+		    return Qt;
+		  break;
+		}
+	      if (XINT (AREF (from, i)) != buf[i])
+		break;
+	    }
+	  if (i == len)
+	    {
+	      val = XCDR (val);
+	      *from_nchars = len;
+	      break;
+	    }
+	}
+if (! CONSP (tail))
+	return Qnil;
 }
 if (VECTORP (val))
 *buf = XINT (AREF (val, 0)), *to_nchars = ASIZE (val);
 else
 *buf = XINT (val);
 					   + MAX_MULTIBYTE_LENGTH * to_nchars,
 					   dst);
 		  dst_end = coding->destination + coding->dst_bytes;
 		}
-	      for (i = 0; i < to_nchars; i++, c = XINT (AREF (trans, i)))
+	      for (i = 0; i < to_nchars; i++)
 		{
+		  if (i > 0)
+		    c = XINT (AREF (trans, i));
 		  if (coding->dst_multibyte
 		      || ! CHAR_BYTE8_P (c))
 		    CHAR_STRING_ADVANCE (c, dst);
 		  else
 		    *dst++ = CHAR_TO_BYTE8 (c);
 return buf;
 }
 static void
-consume_chars (coding)
+consume_chars (coding, translation_table)
 struct coding_system *coding;
+Lisp_Object translation_table;
 {
 int *buf = coding->charbuf;
 int *buf_end = coding->charbuf + coding->charbuf_size;
 const unsigned char *src = coding->source + coding->consumed;
 const unsigned char *src_end = coding->source + coding->src_bytes;
 EMACS_INT end_pos = coding->src_pos + coding->src_chars;
 int multibytep = coding->src_multibyte;
 Lisp_Object eol_type;
 int c;
 EMACS_INT stop, stop_composition, stop_charset;
+int max_lookup = 0, *lookup_buf = NULL;
+if (! NILP (translation_table))
+{
+max_lookup = XINT (XCHAR_TABLE (translation_table)->extras[1]);
+lookup_buf = alloca (sizeof (int) * max_lookup);
+}
 eol_type = CODING_ID_EOL_TYPE (coding->id);
 if (VECTORP (eol_type))
 eol_type = Qunix;
 /* Compensate for CRLF and conversion.  */
 buf_end -= 1 + MAX_ANNOTATION_LENGTH;
 while (buf < buf_end)
 {
+Lisp_Object trans;
 if (pos == stop)
 	{
 	  if (pos == end_pos)
 	    break;
 	  if (pos == stop_composition)
 		*buf++ = '\r';
 	      else
 		c = '\r';
 	    }
 	}
-*buf++ = c;
+if (NILP (translation_table)
+	  || NILP (trans = CHAR_TABLE_REF (translation_table, c)))
+	*buf++ = c;
+else
+	{
+	  int from_nchars = 1, to_nchars = 1;
+	  int *lookup_buf_end;
+	  const unsigned char *p = src;
+	  int i;
+	  lookup_buf[0] = c;
+	  for (i = 1; i < max_lookup && p < src_end; i++)
+	    lookup_buf[i] = STRING_CHAR_ADVANCE (p);
+	  lookup_buf_end = lookup_buf + i;
+	  trans = get_translation (trans, lookup_buf, lookup_buf_end, 1,
+				   &from_nchars, &to_nchars);
+	  if (EQ (trans, Qt)
+	      || buf + to_nchars > buf_end)
+	    break;
+	  *buf++ = *lookup_buf;
+	  for (i = 1; i < to_nchars; i++)
+	    *buf++ = XINT (AREF (trans, i));
+	  for (i = 1; i < from_nchars; i++, pos++)
+	    src += MULTIBYTE_LENGTH_NO_CHECK (src);
+	}
 }
 coding->consumed = src - coding->source;
 coding->consumed_char = pos - coding->src_pos;
 coding->charbuf_used = buf - coding->charbuf;
 ALLOC_CONVERSION_WORK_AREA (coding);
 do {
 coding_set_source (coding);
-consume_chars (coding);
+consume_chars (coding, translation_table);
-if (!NILP (translation_table))
-translate_chars (coding, translation_table);
 coding_set_destination (coding);
 (*(coding->encoder)) (coding);
 } while (coding->consumed_char < coding->src_chars);
 if (BUFFERP (coding->dst_object))
 Setting this variable twice is harmless.
 But don't staticpro it here--that is done in alloc.c.  */
 Qchar_table_extra_slots = intern ("char-table-extra-slots");
 DEFSYM (Qtranslation_table, "translation-table");
-Fput (Qtranslation_table, Qchar_table_extra_slots, make_number (1));
+Fput (Qtranslation_table, Qchar_table_extra_slots, make_number (2));
 DEFSYM (Qtranslation_table_id, "translation-table-id");
 DEFSYM (Qtranslation_table_for_decode, "translation-table-for-decode");
 DEFSYM (Qtranslation_table_for_encode, "translation-table-for-encode");
 DEFSYM (Qvalid_codes, "valid-codes");

Mercurial > emacs

comparison src/coding.c @ 89856:18b52da60a76