Added file name to error messages (parser-side), in doing so, changed tokenLocation a lot