From 58a40e76ebadce78639644cd3d56e42b68336927 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Sun, 29 May 2022 21:57:51 +0200 Subject: libcpp: Ignore CPP_PADDING tokens in _cpp_parse_expr [PR105732] The first part of the following testcase (m1-m3 macros and its use) regressed with my PR89971 fix, but as the m1,m4-m5 and its use part shows, the problem isn't new, we can emit a CPP_PADDING token to avoid it from being adjacent to whatever comes after the __VA_OPT__ (in this case there is nothing afterwards, true). In most cases these CPP_PADDING tokens don't matter, all other callers of cpp_get_token_with_location either ignore CPP_PADDING tokens completely (e.g. c_lex_with_flags) or they just remember them and take them into account when printing stuff whether there should be added whitespace or not (scan_translation_unit + token_streamer::stream). So, I think we should just ignore CPP_PADDING tokens the same way in _cpp_parse_expr. 2022-05-27 Jakub Jelinek PR preprocessor/105732 * expr.cc (_cpp_parse_expr): Handle CPP_PADDING by just another token. * c-c++-common/cpp/va-opt-10.c: New test. --- libcpp/expr.cc | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'libcpp/expr.cc') diff --git a/libcpp/expr.cc b/libcpp/expr.cc index 78c5c3e..a022904 100644 --- a/libcpp/expr.cc +++ b/libcpp/expr.cc @@ -1366,6 +1366,10 @@ _cpp_parse_expr (cpp_reader *pfile, bool is_if) op.op = CPP_UMINUS; break; + case CPP_PADDING: + lex_count--; + continue; + default: if ((int) op.op <= (int) CPP_EQ || (int) op.op >= (int) CPP_PLUS_EQ) SYNTAX_ERROR2_AT (op.loc, -- cgit v1.1