comparison src/syntax.c @ 110551:f28cc7ff91f9

Fix int/EMACS_INT use in casefiddle.c and syntax.c. syntax.c (scan_words, update_syntax_table) (prev_char_comend_first, back_comment, skip_chars) (skip_syntaxes, Fforward_comment, Fbackward_prefix_chars): Use EMACS_INT for buffer and string positions. syntax.h (scan_words, update_syntax_table): Adjust prototypes. casefiddle.c (operate_on_word): Use EMACS_INT for buffer positions.

110550:d33e6623664c

   NULL_INTERVAL.  We also update lim_property to be the next value of
   charpos to call this subroutine again - or be before/after the
   start/end of OBJECT.  */

void
update_syntax_table (int charpos, int count, int init, Lisp_Object object)
{
  Lisp_Object tmp_table;
  int cnt = 0, invalidate = 1;
  INTERVAL i;

}

/* Return the SYNTAX_COMEND_FIRST of the character before POS, POS_BYTE.  */

static int
prev_char_comend_first (int pos, int pos_byte)
{
  int c, val;

  DEC_BOTH (pos, pos_byte);
  UPDATE_SYNTAX_TABLE_BACKWARD (pos);

  /* At beginning of range to scan, we're outside of strings;
     that determines quote parity to the comment-end.  */
  while (from != stop)
    {
      int temp_byte, prev_syntax;
      int com2start, com2end;
      int comstart;

      /* Move back and examine a character.  */
      DEC_BOTH (from, from_byte);
      UPDATE_SYNTAX_TABLE_BACKWARD (from);

      /* If a 2-char comment sequence partly overlaps with another,
	 we don't try to be clever.  E.g. |*| in C, or }% in modes that
	 have %..\n and %{..}%.  */
      if (from > stop && (com2end || comstart))
	{
	  int next = from, next_byte = from_byte, next_c, next_syntax;
	  DEC_BOTH (next, next_byte);
	  UPDATE_SYNTAX_TABLE_BACKWARD (next);
	  next_c = FETCH_CHAR_AS_MULTIBYTE (next_byte);
	  next_syntax = SYNTAX_WITH_FLAGS (next_c);
	  if (((comstart || comnested)

/* Return the position across COUNT words from FROM.
   If that many words cannot be found before the end of the buffer, return 0.
   COUNT negative means scan backward and stop at word beginning.  */

int
scan_words (register int from, register int count)
{
  register int beg = BEGV;
  register int end = ZV;
  register int from_byte = CHAR_TO_BYTE (from);
  register enum syntaxcode code;
  int ch0, ch1;
  Lisp_Object func, script, pos;

  immediate_quit = 1;

  unsigned char fastmap[0400];
  /* Store the ranges of non-ASCII characters.  */
  int *char_ranges;
  int n_char_ranges = 0;
  int negate = 0;
  register int i, i_byte;
  /* Set to 1 if the current buffer is multibyte and the region
     contains non-ASCII chars.  */
  int multibyte;
  /* Set to 1 if STRING is multibyte and it contains non-ASCII
     chars.  */
  int string_multibyte;
  int size_byte;
  const unsigned char *str;
  int len;
  Lisp_Object iso_classes;

  CHECK_STRING (string);

	    fastmap[i] = 1;
	}
    }

  {
    int start_point = PT;
    int pos = PT;
    int pos_byte = PT_BYTE;
    unsigned char *p = PT_ADDR, *endp, *stop;

    if (forwardp)
      {
	endp = (XINT (lim) == GPT) ? GPT_ADDR : CHAR_POS_ADDR (XINT (lim));

skip_syntaxes (int forwardp, Lisp_Object string, Lisp_Object lim)
{
  register unsigned int c;
  unsigned char fastmap[0400];
  int negate = 0;
  register int i, i_byte;
  int multibyte;
  int size_byte;
  unsigned char *str;

  CHECK_STRING (string);

  if (NILP (lim))

  if (negate)
    for (i = 0; i < sizeof fastmap; i++)
      fastmap[i] ^= 1;

  {
    int start_point = PT;
    int pos = PT;
    int pos_byte = PT_BYTE;
    unsigned char *p = PT_ADDR, *endp, *stop;

    if (forwardp)
      {
	endp = (XINT (lim) == GPT) ? GPT_ADDR : CHAR_POS_ADDR (XINT (lim));

	    }

	  if (code == Scomment_fence)
	    {
	      /* Skip until first preceding unquoted comment_fence.  */
	      int found = 0, ini = from, ini_byte = from_byte;

	      while (1)
		{
		  DEC_BOTH (from, from_byte);
		  UPDATE_SYNTAX_TABLE_BACKWARD (from);

       0, 0, 0,
       doc: /* Move point backward over any number of chars with prefix syntax.
This includes chars with "quote" or "prefix" syntax (' or p).  */)
  (void)
{
  int beg = BEGV;
  int opoint = PT;
  int opoint_byte = PT_BYTE;
  int pos = PT;
  int pos_byte = PT_BYTE;
  int c;

  if (pos <= beg)
    {
      SET_PT_BOTH (opoint, opoint_byte);

110551:f28cc7ff91f9

   NULL_INTERVAL.  We also update lim_property to be the next value of
   charpos to call this subroutine again - or be before/after the
   start/end of OBJECT.  */

void
update_syntax_table (EMACS_INT charpos, int count, int init,
		     Lisp_Object object)
{
  Lisp_Object tmp_table;
  int cnt = 0, invalidate = 1;
  INTERVAL i;

}

/* Return the SYNTAX_COMEND_FIRST of the character before POS, POS_BYTE.  */

static int
prev_char_comend_first (EMACS_INT pos, EMACS_INT pos_byte)
{
  int c, val;

  DEC_BOTH (pos, pos_byte);
  UPDATE_SYNTAX_TABLE_BACKWARD (pos);

  /* At beginning of range to scan, we're outside of strings;
     that determines quote parity to the comment-end.  */
  while (from != stop)
    {
      EMACS_INT temp_byte;
      int prev_syntax, com2start, com2end;
      int comstart;

      /* Move back and examine a character.  */
      DEC_BOTH (from, from_byte);
      UPDATE_SYNTAX_TABLE_BACKWARD (from);

      /* If a 2-char comment sequence partly overlaps with another,
	 we don't try to be clever.  E.g. |*| in C, or }% in modes that
	 have %..\n and %{..}%.  */
      if (from > stop && (com2end || comstart))
	{
	  EMACS_INT next = from, next_byte = from_byte;
	  int next_c, next_syntax;
	  DEC_BOTH (next, next_byte);
	  UPDATE_SYNTAX_TABLE_BACKWARD (next);
	  next_c = FETCH_CHAR_AS_MULTIBYTE (next_byte);
	  next_syntax = SYNTAX_WITH_FLAGS (next_c);
	  if (((comstart || comnested)

/* Return the position across COUNT words from FROM.
   If that many words cannot be found before the end of the buffer, return 0.
   COUNT negative means scan backward and stop at word beginning.  */

EMACS_INT
scan_words (register EMACS_INT from, register EMACS_INT count)
{
  register EMACS_INT beg = BEGV;
  register EMACS_INT end = ZV;
  register EMACS_INT from_byte = CHAR_TO_BYTE (from);
  register enum syntaxcode code;
  int ch0, ch1;
  Lisp_Object func, script, pos;

  immediate_quit = 1;

  unsigned char fastmap[0400];
  /* Store the ranges of non-ASCII characters.  */
  int *char_ranges;
  int n_char_ranges = 0;
  int negate = 0;
  register EMACS_INT i, i_byte;
  /* Set to 1 if the current buffer is multibyte and the region
     contains non-ASCII chars.  */
  int multibyte;
  /* Set to 1 if STRING is multibyte and it contains non-ASCII
     chars.  */
  int string_multibyte;
  EMACS_INT size_byte;
  const unsigned char *str;
  int len;
  Lisp_Object iso_classes;

  CHECK_STRING (string);

	    fastmap[i] = 1;
	}
    }

  {
    EMACS_INT start_point = PT;
    EMACS_INT pos = PT;
    EMACS_INT pos_byte = PT_BYTE;
    unsigned char *p = PT_ADDR, *endp, *stop;

    if (forwardp)
      {
	endp = (XINT (lim) == GPT) ? GPT_ADDR : CHAR_POS_ADDR (XINT (lim));

skip_syntaxes (int forwardp, Lisp_Object string, Lisp_Object lim)
{
  register unsigned int c;
  unsigned char fastmap[0400];
  int negate = 0;
  register EMACS_INT i, i_byte;
  int multibyte;
  EMACS_INT size_byte;
  unsigned char *str;

  CHECK_STRING (string);

  if (NILP (lim))

  if (negate)
    for (i = 0; i < sizeof fastmap; i++)
      fastmap[i] ^= 1;

  {
    EMACS_INT start_point = PT;
    EMACS_INT pos = PT;
    EMACS_INT pos_byte = PT_BYTE;
    unsigned char *p = PT_ADDR, *endp, *stop;

    if (forwardp)
      {
	endp = (XINT (lim) == GPT) ? GPT_ADDR : CHAR_POS_ADDR (XINT (lim));

	    }

	  if (code == Scomment_fence)
	    {
	      /* Skip until first preceding unquoted comment_fence.  */
	      int found = 0;
	      EMACS_INT ini = from, ini_byte = from_byte;

	      while (1)
		{
		  DEC_BOTH (from, from_byte);
		  UPDATE_SYNTAX_TABLE_BACKWARD (from);

       0, 0, 0,
       doc: /* Move point backward over any number of chars with prefix syntax.
This includes chars with "quote" or "prefix" syntax (' or p).  */)
  (void)
{
  EMACS_INT beg = BEGV;
  EMACS_INT opoint = PT;
  EMACS_INT opoint_byte = PT_BYTE;
  EMACS_INT pos = PT;
  EMACS_INT pos_byte = PT_BYTE;
  int c;

  if (pos <= beg)
    {
      SET_PT_BOTH (opoint, opoint_byte);