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

tccpp: fix token pasting ##

Browse source 
This patch takes advantage of new function tcc_open_bf
from previous commit.
This commit is contained in:
grischka 2010-11-25 13:30:31 +01:00
parent e97bf88bad
commit 44e84bb22a
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
tccpp.c
View file

@ -2776,7 +2776,6 @@ static inline int *macro_twosharps(const int *macro_str)
CValue cval; CValue cval;
TokenString macro_str1; TokenString macro_str1;
CString cstr; CString cstr;
char *p;
int n; int n;
/* we search the first '##' */ /* we search the first '##' */
@ -2809,18 +2808,17 @@ static inline int *macro_twosharps(const int *macro_str)
cstr_cat(&cstr, get_tok_str(t, &cval)); cstr_cat(&cstr, get_tok_str(t, &cval));
cstr_ccat(&cstr, '\0'); cstr_ccat(&cstr, '\0');
p = file->buf_ptr; tcc_open_bf(tcc_state, "<paste>", cstr.size);
file->buf_ptr = cstr.data; memcpy(file->buffer, cstr.data, cstr.size);
for (;;) { for (;;) {
next_nomacro1(); next_nomacro1();
if (0 == *file->buf_ptr) if (0 == *file->buf_ptr)
break; break;
tok_str_add2(&macro_str1, tok, &tokc); tok_str_add2(&macro_str1, tok, &tokc);
warning("pasting \"%.*s\" and \"%s\" does not give a valid preprocessing token", warning("pasting \"%.*s\" and \"%s\" does not give a valid preprocessing token",
n, cstr.data, (char*)cstr.data + n); n, cstr.data, (char*)cstr.data + n);
} }
file->buf_ptr = p; tcc_close();
cstr_reset(&cstr); cstr_reset(&cstr);
} }
} }