comparison src/charset.c @ 20614:a4800f9842e4

(multibyte_chars_in_text): New function. (Fstring): Use make_multibyte_string. (Fcompose_string): Likewise. (Ffind_charset_string): Handle bytes vs chars in string. Special case for single-byte strings. (Fchars_in_string): Function deleted. (Fstring): Renamed from Fconcat_chars. Handle bytes vs chars in string. (syms_of_charset): Corresponding changes.

20613:e0ed7fc921fa

  int charsets[MAX_CHARSET + 1];
  int i;
  Lisp_Object val;

  CHECK_STRING (str, 0);
  bzero (charsets, (MAX_CHARSET + 1) * sizeof (int));
  find_charset_in_str (XSTRING (str)->data, XSTRING (str)->size,
		       charsets, table);
  val = Qnil;
  for (i = MAX_CHARSET; i >= 0; i--)
    if (charsets[i])
      val = Fcons (CHARSET_SYMBOL (i), val);

  if (!CHARSET_DEFINED_P (charset))
    error ("Invalid character: %d", XINT (ch));
  return CHARSET_TABLE_INFO (charset, CHARSET_DIRECTION_IDX);
}

DEFUN ("chars-in-string", Fchars_in_string, Schars_in_string, 1, 1, 0,
  "Return number of characters in STRING.\n\
When using multibyte characters, this is not the necessarily same as\n\
the length of STRING; the length counts a multibyte characters as\n\
several bytes, but this function counts a multibyte character as one\n\
character.")
  (str)
     Lisp_Object str;
{
  Lisp_Object val;
  unsigned char *p, *endp;
  int chars;

  CHECK_STRING (str, 0);

  if (NILP (current_buffer->enable_multibyte_characters))
    return make_number (XSTRING (str)->size);

  p = XSTRING (str)->data; endp = p + XSTRING (str)->size;
  chars = 0;
  while (p < endp)
    {
      if (*p == LEADING_CODE_COMPOSITION)
	{
	  p++;
	  while (p < endp && ! CHAR_HEAD_P (*p)) p++;
	}
      else
	p += BYTES_BY_CHAR_HEAD (*p);
      chars++;
    }

  XSETFASTINT (val, chars);
  return val;
}

DEFUN ("chars-in-region", Fchars_in_region, Schars_in_region, 2, 2, 0,
  "Return number of characters between BEG and END.")
  (beg, end)
     Lisp_Object beg, end;
{

  to = max (XFASTINT (beg), XFASTINT (end));

  return to - from;
}

int
chars_in_text (ptr, nbytes)
     unsigned char *ptr;
     int nbytes;
{
  unsigned char *endp;
  int chars;

  if (NILP (current_buffer->enable_multibyte_characters))
    return nbytes;

  endp = ptr + nbytes;
  chars = 0;

    }

  return chars;
}

DEFUN ("concat-chars", Fconcat_chars, Sconcat_chars, 1, MANY, 0,
  "Concatenate all the argument characters and make the result a string.")
  (n, args)
     int n;
     Lisp_Object *args;
{

	/* C is a composite character.  */
	bcopy (str, p, len);
      p += len;
    }

  val = make_string (buf, p - buf);
  return val;
}

#endif /* emacs */


  CHECK_STRING (str, 0);

  buf[0] = LEADING_CODE_COMPOSITION;
  p = XSTRING (str)->data;
  pend = p + XSTRING (str)->size;
  i = 1;
  while (p < pend)
    {
      if (*p < 0x20 || *p == 127) /* control code */
	error ("Invalid component character: %d", *p);

  if (i < 5)
    /* STR contains only one character, which can't be composed.  */
    error ("Too short string to be composed: %s", XSTRING (str)->data);

  return make_string (buf, i);
}


charset_id_internal (charset_name)
     char *charset_name;

  defsubr (&Schar_valid_p);
  defsubr (&Schar_bytes);
  defsubr (&Schar_width);
  defsubr (&Sstring_width);
  defsubr (&Schar_direction);
  defsubr (&Schars_in_string);
  defsubr (&Schars_in_region);
  defsubr (&Sconcat_chars);
  defsubr (&Scmpcharp);
  defsubr (&Scmpchar_component);
  defsubr (&Scmpchar_cmp_rule);
  defsubr (&Scmpchar_cmp_rule_p);
  defsubr (&Scmpchar_cmp_count);

