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

Disallowed a plain scalar with just a dash

Browse Source
This commit is contained in:
beder
2012-01-11 16:39:24 -06:00
parent 8f948b8f37
commit 2d166d1733
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/exp.h
View File

@@ -137,7 +137,7 @@ namespace YAML
// . In the block context - ? : must be not be followed with a space. // . In the block context - ? : must be not be followed with a space.
// . In the flow context ? is illegal and : and - must not be followed with a space. // . In the flow context ? is illegal and : and - must not be followed with a space.
inline const RegEx& PlainScalar() { inline const RegEx& PlainScalar() {
static const RegEx e = !(BlankOrBreak() || RegEx(",[]{}#&*!|>\'\"%@`", REGEX_OR) || (RegEx("-?:", REGEX_OR) + Blank())); static const RegEx e = !(BlankOrBreak() || RegEx(",[]{}#&*!|>\'\"%@`", REGEX_OR) || (RegEx("-?:", REGEX_OR) + (BlankOrBreak() || RegEx())));
return e; return e;
} }
inline const RegEx& PlainScalarInFlow() { inline const RegEx& PlainScalarInFlow() {

14
test/emittertests.cpp
View File

@@ -892,7 +892,16 @@ namespace Test
out << YAML::EndSeq; out << YAML::EndSeq;
desiredOutput = "- 1.23\n- 3.14159"; desiredOutput = "- 1.23\n- 3.14159";
} }
////////////////////////////////////////////////////////////////////////////////////////////////////////
void DashInBlockContext(YAML::Emitter& out, std::string& desiredOutput)
{
out << YAML::BeginMap;
out << YAML::Key << "key" << YAML::Value << "-";
out << YAML::EndMap;
desiredOutput = "key: \"-\"";
}
////////////////////////////////////////////////////////////////////////////////////////////////////////
// incorrect emitting // incorrect emitting
void ExtraEndSeq(YAML::Emitter& out, std::string& desiredError) void ExtraEndSeq(YAML::Emitter& out, std::string& desiredError)
@@ -995,7 +1004,7 @@ namespace Test
YAML::Node node; YAML::Node node;
parser.GetNextDocument(node); parser.GetNextDocument(node);
#else #else
// Parse with the new API // YAML::Node node = YAML::Load(output);
#endif #endif
passed++; passed++;
@@ -1113,6 +1122,7 @@ namespace Test
RunEmitterTest(&Emitter::SingleChar, "single char", passed, total); RunEmitterTest(&Emitter::SingleChar, "single char", passed, total);
RunEmitterTest(&Emitter::DefaultPrecision, "default precision", passed, total); RunEmitterTest(&Emitter::DefaultPrecision, "default precision", passed, total);
RunEmitterTest(&Emitter::SetPrecision, "set precision", passed, total); RunEmitterTest(&Emitter::SetPrecision, "set precision", passed, total);
RunEmitterTest(&Emitter::DashInBlockContext, "dash in block context", passed, total);
RunEmitterErrorTest(&Emitter::ExtraEndSeq, "extra EndSeq", passed, total); RunEmitterErrorTest(&Emitter::ExtraEndSeq, "extra EndSeq", passed, total);
RunEmitterErrorTest(&Emitter::ExtraEndMap, "extra EndMap", passed, total); RunEmitterErrorTest(&Emitter::ExtraEndMap, "extra EndMap", passed, total);