Quick Search:

Mode

Context

Displaying 3 lines of context. None | Less | More | Full

Other Diffs

Ignore

Blank Lines Whitespace: Expand:

Diff

1.19
 
1.20
 
MAIN:ragge:20090804192344
 
token.c
_>880880 }
 881881 
 882882 static void
<> 883+skpln(void)
  884+{
  885+        /* just ignore the rest of the line */
  886+        while (inch() != '\n')
  887+                ;
  888+        unch('\n');
  889+        flslvl++;
  890+}
  891+
  892+static void
883893 ifdefstmt(void)         
 884894 {
 885895         int t;
 886896 
 887897         if (flslvl) {
<>888 -                /* just ignore the rest of the line */
 889 -                while (inch() != '\n')
 890 -                        ;
 891 -                unch('\n');
 892 -                flslvl++;
  898+                skpln();
893899                 return;
 894900         }
 895901         do
 896902                 t = sloscan();
 897903         while (t == WSPACE);
 898904         if (t != IDENT)
 899905                 error("bad ifdef");
<>900 -        if (flslvl == 0 && lookup((usch *)yytext, FIND) != 0)
 901 -                trulvl++;
 902 -        else
  906+        if (lookup((usch *)yytext, FIND) == 0) {
  907+                putch('\n');
903908                 flslvl++;
<> 909+        } else
  910+                trulvl++;
904911         chknl(0);
 905912 }
 906913 
     
 !
909916 {
 910917         int t;
 911918 
<> 919+        if (flslvl) {
  920+                skpln();
  921+                return;
  922+        }
912923         do
 913924                 t = sloscan();
 914925         while (t == WSPACE);
 915926         if (t != IDENT)
 916927                 error("bad ifndef");
<>917 -        if (flslvl == 0 && lookup((usch *)yytext, FIND) == 0)
 918 -                trulvl++;
 919 -        else
  928+        if (lookup((usch *)yytext, FIND) != 0) {
  929+                putch('\n');
920930                 flslvl++;
<> 931+        } else
  932+                trulvl++;
921933         chknl(0);
 922934 }
 923935 
     
 !
942954 ifstmt(void)
 943955 {
 944956         if (flslvl == 0) {
<>945 -                if (yyparse())
 946 -                        ++trulvl;
 947 -                else
  957+                if (yyparse() == 0) {
  958+                        putch('\n');
948959                         ++flslvl;
<> 960+                } else
  961+                        ++trulvl;
949962         } else
 950963                 ++flslvl;
 951964 }
     
 !
964977                         if (yyparse()) {
 965978                                 ++trulvl;
 966979                                 prtline();
<>967 -                        } else
  980+                        } else {
  981+                                putch('\n');
968982                                 ++flslvl;
<> 983+                        }
<_969984                 }
 970985         } else if (trulvl) {
 971986                 ++flslvl;
FishEye: Open Source License registered to PCC.
Your maintenance has expired. You can renew your license at http://www.atlassian.com/fisheye/renew
Atlassian FishEye, CVS analysis. (Version:1.6.3 Build:build-336 2008-11-04) - Administration - Page generated 2014-10-31 18:57 +0100