*** 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, 104 insertions, 108 deletions

diff --git a/lldb/tools/lldb-mi/MICmnMIValueTuple.cpp b/lldb/tools/lldb-mi/MICmnMIValueTuple.cpp
index 4ff1d6c..375ce50 100644
--- a/lldb/tools/lldb-mi/MICmnMIValueTuple.cpp
+++ b/lldb/tools/lldb-mi/MICmnMIValueTuple.cpp
@@ -10,20 +10,20 @@
 // In-house headers:
 #include "MICmnMIValueTuple.h"
 
-//++ ------------------------------------------------------------------------------------
+//++
+//------------------------------------------------------------------------------------
 // Details: CMICmnMIValueTuple constructor.
 // Type:    Method.
 // Args:    None.
 // Return:  None.
 // Throws:  None.
 //--
-CMICmnMIValueTuple::CMICmnMIValueTuple()
-    : m_bSpaceAfterComma(false)
-{
-    m_strValue = "{}";
+CMICmnMIValueTuple::CMICmnMIValueTuple() : m_bSpaceAfterComma(false) {
+  m_strValue = "{}";
 }
 
-//++ ------------------------------------------------------------------------------------
+//++
+//------------------------------------------------------------------------------------
 // Details: CMICmnMIValueTuple constructor.
 // Type:    Method.
 // Args:    vResult - (R) MI result object.
@@ -31,180 +31,176 @@ CMICmnMIValueTuple::CMICmnMIValueTuple()
 // Throws:  None.
 //--
 CMICmnMIValueTuple::CMICmnMIValueTuple(const CMICmnMIValueResult &vResult)
-    : m_bSpaceAfterComma(false)
-{
-    m_strValue = vResult.GetString();
-    BuildTuple();
-    m_bJustConstructed = false;
+    : m_bSpaceAfterComma(false) {
+  m_strValue = vResult.GetString();
+  BuildTuple();
+  m_bJustConstructed = false;
 }
 
-//++ ------------------------------------------------------------------------------------
+//++
+//------------------------------------------------------------------------------------
 // Details: CMICmnMIValueTuple constructor.
 // Type:    Method.
 // Args:    vResult         - (R) MI result object.
-//          vbUseSpacing    - (R) True = put space separators into the string, false = no spaces used.
+//          vbUseSpacing    - (R) True = put space separators into the string,
+//          false = no spaces used.
 // Return:  None.
 // Throws:  None.
 //--
-CMICmnMIValueTuple::CMICmnMIValueTuple(const CMICmnMIValueResult &vResult, const bool vbUseSpacing)
-    : m_bSpaceAfterComma(vbUseSpacing)
-{
-    m_strValue = vResult.GetString();
-    BuildTuple();
-    m_bJustConstructed = false;
+CMICmnMIValueTuple::CMICmnMIValueTuple(const CMICmnMIValueResult &vResult,
+                                       const bool vbUseSpacing)
+    : m_bSpaceAfterComma(vbUseSpacing) {
+  m_strValue = vResult.GetString();
+  BuildTuple();
+  m_bJustConstructed = false;
 }
 
-//++ ------------------------------------------------------------------------------------
+//++
+//------------------------------------------------------------------------------------
 // Details: CMICmnMIValueTuple destructor.
 // Type:    Overrideable.
 // Args:    None.
 // Return:  None.
 // Throws:  None.
 //--
-CMICmnMIValueTuple::~CMICmnMIValueTuple()
-{
-}
+CMICmnMIValueTuple::~CMICmnMIValueTuple() {}
 
-//++ ------------------------------------------------------------------------------------
+//++
+//------------------------------------------------------------------------------------
 // Details: Build the result value's mandatory data part, one tuple
 // Type:    Method.
 // Args:    None.
 // Return:  None.
 // Throws:  None.
 //--
-void
-CMICmnMIValueTuple::BuildTuple()
-{
-    const char *pFormat = "{%s}";
-    m_strValue = CMIUtilString::Format(pFormat, m_strValue.c_str());
+void CMICmnMIValueTuple::BuildTuple() {
+  const char *pFormat = "{%s}";
+  m_strValue = CMIUtilString::Format(pFormat, m_strValue.c_str());
 }
 
-//++ ------------------------------------------------------------------------------------
+//++
+//------------------------------------------------------------------------------------
 // Details: Add another MI result object to the value's list of tuples.
 // Type:    Method.
 // Args:    vResult - (R) The MI result object.
 // Return:  None.
 // Throws:  None.
 //--
-void
-CMICmnMIValueTuple::BuildTuple(const CMICmnMIValueResult &vResult)
-{
-    // Clear out the default "<Invalid>" text
-    if (m_bJustConstructed)
-    {
-        m_bJustConstructed = false;
-        m_strValue = vResult.GetString();
-        BuildTuple();
-        return;
-    }
-
-    if (m_strValue[0] == '{')
-    {
-        m_strValue = m_strValue.substr(1, m_strValue.size() - 1);
-    }
-    if (m_strValue[m_strValue.size() - 1] == '}')
-    {
-        m_strValue = m_strValue.substr(0, m_strValue.size() - 1);
-    }
-
-    const char *pFormat = m_bSpaceAfterComma ? "{%s, %s}" : "{%s,%s}";
-    m_strValue = CMIUtilString::Format(pFormat, m_strValue.c_str(), vResult.GetString().c_str());
+void CMICmnMIValueTuple::BuildTuple(const CMICmnMIValueResult &vResult) {
+  // Clear out the default "<Invalid>" text
+  if (m_bJustConstructed) {
+    m_bJustConstructed = false;
+    m_strValue = vResult.GetString();
+    BuildTuple();
+    return;
+  }
+
+  if (m_strValue[0] == '{') {
+    m_strValue = m_strValue.substr(1, m_strValue.size() - 1);
+  }
+  if (m_strValue[m_strValue.size() - 1] == '}') {
+    m_strValue = m_strValue.substr(0, m_strValue.size() - 1);
+  }
+
+  const char *pFormat = m_bSpaceAfterComma ? "{%s, %s}" : "{%s,%s}";
+  m_strValue = CMIUtilString::Format(pFormat, m_strValue.c_str(),
+                                     vResult.GetString().c_str());
 }
 
-//++ ------------------------------------------------------------------------------------
+//++
+//------------------------------------------------------------------------------------
 // Details: Add string value to the value's list of tuples.
 // Type:    Method.
 // Args:    vValue  - (R) The string object.
 // Return:  None.
 // Throws:  None.
 //--
-void
-CMICmnMIValueTuple::BuildTuple(const CMIUtilString &vValue)
-{
-    // Clear out the default "<Invalid>" text
-    if (m_bJustConstructed)
-    {
-        m_bJustConstructed = false;
-        m_strValue = vValue;
-        BuildTuple();
-        return;
-    }
-
-    const CMIUtilString data(ExtractContentNoBrackets());
-    const char *pFormat = m_bSpaceAfterComma ? "{%s, %s}" : "{%s,%s}";
-    m_strValue = CMIUtilString::Format(pFormat, data.c_str(), vValue.c_str());
+void CMICmnMIValueTuple::BuildTuple(const CMIUtilString &vValue) {
+  // Clear out the default "<Invalid>" text
+  if (m_bJustConstructed) {
+    m_bJustConstructed = false;
+    m_strValue = vValue;
+    BuildTuple();
+    return;
+  }
+
+  const CMIUtilString data(ExtractContentNoBrackets());
+  const char *pFormat = m_bSpaceAfterComma ? "{%s, %s}" : "{%s,%s}";
+  m_strValue = CMIUtilString::Format(pFormat, data.c_str(), vValue.c_str());
 }
 
-//++ ------------------------------------------------------------------------------------
+//++
+//------------------------------------------------------------------------------------
 // Details: Add another MI value object to  the value list's of list is values.
-//          Only values objects can be added to a list of values otherwise this function
+//          Only values objects can be added to a list of values otherwise this
+//          function
 //          will return MIstatus::failure.
 // Type:    Method.
 // Args:    vValue  - (R) The MI value object.
 // Return:  None.
 // Throws:  None.
 //--
-void
-CMICmnMIValueTuple::Add(const CMICmnMIValueResult &vResult)
-{
-    BuildTuple(vResult);
+void CMICmnMIValueTuple::Add(const CMICmnMIValueResult &vResult) {
+  BuildTuple(vResult);
 }
 
-//++ ------------------------------------------------------------------------------------
+//++
+//------------------------------------------------------------------------------------
 // Details: Add another MI value object to  the value list's of list is values.
-//          Only values objects can be added to a list of values otherwise this function
+//          Only values objects can be added to a list of values otherwise this
+//          function
 //          will return MIstatus::failure.
 // Type:    Method.
 // Args:    vValue          - (R) The MI value object.
-//          vbUseSpacing    - (R) True = put space separators into the string, false = no spaces used.
+//          vbUseSpacing    - (R) True = put space separators into the string,
+//          false = no spaces used.
 // Return:  None.
 // Throws:  None.
 //--
-void
-CMICmnMIValueTuple::Add(const CMICmnMIValueResult &vResult, const bool vbUseSpacing)
-{
-    m_bSpaceAfterComma = vbUseSpacing;
-    BuildTuple(vResult);
+void CMICmnMIValueTuple::Add(const CMICmnMIValueResult &vResult,
+                             const bool vbUseSpacing) {
+  m_bSpaceAfterComma = vbUseSpacing;
+  BuildTuple(vResult);
 }
 
-//++ ------------------------------------------------------------------------------------
+//++
+//------------------------------------------------------------------------------------
 // Details: Add another MI value object to  the value list's of list is values.
-//          Only values objects can be added to a list of values otherwise this function
+//          Only values objects can be added to a list of values otherwise this
+//          function
 //          will return MIstatus::failure.
 // Type:    Method.
 // Args:    vValue          - (R) The MI value object.
-//          vbUseSpacing    - (R) True = put space separators into the string, false = no spaces used.
+//          vbUseSpacing    - (R) True = put space separators into the string,
+//          false = no spaces used.
 // Return:  None.
 // Throws:  None.
 //--
-void
-CMICmnMIValueTuple::Add(const CMICmnMIValueConst &vValue, const bool vbUseSpacing)
-{
-    m_bSpaceAfterComma = vbUseSpacing;
-    BuildTuple(vValue.GetString());
+void CMICmnMIValueTuple::Add(const CMICmnMIValueConst &vValue,
+                             const bool vbUseSpacing) {
+  m_bSpaceAfterComma = vbUseSpacing;
+  BuildTuple(vValue.GetString());
 }
 
-//++ ------------------------------------------------------------------------------------
-// Details: Retrieve the contents of *this value object but without the outer most
+//++
+//------------------------------------------------------------------------------------
+// Details: Retrieve the contents of *this value object but without the outer
+// most
 //          brackets.
 // Type:    Method.
 // Args:    None.
 // Return:  CMIUtilString - Data within the object.
 // Throws:  None.
 //--
-CMIUtilString
-CMICmnMIValueTuple::ExtractContentNoBrackets() const
-{
-    CMIUtilString data(m_strValue);
-
-    if (data[0] == '{')
-    {
-        data = data.substr(1, data.length() - 1);
-    }
-    if (data[data.size() - 1] == '}')
-    {
-        data = data.substr(0, data.length() - 1);
-    }
-
-    return data;
+CMIUtilString CMICmnMIValueTuple::ExtractContentNoBrackets() const {
+  CMIUtilString data(m_strValue);
+
+  if (data[0] == '{') {
+    data = data.substr(1, data.length() - 1);
+  }
+  if (data[data.size() - 1] == '}') {
+    data = data.substr(0, data.length() - 1);
+  }
+
+  return data;
 }