Author: davide
Date: Fri Mar 15 09:55:51 2019
New Revision: 356271
URL: http://llvm.org/viewvc/llvm-project?rev=356271&view=rev
Log:
[DataFormatters] Remove LLDB_DISABLE_PYTHON from TypeCategory.
Modified:
lldb/trunk/include/lldb/DataFormatters/TypeCategoryMap.h
lldb/trunk/source/DataFormatters/TypeCategory.cpp
lldb/trunk/source/DataFormatters/TypeCategoryMap.cpp
Modified: lldb/trunk/include/lldb/DataFormatters/TypeCategoryMap.h
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/DataFormatters/TypeCategoryMap.h?rev=356271&r1=356270&r2=356271&view=diff
==============================================================================
--- lldb/trunk/include/lldb/DataFormatters/TypeCategoryMap.h (original)
+++ lldb/trunk/include/lldb/DataFormatters/TypeCategoryMap.h Fri Mar 15
09:55:51 2019
@@ -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);
Modified: lldb/trunk/source/DataFormatters/TypeCategory.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/DataFormatters/TypeCategory.cpp?rev=356271&r1=356270&r2=356271&view=diff
==============================================================================
--- lldb/trunk/source/DataFormatters/TypeCategory.cpp (original)
+++ lldb/trunk/source/DataFormatters/TypeCategory.cpp Fri Mar 15 09:55:51 2019
@@ -136,7 +136,6 @@ bool TypeCategoryImpl::Get(ValueObject &
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 &
entry = filter_sp;
return true;
}
-
-#else
- if (filter_sp) {
- entry = filter_sp;
- return true;
- }
-#endif
-
return false;
}
@@ -210,12 +201,10 @@ void TypeCategoryImpl::Clear(FormatCateg
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(ConstStrin
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(Form
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(ConstS
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(ConstS
}
}
-#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(ConstS
return true;
}
}
-#endif
if ((items & eFormatCategoryItemValidator) == eFormatCategoryItemValidator) {
if (GetTypeValidatorsContainer()->Get(type_name, validator_sp)) {
@@ -464,7 +445,6 @@ TypeCategoryImpl::GetFilterForType(lldb:
return retval;
}
-#ifndef LLDB_DISABLE_PYTHON
TypeCategoryImpl::SynthContainer::MapValueType
TypeCategoryImpl::GetSyntheticForType(lldb::TypeNameSpecifierImplSP type_sp) {
SynthContainer::MapValueType retval;
@@ -480,7 +460,6 @@ TypeCategoryImpl::GetSyntheticForType(ll
return retval;
}
-#endif
TypeCategoryImpl::ValidatorContainer::MapValueType
TypeCategoryImpl::GetValidatorForType(lldb::TypeNameSpecifierImplSP type_sp) {
@@ -552,7 +531,6 @@ TypeCategoryImpl::GetTypeNameSpecifierFo
index - GetTypeFiltersContainer()->GetCount());
}
-#ifndef LLDB_DISABLE_PYTHON
TypeCategoryImpl::SynthContainer::MapValueType
TypeCategoryImpl::GetSyntheticAtIndex(size_t index) {
if (index < GetTypeSyntheticsContainer()->GetCount())
@@ -570,7 +548,6 @@ TypeCategoryImpl::GetTypeNameSpecifierFo
return GetRegexTypeSyntheticsContainer()->GetTypeNameSpecifierAtIndex(
index - GetTypeSyntheticsContainer()->GetCount());
}
-#endif
TypeCategoryImpl::ValidatorContainer::MapValueType
TypeCategoryImpl::GetValidatorAtIndex(size_t index) {
Modified: lldb/trunk/source/DataFormatters/TypeCategoryMap.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/DataFormatters/TypeCategoryMap.cpp?rev=356271&r1=356270&r2=356271&view=diff
==============================================================================
--- lldb/trunk/source/DataFormatters/TypeCategoryMap.cpp (original)
+++ lldb/trunk/source/DataFormatters/TypeCategoryMap.cpp Fri Mar 15 09:55:51
2019
@@ -249,7 +249,6 @@ TypeCategoryMap::GetSummaryFormat(Format
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(Fo
"empty SP");
return lldb::SyntheticChildrenSP();
}
-#endif
lldb::TypeValidatorImplSP
TypeCategoryMap::GetValidator(FormattersMatchData &match_data) {
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
