davide created this revision. davide added reviewers: teemperor, jingham, friss. Herald added a project: LLDB.
This should allow further simplifications, but it's a first step. Repository: rG LLVM Github Monorepo https://reviews.llvm.org/D70983 Files: lldb/include/lldb/DataFormatters/TypeCategory.h lldb/source/DataFormatters/TypeCategory.cpp Index: lldb/source/DataFormatters/TypeCategory.cpp =================================================================== --- lldb/source/DataFormatters/TypeCategory.cpp +++ lldb/source/DataFormatters/TypeCategory.cpp @@ -13,18 +13,14 @@ using namespace lldb; using namespace lldb_private; -TypeCategoryImpl::TypeCategoryImpl( - IFormatChangeListener *clist, ConstString name, - std::initializer_list<lldb::LanguageType> langs) +TypeCategoryImpl::TypeCategoryImpl(IFormatChangeListener *clist, + ConstString name) : m_format_cont("format", "regex-format", clist), m_summary_cont("summary", "regex-summary", clist), m_filter_cont("filter", "regex-filter", clist), m_synth_cont("synth", "regex-synth", clist), m_validator_cont("validator", "regex-validator", clist), m_enabled(false), - m_change_listener(clist), m_mutex(), m_name(name), m_languages() { - for (const lldb::LanguageType lang : langs) - AddLanguage(lang); -} + m_change_listener(clist), m_mutex(), m_name(name), m_languages() {} static bool IsApplicable(lldb::LanguageType category_lang, lldb::LanguageType valobj_lang) { Index: lldb/include/lldb/DataFormatters/TypeCategory.h =================================================================== --- lldb/include/lldb/DataFormatters/TypeCategory.h +++ lldb/include/lldb/DataFormatters/TypeCategory.h @@ -214,8 +214,7 @@ ValidatorContainer::RegexMatchForEachCallback m_validator_regex; }; - TypeCategoryImpl(IFormatChangeListener *clist, ConstString name, - std::initializer_list<lldb::LanguageType> langs = {}); + TypeCategoryImpl(IFormatChangeListener *clist, ConstString name); template <typename T> void ForEach(const ForEachCallbacks<T> &foreach) { GetTypeFormatsContainer()->ForEach(foreach.GetFormatExactCallback());
Index: lldb/source/DataFormatters/TypeCategory.cpp =================================================================== --- lldb/source/DataFormatters/TypeCategory.cpp +++ lldb/source/DataFormatters/TypeCategory.cpp @@ -13,18 +13,14 @@ using namespace lldb; using namespace lldb_private; -TypeCategoryImpl::TypeCategoryImpl( - IFormatChangeListener *clist, ConstString name, - std::initializer_list<lldb::LanguageType> langs) +TypeCategoryImpl::TypeCategoryImpl(IFormatChangeListener *clist, + ConstString name) : m_format_cont("format", "regex-format", clist), m_summary_cont("summary", "regex-summary", clist), m_filter_cont("filter", "regex-filter", clist), m_synth_cont("synth", "regex-synth", clist), m_validator_cont("validator", "regex-validator", clist), m_enabled(false), - m_change_listener(clist), m_mutex(), m_name(name), m_languages() { - for (const lldb::LanguageType lang : langs) - AddLanguage(lang); -} + m_change_listener(clist), m_mutex(), m_name(name), m_languages() {} static bool IsApplicable(lldb::LanguageType category_lang, lldb::LanguageType valobj_lang) { Index: lldb/include/lldb/DataFormatters/TypeCategory.h =================================================================== --- lldb/include/lldb/DataFormatters/TypeCategory.h +++ lldb/include/lldb/DataFormatters/TypeCategory.h @@ -214,8 +214,7 @@ ValidatorContainer::RegexMatchForEachCallback m_validator_regex; }; - TypeCategoryImpl(IFormatChangeListener *clist, ConstString name, - std::initializer_list<lldb::LanguageType> langs = {}); + TypeCategoryImpl(IFormatChangeListener *clist, ConstString name); template <typename T> void ForEach(const ForEachCallbacks<T> &foreach) { GetTypeFormatsContainer()->ForEach(foreach.GetFormatExactCallback());
_______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits