xemacs-beta: src/syntax.c comparison

comparison src/syntax.c @ 185:3d6bfa290dbd r20-3b19

Import from CVS: tag r20-3b19

author	cvs
date	Mon, 13 Aug 2007 09:55:28 +0200
parents	3bb7ccffb0c0
children	a2f645c6b9f8

comparison

equal deleted inserted replaced

-:bcd2674570bf
+:3d6bfa290dbd
 int no_quit_in_re_search;
 /* Tell the regex routines which buffer to access for SYNTAX() lookups
 and the like. */
 struct buffer *regex_emacs_buffer;
 Lisp_Object Vstandard_syntax_table;
 Lisp_Object Vsyntax_designator_chars_string;
 /* This is the internal form of the parse state used in parse-partial-sexp.  */
 Bufpos limit = count > 0 ? BUF_ZV (buf) : BUF_BEGV (buf);
 struct Lisp_Char_Table *mirrortab = XCHAR_TABLE (buf->mirror_syntax_table);
 while (count > 0)
 {
 QUIT;
 while (1)
 	{
 	  if (from == limit)
 	    return 0;
 	  if (word_constituent_p (buf, from, mirrortab))
 	{
 	  from++;
 	}
 count--;
 }
 while (count < 0)
 {
 QUIT;
 while (1)
 return Qt;
 }
 static void scan_sexps_forward (struct buffer *buf,
 				struct lisp_parse_state *,
 				Bufpos from, Bufpos end,
 				int targetdepth, int stopbefore,
 				Lisp_Object oldstate,
 				int commentstop);
 static int
 /* 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
 an even number of string quotes away from the safe place.
 OFROM[I] is position of the earliest comment-starter seen
 which is I+2X quotes from the comment-end.
 PARITY is current parity of quotes from the comment end.  */
 int parity = 0;
 Emchar my_stringend = 0;
 	  styles_match_p =
 	    SYNTAX_STYLES_MATCH_END_P (mirrortab, c,
 				       BUF_FETCH_CHAR (buf, from+1),
 				       mask);
 	}
 /* or are we looking at a 1-char comment start sequence
 	 of the style matching mask? */
 else if (code == Scomment
 	       && SYNTAX_STYLES_MATCH_1CHAR_P (mirrortab, c, mask))
 	{
 	  styles_match_p = 1;
 	}
 /* or possibly, a 2-char comment start sequence */
 else if (from >= stop
 	       && SYNTAX_STYLES_MATCH_START_P (mirrortab, c,
 					       BUF_FETCH_CHAR (buf, from+1),
 					       mask))
 	    }
 	  else if (from < stop
 		   && SYNTAX_START_P (mirrortab, c, BUF_FETCH_CHAR (buf, from+1)))
 	    {
 	      /* we have encountered a 2char comment start sequence and we
 		 are ignoring all text inside comments. we must record
 		 the comment style this sequence begins so that later,
 		 only a comment end of the same style actually ends
 		 the comment section */
 	      code = Scomment;
 	  if (char_quoted (buf, from))
 	    {
 	      from--;
 	      continue;
 	    }
 	  c = BUF_FETCH_CHAR (buf, from);
 	  code = SYNTAX (mirrortab, c);
 	  if (code == Sendcomment)
 	    {
 	  /* else, a 2-char comment start sequence? */
 	  else if (from < stop
 		   && SYNTAX_START_P (mirrortab, c, BUF_FETCH_CHAR (buf, from))
 		   && parse_sexp_ignore_comments)
 	    {
 	      /* we have encountered a comment start sequence and we
 		 are ignoring all text inside comments. we must record
 		 the comment style this sequence begins so that later,
 		 only a comment end of the same style actually ends
 		 the comment section */
 	      code = Scomment;
 	      mask = SYNTAX_COMMENT_MASK_START (mirrortab, c,
 						BUF_FETCH_CHAR (buf, from));
 	      from++;
 	    }
 	  if (SYNTAX_PREFIX_UNSAFE (mirrortab, c))
 	    continue;
 	  switch (code)
 	    {
 		if (CHARP (stermobj))
 		  stringterm = XCHAR (stermobj);
 		else
 		  stringterm = ch;
 while (1)
 		  {
 		    if (from >= stop)
 		      goto lose;
 		    if (BUF_FETCH_CHAR (buf, from) == stringterm)
 		  }
 from++;
 if (!depth && sexpflag) goto done;
 break;
 }
 default:
 break;
 	    }
 	}
 	  switch (((quoted) ? Sword : code))
 	    {
 	    case Sword:
 	    case Ssymbol:
 	      if (depth || !sexpflag) break;
 	      /* This word counts as a sexp; count object finished after
 		 passing it. */
 	      while (from > stop)
 		{
 		  enum syntaxcode syncode;
 		  quoted = char_quoted (buf, from - 1);
 		  if (quoted)
 		    from--;
 		  if (! (quoted
 || (syncode =
 			     SYNTAX (mirrortab, BUF_FETCH_CHAR (buf, from - 1)))
 return scan_lists (buf, XINT (from), XINT (count), 0, 1, !NILP (no_error));
 }
 DEFUN ("backward-prefix-chars", Fbackward_prefix_chars, 0, 1, 0, /*
 Move point backward over any number of chars with prefix syntax.
-This includes chars with \"quote\" or \"prefix\" syntax (' or p).
+This includes chars with "quote" or "prefix" syntax (' or p).
 Optional arg BUFFER defaults to the current buffer.
 */
 (buffer))
 {
 If STOPBEFORE is nonzero, stop at the start of an atom.
 If COMMENTSTOP is nonzero, stop at the start of a comment.  */
 static void
 scan_sexps_forward (struct buffer *buf, struct lisp_parse_state *stateptr,
 		    Bufpos from, Bufpos end,
 		    int targetdepth, int stopbefore,
 		    Lisp_Object oldstate,
 		    int commentstop)
 {
 struct lisp_parse_state state;
 	  mask = SYNTAX_COMMENT_1CHAR_MASK (mirrortab,
 					    BUF_FETCH_CHAR (buf, from-1));
 	  state.comstyle = (mask == SYNTAX_COMMENT_STYLE_B);
 	  state.comstart = from - 1;
 	}
 else if (from < end &&
 	       SYNTAX_START_P (mirrortab, BUF_FETCH_CHAR (buf, from-1),
 			       BUF_FETCH_CHAR (buf, from)))
 	{
 	  /* Record the comment style we have entered so that only
 static void
 update_just_this_syntax_table (struct Lisp_Char_Table *ct)
 {
 struct chartab_range range;
 struct cmst_arg arg;
 arg.mirrortab = ct->mirror_table;
 arg.check_inherit = (CHAR_TABLEP (Vstandard_syntax_table)
 		       && ct != XCHAR_TABLE (Vstandard_syntax_table));
 range.type = CHARTAB_RANGE_ALL;
 map_char_table (ct, &range, cmst_mapfun, &arg);
 Fput_char_table (make_char ('"'), make_int ((int) Sstring),
 		     Vstandard_syntax_table);
 Fput_char_table (make_char ('\\'), make_int ((int) Sescape),
 		     Vstandard_syntax_table);
 {
 CONST char *p;
 for (p = "_-+*/&|<>="; *p; p++)
 	Fput_char_table (make_char (*p), make_int ((int) Ssymbol),
 			 Vstandard_syntax_table);

Mercurial > hg > xemacs-beta

comparison src/syntax.c @ 185:3d6bfa290dbd r20-3b19