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

Fix macro expansion of empty args.

Browse source 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
This commit is contained in:
Reimar Döffinger 2015-01-18 22:00:10 +01:00
parent a6149c6dbb
commit fb6331e0fa
4 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tccpp.c
View file

@ -2640,7 +2640,7 @@ static int *macro_arg_subst(Sym **nested_list, const int *macro_str, Sym *args)
tok_str_add2(&str, t1, &cval); tok_str_add2(&str, t1, &cval);
} }
} }
} else { } else if (*st != TOK_PLCHLDR) {
/* NOTE: the stream cannot be read when macro /* NOTE: the stream cannot be read when macro
substituing an argument */ substituing an argument */
macro_subst(&str, nested_list, st, NULL); macro_subst(&str, nested_list, st, NULL);

9
tests/tests2/71_macro_empty_arg.c Normal file
View file

@ -0,0 +1,9 @@
#include <stdio.h>
#define T(a,b,c) a b c
int main(void)
{
printf("%d", T(1,+,2) T(+,,) T(,2,*) T(,7,) T(,,));
return 0;
}

1
tests/tests2/71_macro_empty_arg.expect Normal file
View file

@ -0,0 +1 @@
17

4
tests/tests2/Makefile
View file

@ -89,7 +89,9 @@ TESTS = \
67_macro_concat.test \ 67_macro_concat.test \
68_macro_param_list_err_1.test \ 68_macro_param_list_err_1.test \
69_macro_param_list_err_2.test \ 69_macro_param_list_err_2.test \
70_floating_point_literals.test 70_floating_point_literals.test \
71_macro_empty_arg.test \
# 34_array_assignment.test -- array assignment is not in C standard # 34_array_assignment.test -- array assignment is not in C standard