*** This commit represents a complete reformatting of the LLDB source code

*** to conform to clang-format’s LLVM style.  This kind of mass change has
*** two obvious implications:

Firstly, merging this particular commit into a downstream fork may be a huge
effort.  Alternatively, it may be worth merging all changes up to this commit,
performing the same reformatting operation locally, and then discarding the
merge for this particular commit.  The commands used to accomplish this
reformatting were as follows (with current working directory as the root of
the repository):

    find . \( -iname "*.c" -or -iname "*.cpp" -or -iname "*.h" -or -iname "*.mm" \) -exec clang-format -i {} +
    find . -iname "*.py" -exec autopep8 --in-place --aggressive --aggressive {} + ;

The version of clang-format used was 3.9.0, and autopep8 was 1.2.4.

Secondly, “blame” style tools will generally point to this commit instead of
a meaningful prior commit.  There are alternatives available that will attempt
to look through this change and find the appropriate prior commit.  YMMV.

llvm-svn: 280751

1 files changed, 103 insertions, 115 deletions

diff --git a/lldb/source/DataFormatters/FormattersHelpers.cpp b/lldb/source/DataFormatters/FormattersHelpers.cpp
index c4ff75c..842237f 100644
--- a/lldb/source/DataFormatters/FormattersHelpers.cpp
+++ b/lldb/source/DataFormatters/FormattersHelpers.cpp
@@ -1,4 +1,5 @@
-//===-- FormattersHelpers.cpp -------------------------------------*- C++ -*-===//
+//===-- FormattersHelpers.cpp -------------------------------------*- C++
+//-*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -26,139 +27,126 @@ using namespace lldb;
 using namespace lldb_private;
 using namespace lldb_private::formatters;
 
