change Parser.peg for new grammer