[core][cli][fx] grammar analysis update (keeping tokens from being deleted)