/[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.152.4.10 by miles, Sat Sep 4 09:26:26 2004 UTC revision 1.152.4.11 by miles, Fri Oct 29 02:05:10 2004 UTC
# Line 2799  do { prev_from = from;                         \ Line 2799  do { prev_from = from;                         \
2799        INC_FROM;        INC_FROM;
2800        code = prev_from_syntax & 0xff;        code = prev_from_syntax & 0xff;
2801    
2802        if (code == Scomment)        if (from < end
2803              && SYNTAX_FLAGS_COMSTART_FIRST (prev_from_syntax)
2804              && (c1 = FETCH_CHAR (from_byte),
2805                  SYNTAX_COMSTART_SECOND (c1)))
2806            /* Duplicate code to avoid a complex if-expression
2807               which causes trouble for the SGI compiler.  */
2808          {          {
2809            state.comstyle = SYNTAX_FLAGS_COMMENT_STYLE (prev_from_syntax);            /* Record the comment style we have entered so that only
2810            state.incomment = (SYNTAX_FLAGS_COMMENT_NESTED (prev_from_syntax) ?               the comment-end sequence of the same style actually
2811                               1 : -1);               terminates the comment section.  */
2812              state.comstyle = SYNTAX_COMMENT_STYLE (c1);
2813              comnested = SYNTAX_FLAGS_COMMENT_NESTED (prev_from_syntax);
2814              comnested = comnested || SYNTAX_COMMENT_NESTED (c1);
2815              state.incomment = comnested ? 1 : -1;
2816            state.comstr_start = prev_from;            state.comstr_start = prev_from;
2817              INC_FROM;
2818              code = Scomment;
2819          }          }
2820        else if (code == Scomment_fence)        else if (code == Scomment_fence)
2821          {          {
# Line 2816  do { prev_from = from;                         \ Line 2827  do { prev_from = from;                         \
2827            state.comstr_start = prev_from;            state.comstr_start = prev_from;
2828            code = Scomment;            code = Scomment;
2829          }          }
2830       else if (from < end)        else if (code == Scomment)
2831          if (SYNTAX_FLAGS_COMSTART_FIRST (prev_from_syntax))          {
2832            if (c1 = FETCH_CHAR (from_byte),            state.comstyle = SYNTAX_FLAGS_COMMENT_STYLE (prev_from_syntax);
2833                SYNTAX_COMSTART_SECOND (c1))            state.incomment = (SYNTAX_FLAGS_COMMENT_NESTED (prev_from_syntax) ?
2834              /* Duplicate code to avoid a complex if-expression                               1 : -1);
2835                 which causes trouble for the SGI compiler.  */            state.comstr_start = prev_from;
2836              {          }
               /* 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;  
             }  
2837    
2838        if (SYNTAX_FLAGS_PREFIX (prev_from_syntax))        if (SYNTAX_FLAGS_PREFIX (prev_from_syntax))
2839          continue;          continue;

Legend:
Removed from v.1.152.4.10  
changed lines
  Added in v.1.152.4.11

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