20614:a4800f9842e4

  int charsets[MAX_CHARSET + 1];
  int i;
  Lisp_Object val;

  CHECK_STRING (str, 0);

  if (! STRING_MULTIBYTE (str))
    return Qnil;

  bzero (charsets, (MAX_CHARSET + 1) * sizeof (int));
  find_charset_in_str (XSTRING (str)->data, XSTRING (str)->size_byte,
		       charsets, table);
  val = Qnil;
  for (i = MAX_CHARSET; i >= 0; i--)
    if (charsets[i])
      val = Fcons (CHARSET_SYMBOL (i), val);

  if (!CHARSET_DEFINED_P (charset))
    error ("Invalid character: %d", XINT (ch));
  return CHARSET_TABLE_INFO (charset, CHARSET_DIRECTION_IDX);
}

DEFUN ("chars-in-region", Fchars_in_region, Schars_in_region, 2, 2, 0,
  "Return number of characters between BEG and END.")
  (beg, end)
     Lisp_Object beg, end;
{

  to = max (XFASTINT (beg), XFASTINT (end));

  return to - from;
}

/* Return the number of characters in the NBYTES bytes at PTR.
   This works by looking at the contents and checking for multibyte sequences.
   However, if the current buffer has enable-multibyte-characters = nil,
   we treat each byte as a character.  */

int
chars_in_text (ptr, nbytes)
     unsigned char *ptr;
     int nbytes;
{
  unsigned char *endp;
  int chars;

  /* current_buffer is null at early stages of Emacs initialization.  */
  if (current_buffer == 0
      || NILP (current_buffer->enable_multibyte_characters))
    return nbytes;

  endp = ptr + nbytes;
  chars = 0;

    }

  return chars;
}

/* Return the number of characters in the NBYTES bytes at PTR.
   This works by looking at the contents and checking for multibyte sequences.
   It ignores enable-multibyte-characters.  */

int
multibyte_chars_in_text (ptr, nbytes)
     unsigned char *ptr;
     int nbytes;
{
  unsigned char *endp;
  int chars;

  endp = ptr + nbytes;
  chars = 0;

  while (ptr < endp)
    {
      if (*ptr == LEADING_CODE_COMPOSITION)
	{
	  ptr++;
	  while (ptr < endp && ! CHAR_HEAD_P (*ptr)) ptr++;
	}
      else
	ptr += BYTES_BY_CHAR_HEAD (*ptr);
      chars++;
    }

  return chars;
}

DEFUN ("string", Fstring, Sstring, 1, MANY, 0,
  "Concatenate all the argument characters and make the result a string.")
  (n, args)
     int n;
     Lisp_Object *args;
{

	/* C is a composite character.  */
	bcopy (str, p, len);
      p += len;
    }

  val = make_multibyte_string (buf, n, p - buf);
  return val;
}

#endif /* emacs */


  CHECK_STRING (str, 0);

  buf[0] = LEADING_CODE_COMPOSITION;
  p = XSTRING (str)->data;
  pend = p + XSTRING (str)->size_byte;
  i = 1;
  while (p < pend)
    {
      if (*p < 0x20 || *p == 127) /* control code */
	error ("Invalid component character: %d", *p);

  if (i < 5)
    /* STR contains only one character, which can't be composed.  */
    error ("Too short string to be composed: %s", XSTRING (str)->data);

  return make_multibyte_string (buf, 1, i);
}


charset_id_internal (charset_name)
     char *charset_name;

  defsubr (&Schar_valid_p);
  defsubr (&Schar_bytes);
  defsubr (&Schar_width);
  defsubr (&Sstring_width);
  defsubr (&Schar_direction);
  defsubr (&Schars_in_region);
  defsubr (&Sstring);
  defsubr (&Scmpcharp);
  defsubr (&Scmpchar_component);
  defsubr (&Scmpchar_cmp_rule);
  defsubr (&Scmpchar_cmp_rule_p);
  defsubr (&Scmpchar_cmp_count);