diff options
author | Kate Stone <katherine.stone@apple.com> | 2016-09-06 20:57:50 +0000 |
---|---|---|
committer | Kate Stone <katherine.stone@apple.com> | 2016-09-06 20:57:50 +0000 |
commit | b9c1b51e45b845debb76d8658edabca70ca56079 (patch) | |
tree | dfcb5a13ef2b014202340f47036da383eaee74aa /lldb/source/Interpreter/CommandHistory.cpp | |
parent | d5aa73376966339caad04013510626ec2e42c760 (diff) | |
download | llvm-b9c1b51e45b845debb76d8658edabca70ca56079.zip llvm-b9c1b51e45b845debb76d8658edabca70ca56079.tar.gz llvm-b9c1b51e45b845debb76d8658edabca70ca56079.tar.bz2 |
*** 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
Diffstat (limited to 'lldb/source/Interpreter/CommandHistory.cpp')
-rw-r--r-- | lldb/source/Interpreter/CommandHistory.cpp | 175 |
1 files changed, 71 insertions, 104 deletions
diff --git a/lldb/source/Interpreter/CommandHistory.cpp b/lldb/source/Interpreter/CommandHistory.cpp index ff87e52..09ee620 100644 --- a/lldb/source/Interpreter/CommandHistory.cpp +++ b/lldb/source/Interpreter/CommandHistory.cpp @@ -9,134 +9,101 @@ #include <inttypes.h> -#include "lldb/Interpreter/CommandHistory.h" #include "lldb/Host/StringConvert.h" +#include "lldb/Interpreter/CommandHistory.h" using namespace lldb; using namespace lldb_private; -CommandHistory::CommandHistory() : m_mutex(), m_history() -{} +CommandHistory::CommandHistory() : m_mutex(), m_history() {} -CommandHistory::~CommandHistory () -{} +CommandHistory::~CommandHistory() {} -size_t -CommandHistory::GetSize () const -{ - std::lock_guard<std::recursive_mutex> guard(m_mutex); - return m_history.size(); +size_t CommandHistory::GetSize() const { + std::lock_guard<std::recursive_mutex> guard(m_mutex); + return m_history.size(); } -bool -CommandHistory::IsEmpty () const -{ - std::lock_guard<std::recursive_mutex> guard(m_mutex); - return m_history.empty(); +bool CommandHistory::IsEmpty() const { + std::lock_guard<std::recursive_mutex> guard(m_mutex); + return m_history.empty(); } -const char* -CommandHistory::FindString (const char* input_str) const -{ - std::lock_guard<std::recursive_mutex> guard(m_mutex); - if (!input_str) - return nullptr; - if (input_str[0] != g_repeat_char) - return nullptr; - if (input_str[1] == '-') - { - bool success; - size_t idx = StringConvert::ToUInt32 (input_str+2, 0, 0, &success); - if (!success) - return nullptr; - if (idx > m_history.size()) - return nullptr; - idx = m_history.size() - idx; - return m_history[idx].c_str(); - - } - else if (input_str[1] == g_repeat_char) - { - if (m_history.empty()) - return nullptr; - else - return m_history.back().c_str(); - } +const char *CommandHistory::FindString(const char *input_str) const { + std::lock_guard<std::recursive_mutex> guard(m_mutex); + if (!input_str) + return nullptr; + if (input_str[0] != g_repeat_char) + return nullptr; + if (input_str[1] == '-') { + bool success; + size_t idx = StringConvert::ToUInt32(input_str + 2, 0, 0, &success); + if (!success) + return nullptr; + if (idx > m_history.size()) + return nullptr; + idx = m_history.size() - idx; + return m_history[idx].c_str(); + + } else if (input_str[1] == g_repeat_char) { + if (m_history.empty()) + return nullptr; else - { - bool success; - uint32_t idx = StringConvert::ToUInt32 (input_str+1, 0, 0, &success); - if (!success) - return nullptr; - if (idx >= m_history.size()) - return nullptr; - return m_history[idx].c_str(); - } + return m_history.back().c_str(); + } else { + bool success; + uint32_t idx = StringConvert::ToUInt32(input_str + 1, 0, 0, &success); + if (!success) + return nullptr; + if (idx >= m_history.size()) + return nullptr; + return m_history[idx].c_str(); + } } -const char* -CommandHistory::GetStringAtIndex (size_t idx) const -{ - std::lock_guard<std::recursive_mutex> guard(m_mutex); - if (idx < m_history.size()) - return m_history[idx].c_str(); - return nullptr; +const char *CommandHistory::GetStringAtIndex(size_t idx) const { + std::lock_guard<std::recursive_mutex> guard(m_mutex); + if (idx < m_history.size()) + return m_history[idx].c_str(); + return nullptr; } -const char* -CommandHistory::operator [] (size_t idx) const -{ - return GetStringAtIndex(idx); +const char *CommandHistory::operator[](size_t idx) const { + return GetStringAtIndex(idx); } -const char* -CommandHistory::GetRecentmostString () const -{ - std::lock_guard<std::recursive_mutex> guard(m_mutex); - if (m_history.empty()) - return nullptr; - return m_history.back().c_str(); +const char *CommandHistory::GetRecentmostString() const { + std::lock_guard<std::recursive_mutex> guard(m_mutex); + if (m_history.empty()) + return nullptr; + return m_history.back().c_str(); } -void -CommandHistory::AppendString (const std::string& str, - bool reject_if_dupe) -{ - std::lock_guard<std::recursive_mutex> guard(m_mutex); - if (reject_if_dupe) - { - if (!m_history.empty()) - { - if (str == m_history.back()) - return; - } +void CommandHistory::AppendString(const std::string &str, bool reject_if_dupe) { + std::lock_guard<std::recursive_mutex> guard(m_mutex); + if (reject_if_dupe) { + if (!m_history.empty()) { + if (str == m_history.back()) + return; } - m_history.push_back(std::string(str)); + } + m_history.push_back(std::string(str)); } -void -CommandHistory::Clear () -{ - std::lock_guard<std::recursive_mutex> guard(m_mutex); - m_history.clear(); +void CommandHistory::Clear() { + std::lock_guard<std::recursive_mutex> guard(m_mutex); + m_history.clear(); } -void -CommandHistory::Dump (Stream& stream, - size_t start_idx, - size_t stop_idx) const -{ - std::lock_guard<std::recursive_mutex> guard(m_mutex); - stop_idx = std::min(stop_idx + 1, m_history.size()); - for (size_t counter = start_idx; - counter < stop_idx; - counter++) - { - const std::string hist_item = m_history[counter]; - if (!hist_item.empty()) - { - stream.Indent(); - stream.Printf("%4" PRIu64 ": %s\n", (uint64_t)counter, hist_item.c_str()); - } +void CommandHistory::Dump(Stream &stream, size_t start_idx, + size_t stop_idx) const { + std::lock_guard<std::recursive_mutex> guard(m_mutex); + stop_idx = std::min(stop_idx + 1, m_history.size()); + for (size_t counter = start_idx; counter < stop_idx; counter++) { + const std::string hist_item = m_history[counter]; + if (!hist_item.empty()) { + stream.Indent(); + stream.Printf("%4" PRIu64 ": %s\n", (uint64_t)counter, hist_item.c_str()); } + } } |