*** 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, 54 insertions, 90 deletions

diff --git a/lldb/source/Utility/StringLexer.cpp b/lldb/source/Utility/StringLexer.cpp
index 2f62d2cedb4..ec18f049476 100644
--- a/lldb/source/Utility/StringLexer.cpp
+++ b/lldb/source/Utility/StringLexer.cpp
@@ -1,4 +1,5 @@
-//===--------------------- StringLexer.cpp -----------------------*- C++ -*-===//
+//===--------------------- StringLexer.cpp -----------------------*- C++
+//-*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -14,116 +15,79 @@
 
 using namespace lldb_utility;
 
-StringLexer::StringLexer (std::string s) :
-    m_data(s),
-    m_position(0)
-{ }
+StringLexer::StringLexer(std::string s) : m_data(s), m_position(0) {}
 
-StringLexer::StringLexer (const StringLexer& rhs) :
-    m_data(rhs.m_data),
-    m_position(rhs.m_position)
-{ }
+StringLexer::StringLexer(const StringLexer &rhs)
+    : m_data(rhs.m_data), m_position(rhs.m_position) {}
 
-StringLexer::Character
-StringLexer::Peek ()
-{
-    return m_data[m_position];
-}
+StringLexer::Character StringLexer::Peek() { return m_data[m_position]; }
 
-bool
-StringLexer::NextIf (Character c)
-{
-    auto val = Peek();
-    if (val == c)
-    {
-        Next();
-        return true;
-    }
-    return false;
+bool StringLexer::NextIf(Character c) {
+  auto val = Peek();
+  if (val == c) {
+    Next();
+    return true;
+  }
+  return false;
 }
 
 std::pair<bool, StringLexer::Character>
-StringLexer::NextIf (std::initializer_list<Character> cs)
-{
-    auto val = Peek();
-    for (auto c : cs)
-    {
-        if (val == c)
-        {
-            Next();
-            return {true,c};
-        }
+StringLexer::NextIf(std::initializer_list<Character> cs) {
+  auto val = Peek();
+  for (auto c : cs) {
+    if (val == c) {
+      Next();
+      return {true, c};
     }
-    return {false,0};
+  }
+  return {false, 0};
 }
 
-bool
-StringLexer::AdvanceIf (const std::string& token)
-{
-    auto pos = m_position;
-    bool matches = true;
-    for (auto c : token)
-    {
-        if (!NextIf(c))
-        {
-            matches = false;
-            break;
-        }
-    }
-    if (!matches)
-    {
-        m_position = pos;
-        return false;
+bool StringLexer::AdvanceIf(const std::string &token) {
+  auto pos = m_position;
+  bool matches = true;
+  for (auto c : token) {
+    if (!NextIf(c)) {
+      matches = false;
+      break;
     }
-    return true;
+  }
+  if (!matches) {
+    m_position = pos;
+    return false;
+  }
+  return true;
 }
 
-StringLexer::Character
-StringLexer::Next ()
-{
-    auto val = Peek();
-    Consume();
-    return val;
+StringLexer::Character StringLexer::Next() {
+  auto val = Peek();
+  Consume();
+  return val;
 }
 
-bool
-StringLexer::HasAtLeast (Size s)
-{
-    return (m_data.size() - m_position) >= s;
+bool StringLexer::HasAtLeast(Size s) {
+  return (m_data.size() - m_position) >= s;
 }
 
-void
-StringLexer::PutBack (Size s)
-{
-    assert (m_position >= s);
-    m_position -= s;
+void StringLexer::PutBack(Size s) {
+  assert(m_position >= s);
+  m_position -= s;
 }
 
-bool
-StringLexer::HasAny (Character c)
-{
-    return m_data.find(c, m_position) != std::string::npos;
+bool StringLexer::HasAny(Character c) {
+  return m_data.find(c, m_position) != std::string::npos;
 }
 
-std::string
-StringLexer::GetUnlexed ()
-{
-    return std::string(m_data, m_position);
+std::string StringLexer::GetUnlexed() {
+  return std::string(m_data, m_position);
 }
 
-void
-StringLexer::Consume()
-{
-    m_position++;
-}
+void StringLexer::Consume() { m_position++; }
 
-StringLexer&
-StringLexer::operator = (const StringLexer& rhs)
-{
-    if (this != &rhs)
-    {
-        m_data = rhs.m_data;
-        m_position = rhs.m_position;
-    }
-    return *this;
+StringLexer &StringLexer::operator=(const StringLexer &rhs) {
+  if (this != &rhs) {
+    m_data = rhs.m_data;
+    m_position = rhs.m_position;
+  }
+  return *this;
 }