Lexer return token type and value
Typo
Add line counter
Use this consistently