-void
-lldb_private::formatters::AddFormat (TypeCategoryImpl::SharedPointer category_sp,
-                                     lldb::Format format,
-                                     ConstString type_name,
-                                     TypeFormatImpl::Flags flags,
-                                     bool regex)
-{
-    lldb::TypeFormatImplSP format_sp(new TypeFormatImpl_Format(format, flags));
-    
-    if (regex)
-        category_sp->GetRegexTypeFormatsContainer()->Add(RegularExpressionSP(new RegularExpression(type_name.AsCString())),format_sp);
-    else
-        category_sp->GetTypeFormatsContainer()->Add(type_name, format_sp);
+void lldb_private::formatters::AddFormat(
+    TypeCategoryImpl::SharedPointer category_sp, lldb::Format format,
+    ConstString type_name, TypeFormatImpl::Flags flags, bool regex) {
+  lldb::TypeFormatImplSP format_sp(new TypeFormatImpl_Format(format, flags));
+
+  if (regex)
+    category_sp->GetRegexTypeFormatsContainer()->Add(
+        RegularExpressionSP(new RegularExpression(type_name.AsCString())),
+        format_sp);
+  else
+    category_sp->GetTypeFormatsContainer()->Add(type_name, format_sp);
 }
 
-void
-lldb_private::formatters::AddSummary(TypeCategoryImpl::SharedPointer category_sp,
-                                     TypeSummaryImplSP summary_sp,
-                                     ConstString type_name,
-                                     bool regex)
-{
-    if (regex)
-        category_sp->GetRegexTypeSummariesContainer()->Add(RegularExpressionSP(new RegularExpression(type_name.AsCString())),summary_sp);
-    else
-        category_sp->GetTypeSummariesContainer()->Add(type_name, summary_sp);
+void lldb_private::formatters::AddSummary(
+    TypeCategoryImpl::SharedPointer category_sp, TypeSummaryImplSP summary_sp,
+    ConstString type_name, bool regex) {
+  if (regex)
+    category_sp->GetRegexTypeSummariesContainer()->Add(
+        RegularExpressionSP(new RegularExpression(type_name.AsCString())),
+        summary_sp);
+  else
+    category_sp->GetTypeSummariesContainer()->Add(type_name, summary_sp);
 }
 
-void
-lldb_private::formatters::AddStringSummary(TypeCategoryImpl::SharedPointer category_sp,
-                                           const char* string,
-                                           ConstString type_name,
-                                           TypeSummaryImpl::Flags flags,
-                                           bool regex)
-{
-    lldb::TypeSummaryImplSP summary_sp(new StringSummaryFormat(flags,
-                                                               string));
-    
-    if (regex)
-        category_sp->GetRegexTypeSummariesContainer()->Add(RegularExpressionSP(new RegularExpression(type_name.AsCString())),summary_sp);
-    else
-        category_sp->GetTypeSummariesContainer()->Add(type_name, summary_sp);
+void lldb_private::formatters::AddStringSummary(
+    TypeCategoryImpl::SharedPointer category_sp, const char *string,
+    ConstString type_name, TypeSummaryImpl::Flags flags, bool regex) {
+  lldb::TypeSummaryImplSP summary_sp(new StringSummaryFormat(flags, string));
+
+  if (regex)
+    category_sp->GetRegexTypeSummariesContainer()->Add(
+        RegularExpressionSP(new RegularExpression(type_name.AsCString())),
+        summary_sp);
+  else
+    category_sp->GetTypeSummariesContainer()->Add(type_name, summary_sp);
 }
 
-void
-lldb_private::formatters::AddOneLineSummary (TypeCategoryImpl::SharedPointer category_sp,
-                                             ConstString type_name,
-                                             TypeSummaryImpl::Flags flags,
-                                             bool regex)
-{
-    flags.SetShowMembersOneLiner(true);
-    lldb::TypeSummaryImplSP summary_sp(new StringSummaryFormat(flags, ""));
-    
-    if (regex)
-        category_sp->GetRegexTypeSummariesContainer()->Add(RegularExpressionSP(new RegularExpression(type_name.AsCString())),summary_sp);
-    else
-        category_sp->GetTypeSummariesContainer()->Add(type_name, summary_sp);
+void lldb_private::formatters::AddOneLineSummary(
+    TypeCategoryImpl::SharedPointer category_sp, ConstString type_name,
+    TypeSummaryImpl::Flags flags, bool regex) {
+  flags.SetShowMembersOneLiner(true);
+  lldb::TypeSummaryImplSP summary_sp(new StringSummaryFormat(flags, ""));
+
+  if (regex)
+    category_sp->GetRegexTypeSummariesContainer()->Add(
+        RegularExpressionSP(new RegularExpression(type_name.AsCString())),
+        summary_sp);
+  else
+    category_sp->GetTypeSummariesContainer()->Add(type_name, summary_sp);
 }
 
 #ifndef LLDB_DISABLE_PYTHON
-void
-lldb_private::formatters::AddCXXSummary (TypeCategoryImpl::SharedPointer category_sp,
-                                         CXXFunctionSummaryFormat::Callback funct,
-                                         const char* description,
-                                         ConstString type_name,
-                                         TypeSummaryImpl::Flags flags,
-                                         bool regex)
-{
-    lldb::TypeSummaryImplSP summary_sp(new CXXFunctionSummaryFormat(flags,funct,description));
-    if (regex)
-        category_sp->GetRegexTypeSummariesContainer()->Add(RegularExpressionSP(new RegularExpression(type_name.AsCString())),summary_sp);
-    else
-        category_sp->GetTypeSummariesContainer()->Add(type_name, summary_sp);
+void lldb_private::formatters::AddCXXSummary(
+    TypeCategoryImpl::SharedPointer category_sp,
+    CXXFunctionSummaryFormat::Callback funct, const char *description,
+    ConstString type_name, TypeSummaryImpl::Flags flags, bool regex) {
+  lldb::TypeSummaryImplSP summary_sp(
+      new CXXFunctionSummaryFormat(flags, funct, description));
+  if (regex)
+    category_sp->GetRegexTypeSummariesContainer()->Add(
+        RegularExpressionSP(new RegularExpression(type_name.AsCString())),
+        summary_sp);
+  else
+    category_sp->GetTypeSummariesContainer()->Add(type_name, summary_sp);
 }
 
-void
-lldb_private::formatters::AddCXXSynthetic  (TypeCategoryImpl::SharedPointer category_sp,
-                                            CXXSyntheticChildren::CreateFrontEndCallback generator,
-                                            const char* description,
-                                            ConstString type_name,
-                                            ScriptedSyntheticChildren::Flags flags,
-                                            bool regex)
-{
-    lldb::SyntheticChildrenSP synth_sp(new CXXSyntheticChildren(flags,description,generator));
-    if (regex)
-        category_sp->GetRegexTypeSyntheticsContainer()->Add(RegularExpressionSP(new RegularExpression(type_name.AsCString())), synth_sp);
-    else
-        category_sp->GetTypeSyntheticsContainer()->Add(type_name,synth_sp);
+void lldb_private::formatters::AddCXXSynthetic(
+    TypeCategoryImpl::SharedPointer category_sp,
+    CXXSyntheticChildren::CreateFrontEndCallback generator,
+    const char *description, ConstString type_name,
+    ScriptedSyntheticChildren::Flags flags, bool regex) {
+  lldb::SyntheticChildrenSP synth_sp(
+      new CXXSyntheticChildren(flags, description, generator));
+  if (regex)
+    category_sp->GetRegexTypeSyntheticsContainer()->Add(
+        RegularExpressionSP(new RegularExpression(type_name.AsCString())),
+        synth_sp);
+  else
+    category_sp->GetTypeSyntheticsContainer()->Add(type_name, synth_sp);
 }
 
-void
-lldb_private::formatters::AddFilter  (TypeCategoryImpl::SharedPointer category_sp,
-                                      std::vector<std::string> children,
-                                      const char* description,
-                                      ConstString type_name,
-                                      ScriptedSyntheticChildren::Flags flags,
-                                      bool regex)
-{
-    TypeFilterImplSP filter_sp(new TypeFilterImpl(flags));
-    for (auto child : children)
-        filter_sp->AddExpressionPath(child);
-    if (regex)
-        category_sp->GetRegexTypeFiltersContainer()->Add(RegularExpressionSP(new RegularExpression(type_name.AsCString())), filter_sp);
-    else
-        category_sp->GetTypeFiltersContainer()->Add(type_name,filter_sp);
+void lldb_private::formatters::AddFilter(
+    TypeCategoryImpl::SharedPointer category_sp,
+    std::vector<std::string> children, const char *description,
+    ConstString type_name, ScriptedSyntheticChildren::Flags flags, bool regex) {
+  TypeFilterImplSP filter_sp(new TypeFilterImpl(flags));
+  for (auto child : children)
+    filter_sp->AddExpressionPath(child);
+  if (regex)
+    category_sp->GetRegexTypeFiltersContainer()->Add(
+        RegularExpressionSP(new RegularExpression(type_name.AsCString())),
+        filter_sp);
+  else
+    category_sp->GetTypeFiltersContainer()->Add(type_name, filter_sp);
 }
 #endif
 
-size_t
-lldb_private::formatters::ExtractIndexFromString (const char* item_name)
-{
-    if (!item_name || !*item_name)
-        return UINT32_MAX;
-    if (*item_name != '[')
-        return UINT32_MAX;
-    item_name++;
-    char* endptr = NULL;
-    unsigned long int idx = ::strtoul(item_name, &endptr, 0);
-    if (idx == 0 && endptr == item_name)
-        return UINT32_MAX;
-    if (idx == ULONG_MAX)
-        return UINT32_MAX;
-    return idx;
+size_t lldb_private::formatters::ExtractIndexFromString(const char *item_name) {
+  if (!item_name || !*item_name)
+    return UINT32_MAX;
+  if (*item_name != '[')
+    return UINT32_MAX;
+  item_name++;
+  char *endptr = NULL;
+  unsigned long int idx = ::strtoul(item_name, &endptr, 0);
+  if (idx == 0 && endptr == item_name)
+    return UINT32_MAX;
+  if (idx == ULONG_MAX)
+    return UINT32_MAX;
+  return idx;
 }
 
 lldb::addr_t
-lldb_private::formatters::GetArrayAddressOrPointerValue (ValueObject& valobj)
-{
-    lldb::addr_t data_addr = LLDB_INVALID_ADDRESS;
+lldb_private::formatters::GetArrayAddressOrPointerValue(ValueObject &valobj) {
+  lldb::addr_t data_addr = LLDB_INVALID_ADDRESS;
 
-    if (valobj.IsPointerType())
-        data_addr = valobj.GetValueAsUnsigned(0);
-    else if (valobj.IsArrayType())
-        data_addr = valobj.GetAddressOf();
+  if (valobj.IsPointerType())
+    data_addr = valobj.GetValueAsUnsigned(0);
+  else if (valobj.IsArrayType())
+    data_addr = valobj.GetAddressOf();
 
-    return data_addr;
+  return data_addr;
 }