Quick Search:

Mode

Context

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

Other Diffs

Ignore

Blank Lines Whitespace: Expand:

Diff

1.92
 
1.93
 
MAIN:ragge:20080818205043
 
cpp.c
_>969969 struct recur *rp;
 970970 {
 971971         struct recur rp2;
<>972 -        register usch *vp, *cp;
 973 -        int c, rv = 0, ws;
  972+        register usch *vp, *cp, *obp;
  973+        int c, nl;
974974 
 975975         DPRINT(("subst: %s\n", sp->namep));
 976976         /*
     
 !
996996 
 997997                 /* should we be here at all? */
 998998                 /* check if identifier is followed by parentheses */
<>999 -                rv = 1;
 1000 -                ws = 0;
  999+
  1000+                obp = stringbuf;
  1001+                nl = 0;
10011002                 do {
<>1002 -                        c = yylex();
  1003+                        c = cinput();
  1004+                        *stringbuf++ = c;
10031005                         if (c == WARN) {
 10041006                                 gotwarn++;
 10051007                                 if (rp == NULL)
<>1006 -                                        goto noid;
 1007 -                        } else if (c == WSPACE || c == '\n')
 1008 -                                ws = 1;
 1009 -                } while (c == WSPACE || c == '\n' || c == WARN);
  1008+                                        break;
  1009+                        }
  1010+                        if (c == '\n')
  1011+                                nl++;
  1012+                } while (c == ' ' || c == '\t' || c == '\n' ||
  1013+                            c == '\r' || c == WARN);
10101014 
<>1011 -                cp = (usch *)yytext;
 1012 -                while (*cp)
 1013 -                        cp++;
 1014 -                while (cp > (usch *)yytext)
 1015 -                        cunput(*--cp);
10161015                 DPRINT(("c %d\n", c));
 10171016                 if (c == '(' ) {
<> 1017+                        cunput(c);
  1018+                        stringbuf = obp;
  1019+                        ifiles->lineno += nl;
10181020                         expdef(vp, &rp2, gotwarn);
<>1019 -                        return rv;
  1021+                        return 1;
10201022                 } else {
<>1021 -                        /* restore identifier */
 1022 -noid:                   while (gotwarn--)
 1023 -                                cunput(WARN);
 1024 -                        if (ws)
 1025 -                                cunput(' ');
 1026 -                        cp = sp->namep;
 1027 -                        while (*cp)
 1028 -                                cp++;
 1029 -                        while (cp > sp->namep)
 1030 -                                cunput(*--cp);
  1023+                        *stringbuf = 0;
  1024+                        unpstr(obp);
  1025+                        unpstr(sp->namep);
10311026                         if ((c = yylex()) != IDENT)
 10321027                                 error("internal sync error");
<> 1028+                        stringbuf = obp;
<_10331029                         return 0;
 10341030                 }
 10351031         } else {
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-30 15:33 +0100