comparison src/regex.c @ 23670:40072cd9d21c

(regex_compile): Handle translation of multibyte exact-match characters.

23669:32b916f68c79

	/* Expects the character in `c'.  */
	normal_char:
	  p1 = p - 1;		/* P1 points the head of C.  */
#ifdef emacs
	  if (bufp->multibyte)
	    /* Set P to the next character boundary.  */
	    p += MULTIBYTE_FORM_LENGTH (p1, pend - p1) - 1;
#endif
	      /* If no exactn currently being built.  */
	  if (!pending_exact

	      /* If last exactn not at current position.  */

	      BUF_PUSH_2 (exactn, 0);
	      pending_exact = b - 1;
	    }

	  /* Here, C may translated, therefore C may not equal to *P1. */
	  while (1)
	    {
	      BUF_PUSH (c);
	      (*pending_exact)++;
	      if (++p1 == p)
		break;

	      /* Rest of multibyte form should be copied literally. */
	      c = *(unsigned char *)p1;
	    }
	  break;
	} /* switch (c) */
    } /* while p != pend */

23670:40072cd9d21c

	/* Expects the character in `c'.  */
	normal_char:
	  p1 = p - 1;		/* P1 points the head of C.  */
#ifdef emacs
	  if (bufp->multibyte)
	    {
	      c = STRING_CHAR (p1, pend - p1);
	      c = TRANSLATE (c);
	      /* Set P to the next character boundary.  */
	      p += MULTIBYTE_FORM_LENGTH (p1, pend - p1) - 1;
	    }
#endif
	      /* If no exactn currently being built.  */
	  if (!pending_exact

	      /* If last exactn not at current position.  */

	      BUF_PUSH_2 (exactn, 0);
	      pending_exact = b - 1;
	    }

#ifdef emacs
	  if (! SINGLE_BYTE_CHAR_P (c))
	    {
	      unsigned char work[4], *str;
	      int i = CHAR_STRING (c, work, str);
	      int j;
	      for (j = 0; j < i; j++)
		{
		  BUF_PUSH (str[j]);
		  (*pending_exact)++;
		}
	    }
	  else
#endif
	    {
	      BUF_PUSH (c);
	      (*pending_exact)++;
	    }
	  break;
	} /* switch (c) */
    } /* while p != pend */