*** 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, 109 insertions, 117 deletions

diff --git a/lldb/tools/lldb-mi/MICmdArgValFile.cpp b/lldb/tools/lldb-mi/MICmdArgValFile.cpp
index 7f5b20ec314..77e9a6b2af8 100644
--- a/lldb/tools/lldb-mi/MICmdArgValFile.cpp
+++ b/lldb/tools/lldb-mi/MICmdArgValFile.cpp
@@ -11,44 +11,47 @@
 #include "MICmdArgValFile.h"
 #include "MICmdArgContext.h"
 
-//++ ------------------------------------------------------------------------------------
+//++
+//------------------------------------------------------------------------------------
 // Details: CMICmdArgValFile constructor.
 // Type:    Method.
 // Args:    None.
 // Return:  None.
 // Throws:  None.
 //--
-CMICmdArgValFile::CMICmdArgValFile()
-{
-}
+CMICmdArgValFile::CMICmdArgValFile() {}
 
-//++ ------------------------------------------------------------------------------------
+//++
+//------------------------------------------------------------------------------------
 // Details: CMICmdArgValFile 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.
 //--
-CMICmdArgValFile::CMICmdArgValFile(const CMIUtilString &vrArgName, const bool vbMandatory, const bool vbHandleByCmd)
-    : CMICmdArgValBaseTemplate(vrArgName, vbMandatory, vbHandleByCmd)
-{
-}
+CMICmdArgValFile::CMICmdArgValFile(const CMIUtilString &vrArgName,
+                                   const bool vbMandatory,
+                                   const bool vbHandleByCmd)
+    : CMICmdArgValBaseTemplate(vrArgName, vbMandatory, vbHandleByCmd) {}
 
-//++ ------------------------------------------------------------------------------------
+//++
+//------------------------------------------------------------------------------------
 // Details: CMICmdArgValFile destructor.
 // Type:    Overridden.
 // Args:    None.
 // Return:  None.
 // Throws:  None.
 //--
-CMICmdArgValFile::~CMICmdArgValFile()
-{
-}
+CMICmdArgValFile::~CMICmdArgValFile() {}
 
-//++ ------------------------------------------------------------------------------------
-// Details: Parse the command's argument options string and try to extract the value *this
+//++
+//------------------------------------------------------------------------------------
+// Details: Parse the command's argument options string and try to extract the
+// value *this
 //          argument is looking for.
 // Type:    Overridden.
 // Args:    vwArgContext    - (R) The command's argument options string.
@@ -56,59 +59,52 @@ CMICmdArgValFile::~CMICmdArgValFile()
 //          MIstatus::failure - Functional failed.
 // Throws:  None.
 //--
