I make the v2 of the patch,use Tom's advice.
But I can't make ROLE and USER in the keyword list,it is hard to solve the conflict,or rewrite many gram rules.
the problem is :
role_or_user : ROLE | USER;
xx_keyword:...| ROLE|...|USER..;
this two rules produce conflict.So in v2,I remove ROLE and USER from the xx_keyword rule now?
Any idea?