Rename Error -> Status.
This renames the LLDB error class to Status, as discussed
on the lldb-dev mailing list.
A change of this magnitude cannot easily be done without
find and replace, but that has potential to catch unwanted
occurrences of common strings such as "Error". Every effort
was made to find all the obvious things such as the word "Error"
appearing in a string, etc, but it's possible there are still
some lingering occurences left around. Hopefully nothing too
serious.
llvm-svn: 302872
diff --git a/lldb/source/Core/ValueObject.cpp b/lldb/source/Core/ValueObject.cpp
index 9e6b9da..c09139f 100644
--- a/lldb/source/Core/ValueObject.cpp
+++ b/lldb/source/Core/ValueObject.cpp
@@ -347,7 +347,7 @@
return m_data;
}
-const Error &ValueObject::GetError() {
+const Status &ValueObject::GetError() {
UpdateValueIfNeeded(false);
return m_error;
}
@@ -423,7 +423,7 @@
return false;
}
-bool ValueObject::IsLogicalTrue(Error &error) {
+bool ValueObject::IsLogicalTrue(Status &error) {
if (Language *language = Language::FindPlugin(GetObjectRuntimeLanguage())) {
LazyBool is_logical_true = language->IsLogicalTrue(*this, error);
switch (is_logical_true) {
@@ -771,7 +771,7 @@
if (item_idx == 0 && item_count == 1) // simply a deref
{
if (is_pointer_type) {
- Error error;
+ Status error;
ValueObjectSP pointee_sp = Dereference(error);
if (error.Fail() || pointee_sp.get() == NULL)
return 0;
@@ -780,13 +780,13 @@
ValueObjectSP child_sp = GetChildAtIndex(0, true);
if (child_sp.get() == NULL)
return 0;
- Error error;
+ Status error;
return child_sp->GetData(data, error);
}
return true;
} else /* (items > 1) */
{
- Error error;
+ Status error;
lldb_private::DataBufferHeap *heap_buf_ptr = NULL;
lldb::DataBufferSP data_sp(heap_buf_ptr =
new lldb_private::DataBufferHeap());
@@ -848,7 +848,7 @@
return 0;
}
-uint64_t ValueObject::GetData(DataExtractor &data, Error &error) {
+uint64_t ValueObject::GetData(DataExtractor &data, Status &error) {
UpdateValueIfNeeded(false);
ExecutionContext exe_ctx(GetExecutionContextRef());
error = m_value.GetValueAsData(&exe_ctx, data, 0, GetModule().get());
@@ -866,7 +866,7 @@
return data.GetByteSize();
}
-bool ValueObject::SetData(DataExtractor &data, Error &error) {
+bool ValueObject::SetData(DataExtractor &data, Status &error) {
error.Clear();
// Make sure our value is up to date first so that our location and location
// type is valid.
@@ -884,7 +884,7 @@
switch (value_type) {
case Value::eValueTypeScalar: {
- Error set_error =
+ Status set_error =
m_value.GetScalar().SetValueFromData(data, encoding, byte_size);
if (!set_error.Success()) {
@@ -938,7 +938,7 @@
}
std::pair<size_t, bool>
-ValueObject::ReadPointedString(lldb::DataBufferSP &buffer_sp, Error &error,
+ValueObject::ReadPointedString(lldb::DataBufferSP &buffer_sp, Status &error,
uint32_t max_length, bool honor_array,
Format item_format) {
bool was_capped = false;
@@ -1285,7 +1285,7 @@
custom_format ==
eFormatVectorOfChar)) // print char[] & char* directly
{
- Error error;
+ Status error;
lldb::DataBufferSP buffer_sp;
std::pair<size_t, bool> read_string = ReadPointedString(
buffer_sp, error, 0, (custom_format == eFormatVectorOfChar) ||
@@ -1561,7 +1561,7 @@
return address;
}
-bool ValueObject::SetValueFromCString(const char *value_str, Error &error) {
+bool ValueObject::SetValueFromCString(const char *value_str, Status &error) {
error.Clear();
// Make sure our value is up to date first so that our location and location
// type is valid.
@@ -2185,7 +2185,7 @@
if ((final_task_on_target ? *final_task_on_target
: dummy_final_task_on_target) ==
ValueObject::eExpressionPathAftermathDereference) {
- Error error;
+ Status error;
ValueObjectSP final_value = ret_val->Dereference(error);
if (error.Fail() || !final_value.get()) {
if (reason_to_stop)
@@ -2202,7 +2202,7 @@
}
if (*final_task_on_target ==
ValueObject::eExpressionPathAftermathTakeAddress) {
- Error error;
+ Status error;
ValueObjectSP final_value = ret_val->AddressOf(error);
if (error.Fail() || !final_value.get()) {
if (reason_to_stop)
@@ -2552,7 +2552,7 @@
// and use this as
// a bitfield
pointee_compiler_type_info.Test(eTypeIsScalar)) {
- Error error;
+ Status error;
root = root->Dereference(error);
if (error.Fail() || !root) {
*reason_to_stop =
@@ -2697,7 +2697,7 @@
*what_next ==
ValueObject::eExpressionPathAftermathDereference &&
pointee_compiler_type_info.Test(eTypeIsScalar)) {
- Error error;
+ Status error;
root = root->Dereference(error);
if (error.Fail() || !root) {
*reason_to_stop =
@@ -2839,7 +2839,7 @@
return LLDB_INVALID_ADDRESS;
}
-ValueObjectSP ValueObject::Dereference(Error &error) {
+ValueObjectSP ValueObject::Dereference(Status &error) {
if (m_deref_valobj)
return m_deref_valobj->GetSP();
@@ -2904,7 +2904,7 @@
}
}
-ValueObjectSP ValueObject::AddressOf(Error &error) {
+ValueObjectSP ValueObject::AddressOf(Status &error) {
if (m_addr_of_valobj_sp)
return m_addr_of_valobj_sp;
@@ -3191,7 +3191,7 @@
if (ptr_result_valobj_sp) {
ptr_result_valobj_sp->GetValue().SetValueType(
Value::eValueTypeLoadAddress);
- Error err;
+ Status err;
ptr_result_valobj_sp = ptr_result_valobj_sp->Dereference(err);
if (ptr_result_valobj_sp && !name.empty())
ptr_result_valobj_sp->SetName(ConstString(name));