-bool
-CMICmdArgValFile::Validate(CMICmdArgContext &vwArgContext)
-{
-    if (vwArgContext.IsEmpty())
-        return m_bMandatory ? MIstatus::failure : MIstatus::success;
-
-    // The GDB/MI spec suggests there is only parameter
-
-    if (vwArgContext.GetNumberArgsPresent() == 1)
-    {
-        const CMIUtilString &rFile(vwArgContext.GetArgsLeftToParse());
-        if (IsFilePath(rFile))
-        {
-            m_bFound = true;
-            m_bValid = true;
-            m_argValue = rFile.Trim('"');
-            vwArgContext.RemoveArg(rFile);
-            return MIstatus::success;
-        }
-        else
-            return MIstatus::failure;
+bool CMICmdArgValFile::Validate(CMICmdArgContext &vwArgContext) {
+  if (vwArgContext.IsEmpty())
+    return m_bMandatory ? MIstatus::failure : MIstatus::success;
+
+  // The GDB/MI spec suggests there is only parameter
+
+  if (vwArgContext.GetNumberArgsPresent() == 1) {
+    const CMIUtilString &rFile(vwArgContext.GetArgsLeftToParse());
+    if (IsFilePath(rFile)) {
+      m_bFound = true;
+      m_bValid = true;
+      m_argValue = rFile.Trim('"');
+      vwArgContext.RemoveArg(rFile);
+      return MIstatus::success;
+    } else
+      return MIstatus::failure;
+  }
+
+  // In reality there are more than one option,  if so the file option
+  // is the last one (don't handle that here - find the best looking one)
+  const CMIUtilString::VecString_t vecOptions(vwArgContext.GetArgs());
+  CMIUtilString::VecString_t::const_iterator it = vecOptions.begin();
+  while (it != vecOptions.end()) {
+    const CMIUtilString &rTxt(*it);
+    if (IsFilePath(rTxt)) {
+      m_bFound = true;
+
+      if (vwArgContext.RemoveArg(rTxt)) {
+        m_bValid = true;
+        m_argValue = rTxt.Trim('"');
+        return MIstatus::success;
+      } else
+        return MIstatus::success;
     }
 
-    // In reality there are more than one option,  if so the file option
-    // is the last one (don't handle that here - find the best looking one)
-    const CMIUtilString::VecString_t vecOptions(vwArgContext.GetArgs());
-    CMIUtilString::VecString_t::const_iterator it = vecOptions.begin();
-    while (it != vecOptions.end())
-    {
-        const CMIUtilString &rTxt(*it);
-        if (IsFilePath(rTxt))
-        {
-            m_bFound = true;
-
-            if (vwArgContext.RemoveArg(rTxt))
-            {
-                m_bValid = true;
-                m_argValue = rTxt.Trim('"');
-                return MIstatus::success;
-            }
-            else
-                return MIstatus::success;
-        }
-
-        // Next
-        ++it;
-    }
+    // Next
+    ++it;
+  }
 
-    return MIstatus::failure;
+  return MIstatus::failure;
 }
 
-//++ ------------------------------------------------------------------------------------
-// Details: Given some text extract the file name path from it. If a space is found in
+//++
+//------------------------------------------------------------------------------------
+// Details: Given some text extract the file name path from it. If a space is
+// found in
 //          path done return the path surrounded in quotes.
 // Type:    Method.
 // Args:    vrTxt   - (R) The text to extract the file name path from.
@@ -116,82 +112,78 @@ CMICmdArgValFile::Validate(CMICmdArgContext &vwArgContext)
 // Throws:  None.
 //--
 CMIUtilString
-CMICmdArgValFile::GetFileNamePath(const CMIUtilString &vrTxt) const
-{
-    CMIUtilString fileNamePath(vrTxt);
+CMICmdArgValFile::GetFileNamePath(const CMIUtilString &vrTxt) const {
+  CMIUtilString fileNamePath(vrTxt);
 
-    // Look for a space in the path
-    const char cSpace = ' ';
-    const size_t nPos = fileNamePath.find(cSpace);
-    if (nPos != std::string::npos)
-        fileNamePath = CMIUtilString::Format("\"%s\"", fileNamePath.c_str());
+  // Look for a space in the path
+  const char cSpace = ' ';
+  const size_t nPos = fileNamePath.find(cSpace);
+  if (nPos != std::string::npos)
+    fileNamePath = CMIUtilString::Format("\"%s\"", fileNamePath.c_str());
 
-    return fileNamePath;
+  return fileNamePath;
 }
 
-//++ ------------------------------------------------------------------------------------
+//++
+//------------------------------------------------------------------------------------
 // Details: Examine the string and determine if it is a valid file name path.
 // Type:    Method.
 // Args:    vrFileNamePath  - (R) File's name and directory path.
 // Return:  bool -  True = yes valid file path, false = no.
 // Throws:  None.
 //--
-bool
-CMICmdArgValFile::IsFilePath(const CMIUtilString &vrFileNamePath) const
-{
-    if (vrFileNamePath.empty())
-        return false;
+bool CMICmdArgValFile::IsFilePath(const CMIUtilString &vrFileNamePath) const {
+  if (vrFileNamePath.empty())
+    return false;
 
-    const bool bHavePosSlash = (vrFileNamePath.find('/') != std::string::npos);
-    const bool bHaveBckSlash = (vrFileNamePath.find('\\') != std::string::npos);
+  const bool bHavePosSlash = (vrFileNamePath.find('/') != std::string::npos);
+  const bool bHaveBckSlash = (vrFileNamePath.find('\\') != std::string::npos);
 
-    // Look for --someLongOption
-    size_t nPos = vrFileNamePath.find("--");
-    const bool bLong = (nPos == 0);
-    if (bLong)
-        return false;
+  // Look for --someLongOption
+  size_t nPos = vrFileNamePath.find("--");
+  const bool bLong = (nPos == 0);
+  if (bLong)
+    return false;
 
-    // Look for -f type short parameters
-    nPos = vrFileNamePath.find('-');
-    const bool bShort = (nPos == 0);
-    if (bShort)
-        return false;
+  // Look for -f type short parameters
+  nPos = vrFileNamePath.find('-');
+  const bool bShort = (nPos == 0);
+  if (bShort)
+    return false;
 
-    // Look for i1 i2 i3....
-    nPos = vrFileNamePath.find('i');
-    const bool bFoundI1 = ((nPos == 0) && (::isdigit(vrFileNamePath[1])));
-    if (bFoundI1)
-        return false;
+  // Look for i1 i2 i3....
+  nPos = vrFileNamePath.find('i');
+  const bool bFoundI1 = ((nPos == 0) && (::isdigit(vrFileNamePath[1])));
+  if (bFoundI1)
+    return false;
 
-    const bool bValidChars = IsValidChars(vrFileNamePath);
-    if (bValidChars || bHavePosSlash || bHaveBckSlash)
-        return true;
+  const bool bValidChars = IsValidChars(vrFileNamePath);
+  if (bValidChars || bHavePosSlash || bHaveBckSlash)
+    return true;
 
-    return false;
+  return false;
 }
 
-//++ ------------------------------------------------------------------------------------
-// Details: Determine if the path contains valid characters for a file path. Letters can be
+//++
+//------------------------------------------------------------------------------------
+// Details: Determine if the path contains valid characters for a file path.
+// Letters can be
 //          either upper or lower case.
 // Type:    Method.
 // Args:    vrText  - (R) The text data to examine.
 // Return:  bool - True = yes valid, false = one or more chars is valid.
 // Throws:  None.
 //--
-bool
-CMICmdArgValFile::IsValidChars(const CMIUtilString &vrText) const
-{
-    static CMIUtilString s_strSpecialCharacters(".'\"`@#$%^&*()_+-={}[]| ");
-    const char *pPtr = vrText.c_str();
-    for (MIuint i = 0; i < vrText.length(); i++, pPtr++)
-    {
-        const char c = *pPtr;
-        if (::isalnum((int)c) == 0)
-        {
-            if (s_strSpecialCharacters.find(c) == CMIUtilString::npos)
-                return false;
-        }
+bool CMICmdArgValFile::IsValidChars(const CMIUtilString &vrText) const {
+  static CMIUtilString s_strSpecialCharacters(".'\"`@#$%^&*()_+-={}[]| ");
+  const char *pPtr = vrText.c_str();
+  for (MIuint i = 0; i < vrText.length(); i++, pPtr++) {
+    const char c = *pPtr;
+    if (::isalnum((int)c) == 0) {
+      if (s_strSpecialCharacters.find(c) == CMIUtilString::npos)
+        return false;
     }
+  }
 
-    return true;
+  return true;
 }