Ensure not adding EOF token to the parse tree

Ensure not adding EOF token to the parse tree #692