Added oper and expr to fix the revised grammar