Skip to content
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

Accessing Cpp::* functions through Cpp::GetUnderlyingScope #117

Merged
merged 1 commit into from
Dec 11, 2024
Merged

Accessing Cpp::* functions through Cpp::GetUnderlyingScope #117

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 9 additions & 9 deletions clingwrapper/src/clingwrapper.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -595,7 +595,7 @@ Cppyy::TCppScope_t Cppyy::GetScope(const std::string& name,

Cppyy::TCppScope_t Cppyy::GetFullScope(const std::string& name)
{
return Cpp::GetScopeFromCompleteName(name);
return Cppyy::GetScope(name);
}

Cppyy::TCppScope_t Cppyy::GetTypeScope(TCppScope_t var)
Expand Down Expand Up @@ -988,7 +988,7 @@ bool Cppyy::IsEnumScope(TCppScope_t scope)

bool Cppyy::IsEnumConstant(TCppScope_t scope)
{
return Cpp::IsEnumConstant(scope);
return Cpp::IsEnumConstant(Cpp::GetUnderlyingScope(scope));
}

bool Cppyy::IsEnumType(TCppType_t type)
Expand Down Expand Up @@ -1106,7 +1106,7 @@ std::vector<Cppyy::TCppScope_t> Cppyy::GetUsingNamespaces(TCppScope_t scope)
// // class reflection information ----------------------------------------------
std::string Cppyy::GetFinalName(TCppType_t klass)
{
return Cpp::GetCompleteName(klass);
return Cpp::GetCompleteName(Cpp::GetUnderlyingScope(klass));
}

std::string Cppyy::GetScopedFinalName(TCppType_t klass)
Expand Down Expand Up @@ -1696,13 +1696,13 @@ bool Cppyy::CheckDatamember(TCppScope_t scope, const std::string& name) {

Cppyy::TCppType_t Cppyy::GetDatamemberType(TCppScope_t var)
{
return Cpp::GetVariableType(var);
return Cpp::GetVariableType(Cpp::GetUnderlyingScope(var));
}

std::string Cppyy::GetDatamemberTypeAsString(TCppScope_t scope)
{
return Cpp::GetTypeAsString(
Cpp::GetVariableType(scope));
return Cpp::GetTypeAsString(
Cpp::GetVariableType(Cpp::GetUnderlyingScope(scope)));
}

std::string Cppyy::GetTypeAsString(TCppType_t type)
Expand All @@ -1712,7 +1712,7 @@ std::string Cppyy::GetTypeAsString(TCppType_t type)

intptr_t Cppyy::GetDatamemberOffset(TCppScope_t var)
{
return Cpp::GetVariableOffset(var);
return Cpp::GetVariableOffset(Cpp::GetUnderlyingScope(var));
}

// static inline
Expand Down Expand Up @@ -1804,7 +1804,7 @@ bool Cppyy::IsPrivateData(TCppScope_t datamem)

bool Cppyy::IsStaticDatamember(TCppScope_t var)
{
return Cpp::IsStaticVariable(var);
return Cpp::IsStaticVariable(Cpp::GetUnderlyingScope(var));
}

bool Cppyy::IsConstVar(TCppScope_t var)
Expand Down Expand Up @@ -1865,7 +1865,7 @@ std::vector<Cppyy::TCppScope_t> Cppyy::GetEnumConstants(TCppScope_t scope)

Cppyy::TCppType_t Cppyy::GetEnumConstantType(TCppScope_t scope)
{
return Cpp::GetEnumConstantType(scope);
return Cpp::GetEnumConstantType(Cpp::GetUnderlyingScope(scope));
}

Cppyy::TCppIndex_t Cppyy::GetEnumDataValue(TCppScope_t scope)
Expand Down