Quick Search:

Mode

Context

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

Other Diffs

Ignore

Blank Lines Whitespace: Expand:

Diff

1.43
 
1.44
 
MAIN:ragge:20110116115554
 
token.c
_>8888 #define MAX_INCLEVEL    100
 8989 static int inclevel;
 9090 
 9191 /* get next character unaltered */
 9292 #define NXTCH() (ifiles->curptr < ifiles->maxread ? *ifiles->curptr++ : inpch())
 9393 
<>94 -#ifdef YYTEXT_POINTER
 95 -static char buf[CPPBUF];
 96 -char *yytext = buf;
 97 -#else
 98 -char yytext[CPPBUF];
 99 -#endif
  94+usch yytext[CPPBUF];
10095 
 10196 char spechr[256] = {
 10297         0,      0,      0,      0,      C_SPECC_SPEC0,      0,
 10398         0,      C_WSNLC_SPEC|C_WSNL,  0,
 10499         0,      C_WSNL0,      0,
 105100         0,      0,      0,      0,      0,      0,      0,      0,
     
 !
166161                         printf("fastscan ch %d (%c)\n", ch, ch > 31 ? ch : '@');
 167162                 if ((spechr[ch] & C_SPEC) == 0) {
 168163                         PUTCH(ch);
 169164                         continue;
 170165                 }
 171166                 switch (ch) {
<>172 -                case EXP:
 173 -                case NEX:
  167+                case EBLOCK:
174168                 case WARN:
 175169                 case CONC:
 176170                         error("bad char passed");
 177171                         break;
 178172 
 179173                 case '/': /* Comments */
     
 !
251245                         }
 252246                         goto xloop;
 253247 
 254248                 case '\"': /* strings */
 255249 str:                    PUTCH(ch);
 256250                         while ((ch = inch()) != '\"') {
<>257 -                                if (ch == EXP)
 258 -                                        doexp();
 259 -                                else if (ch == NEX)
 260 -                                        donex();
 261 -                                else if (ch != CONC) /* XXX ??? */
262251                                         PUTCH(ch);
 263252                                 if (ch == '\\') {
 264253                                         ch = inch();
 265254                                         PUTCH(ch);
 266255                                 }
 267256                                 if (ch < 0)
     
 !
614603                 } else
 615604                         cvtdig(yytext[0] != '0' ? 10 :
 616605                             yytext[1] == 'x' || yytext[1] == 'X' ? 16 : 8);
 617606                 return NUMBER;
 618607 
 619608         case IDENT:
<>620 -                if (strcmp(yytext, "defined") == 0) {
  609+                if (strcmp((char *)yytext, "defined") == 0) {
621610                         ifdef = 1;
 622611                         return DEFINED;
 623612                 }
 624613                 nl = lookup((usch *)yytext, FIND);
 625614                 if (ifdef) {
 626615                         yylval.node.nd_val = nl != NULL;
     
 !
858847  */
 859848 static void
 860849 cvtdig(int rad)
 861850 {
 862851         unsigned long long rv = 0;
 863852         unsigned long long rv2 = 0;
<>864 -        char *y = yytext;
  853+        usch *y = yytext;
865854         int c;
 866855 
 867856         c = *y++;
 868857         if (rad == 16)
 869858                 y++;
 870859         while (isxdigit(c)) {
     
 !
11561145 {
 11571146         int c;
 11581147 
 11591148         if (sloscan() != WSPACE)
 11601149                 error("bad pragma");
 11611150         if (!flslvl)
<>1162 -                putstr((const usch *)"#pragma ");
  1151+                putstr((const usch *)"\n#pragma ");
<_11631152         do {
 11641153                 c = inch();
 11651154                 if (!flslvl)
 11661155                         putch(c);       /* Do arg expansion instead? */
 11671156         } while (c && c != '\n');
 11681157         if (c == '\n')
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 10:48 +0100