modify grammar and parser for bugs(bugs existed stillly)