[cli] grammatical analysis update