peisongxiao/yaml-cpp
1
0
Fork 0
mirror of https://github.com/jbeder/yaml-cpp.git synced 2025-09-09 12:41:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix formatting when writing " as a character.

Browse Source
This commit is contained in:
Jesse Beder
2016-01-10 12:08:42 -06:00
parent 97d56c3f36
commit 36fd93a8d5
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/emitterutils.cpp
View File

@@ -375,14 +375,16 @@ bool WriteLiteralString(ostream_wrapper& out, const std::string& str,
bool WriteChar(ostream_wrapper& out, char ch) { bool WriteChar(ostream_wrapper& out, char ch) {
if (('a' <= ch && ch <= 'z') || ('A' <= ch && ch <= 'Z')) { if (('a' <= ch && ch <= 'z') || ('A' <= ch && ch <= 'Z')) {
out << ch; out << ch;
} else if ((0x20 <= ch && ch <= 0x7e) || ch == ' ') { } else if (ch == '\"') {
out << "\"" << ch << "\""; out << "\"\\\"\"";
} else if (ch == '\t') { } else if (ch == '\t') {
out << "\"\\t\""; out << "\"\\t\"";
} else if (ch == '\n') { } else if (ch == '\n') {
out << "\"\\n\""; out << "\"\\n\"";
} else if (ch == '\b') { } else if (ch == '\b') {
out << "\"\\b\""; out << "\"\\b\"";
} else if ((0x20 <= ch && ch <= 0x7e) || ch == ' ') {
out << "\"" << ch << "\"";
} else { } else {
out << "\""; out << "\"";
WriteDoubleQuoteEscapeSequence(out, ch); WriteDoubleQuoteEscapeSequence(out, ch);

8
test/integration/emitter_test.cpp
View File

@@ -962,6 +962,14 @@ TEST_F(EmitterTest, QuoteNull) {
ExpectEmit("\"null\""); ExpectEmit("\"null\"");
} }
TEST_F(EmitterTest, ValueOfDoubleQuote) {
out << YAML::BeginMap;
out << YAML::Key << "foo" << YAML::Value << '"';
out << YAML::EndMap;
ExpectEmit("foo: \"\\\"\"");
}
class EmitterErrorTest : public ::testing::Test { class EmitterErrorTest : public ::testing::Test {
protected: protected:
void ExpectEmitError(const std::string& expectedError) { void ExpectEmitError(const std::string& expectedError) {