refactor yparser.code