summaryrefslogtreecommitdiffstats
path: root/lldb/tools/debugserver/source/JSON.cpp
diff options
context:
space:
mode:
authorZachary Turner <zturner@google.com>2017-05-12 04:51:55 +0000
committerZachary Turner <zturner@google.com>2017-05-12 04:51:55 +0000
commit97206d572797bddc1bba71bb1c18c97f19d69053 (patch)
treefdf21d24485672cf97c800264d135b9d5d2ecdce /lldb/tools/debugserver/source/JSON.cpp
parent3086b45a2fae833e8419885e78c598d936cc6429 (diff)
downloadbcm5719-llvm-97206d572797bddc1bba71bb1c18c97f19d69053.tar.gz
bcm5719-llvm-97206d572797bddc1bba71bb1c18c97f19d69053.zip
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
Diffstat (limited to 'lldb/tools/debugserver/source/JSON.cpp')
-rw-r--r--lldb/tools/debugserver/source/JSON.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/lldb/tools/debugserver/source/JSON.cpp b/lldb/tools/debugserver/source/JSON.cpp
index 19ebfd000f5..c914f2498f0 100644
--- a/lldb/tools/debugserver/source/JSON.cpp
+++ b/lldb/tools/debugserver/source/JSON.cpp
@@ -282,7 +282,7 @@ JSONParser::Token JSONParser::GetToken(std::string &value) {
error << "error: an error occurred getting a character from offset "
<< start_index;
value = error.str();
- return Token::Error;
+ return Token::Status;
} else {
const bool is_end_quote = escaped_ch == '"';
@@ -296,13 +296,13 @@ JSONParser::Token JSONParser::GetToken(std::string &value) {
<< std::setprecision(4) << std::hex << escaped_ch;
error << " at offset " << start_index;
value = error.str();
- return Token::Error;
+ return Token::Status;
}
} else if (is_end_quote) {
return Token::String;
} else if (is_null) {
value = "error: missing end quote for string";
- return Token::Error;
+ return Token::Status;
}
}
}
@@ -352,7 +352,7 @@ JSONParser::Token JSONParser::GetToken(std::string &value) {
if (got_decimal_point) {
error << "error: extra decimal point found at offset " << start_index;
value = error.str();
- return Token::Error;
+ return Token::Status;
} else {
got_decimal_point = true;
++m_index; // Skip this character
@@ -365,7 +365,7 @@ JSONParser::Token JSONParser::GetToken(std::string &value) {
error << "error: extra exponent character found at offset "
<< start_index;
value = error.str();
- return Token::Error;
+ return Token::Status;
} else {
exp_index = m_index;
++m_index; // Skip this character
@@ -381,7 +381,7 @@ JSONParser::Token JSONParser::GetToken(std::string &value) {
error << "error: unexpected " << next_ch << " character at offset "
<< start_index;
value = error.str();
- return Token::Error;
+ return Token::Status;
}
break;
@@ -403,7 +403,7 @@ JSONParser::Token JSONParser::GetToken(std::string &value) {
"offset in float value \""
<< value.c_str() << "\"";
value = error.str();
- return Token::Error;
+ return Token::Status;
}
} else {
// No exponent, but we need at least one decimal after the decimal
@@ -414,7 +414,7 @@ JSONParser::Token JSONParser::GetToken(std::string &value) {
error << "error: no digits after decimal point \"" << value.c_str()
<< "\"";
value = error.str();
- return Token::Error;
+ return Token::Status;
}
}
} else {
@@ -425,13 +425,13 @@ JSONParser::Token JSONParser::GetToken(std::string &value) {
} else {
error << "error: no digits negate sign \"" << value.c_str() << "\"";
value = error.str();
- return Token::Error;
+ return Token::Status;
}
}
} else {
error << "error: invalid number found at offset " << start_index;
value = error.str();
- return Token::Error;
+ return Token::Status;
}
} break;
default:
@@ -440,7 +440,7 @@ JSONParser::Token JSONParser::GetToken(std::string &value) {
error << "error: failed to parse token at offset " << start_index
<< " (around character '" << ch << "')";
value = error.str();
- return Token::Error;
+ return Token::Status;
}
int JSONParser::GetEscapedChar(bool &was_escaped) {
OpenPOWER on IntegriCloud