From b9c1b51e45b845debb76d8658edabca70ca56079 Mon Sep 17 00:00:00 2001
From: Kate Stone <katherine.stone@apple.com>
Date: Tue, 6 Sep 2016 20:57:50 +0000
Subject: =?UTF-8?q?***=20This=20commit=20represents=20a=20complete=20refor?=
 =?UTF-8?q?matting=20of=20the=20LLDB=20source=20code=20***=20to=20conform?=
 =?UTF-8?q?=20to=20clang-format=E2=80=99s=20LLVM=20style.=20=20This=20kind?=
 =?UTF-8?q?=20of=20mass=20change=20has=20***=20two=20obvious=20implication?=
 =?UTF-8?q?s:?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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
---
 lldb/source/Symbol/CompilerDeclContext.cpp | 94 +++++++++++++-----------------
 1 file changed, 41 insertions(+), 53 deletions(-)

(limited to 'lldb/source/Symbol/CompilerDeclContext.cpp')

diff --git a/lldb/source/Symbol/CompilerDeclContext.cpp b/lldb/source/Symbol/CompilerDeclContext.cpp
index 10a70d9..43a83bb 100644
--- a/lldb/source/Symbol/CompilerDeclContext.cpp
+++ b/lldb/source/Symbol/CompilerDeclContext.cpp
@@ -15,71 +15,59 @@
 using namespace lldb_private;
 
 std::vector<CompilerDecl>
-CompilerDeclContext::FindDeclByName (ConstString name, const bool ignore_using_decls)
-{
-    if (IsValid())
-        return m_type_system->DeclContextFindDeclByName(
-            m_opaque_decl_ctx, name, ignore_using_decls);
-    else
-        return std::vector<CompilerDecl>();
+CompilerDeclContext::FindDeclByName(ConstString name,
+                                    const bool ignore_using_decls) {
+  if (IsValid())
+    return m_type_system->DeclContextFindDeclByName(m_opaque_decl_ctx, name,
+                                                    ignore_using_decls);
+  else
+    return std::vector<CompilerDecl>();
 }
 
-bool
-CompilerDeclContext::IsClang () const
-{
-    return IsValid() && m_type_system->getKind() == TypeSystem::eKindClang;
+bool CompilerDeclContext::IsClang() const {
+  return IsValid() && m_type_system->getKind() == TypeSystem::eKindClang;
 }
 
-ConstString
-CompilerDeclContext::GetName () const
-{
-    if (IsValid())
-        return m_type_system->DeclContextGetName(m_opaque_decl_ctx);
-    else
-        return ConstString();
+ConstString CompilerDeclContext::GetName() const {
+  if (IsValid())
+    return m_type_system->DeclContextGetName(m_opaque_decl_ctx);
+  else
+    return ConstString();
 }
 
-ConstString
-CompilerDeclContext::GetScopeQualifiedName () const
-{
-    if (IsValid())
-        return m_type_system->DeclContextGetScopeQualifiedName(m_opaque_decl_ctx);
-    else
-        return ConstString();
+ConstString CompilerDeclContext::GetScopeQualifiedName() const {
+  if (IsValid())
+    return m_type_system->DeclContextGetScopeQualifiedName(m_opaque_decl_ctx);
+  else
+    return ConstString();
 }
 
-bool
-CompilerDeclContext::IsStructUnionOrClass () const
-{
-    if (IsValid())
-        return m_type_system->DeclContextIsStructUnionOrClass(m_opaque_decl_ctx);
-    else
-        return false;
+bool CompilerDeclContext::IsStructUnionOrClass() const {
+  if (IsValid())
+    return m_type_system->DeclContextIsStructUnionOrClass(m_opaque_decl_ctx);
+  else
+    return false;
 }
 
-bool
-CompilerDeclContext::IsClassMethod (lldb::LanguageType *language_ptr,
-                                    bool *is_instance_method_ptr,
-                                    ConstString *language_object_name_ptr)
-{
-    if (IsValid())
-        return m_type_system->DeclContextIsClassMethod (m_opaque_decl_ctx,
-                                                        language_ptr,
-                                                        is_instance_method_ptr,
-                                                        language_object_name_ptr);
-    else
-        return false;
+bool CompilerDeclContext::IsClassMethod(lldb::LanguageType *language_ptr,
+                                        bool *is_instance_method_ptr,
+                                        ConstString *language_object_name_ptr) {
+  if (IsValid())
+    return m_type_system->DeclContextIsClassMethod(
+        m_opaque_decl_ctx, language_ptr, is_instance_method_ptr,
+        language_object_name_ptr);
+  else
+    return false;
 }
 
-bool
-lldb_private::operator == (const lldb_private::CompilerDeclContext &lhs, const lldb_private::CompilerDeclContext &rhs)
-{
-    return lhs.GetTypeSystem() == rhs.GetTypeSystem() && lhs.GetOpaqueDeclContext() == rhs.GetOpaqueDeclContext();
+bool lldb_private::operator==(const lldb_private::CompilerDeclContext &lhs,
+                              const lldb_private::CompilerDeclContext &rhs) {
+  return lhs.GetTypeSystem() == rhs.GetTypeSystem() &&
+         lhs.GetOpaqueDeclContext() == rhs.GetOpaqueDeclContext();
 }
 
-
-bool
-lldb_private::operator != (const lldb_private::CompilerDeclContext &lhs, const lldb_private::CompilerDeclContext &rhs)
-{
-    return lhs.GetTypeSystem() != rhs.GetTypeSystem() || lhs.GetOpaqueDeclContext() != rhs.GetOpaqueDeclContext();
+bool lldb_private::operator!=(const lldb_private::CompilerDeclContext &lhs,
+                              const lldb_private::CompilerDeclContext &rhs) {
+  return lhs.GetTypeSystem() != rhs.GetTypeSystem() ||
+         lhs.GetOpaqueDeclContext() != rhs.GetOpaqueDeclContext();
 }
-- 
cgit v1.1