comparison src/syntax.c @ 22130:b25abff012fd

(skip_chars): Fix previous change.

22129:d76e72401a73

  int n_char_ranges = 0;
  int negate = 0;
  register int i, i_byte;
  int multibyte = !NILP (current_buffer->enable_multibyte_characters);
  int string_multibyte = STRING_MULTIBYTE (string);

  CHECK_STRING (string, 0);
  char_ranges = (int *) alloca (XSTRING (string)->size * (sizeof (int)) * 2);

  if (NILP (lim))

  bzero (fastmap, sizeof fastmap);

  i = 0, i_byte = 0;

  if (i < XSTRING (string)->size
      && XSTRING (string)->data[0] == '^')
    {
      negate = 1; i++, i_byte++;
    }

  /* Find the characters specified and set their elements of fastmap.
     If syntaxp, each character counts as itself.
     Otherwise, handle backslashes and ranges specially.  */

  while (i < XSTRING (string)->size)
    {
      int c_leading_code;

      if (string_multibyte)
	{
	  c_leading_code = XSTRING (string)->data[i_byte];
	  FETCH_STRING_CHAR_ADVANCE (c, string, i, i_byte);
	}
      else
	c = c_leading_code = XSTRING (string)->data[i++];

      /* Convert multibyteness between what the string has
	 and what the buffer has.  */
      if (multibyte)
	c = unibyte_char_to_multibyte (c);

	fastmap[syntax_spec_code[c & 0377]] = 1;
      else
	{
	  if (c == '\\')
	    {
	      if (i == XSTRING (string)->size)
		break;

	      if (string_multibyte)
		{
		  c_leading_code = XSTRING (string)->data[i];
		  FETCH_STRING_CHAR_ADVANCE (c, string, i, i_byte);
		}
	      else
		c = c_leading_code = XSTRING (string)->data[i++];
	    }
	  if (i < XSTRING (string)->size
	      && XSTRING (string)->data[i_byte] == '-')
	    {
	      unsigned int c2, c2_leading_code;

	      /* Skip over the dash.  */
	      i++, i_byte++;

	      if (i == XSTRING (string)->size)
		break;

	      /* Get the end of the range.  */
	      if (string_multibyte)
		{
		  c2_leading_code = XSTRING (string)->data[i_byte];
		  FETCH_STRING_CHAR_ADVANCE (c2, string, i, i_byte);
		}
	      else
		c2 = XSTRING (string)->data[i++];

	      if (SINGLE_BYTE_CHAR_P (c))
		{
		  if (! SINGLE_BYTE_CHAR_P (c2))
		    error ("Invalid charcter range: %s",

22130:b25abff012fd

  int n_char_ranges = 0;
  int negate = 0;
  register int i, i_byte;
  int multibyte = !NILP (current_buffer->enable_multibyte_characters);
  int string_multibyte = STRING_MULTIBYTE (string);
  int size_byte = STRING_BYTES (XSTRING (string));

  CHECK_STRING (string, 0);
  char_ranges = (int *) alloca (XSTRING (string)->size * (sizeof (int)) * 2);

  if (NILP (lim))

  bzero (fastmap, sizeof fastmap);

  i = 0, i_byte = 0;

  if (i_byte < size_byte
      && XSTRING (string)->data[0] == '^')
    {
      negate = 1; i++, i_byte++;
    }

  /* Find the characters specified and set their elements of fastmap.
     If syntaxp, each character counts as itself.
     Otherwise, handle backslashes and ranges specially.  */

  while (i_byte < size_byte)
    {
      int c_leading_code;

      if (string_multibyte)
	{
	  c_leading_code = XSTRING (string)->data[i_byte];
	  FETCH_STRING_CHAR_ADVANCE (c, string, i, i_byte);
	}
      else
	c = c_leading_code = XSTRING (string)->data[i_byte++];

      /* Convert multibyteness between what the string has
	 and what the buffer has.  */
      if (multibyte)
	c = unibyte_char_to_multibyte (c);

	fastmap[syntax_spec_code[c & 0377]] = 1;
      else
	{
	  if (c == '\\')
	    {
	      if (i_byte == size_byte)
		break;

	      if (string_multibyte)
		{
		  c_leading_code = XSTRING (string)->data[i_byte];
		  FETCH_STRING_CHAR_ADVANCE (c, string, i, i_byte);
		}
	      else
		c = c_leading_code = XSTRING (string)->data[i_byte++];
	    }
	  if (i_byte < size_byte
	      && XSTRING (string)->data[i_byte] == '-')
	    {
	      unsigned int c2, c2_leading_code;

	      /* Skip over the dash.  */
	      i++, i_byte++;

	      if (i_byte == size_byte)
		break;

	      /* Get the end of the range.  */
	      if (string_multibyte)
		{
		  c2_leading_code = XSTRING (string)->data[i_byte];
		  FETCH_STRING_CHAR_ADVANCE (c2, string, i, i_byte);
		}
	      else
		c2 = XSTRING (string)->data[i_byte++];

	      if (SINGLE_BYTE_CHAR_P (c))
		{
		  if (! SINGLE_BYTE_CHAR_P (c2))
		    error ("Invalid charcter range: %s",