d0p1/ack
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix in preprocessor part: macro invocation with parameterlist on the

Browse source 
next line did not work
This commit is contained in:
ceriel 1988-07-29 18:38:25 +00:00
parent 5d247a2055
commit 87c8b648fc
6 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lang/cem/cemcom/domacro.c
View file

@ -288,7 +288,7 @@ do_define()
LoadChar(ch);
}
/* read the replacement text if there is any */
ch = skipspaces(ch); /* find first character of the text */
ch = skipspaces(ch,0); /* find first character of the text */
ASSERT(ch != EOI);
if (class(ch) == STNL) {
/* Treat `#define something' as `#define something ""'
@ -415,7 +415,7 @@ getparams(buf, parbuf)
register char **pbuf2;
LoadChar(c);
c = skipspaces(c);
c = skipspaces(c,0);
if (c == ')') { /* no parameters: #define name() */
*pbuf = (char *) 0;
return 0;
@ -448,7 +448,7 @@ getparams(buf, parbuf)
}
pbuf++;
c = skipspaces(c);
c = skipspaces(c,0);
if (c == ')') { /* end of the formal parameter list */
*pbuf = (char *) 0;
return pbuf - buf;
@ -458,7 +458,7 @@ getparams(buf, parbuf)
return -1;
}
LoadChar(c);
c = skipspaces(c);
c = skipspaces(c,0);
}
/*NOTREACHED*/
}

2
lang/cem/cemcom/replace.c
View file

@ -68,7 +68,7 @@ replace(idef)
return 0;
}
LoadChar(c);
c = skipspaces(c);
c = skipspaces(c,1);
if (c != '(') { /* no replacement if no () */
lexerror("(warning) macro %s needs arguments",
idef->id_text);

4
lang/cem/cemcom/skip.c
View file

@ -14,14 +14,14 @@
#ifndef NOPP
PRIVATE int
skipspaces(ch)
skipspaces(ch, skipnl)
register int ch;
{
/* skipspaces() skips any white space and returns the first
non-space character.
*/
for (;;) {
while (class(ch) == STSKIP)
while (class(ch) == STSKIP || (skipnl && class(ch) == STNL))
LoadChar(ch);
/* How about "\\\n"????????? */

8
util/cpp/domacro.c
View file

@ -307,7 +307,7 @@ do_define()
LoadChar(ch);
}
/* read the replacement text if there is any */
ch = skipspaces(ch); /* find first character of the text */
ch = skipspaces(ch,0); /* find first character of the text */
assert(ch != EOI);
if (class(ch) == STNL) {
/* Treat `#define something' as `#define something ""'
@ -463,7 +463,7 @@ getparams(buf, parbuf)
register char **pbuf2;
LoadChar(c);
c = skipspaces(c);
c = skipspaces(c,0);
if (c == ')') { /* no parameters: #define name() */
*pbuf = (char *) 0;
return 0;
@ -496,7 +496,7 @@ getparams(buf, parbuf)
}
pbuf++;
c = skipspaces(c);
c = skipspaces(c,0);
if (c == ')') { /* end of the formal parameter list */
*pbuf = (char *) 0;
return pbuf - buf;
@ -506,7 +506,7 @@ getparams(buf, parbuf)
return -1;
}
LoadChar(c);
c = skipspaces(c);
c = skipspaces(c,0);
}
/*NOTREACHED*/
}

2
util/cpp/replace.c
View file

@ -64,7 +64,7 @@ replace(idef)
return 0;
}
LoadChar(c);
c = skipspaces(c);
c = skipspaces(c,1);
if (c != '(') { /* no replacement if no () */
error("macro %s needs arguments",
idef->id_text);

7
util/cpp/skip.c
View file

@ -10,7 +10,7 @@
#include "input.h"
int
skipspaces(ch)
skipspaces(ch, skipnl)
register int ch;
{
/* skipspaces() skips any white space and returns the first
@ -19,6 +19,11 @@ skipspaces(ch)
for (;;) {
while (class(ch) == STSKIP)
LoadChar(ch);
if (skipnl && class(ch) == STNL) {
LoadChar(ch);
++LineNumber;
continue;
}
/* How about "\\\n"????????? */
if (ch == '/') {
LoadChar(ch);