rewrote parser to be ll(1)
changed parser to be ll(1), changed token format