summaryrefslogtreecommitdiff
path: root/src/parse/tokenstream.cpp
diff options
context:
space:
mode:
authorJohn Hodge (bugs) <tpg@mutabah.net>2017-05-14 12:39:31 +0800
committerJohn Hodge (bugs) <tpg@mutabah.net>2017-05-14 12:39:31 +0800
commit39ccbcf7e5596ca791d8616b678d1a13ebbb1af4 (patch)
tree7d05b59afda9dca6c741275ab3d27e13c39ff561 /src/parse/tokenstream.cpp
parent1d2fe7681219700998c8ecbdb8ed5acab66578df (diff)
parent699dbed9dca998b0df8418fde68235d230a726eb (diff)
downloadmrust-39ccbcf7e5596ca791d8616b678d1a13ebbb1af4.tar.gz
Merge branch 'master' of https://github.com/thepowersgang/mrustc
Diffstat (limited to 'src/parse/tokenstream.cpp')
-rw-r--r--src/parse/tokenstream.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/parse/tokenstream.cpp b/src/parse/tokenstream.cpp
index 491b2a3e..20b53431 100644
--- a/src/parse/tokenstream.cpp
+++ b/src/parse/tokenstream.cpp
@@ -33,6 +33,7 @@ Token TokenStream::getToken()
{
if( m_cache_valid )
{
+ //DEBUG("<<< " << m_cache << " (cache)");
m_cache_valid = false;
return mv$(m_cache);
}
@@ -41,6 +42,7 @@ Token TokenStream::getToken()
Token ret = mv$( m_lookahead.front().first );
m_hygiene = m_lookahead.front().second;
m_lookahead.erase(m_lookahead.begin());
+ //DEBUG("<<< " << ret << " (lookahead)");
if( DEBUG_PRINT_TOKENS ) {
::std::cout << "getToken[" << typeid(*this).name() << "] - " << ret.get_pos() << "-" << ret << ::std::endl;
}
@@ -50,6 +52,7 @@ Token TokenStream::getToken()
{
Token ret = this->innerGetToken();
m_hygiene = this->realGetHygiene();
+ //DEBUG("<<< " << ret << " (new)");
if( DEBUG_PRINT_TOKENS ) {
::std::cout << "getToken[" << typeid(*this).name() << "] - " << ret.get_pos() << "-" << ret << ::std::endl;
}
@@ -65,6 +68,7 @@ void TokenStream::putback(Token tok)
}
else
{
+ //DEBUG(">>> " << tok);
m_cache_valid = true;
m_cache = mv$(tok);
}