--- a/src/lexer_scanner.h Sat Jan 11 22:36:31 2014 +0200 +++ b/src/lexer_scanner.h Mon Jan 13 00:15:38 2014 +0200 @@ -78,9 +78,9 @@ return m_ptr - m_line_break_pos; } - inline e_token get_e_token() const + inline e_token get_token_type() const { - return m_e_token; + return m_token_type; } static string get_token_string (e_token a); @@ -91,7 +91,7 @@ * m_line_break_pos; string m_token_text, m_last_token; - e_token m_e_token; + e_token m_token_type; int m_line; bool check_string (const char* c, int flags = 0);