forked from qt-creator/qt-creator
Great debugger helper bug fixing spree.
- Fix extractTemplate() not to kill blanks in case there is no blank after a comma, fix hardcoded types accordingly. - Make niceType()'s regexps ignore blanks after commas, add unsigned short as char_type and cache the mappings, making them work for CDB. - CDB: Parse map output of dumpers correctly, generally don't confuse the parser by unknown keywords encountered when parsing children, thus enabling simple QMap types. - Make dumpInnerValueHelper output std::string types.
This commit is contained in:
@@ -256,6 +256,18 @@ static int dumpStdStringVector()
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int dumpStdWStringVector()
|
||||
{
|
||||
std::vector<std::wstring> test;
|
||||
test.push_back(L"item1");
|
||||
test.push_back(L"item2");
|
||||
prepareInBuffer("std::vector", "local.wstringvector", "local.wstringvector", "std::wstring");
|
||||
qDumpObjectData440(2, 42, testAddress(&test), 1, sizeof(std::wstring), sizeof(std::list<int>::allocator_type), 0, 0);
|
||||
fputs(qDumpOutBuffer, stdout);
|
||||
fputc('\n', stdout);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int dumpStdIntSet()
|
||||
{
|
||||
std::set<int> test;
|
||||
@@ -335,6 +347,8 @@ static bool dumpType(const char *arg)
|
||||
{ dumpStdIntVector(); return true; }
|
||||
if (!qstrcmp(arg, "vector<string>"))
|
||||
{ dumpStdStringVector(); return true; }
|
||||
if (!qstrcmp(arg, "vector<wstring>"))
|
||||
{ dumpStdWStringVector(); return true; }
|
||||
if (!qstrcmp(arg, "set<int>"))
|
||||
{ dumpStdIntSet(); return true; }
|
||||
if (!qstrcmp(arg, "set<string>"))
|
||||
|
||||
Reference in New Issue
Block a user