maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Enhance the 'type X list' commands such that they actually alert the user if no formatters matching the constraints could be found 

llvm-svn: 264957
This commit is contained in:
Enrico Granata 2016-03-30 22:45:13 +00:00
parent cf8c42f546
commit b64d3d61e3
3 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-categories/TestDataFormatterCategories.py
View File

@ -155,6 +155,7 @@ class CategoriesDataFormatterTestCase(TestBase):
self.runCmd("type category enable Category1")
self.runCmd("type summary list -w Category1")
self.expect("type summary list -w NoSuchCategoryHere", substrs=['no matching results found'])
self.expect("frame variable r1 r2 r3",
substrs = ['r1 = Category1',

2
lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-named-summaries/TestDataFormatterNamedSummaries.py
View File

@ -49,6 +49,8 @@ class NamedSummariesDataFormatterTestCase(TestBase):
self.runCmd("type summary add --summary-string \"Second: x=${var.x} y=${var.y%hex}\" Second")
self.runCmd("type summary add --summary-string \"Third: x=${var.x} z=${var.z}\" Third")
self.expect('type summary list', substrs=['AllUseIt'])
self.expect("frame variable first",
substrs = ['First: x=12'])

30
lldb/source/Commands/CommandObjectType.cpp
View File

@ -1310,9 +1310,10 @@ public:
~CommandObjectTypeFormatterList() override = default;
protected:
virtual void
virtual bool
FormatterSpecificList (CommandReturnObject &result)
{
return false;
}
bool
@ -1346,10 +1347,13 @@ protected:
}
}
auto category_closure = [&result, &formatter_regex] (const lldb::TypeCategoryImplSP& category) -> void {
bool any_printed = false;
auto category_closure = [&result, &formatter_regex, &any_printed] (const lldb::TypeCategoryImplSP& category) -> void {
result.GetOutputStream().Printf("-----------------------\nCategory: %s\n-----------------------\n", category->GetName());
TypeCategoryImpl::ForEachCallbacks<FormatterType> foreach;
foreach.SetExact([&result, &formatter_regex] (ConstString name, const FormatterSharedPointer& format_sp) -> bool {
foreach.SetExact([&result, &formatter_regex, &any_printed] (ConstString name, const FormatterSharedPointer& format_sp) -> bool {
if (formatter_regex)
{
bool escape = true;
@ -1366,12 +1370,12 @@ protected:
return true;
}
any_printed = true;
result.GetOutputStream().Printf ("%s: %s\n", name.AsCString(), format_sp->GetDescription().c_str());
return true;
});
foreach.SetWithRegex( [&result, &formatter_regex] (RegularExpressionSP regex_sp, const FormatterSharedPointer& format_sp) -> bool {
foreach.SetWithRegex([&result, &formatter_regex, &any_printed] (RegularExpressionSP regex_sp, const FormatterSharedPointer& format_sp) -> bool {
if (formatter_regex)
{
bool escape = true;
@ -1388,8 +1392,8 @@ protected:
return true;
}
any_printed = true;
result.GetOutputStream().Printf ("%s: %s\n", regex_sp->GetText(), format_sp->GetDescription().c_str());
return true;
});
@ -1427,10 +1431,16 @@ protected:
return true;
});
FormatterSpecificList(result);
any_printed = FormatterSpecificList(result) | any_printed;
}
result.SetStatus(eReturnStatusSuccessFinishResult);
if (any_printed)
result.SetStatus(eReturnStatusSuccessFinishResult);
else
{
result.GetOutputStream().PutCString("no matching results found.");
result.SetStatus(eReturnStatusSuccessFinishNoResult);
}
return result.Succeeded();
}
};
@ -2028,7 +2038,7 @@ public:
}
protected:
void
bool
FormatterSpecificList (CommandReturnObject &result) override
{
if (DataVisualization::NamedSummaryFormats::GetCount() > 0)
@ -2038,7 +2048,9 @@ protected:
result.GetOutputStream().Printf ("%s: %s\n", name.AsCString(), summary_sp->GetDescription().c_str());
return true;
});
return true;
}
return false;
}
};