I am not sure the lexer should deal with this issue  ( I did include it in my suggestion below though).