Moved symbol matching logic into lexer module