updated r lexer