update Parser and Lexer