feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Debugger: Fix manual splitting of complex template parameter types

Browse Source 
Parsing has to stop at the first < (coming from the end).
foo::span<int>::bar<double> has a parameter 'double', not 'intdouble'.

Change-Id: Ied142d5e75a7587d6c0efd3b51608b199b999e93
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
hjk
2017-06-16 18:12:07 +02:00
parent 2897414d3b
commit b129cebccc
2 changed files with 31 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
share/qtcreator/debugger/dumper.py
View File

@@ -563,6 +563,7 @@ class DumperBase:
else:
push(inner)
inner = ''
break
elif c == ',':
#warn('c: %s level: %s' % (c, level))
if level == 1:

30
tests/auto/debugger/tst_dumpers.cpp
View File

@@ -6790,6 +6790,36 @@ void tst_Dumpers::dumper_data()
+ Check("tc.3.bar", "15", "int");
QTest::newRow("Internal3")
<< Data("namespace details\n"
"{\n"
" template <int> struct extent_type;\n"
" template <> struct extent_type<-1> { int size_; };\n"
"}\n"
"\n"
"template <class T, int Extent>\n"
"struct Span\n"
"{\n"
" Span(T *firstElem, int n) : storage_(firstElem, n) {}\n"
"\n"
" template <class ExtentType>\n"
" struct Storage : public ExtentType\n"
" {\n"
" template <class OtherExtentType>\n"
" Storage(T *data, OtherExtentType ext)\n"
" : ExtentType{ext}, data_(data)\n"
" {}\n"
"\n"
" T *data_;\n"
" };\n"
"\n"
" Storage<details::extent_type<Extent>> storage_;\n"
"};\n",
"int v[4] = { 1, 2, 4, 8 }; \n"
"Span<int, -1> s(v, 4); unused(&s); \n")
+ Check("s.storage_.@1.size_", "4", "int");
QTest::newRow("BufArray")
<< Data("#include <new>\n"
"static int c = 0;\n"