/[emacs]/emacs/src/syntax.c
ViewVC logotype

Diff of /emacs/src/syntax.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.166.4.7 by handa, Fri Oct 29 00:24:33 2004 UTC revision 1.166.4.8 by miles, Thu Nov 4 08:55:31 2004 UTC
# Line 3023  do { prev_from = from;                         \ Line 3023  do { prev_from = from;                         \
3023        INC_FROM;        INC_FROM;
3024        code = prev_from_syntax & 0xff;        code = prev_from_syntax & 0xff;
3025    
3026        if (code == Scomment)        if (from < end
3027              && SYNTAX_FLAGS_COMSTART_FIRST (prev_from_syntax)
3028              && (c1 = FETCH_CHAR (from_byte),
3029                  SYNTAX_COMSTART_SECOND (c1)))
3030            /* Duplicate code to avoid a complex if-expression
3031               which causes trouble for the SGI compiler.  */
3032          {          {
3033            state.comstyle = SYNTAX_FLAGS_COMMENT_STYLE (prev_from_syntax);            /* Record the comment style we have entered so that only
3034            state.incomment = (SYNTAX_FLAGS_COMMENT_NESTED (prev_from_syntax) ?               the comment-end sequence of the same style actually
3035                               1 : -1);               terminates the comment section.  */
3036              state.comstyle = SYNTAX_COMMENT_STYLE (c1);
3037              comnested = SYNTAX_FLAGS_COMMENT_NESTED (prev_from_syntax);
3038              comnested = comnested || SYNTAX_COMMENT_NESTED (c1);
3039              state.incomment = comnested ? 1 : -1;
3040            state.comstr_start = prev_from;            state.comstr_start = prev_from;
3041              INC_FROM;
3042              code = Scomment;
3043          }          }
3044        else if (code == Scomment_fence)        else if (code == Scomment_fence)
3045          {          {
# Line 3040  do { prev_from = from;                         \ Line 3051  do { prev_from = from;                         \
3051            state.comstr_start = prev_from;            state.comstr_start = prev_from;
3052            code = Scomment;            code = Scomment;
3053          }          }
3054       else if (from < end)        else if (code == Scomment)
3055          if (SYNTAX_FLAGS_COMSTART_FIRST (prev_from_syntax))          {
3056            if (c1 = FETCH_CHAR_AS_MULTIBYTE (from_byte),            state.comstyle = SYNTAX_FLAGS_COMMENT_STYLE (prev_from_syntax);
3057                SYNTAX_COMSTART_SECOND (c1))            state.incomment = (SYNTAX_FLAGS_COMMENT_NESTED (prev_from_syntax) ?
3058              /* Duplicate code to avoid a complex if-expression                               1 : -1);
3059                 which causes trouble for the SGI compiler.  */            state.comstr_start = prev_from;
3060              {          }
               /* 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 = SYNTAX_COMMENT_STYLE (c1);  
               comnested = SYNTAX_FLAGS_COMMENT_NESTED (prev_from_syntax);  
               comnested = comnested || SYNTAX_COMMENT_NESTED (c1);  
               state.incomment = comnested ? 1 : -1;  
               state.comstr_start = prev_from;  
               INC_FROM;  
               code = Scomment;  
             }  
3061    
3062        if (SYNTAX_FLAGS_PREFIX (prev_from_syntax))        if (SYNTAX_FLAGS_PREFIX (prev_from_syntax))
3063          continue;          continue;

Legend:
Removed from v.1.166.4.7  
changed lines
  Added in v.1.166.4.8

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26