Author: adrian
Date: Thu Aug 22 13:08:46 2019
New Revision: 369698
URL: http://llvm.org/viewvc/llvm-project?rev=369698&view=rev
Log:
Rename lldb/source/Interpreter/OptionValueFileSpecLIst.cpp to
lldb/source/Interpreter/OptionValueFileSpecListTmp.cpp (NFC)
Added:
lldb/trunk/source/Interpreter/OptionValueFileSpecListTmp.cpp
Removed:
lldb/trunk/source/Interpreter/OptionValueFileSpecLIst.cpp
Modified:
lldb/trunk/source/Interpreter/CMakeLists.txt
Modified: lldb/trunk/source/Interpreter/CMakeLists.txt
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Interpreter/CMakeLists.txt?rev=369698&r1=369697&r2=369698&view=diff
==============================================================================
--- lldb/trunk/source/Interpreter/CMakeLists.txt (original)
+++ lldb/trunk/source/Interpreter/CMakeLists.txt Thu Aug 22 13:08:46 2019
@@ -35,7 +35,7 @@ add_lldb_library(lldbInterpreter
OptionValueDictionary.cpp
OptionValueEnumeration.cpp
OptionValueFileSpec.cpp
- OptionValueFileSpecLIst.cpp
+ OptionValueFileSpecListTmp.cpp
OptionValueFormat.cpp
OptionValueFormatEntity.cpp
OptionValueLanguage.cpp
Removed: lldb/trunk/source/Interpreter/OptionValueFileSpecLIst.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Interpreter/OptionValueFileSpecLIst.cpp?rev=369697&view=auto
==============================================================================
--- lldb/trunk/source/Interpreter/OptionValueFileSpecLIst.cpp (original)
+++ lldb/trunk/source/Interpreter/OptionValueFileSpecLIst.cpp (removed)
@@ -1,170 +0,0 @@
-//===-- OptionValueFileSpecLIst.cpp -----------------------------*- C++
-*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM
Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "lldb/Interpreter/OptionValueFileSpecList.h"
-
-#include "lldb/Host/StringConvert.h"
-#include "lldb/Utility/Args.h"
-#include "lldb/Utility/Stream.h"
-
-using namespace lldb;
-using namespace lldb_private;
-
-void OptionValueFileSpecList::DumpValue(const ExecutionContext *exe_ctx,
- Stream &strm, uint32_t dump_mask) {
- std::lock_guard<std::recursive_mutex> lock(m_mutex);
- if (dump_mask & eDumpOptionType)
- strm.Printf("(%s)", GetTypeAsCString());
- if (dump_mask & eDumpOptionValue) {
- const bool one_line = dump_mask & eDumpOptionCommand;
- const uint32_t size = m_current_value.GetSize();
- if (dump_mask & eDumpOptionType)
- strm.Printf(" =%s",
- (m_current_value.GetSize() > 0 && !one_line) ? "\n" : "");
- if (!one_line)
- strm.IndentMore();
- for (uint32_t i = 0; i < size; ++i) {
- if (!one_line) {
- strm.Indent();
- strm.Printf("[%u]: ", i);
- }
- m_current_value.GetFileSpecAtIndex(i).Dump(&strm);
- if (one_line)
- strm << ' ';
- }
- if (!one_line)
- strm.IndentLess();
- }
-}
-
-Status OptionValueFileSpecList::SetValueFromString(llvm::StringRef value,
- VarSetOperationType op) {
- std::lock_guard<std::recursive_mutex> lock(m_mutex);
- Status error;
- Args args(value.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 < argc; ++i, ++idx) {
- FileSpec file(args.GetArgumentAtIndex(i));
- 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");
- }
- break;
-
- 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));
- 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));
- 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<int> 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
- llvm::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 {
- std::lock_guard<std::recursive_mutex> lock(m_mutex);
- return OptionValueSP(new OptionValueFileSpecList(m_current_value));
-}
Added: lldb/trunk/source/Interpreter/OptionValueFileSpecListTmp.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Interpreter/OptionValueFileSpecListTmp.cpp?rev=369698&view=auto
==============================================================================
--- lldb/trunk/source/Interpreter/OptionValueFileSpecListTmp.cpp (added)
+++ lldb/trunk/source/Interpreter/OptionValueFileSpecListTmp.cpp Thu Aug 22
13:08:46 2019
@@ -0,0 +1,170 @@
+//===-- OptionValueFileSpecList.cpp
---------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM
Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#include "lldb/Interpreter/OptionValueFileSpecList.h"
+
+#include "lldb/Host/StringConvert.h"
+#include "lldb/Utility/Args.h"
+#include "lldb/Utility/Stream.h"
+
+using namespace lldb;
+using namespace lldb_private;
+
+void OptionValueFileSpecList::DumpValue(const ExecutionContext *exe_ctx,
+ Stream &strm, uint32_t dump_mask) {
+ std::lock_guard<std::recursive_mutex> lock(m_mutex);
+ if (dump_mask & eDumpOptionType)
+ strm.Printf("(%s)", GetTypeAsCString());
+ if (dump_mask & eDumpOptionValue) {
+ const bool one_line = dump_mask & eDumpOptionCommand;
+ const uint32_t size = m_current_value.GetSize();
+ if (dump_mask & eDumpOptionType)
+ strm.Printf(" =%s",
+ (m_current_value.GetSize() > 0 && !one_line) ? "\n" : "");
+ if (!one_line)
+ strm.IndentMore();
+ for (uint32_t i = 0; i < size; ++i) {
+ if (!one_line) {
+ strm.Indent();
+ strm.Printf("[%u]: ", i);
+ }
+ m_current_value.GetFileSpecAtIndex(i).Dump(&strm);
+ if (one_line)
+ strm << ' ';
+ }
+ if (!one_line)
+ strm.IndentLess();
+ }
+}
+
+Status OptionValueFileSpecList::SetValueFromString(llvm::StringRef value,
+ VarSetOperationType op) {
+ std::lock_guard<std::recursive_mutex> lock(m_mutex);
+ Status error;
+ Args args(value.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 < argc; ++i, ++idx) {
+ FileSpec file(args.GetArgumentAtIndex(i));
+ 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");
+ }
+ break;
+
+ 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));
+ 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));
+ 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<int> 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
+ llvm::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 {
+ std::lock_guard<std::recursive_mutex> lock(m_mutex);
+ return OptionValueSP(new OptionValueFileSpecList(m_current_value));
+}
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
