Added line/col support to lexer