Skip to content

[NFC][TableGen] Emit nested namespace definitions in NamespaceEmitter #161958

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+17 −11
Open

[NFC][TableGen] Emit nested namespace definitions in NamespaceEmitter #161958

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f603664
[NFC][TableGen] Use C++17 nested namespace definitions
jurahul Oct 4, 2025
2e0a119
Adopt a lit test
jurahul Oct 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 12 additions & 11 deletions llvm/include/llvm/TableGen/CodeGenHelpers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,28 +38,29 @@ class IfDefEmitter {
// namespace (empty for anonymous namespace) or nested namespace.
class NamespaceEmitter {
public:
NamespaceEmitter(raw_ostream &OS, StringRef Name) : OS(OS) {
emitNamespaceStarts(Name);
NamespaceEmitter(raw_ostream &OS, StringRef Name)
: Name(trim(Name).str()), OS(OS) {
OS << "namespace " << this->Name << " {\n";
}

~NamespaceEmitter() { close(); }

// Explicit function to close the namespace scopes.
void close() {
for (StringRef NS : llvm::reverse(Namespaces))
OS << "} // namespace " << NS << "\n";
Namespaces.clear();
if (!Closed)
OS << "} // namespace " << Name << "\n";
Closed = true;
}

private:
void emitNamespaceStarts(StringRef Name) {
llvm::SplitString(Name, Namespaces, "::");
for (StringRef NS : Namespaces)
OS << "namespace " << NS << " {\n";
// Trim "::" prefix.
static StringRef trim(StringRef Name) {
Name.consume_front("::");
return Name;
}

SmallVector<StringRef, 2> Namespaces;
std::string Name;
raw_ostream &OS;
bool Closed = false;
};

} // end namespace llvm
Expand Down
5 changes: 5 additions & 0 deletions mlir/test/mlir-tblgen/dialect.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,14 @@ def E_SpecialNSOp : Op<E_Dialect, "special_ns_op", []> {
// DEF: ::E::SPECIAL_NS::SpecialNSOp definitions

// DECL-LABEL: GET_OP_CLASSES
// DECL: namespace a {
// DECL: a::SomeOp declarations
// DECL: namespace BNS {
// DECL: BNS::SomeOp declarations
// DECL: namespace C::CC {
// DECL: ::C::CC::SomeOp declarations
// DECL: DSomeOp declarations
// DECL: namespace ENS {
// DECL: ENS::SomeOp declarations
// DECL: namespace E::SPECIAL_NS {
// DECL: ::E::SPECIAL_NS::SpecialNSOp declarations