Lexer definition & parser grammar update