Second round of code cleanups:

 - reorganizing classes layout to have public part first
   Typedefs that we want to keep private, but must be defined for some public code to work correctly are an exception
 - avoiding methods in the form T foo() { code; } all on one-line
 - moving method implementations from .h to .cpp whenever feasible
   Templatized code is an exception and so are very small methods
 - generally, adhering to coding conventions followed project-wide
Functional changes:
 - fixed an issue where using ${var} in a summary for an aggregate, and then displaying a pointer-to-aggregate would lead to no summary being displayed
   The issue was not a major one because all ${var} was meant to do in that context was display an error for invalid use of pointer
   Accordingly fixed test cases and added a new test case

llvm-svn: 137944

1 files changed, 3 insertions, 5 deletions

diff --git a/lldb/test/functionalities/data-formatter/data-formatter-smart-array/TestDataFormatterSmartArray.py b/lldb/test/functionalities/data-formatter/data-formatter-smart-array/TestDataFormatterSmartArray.py
index d570351fd0a..9d79b3adf10 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-smart-array/TestDataFormatterSmartArray.py
+++ b/lldb/test/functionalities/data-formatter/data-formatter-smart-array/TestDataFormatterSmartArray.py
@@ -57,7 +57,7 @@ class DataFormatterTestCase(TestBase):
         self.runCmd("type summary add -f \"${var%V}\" SomeData")
 
         self.expect("frame variable data",
-            substrs = ['no printable representation'])
+            substrs = ['invalid use of aggregate type'])
 # ${var%s}
         self.runCmd("type summary add -f \"ptr = ${var%s}\" \"char *\"")
 
@@ -169,12 +169,10 @@ class DataFormatterTestCase(TestBase):
         self.runCmd("type summary add -f \"arr = ${var%x}\" \"int [5]\"")
         
         self.expect("frame variable intarr",
-                    substrs = ['intarr = {',
-                               '[0] = 1'])
+                    substrs = ['<invalid usage of pointer value as object>'])
         
         self.expect("frame variable other.intarr",
-                    substrs = ['intarr = {',
-                               '[0] = 9'])
+                    substrs = ['<invalid usage of pointer value as object>'])
 
         self.runCmd("type summary add -f \"arr = ${var[]%x}\" \"int [5]\"")