sorry
> a) you don't use macro "token_matches" consistently
should be
a) you don't use macro "token_is_keyword" consistently
it should be used for all keywords
Regards
Pavel Stehule