Change the "reader" implementation to be reentrant
Fix error with EOF token in run-lexer implementation