incorporated Valentine's token definitions + adapted lexer converter