modified parser.mly to fix shift/reduce errors