fix(parser): improve expression parsing logic to handle end of tokens

fix(parser): improve expression parsing logic to handle end of tokens #715