comparison src/syntax.c @ 18079:5fbb5aef5649

(back_comment): Detect 2-char comment starts properly. New arg COMSTYLE; callers changed.

18078:cd5f9bda791e

   of comment.  Global syntax data remains valid for
   backward search starting at the returned value (or at FROM, if
   the search was not successful).  */

static int
back_comment (from, stop)
     int from, stop;
{
  /* Look back, counting the parity of string-quotes,
     and recording the comment-starters seen.
     When we reach a safe place, assume that's not in a string;
     then step the main scan to the earliest comment-starter seen

  int comment_end = from;
  int comstart_pos = 0;
  int comstart_parity = 0;
  int scanstart = from - 1;
  register enum syntaxcode code;
  int c, comstyle = 0;

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

	  c = FETCH_CHAR (from);
	}
			
      /* If this char starts a 2-char comment start sequence,
	 treat it like a 1-char comment starter.  */
      if (from < scanstart && SYNTAX_COMSTART_FIRST (c)
	  && SYNTAX_COMSTART_SECOND (FETCH_CHAR (from + 1))
	  && comstyle == SYNTAX_COMMENT_STYLE (FETCH_CHAR (from + 1)))
	code = Scomment;

      /* Ignore escaped characters.  */
      if (char_quoted (from))
	continue;

			break;
		    }
		  break;
		}
#endif /* 0 */
	      found = back_comment (from, stop);
	      if (found != -1) from = found;
#if 0
	      /* Look back, counting the parity of string-quotes,
		 and recording the comment-starters seen.
		 When we reach a safe place, assume that's not in a string;

			break;
		    }
		  break;
		}
#endif /* 0 */
	      found = back_comment (from, stop);
	      if (found != -1) from = found;
#if 0
	      /* Look back, counting the parity of string-quotes,
		 and recording the comment-starters seen.
		 When we reach a safe place, assume that's not in a string;

18079:5fbb5aef5649

   of comment.  Global syntax data remains valid for
   backward search starting at the returned value (or at FROM, if
   the search was not successful).  */

static int
back_comment (from, stop, comstyle)
     int from, stop, comstyle;
{
  /* Look back, counting the parity of string-quotes,
     and recording the comment-starters seen.
     When we reach a safe place, assume that's not in a string;
     then step the main scan to the earliest comment-starter seen

  int comment_end = from;
  int comstart_pos = 0;
  int comstart_parity = 0;
  int scanstart = from - 1;
  register enum syntaxcode code;
  int c;

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

	  c = FETCH_CHAR (from);
	}
			
      /* If this char starts a 2-char comment start sequence,
	 treat it like a 1-char comment starter.  */
      if (from < scanstart && SYNTAX_COMSTART_SECOND (c)
	  && SYNTAX_COMSTART_FIRST (FETCH_CHAR (from - 1))
	  && comstyle == SYNTAX_COMMENT_STYLE (c))
	{
	  code = Scomment;
	  DEC_POS (from);
	  /* This is apparently the best we can do: */
	  UPDATE_SYNTAX_TABLE_BACKWARD (from);
	  c = FETCH_CHAR (from);
	}

      /* Ignore escaped characters.  */
      if (char_quoted (from))
	continue;

			break;
		    }
		  break;
		}
#endif /* 0 */
	      found = back_comment (from, stop, comstyle);
	      if (found != -1) from = found;
#if 0
	      /* Look back, counting the parity of string-quotes,
		 and recording the comment-starters seen.
		 When we reach a safe place, assume that's not in a string;

			break;
		    }
		  break;
		}
#endif /* 0 */
	      found = back_comment (from, stop, comstyle);
	      if (found != -1) from = found;
#if 0
	      /* Look back, counting the parity of string-quotes,
		 and recording the comment-starters seen.
		 When we reach a safe place, assume that's not in a string;