https://github.com/alexpaniman updated https://github.com/llvm/llvm-project/pull/164894
>From 805d4a513d3927620058d9248d451bd4948e709d Mon Sep 17 00:00:00 2001 From: alexpaniman <[email protected]> Date: Thu, 23 Oct 2025 23:25:45 +0300 Subject: [PATCH 1/3] [clang] Make -dump-tokens option align tokens --- clang/lib/Lex/Preprocessor.cpp | 19 +++++++++++-------- clang/test/Preprocessor/dump-tokens.cpp | 16 ++++++++++++++++ 2 files changed, 27 insertions(+), 8 deletions(-) create mode 100644 clang/test/Preprocessor/dump-tokens.cpp diff --git a/clang/lib/Lex/Preprocessor.cpp b/clang/lib/Lex/Preprocessor.cpp index e003ad3a95570..fcf2369453d47 100644 --- a/clang/lib/Lex/Preprocessor.cpp +++ b/clang/lib/Lex/Preprocessor.cpp @@ -59,6 +59,7 @@ #include "llvm/ADT/StringRef.h" #include "llvm/Support/Capacity.h" #include "llvm/Support/ErrorHandling.h" +#include "llvm/Support/FormatVariadic.h" #include "llvm/Support/MemoryBuffer.h" #include "llvm/Support/raw_ostream.h" #include <algorithm> @@ -234,14 +235,20 @@ void Preprocessor::FinalizeForModelFile() { } void Preprocessor::DumpToken(const Token &Tok, bool DumpFlags) const { - llvm::errs() << tok::getTokenName(Tok.getKind()); + llvm::errs() << llvm::formatv("{0,-16} ", tok::getTokenName(Tok.getKind())); - if (!Tok.isAnnotation()) - llvm::errs() << " '" << getSpelling(Tok) << "'"; + std::string Spelling; + if (!Tok.isAnnotation()) { + Spelling = llvm::formatv("{0,-32} ", "'" + getSpelling(Tok) + "'"); + } + llvm::errs() << Spelling; if (!DumpFlags) return; - llvm::errs() << "\t"; + llvm::errs() << "Loc=<"; + DumpLocation(Tok.getLocation()); + llvm::errs() << ">"; + if (Tok.isAtStartOfLine()) llvm::errs() << " [StartOfLine]"; if (Tok.hasLeadingSpace()) @@ -253,10 +260,6 @@ void Preprocessor::DumpToken(const Token &Tok, bool DumpFlags) const { llvm::errs() << " [UnClean='" << StringRef(Start, Tok.getLength()) << "']"; } - - llvm::errs() << "\tLoc=<"; - DumpLocation(Tok.getLocation()); - llvm::errs() << ">"; } void Preprocessor::DumpLocation(SourceLocation Loc) const { diff --git a/clang/test/Preprocessor/dump-tokens.cpp b/clang/test/Preprocessor/dump-tokens.cpp new file mode 100644 index 0000000000000..3774894943b87 --- /dev/null +++ b/clang/test/Preprocessor/dump-tokens.cpp @@ -0,0 +1,16 @@ +// RUN: %clang_cc1 -dump-tokens %s 2>&1 | FileCheck %s + +-> // CHECK: arrow '->' +5 // CHECK: numeric_constant '5' +id // CHECK: identifier 'id' +& // CHECK: amp '&' +) // CHECK: r_paren ')' +unsigned // CHECK: unsigned 'unsigned' +~ // CHECK: tilde '~' +long_variable_name_very_long // CHECK: identifier 'long_variable_name_very_long' +union // CHECK: union 'union' +42 // CHECK: numeric_constant '42' +j // CHECK: identifier 'j' +&= // CHECK: ampequal '&=' +15 // CHECK: numeric_constant '15' + >From 194f5ad66f6e30e2628d91f323480da5ce4c83a2 Mon Sep 17 00:00:00 2001 From: alexpaniman <[email protected]> Date: Fri, 24 Oct 2025 19:52:33 +0300 Subject: [PATCH 2/3] [clang] Remove unnecessary variable from Preprocessor::DumpToken --- clang/lib/Lex/Preprocessor.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/clang/lib/Lex/Preprocessor.cpp b/clang/lib/Lex/Preprocessor.cpp index fcf2369453d47..76e735eec7f13 100644 --- a/clang/lib/Lex/Preprocessor.cpp +++ b/clang/lib/Lex/Preprocessor.cpp @@ -237,11 +237,9 @@ void Preprocessor::FinalizeForModelFile() { void Preprocessor::DumpToken(const Token &Tok, bool DumpFlags) const { llvm::errs() << llvm::formatv("{0,-16} ", tok::getTokenName(Tok.getKind())); - std::string Spelling; if (!Tok.isAnnotation()) { - Spelling = llvm::formatv("{0,-32} ", "'" + getSpelling(Tok) + "'"); + llvm::errs() << llvm::formatv("{0,-32} ", "'" + getSpelling(Tok) + "'"); } - llvm::errs() << Spelling; if (!DumpFlags) return; >From ba0ba385ca90a4531f810db9feb85fc31b0d8ba1 Mon Sep 17 00:00:00 2001 From: alexpaniman <[email protected]> Date: Fri, 24 Oct 2025 20:10:44 +0300 Subject: [PATCH 3/3] [clang] Ensure consistent spacing for annotations too in Preprocessor::DumpToken --- clang/lib/Lex/Preprocessor.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/clang/lib/Lex/Preprocessor.cpp b/clang/lib/Lex/Preprocessor.cpp index 76e735eec7f13..1d1b7c2358a03 100644 --- a/clang/lib/Lex/Preprocessor.cpp +++ b/clang/lib/Lex/Preprocessor.cpp @@ -237,10 +237,13 @@ void Preprocessor::FinalizeForModelFile() { void Preprocessor::DumpToken(const Token &Tok, bool DumpFlags) const { llvm::errs() << llvm::formatv("{0,-16} ", tok::getTokenName(Tok.getKind())); + std::string Spelling; if (!Tok.isAnnotation()) { - llvm::errs() << llvm::formatv("{0,-32} ", "'" + getSpelling(Tok) + "'"); + Spelling = "'" + getSpelling(Tok) + "'"; } + llvm::errs() << llvm::formatv("{0,-32} ", Spelling); + if (!DumpFlags) return; llvm::errs() << "Loc=<"; _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
