Skip to content

Fixes to rootcling's handling of (unnamed) enums #13335

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

Merged
hahnjo merged 3 commits into from
Jul 27, 2023
Merged

Fixes to rootcling's handling of (unnamed) enums #13335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5c4f91f
rootclingIO: Fix splitting of enum namespaces
hahnjo Jul 26, 2023
9c4e17d
SelectionRules: Collapse two if branches
hahnjo Jul 26, 2023
ffbd964
SelectionRules: Only generate qualified name if there is one
hahnjo Jul 26, 2023
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
9 changes: 3 additions & 6 deletions core/dictgen/src/SelectionRules.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,14 +430,11 @@ bool SelectionRules::GetDeclName(const clang::Decl* D, std::string& name, std::s
return false;

// the identifier is NULL for some special methods like constructors, destructors and operators
if (N->getIdentifier()) {
if (N->getIdentifier() || N->isCXXClassMember()) {
name = N->getNameAsString();
llvm::raw_string_ostream stream(qual_name);
N->getNameForDiagnostic(stream,N->getASTContext().getPrintingPolicy(),true);
}
else if (N->isCXXClassMember()) { // for constructors, destructors, operator=, etc. methods
name = N->getNameAsString(); // we use this (unefficient) method to Get the name in that case
}
llvm::raw_string_ostream stream(qual_name);
N->getNameForDiagnostic(stream,N->getASTContext().getPrintingPolicy(),true);
return true;
}

Expand Down
6 changes: 3 additions & 3 deletions io/rootpcm/src/rootclingIO.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,9 +241,9 @@ bool CloseStreamerInfoROOTFile(bool writeEmptyRootPCM)
TObjArray enums(gEnumsToStore.size());
for (const auto & enumname : gEnumsToStore) {
TEnum *en = nullptr;
const size_t lastSepPos = enumname.find_last_of("::");
const size_t lastSepPos = enumname.rfind("::");
if (lastSepPos != std::string::npos) {
const std::string nsName = enumname.substr(0, lastSepPos - 1);
const std::string nsName = enumname.substr(0, lastSepPos);
TClass *tclassInstance = TClass::GetClass(nsName.c_str());
if (!tclassInstance) {
Error("CloseStreamerInfoROOTFile", "Cannot find TClass instance for namespace %s.", nsName.c_str());
Expand All @@ -256,7 +256,7 @@ bool CloseStreamerInfoROOTFile(bool writeEmptyRootPCM)
Error("CloseStreamerInfoROOTFile", "TClass instance for namespace %s does not have any enum associated. This is an inconsistency.", nsName.c_str());
return false;
}
const std::string unqualifiedEnumName = enumname.substr(lastSepPos + 1);
const std::string unqualifiedEnumName = enumname.substr(lastSepPos + 2);
en = (TEnum *)enumListPtr->FindObject(unqualifiedEnumName.c_str());
if (en) en->SetTitle(nsName.c_str());
} else {
Expand Down