github-repos/tinycc
1
0
Fork 0
mirror of https://github.com/mirror/tinycc.git synced 2025-04-03 12:40:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Prevent ## to appear at start or end of macro

Browse Source
This commit is contained in:
Thomas Preud'homme 2014-04-08 22:19:48 +08:00
parent 91d4db600b
commit a715d7143d
6 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tccpp.c
View File

@ -1213,7 +1213,7 @@ static void tok_print(int *str)
ST_FUNC void parse_define(void) ST_FUNC void parse_define(void)
{ {
Sym *s, *first, **ps; Sym *s, *first, **ps;
int v, t, varg, is_vaargs, spc; int v, t, varg, is_vaargs, spc, ptok, macro_list_start;
TokenString str; TokenString str;
v = tok; v = tok;
@ -1254,7 +1254,12 @@ ST_FUNC void parse_define(void)
tok_str_new(&str); tok_str_new(&str);
spc = 2; spc = 2;
/* EOF testing necessary for '-D' handling */ /* EOF testing necessary for '-D' handling */
ptok = 0;
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)
tcc_error("'##' invalid at start of macro");
ptok = tok;
/* remove spaces around ## and after '#' */ /* remove spaces around ## and after '#' */
if (TOK_TWOSHARPS == tok) { if (TOK_TWOSHARPS == tok) {
if (1 == spc) if (1 == spc)
@ -1268,7 +1273,10 @@ ST_FUNC void parse_define(void)
tok_str_add2(&str, tok, &tokc); tok_str_add2(&str, tok, &tokc);
skip: skip:
next_nomacro_spc(); next_nomacro_spc();
macro_list_start = 0;
} }
if (ptok == TOK_TWOSHARPS)
tcc_error("'##' invalid at end of macro");
if (spc == 1) if (spc == 1)
--str.len; /* remove trailing space */ --str.len; /* remove trailing space */
tok_str_add(&str, 0); tok_str_add(&str, 0);

2
tests/tests2/65_macro_concat_start.c Normal file
View File

@ -0,0 +1,2 @@
#define paste(A,B) ##A B
paste(x,y)

1
tests/tests2/65_macro_concat_start.expect Normal file
View File

@ -0,0 +1 @@
65_macro_concat_start.c:1: error: '##' invalid at start of macro

2
tests/tests2/66_macro_concat_end.c Normal file
View File

@ -0,0 +1,2 @@
#define paste(A,B) A B##
paste(x,y)

1
tests/tests2/66_macro_concat_end.expect Normal file
View File

@ -0,0 +1 @@
66_macro_concat_end.c:2: error: '##' invalid at end of macro

4
tests/tests2/Makefile
View File

@ -79,7 +79,9 @@ TESTS = \
61_undefined_enum.test \ 61_undefined_enum.test \
62_enumerator_redefinition.test \ 62_enumerator_redefinition.test \
63_local_enumerator_redefinition.test \ 63_local_enumerator_redefinition.test \
64_macro_nesting.test 64_macro_nesting.test \
65_macro_concat_start.test \
66_macro_concat_end.test
# 30_hanoi.test -- seg fault in the code, gcc as well # 30_hanoi.test -- seg fault in the code, gcc as well
# 34_array_assignment.test -- array assignment is not in C standard # 34_array_assignment.test -- array assignment is not in C standard