comparison src/coding.c @ 89448:de8b460070cc

(setup_coding_system): If coding has post-read-conversion or pre-write-conversion, set CODING_REQUIRE_DECODING_MASK and CODING_REQUIRE_ENCODING_MASK respectively. (decode_coding_gap): Run post-read-conversion if any.

89447:afecc4e131a1

  coding->mode = 0;
  coding->head_ascii = -1;
  coding->common_flags
    = (VECTORP (eol_type) ? CODING_REQUIRE_DETECTION_MASK : 0);

  val = CODING_ATTR_SAFE_CHARSETS (attrs);
  coding->max_charset_id = XSTRING (val)->size - 1;
  coding->safe_charsets = (char *) XSTRING (val)->data;
  coding->default_char = XINT (CODING_ATTR_DEFAULT_CHAR (attrs));

decode_coding_gap (coding, chars, bytes)
     struct coding_system *coding;
     EMACS_INT chars, bytes;
{
  int count = specpdl_ptr - specpdl;
  Lisp_Object buffer;

  buffer = Fcurrent_buffer ();
  code_conversion_save (buffer, 0, 0);

  coding->src_chars = chars;
  coding->src_bytes = bytes;
  coding->src_pos = -chars;
  coding->src_pos_byte = -bytes;
  coding->src_multibyte = chars < bytes;
  coding->dst_object = coding->src_object;
  coding->dst_pos = PT;
  coding->dst_pos_byte = PT_BYTE;
  coding->dst_multibyte = ! NILP (current_buffer->enable_multibyte_characters);
  coding->mode |= CODING_MODE_LAST_BLOCK;

  if (CODING_REQUIRE_DETECTION (coding))
    detect_coding (coding);
    
  decode_coding (coding);

  unbind_to (count, Qnil);
  return coding->result;
}

89448:de8b460070cc

  coding->mode = 0;
  coding->head_ascii = -1;
  coding->common_flags
    = (VECTORP (eol_type) ? CODING_REQUIRE_DETECTION_MASK : 0);
  if (! NILP (CODING_ATTR_POST_READ (attrs)))
    coding->common_flags |= CODING_REQUIRE_DECODING_MASK;
  if (! NILP (CODING_ATTR_PRE_WRITE (attrs)))
    coding->common_flags |= CODING_REQUIRE_ENCODING_MASK;

  val = CODING_ATTR_SAFE_CHARSETS (attrs);
  coding->max_charset_id = XSTRING (val)->size - 1;
  coding->safe_charsets = (char *) XSTRING (val)->data;
  coding->default_char = XINT (CODING_ATTR_DEFAULT_CHAR (attrs));

decode_coding_gap (coding, chars, bytes)
     struct coding_system *coding;
     EMACS_INT chars, bytes;
{
  int count = specpdl_ptr - specpdl;
  Lisp_Object attrs;
  Lisp_Object buffer;

  buffer = Fcurrent_buffer ();
  code_conversion_save (buffer, 0, 0);

  coding->src_chars = chars;
  coding->src_bytes = bytes;
  coding->src_pos = -chars;
  coding->src_pos_byte = -bytes;
  coding->src_multibyte = chars < bytes;
  coding->dst_object = buffer;
  coding->dst_pos = PT;
  coding->dst_pos_byte = PT_BYTE;
  coding->dst_multibyte = ! NILP (current_buffer->enable_multibyte_characters);
  coding->mode |= CODING_MODE_LAST_BLOCK;

  if (CODING_REQUIRE_DETECTION (coding))
    detect_coding (coding);
    
  decode_coding (coding);

  attrs = CODING_ID_ATTRS (coding->id);
  if (! NILP (CODING_ATTR_POST_READ (attrs)))
    {
      struct gcpro gcpro1;
      EMACS_INT prev_Z = Z, prev_Z_BYTE = Z_BYTE;
      Lisp_Object val;

      TEMP_SET_PT_BOTH (coding->dst_pos, coding->dst_pos_byte);
      GCPRO1 (buffer);
      val = call1 (CODING_ATTR_POST_READ (attrs),
		   make_number (coding->produced_char));
      UNGCPRO;
      CHECK_NATNUM (val);
      coding->produced_char += Z - prev_Z;
      coding->produced += Z_BYTE - prev_Z_BYTE;
    }

  unbind_to (count, Qnil);
  return coding->result;
}