Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(397)

Unified Diff: third_party/inspector_protocol/lib/Values_cpp.template

Issue 2660503002: Adapt StringBuilder's append and toString methods via StringUtil helper. (Closed)
Patch Set: Corrected the revision number... :-/ Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/inspector_protocol/lib/Parser_cpp.template ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/inspector_protocol/lib/Values_cpp.template
diff --git a/third_party/inspector_protocol/lib/Values_cpp.template b/third_party/inspector_protocol/lib/Values_cpp.template
index 8fe128ef4880566f8a0964119e5d8570bab12398..6f8b14c16c8edf44e061ef77037d86b620e759b4 100644
--- a/third_party/inspector_protocol/lib/Values_cpp.template
+++ b/third_party/inspector_protocol/lib/Values_cpp.template
@@ -17,13 +17,13 @@ const char* const falseValueString = "false";
inline bool escapeChar(uint16_t c, StringBuilder* dst)
{
switch (c) {
- case '\b': dst->append("\\b"); break;
- case '\f': dst->append("\\f"); break;
- case '\n': dst->append("\\n"); break;
- case '\r': dst->append("\\r"); break;
- case '\t': dst->append("\\t"); break;
- case '\\': dst->append("\\\\"); break;
- case '"': dst->append("\\\""); break;
+ case '\b': StringUtil::builderAppend(*dst, "\\b"); break;
+ case '\f': StringUtil::builderAppend(*dst, "\\f"); break;
+ case '\n': StringUtil::builderAppend(*dst, "\\n"); break;
+ case '\r': StringUtil::builderAppend(*dst, "\\r"); break;
+ case '\t': StringUtil::builderAppend(*dst, "\\t"); break;
+ case '\\': StringUtil::builderAppend(*dst, "\\\\"); break;
+ case '"': StringUtil::builderAppend(*dst, "\\\""); break;
default:
return false;
}
@@ -34,10 +34,10 @@ const char hexDigits[17] = "0123456789ABCDEF";
void appendUnsignedAsHex(uint16_t number, StringBuilder* dst)
{
- dst->append("\\u");
+ StringUtil::builderAppend(*dst, "\\u");
for (size_t i = 0; i < 4; ++i) {
uint16_t c = hexDigits[(number & 0xF000) >> 12];
- dst->append(c);
+ StringUtil::builderAppend(*dst, c);
number <<= 4;
}
}
@@ -53,7 +53,7 @@ void escapeStringForJSON(const String& str, StringBuilder* dst)
// is also optional. It would also be a pain to implement here.
appendUnsignedAsHex(c, dst);
} else {
- dst->append(c);
+ StringUtil::builderAppend(*dst, c);
}
}
}
@@ -61,9 +61,9 @@ void escapeStringForJSON(const String& str, StringBuilder* dst)
void doubleQuoteStringForJSON(const String& str, StringBuilder* dst)
{
- dst->append('"');
+ StringUtil::builderAppend(*dst, '"');
escapeStringForJSON(str, dst);
- dst->append('"');
+ StringUtil::builderAppend(*dst, '"');
}
} // anonymous namespace
@@ -96,7 +96,7 @@ bool Value::asSerialized(String*) const
void Value::writeJSON(StringBuilder* output) const
{
DCHECK(m_type == TypeNull);
- output->append(nullValueString, 4);
+ StringUtil::builderAppend(*output, nullValueString, 4);
}
std::unique_ptr<Value> Value::clone() const
@@ -109,7 +109,7 @@ String Value::serialize()
StringBuilder result;
StringUtil::builderReserve(result, 512);
writeJSON(&result);
- return result.toString();
+ return StringUtil::builderToString(result);
}
bool FundamentalValue::asBoolean(bool* output) const
@@ -146,17 +146,17 @@ void FundamentalValue::writeJSON(StringBuilder* output) const
DCHECK(type() == TypeBoolean || type() == TypeInteger || type() == TypeDouble);
if (type() == TypeBoolean) {
if (m_boolValue)
- output->append(trueValueString, 4);
+ StringUtil::builderAppend(*output, trueValueString, 4);
else
- output->append(falseValueString, 5);
+ StringUtil::builderAppend(*output, falseValueString, 5);
} else if (type() == TypeDouble) {
if (!std::isfinite(m_doubleValue)) {
- output->append(nullValueString, 4);
+ StringUtil::builderAppend(*output, nullValueString, 4);
return;
}
- output->append(StringUtil::fromDouble(m_doubleValue));
+ StringUtil::builderAppend(*output, StringUtil::fromDouble(m_doubleValue));
} else if (type() == TypeInteger) {
- output->append(StringUtil::fromInteger(m_integerValue));
+ StringUtil::builderAppend(*output, StringUtil::fromInteger(m_integerValue));
}
}
@@ -198,7 +198,7 @@ bool SerializedValue::asSerialized(String* output) const
void SerializedValue::writeJSON(StringBuilder* output) const
{
DCHECK(type() == TypeSerialized);
- output->append(m_serializedValue);
+ StringUtil::builderAppend(*output, m_serializedValue);
}
std::unique_ptr<Value> SerializedValue::clone() const
@@ -330,17 +330,17 @@ void DictionaryValue::remove(const String& name)
void DictionaryValue::writeJSON(StringBuilder* output) const
{
- output->append('{');
+ StringUtil::builderAppend(*output, '{');
for (size_t i = 0; i < m_order.size(); ++i) {
Dictionary::const_iterator it = m_data.find(m_order[i]);
CHECK(it != m_data.end());
if (i)
- output->append(',');
+ StringUtil::builderAppend(*output, ',');
doubleQuoteStringForJSON(it->first, output);
- output->append(':');
+ StringUtil::builderAppend(*output, ':');
it->second->writeJSON(output);
}
- output->append('}');
+ StringUtil::builderAppend(*output, '}');
}
std::unique_ptr<Value> DictionaryValue::clone() const
@@ -366,15 +366,15 @@ ListValue::~ListValue()
void ListValue::writeJSON(StringBuilder* output) const
{
- output->append('[');
+ StringUtil::builderAppend(*output, '[');
bool first = true;
for (const std::unique_ptr<protocol::Value>& value : m_data) {
if (!first)
- output->append(',');
+ StringUtil::builderAppend(*output, ',');
value->writeJSON(output);
first = false;
}
- output->append(']');
+ StringUtil::builderAppend(*output, ']');
}
std::unique_ptr<Value> ListValue::clone() const
« no previous file with comments | « third_party/inspector_protocol/lib/Parser_cpp.template ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698