Yacc修改
merge from kaqiling