meesbs
/
tinycc
forked from Mirrors/tinycc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tccpp: token ## pasting: preserve parts if pasting fails 

for example
    #define LBL(name) _ ## name ## :
    LBL(main)
will give two tokens
    '_main' and ':'
and the warning
master
grischka 2016-10-01 21:57:40 +02:00
parent c5b9ae4e3f
commit 8afb8ccba2
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tccpp.c
View File

@ -3219,7 +3219,7 @@ static int macro_subst_tok(
static int paste_tokens(int t1, CValue *v1, int t2, CValue *v2) static int paste_tokens(int t1, CValue *v1, int t2, CValue *v2)
{ {
CString cstr; CString cstr;
int n; int n, ret = 1;
cstr_new(&cstr); cstr_new(&cstr);
if (t1 != TOK_PLCHLDR) if (t1 != TOK_PLCHLDR)
@ -3237,15 +3237,15 @@ static int paste_tokens(int t1, CValue *v1, int t2, CValue *v2)
break; break;
if (is_space(tok)) if (is_space(tok))
continue; continue;
tcc_warning("pasting <%.*s> and <%s> does not give a valid preprocessing token", tcc_warning("pasting \"%.*s\" and \"%s\" does not give a valid"
n, cstr.data, (char*)cstr.data + n); " preprocessing token", n, cstr.data, (char*)cstr.data + n);
ret = 0;
break; break;
} }
tcc_close(); tcc_close();
//printf("paste <%s>\n", (char*)cstr.data); //printf("paste <%s>\n", (char*)cstr.data);
cstr_free(&cstr); cstr_free(&cstr);
return 0; return ret;
} }
/* handle the '##' operator. Return NULL if no '##' seen. Otherwise /* handle the '##' operator. Return NULL if no '##' seen. Otherwise
@ -3284,13 +3284,15 @@ static inline int *macro_twosharps(const int *ptr0)
/* given 'a##b', remove nosubsts preceding 'b' */ /* given 'a##b', remove nosubsts preceding 'b' */
while ((t1 = *++ptr) == TOK_NOSUBST) while ((t1 = *++ptr) == TOK_NOSUBST)
; ;
if (t1 && t1 != TOK_TWOSHARPS if (t1 && t1 != TOK_TWOSHARPS) {
&& t1 != ':') /* 'a##:' don't build a new token */
{
TOK_GET(&t1, &ptr, &cv1); TOK_GET(&t1, &ptr, &cv1);
if (t != TOK_PLCHLDR || t1 != TOK_PLCHLDR) { if (t != TOK_PLCHLDR || t1 != TOK_PLCHLDR) {
paste_tokens(t, &cval, t1, &cv1); if (paste_tokens(t, &cval, t1, &cv1)) {
t = tok, cval = tokc; t = tok, cval = tokc;
} else {
tok_str_add2(&macro_str1, t, &cval);
t = t1, cval = cv1;
}
} }
} }
} }