From b9c1b51e45b845debb76d8658edabca70ca56079 Mon Sep 17 00:00:00 2001 From: Kate Stone Date: Tue, 6 Sep 2016 20:57:50 +0000 Subject: *** 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: 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 --- .../Language/ObjCPlusPlus/ObjCPlusPlusLanguage.cpp | 56 +++++++----------- .../Language/ObjCPlusPlus/ObjCPlusPlusLanguage.h | 68 +++++++++------------- 2 files changed, 49 insertions(+), 75 deletions(-) (limited to 'lldb/source/Plugins/Language/ObjCPlusPlus') diff --git a/lldb/source/Plugins/Language/ObjCPlusPlus/ObjCPlusPlusLanguage.cpp b/lldb/source/Plugins/Language/ObjCPlusPlus/ObjCPlusPlusLanguage.cpp index 62ddafefad9..cb73eef5468 100644 --- a/lldb/source/Plugins/Language/ObjCPlusPlus/ObjCPlusPlusLanguage.cpp +++ b/lldb/source/Plugins/Language/ObjCPlusPlus/ObjCPlusPlusLanguage.cpp @@ -1,4 +1,5 @@ -//===-- ObjCPlusPlusLanguage.cpp --------------------------------------*- C++ -*-===// +//===-- ObjCPlusPlusLanguage.cpp --------------------------------------*- C++ +//-*-===// // // The LLVM Compiler Infrastructure // @@ -15,54 +16,37 @@ using namespace lldb; using namespace lldb_private; -void -ObjCPlusPlusLanguage::Initialize() -{ - PluginManager::RegisterPlugin (GetPluginNameStatic(), - "Objective-C++ Language", - CreateInstance); +void ObjCPlusPlusLanguage::Initialize() { + PluginManager::RegisterPlugin(GetPluginNameStatic(), "Objective-C++ Language", + CreateInstance); } -void -ObjCPlusPlusLanguage::Terminate() -{ - PluginManager::UnregisterPlugin (CreateInstance); +void ObjCPlusPlusLanguage::Terminate() { + PluginManager::UnregisterPlugin(CreateInstance); } -lldb_private::ConstString -ObjCPlusPlusLanguage::GetPluginNameStatic() -{ - static ConstString g_name("objcplusplus"); - return g_name; +lldb_private::ConstString ObjCPlusPlusLanguage::GetPluginNameStatic() { + static ConstString g_name("objcplusplus"); + return g_name; } - //------------------------------------------------------------------ // PluginInterface protocol //------------------------------------------------------------------ -lldb_private::ConstString -ObjCPlusPlusLanguage::GetPluginName() -{ - return GetPluginNameStatic(); +lldb_private::ConstString ObjCPlusPlusLanguage::GetPluginName() { + return GetPluginNameStatic(); } -uint32_t -ObjCPlusPlusLanguage::GetPluginVersion() -{ - return 1; -} +uint32_t ObjCPlusPlusLanguage::GetPluginVersion() { return 1; } //------------------------------------------------------------------ // Static Functions //------------------------------------------------------------------ -Language * -ObjCPlusPlusLanguage::CreateInstance (lldb::LanguageType language) -{ - switch (language) - { - case lldb::eLanguageTypeObjC_plus_plus: - return new ObjCPlusPlusLanguage(); - default: - return nullptr; - } +Language *ObjCPlusPlusLanguage::CreateInstance(lldb::LanguageType language) { + switch (language) { + case lldb::eLanguageTypeObjC_plus_plus: + return new ObjCPlusPlusLanguage(); + default: + return nullptr; + } } diff --git a/lldb/source/Plugins/Language/ObjCPlusPlus/ObjCPlusPlusLanguage.h b/lldb/source/Plugins/Language/ObjCPlusPlus/ObjCPlusPlusLanguage.h index 0e1db66b089..588b52215c1 100644 --- a/lldb/source/Plugins/Language/ObjCPlusPlus/ObjCPlusPlusLanguage.h +++ b/lldb/source/Plugins/Language/ObjCPlusPlus/ObjCPlusPlusLanguage.h @@ -14,50 +14,40 @@ // C++ Includes // Other libraries and framework includes // Project includes -#include "lldb/lldb-private.h" #include "lldb/Target/Language.h" +#include "lldb/lldb-private.h" namespace lldb_private { - -class ObjCPlusPlusLanguage : - public Language -{ + +class ObjCPlusPlusLanguage : public Language { public: - ObjCPlusPlusLanguage() = default; - - ~ObjCPlusPlusLanguage() override = default; - - lldb::LanguageType - GetLanguageType() const override - { - return lldb::eLanguageTypeObjC_plus_plus; - } - - //------------------------------------------------------------------ - // Static Functions - //------------------------------------------------------------------ - static void - Initialize(); - - static void - Terminate(); - - static lldb_private::Language * - CreateInstance (lldb::LanguageType language); - - static lldb_private::ConstString - GetPluginNameStatic(); - - //------------------------------------------------------------------ - // PluginInterface protocol - //------------------------------------------------------------------ - ConstString - GetPluginName() override; - - uint32_t - GetPluginVersion() override; + ObjCPlusPlusLanguage() = default; + + ~ObjCPlusPlusLanguage() override = default; + + lldb::LanguageType GetLanguageType() const override { + return lldb::eLanguageTypeObjC_plus_plus; + } + + //------------------------------------------------------------------ + // Static Functions + //------------------------------------------------------------------ + static void Initialize(); + + static void Terminate(); + + static lldb_private::Language *CreateInstance(lldb::LanguageType language); + + static lldb_private::ConstString GetPluginNameStatic(); + + //------------------------------------------------------------------ + // PluginInterface protocol + //------------------------------------------------------------------ + ConstString GetPluginName() override; + + uint32_t GetPluginVersion() override; }; - + } // namespace lldb_private #endif // liblldb_CPlusPlusLanguage_h_ -- cgit v1.2.3