Added less verbose comparison between Token and token_t.
Updated error functions so that they can report the line it occured.