replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

<rdar://problem/11589605> Making a 

'type category enable *' command
to match 'type category disable *'

llvm-svn: 161882
This commit is contained in:
Enrico Granata 2012-08-14 18:18:07 +00:00
parent 39c0462f3b
commit 273d177bdf
2 changed files with 38 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1956,24 +1956,46 @@ protected:
return false;
}
for (int i = argc - 1; i >= 0; i--)
if (argc == 1 && strcmp(command.GetArgumentAtIndex(0),"*") == 0)
{
const char* typeA = command.GetArgumentAtIndex(i);
ConstString typeCS(typeA);
if (!typeCS)
// we want to make sure to enable "system" last and "default" first
DataVisualization::Categories::Enable(ConstString("default"), CategoryMap::First);
uint32_t num_categories = DataVisualization::Categories::GetCount();
for (uint32_t i = 0; i < num_categories; i++)
{
result.AppendError("empty category name not allowed");
result.SetStatus(eReturnStatusFailed);
return false;
}
DataVisualization::Categories::Enable(typeCS);
lldb::TypeCategoryImplSP cate;
if (DataVisualization::Categories::GetCategory(typeCS, cate) && cate.get())
{
if (cate->GetCount() == 0)
lldb::TypeCategoryImplSP category_sp = DataVisualization::Categories::GetCategoryAtIndex(i);
if (category_sp)
{
result.AppendWarning("empty category enabled (typo?)");
if ( ::strcmp(category_sp->GetName(), "system") == 0 ||
::strcmp(category_sp->GetName(), "default") == 0 )
continue;
else
DataVisualization::Categories::Enable(category_sp, CategoryMap::Default);
}
}
DataVisualization::Categories::Enable(ConstString("system"), CategoryMap::Last);
}
else
{
for (int i = argc - 1; i >= 0; i--)
{
const char* typeA = command.GetArgumentAtIndex(i);
ConstString typeCS(typeA);
if (!typeCS)
{
result.AppendError("empty category name not allowed");
result.SetStatus(eReturnStatusFailed);
return false;
}
DataVisualization::Categories::Enable(typeCS);
lldb::TypeCategoryImplSP cate;
if (DataVisualization::Categories::GetCategory(typeCS, cate) && cate.get())
{
if (cate->GetCount() == 0)
{
result.AppendWarning("empty category enabled (typo?)");
}
}
}
}

2
lldb/test/functionalities/data-formatter/data-formatter-disabling/TestDataFormatterDisabling.py
View File

@ -83,7 +83,7 @@ class DataFormatterDisablingTestCase(TestBase):
self.expect('type category list', substrs = ['system is not enabled', 'gnu-libstdc++ is not enabled', 'AppKit is not enabled'])
# now enable and check that we are back to normal
cleanup()
self.runCmd("type category enable *")
self.expect('type category list', substrs = ['system is enabled', 'gnu-libstdc++ is enabled', 'AppKit is enabled'])