comparison src/coding.c @ 89373:4cc9e57fcabc

(decode_coding_ccl, encode_coding_ccl): Call ccl_driver with the last arg charset_list acquired from coding. (Fdefine_coding_system_internal): For ccl-based coding system, fix the attribute coding_attr_ccl_valids.

89372:95c081cdbd5f

  int consumed_chars = 0;
  int multibytep = coding->src_multibyte;
  struct ccl_program ccl;
  int source_charbuf[1024];
  int source_byteidx[1024];

  setup_ccl_program (&ccl, CODING_CCL_DECODER (coding));

  while (src < src_end)
    {
      const unsigned char *p = src;

      source = source_charbuf;
      source_end = source + i;
      while (source < source_end)
	{
	  ccl_driver (&ccl, source, charbuf,
		      source_end - source, charbuf_end - charbuf);
	  source += ccl.consumed;
	  charbuf += ccl.produced;
	  if (ccl.status != CCL_STAT_SUSPEND_BY_DST)
	    break;
	}

  unsigned char *dst = coding->destination + coding->produced;
  unsigned char *dst_end = coding->destination + coding->dst_bytes;
  unsigned char *adjusted_dst_end = dst_end - 1;
  int destination_charbuf[1024];
  int i, produced_chars = 0;

  setup_ccl_program (&ccl, CODING_CCL_ENCODER (coding));

  ccl.last_block = coding->mode & CODING_MODE_LAST_BLOCK;
  ccl.dst_multibyte = coding->dst_multibyte;

      int dst_bytes = dst_end - dst;
      if (dst_bytes > 1024)
	dst_bytes = 1024;

      ccl_driver (&ccl, charbuf, destination_charbuf,
		  charbuf_end - charbuf, dst_bytes);
      charbuf += ccl.consumed;
      if (multibytep)
	for (i = 0; i < ccl.produced; i++)
	  EMIT_ONE_BYTE (destination_charbuf[i] & 0xFF);
      else

      val = args[coding_arg_ccl_valids];
      valids = Fmake_string (make_number (256), make_number (0));
      for (tail = val; !NILP (tail); tail = Fcdr (tail))
	{
	  val = Fcar (tail);
	  if (INTEGERP (val))
	    ASET (valids, XINT (val), make_number (1));
	  else
	    {
	      int from, to;

	      CHECK_CONS (val);
	      CHECK_NUMBER (XCAR (val));
	      CHECK_NUMBER (XCDR (val));
	      from = XINT (XCAR (val));
	      to = XINT (XCDR (val));
	      for (i = from; i <= to; i++)
		ASET (valids, i, make_number (1));
	    }
	}
      ASET (attrs, coding_attr_ccl_valids, valids);
      
      category = coding_category_ccl;
    }

89373:4cc9e57fcabc

  int consumed_chars = 0;
  int multibytep = coding->src_multibyte;
  struct ccl_program ccl;
  int source_charbuf[1024];
  int source_byteidx[1024];
  Lisp_Object attrs, eol_type, charset_list, valids;

  CODING_GET_INFO (coding, attrs, eol_type, charset_list);
  setup_ccl_program (&ccl, CODING_CCL_DECODER (coding));

  while (src < src_end)
    {
      const unsigned char *p = src;

      source = source_charbuf;
      source_end = source + i;
      while (source < source_end)
	{
	  ccl_driver (&ccl, source, charbuf,
		      source_end - source, charbuf_end - charbuf,
		      charset_list);
	  source += ccl.consumed;
	  charbuf += ccl.produced;
	  if (ccl.status != CCL_STAT_SUSPEND_BY_DST)
	    break;
	}

  unsigned char *dst = coding->destination + coding->produced;
  unsigned char *dst_end = coding->destination + coding->dst_bytes;
  unsigned char *adjusted_dst_end = dst_end - 1;
  int destination_charbuf[1024];
  int i, produced_chars = 0;
  Lisp_Object attrs, eol_type, charset_list;

  CODING_GET_INFO (coding, attrs, eol_type, charset_list);
  setup_ccl_program (&ccl, CODING_CCL_ENCODER (coding));

  ccl.last_block = coding->mode & CODING_MODE_LAST_BLOCK;
  ccl.dst_multibyte = coding->dst_multibyte;

      int dst_bytes = dst_end - dst;
      if (dst_bytes > 1024)
	dst_bytes = 1024;

      ccl_driver (&ccl, charbuf, destination_charbuf,
		  charbuf_end - charbuf, dst_bytes, charset_list);
      charbuf += ccl.consumed;
      if (multibytep)
	for (i = 0; i < ccl.produced; i++)
	  EMIT_ONE_BYTE (destination_charbuf[i] & 0xFF);
      else

      val = args[coding_arg_ccl_valids];
      valids = Fmake_string (make_number (256), make_number (0));
      for (tail = val; !NILP (tail); tail = Fcdr (tail))
	{
	  int from, to;

	  val = Fcar (tail);
	  if (INTEGERP (val))
	    {
	      from = to = XINT (val);
	      if (from < 0 || from > 255)
		args_out_of_range_3 (val, make_number (0), make_number (255));
	    }
	  else
	    {
	      CHECK_CONS (val);
	      CHECK_NUMBER (XCAR (val));
	      CHECK_NUMBER (XCDR (val));
	      from = XINT (XCAR (val));
	      if (from < 0 || from > 255)
		args_out_of_range_3 (XCAR (val),
				     make_number (0), make_number (255));
	      to = XINT (XCDR (val));
	      if (to < from || to > 255)
		args_out_of_range_3 (XCDR (val),
				     XCAR (val), make_number (255));
	    }
	  for (i = from; i <= to; i++)
	    XSTRING (valids)->data[i] = 1;
	}
      ASET (attrs, coding_attr_ccl_valids, valids);
      
      category = coding_category_ccl;
    }