emacs: src/syntax.c comparison

comparison src/syntax.c @ 21207:390b39d69836

(Fbackward_prefix_chars): Set point properly while scanning. (scan_sexps_forward): Make INC_FROM do UPDATE_SYNTAX_TABLE_FORWARD. Delete the explicit calls to UPDATE_SYNTAX_TABLE_FORWARD. Also set prev_from_syntax (new local var). Test that in the loop, instead of fetching syntax of the previous char.

author	Richard M. Stallman <rms@gnu.org>
date	Wed, 18 Mar 1998 00:11:33 +0000
parents	ceb05db73a63
children	fa9ff387d260

comparison

equal deleted inserted replaced

-:dac44ee5f772
+:390b39d69836
 SETUP_SYNTAX_TABLE (pos, -1);
 }
 DEC_BOTH (pos, pos_byte);
-while (pos + 1 > beg && !char_quoted (pos, pos_byte)
+while (!char_quoted (pos, pos_byte)
 	 /* Previous statement updates syntax table.  */
 	 && ((c = FETCH_CHAR (pos_byte), SYNTAX (c) == Squote)
 	     || SYNTAX_PREFIX (c)))
 {
-DEC_BOTH (pos, pos_byte);
+opoint = pos;
+opoint_byte = pos_byte;
+if (pos + 1 > beg)
+	DEC_BOTH (pos, pos_byte);
 }
 SET_PT_BOTH (opoint, opoint_byte);
 return Qnil;
 int mindepth;		/* Lowest DEPTH value seen.  */
 int start_quoted = 0;		/* Nonzero means starting after a char quote */
 Lisp_Object tem;
 int prev_from;		/* Keep one character before FROM.  */
 int prev_from_byte;
+int prev_from_syntax;
 int boundary_stop = commentstop == -1;
 int nofence;
 prev_from = from;
 prev_from_byte = from_byte;
 /* Use this macro instead of `from++'.  */
 #define INC_FROM				\
 do { prev_from = from;				\
 prev_from_byte = from_byte; 		\
+prev_from_syntax				\
+= SYNTAX_WITH_FLAGS (FETCH_CHAR (prev_from_byte)); \
 INC_BOTH (from, from_byte);		\
+UPDATE_SYNTAX_TABLE_FORWARD (from);	\
 } while (0)
 immediate_quit = 1;
 QUIT;
-SETUP_SYNTAX_TABLE (from, 1);
 if (NILP (oldstate))
 {
 depth = 0;
 state.instring = -1;
 if (start_quoted) goto startquotedinstring;
 goto startinstring;
 }
 if (start_quoted) goto startquoted;
+SETUP_SYNTAX_TABLE (prev_from, 1);
+prev_from_syntax = SYNTAX_WITH_FLAGS (FETCH_CHAR (prev_from_byte));
+UPDATE_SYNTAX_TABLE_FORWARD (from);
 while (from < end)
 {
-UPDATE_SYNTAX_TABLE_FORWARD (from);
-code = SYNTAX (FETCH_CHAR (from_byte));
 INC_FROM;
+code = prev_from_syntax & 0xff;
 if (code == Scomment)
 	state.comstr_start = prev_from;
 else if (code == Scomment_fence)
 	{
 	     terminates the comment section.  */
 	  state.comstyle = ( code == Scomment_fence
 			     ? ST_COMMENT_STYLE
 			     : SYNTAX_COMMENT_STYLE (FETCH_CHAR (from_byte)));
 	  state.comstr_start = prev_from;
-	  if (code != Scomment_fence) INC_FROM;
+	  if (code != Scomment_fence)
+	    INC_FROM;
 	  code = Scomment;
 	}
 else if (from < end)
-	if (SYNTAX_COMSTART_FIRST (FETCH_CHAR (prev_from_byte)))
+	if (SYNTAX_FLAGS_COMSTART_FIRST (prev_from_syntax))
 	  if (SYNTAX_COMSTART_SECOND (FETCH_CHAR (from_byte)))
-	    /* Duplicate code to avoid a very complex if-expression
+	    /* Duplicate code to avoid a complex if-expression
 	       which causes trouble for the SGI compiler.  */
 	    {
 	      /* Record the comment style we have entered so that only
 		 the comment-end sequence of the same style actually
 		 terminates the comment section.  */
 	      state.comstyle = ( code == Scomment_fence
 				 ? ST_COMMENT_STYLE
 				 : SYNTAX_COMMENT_STYLE (FETCH_CHAR (from_byte)));
 	      state.comstr_start = prev_from;
-	      if (code != Scomment_fence) INC_FROM;
+	      if (code != Scomment_fence)
+		INC_FROM;
 	      code = Scomment;
 	    }
-if (SYNTAX_PREFIX (FETCH_CHAR (prev_from_byte)))
+if (SYNTAX_FLAGS_PREFIX (prev_from_syntax))
 	continue;
 switch (SWITCH_ENUM_CAST (code))
 	{
 	case Sescape:
 	case Scharquote:
 	  if (stopbefore) goto stop;  /* this arg means stop at sexp start */
 	  curlevel->last = prev_from;
 	symstarted:
 	  while (from < end)
 	    {
-	      UPDATE_SYNTAX_TABLE_FORWARD (from);
 	      switch (SWITCH_ENUM_CAST (SYNTAX (FETCH_CHAR (from_byte))))
 		{
 		case Scharquote:
 		case Sescape:
 		  INC_FROM;
 	    goto done;
 	  if (from != BEGV)
 	    {
 	      /* Enter the loop in the middle so that we find
 		 a 2-char comment ender if we start in the middle of it.  */
-	      prev = FETCH_CHAR (prev_from_byte);
 	      goto startincomment_1;
 	    }
 	  /* At beginning of buffer, enter the loop the ordinary way.  */
 	  state.incomment = 1;
 	  goto commentloop;
 	  if (commentstop || boundary_stop) goto done;
 	commentloop:
 	  while (1)
 	    {
 	      if (from == end) goto done;
-	      UPDATE_SYNTAX_TABLE_FORWARD (from);
 	      prev = FETCH_CHAR (from_byte);
 	      if (SYNTAX (prev) == Sendcomment
 		  && SYNTAX_COMMENT_STYLE (prev) == state.comstyle)
 		/* Only terminate the comment section if the endcomment
 		   of the same style as the start sequence has been
 	      if (state.comstyle == ST_COMMENT_STYLE
 		  && SYNTAX (prev) == Scomment_fence)
 		break;
 	      INC_FROM;
 	    startincomment_1:
-	      if (from < end && SYNTAX_COMEND_FIRST (prev)
+	      if (from < end && SYNTAX_FLAGS_COMEND_FIRST (prev_from_syntax)
 		  && SYNTAX_COMEND_SECOND (FETCH_CHAR (from_byte))
-		  && SYNTAX_COMMENT_STYLE (prev) == state.comstyle)
+		  && (SYNTAX_FLAGS_COMMENT_STYLE (prev_from_syntax)
+		      == state.comstyle))
 		/* Only terminate the comment section if the end-comment
 		   sequence of the same style as the start sequence has
 		   been encountered.  */
 		break;
 	    }
 		int c;
 		if (from >= end) goto done;
 		c = FETCH_CHAR (from_byte);
 		if (nofence && c == state.instring) break;
-		UPDATE_SYNTAX_TABLE_FORWARD (from);
 		switch (SWITCH_ENUM_CAST (SYNTAX (c)))
 		  {
 		  case Sstring_fence:
 		    if (!nofence) goto string_end;
 		    break;

Mercurial > emacs

comparison src/syntax.c @ 21207:390b39d69836