This implements __VA_OPT__, a new preprocessor feature added in C++2A. The paper can be found here: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2017/p0306r4.html gcc/ChangeLog * doc/cpp.texi (Variadic Macros): Document __VA_OPT__. gcc/testsuite/ChangeLog * c-c++-common/cpp/va-opt-pedantic.c: New file. * c-c++-common/cpp/va-opt.c: New file. * c-c++-common/cpp/va-opt-error.c: New file. libcpp/ChangeLog * pch.c (cpp_read_state): Set n__VA_OPT__. * macro.c (vaopt_state): New class. (_cpp_arguments_ok): Check va_opt flag. (replace_args, create_iso_definition): Use vaopt_state. * lex.c (lex_identifier_intern): Possibly issue errors for __VA_OPT__. (lex_identifier): Likewise. (maybe_va_opt_error): New function. * internal.h (struct lexer_state) <va_args_ok>: Update comment. (struct spec_nodes) <n__VA_OPT__>: New field. * init.c (struct lang_flags) <va_opt>: New field. (lang_defaults): Add entries for C++2A. Update all entries for va_opt. (cpp_set_lang): Initialize va_opt. * include/cpplib.h (struct cpp_options) <va_opt>: New field. * identifiers.c (_cpp_init_hashtable): Initialize n__VA_OPT__. From-SVN: r254707
43 lines
893 B
C
43 lines
893 B
C
/* { dg-do compile } */
|
|
/* { dg-options "-std=gnu99" { target c } } */
|
|
/* { dg-options "-std=c++2a" { target c++ } } */
|
|
|
|
extern void f0 (void);
|
|
extern void f1 (int);
|
|
extern void f2 (int, int);
|
|
extern void f3 (int, int, int);
|
|
extern void f4 (int, int, int, int);
|
|
extern int s (const char *);
|
|
|
|
#define CALL(F, ...) F (7 __VA_OPT__(,) __VA_ARGS__)
|
|
#define CP(F, X, Y, ...) F (__VA_OPT__(X ## Y,) __VA_ARGS__)
|
|
#define CS(F, ...) F(__VA_OPT__(s(# __VA_ARGS__)))
|
|
#define D(F, ...) F(__VA_OPT__(__VA_ARGS__) __VA_OPT__(,) __VA_ARGS__)
|
|
#define CALL0(...) __VA_OPT__(f2)(0 __VA_OPT__(,)__VA_ARGS__)
|
|
|
|
void t (void)
|
|
{
|
|
CALL (f1);
|
|
CALL (f1, );
|
|
CALL (f2, 1);
|
|
CALL (f3, 1, 2);
|
|
|
|
int one = 1;
|
|
int two = 2;
|
|
int onetwo = 23;
|
|
|
|
CP (f0, one, two);
|
|
CP (f0, one, two, );
|
|
CP (f2, one, two, 3);
|
|
|
|
CS (f0);
|
|
CS (f1, 1, 2, 3, 4);
|
|
|
|
D (f0);
|
|
D (f2, 1);
|
|
D (f4, 1, 2);
|
|
|
|
CALL0 ();
|
|
CALL0 (23);
|
|
}
|