*** 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, 136 insertions, 132 deletions

diff --git a/lldb/tools/lldb-mi/MICmdArgValListBase.cpp b/lldb/tools/lldb-mi/MICmdArgValListBase.cpp
index 0539628..ff18aba 100644
--- a/lldb/tools/lldb-mi/MICmdArgValListBase.cpp
+++ b/lldb/tools/lldb-mi/MICmdArgValListBase.cpp
@@ -10,15 +10,16 @@
 // In-house headers:
 #include "MICmdArgValListBase.h"
 #include "MICmdArgContext.h"
+#include "MICmdArgValConsume.h"
 #include "MICmdArgValFile.h"
 #include "MICmdArgValNumber.h"
 #include "MICmdArgValOptionLong.h"
 #include "MICmdArgValOptionShort.h"
 #include "MICmdArgValString.h"
 #include "MICmdArgValThreadGrp.h"
-#include "MICmdArgValConsume.h"
 
-//++ ------------------------------------------------------------------------------------
+//++
+//------------------------------------------------------------------------------------
 // Details: CMICmdArgValListBase constructor.
 // Type:    Method.
 // Args:    None.
@@ -26,80 +27,85 @@
 // Throws:  None.
 //--
 CMICmdArgValListBase::CMICmdArgValListBase()
-    : m_eArgType(eArgValType_invalid)
-{
-}
+    : m_eArgType(eArgValType_invalid) {}
 
-//++ ------------------------------------------------------------------------------------
+//++
+//------------------------------------------------------------------------------------
 // Details: CMICmdArgValListBase constructor.
 // Type:    Method.
 // Args:    vrArgName       - (R) Argument's name to search by.
-//          vbMandatory     - (R) True = Yes must be present, false = optional argument.
-//          vbHandleByCmd   - (R) True = Command processes *this option, false = not handled.
+//          vbMandatory     - (R) True = Yes must be present, false = optional
+//          argument.
+//          vbHandleByCmd   - (R) True = Command processes *this option, false =
+//          not handled.
 // Return:  None.
 // Throws:  None.
 //--
-CMICmdArgValListBase::CMICmdArgValListBase(const CMIUtilString &vrArgName, const bool vbMandatory, const bool vbHandleByCmd)
-    : CMICmdArgValBaseTemplate(vrArgName, vbMandatory, vbHandleByCmd)
-    , m_eArgType(eArgValType_invalid)
-{
-}
+CMICmdArgValListBase::CMICmdArgValListBase(const CMIUtilString &vrArgName,
+                                           const bool vbMandatory,
+                                           const bool vbHandleByCmd)
+    : CMICmdArgValBaseTemplate(vrArgName, vbMandatory, vbHandleByCmd),
+      m_eArgType(eArgValType_invalid) {}
 
-//++ ------------------------------------------------------------------------------------
+//++
+//------------------------------------------------------------------------------------
 // Details: CMICmdArgValListBase constructor.
 // Type:    Method.
 // Args:    vrArgName       - (R) Argument's name to search by.
-//          vbMandatory     - (R) True = Yes must be present, false = optional argument.
-//          vbHandleByCmd   - (R) True = Command processes *this option, false = not handled.
-//          veType          - (R) The type of argument to look for and create argument object of a certain type.
+//          vbMandatory     - (R) True = Yes must be present, false = optional
+//          argument.
+//          vbHandleByCmd   - (R) True = Command processes *this option, false =
+//          not handled.
+//          veType          - (R) The type of argument to look for and create
+//          argument object of a certain type.
 // Return:  None.
 // Throws:  None.
 //--
