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

Fixed bug in anchors with no content. This involved refactoring the 'implicit sequence' concept (where a map and a sequence start on the same indent, but we read the sequence as more indented since the '-' is visually an indent).

Browse Source
This commit is contained in:
jbeder
2009-08-24 22:56:54 +00:00
parent fc22d55b53
commit c7ed85a4ac
12 changed files with 183 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/scantoken.cpp
View File

@@ -19,7 +19,7 @@ namespace YAML
std::vector <std::string> params;
// pop indents and simple keys
PopIndentTo(-1);
PopAllIndents();
VerifyAllSimpleKeys();
m_simpleKeyAllowed = false;
@@ -59,7 +59,7 @@ namespace YAML
// DocStart
void Scanner::ScanDocStart()
{
PopIndentTo(-1);
PopAllIndents();
VerifyAllSimpleKeys();
m_simpleKeyAllowed = false;
@@ -72,7 +72,7 @@ namespace YAML
// DocEnd
void Scanner::ScanDocEnd()
{
PopIndentTo(-1);
PopAllIndents();
VerifyAllSimpleKeys();
m_simpleKeyAllowed = false;
@@ -135,7 +135,7 @@ namespace YAML
if(!m_simpleKeyAllowed)
throw ParserException(INPUT.mark(), ErrorMsg::BLOCK_ENTRY);
PushIndentTo(INPUT.column(), true);
PushIndentTo(INPUT.column(), IndentMarker::SEQ);
m_simpleKeyAllowed = true;
// eat
@@ -152,7 +152,7 @@ namespace YAML
if(!m_simpleKeyAllowed)
throw ParserException(INPUT.mark(), ErrorMsg::MAP_KEY);
PushIndentTo(INPUT.column(), false);
PushIndentTo(INPUT.column(), IndentMarker::MAP);
}
// can only put a simple key here if we're in block context
@@ -180,7 +180,7 @@ namespace YAML
if(!m_simpleKeyAllowed)
throw ParserException(INPUT.mark(), ErrorMsg::MAP_VALUE);
PushIndentTo(INPUT.column(), false);
PushIndentTo(INPUT.column(), IndentMarker::MAP);
}
// can only put a simple key here if we're in block context
@@ -277,7 +277,7 @@ namespace YAML
ScanScalarParams params;
params.end = (m_flowLevel > 0 ? Exp::EndScalarInFlow : Exp::EndScalar) || (Exp::BlankOrBreak + Exp::Comment);
params.eatEnd = false;
params.indent = (m_flowLevel > 0 ? 0 : m_indents.top() + 1);
params.indent = (m_flowLevel > 0 ? 0 : GetTopIndent() + 1);
params.fold = true;
params.eatLeadingWhitespace = true;
params.trimTrailingSpaces = true;
@@ -391,8 +391,8 @@ namespace YAML
throw ParserException(INPUT.mark(), ErrorMsg::CHAR_IN_BLOCK);
// set the initial indentation
if(m_indents.top() >= 0)
params.indent += m_indents.top();
if(GetTopIndent() >= 0)
params.indent += GetTopIndent();
params.eatLeadingWhitespace = false;
params.trimTrailingSpaces = false;