*** 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, 191 insertions, 173 deletions

diff --git a/lldb/source/Interpreter/OptionGroupValueObjectDisplay.cpp b/lldb/source/Interpreter/OptionGroupValueObjectDisplay.cpp
index 718ddc77f82..5ce7fb8ed72 100644
--- a/lldb/source/Interpreter/OptionGroupValueObjectDisplay.cpp
+++ b/lldb/source/Interpreter/OptionGroupValueObjectDisplay.cpp
@@ -15,191 +15,209 @@
 // Project includes
 #include "lldb/DataFormatters/ValueObjectPrinter.h"
 #include "lldb/Host/StringConvert.h"
-#include "lldb/Target/Target.h"
 #include "lldb/Interpreter/CommandInterpreter.h"
+#include "lldb/Target/Target.h"
 #include "lldb/Utility/Utils.h"
 
 using namespace lldb;
 using namespace lldb_private;
 
-OptionGroupValueObjectDisplay::OptionGroupValueObjectDisplay()
-{
-}
-
-OptionGroupValueObjectDisplay::~OptionGroupValueObjectDisplay ()
-{
+OptionGroupValueObjectDisplay::OptionGroupValueObjectDisplay() {}
+
+OptionGroupValueObjectDisplay::~OptionGroupValueObjectDisplay() {}
+
+static OptionDefinition g_option_table[] = {
+    {LLDB_OPT_SET_1, false, "dynamic-type", 'd',
+     OptionParser::eRequiredArgument, nullptr, g_dynamic_value_types, 0,
+     eArgTypeNone, "Show the object as its full dynamic type, not its static "
+                   "type, if available."},
+    {LLDB_OPT_SET_1, false, "synthetic-type", 'S',
+     OptionParser::eRequiredArgument, nullptr, nullptr, 0, eArgTypeBoolean,
+     "Show the object obeying its synthetic provider, if available."},
+    {LLDB_OPT_SET_1, false, "depth", 'D', OptionParser::eRequiredArgument,
+     nullptr, nullptr, 0, eArgTypeCount, "Set the max recurse depth when "
+                                         "dumping aggregate types (default is "
+                                         "infinity)."},
+    {LLDB_OPT_SET_1, false, "flat", 'F', OptionParser::eNoArgument, nullptr,
+     nullptr, 0, eArgTypeNone, "Display results in a flat format that uses "
+                               "expression paths for each variable or member."},
+    {LLDB_OPT_SET_1, false, "location", 'L', OptionParser::eNoArgument, nullptr,
+     nullptr, 0, eArgTypeNone, "Show variable location information."},
+    {LLDB_OPT_SET_1, false, "object-description", 'O',
+     OptionParser::eNoArgument, nullptr, nullptr, 0, eArgTypeNone,
+     "Print as an Objective-C object."},
+    {LLDB_OPT_SET_1, false, "ptr-depth", 'P', OptionParser::eRequiredArgument,
+     nullptr, nullptr, 0, eArgTypeCount, "The number of pointers to be "
+                                         "traversed when dumping values "
+                                         "(default is zero)."},
+    {LLDB_OPT_SET_1, false, "show-types", 'T', OptionParser::eNoArgument,
+     nullptr, nullptr, 0, eArgTypeNone,
+     "Show variable types when dumping values."},
+    {LLDB_OPT_SET_1, false, "no-summary-depth", 'Y',
+     OptionParser::eOptionalArgument, nullptr, nullptr, 0, eArgTypeCount,
+     "Set the depth at which omitting summary information stops (default is "
+     "1)."},
+    {LLDB_OPT_SET_1, false, "raw-output", 'R', OptionParser::eNoArgument,
+     nullptr, nullptr, 0, eArgTypeNone, "Don't use formatting options."},
+    {LLDB_OPT_SET_1, false, "show-all-children", 'A', OptionParser::eNoArgument,
+     nullptr, nullptr, 0, eArgTypeNone,
+     "Ignore the upper bound on the number of children to show."},
+    {LLDB_OPT_SET_1, false, "validate", 'V', OptionParser::eRequiredArgument,
+     nullptr, nullptr, 0, eArgTypeBoolean, "Show results of type validators."},
+    {LLDB_OPT_SET_1, false, "element-count", 'Z',
+     OptionParser::eRequiredArgument, nullptr, nullptr, 0, eArgTypeCount,
+     "Treat the result of the expression as if its type is an array of this "
+     "many values."},
+    {0, false, nullptr, 0, 0, nullptr, nullptr, 0, eArgTypeNone, nullptr}};
+
+uint32_t OptionGroupValueObjectDisplay::GetNumDefinitions() {
+  return llvm::array_lengthof(g_option_table);
 }
 
-static OptionDefinition
-g_option_table[] =
-{
-    { LLDB_OPT_SET_1, false, "dynamic-type",       'd', OptionParser::eRequiredArgument, nullptr, g_dynamic_value_types, 0, eArgTypeNone,      "Show the object as its full dynamic type, not its static type, if available."},
-    { LLDB_OPT_SET_1, false, "synthetic-type",     'S', OptionParser::eRequiredArgument, nullptr, nullptr, 0, eArgTypeBoolean,   "Show the object obeying its synthetic provider, if available."},
-    { LLDB_OPT_SET_1, false, "depth",              'D', OptionParser::eRequiredArgument, nullptr, nullptr, 0, eArgTypeCount,     "Set the max recurse depth when dumping aggregate types (default is infinity)."},
-    { LLDB_OPT_SET_1, false, "flat",               'F', OptionParser::eNoArgument,       nullptr, nullptr, 0, eArgTypeNone,      "Display results in a flat format that uses expression paths for each variable or member."},
-    { LLDB_OPT_SET_1, false, "location",           'L', OptionParser::eNoArgument,       nullptr, nullptr, 0, eArgTypeNone,      "Show variable location information."},
-    { LLDB_OPT_SET_1, false, "object-description", 'O', OptionParser::eNoArgument,       nullptr, nullptr, 0, eArgTypeNone,      "Print as an Objective-C object."},
-    { LLDB_OPT_SET_1, false, "ptr-depth",          'P', OptionParser::eRequiredArgument, nullptr, nullptr, 0, eArgTypeCount,     "The number of pointers to be traversed when dumping values (default is zero)."},
-    { LLDB_OPT_SET_1, false, "show-types",         'T', OptionParser::eNoArgument,       nullptr, nullptr, 0, eArgTypeNone,      "Show variable types when dumping values."},
-    { LLDB_OPT_SET_1, false, "no-summary-depth",   'Y', OptionParser::eOptionalArgument, nullptr, nullptr, 0, eArgTypeCount,     "Set the depth at which omitting summary information stops (default is 1)."},
-    { LLDB_OPT_SET_1, false, "raw-output",         'R', OptionParser::eNoArgument,       nullptr, nullptr, 0, eArgTypeNone,      "Don't use formatting options."},
-    { LLDB_OPT_SET_1, false, "show-all-children",  'A', OptionParser::eNoArgument,       nullptr, nullptr, 0, eArgTypeNone,      "Ignore the upper bound on the number of children to show."},
-    { LLDB_OPT_SET_1, false, "validate",           'V',  OptionParser::eRequiredArgument, nullptr, nullptr,0, eArgTypeBoolean,   "Show results of type validators."},
-    { LLDB_OPT_SET_1, false, "element-count",      'Z', OptionParser::eRequiredArgument, nullptr, nullptr, 0, eArgTypeCount,     "Treat the result of the expression as if its type is an array of this many values."},
-    { 0, false, nullptr, 0, 0, nullptr, nullptr, 0, eArgTypeNone, nullptr }
-};
-
-uint32_t
-OptionGroupValueObjectDisplay::GetNumDefinitions ()
-{
-    return llvm::array_lengthof(g_option_table);
+const OptionDefinition *OptionGroupValueObjectDisplay::GetDefinitions() {
+  return g_option_table;
 }
 
-const OptionDefinition *
-OptionGroupValueObjectDisplay::GetDefinitions ()
-{
-    return g_option_table;
-}
-
-
-Error
-OptionGroupValueObjectDisplay::SetOptionValue(uint32_t option_idx,
-                                              const char *option_arg,
-                                              ExecutionContext
-                                              *execution_context)
-{
-    Error error;
-    const int short_option = g_option_table[option_idx].short_option;
-    bool success = false;
-
-    switch (short_option)
-    {
-        case 'd':
-            {
-                int32_t result;
-                result = Args::StringToOptionEnum (option_arg, g_dynamic_value_types, 2, error);
-                if (error.Success())
-                    use_dynamic = (lldb::DynamicValueType) result;
-            }
-            break;
-        case 'T':   show_types   = true;  break;
-        case 'L':   show_location= true;  break;
-        case 'F':   flat_output  = true;  break;
-        case 'O':   use_objc     = true;  break;
-        case 'R':   be_raw       = true;  break;
-        case 'A':   ignore_cap   = true;  break;
-            
-        case 'D':
-            max_depth = StringConvert::ToUInt32 (option_arg, UINT32_MAX, 0, &success);
-            if (!success)
-                error.SetErrorStringWithFormat("invalid max depth '%s'", option_arg);
-            break;
-
-        case 'Z':
-            elem_count = StringConvert::ToUInt32 (option_arg, UINT32_MAX, 0, &success);
-            if (!success)
-                error.SetErrorStringWithFormat("invalid element count '%s'", option_arg);
-            break;
-            
-        case 'P':
-            ptr_depth = StringConvert::ToUInt32 (option_arg, 0, 0, &success);
-            if (!success)
-                error.SetErrorStringWithFormat("invalid pointer depth '%s'", option_arg);
-            break;
-            
-        case 'Y':
-            if (option_arg)
-            {
-                no_summary_depth = StringConvert::ToUInt32 (option_arg, 0, 0, &success);
-                if (!success)
-                    error.SetErrorStringWithFormat("invalid pointer depth '%s'", option_arg);
-            }
-            else
-                no_summary_depth = 1;
-            break;
-            
-        case 'S':
-            use_synth = Args::StringToBoolean(option_arg, true, &success);
-            if (!success)
-                error.SetErrorStringWithFormat("invalid synthetic-type '%s'", option_arg);
-            break;
-            
-        case 'V':
-            run_validator = Args::StringToBoolean(option_arg, true, &success);
-            if (!success)
-                error.SetErrorStringWithFormat("invalid validate '%s'", option_arg);
-            break;
-            
-        default:
-            error.SetErrorStringWithFormat ("unrecognized option '%c'", short_option);
-            break;
-    }
-
-    return error;
+Error OptionGroupValueObjectDisplay::SetOptionValue(
+    uint32_t option_idx, const char *option_arg,
+    ExecutionContext *execution_context) {
+  Error error;
+  const int short_option = g_option_table[option_idx].short_option;
+  bool success = false;
+
+  switch (short_option) {
+  case 'd': {
+    int32_t result;
+    result =
+        Args::StringToOptionEnum(option_arg, g_dynamic_value_types, 2, error);
+    if (error.Success())
+      use_dynamic = (lldb::DynamicValueType)result;
+  } break;
+  case 'T':
+    show_types = true;
+    break;
+  case 'L':
+    show_location = true;
+    break;
+  case 'F':
+    flat_output = true;
+    break;
+  case 'O':
+    use_objc = true;
+    break;
+  case 'R':
+    be_raw = true;
+    break;
+  case 'A':
+    ignore_cap = true;
+    break;
+
+  case 'D':
+    max_depth = StringConvert::ToUInt32(option_arg, UINT32_MAX, 0, &success);
+    if (!success)
+      error.SetErrorStringWithFormat("invalid max depth '%s'", option_arg);
+    break;
+
+  case 'Z':
+    elem_count = StringConvert::ToUInt32(option_arg, UINT32_MAX, 0, &success);
+    if (!success)
+      error.SetErrorStringWithFormat("invalid element count '%s'", option_arg);
+    break;
+
+  case 'P':
+    ptr_depth = StringConvert::ToUInt32(option_arg, 0, 0, &success);
+    if (!success)
+      error.SetErrorStringWithFormat("invalid pointer depth '%s'", option_arg);
+    break;
+
+  case 'Y':
+    if (option_arg) {
+      no_summary_depth = StringConvert::ToUInt32(option_arg, 0, 0, &success);
+      if (!success)
+        error.SetErrorStringWithFormat("invalid pointer depth '%s'",
+                                       option_arg);
+    } else
+      no_summary_depth = 1;
+    break;
+
+  case 'S':
+    use_synth = Args::StringToBoolean(option_arg, true, &success);
+    if (!success)
+      error.SetErrorStringWithFormat("invalid synthetic-type '%s'", option_arg);
+    break;
+
+  case 'V':
+    run_validator = Args::StringToBoolean(option_arg, true, &success);
+    if (!success)
+      error.SetErrorStringWithFormat("invalid validate '%s'", option_arg);
+    break;
+
+  default:
+    error.SetErrorStringWithFormat("unrecognized option '%c'", short_option);
+    break;
+  }
+
+  return error;
 }
 
-void
-OptionGroupValueObjectDisplay::OptionParsingStarting(ExecutionContext
-                                                     *execution_context)
-{
-    // If these defaults change, be sure to modify AnyOptionWasSet().
-    show_types        = false;
-    no_summary_depth  = 0;
-    show_location     = false;
-    flat_output       = false;
-    use_objc          = false;
-    max_depth         = UINT32_MAX;
-    ptr_depth         = 0;
-    elem_count        = 0;
-    use_synth         = true;
-    be_raw            = false;
-    ignore_cap        = false;
-    run_validator     = false;
-
-    TargetSP target_sp =
-        execution_context ? execution_context->GetTargetSP() : TargetSP();
-    if (target_sp)
-        use_dynamic = target_sp->GetPreferDynamicValue();
-    else
-    {
-        // If we don't have any targets, then dynamic values won't do us much good.
-        use_dynamic = lldb::eNoDynamicValues;
-    }
+void OptionGroupValueObjectDisplay::OptionParsingStarting(
+    ExecutionContext *execution_context) {
+  // If these defaults change, be sure to modify AnyOptionWasSet().
+  show_types = false;
+  no_summary_depth = 0;
+  show_location = false;
+  flat_output = false;
+  use_objc = false;
+  max_depth = UINT32_MAX;
+  ptr_depth = 0;
+  elem_count = 0;
+  use_synth = true;
+  be_raw = false;
+  ignore_cap = false;
+  run_validator = false;
+
+  TargetSP target_sp =
+      execution_context ? execution_context->GetTargetSP() : TargetSP();
+  if (target_sp)
+    use_dynamic = target_sp->GetPreferDynamicValue();
+  else {
+    // If we don't have any targets, then dynamic values won't do us much good.
+    use_dynamic = lldb::eNoDynamicValues;
+  }
 }
 
-DumpValueObjectOptions
-OptionGroupValueObjectDisplay::GetAsDumpOptions (LanguageRuntimeDescriptionDisplayVerbosity lang_descr_verbosity,
-                                                 lldb::Format format,
-                                                 lldb::TypeSummaryImplSP summary_sp)
-{
-    DumpValueObjectOptions options;
-    options.SetMaximumPointerDepth( {DumpValueObjectOptions::PointerDepth::Mode::Always,ptr_depth} );
-    if (use_objc)
-        options.SetShowSummary(false);
-    else
-        options.SetOmitSummaryDepth(no_summary_depth);
-    options.SetMaximumDepth(max_depth)
-    .SetShowTypes(show_types)
-    .SetShowLocation(show_location)
-    .SetUseObjectiveC(use_objc)
-    .SetUseDynamicType(use_dynamic)
-    .SetUseSyntheticValue(use_synth)
-    .SetFlatOutput(flat_output)
-    .SetIgnoreCap(ignore_cap)
-    .SetFormat(format)
-    .SetSummary(summary_sp);
-    
-    if (lang_descr_verbosity == eLanguageRuntimeDescriptionDisplayVerbosityCompact)
-        options.SetHideRootType(use_objc)
-        .SetHideName(use_objc)
-        .SetHideValue(use_objc);
-    
-    if (be_raw)
-        options.SetRawDisplay();
-    
-    options.SetRunValidator(run_validator);
-    
-    options.SetElementCount(elem_count);
-
-    return options;
+DumpValueObjectOptions OptionGroupValueObjectDisplay::GetAsDumpOptions(
+    LanguageRuntimeDescriptionDisplayVerbosity lang_descr_verbosity,
+    lldb::Format format, lldb::TypeSummaryImplSP summary_sp) {
+  DumpValueObjectOptions options;
+  options.SetMaximumPointerDepth(
+      {DumpValueObjectOptions::PointerDepth::Mode::Always, ptr_depth});
+  if (use_objc)
+    options.SetShowSummary(false);
+  else
+    options.SetOmitSummaryDepth(no_summary_depth);
+  options.SetMaximumDepth(max_depth)
+      .SetShowTypes(show_types)
+      .SetShowLocation(show_location)
+      .SetUseObjectiveC(use_objc)
+      .SetUseDynamicType(use_dynamic)
+      .SetUseSyntheticValue(use_synth)
+      .SetFlatOutput(flat_output)
+      .SetIgnoreCap(ignore_cap)
+      .SetFormat(format)
+      .SetSummary(summary_sp);
+
+  if (lang_descr_verbosity ==
+      eLanguageRuntimeDescriptionDisplayVerbosityCompact)
+    options.SetHideRootType(use_objc).SetHideName(use_objc).SetHideValue(
+        use_objc);
+
+  if (be_raw)
+    options.SetRawDisplay();
+
+  options.SetRunValidator(run_validator);
+
+  options.SetElementCount(elem_count);
+
+  return options;
 }