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

Replaced the queue of Token pointers with values.

Browse Source 
We were getting memory leaks (as told by the CRT detectors, which I also added), and there's really no reason (as long as we're careful) to use pointers there.
This commit is contained in:
beder
2008-07-20 05:02:01 +00:00
parent f4e522490f
commit 557f81e622
25 changed files with 297 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/parser.cpp
View File

@@ -1,3 +1,4 @@
#include "crt.h"
#include "parser.h"
#include "scanner.h"
#include "token.h"
@@ -18,7 +19,7 @@ namespace YAML
Parser::operator bool() const
{
return m_pScanner->PeekNextToken() != 0;
return !m_pScanner->IsEmpty();
}
void Parser::Load(std::istream& in)
@@ -40,19 +41,19 @@ namespace YAML
ParseDirectives();
// we better have some tokens in the queue
if(!m_pScanner->PeekNextToken())
if(m_pScanner->IsEmpty())
return;
// first eat doc start (optional)
if(m_pScanner->PeekNextToken()->type == TT_DOC_START)
m_pScanner->EatNextToken();
if(m_pScanner->PeekToken().type == TT_DOC_START)
m_pScanner->PopToken();
// now parse our root node
document.Parse(m_pScanner, m_state);
// and finally eat any doc ends we see
while(m_pScanner->PeekNextToken() && m_pScanner->PeekNextToken()->type == TT_DOC_END)
m_pScanner->EatNextToken();
while(!m_pScanner->IsEmpty() && m_pScanner->PeekToken().type == TT_DOC_END)
m_pScanner->PopToken();
}
// ParseDirectives
@@ -62,8 +63,11 @@ namespace YAML
bool readDirective = false;
while(1) {
Token *pToken = m_pScanner->PeekNextToken();
if(!pToken || pToken->type != TT_DIRECTIVE)
if(m_pScanner->IsEmpty())
break;
Token& token = m_pScanner->PeekToken();
if(token.type != TT_DIRECTIVE)
break;
// we keep the directives from the last document if none are specified;
@@ -72,8 +76,8 @@ namespace YAML
m_state.Reset();
readDirective = true;
HandleDirective(pToken);
m_pScanner->PopNextToken();
HandleDirective(&token);
m_pScanner->PopToken();
}
}
@@ -119,11 +123,11 @@ namespace YAML
void Parser::PrintTokens(std::ostream& out)
{
while(1) {
Token *pToken = m_pScanner->GetNextToken();
if(!pToken)
if(m_pScanner->IsEmpty())
break;
out << *pToken << std::endl;
out << m_pScanner->PeekToken() << std::endl;
m_pScanner->PopToken();
}
}
}