diff options
| author | yronglin <yronglin777@gmail.com> | 2024-07-20 20:41:00 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-20 20:41:00 +0800 |
| commit | e77a01d79a48e15c94c89e4aa4bd27424a96b49b (patch) | |
| tree | de9dcfce36f2d950bd058ac191222595bf8ffa9a /clang/lib/Frontend/PrintPreprocessedOutput.cpp | |
| parent | 710dab6e18ad9ed22c2529b9125d7b8813165ede (diff) | |
| download | llvm-e77a01d79a48e15c94c89e4aa4bd27424a96b49b.zip llvm-e77a01d79a48e15c94c89e4aa4bd27424a96b49b.tar.gz llvm-e77a01d79a48e15c94c89e4aa4bd27424a96b49b.tar.bz2 | |
[Clang] Implement P3034R1 Module Declarations Shouldn’t be Macros (#90574)
This PR implement [P3034R1 Module Declarations Shouldn’t be
Macros](https://wg21.link/P3034R1), and refactor the convoluted state
machines in module name lexical analysis.
---------
Signed-off-by: yronglin <yronglin777@gmail.com>
Co-authored-by: Aaron Ballman <aaron@aaronballman.com>
Co-authored-by: cor3ntin <corentinjabot@gmail.com>
Diffstat (limited to 'clang/lib/Frontend/PrintPreprocessedOutput.cpp')
| -rw-r--r-- | clang/lib/Frontend/PrintPreprocessedOutput.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/clang/lib/Frontend/PrintPreprocessedOutput.cpp b/clang/lib/Frontend/PrintPreprocessedOutput.cpp index 0592423..1fff88c 100644 --- a/clang/lib/Frontend/PrintPreprocessedOutput.cpp +++ b/clang/lib/Frontend/PrintPreprocessedOutput.cpp @@ -758,9 +758,10 @@ void PrintPPOutputPPCallbacks::HandleWhitespaceBeforeTok(const Token &Tok, // These tokens are not expanded to anything and don't need whitespace before // them. if (Tok.is(tok::eof) || - (Tok.isAnnotation() && !Tok.is(tok::annot_header_unit) && - !Tok.is(tok::annot_module_begin) && !Tok.is(tok::annot_module_end) && - !Tok.is(tok::annot_repl_input_end) && !Tok.is(tok::annot_embed))) + (Tok.isAnnotation() && Tok.isNot(tok::annot_header_unit) && + Tok.isNot(tok::annot_module_begin) && Tok.isNot(tok::annot_module_end) && + Tok.isNot(tok::annot_module_name) && + Tok.isNot(tok::annot_repl_input_end) && Tok.isNot(tok::annot_embed))) return; // EmittedDirectiveOnThisLine takes priority over RequireSameLine. @@ -951,6 +952,11 @@ static void PrintPreprocessedTokens(Preprocessor &PP, Token &Tok, PP.Lex(Tok); IsStartOfLine = true; continue; + } else if (Tok.is(tok::annot_module_name)) { + auto *Info = static_cast<ModuleNameInfo *>(Tok.getAnnotationValue()); + *Callbacks->OS << Info->getFlatName(); + PP.Lex(Tok); + continue; } else if (Tok.is(tok::annot_header_unit)) { // This is a header-name that has been (effectively) converted into a // module-name. |