OSO/TinyCC
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tcc -E: append a ' ' after subst

Browse Source 
We need a ' ' after subst of m in the following case

    #define m(name,r)  name ## r
    #define m0(a,b,c) int m(a,b)   c
    #define m1(a,b,c) int m(a,b)c
    m0(a, b, c);
    m1(a, b, c);
This commit is contained in:
Changming Xu
2011-02-27 10:15:15 +08:00
parent 1b85b55059
commit 185fba4189
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tccpp.c
View File

@ -2851,6 +2851,9 @@ static void macro_subst(TokenString *tok_str, Sym **nested_list,
/* first scan for '##' operator handling */ /* first scan for '##' operator handling */
ptr = macro_str; ptr = macro_str;
macro_str1 = macro_twosharps(ptr); macro_str1 = macro_twosharps(ptr);
/* a ' ' after subst */
int append_space = 0;
if (macro_str1) if (macro_str1)
ptr = macro_str1; ptr = macro_str1;
spc = 0; spc = 0;
@ -2888,8 +2891,15 @@ static void macro_subst(TokenString *tok_str, Sym **nested_list,
*can_read_stream = ml.prev; *can_read_stream = ml.prev;
if (ret != 0) if (ret != 0)
goto no_subst; goto no_subst;
if (parse_flags & PARSE_FLAG_SPACES)
append_space = 1;
} else { } else {
no_subst: no_subst:
if (append_space) {
tok_str_add(tok_str, ' ');
spc = 1;
append_space = 0;
}
if (!check_space(t, &spc)) if (!check_space(t, &spc))
tok_str_add2(tok_str, t, &cval); tok_str_add2(tok_str, t, &cval);
} }