From 14f1b3e8826ce43b978db93a62d1166055db5394 Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Mon, 2 Jan 2017 19:26:05 +0000 Subject: Vendor import of lldb trunk r290819: https://llvm.org/svn/llvm-project/lldb/trunk@290819 --- source/Interpreter/OptionValuePathMappings.cpp | 379 +++++++++++-------------- 1 file changed, 173 insertions(+), 206 deletions(-) (limited to 'source/Interpreter/OptionValuePathMappings.cpp') diff --git a/source/Interpreter/OptionValuePathMappings.cpp b/source/Interpreter/OptionValuePathMappings.cpp index f3f146f1f8c6..5b9850d45216 100644 --- a/source/Interpreter/OptionValuePathMappings.cpp +++ b/source/Interpreter/OptionValuePathMappings.cpp @@ -20,222 +20,189 @@ using namespace lldb; using namespace lldb_private; -namespace -{ - static bool - VerifyPathExists(const char *path) - { - if (path && path[0]) - return FileSpec(path, false).Exists(); - else - return false; - } +namespace { +static bool VerifyPathExists(const char *path) { + if (path && path[0]) + return FileSpec(path, false).Exists(); + else + return false; +} } - -void -OptionValuePathMappings::DumpValue (const ExecutionContext *exe_ctx, Stream &strm, uint32_t dump_mask) -{ +void OptionValuePathMappings::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_path_mappings.GetSize() > 0) ? "\n" : ""); - m_path_mappings.Dump(&strm); - } + strm.Printf(" =%s", (m_path_mappings.GetSize() > 0) ? "\n" : ""); + m_path_mappings.Dump(&strm); + } } -Error -OptionValuePathMappings::SetValueFromString (llvm::StringRef value, VarSetOperationType op) -{ - Error error; - Args args(value.str().c_str()); - const size_t argc = args.GetArgumentCount(); +Error OptionValuePathMappings::SetValueFromString(llvm::StringRef value, + VarSetOperationType op) { + Error error; + Args args(value.str()); + const size_t argc = args.GetArgumentCount(); - switch (op) - { - case eVarSetOperationClear: - Clear (); - NotifyValueChanged(); - break; - - case eVarSetOperationReplace: - // Must be at least one index + 1 pair of paths, and the pair count must be even - if (argc >= 3 && (((argc - 1) & 1) == 0)) - { - uint32_t idx = StringConvert::ToUInt32(args.GetArgumentAtIndex(0), UINT32_MAX); - const uint32_t count = m_path_mappings.GetSize(); - if (idx > count) - { - error.SetErrorStringWithFormat("invalid file list index %u, index must be 0 through %u", idx, count); - } - else - { - bool changed = false; - for (size_t i=1; i= 3 && (((argc - 1) & 1) == 0)) - { - uint32_t idx = StringConvert::ToUInt32(args.GetArgumentAtIndex(0), UINT32_MAX); - const uint32_t count = m_path_mappings.GetSize(); - if (idx > count) - { - error.SetErrorStringWithFormat("invalid file list index %u, index must be 0 through %u", idx, count); - } - else - { - bool changed = false; - 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= 3 && (((argc - 1) & 1) == 0)) { + uint32_t idx = + StringConvert::ToUInt32(args.GetArgumentAtIndex(0), UINT32_MAX); + const uint32_t count = m_path_mappings.GetSize(); + if (idx > count) { + error.SetErrorStringWithFormat( + "invalid file list index %u, index must be 0 through %u", idx, + count); + } else { + bool changed = false; + for (size_t i = 1; i < argc; i += 2, ++idx) { + const char *orginal_path = args.GetArgumentAtIndex(i); + const char *replace_path = args.GetArgumentAtIndex(i + 1); + if (VerifyPathExists(replace_path)) { + ConstString a(orginal_path); + ConstString b(replace_path); + if (!m_path_mappings.Replace(a, b, idx, m_notify_changes)) + m_path_mappings.Append(a, b, m_notify_changes); + changed = true; + } else { + error.SetErrorStringWithFormat( + "the replacement path doesn't exist: \"%s\"", replace_path); break; + } + } + if (changed) + NotifyValueChanged(); + } + } else { + error.SetErrorString("replace operation takes an array index followed by " + "one or more path pairs"); + } + break; - case eVarSetOperationInvalid: - error = OptionValue::SetValueFromString (value, op); + case eVarSetOperationAssign: + if (argc < 2 || (argc & 1)) { + error.SetErrorString("assign operation takes one or more path pairs"); + break; + } + m_path_mappings.Clear(m_notify_changes); + // Fall through to append case + LLVM_FALLTHROUGH; + case eVarSetOperationAppend: + if (argc < 2 || (argc & 1)) { + error.SetErrorString("append operation takes one or more path pairs"); + break; + } else { + bool changed = false; + for (size_t i = 0; i < argc; i += 2) { + const char *orginal_path = args.GetArgumentAtIndex(i); + const char *replace_path = args.GetArgumentAtIndex(i + 1); + if (VerifyPathExists(replace_path)) { + ConstString a(orginal_path); + ConstString b(replace_path); + m_path_mappings.Append(a, b, m_notify_changes); + m_value_was_set = true; + changed = true; + } else { + error.SetErrorStringWithFormat( + "the replacement path doesn't exist: \"%s\"", replace_path); + break; + } + } + if (changed) + NotifyValueChanged(); + } + break; + + case eVarSetOperationInsertBefore: + case eVarSetOperationInsertAfter: + // Must be at least one index + 1 pair of paths, and the pair count must be + // even + if (argc >= 3 && (((argc - 1) & 1) == 0)) { + uint32_t idx = + StringConvert::ToUInt32(args.GetArgumentAtIndex(0), UINT32_MAX); + const uint32_t count = m_path_mappings.GetSize(); + if (idx > count) { + error.SetErrorStringWithFormat( + "invalid file list index %u, index must be 0 through %u", idx, + count); + } else { + bool changed = false; + if (op == eVarSetOperationInsertAfter) + ++idx; + for (size_t i = 1; i < argc; i += 2, ++idx) { + const char *orginal_path = args.GetArgumentAtIndex(i); + const char *replace_path = args.GetArgumentAtIndex(i + 1); + if (VerifyPathExists(replace_path)) { + ConstString a(orginal_path); + ConstString b(replace_path); + m_path_mappings.Insert(a, b, idx, m_notify_changes); + changed = true; + } else { + error.SetErrorStringWithFormat( + "the replacement path doesn't exist: \"%s\"", replace_path); break; + } + } + if (changed) + NotifyValueChanged(); + } + } else { + error.SetErrorString("insert operation takes an array index followed by " + "one or more path pairs"); } - return error; + 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_path_mappings.Remove(j, m_notify_changes); + } + } + 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 -OptionValuePathMappings::DeepCopy () const -{ - return OptionValueSP(new OptionValuePathMappings(*this)); +lldb::OptionValueSP OptionValuePathMappings::DeepCopy() const { + return OptionValueSP(new OptionValuePathMappings(*this)); } -- cgit v1.2.3