[Lldb-commits] [lldb] r151870 - in /lldb/trunk: source/Core/FormatManager.cpp test/functionalities/data-formatter/data-formatter-stl/vector/TestDataFormatterStdVector.py

[Enrico Granata]

Author: enrico
Date: Thu Mar  1 19:14:02 2012
New Revision: 151870

URL: http://llvm.org/viewvc/llvm-project?rev=151870&view=rev
Log:
having std::vector still show children even if it now has a builtin summary - having the std::vector test case deal with the fact that we now have said builtin summary

Modified:
    lldb/trunk/source/Core/FormatManager.cpp
    lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/vector/TestDataFormatterStdVector.py

Modified: lldb/trunk/source/Core/FormatManager.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/FormatManager.cpp?rev=151870&r1=151869&r2=151870&view=diff
==============================================================================
--- lldb/trunk/source/Core/FormatManager.cpp (original)
+++ lldb/trunk/source/Core/FormatManager.cpp Thu Mar  1 19:14:02 2012
@@ -646,6 +646,7 @@
                                                        SyntheticChildrenSP(new TypeSyntheticImpl(stl_synth_flags,
                                                                                                  "gnu_libstdcpp.StdListSynthProvider")));
     
+    stl_summary_flags.SetDontShowChildren(false);
     gnu_category_sp->GetRegexSummaryNavigator()->Add(RegularExpressionSP(new RegularExpression("^(std::)?vector<.+>$")),
                                                      TypeSummaryImplSP(new StringSummaryFormat(stl_summary_flags,
                                                                                                "size=${svar%#}")));

Modified: lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/vector/TestDataFormatterStdVector.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/vector/TestDataFormatterStdVector.py?rev=151870&r1=151869&r2=151870&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/vector/TestDataFormatterStdVector.py (original)
+++ lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/vector/TestDataFormatterStdVector.py Thu Mar  1 19:14:02 2012
@@ -58,13 +58,13 @@
 
         # empty vectors (and storage pointers SHOULD BOTH BE NULL..)
         self.expect("frame variable numbers",
-            substrs = ['numbers = {}'])
+            substrs = ['numbers = size=0'])
 
         self.runCmd("n")
         
         # first value added
         self.expect("frame variable numbers",
-                    substrs = ['numbers = {',
+                    substrs = ['numbers = size=1',
                                '[0] = 1',
                                '}'])
 
@@ -72,7 +72,7 @@
         self.runCmd("n");self.runCmd("n");self.runCmd("n");
     
         self.expect("frame variable numbers",
-                    substrs = ['numbers = {',
+                    substrs = ['numbers = size=4',
                                '[0] = 1',
                                '[1] = 12',
                                '[2] = 123',
@@ -80,7 +80,7 @@
                                '}'])
 
         self.expect("p numbers",
-                    substrs = ['$', '= {',
+                    substrs = ['$', 'size=4',
                                '[0] = 1',
                                '[1] = 12',
                                '[2] = 123',
@@ -106,7 +106,7 @@
         self.runCmd("n");self.runCmd("n");self.runCmd("n");
 
         self.expect("frame variable numbers",
-                    substrs = ['numbers = {',
+                    substrs = ['numbers = size=7',
                                '[0] = 1',
                                '[1] = 12',
                                '[2] = 123',
@@ -117,7 +117,7 @@
                                '}'])
             
         self.expect("p numbers",
-                    substrs = ['$', ' = {',
+                    substrs = ['$', 'size=7',
                                '[0] = 1',
                                '[1] = 12',
                                '[2] = 123',
@@ -147,13 +147,13 @@
         self.runCmd("n")
 
         self.expect("frame variable numbers",
-            substrs = ['numbers = {}'])
+            substrs = ['numbers = size=0'])
 
         self.runCmd("n")
 
         # first value added
         self.expect("frame variable numbers",
-                    substrs = ['numbers = {',
+                    substrs = ['numbers = size=1',
                                '[0] = 7',
                                '}'])