Fix bnf to generate lexer and parser