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

Added some exceptions for directives.

Browse Source
This commit is contained in:
beder
2008-07-08 06:06:24 +00:00
parent 2f5c19fa00
commit 5d5651861d
4 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
node.cpp
View File

@@ -83,10 +83,10 @@ namespace YAML
void Node::ParseTag(Scanner *pScanner, const ParserState& state) void Node::ParseTag(Scanner *pScanner, const ParserState& state)
{ {
if(m_tag != "")
return; // TODO: throw
Token *pToken = pScanner->PeekNextToken(); Token *pToken = pScanner->PeekNextToken();
if(m_tag != "")
throw ParserException(pToken->line, pToken->column, "cannot assign multiple tags to the same node");
m_tag = state.TranslateTag(pToken->value); m_tag = state.TranslateTag(pToken->value);
for(unsigned i=0;i<pToken->params.size();i++) for(unsigned i=0;i<pToken->params.size();i++)
@@ -96,10 +96,10 @@ namespace YAML
void Node::ParseAnchor(Scanner *pScanner, const ParserState& state) void Node::ParseAnchor(Scanner *pScanner, const ParserState& state)
{ {
if(m_anchor != "")
return; // TODO: throw
Token *pToken = pScanner->PeekNextToken(); Token *pToken = pScanner->PeekNextToken();
if(m_anchor != "")
throw ParserException(pToken->line, pToken->column, "cannot assign multiple anchors to the same node");
m_anchor = pToken->value; m_anchor = pToken->value;
m_alias = false; m_alias = false;
pScanner->PopNextToken(); pScanner->PopNextToken();
@@ -107,12 +107,12 @@ namespace YAML
void Node::ParseAlias(Scanner *pScanner, const ParserState& state) void Node::ParseAlias(Scanner *pScanner, const ParserState& state)
{ {
if(m_anchor != "")
return; // TODO: throw
if(m_tag != "")
return; // TODO: throw (aliases can't have any content, *including* tags)
Token *pToken = pScanner->PeekNextToken(); Token *pToken = pScanner->PeekNextToken();
if(m_anchor != "")
throw ParserException(pToken->line, pToken->column, "cannot assign multiple aliases to the same node");
if(m_tag != "")
throw ParserException(pToken->line, pToken->column, "aliases can't have any content, *including* tags");
m_anchor = pToken->value; m_anchor = pToken->value;
m_alias = true; m_alias = true;
pScanner->PopNextToken(); pScanner->PopNextToken();

12
parser.cpp
View File

@@ -96,13 +96,17 @@ namespace YAML
str >> m_state.version.major; str >> m_state.version.major;
str.get(); str.get();
str >> m_state.version.minor; str >> m_state.version.minor;
if(!str) if(!str || str.peek() != EOF)
throw ParserException(pToken->line, pToken->column, "bad YAML directive"); throw ParserException(pToken->line, pToken->column, "bad YAML version: " + pToken->params[0]);
// TODO: or throw if there are any more characters in the stream?
// TODO: throw on major > 1? warning on major == 1, minor > 2? if(m_state.version.major > 1)
throw ParserException(pToken->line, pToken->column, "YAML major version > 1");
// TODO: warning on major == 1, minor > 2?
} }
// HandleTagDirective
// . Should be of the form 'handle prefix', where 'handle' is converted to 'prefix' in the file.
void Parser::HandleTagDirective(Token *pToken) void Parser::HandleTagDirective(Token *pToken)
{ {
if(pToken->params.size() != 2) if(pToken->params.size() != 2)

3
tests.cpp
View File

@@ -16,6 +16,7 @@ namespace YAML
files.push_back("tests/simple.yaml"); files.push_back("tests/simple.yaml");
files.push_back("tests/mixed.yaml"); files.push_back("tests/mixed.yaml");
files.push_back("tests/scalars.yaml"); files.push_back("tests/scalars.yaml");
files.push_back("tests/directives.yaml");
bool passed = true; bool passed = true;
for(unsigned i=0;i<files.size();i++) { for(unsigned i=0;i<files.size();i++) {
@@ -69,8 +70,6 @@ namespace YAML
fout << firstTry << std::endl; fout << firstTry << std::endl;
fout << "---\n"; fout << "---\n";
fout << secondTry << std::endl; fout << secondTry << std::endl;
return false;
} catch(ParserException& e) { } catch(ParserException& e) {
std::cout << file << " (line " << e.line + 1 << ", col " << e.column + 1 << "): " << e.msg << std::endl; std::cout << file << " (line " << e.line + 1 << ", col " << e.column + 1 << "): " << e.msg << std::endl;
return false; return false;

5
tests/directives.yaml Normal file
View File

@@ -0,0 +1,5 @@
%YAML 1.2
%TAG ! !howdy
---
- basic node
- ! yeah baby