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 --- lldb/source/Interpreter/OptionValueRegex.cpp | 102 ++++++++++++--------------- 1 file changed, 44 insertions(+), 58 deletions(-) (limited to 'lldb/source/Interpreter/OptionValueRegex.cpp') diff --git a/lldb/source/Interpreter/OptionValueRegex.cpp b/lldb/source/Interpreter/OptionValueRegex.cpp index ebe7ae2feb9..9a19b842f6e 100644 --- a/lldb/source/Interpreter/OptionValueRegex.cpp +++ b/lldb/source/Interpreter/OptionValueRegex.cpp @@ -18,71 +18,57 @@ using namespace lldb; using namespace lldb_private; -void -OptionValueRegex::DumpValue (const ExecutionContext *exe_ctx, Stream &strm, uint32_t dump_mask) -{ +void OptionValueRegex::DumpValue(const ExecutionContext *exe_ctx, Stream &strm, + uint32_t dump_mask) { + if (dump_mask & eDumpOptionType) + strm.Printf("(%s)", GetTypeAsCString()); + if (dump_mask & eDumpOptionValue) { if (dump_mask & eDumpOptionType) - strm.Printf ("(%s)", GetTypeAsCString ()); - if (dump_mask & eDumpOptionValue) - { - if (dump_mask & eDumpOptionType) - strm.PutCString (" = "); - if (m_regex.IsValid()) - { - const char *regex_text = m_regex.GetText(); - if (regex_text && regex_text[0]) - strm.Printf ("%s", regex_text); - } - else - { - - } + strm.PutCString(" = "); + if (m_regex.IsValid()) { + const char *regex_text = m_regex.GetText(); + if (regex_text && regex_text[0]) + strm.Printf("%s", regex_text); + } else { } + } } -Error -OptionValueRegex::SetValueFromString (llvm::StringRef value, - VarSetOperationType op) -{ - Error error; - switch (op) - { - case eVarSetOperationInvalid: - case eVarSetOperationInsertBefore: - case eVarSetOperationInsertAfter: - case eVarSetOperationRemove: - case eVarSetOperationAppend: - error = OptionValue::SetValueFromString (value, op); - break; +Error OptionValueRegex::SetValueFromString(llvm::StringRef value, + VarSetOperationType op) { + Error error; + switch (op) { + case eVarSetOperationInvalid: + case eVarSetOperationInsertBefore: + case eVarSetOperationInsertAfter: + case eVarSetOperationRemove: + case eVarSetOperationAppend: + error = OptionValue::SetValueFromString(value, op); + break; - case eVarSetOperationClear: - Clear(); - NotifyValueChanged(); - break; + case eVarSetOperationClear: + Clear(); + NotifyValueChanged(); + break; - case eVarSetOperationReplace: - case eVarSetOperationAssign: - if (m_regex.Compile (value.str().c_str())) - { - m_value_was_set = true; - NotifyValueChanged(); - } - else - { - char regex_error[1024]; - if (m_regex.GetErrorAsCString(regex_error, sizeof(regex_error))) - error.SetErrorString (regex_error); - else - error.SetErrorStringWithFormat ("regex error %u", m_regex.GetErrorCode()); - } - break; + case eVarSetOperationReplace: + case eVarSetOperationAssign: + if (m_regex.Compile(value.str().c_str())) { + m_value_was_set = true; + NotifyValueChanged(); + } else { + char regex_error[1024]; + if (m_regex.GetErrorAsCString(regex_error, sizeof(regex_error))) + error.SetErrorString(regex_error); + else + error.SetErrorStringWithFormat("regex error %u", + m_regex.GetErrorCode()); } - return error; + break; + } + return error; } - -lldb::OptionValueSP -OptionValueRegex::DeepCopy () const -{ - return OptionValueSP(new OptionValueRegex(m_regex.GetText())); +lldb::OptionValueSP OptionValueRegex::DeepCopy() const { + return OptionValueSP(new OptionValueRegex(m_regex.GetText())); } -- cgit v1.2.3