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

Implemented adjacent key:value pairs when the key is JSON-like

Browse Source
This commit is contained in:
Jesse Beder
2009-10-29 21:05:48 +00:00
parent a5607f82a3
commit fadc2ad39f
4 changed files with 31 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/scanner.cpp
View File

@@ -8,7 +8,7 @@
namespace YAML
{
Scanner::Scanner(std::istream& in)
: INPUT(in), m_startedStream(false), m_endedStream(false), m_simpleKeyAllowed(false)
: INPUT(in), m_startedStream(false), m_endedStream(false), m_simpleKeyAllowed(false), m_canBeJSONFlow(false)
{
}
@@ -142,7 +142,7 @@ namespace YAML
if((InBlockContext() ? Exp::Key : Exp::KeyInFlow).Matches(INPUT))
return ScanKey();
if((InBlockContext() ? Exp::Value : Exp::ValueInFlow).Matches(INPUT))
if(GetValueRegex().Matches(INPUT))
return ScanValue();
// alias/anchor
@@ -226,6 +226,16 @@ namespace YAML
return false;
}
// GetValueRegex
// . Get the appropriate regex to check if it's a value token
const RegEx& Scanner::GetValueRegex() const
{
if(InBlockContext())
return Exp::Value;
return m_canBeJSONFlow ? Exp::ValueInJSONFlow : Exp::ValueInFlow;
}
// StartStream
// . Set the initial conditions for starting a stream.
void Scanner::StartStream()
@@ -410,3 +420,4 @@ namespace YAML
m_anchors.clear();
}
}