diff options
| author | Nathan Sidwell <nathan@acm.org> | 2020-12-01 11:44:34 -0800 |
|---|---|---|
| committer | Nathan Sidwell <nathan@acm.org> | 2020-12-01 11:47:32 -0800 |
| commit | 41676a36a04d5ef86012195d84830df191ee6790 (patch) | |
| tree | c76e3047ed1adb2472ccc0bf119b43d51b3e5c96 /gcc/c-family | |
| parent | 6e3603e62ac3a811e0a1032821b8d045b020a9c1 (diff) | |
| download | gcc-41676a36a04d5ef86012195d84830df191ee6790.zip gcc-41676a36a04d5ef86012195d84830df191ee6790.tar.gz gcc-41676a36a04d5ef86012195d84830df191ee6790.tar.bz2 | |
C++ Module keywords
This adds the module keywords. These are special internal tokens
generated by the preprocessor's module-control-line token peeking
logic. Spelling them with a space means that they turn back into
regular tokens in preprocessor output (but do skew the column
numbering :()
gcc/c-family/
* c-common.c (module, import, export): New internal tokens (with
trailing space).
* c-common.h (RID__MODULE, RID__IMPORT & RID__EXPORT): Enumerate
them.
(D_CXX_MODULES, D_CXX_MODULES_FLAGS): Enable them.
* c-cppbuiltin.c (c_cpp_builtins): Feature macro.
gcc/cp/
* lex.c (init_reswords): Maybe enable module keywords.
Diffstat (limited to 'gcc/c-family')
| -rw-r--r-- | gcc/c-family/c-common.c | 6 | ||||
| -rw-r--r-- | gcc/c-family/c-common.h | 5 | ||||
| -rw-r--r-- | gcc/c-family/c-cppbuiltin.c | 4 |
3 files changed, 15 insertions, 0 deletions
diff --git a/gcc/c-family/c-common.c b/gcc/c-family/c-common.c index 5d1e4ef..cae883b 100644 --- a/gcc/c-family/c-common.c +++ b/gcc/c-family/c-common.c @@ -540,6 +540,12 @@ const struct c_common_resword c_common_reswords[] = { "concept", RID_CONCEPT, D_CXX_CONCEPTS_FLAGS | D_CXXWARN }, { "requires", RID_REQUIRES, D_CXX_CONCEPTS_FLAGS | D_CXXWARN }, + /* Modules-related keywords, these are internal unspellable tokens, + created by the preprocessor. */ + { "module ", RID__MODULE, D_CXX_MODULES_FLAGS | D_CXXWARN }, + { "import ", RID__IMPORT, D_CXX_MODULES_FLAGS | D_CXXWARN }, + { "export ", RID__EXPORT, D_CXX_MODULES_FLAGS | D_CXXWARN }, + /* Coroutines-related keywords */ { "co_await", RID_CO_AWAIT, D_CXX_COROUTINES_FLAGS | D_CXXWARN }, { "co_yield", RID_CO_YIELD, D_CXX_COROUTINES_FLAGS | D_CXXWARN }, diff --git a/gcc/c-family/c-common.h b/gcc/c-family/c-common.h index f413e87..8c17067 100644 --- a/gcc/c-family/c-common.h +++ b/gcc/c-family/c-common.h @@ -195,6 +195,9 @@ enum rid /* C++ concepts */ RID_CONCEPT, RID_REQUIRES, + /* C++ modules. */ + RID__MODULE, RID__IMPORT, RID__EXPORT, /* Internal tokens. */ + /* C++ coroutines */ RID_CO_AWAIT, RID_CO_YIELD, RID_CO_RETURN, @@ -449,9 +452,11 @@ extern machine_mode c_default_pointer_mode; #define D_CXX_CHAR8_T 0X1000 /* In C++, only with -fchar8_t. */ #define D_CXX20 0x2000 /* In C++, C++20 only. */ #define D_CXX_COROUTINES 0x4000 /* In C++, only with coroutines. */ +#define D_CXX_MODULES 0x8000 /* In C++, only with modules. */ #define D_CXX_CONCEPTS_FLAGS D_CXXONLY | D_CXX_CONCEPTS #define D_CXX_CHAR8_T_FLAGS D_CXXONLY | D_CXX_CHAR8_T +#define D_CXX_MODULES_FLAGS (D_CXXONLY | D_CXX_MODULES) #define D_CXX_COROUTINES_FLAGS (D_CXXONLY | D_CXX_COROUTINES) /* The reserved keyword table. */ diff --git a/gcc/c-family/c-cppbuiltin.c b/gcc/c-family/c-cppbuiltin.c index d35b087..41914f6 100644 --- a/gcc/c-family/c-cppbuiltin.c +++ b/gcc/c-family/c-cppbuiltin.c @@ -1025,6 +1025,10 @@ c_cpp_builtins (cpp_reader *pfile) else cpp_define (pfile, "__cpp_concepts=201507L"); } + if (flag_modules) + /* The std-defined value is 201907L, but I don't think we can + claim victory yet. 201810 is the p1103 date. */ + cpp_define (pfile, "__cpp_modules=201810L"); if (flag_coroutines) cpp_define (pfile, "__cpp_impl_coroutine=201902L"); /* n4861, DIS */ if (flag_tm) |