-CMICmdArgValListBase::CMICmdArgValListBase(const CMIUtilString &vrArgName, const bool vbMandatory, const bool vbHandleByCmd,
+CMICmdArgValListBase::CMICmdArgValListBase(const CMIUtilString &vrArgName,
+                                           const bool vbMandatory,
+                                           const bool vbHandleByCmd,
                                            const ArgValType_e veType)
-    : CMICmdArgValBaseTemplate(vrArgName, vbMandatory, vbHandleByCmd)
-    , m_eArgType(veType)
-{
-}
+    : CMICmdArgValBaseTemplate(vrArgName, vbMandatory, vbHandleByCmd),
+      m_eArgType(veType) {}
 
-//++ ------------------------------------------------------------------------------------
+//++
+//------------------------------------------------------------------------------------
 // Details: CMICmdArgValListBase destructor.
 // Type:    Overridden.
 // Args:    None.
 // Return:  None.
 // Throws:  None.
 //--
-CMICmdArgValListBase::~CMICmdArgValListBase()
-{
-    // Tidy up
-    Destroy();
+CMICmdArgValListBase::~CMICmdArgValListBase() {
+  // Tidy up
+  Destroy();
 }
 
-//++ ------------------------------------------------------------------------------------
+//++
+//------------------------------------------------------------------------------------
 // Details: Tear down resources used by *this object.
 // Type:    Method.
 // Args:    None.
 // Return:  None.
 // Throws:  None.
 //--
-void
-CMICmdArgValListBase::Destroy()
-{
-    // Tidy up
-    VecArgObjPtr_t::const_iterator it = m_argValue.begin();
-    while (it != m_argValue.end())
-    {
-        CMICmdArgValBase *pArgObj = *it;
-        delete pArgObj;
+void CMICmdArgValListBase::Destroy() {
+  // Tidy up
+  VecArgObjPtr_t::const_iterator it = m_argValue.begin();
+  while (it != m_argValue.end()) {
+    CMICmdArgValBase *pArgObj = *it;
+    delete pArgObj;
 
-        // Next
-        ++it;
-    }
-    m_argValue.clear();
+    // Next
+    ++it;
+  }
+  m_argValue.clear();
 }
 
-//++ ------------------------------------------------------------------------------------
-// Details: Create an CMICmdArgValBase derived object matching the type specified
+//++
+//------------------------------------------------------------------------------------
+// Details: Create an CMICmdArgValBase derived object matching the type
+// specified
 //          and put the option or argument's value inside it.
 // Type:    Method.
 // Args:    vrTxt   - (R) Text version the option or argument.
@@ -109,56 +115,56 @@ CMICmdArgValListBase::Destroy()
 // Throws:  None.
 //--
 CMICmdArgValBase *
-CMICmdArgValListBase::CreationObj(const CMIUtilString &vrTxt, const ArgValType_e veType) const
-{
-    CMICmdArgValBase *pOptionObj = nullptr;
-    switch (veType)
-    {
-        case eArgValType_File:
-            pOptionObj = new CMICmdArgValFile();
-            break;
-        case eArgValType_Consume:
-            pOptionObj = new CMICmdArgValConsume();
-            break;
-        case eArgValType_Number:
-            pOptionObj = new CMICmdArgValNumber();
-            break;
-        case eArgValType_OptionLong:
-            pOptionObj = new CMICmdArgValOptionLong();
-            break;
-        case eArgValType_OptionShort:
-            pOptionObj = new CMICmdArgValOptionShort();
-            break;
-        case eArgValType_String:
-            pOptionObj = new CMICmdArgValString();
-            break;
-        case eArgValType_StringQuoted:
-            pOptionObj = new CMICmdArgValString(true, false, false);
-            break;
-        case eArgValType_StringQuotedNumber:
-            pOptionObj = new CMICmdArgValString(true, true, false);
-            break;
-        case eArgValType_StringQuotedNumberPath:
-            pOptionObj = new CMICmdArgValString(true, true, true);
-            break;
-        case eArgValType_StringAnything:
-            pOptionObj = new CMICmdArgValString(true);
-            break;
-        case eArgValType_ThreadGrp:
-            pOptionObj = new CMICmdArgValThreadGrp();
-            break;
-        default:
-            return nullptr;
-    }
+CMICmdArgValListBase::CreationObj(const CMIUtilString &vrTxt,
+                                  const ArgValType_e veType) const {
+  CMICmdArgValBase *pOptionObj = nullptr;
+  switch (veType) {
+  case eArgValType_File:
+    pOptionObj = new CMICmdArgValFile();
+    break;
+  case eArgValType_Consume:
+    pOptionObj = new CMICmdArgValConsume();
+    break;
+  case eArgValType_Number:
+    pOptionObj = new CMICmdArgValNumber();
+    break;
+  case eArgValType_OptionLong:
+    pOptionObj = new CMICmdArgValOptionLong();
+    break;
+  case eArgValType_OptionShort:
+    pOptionObj = new CMICmdArgValOptionShort();
+    break;
+  case eArgValType_String:
+    pOptionObj = new CMICmdArgValString();
+    break;
+  case eArgValType_StringQuoted:
+    pOptionObj = new CMICmdArgValString(true, false, false);
+    break;
+  case eArgValType_StringQuotedNumber:
+    pOptionObj = new CMICmdArgValString(true, true, false);
+    break;
+  case eArgValType_StringQuotedNumberPath:
+    pOptionObj = new CMICmdArgValString(true, true, true);
+    break;
+  case eArgValType_StringAnything:
+    pOptionObj = new CMICmdArgValString(true);
+    break;
+  case eArgValType_ThreadGrp:
+    pOptionObj = new CMICmdArgValThreadGrp();
+    break;
+  default:
+    return nullptr;
+  }
 
-    CMICmdArgContext argCntxt(vrTxt);
-    if (!pOptionObj->Validate(argCntxt))
-        return nullptr;
+  CMICmdArgContext argCntxt(vrTxt);
+  if (!pOptionObj->Validate(argCntxt))
+    return nullptr;
 
-    return pOptionObj;
+  return pOptionObj;
 }
 
-//++ ------------------------------------------------------------------------------------
+//++
+//------------------------------------------------------------------------------------
 // Details: Validate the option or argument is the correct type.
 // Type:    Method.
 // Args:    vrTxt   - (R) Text version the option or argument.
@@ -166,48 +172,46 @@ CMICmdArgValListBase::CreationObj(const CMIUtilString &vrTxt, const ArgValType_e
 // Return:  bool    - True = Yes expected type present, False = no.
 // Throws:  None.
 //--
-bool
-CMICmdArgValListBase::IsExpectedCorrectType(const CMIUtilString &vrTxt, const ArgValType_e veType) const
-{
-    bool bValid = false;
-    switch (veType)
-    {
-        case eArgValType_File:
-            bValid = CMICmdArgValFile().IsFilePath(vrTxt);
-            break;
-        case eArgValType_Consume:
-            bValid = CMICmdArgValConsume().IsOk();
-            break;
-        case eArgValType_Number:
-            bValid = CMICmdArgValNumber().IsArgNumber(vrTxt);
-            break;
-        case eArgValType_OptionLong:
-            bValid = CMICmdArgValOptionLong().IsArgLongOption(vrTxt);
-            break;
-        case eArgValType_OptionShort:
-            bValid = CMICmdArgValOptionShort().IsArgShortOption(vrTxt);
-            break;
-        case eArgValType_String:
-            bValid = CMICmdArgValString().IsStringArg(vrTxt);
-            break;
-        case eArgValType_StringQuoted:
-            bValid = CMICmdArgValString(true, false, false).IsStringArg(vrTxt);
-            break;
-        case eArgValType_StringQuotedNumber:
-            bValid = CMICmdArgValString(true, true, false).IsStringArg(vrTxt);
-            break;
-        case eArgValType_StringQuotedNumberPath:
-            bValid = CMICmdArgValString(true, true, true).IsStringArg(vrTxt);
-            break;
-        case eArgValType_StringAnything:
-            bValid = CMICmdArgValString(true).IsStringArg(vrTxt);
-            break;
-        case eArgValType_ThreadGrp:
-            bValid = CMICmdArgValThreadGrp().IsArgThreadGrp(vrTxt);
-            break;
-        default:
-            return false;
-    }
+bool CMICmdArgValListBase::IsExpectedCorrectType(
+    const CMIUtilString &vrTxt, const ArgValType_e veType) const {
+  bool bValid = false;
+  switch (veType) {
+  case eArgValType_File:
+    bValid = CMICmdArgValFile().IsFilePath(vrTxt);
+    break;
+  case eArgValType_Consume:
+    bValid = CMICmdArgValConsume().IsOk();
+    break;
+  case eArgValType_Number:
+    bValid = CMICmdArgValNumber().IsArgNumber(vrTxt);
+    break;
+  case eArgValType_OptionLong:
+    bValid = CMICmdArgValOptionLong().IsArgLongOption(vrTxt);
+    break;
+  case eArgValType_OptionShort:
+    bValid = CMICmdArgValOptionShort().IsArgShortOption(vrTxt);
+    break;
+  case eArgValType_String:
+    bValid = CMICmdArgValString().IsStringArg(vrTxt);
+    break;
+  case eArgValType_StringQuoted:
+    bValid = CMICmdArgValString(true, false, false).IsStringArg(vrTxt);
+    break;
+  case eArgValType_StringQuotedNumber:
+    bValid = CMICmdArgValString(true, true, false).IsStringArg(vrTxt);
+    break;
+  case eArgValType_StringQuotedNumberPath:
+    bValid = CMICmdArgValString(true, true, true).IsStringArg(vrTxt);
+    break;
+  case eArgValType_StringAnything:
+    bValid = CMICmdArgValString(true).IsStringArg(vrTxt);
+    break;
+  case eArgValType_ThreadGrp:
+    bValid = CMICmdArgValThreadGrp().IsArgThreadGrp(vrTxt);
+    break;
+  default:
+    return false;
+  }
 
-    return bValid;
+  return bValid;
 }