*** 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, 254 insertions, 263 deletions

diff --git a/lldb/source/Interpreter/Property.cpp b/lldb/source/Interpreter/Property.cpp
index b9fe28620a4..1958949c0b0 100644
--- a/lldb/source/Interpreter/Property.cpp
+++ b/lldb/source/Interpreter/Property.cpp
@@ -22,289 +22,280 @@
 using namespace lldb;
 using namespace lldb_private;
 
-Property::Property (const PropertyDefinition &definition) :
-    m_name (definition.name),
-    m_description (definition.description),
-    m_value_sp (),
-    m_is_global (definition.global)
-{
-    switch (definition.type)
-    {
-        case OptionValue::eTypeInvalid:
-        case OptionValue::eTypeProperties:
-            break;
-        case OptionValue::eTypeArch:
-            // "definition.default_uint_value" is not used
-            // "definition.default_cstr_value" as a string value that represents the default string value for the architecture/triple
-            m_value_sp.reset (new OptionValueArch(definition.default_cstr_value));
-            break;
-            
-        case OptionValue::eTypeArgs:
-            // "definition.default_uint_value" is always a OptionValue::Type
-            m_value_sp.reset (new OptionValueArgs());
-            break;
-            
-        case OptionValue::eTypeArray:
-            // "definition.default_uint_value" is always a OptionValue::Type
-            m_value_sp.reset (new OptionValueArray(OptionValue::ConvertTypeToMask((OptionValue::Type)definition.default_uint_value)));
-            break;
-            
-        case OptionValue::eTypeBoolean:
-            // "definition.default_uint_value" is the default boolean value if
-            // "definition.default_cstr_value" is NULL, otherwise interpret
-            // "definition.default_cstr_value" as a string value that represents the default
-            // value.
-            if (definition.default_cstr_value)
-                m_value_sp.reset (new OptionValueBoolean(Args::StringToBoolean (definition.default_cstr_value, false, nullptr)));
-            else
-                m_value_sp.reset (new OptionValueBoolean(definition.default_uint_value != 0));
-            break;
+Property::Property(const PropertyDefinition &definition)
+    : m_name(definition.name), m_description(definition.description),
+      m_value_sp(), m_is_global(definition.global) {
+  switch (definition.type) {
+  case OptionValue::eTypeInvalid:
+  case OptionValue::eTypeProperties:
+    break;
+  case OptionValue::eTypeArch:
+    // "definition.default_uint_value" is not used
+    // "definition.default_cstr_value" as a string value that represents the
+    // default string value for the architecture/triple
+    m_value_sp.reset(new OptionValueArch(definition.default_cstr_value));
+    break;
 
-        case OptionValue::eTypeChar:
-            m_value_sp.reset(new OptionValueChar(Args::StringToChar(definition.default_cstr_value, '\0', nullptr)));
-            break;
+  case OptionValue::eTypeArgs:
+    // "definition.default_uint_value" is always a OptionValue::Type
+    m_value_sp.reset(new OptionValueArgs());
+    break;
 
-        case OptionValue::eTypeDictionary:
-            // "definition.default_uint_value" is always a OptionValue::Type
-            m_value_sp.reset (new OptionValueDictionary(OptionValue::ConvertTypeToMask((OptionValue::Type)definition.default_uint_value)));
-            break;
-            
-        case OptionValue::eTypeEnum:
-            // "definition.default_uint_value" is the default enumeration value if
-            // "definition.default_cstr_value" is NULL, otherwise interpret
-            // "definition.default_cstr_value" as a string value that represents the default
-            // value.
-        {
-            OptionValueEnumeration *enum_value = new OptionValueEnumeration(definition.enum_values, definition.default_uint_value);
-            m_value_sp.reset (enum_value);
-            if (definition.default_cstr_value)
-            {
-                if (enum_value->SetValueFromString(definition.default_cstr_value).Success())
-                {
-                    enum_value->SetDefaultValue(enum_value->GetCurrentValue());
-                    // Call Clear() since we don't want the value to appear as
-                    // having been set since we called SetValueFromString() above.
-                    // Clear will set the current value to the default and clear
-                    // the boolean that says that the value has been set.
-                    enum_value->Clear();
-                }
-            }
-        }
-            break;
-            
-        case OptionValue::eTypeFileSpec:
-        {
-            // "definition.default_uint_value" represents if the "definition.default_cstr_value" should
-            // be resolved or not
-            const bool resolve = definition.default_uint_value != 0;
-            m_value_sp.reset (new OptionValueFileSpec(FileSpec(definition.default_cstr_value, resolve), resolve));
-            break;
-        }
-            
-        case OptionValue::eTypeFileSpecList:
-            // "definition.default_uint_value" is not used for a OptionValue::eTypeFileSpecList
-            m_value_sp.reset (new OptionValueFileSpecList());
-            break;
-            
-        case OptionValue::eTypeFormat:
-            // "definition.default_uint_value" is the default format enumeration value if
-            // "definition.default_cstr_value" is NULL, otherwise interpret
-            // "definition.default_cstr_value" as a string value that represents the default
-            // value.
-            {
-                Format new_format = eFormatInvalid;
-                if (definition.default_cstr_value)
-                    Args::StringToFormat (definition.default_cstr_value, new_format, nullptr);
-                else
-                    new_format = (Format)definition.default_uint_value;
-                m_value_sp.reset (new OptionValueFormat(new_format));
-            }
-            break;
-            
-        case OptionValue::eTypeLanguage:
-            // "definition.default_uint_value" is the default language enumeration value if
-            // "definition.default_cstr_value" is NULL, otherwise interpret
-            // "definition.default_cstr_value" as a string value that represents the default
-            // value.
-        {
-            LanguageType new_lang = eLanguageTypeUnknown;
-            if (definition.default_cstr_value)
-                Language::GetLanguageTypeFromString(definition.default_cstr_value);
-            else
-                new_lang = (LanguageType)definition.default_uint_value;
-            m_value_sp.reset (new OptionValueLanguage(new_lang));
+  case OptionValue::eTypeArray:
+    // "definition.default_uint_value" is always a OptionValue::Type
+    m_value_sp.reset(new OptionValueArray(OptionValue::ConvertTypeToMask(
+        (OptionValue::Type)definition.default_uint_value)));
+    break;
+
+  case OptionValue::eTypeBoolean:
+    // "definition.default_uint_value" is the default boolean value if
+    // "definition.default_cstr_value" is NULL, otherwise interpret
+    // "definition.default_cstr_value" as a string value that represents the
+    // default
+    // value.
+    if (definition.default_cstr_value)
+      m_value_sp.reset(new OptionValueBoolean(Args::StringToBoolean(
+          definition.default_cstr_value, false, nullptr)));
+    else
+      m_value_sp.reset(
+          new OptionValueBoolean(definition.default_uint_value != 0));
+    break;
+
+  case OptionValue::eTypeChar:
+    m_value_sp.reset(new OptionValueChar(
+        Args::StringToChar(definition.default_cstr_value, '\0', nullptr)));
+    break;
+
+  case OptionValue::eTypeDictionary:
+    // "definition.default_uint_value" is always a OptionValue::Type
+    m_value_sp.reset(new OptionValueDictionary(OptionValue::ConvertTypeToMask(
+        (OptionValue::Type)definition.default_uint_value)));
+    break;
+
+  case OptionValue::eTypeEnum:
+    // "definition.default_uint_value" is the default enumeration value if
+    // "definition.default_cstr_value" is NULL, otherwise interpret
+    // "definition.default_cstr_value" as a string value that represents the
+    // default
+    // value.
+    {
+      OptionValueEnumeration *enum_value = new OptionValueEnumeration(
+          definition.enum_values, definition.default_uint_value);
+      m_value_sp.reset(enum_value);
+      if (definition.default_cstr_value) {
+        if (enum_value->SetValueFromString(definition.default_cstr_value)
+                .Success()) {
+          enum_value->SetDefaultValue(enum_value->GetCurrentValue());
+          // Call Clear() since we don't want the value to appear as
+          // having been set since we called SetValueFromString() above.
+          // Clear will set the current value to the default and clear
+          // the boolean that says that the value has been set.
+          enum_value->Clear();
         }
-            break;
-            
-        case OptionValue::eTypeFormatEntity:
-            // "definition.default_cstr_value" as a string value that represents the default
-            m_value_sp.reset (new OptionValueFormatEntity(definition.default_cstr_value));
-            break;
+      }
+    }
+    break;
 
-        case OptionValue::eTypePathMap:
-            // "definition.default_uint_value" tells us if notifications should occur for
-            // path mappings
-            m_value_sp.reset (new OptionValuePathMappings(definition.default_uint_value != 0));
-            break;
-            
-        case OptionValue::eTypeRegex:
-            // "definition.default_uint_value" is used to the regular expression flags
-            // "definition.default_cstr_value" the default regular expression value
-            // value.
-            m_value_sp.reset (new OptionValueRegex(definition.default_cstr_value));
-            break;
-            
-        case OptionValue::eTypeSInt64:
-            // "definition.default_uint_value" is the default integer value if
-            // "definition.default_cstr_value" is NULL, otherwise interpret
-            // "definition.default_cstr_value" as a string value that represents the default
-            // value.
-            m_value_sp.reset (new OptionValueSInt64(definition.default_cstr_value ? StringConvert::ToSInt64 (definition.default_cstr_value) : definition.default_uint_value));
-            break;
-            
-        case OptionValue::eTypeUInt64:
-            // "definition.default_uint_value" is the default unsigned integer value if
-            // "definition.default_cstr_value" is NULL, otherwise interpret
-            // "definition.default_cstr_value" as a string value that represents the default
-            // value.
-            m_value_sp.reset (new OptionValueUInt64(definition.default_cstr_value ? StringConvert::ToUInt64 (definition.default_cstr_value) : definition.default_uint_value));
-            break;
-            
-        case OptionValue::eTypeUUID:
-            // "definition.default_uint_value" is not used for a OptionValue::eTypeUUID
-            // "definition.default_cstr_value" can contain a default UUID value
-            {
-                UUID uuid;
-                if (definition.default_cstr_value)
-                    uuid.SetFromCString (definition.default_cstr_value);
-                m_value_sp.reset (new OptionValueUUID(uuid));
-            }
-            break;
-            
-        case OptionValue::eTypeString:
-            // "definition.default_uint_value" can contain the string option flags OR'ed together
-            // "definition.default_cstr_value" can contain a default string value
-            {
-                OptionValueString *string_value = new OptionValueString(definition.default_cstr_value);
-                if (definition.default_uint_value != 0)
-                    string_value->GetOptions().Reset(definition.default_uint_value);
-                m_value_sp.reset (string_value);
-            }
-            break;
+  case OptionValue::eTypeFileSpec: {
+    // "definition.default_uint_value" represents if the
+    // "definition.default_cstr_value" should
+    // be resolved or not
+    const bool resolve = definition.default_uint_value != 0;
+    m_value_sp.reset(new OptionValueFileSpec(
+        FileSpec(definition.default_cstr_value, resolve), resolve));
+    break;
+  }
+
+  case OptionValue::eTypeFileSpecList:
+    // "definition.default_uint_value" is not used for a
+    // OptionValue::eTypeFileSpecList
+    m_value_sp.reset(new OptionValueFileSpecList());
+    break;
+
+  case OptionValue::eTypeFormat:
+    // "definition.default_uint_value" is the default format enumeration value
+    // if
+    // "definition.default_cstr_value" is NULL, otherwise interpret
+    // "definition.default_cstr_value" as a string value that represents the
+    // default
+    // value.
+    {
+      Format new_format = eFormatInvalid;
+      if (definition.default_cstr_value)
+        Args::StringToFormat(definition.default_cstr_value, new_format,
+                             nullptr);
+      else
+        new_format = (Format)definition.default_uint_value;
+      m_value_sp.reset(new OptionValueFormat(new_format));
     }
-}
+    break;
 
-Property::Property (const ConstString &name,
-                    const ConstString &desc,
-                    bool is_global,
-                    const lldb::OptionValueSP &value_sp) :
-    m_name (name),
-    m_description (desc),
-    m_value_sp (value_sp),
-    m_is_global (is_global)
-{
-}
+  case OptionValue::eTypeLanguage:
+    // "definition.default_uint_value" is the default language enumeration value
+    // if
+    // "definition.default_cstr_value" is NULL, otherwise interpret
+    // "definition.default_cstr_value" as a string value that represents the
+    // default
+    // value.
+    {
+      LanguageType new_lang = eLanguageTypeUnknown;
+      if (definition.default_cstr_value)
+        Language::GetLanguageTypeFromString(definition.default_cstr_value);
+      else
+        new_lang = (LanguageType)definition.default_uint_value;
+      m_value_sp.reset(new OptionValueLanguage(new_lang));
+    }
+    break;
+
+  case OptionValue::eTypeFormatEntity:
+    // "definition.default_cstr_value" as a string value that represents the
+    // default
+    m_value_sp.reset(
+        new OptionValueFormatEntity(definition.default_cstr_value));
+    break;
+
+  case OptionValue::eTypePathMap:
+    // "definition.default_uint_value" tells us if notifications should occur
+    // for
+    // path mappings
+    m_value_sp.reset(
+        new OptionValuePathMappings(definition.default_uint_value != 0));
+    break;
 
-bool
-Property::DumpQualifiedName(Stream &strm) const
-{
-    if (m_name)
+  case OptionValue::eTypeRegex:
+    // "definition.default_uint_value" is used to the regular expression flags
+    // "definition.default_cstr_value" the default regular expression value
+    // value.
+    m_value_sp.reset(new OptionValueRegex(definition.default_cstr_value));
+    break;
+
+  case OptionValue::eTypeSInt64:
+    // "definition.default_uint_value" is the default integer value if
+    // "definition.default_cstr_value" is NULL, otherwise interpret
+    // "definition.default_cstr_value" as a string value that represents the
+    // default
+    // value.
+    m_value_sp.reset(new OptionValueSInt64(
+        definition.default_cstr_value
+            ? StringConvert::ToSInt64(definition.default_cstr_value)
+            : definition.default_uint_value));
+    break;
+
+  case OptionValue::eTypeUInt64:
+    // "definition.default_uint_value" is the default unsigned integer value if
+    // "definition.default_cstr_value" is NULL, otherwise interpret
+    // "definition.default_cstr_value" as a string value that represents the
+    // default
+    // value.
+    m_value_sp.reset(new OptionValueUInt64(
+        definition.default_cstr_value
+            ? StringConvert::ToUInt64(definition.default_cstr_value)
+            : definition.default_uint_value));
+    break;
+
+  case OptionValue::eTypeUUID:
+    // "definition.default_uint_value" is not used for a OptionValue::eTypeUUID
+    // "definition.default_cstr_value" can contain a default UUID value
     {
-        if (m_value_sp->DumpQualifiedName(strm))
-            strm.PutChar('.');
-        strm << m_name;
-        return true;
+      UUID uuid;
+      if (definition.default_cstr_value)
+        uuid.SetFromCString(definition.default_cstr_value);
+      m_value_sp.reset(new OptionValueUUID(uuid));
     }
-    return false;
+    break;
+
+  case OptionValue::eTypeString:
+    // "definition.default_uint_value" can contain the string option flags OR'ed
+    // together
+    // "definition.default_cstr_value" can contain a default string value
+    {
+      OptionValueString *string_value =
+          new OptionValueString(definition.default_cstr_value);
+      if (definition.default_uint_value != 0)
+        string_value->GetOptions().Reset(definition.default_uint_value);
+      m_value_sp.reset(string_value);
+    }
+    break;
+  }
 }
 
+Property::Property(const ConstString &name, const ConstString &desc,
+                   bool is_global, const lldb::OptionValueSP &value_sp)
+    : m_name(name), m_description(desc), m_value_sp(value_sp),
+      m_is_global(is_global) {}
 
-void
-Property::Dump (const ExecutionContext *exe_ctx, Stream &strm, uint32_t dump_mask) const
-{
-    if (m_value_sp)
-    {
-        const bool dump_desc = dump_mask & OptionValue::eDumpOptionDescription;
-        const bool transparent = m_value_sp->ValueIsTransparent ();
-        if (dump_desc || !transparent)
-        {
-            if ((dump_mask & OptionValue::eDumpOptionName) && m_name)
-            {
-                DumpQualifiedName(strm);
-                if (dump_mask & ~OptionValue::eDumpOptionName)
-                    strm.PutChar(' ');
-            }
-        }
-        if (dump_desc)
-        {
-            const char *desc = GetDescription();
-            if (desc)
-                strm.Printf ("-- %s", desc);
-            
-            if (transparent && (dump_mask == (OptionValue::eDumpOptionName | OptionValue::eDumpOptionDescription)))
-                strm.EOL();
-        }
-        m_value_sp->DumpValue(exe_ctx, strm, dump_mask);
+bool Property::DumpQualifiedName(Stream &strm) const {
+  if (m_name) {
+    if (m_value_sp->DumpQualifiedName(strm))
+      strm.PutChar('.');
+    strm << m_name;
+    return true;
+  }
+  return false;
+}
+
+void Property::Dump(const ExecutionContext *exe_ctx, Stream &strm,
+                    uint32_t dump_mask) const {
+  if (m_value_sp) {
+    const bool dump_desc = dump_mask & OptionValue::eDumpOptionDescription;
+    const bool transparent = m_value_sp->ValueIsTransparent();
+    if (dump_desc || !transparent) {
+      if ((dump_mask & OptionValue::eDumpOptionName) && m_name) {
+        DumpQualifiedName(strm);
+        if (dump_mask & ~OptionValue::eDumpOptionName)
+          strm.PutChar(' ');
+      }
+    }
+    if (dump_desc) {
+      const char *desc = GetDescription();
+      if (desc)
+        strm.Printf("-- %s", desc);
+
+      if (transparent && (dump_mask == (OptionValue::eDumpOptionName |
+                                        OptionValue::eDumpOptionDescription)))
+        strm.EOL();
     }
+    m_value_sp->DumpValue(exe_ctx, strm, dump_mask);
+  }
 }
 
+void Property::DumpDescription(CommandInterpreter &interpreter, Stream &strm,
+                               uint32_t output_width,
+                               bool display_qualified_name) const {
+  if (m_value_sp) {
+    const char *desc = GetDescription();
 
-void
-Property::DumpDescription (CommandInterpreter &interpreter,
-                           Stream &strm,
-                           uint32_t output_width,
-                           bool display_qualified_name) const
-{
-    if (m_value_sp)
-    {
-        const char *desc = GetDescription();
+    if (desc) {
+      StreamString qualified_name;
+      const OptionValueProperties *sub_properties =
+          m_value_sp->GetAsProperties();
+      if (sub_properties) {
+        strm.EOL();
 
-        if (desc)
-        {
+        if (m_value_sp->DumpQualifiedName(qualified_name))
+          strm.Printf("'%s' variables:\n\n",
+                      qualified_name.GetString().c_str());
+        sub_properties->DumpAllDescriptions(interpreter, strm);
+      } else {
+        if (desc) {
+          if (display_qualified_name) {
             StreamString qualified_name;
-            const OptionValueProperties *sub_properties = m_value_sp->GetAsProperties();
-            if (sub_properties)
-            {
-                strm.EOL();
-                
-                if (m_value_sp->DumpQualifiedName(qualified_name))
-                    strm.Printf("'%s' variables:\n\n", qualified_name.GetString().c_str());
-                sub_properties->DumpAllDescriptions(interpreter, strm);
-            }
-            else
-            {
-                if (desc)
-                {
-                    if (display_qualified_name)
-                    {
-                        StreamString qualified_name;
-                        DumpQualifiedName(qualified_name);
-                        interpreter.OutputFormattedHelpText (strm,
-                                                             qualified_name.GetString().c_str(),
-                                                             "--",
-                                                             desc,
-                                                             output_width);
-                    }
-                    else
-                    {
-                        interpreter.OutputFormattedHelpText (strm,
-                                                             m_name.GetCString(),
-                                                             "--",
-                                                             desc,
-                                                             output_width);
-                    }
-                }
-            }
+            DumpQualifiedName(qualified_name);
+            interpreter.OutputFormattedHelpText(
+                strm, qualified_name.GetString().c_str(), "--", desc,
+                output_width);
+          } else {
+            interpreter.OutputFormattedHelpText(strm, m_name.GetCString(), "--",
+                                                desc, output_width);
+          }
         }
+      }
     }
+  }
 }
 
-
-void
-Property::SetValueChangedCallback (OptionValueChangedCallback callback, void *baton)
-{
-    if (m_value_sp)
-        m_value_sp->SetValueChangedCallback (callback, baton);
+void Property::SetValueChangedCallback(OptionValueChangedCallback callback,
+                                       void *baton) {
+  if (m_value_sp)
+    m_value_sp->SetValueChangedCallback(callback, baton);
 }
-
-