cleaning up the external interface of Scanner::next(). No special cases

1 files changed, 7 insertions, 3 deletions

diff --git a/Scanner.cpp b/Scanner.cpp
index 934b30dc..d3000099 100644
--- a/Scanner.cpp
+++ b/Scanner.cpp
@@ -109,7 +109,11 @@ void Scanner::reset(CharStream const& _source)
 	m_char = m_source.get();
 	skipWhitespace();
 	foundDocComment = scanToken();
-	next(foundDocComment);
+
+	// special version of Scanner:next() taking the previous scanToken() result into account
+	m_current_token = m_next_token;
+	if (scanToken() || foundDocComment)
+		m_skipped_comment = m_next_skipped_comment;
 }
 
 
@@ -135,10 +139,10 @@ bool Scanner::scanHexByte(char& o_scannedByte)
 // Ensure that tokens can be stored in a byte.
 BOOST_STATIC_ASSERT(Token::NUM_TOKENS <= 0x100);
 
-Token::Value Scanner::next(bool _changeSkippedComment)
+Token::Value Scanner::next()
 {
 	m_current_token = m_next_token;
-	if (scanToken() || _changeSkippedComment)
+	if (scanToken())
 		m_skipped_comment = m_next_skipped_comment;
 	return m_current_token.token;
 }