Quick Search:

Mode

Context

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

Other Diffs

Ignore

Blank Lines Whitespace: Expand:

Diff

1.14
 
1.15
 
MAIN:ragge:20090312201943
 
token.c
_>7979 #define COMMENT 4
 8080 static int state;
 8181 #define BEGIN state =
 8282 #define YYSTATE state
 8383 
 8484 char yytext[CPPBUF];
<> 85+static int owasnl, wasnl = 1;
8586 
 8687 static void
 8788 unch(int c)
 8889 {
<>89 -        *--ifiles->curptr = c;
  90+                
  91+        --ifiles->curptr;
  92+        if (ifiles->curptr < ifiles->bbuf)
  93+                error("pushback buffer full");
  94+        *ifiles->curptr = c;
9095 }
 9196 
 9297 
 9398 int
 9499 yylex()
 95100 {
<>96 -        static int owasnl, wasnl = 1;
97101         int ch;
 98102         int yyp;
 99103         int os, mixed, haspmd;
 100104 
 101105 zagain:
 102106         yyp = 0;
     
 !
186190                         }
 187191                         break;
 188192                 }
 189193                 unput(ch);
 190194                 yytext[yyp] = 0;
 191195 
<> 196+                if (mixed == 1 && slow && (state == 0 || state == DEF))
  197+                        return IDENT;
  198+
192199                 if (mixed == 0) {
 193200                         if (slow && !YYSTATE)
 194201                                 return IDENT;
 195202                         scale = yytext[0] == '0' ? 8 : 10;
 196203                         goto num;
 197204                 } else if (yytext[0] == '0' &&
     
 !
708715 
 709716         otrulvl = trulvl;
 710717 
 711718         if ((c = yylex()) != 0)
 712719                 error("yylex returned %d", c);
 713720 
<> 721+wasnl = owasnl;
714722         if (otrulvl != trulvl || flslvl)
 715723                 error("unterminated conditional");
 716724 
 717725         ifiles = ic->next;
 718726         close(ic->infil);
 719727         inclevel--;
     
 !
11311139                 putstr((usch *)"#pragma ");
 11321140         do {
 11331141                 c = input();
 11341142                 if (!flslvl)
 11351143                         putch(c);       /* Do arg expansion instead? */
 11361144         } while (c && c != '\n');
<>1137 -        ifiles->lineno++;
  1145+        if (c == '\n')
  1146+                unch(c);
<_11381147         prtline();
 11391148         slow = 0;
 11401149 }
 11411150 
 11421151 static void
 11431152 badop(const char *op)
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-11-01 07:12 +0100