From 328b826e8a43ed39f9eebb8493cc6abea2ddac1c Mon Sep 17 00:00:00 2001 From: Michael Matz Date: Sat, 15 Apr 2017 19:24:13 +0200 Subject: tccpp: Fix corner case of fnlike macro invocation Arg substitution leaves placeholder marker in the stream for empty arguments. Those need to be skipped when searching for a fnlike macro invocation in the replacement list itself. See testcase. --- tests/pp/18.c | 15 +++++++++++++++ tests/pp/18.expect | 3 +++ 2 files changed, 18 insertions(+) create mode 100644 tests/pp/18.c create mode 100644 tests/pp/18.expect (limited to 'tests/pp') diff --git a/tests/pp/18.c b/tests/pp/18.c new file mode 100644 index 0000000..0961426 --- /dev/null +++ b/tests/pp/18.c @@ -0,0 +1,15 @@ +#define M_RETI_ARG27(x,y,z,aa, ...) aa +#define M_RET_ARG27(...) M_RETI_ARG27(__VA_ARGS__) +#define M_COMMA_P(...) M_RET_ARG27(__VA_ARGS__, 1, 1, 0, useless) +#define M_EMPTYI_DETECT(...) 0, 1, +#define M_EMPTYI_P_C1(...) M_COMMA_P(M_EMPTYI_DETECT __VA_ARGS__ () ) +#define EX +#define empty(x) +#define fnlike(x) yeah x +/* If the following macro is called with empty arg (X183), the use + of 'x' between fnlike and '(' doesn't hinder the recognition of this + being a further fnlike macro invocation. */ +#define usefnlike(x) fnlike x (x) +X181 M_EMPTYI_P_C1() +X182 M_EMPTYI_P_C1(x) +X183 usefnlike() diff --git a/tests/pp/18.expect b/tests/pp/18.expect new file mode 100644 index 0000000..447a9b2 --- /dev/null +++ b/tests/pp/18.expect @@ -0,0 +1,3 @@ +X181 1 +X182 0 +X183 yeah -- cgit v1.3.1