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

Moved the simple key validation to before each token scan (plus at newlines of scalars).

Browse Source
This commit is contained in:
Jesse Beder
2008-06-28 16:46:37 +00:00
parent 11706abbb7
commit c63ebbd878
4 changed files with 66 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scantoken.cpp
View File

@@ -99,7 +99,7 @@ namespace YAML
// FlowMapEndToken
template <> FlowMapEndToken *Scanner::ScanToken(FlowMapEndToken *pToken)
{
ValidateSimpleKey();
//ValidateSimpleKey();
DecreaseFlowLevel();
m_simpleKeyAllowed = false;
@@ -111,7 +111,7 @@ namespace YAML
// FlowEntryToken
template <> FlowEntryToken *Scanner::ScanToken(FlowEntryToken *pToken)
{
ValidateSimpleKey();
//ValidateSimpleKey();
m_simpleKeyAllowed = true;
// eat
@@ -122,7 +122,7 @@ namespace YAML
// BlockEntryToken
template <> BlockEntryToken *Scanner::ScanToken(BlockEntryToken *pToken)
{
ValidateSimpleKey();
//ValidateSimpleKey();
// we better be in the block context!
if(m_flowLevel == 0) {
@@ -170,9 +170,9 @@ namespace YAML
template <> ValueToken *Scanner::ScanToken(ValueToken *pToken)
{
// does this follow a simple key?
bool isValidKey = ValidateSimpleKey();
// bool isValidKey = ValidateSimpleKey();
if(isValidKey) {
if(m_isLastKeyValid) {
// can't follow a simple key with another simple key (dunno why, though - it seems fine)
m_simpleKeyAllowed = false;
} else {