d0p1/tcc-stupidos
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tccpp.c: fix ##-in-macros logic

Browse source 
The old code had an inverted condition, so

    #define a(b)## b

would be accepted while

    #define a(b,c) b ## ## c

would be rejected with the confusing error message "'##' invalid at
start of macro".
This commit is contained in:
Philip 2015-05-02 12:14:14 +00:00
parent a6b94eff79
commit 3a922ad2ba
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tccpp.c
View file

@ -1296,7 +1296,7 @@ ST_FUNC void parse_define(void)
ptok = 0; ptok = 0;
macro_list_start = 1; macro_list_start = 1;
while (tok != TOK_LINEFEED && tok != TOK_EOF) { while (tok != TOK_LINEFEED && tok != TOK_EOF) {
if (!macro_list_start && spc == 2 && tok == TOK_TWOSHARPS) if (macro_list_start && spc == 2 && tok == TOK_TWOSHARPS)
tcc_error("'##' invalid at start of macro"); tcc_error("'##' invalid at start of macro");
ptok = tok; ptok = tok;
/* remove spaces around ## and after '#' */ /* remove spaces around ## and after '#' */
@ -1310,9 +1310,9 @@ ST_FUNC void parse_define(void)
goto skip; goto skip;
} }
tok_str_add2(&str, tok, &tokc); tok_str_add2(&str, tok, &tokc);
macro_list_start = 0;
skip: skip:
next_nomacro_spc(); next_nomacro_spc();
macro_list_start = 0;
} }
if (ptok == TOK_TWOSHARPS) if (ptok == TOK_TWOSHARPS)
tcc_error("'##' invalid at end of macro"); tcc_error("'##' invalid at end of macro");