Refactor parser with eat()/expect() functions

[mkhan45]

To avoid annoying match chains