From b9c1b51e45b845debb76d8658edabca70ca56079 Mon Sep 17 00:00:00 2001 From: Kate Stone 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 --- .../source/Interpreter/OptionValueFileSpecLIst.cpp | 290 ++++++++++----------- 1 file changed, 132 insertions(+), 158 deletions(-) (limited to 'lldb/source/Interpreter/OptionValueFileSpecLIst.cpp') diff --git a/lldb/source/Interpreter/OptionValueFileSpecLIst.cpp b/lldb/source/Interpreter/OptionValueFileSpecLIst.cpp index 6a0ba11..a15dd5c 100644 --- a/lldb/source/Interpreter/OptionValueFileSpecLIst.cpp +++ b/lldb/source/Interpreter/OptionValueFileSpecLIst.cpp @@ -20,171 +20,145 @@ using namespace lldb; using namespace lldb_private; -void -OptionValueFileSpecList::DumpValue (const ExecutionContext *exe_ctx, Stream &strm, uint32_t dump_mask) -{ +void OptionValueFileSpecList::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.Printf (" =%s", m_current_value.GetSize() > 0 ? "\n" : ""); - strm.IndentMore(); - const uint32_t size = m_current_value.GetSize(); - for (uint32_t i = 0; i 0 ? "\n" : ""); + strm.IndentMore(); + const uint32_t size = m_current_value.GetSize(); + for (uint32_t i = 0; i < size; ++i) { + strm.Indent(); + strm.Printf("[%u]: ", i); + m_current_value.GetFileSpecAtIndex(i).Dump(&strm); } + strm.IndentLess(); + } } -Error -OptionValueFileSpecList::SetValueFromString (llvm::StringRef value, VarSetOperationType op) -{ - Error error; - Args args(value.str().c_str()); - const size_t argc = args.GetArgumentCount(); +Error OptionValueFileSpecList::SetValueFromString(llvm::StringRef value, + VarSetOperationType op) { + Error error; + Args args(value.str().c_str()); + const size_t argc = args.GetArgumentCount(); - switch (op) - { - case eVarSetOperationClear: - Clear (); - NotifyValueChanged(); - break; - - case eVarSetOperationReplace: - if (argc > 1) - { - uint32_t idx = StringConvert::ToUInt32(args.GetArgumentAtIndex(0), UINT32_MAX); - const uint32_t count = m_current_value.GetSize(); - if (idx > count) - { - error.SetErrorStringWithFormat("invalid file list index %u, index must be 0 through %u", idx, count); - } - else - { - for (size_t i=1; i 0) - { - m_value_was_set = true; - for (size_t i=0; i 1) - { - uint32_t idx = StringConvert::ToUInt32(args.GetArgumentAtIndex(0), UINT32_MAX); - const uint32_t count = m_current_value.GetSize(); - if (idx > count) - { - error.SetErrorStringWithFormat("invalid insert file list index %u, index must be 0 through %u", idx, count); - } - else - { - if (op == eVarSetOperationInsertAfter) - ++idx; - for (size_t i=1; i 0) - { - std::vector remove_indexes; - bool all_indexes_valid = true; - size_t i; - for (i=0; all_indexes_valid && i 1) { + uint32_t idx = + StringConvert::ToUInt32(args.GetArgumentAtIndex(0), UINT32_MAX); + const uint32_t count = m_current_value.GetSize(); + if (idx > count) { + error.SetErrorStringWithFormat( + "invalid file list index %u, index must be 0 through %u", idx, + count); + } else { + for (size_t i = 1; i < argc; ++i, ++idx) { + FileSpec file(args.GetArgumentAtIndex(i), false); + if (idx < count) + m_current_value.Replace(idx, file); + else + m_current_value.Append(file); + } + NotifyValueChanged(); + } + } else { + error.SetErrorString("replace operation takes an array index followed by " + "one or more values"); } - return error; -} + break; -lldb::OptionValueSP -OptionValueFileSpecList::DeepCopy () const -{ - return OptionValueSP(new OptionValueFileSpecList(*this)); -} + case eVarSetOperationAssign: + m_current_value.Clear(); + // Fall through to append case + LLVM_FALLTHROUGH; + case eVarSetOperationAppend: + if (argc > 0) { + m_value_was_set = true; + for (size_t i = 0; i < argc; ++i) { + FileSpec file(args.GetArgumentAtIndex(i), false); + m_current_value.Append(file); + } + NotifyValueChanged(); + } else { + error.SetErrorString( + "assign operation takes at least one file path argument"); + } + break; + + case eVarSetOperationInsertBefore: + case eVarSetOperationInsertAfter: + if (argc > 1) { + uint32_t idx = + StringConvert::ToUInt32(args.GetArgumentAtIndex(0), UINT32_MAX); + const uint32_t count = m_current_value.GetSize(); + if (idx > count) { + error.SetErrorStringWithFormat( + "invalid insert file list index %u, index must be 0 through %u", + idx, count); + } else { + if (op == eVarSetOperationInsertAfter) + ++idx; + for (size_t i = 1; i < argc; ++i, ++idx) { + FileSpec file(args.GetArgumentAtIndex(i), false); + m_current_value.Insert(idx, file); + } + NotifyValueChanged(); + } + } else { + error.SetErrorString("insert operation takes an array index followed by " + "one or more values"); + } + break; + + case eVarSetOperationRemove: + if (argc > 0) { + std::vector remove_indexes; + bool all_indexes_valid = true; + size_t i; + for (i = 0; all_indexes_valid && i < argc; ++i) { + const int idx = + StringConvert::ToSInt32(args.GetArgumentAtIndex(i), INT32_MAX); + if (idx == INT32_MAX) + all_indexes_valid = false; + else + remove_indexes.push_back(idx); + } + if (all_indexes_valid) { + size_t num_remove_indexes = remove_indexes.size(); + if (num_remove_indexes) { + // Sort and then erase in reverse so indexes are always valid + std::sort(remove_indexes.begin(), remove_indexes.end()); + for (size_t j = num_remove_indexes - 1; j < num_remove_indexes; ++j) { + m_current_value.Remove(j); + } + } + NotifyValueChanged(); + } else { + error.SetErrorStringWithFormat( + "invalid array index '%s', aborting remove operation", + args.GetArgumentAtIndex(i)); + } + } else { + error.SetErrorString("remove operation takes one or more array index"); + } + break; + case eVarSetOperationInvalid: + error = OptionValue::SetValueFromString(value, op); + break; + } + return error; +} + +lldb::OptionValueSP OptionValueFileSpecList::DeepCopy() const { + return OptionValueSP(new OptionValueFileSpecList(*this)); +} -- cgit v1.1