[DataFormatters] Remove LLDB_DISABLE_PYTHON from TypeCategory.
llvm-svn: 356271
This commit is contained in:
parent
65165d54bb
commit
bbcda82e21
|
@ -81,10 +81,8 @@ public:
|
|||
|
||||
lldb::TypeSummaryImplSP GetSummaryFormat(FormattersMatchData &match_data);
|
||||
|
||||
#ifndef LLDB_DISABLE_PYTHON
|
||||
lldb::SyntheticChildrenSP
|
||||
GetSyntheticChildren(FormattersMatchData &match_data);
|
||||
#endif
|
||||
|
||||
lldb::TypeValidatorImplSP GetValidator(FormattersMatchData &match_data);
|
||||
|
||||
|
|
|
@ -136,7 +136,6 @@ bool TypeCategoryImpl::Get(ValueObject &valobj,
|
|||
regex_filter = GetRegexTypeFiltersContainer()->Get(candidates, filter_sp,
|
||||
&reason_filter);
|
||||
|
||||
#ifndef LLDB_DISABLE_PYTHON
|
||||
bool regex_synth = false;
|
||||
uint32_t reason_synth = 0;
|
||||
bool pick_synth = false;
|
||||
|
@ -167,14 +166,6 @@ bool TypeCategoryImpl::Get(ValueObject &valobj,
|
|||
entry = filter_sp;
|
||||
return true;
|
||||
}
|
||||
|
||||
#else
|
||||
if (filter_sp) {
|
||||
entry = filter_sp;
|
||||
return true;
|
||||
}
|
||||
#endif
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@ -210,12 +201,10 @@ void TypeCategoryImpl::Clear(FormatCategoryItems items) {
|
|||
eFormatCategoryItemRegexFilter)
|
||||
GetRegexTypeFiltersContainer()->Clear();
|
||||
|
||||
#ifndef LLDB_DISABLE_PYTHON
|
||||
if ((items & eFormatCategoryItemSynth) == eFormatCategoryItemSynth)
|
||||
GetTypeSyntheticsContainer()->Clear();
|
||||
if ((items & eFormatCategoryItemRegexSynth) == eFormatCategoryItemRegexSynth)
|
||||
GetRegexTypeSyntheticsContainer()->Clear();
|
||||
#endif
|
||||
|
||||
if ((items & eFormatCategoryItemValidator) == eFormatCategoryItemValidator)
|
||||
GetTypeValidatorsContainer()->Clear();
|
||||
|
@ -244,12 +233,10 @@ bool TypeCategoryImpl::Delete(ConstString name, FormatCategoryItems items) {
|
|||
eFormatCategoryItemRegexFilter)
|
||||
success = GetRegexTypeFiltersContainer()->Delete(name) || success;
|
||||
|
||||
#ifndef LLDB_DISABLE_PYTHON
|
||||
if ((items & eFormatCategoryItemSynth) == eFormatCategoryItemSynth)
|
||||
success = GetTypeSyntheticsContainer()->Delete(name) || success;
|
||||
if ((items & eFormatCategoryItemRegexSynth) == eFormatCategoryItemRegexSynth)
|
||||
success = GetRegexTypeSyntheticsContainer()->Delete(name) || success;
|
||||
#endif
|
||||
|
||||
if ((items & eFormatCategoryItemValidator) == eFormatCategoryItemValidator)
|
||||
success = GetTypeValidatorsContainer()->Delete(name) || success;
|
||||
|
@ -280,12 +267,10 @@ uint32_t TypeCategoryImpl::GetCount(FormatCategoryItems items) {
|
|||
eFormatCategoryItemRegexFilter)
|
||||
count += GetRegexTypeFiltersContainer()->GetCount();
|
||||
|
||||
#ifndef LLDB_DISABLE_PYTHON
|
||||
if ((items & eFormatCategoryItemSynth) == eFormatCategoryItemSynth)
|
||||
count += GetTypeSyntheticsContainer()->GetCount();
|
||||
if ((items & eFormatCategoryItemRegexSynth) == eFormatCategoryItemRegexSynth)
|
||||
count += GetRegexTypeSyntheticsContainer()->GetCount();
|
||||
#endif
|
||||
|
||||
if ((items & eFormatCategoryItemValidator) == eFormatCategoryItemValidator)
|
||||
count += GetTypeValidatorsContainer()->GetCount();
|
||||
|
@ -306,9 +291,7 @@ bool TypeCategoryImpl::AnyMatches(ConstString type_name,
|
|||
lldb::TypeFormatImplSP format_sp;
|
||||
lldb::TypeSummaryImplSP summary_sp;
|
||||
TypeFilterImpl::SharedPointer filter_sp;
|
||||
#ifndef LLDB_DISABLE_PYTHON
|
||||
ScriptedSyntheticChildren::SharedPointer synth_sp;
|
||||
#endif
|
||||
TypeValidatorImpl::SharedPointer validator_sp;
|
||||
|
||||
if ((items & eFormatCategoryItemValue) == eFormatCategoryItemValue) {
|
||||
|
@ -371,7 +354,6 @@ bool TypeCategoryImpl::AnyMatches(ConstString type_name,
|
|||
}
|
||||
}
|
||||
|
||||
#ifndef LLDB_DISABLE_PYTHON
|
||||
if ((items & eFormatCategoryItemSynth) == eFormatCategoryItemSynth) {
|
||||
if (GetTypeSyntheticsContainer()->Get(type_name, synth_sp)) {
|
||||
if (matching_category)
|
||||
|
@ -391,7 +373,6 @@ bool TypeCategoryImpl::AnyMatches(ConstString type_name,
|
|||
return true;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
if ((items & eFormatCategoryItemValidator) == eFormatCategoryItemValidator) {
|
||||
if (GetTypeValidatorsContainer()->Get(type_name, validator_sp)) {
|
||||
|
@ -464,7 +445,6 @@ TypeCategoryImpl::GetFilterForType(lldb::TypeNameSpecifierImplSP type_sp) {
|
|||
return retval;
|
||||
}
|
||||
|
||||
#ifndef LLDB_DISABLE_PYTHON
|
||||
TypeCategoryImpl::SynthContainer::MapValueType
|
||||
TypeCategoryImpl::GetSyntheticForType(lldb::TypeNameSpecifierImplSP type_sp) {
|
||||
SynthContainer::MapValueType retval;
|
||||
|
@ -480,7 +460,6 @@ TypeCategoryImpl::GetSyntheticForType(lldb::TypeNameSpecifierImplSP type_sp) {
|
|||
|
||||
return retval;
|
||||
}
|
||||
#endif
|
||||
|
||||
TypeCategoryImpl::ValidatorContainer::MapValueType
|
||||
TypeCategoryImpl::GetValidatorForType(lldb::TypeNameSpecifierImplSP type_sp) {
|
||||
|
@ -552,7 +531,6 @@ TypeCategoryImpl::GetTypeNameSpecifierForFilterAtIndex(size_t index) {
|
|||
index - GetTypeFiltersContainer()->GetCount());
|
||||
}
|
||||
|
||||
#ifndef LLDB_DISABLE_PYTHON
|
||||
TypeCategoryImpl::SynthContainer::MapValueType
|
||||
TypeCategoryImpl::GetSyntheticAtIndex(size_t index) {
|
||||
if (index < GetTypeSyntheticsContainer()->GetCount())
|
||||
|
@ -570,7 +548,6 @@ TypeCategoryImpl::GetTypeNameSpecifierForSyntheticAtIndex(size_t index) {
|
|||
return GetRegexTypeSyntheticsContainer()->GetTypeNameSpecifierAtIndex(
|
||||
index - GetTypeSyntheticsContainer()->GetCount());
|
||||
}
|
||||
#endif
|
||||
|
||||
TypeCategoryImpl::ValidatorContainer::MapValueType
|
||||
TypeCategoryImpl::GetValidatorAtIndex(size_t index) {
|
||||
|
|
|
@ -249,7 +249,6 @@ TypeCategoryMap::GetSummaryFormat(FormattersMatchData &match_data) {
|
|||
return lldb::TypeSummaryImplSP();
|
||||
}
|
||||
|
||||
#ifndef LLDB_DISABLE_PYTHON
|
||||
lldb::SyntheticChildrenSP
|
||||
TypeCategoryMap::GetSyntheticChildren(FormattersMatchData &match_data) {
|
||||
std::lock_guard<std::recursive_mutex> guard(m_map_mutex);
|
||||
|
@ -291,7 +290,6 @@ TypeCategoryMap::GetSyntheticChildren(FormattersMatchData &match_data) {
|
|||
"empty SP");
|
||||
return lldb::SyntheticChildrenSP();
|
||||
}
|
||||
#endif
|
||||
|
||||
lldb::TypeValidatorImplSP
|
||||
TypeCategoryMap::GetValidator(FormattersMatchData &match_data) {
|
||||
|
|
Loading…
Reference in New Issue