lexer:re2c - refactoring