Skip to content

[core] remove class prefix if any in IsDefAlloc #17048

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
pcanal merged 7 commits into from
Dec 6, 2024
Merged

[core] remove class prefix if any in IsDefAlloc #17048

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
74c5a37
[core] remove class prefix if any in IsDefAlloc
ferdymercury Nov 26, 2024
a4103ae
[core] add test for IsDefAlloc with class prefix
ferdymercury Nov 26, 2024
0bf4df4
[core] add original test for getnormalizedname
ferdymercury Nov 26, 2024
8104898
[core] skip potentially preceding class prefix
ferdymercury Dec 3, 2024
35395a3
[core] use constexpr static instead of const static
ferdymercury Dec 4, 2024
044b1a4
[skip-ci] clarify rationale of skipping leading 'class '
ferdymercury Dec 4, 2024
6ae11aa
[core] fix: try constexpr alternative to strlen
ferdymercury Dec 4, 2024
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
22 changes: 17 additions & 5 deletions core/foundation/src/TClassEdit.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
#include <memory>
#include <string_view>
#include <algorithm>
#include <string>

#include "TSpinLockGuard.h"

Expand Down Expand Up @@ -621,13 +622,19 @@ static size_t findNameEnd(const std::string &full, size_t pos)
bool TClassEdit::IsDefAlloc(const char *allocname, const char *classname)
{
string_view a( allocname );
// In Windows, allocname might be 'class const std::allocator<int>',
// (never 'const class ...'), so we start by stripping the 'class ', if any
constexpr static int clalloclen = std::char_traits<char>::length("class ");
if (a.compare(0,clalloclen,"class ") == 0) {
a.remove_prefix(clalloclen);
}
RemoveStd(a);

if (a=="alloc") return true;
if (a=="__default_alloc_template<true,0>") return true;
if (a=="__malloc_alloc_template<0>") return true;

const static int alloclen = strlen("allocator<");
constexpr static int alloclen = std::char_traits<char>::length("allocator<");
if (a.compare(0,alloclen,"allocator<") != 0) {
return false;
}
Expand Down Expand Up @@ -676,15 +683,15 @@ bool TClassEdit::IsDefAlloc(const char *allocname,
string_view a( allocname );
RemoveStd(a);

const static int alloclen = strlen("allocator<");
constexpr static int alloclen = std::char_traits<char>::length("allocator<");
if (a.compare(0,alloclen,"allocator<") != 0) {
return false;
}
a.remove_prefix(alloclen);

RemoveStd(a);

const static int pairlen = strlen("pair<");
constexpr static int pairlen = std::char_traits<char>::length("pair<");
if (a.compare(0,pairlen,"pair<") != 0) {
return false;
}
Expand Down Expand Up @@ -1533,14 +1540,19 @@ static void ResolveTypedefImpl(const char *tname,
}
while (tname[cursor]==' ') ++cursor;
}

// In Windows, we might have 'class const ...' as name,
// (never 'const class ...'), so skip the leading 'class ', if any
if (tname[cursor]=='c' && (cursor+6<len)) {
if (strncmp(tname+cursor,"class ",6) == 0) {
cursor += 6;
}
}
if (tname[cursor]=='c' && (cursor+6<len)) {
if (strncmp(tname+cursor,"const ",6) == 0) {
cursor += 6;
if (modified) result += "const ";
}
constprefix = true;

}

if (len > 2 && strncmp(tname+cursor,"::",2) == 0) {
Expand Down
14 changes: 14 additions & 0 deletions core/foundation/test/testClassEdit.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,3 +274,17 @@ TEST(TClassEdit, DefComp)
{
EXPECT_FALSE(TClassEdit::IsDefComp("std::less<>", "std::string"));
}

// https://github.com/root-project/root/issues/6607
TEST(TClassEdit, DefAlloc)
{
EXPECT_TRUE(TClassEdit::IsDefAlloc("class std::allocator<float>", "float"));
}

// https://github.com/root-project/root/issues/6607
TEST(TClassEdit, GetNormalizedName)
{
std::string n;
TClassEdit::GetNormalizedName(n, "std::vector<float, class std::allocator<float>>");
EXPECT_STREQ("vector<float>", n.c_str());
}
Loading